Merge pull request #513 from MohamedRejeb/1.x

MohamedRejeb · web-flow · commit 22b29e3658d9 · 2025-02-16T21:26:04.000+01:00
Add OrderedListStyleType.Arabic
diff --git a/richeditor-compose/api/android/richeditor-compose.api b/richeditor-compose/api/android/richeditor-compose.api
@@ -232,6 +232,20 @@ public abstract interface class com/mohamedrejeb/richeditor/paragraph/type/Order
 	public abstract fun getSuffix (I)Ljava/lang/String;
 }
 
+public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Arabic : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Arabic;
+	public fun format (II)Ljava/lang/String;
+	public fun getSuffix (I)Ljava/lang/String;
+}
+
+public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$ArabicIndic : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$ArabicIndic;
+	public fun format (II)Ljava/lang/String;
+	public fun getSuffix (I)Ljava/lang/String;
+}
+
 public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
 	public static final field $stable I
 	public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal;
diff --git a/richeditor-compose/api/desktop/richeditor-compose.api b/richeditor-compose/api/desktop/richeditor-compose.api
@@ -232,6 +232,20 @@ public abstract interface class com/mohamedrejeb/richeditor/paragraph/type/Order
 	public abstract fun getSuffix (I)Ljava/lang/String;
 }
 
+public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Arabic : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Arabic;
+	public fun format (II)Ljava/lang/String;
+	public fun getSuffix (I)Ljava/lang/String;
+}
+
+public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$ArabicIndic : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
+	public static final field $stable I
+	public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$ArabicIndic;
+	public fun format (II)Ljava/lang/String;
+	public fun getSuffix (I)Ljava/lang/String;
+}
+
 public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
 	public static final field $stable I
 	public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal;
diff --git a/richeditor-compose/api/richeditor-compose.klib.api b/richeditor-compose/api/richeditor-compose.klib.api
@@ -107,6 +107,14 @@ abstract interface com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleTy
         final fun getSuffix(kotlin/Int): kotlin/String // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.Multiple.getSuffix|getSuffix(kotlin.Int){}[0]
     }
 
+    final object Arabic : com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType { // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.Arabic|null[0]
+        final fun format(kotlin/Int, kotlin/Int): kotlin/String // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.Arabic.format|format(kotlin.Int;kotlin.Int){}[0]
+    }
+
+    final object ArabicIndic : com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType { // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.ArabicIndic|null[0]
+        final fun format(kotlin/Int, kotlin/Int): kotlin/String // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.ArabicIndic.format|format(kotlin.Int;kotlin.Int){}[0]
+    }
+
     final object Decimal : com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType { // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.Decimal|null[0]
         final fun format(kotlin/Int, kotlin/Int): kotlin/String // com.mohamedrejeb.richeditor.paragraph.type/OrderedListStyleType.Decimal.format|format(kotlin.Int;kotlin.Int){}[0]
     }
@@ -366,6 +374,8 @@ final val com.mohamedrejeb.richeditor.model/com_mohamedrejeb_richeditor_model_Ri
 final val com.mohamedrejeb.richeditor.model/com_mohamedrejeb_richeditor_model_TextPaddingValues$stableprop // com.mohamedrejeb.richeditor.model/com_mohamedrejeb_richeditor_model_TextPaddingValues$stableprop|#static{}com_mohamedrejeb_richeditor_model_TextPaddingValues$stableprop[0]
 final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_DefaultParagraph$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_DefaultParagraph$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_DefaultParagraph$stableprop[0]
 final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedList$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedList$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_OrderedList$stableprop[0]
+final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Arabic$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Arabic$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Arabic$stableprop[0]
+final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_ArabicIndic$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_ArabicIndic$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_ArabicIndic$stableprop[0]
 final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Decimal$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Decimal$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Decimal$stableprop[0]
 final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerAlpha$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerAlpha$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerAlpha$stableprop[0]
 final val com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerRoman$stableprop // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerRoman$stableprop|#static{}com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerRoman$stableprop[0]
