Merge pull request #89 from MohamedRejeb/1.x

Fix an issue with setHtml in release mode
MohamedRejeb · Aug 5, 2023 · 9df6238 · 9df6238
2 parents 3244b6c + 4045f96
commit 9df6238
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 5 deletions.
diff --git a/richeditor-compose/build.gradle.kts b/richeditor-compose/build.gradle.kts
@@ -77,5 +77,6 @@ android {
 
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
+        consumerProguardFile("proguard-rules.pro")
     }
 }
diff --git a/richeditor-compose/proguard-rules.pro b/richeditor-compose/proguard-rules.pro
@@ -0,0 +1 @@
+-keep class com.mohamedrejeb.ksoup.html.** { *; }
diff --git a/.../src/commonMain/kotlin/com/mohamedrejeb/richeditor/parser/html/RichTextStateHtmlParser.kt b/.../src/commonMain/kotlin/com/mohamedrejeb/richeditor/parser/html/RichTextStateHtmlParser.kt
@@ -16,7 +16,6 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
     override fun encode(input: String): RichTextState {
         val openedTags = mutableListOf<Pair<String, Map<String, String>>>()
         val stringBuilder = StringBuilder()
-        val currentStyles: MutableList<RichTextStyle> = mutableListOf()
         val richParagraphList = mutableListOf<RichParagraph>()
         var currentRichSpan: RichSpan? = null
         var lastClosedTag: String? = null
@@ -147,7 +146,6 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
             }
             .onCloseTag { name, _ ->
                 openedTags.removeLastOrNull()
-                currentStyles.removeLastOrNull()
                 lastClosedTag = name
 
                 if (name == "ul" || name == "ol") {

diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts
@@ -30,6 +30,23 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            isDebuggable = false
+
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
     dependencies {
         implementation(project(":sample:common"))
 

diff --git a/sample/android/proguard-rules.pro b/sample/android/proguard-rules.pro
diff --git a/sample/android/src/main/AndroidManifest.xml b/sample/android/src/main/AndroidManifest.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mohamedrejeb.richeditor.android">
+<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:allowBackup="false"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+        android:enableOnBackInvokedCallback="true"
+        tools:targetApi="tiramisu">
         <activity
             android:name="com.mohamedrejeb.richeditor.sample.MainActivity"
             android:exported="true"

diff --git a/sample/android/src/main/res/values/strings.xml b/sample/android/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Compose Rich Editor</string>
+</resources>
diff --git a/.../commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/HtmlToRichText.kt b/.../commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/HtmlToRichText.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
-import com.mohamedrejeb.richeditor.model.RichTextValue
 import com.mohamedrejeb.richeditor.model.rememberRichTextState
 import com.mohamedrejeb.richeditor.ui.material3.RichText