Fix warnings

MohamedRejeb · Mar 31, 2024 · 896e90c · 896e90c
1 parent ceede9f
commit 896e90c
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 33 deletions.
diff --git a/...itor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/RichParagraph.kt b/...itor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/RichParagraph.kt
@@ -2,6 +2,7 @@ package com.mohamedrejeb.richeditor.paragraph
 
 import androidx.compose.ui.text.ParagraphStyle
 import androidx.compose.ui.text.TextRange
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.RichSpan
 import com.mohamedrejeb.richeditor.paragraph.type.DefaultParagraph
 import com.mohamedrejeb.richeditor.paragraph.type.ParagraphType
@@ -17,6 +18,7 @@ internal class RichParagraph(
     var type: ParagraphType = DefaultParagraph(),
 ) {
 
+    @OptIn(ExperimentalRichTextApi::class)
     fun getRichSpanByTextIndex(
         paragraphIndex: Int,
         textIndex: Int,
@@ -60,6 +62,7 @@ internal class RichParagraph(
         return index to null
     }
 
+    @OptIn(ExperimentalRichTextApi::class)
     fun getRichSpanListByTextRange(
         paragraphIndex: Int,
         searchTextRange: TextRange,

diff --git a/...pose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/DefaultParagraph.kt b/...pose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/DefaultParagraph.kt
@@ -1,13 +1,15 @@
 package com.mohamedrejeb.richeditor.paragraph.type
 
 import androidx.compose.ui.text.ParagraphStyle
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.RichSpan
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 
 internal class DefaultParagraph : ParagraphType {
     override val style: ParagraphStyle =
         ParagraphStyle()
 
+    @OptIn(ExperimentalRichTextApi::class)
     override val startRichSpan: RichSpan =
         RichSpan(paragraph = RichParagraph(type = this))
 

diff --git a/...r-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedList.kt b/...r-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedList.kt
@@ -5,6 +5,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.style.TextIndent
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.RichSpan
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 
@@ -46,6 +47,7 @@ internal class OrderedList(
     override var startRichSpan: RichSpan =
         getNewStartRichSpan()
 
+    @OptIn(ExperimentalRichTextApi::class)
     private fun getNewStartRichSpan() =
         RichSpan(
             paragraph = RichParagraph(type = this),

diff --git a/...compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/UnorderedList.kt b/...compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/UnorderedList.kt
@@ -2,8 +2,8 @@ package com.mohamedrejeb.richeditor.paragraph.type
 
 import androidx.compose.ui.text.ParagraphStyle
 import androidx.compose.ui.text.style.TextIndent
-import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.RichSpan
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 
@@ -20,6 +20,7 @@ internal class UnorderedList : ParagraphType {
             )
         )
 
+    @OptIn(ExperimentalRichTextApi::class)
     override var startRichSpan: RichSpan =
         RichSpan(
             paragraph = RichParagraph(type = this),

diff --git a/.../src/commonMain/kotlin/com/mohamedrejeb/richeditor/parser/html/RichTextStateHtmlParser.kt b/.../src/commonMain/kotlin/com/mohamedrejeb/richeditor/parser/html/RichTextStateHtmlParser.kt
@@ -4,6 +4,7 @@ import androidx.compose.ui.text.SpanStyle
 import com.mohamedrejeb.ksoup.entities.KsoupEntities
 import com.mohamedrejeb.ksoup.html.parser.KsoupHtmlHandler
 import com.mohamedrejeb.ksoup.html.parser.KsoupHtmlParser
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.*
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 import com.mohamedrejeb.richeditor.paragraph.type.DefaultParagraph
@@ -18,6 +19,7 @@ import com.mohamedrejeb.richeditor.utils.fastForEachIndexed
 
 internal object RichTextStateHtmlParser : RichTextStateParser<String> {
 
+    @OptIn(ExperimentalRichTextApi::class)
     override fun encode(input: String): RichTextState {
         val openedTags = mutableListOf<Pair<String, Map<String, String>>>()
         val stringBuilder = StringBuilder()
@@ -238,6 +240,7 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
         return builder.toString()
     }
 
+    @OptIn(ExperimentalRichTextApi::class)
     private fun decodeRichSpanToHtml(richSpan: RichSpan, parentFormattingTags: List<String> = emptyList()): String {
         val stringBuilder = StringBuilder()
 
@@ -353,6 +356,7 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
     /**
      * Encodes HTML elements to [RichSpanStyle].
      */
+    @OptIn(ExperimentalRichTextApi::class)
     private fun encodeHtmlElementToRichSpanStyle(
         tagName: String,
         attributes: Map<String, String>,
@@ -369,6 +373,7 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
     /**
      * Decodes HTML elements from [RichSpanStyle].
      */
+    @OptIn(ExperimentalRichTextApi::class)
     private fun decodeHtmlElementFromRichSpanStyle(
         richSpanStyle: RichSpanStyle,
     ): Pair<String, Map<String, String>> =

diff --git a/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt b/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt
@@ -3,6 +3,7 @@ package com.mohamedrejeb.richeditor.parser.markdown
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextDecoration
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.*
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 import com.mohamedrejeb.richeditor.paragraph.type.DefaultParagraph
@@ -22,6 +23,7 @@ import org.intellij.markdown.flavours.gfm.GFMElementTypes
 
 internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
 
+    @OptIn(ExperimentalRichTextApi::class)
     override fun encode(input: String): RichTextState {
         val openedNodes = mutableListOf<ASTNode>()
         val stringBuilder = StringBuilder()
@@ -149,7 +151,7 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
 
                 currentRichSpan = currentRichSpan?.parent
             },
-            onHtml = { html ->
+            onHtml = { _ ->
                 // Todo: support HTML in markdown
             }
         )
@@ -187,6 +189,7 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
         return builder.toString()
     }
 
+    @OptIn(ExperimentalRichTextApi::class)
     private fun decodeRichSpanToMarkdown(richSpan: RichSpan): String {
         val stringBuilder = StringBuilder()
 
@@ -239,6 +242,7 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
     /**
      * Encodes Markdown elements to [RichSpanStyle].
      */
+    @OptIn(ExperimentalRichTextApi::class)
     private fun encodeMarkdownElementToRichSpanStyle(
         node: ASTNode,
         markdown: String,
@@ -269,6 +273,7 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
     /**
      * Decodes HTML elements from [RichSpan].
      */
+    @OptIn(ExperimentalRichTextApi::class)
     private fun decodeMarkdownElementFromRichSpan(
         text: String,
         richSpanStyle: RichSpanStyle,

diff --git a/...-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/ui/RichTextClipboardManager.kt b/...-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/ui/RichTextClipboardManager.kt
@@ -4,6 +4,7 @@ import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.RichSpanStyle
 import com.mohamedrejeb.richeditor.model.RichTextState
 import com.mohamedrejeb.richeditor.paragraph.type.ParagraphType.Companion.startText
@@ -27,6 +28,7 @@ internal class RichTextClipboardManager(
         return clipboardManager.getText()
     }
 
+    @OptIn(ExperimentalRichTextApi::class)
     override fun setText(annotatedString: AnnotatedString) {
         val selection = richTextState.selection
         val richTextAnnotatedString = buildAnnotatedString {

diff --git a/...-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/ui/test/DebugRichTextEditor.kt b/...-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/ui/test/DebugRichTextEditor.kt
@@ -43,7 +43,7 @@ internal fun DebugRichTextEditor(
                 .padding(8.dp),
         )
 
-        Divider(modifier = Modifier.padding(vertical = 20.dp))
+        HorizontalDivider(modifier = Modifier.padding(vertical = 20.dp))
 
         Text(
             text = "Annotation Length: ${richTextState.annotatedString.text.length}",
@@ -83,7 +83,7 @@ internal fun DebugRichTextEditor(
                     RichTextStyleTreeRepresentation(childIndex, richTextStyle, " -")
                 }
 
-                Divider(modifier = Modifier.padding(vertical = 20.dp))
+                HorizontalDivider(modifier = Modifier.padding(vertical = 20.dp))
             }
         }
     }

diff --git a/...compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/model/RichParagraphStyleTest.kt b/...compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/model/RichParagraphStyleTest.kt
@@ -2,12 +2,14 @@ package com.mohamedrejeb.richeditor.model
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.ui.text.TextRange
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class RichParagraphStyleTest {
     private val paragraph = RichParagraph(key = 0)
+    @OptIn(ExperimentalRichTextApi::class)
     private val richSpanLists get() = listOf(
         RichSpan(
             key = 0,

diff --git a/...itor-compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/model/RichSpanStyleTest.kt b/...itor-compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/model/RichSpanStyleTest.kt
@@ -1,12 +1,14 @@
 package com.mohamedrejeb.richeditor.model
 
 import androidx.compose.ui.text.TextRange
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class RichSpanTest {
     private val paragraph = RichParagraph(key = 0)
+    @OptIn(ExperimentalRichTextApi::class)
     private val richSpan get() = RichSpan(
         key = 0,
         paragraph = paragraph,

diff --git a/...ommonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/components/RichTextStyleRow.kt b/...ommonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/components/RichTextStyleRow.kt
@@ -6,6 +6,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.FormatAlignLeft
+import androidx.compose.material.icons.automirrored.outlined.FormatAlignRight
+import androidx.compose.material.icons.automirrored.outlined.FormatListBulleted
 import androidx.compose.material.icons.filled.Circle
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.Composable
@@ -20,9 +23,11 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.mohamedrejeb.richeditor.annotation.ExperimentalRichTextApi
 import com.mohamedrejeb.richeditor.model.RichTextState
 import com.mohamedrejeb.richeditor.sample.common.richeditor.SpellCheck
 
+@OptIn(ExperimentalRichTextApi::class)
 @Composable
 fun RichTextStyleRow(
     modifier: Modifier = Modifier,
@@ -42,7 +47,7 @@ fun RichTextStyleRow(
                     )
                 },
                 isSelected = state.currentParagraphStyle.textAlign == TextAlign.Left,
-                icon = Icons.Outlined.FormatAlignLeft
+                icon = Icons.AutoMirrored.Outlined.FormatAlignLeft
             )
         }
 
@@ -70,7 +75,7 @@ fun RichTextStyleRow(
                     )
                 },
                 isSelected = state.currentParagraphStyle.textAlign == TextAlign.Right,
-                icon = Icons.Outlined.FormatAlignRight
+                icon = Icons.AutoMirrored.Outlined.FormatAlignRight
             )
         }
 
@@ -189,7 +194,7 @@ fun RichTextStyleRow(
                     state.toggleUnorderedList()
                 },
                 isSelected = state.isUnorderedList,
-                icon = Icons.Outlined.FormatListBulleted,
+                icon = Icons.AutoMirrored.Outlined.FormatListBulleted,
             )
         }
 

diff --git a/...mmonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/HtmlEditorContent.kt b/...mmonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/HtmlEditorContent.kt
@@ -2,16 +2,14 @@ package com.mohamedrejeb.richeditor.sample.common.htmleditor
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.SwapHoriz
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.TextFieldValue
 import cafe.adriel.voyager.navigator.LocalNavigator
-import cafe.adriel.voyager.navigator.currentOrThrow
 import com.mohamedrejeb.richeditor.model.rememberRichTextState
-import com.mohamedrejeb.richeditor.sample.common.ui.theme.ComposeRichEditorTheme
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
@@ -39,7 +37,7 @@ fun HtmlEditorContent() {
                     IconButton(
                         onClick = { navigator?.pop() }
                     ) {
-                        Icon(Icons.Default.ArrowBack, contentDescription = "Back")
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
                     }
                 },
                 actions = {

diff --git a/.../commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/HtmlToRichText.kt b/.../commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/HtmlToRichText.kt
@@ -52,7 +52,7 @@ fun HtmlToRichText(
 
         Spacer(Modifier.width(8.dp))
 
-        Divider(
+        HorizontalDivider(
             modifier = Modifier
                 .fillMaxHeight()
                 .width(2.dp)

diff --git a/.../commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/RichTextToHtml.kt b/.../commonMain/kotlin/com/mohamedrejeb/richeditor/sample/common/htmleditor/RichTextToHtml.kt
@@ -55,7 +55,7 @@ fun RichTextToHtml(
 
         Spacer(Modifier.width(8.dp))
 
-        Divider(
+        HorizontalDivider(
             modifier = Modifier
                 .fillMaxHeight()
                 .width(2.dp)

diff --git a/.../kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/MarkdownEditorContent.kt b/.../kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/MarkdownEditorContent.kt
@@ -2,7 +2,7 @@ package com.mohamedrejeb.richeditor.sample.common.markdowneditor
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.SwapHoriz
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
@@ -11,9 +11,8 @@ import androidx.compose.ui.text.input.TextFieldValue
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.mohamedrejeb.richeditor.model.rememberRichTextState
-import com.mohamedrejeb.richeditor.sample.common.ui.theme.ComposeRichEditorTheme
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MarkdownEditorContent() {
     val navigator = LocalNavigator.currentOrThrow
@@ -39,7 +38,7 @@ fun MarkdownEditorContent() {
                     IconButton(
                         onClick = { navigator.pop() }
                     ) {
-                        Icon(Icons.Default.ArrowBack, contentDescription = "Back")
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
                     }
                 },
                 actions = {

diff --git a/...ain/kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/MarkdownToRichText.kt b/...ain/kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/MarkdownToRichText.kt
@@ -53,7 +53,7 @@ fun MarkdownToRichText(
 
         Spacer(Modifier.width(8.dp))
 
-        Divider(
+        HorizontalDivider(
             modifier = Modifier
                 .fillMaxHeight()
                 .width(2.dp)

diff --git a/...ain/kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/RichTextToMarkdown.kt b/...ain/kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/RichTextToMarkdown.kt
@@ -55,7 +55,7 @@ fun RichTextToMarkdown(
 
         Spacer(Modifier.width(8.dp))
 
-        Divider(
+        HorizontalDivider(
             modifier = Modifier
                 .fillMaxHeight()
                 .width(2.dp)