Fix index out of bounds crashes

MohamedRejeb · Mar 10, 2024 · 5de91a7 · 5de91a7
1 parent 7dba8a2
commit 5de91a7
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/.fleet/settings.json b/.fleet/settings.json
@@ -0,0 +1,3 @@
+{
+    "run.destination.stop.already.running": "Always"
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.2.2"
 kotlin = "1.9.22"
-compose = "1.6.0-rc02"
+compose = "1.6.0"
 dokka = "1.9.10"
 
 ksoup = "0.3.1"

diff --git a/richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/model/RichTextState.kt b/richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/model/RichTextState.kt
@@ -719,7 +719,7 @@ class RichTextState internal constructor(
         }
 
         styledRichSpanList.clear()
-        textFieldValue = newTextFieldValue.copy(text = newText)
+        textFieldValue = newTextFieldValue.copy(text = annotatedString.te)
         visualTransformation = VisualTransformation { _ ->
             TransformedText(
                 annotatedString,

diff --git a/...ditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/ui/BasicRichTextEditor.kt b/...ditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/ui/BasicRichTextEditor.kt
@@ -231,7 +231,7 @@ internal fun BasicRichTextEditor(
 
     CompositionLocalProvider(LocalClipboardManager provides richClipboardManager) {
         BasicTextField(
-            value = state.textFieldValue.copy(annotatedString = state.annotatedString),
+            value = state.textFieldValue,
             onValueChange = {
                 if (readOnly) return@BasicTextField
                 if (it.text.length > maxLength) return@BasicTextField
@@ -273,6 +273,7 @@ internal fun BasicRichTextEditor(
             singleLine = singleLine,
             maxLines = maxLines,
             minLines = minLines,
+            visualTransformation = state.visualTransformation,
             onTextLayout = {
                 state.onTextLayout(
                     textLayoutResult = it,

diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts
@@ -41,7 +41,7 @@ kotlin {
                 api(compose.material3)
                 api(compose.materialIconsExtended)
                 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-                api(compose.components.resources)
+                implementation(compose.components.resources)
 
 //                implementation(libs.richeditor.compose)
                 implementation(project(":richeditor-compose"))

diff --git a/...n/src/commonMain/resources/slack-logo.png → .../composeResources/drawable/slack-logo.png b/...n/src/commonMain/resources/slack-logo.png → .../composeResources/drawable/slack-logo.png
diff --git a/...src/commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/slack/SlackDemoContent.kt b/...src/commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/slack/SlackDemoContent.kt
@@ -10,6 +10,8 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.Send
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.outlined.Send
 import androidx.compose.material.ripple.rememberRipple
@@ -26,18 +28,17 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
+import com.mohamedrejeb.richeditor.common.generated.resources.Res
+import com.mohamedrejeb.richeditor.common.generated.resources.slack_logo
 import com.mohamedrejeb.richeditor.model.RichTextState
 import com.mohamedrejeb.richeditor.model.rememberRichTextState
 import com.mohamedrejeb.richeditor.ui.material3.RichText
 import com.mohamedrejeb.richeditor.ui.material3.RichTextEditor
 import com.mohamedrejeb.richeditor.ui.material3.RichTextEditorDefaults
-import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalRichTextApi::class, ExperimentalLayoutApi::class,
-    ExperimentalResourceApi::class,
-)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalRichTextApi::class, ExperimentalResourceApi::class)
 @Composable
 fun SlackDemoContent() {
     val navigator = LocalNavigator.currentOrThrow
@@ -77,7 +78,7 @@ fun SlackDemoContent() {
                             IconButton(
                                 onClick = { navigator.pop() }
                             ) {
-                                Icon(Icons.Default.ArrowBack, contentDescription = "Back")
+                                Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
                             }
                         },
                         colors = TopAppBarDefaults.mediumTopAppBarColors(
@@ -86,7 +87,8 @@ fun SlackDemoContent() {
                             navigationIconContentColor = Color.White,
                         )
                     )
-                    Divider(color = Color(0xFFCBCCCD), thickness = 1.dp)
+
+                    HorizontalDivider(color = Color(0xFFCBCCCD))
                 }
             },
             containerColor = Color(0xFF1a1d21),
@@ -121,7 +123,7 @@ fun SlackDemoContent() {
                                         .background(Color.White)
                                 ) {
                                     Image(
-                                        painterResource(DrawableResource("slack-logo.png")),
+                                        painterResource(Res.drawable.slack_logo),
                                         contentDescription = "Slack Logo",
                                         modifier = Modifier
                                             .fillMaxSize()
@@ -206,7 +208,7 @@ fun SlackDemoContent() {
                             contentAlignment = Alignment.Center
                         ) {
                             Icon(
-                                imageVector = Icons.Outlined.Send,
+                                imageVector = Icons.AutoMirrored.Outlined.Send,
                                 contentDescription = "Send",
                                 tint = Color.White,
                                 modifier = Modifier
@@ -218,14 +220,13 @@ fun SlackDemoContent() {
                     }
                 }
 
-                if (openLinkDialog.value) {
+                if (openLinkDialog.value)
                     SlackDemoLinkDialog(
                         state = richTextState,
                         text = text,
                         link = link,
                         openLinkDialog = openLinkDialog
                     )
-                }
             }
         }
     }

diff --git a/...ditor.xcodeproj/xcuserdata/mohamedbenrejeb.xcuserdatad/xcschemes/xcschememanagement.plist b/...ditor.xcodeproj/xcuserdata/mohamedbenrejeb.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,7 +4,7 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>Compose Rich Editor.xcscheme_^#shared#^_</key>
+		<key>Compose Rich Editor.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>