@@ -402,6 +412,8 @@ final fun com.mohamedrejeb.richeditor.model/com_mohamedrejeb_richeditor_model_Te
 final fun com.mohamedrejeb.richeditor.model/rememberRichTextState(androidx.compose.runtime/Composer?, kotlin/Int): com.mohamedrejeb.richeditor.model/RichTextState // com.mohamedrejeb.richeditor.model/rememberRichTextState|rememberRichTextState(androidx.compose.runtime.Composer?;kotlin.Int){}[0]
 final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_DefaultParagraph$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_DefaultParagraph$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_DefaultParagraph$stableprop_getter(){}[0]
 final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedList$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedList$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_OrderedList$stableprop_getter(){}[0]
+final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Arabic$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Arabic$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Arabic$stableprop_getter(){}[0]
+final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_ArabicIndic$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_ArabicIndic$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_ArabicIndic$stableprop_getter(){}[0]
 final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Decimal$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Decimal$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_Decimal$stableprop_getter(){}[0]
 final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerAlpha$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerAlpha$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerAlpha$stableprop_getter(){}[0]
 final fun com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerRoman$stableprop_getter(): kotlin/Int // com.mohamedrejeb.richeditor.paragraph.type/com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerRoman$stableprop_getter|com_mohamedrejeb_richeditor_paragraph_type_OrderedListStyleType_LowerRoman$stableprop_getter(){}[0]
diff --git a/richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType.kt b/richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType.kt
@@ -77,7 +77,22 @@ public interface OrderedListStyleType {
     }
 
     /**
-     * Lowercase letters style (a, b, c, ...)
+     * Arabic letters style (ا, ب, ج, ...)
+     */
+    public object Arabic: OrderedListStyleType {
+        internal val arabicLetters = charArrayOf(
+            'أ', 'ب', 'ج', 'د', 'ه', 'و', 'ز', 'ح', 'ط', 'ي', 'ك', 'ل', 'م',
+            'ن', 'س', 'ع', 'ف', 'ص', 'ق', 'ر', 'ش', 'ت', 'ث', 'خ', 'ذ', 'ض', 'ظ', 'غ'
+        )
+
+        override fun format(number: Int, listLevel: Int): String =
+            formatToArabic(
+                number = number,
+            )
+    }
+
+    /**
+     * Lowercase latin letters style (a, b, c, ...)
      */
     public object LowerAlpha : OrderedListStyleType {
         override fun format(number: Int, listLevel: Int): String =
@@ -88,7 +103,7 @@ public interface OrderedListStyleType {
     }
 
     /**
-     * Uppercase letters style (A, B, C, ...)
+     * Uppercase latin letters style (A, B, C, ...)
      */
     public object UpperAlpha : OrderedListStyleType {
         override fun format(number: Int, listLevel: Int): String =
@@ -176,6 +191,22 @@ public interface OrderedListStyleType {
 
     private companion object {
 
+        private fun formatToArabic(
+            number: Int,
+        ): String {
+            if (number <= 0)
+                return Arabic.arabicLetters.first().toString()
+
+            val result = StringBuilder()
+            var n = number
+            while (n > 0) {
+                val remainder = (n - 1) % 28
+                result.insert(0, Arabic.arabicLetters[remainder])
+                n = (n - 1) / 28
+            }
+            return result.toString()
+        }
+
         private fun formatToAlpha(
             number: Int,
             base: Char,
diff --git a/richeditor-compose/src/commonTest/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleTypeTest.kt b/richeditor-compose/src/commonTest/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleTypeTest.kt
@@ -24,6 +24,17 @@ class OrderedListStyleTypeTest {
         assertEquals("-١", styleType.format(-1, 1))
     }
 
+    @Test
+    fun testArabicFormat() {
+        val styleType = OrderedListStyleType.Arabic
+        assertEquals("أ", styleType.format(1, 1))
+        assertEquals("ب", styleType.format(2, 1))
+        assertEquals("غ", styleType.format(28, 1))
+        assertEquals("أأ", styleType.format(29, 1))
+        assertEquals("أب", styleType.format(30, 1))
+        assertEquals("أ", styleType.format(0, 1))
+    }
+
     @Test
     fun testLowerAlphaFormat() {
         val styleType = OrderedListStyleType.LowerAlpha
