Remove confusing RTL options

ruslin-note · May 9, 2023 · 8fb6da7 · 8fb6da7
1 parent 32b88f6
commit 8fb6da7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/app/src/main/java/org/dianqk/ruslin/data/preference/TextDirectionPreference.kt b/app/src/main/java/org/dianqk/ruslin/data/preference/TextDirectionPreference.kt
@@ -6,15 +6,14 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.dianqk.ruslin.R
 import org.dianqk.ruslin.data.DataStoreKeys
 import org.dianqk.ruslin.data.dataStore
 
 sealed class TextDirectionPreference(val value: Int) {
     object Ltr : TextDirectionPreference(1)
     object Rtl : TextDirectionPreference(2)
-    object Content : TextDirectionPreference(3)
-    object ContentOrLtr : TextDirectionPreference(4)
-    object ContentOrRtl : TextDirectionPreference(5)
+    object Auto : TextDirectionPreference(3)
 
     fun put(context: Context, scope: CoroutineScope) {
         scope.launch {
@@ -24,33 +23,31 @@ sealed class TextDirectionPreference(val value: Int) {
         }
     }
 
-    fun toDesc(context: Context): String = getTextDirection().toString()
+    fun toDesc(context: Context): String = when (this) {
+        Ltr -> context.getString(R.string.ltr)
+        Rtl -> context.getString(R.string.rtl)
+        Auto -> context.getString(R.string.auto)
+    }
 
     fun getTextDirection(): TextDirection = when (this) {
         Ltr -> TextDirection.Ltr
         Rtl -> TextDirection.Rtl
-        Content -> TextDirection.Content
-        ContentOrLtr -> TextDirection.ContentOrLtr
-        ContentOrRtl -> TextDirection.ContentOrRtl
+        Auto -> TextDirection.Content
     }
 
     companion object {
         val default = Ltr
         val values = listOf(
             Ltr,
             Rtl,
-            Content,
-            ContentOrLtr,
-            ContentOrRtl,
+            Auto
         )
 
         fun fromPreferences(preferences: Preferences): TextDirectionPreference =
             when (preferences[DataStoreKeys.TextDirection.key]) {
                 1 -> Ltr
                 2 -> Rtl
-                3 -> Content
-                4 -> ContentOrLtr
-                5 -> ContentOrRtl
+                3 -> Auto
                 else -> default
             }
     }

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -83,4 +83,5 @@
     <string name="other">其他</string>
     <string name="content_text_direction">内容文本方向</string>
     <string name="content_text_direction_desc">笔记、标题等文本方向</string>
+    <string name="auto">自动</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -87,4 +87,7 @@
     <string name="other">Other</string>
     <string name="content_text_direction">Content Text Direction</string>
     <string name="content_text_direction_desc">Text direction of notes, titles, etc.</string>
+    <string name="rtl" translatable="false">RTL</string>
+    <string name="ltr" translatable="false">LTR</string>
+    <string name="auto">Auto</string>
 </resources>