Add workaround disabling RTL bracket flipping on Samsung devices

See #206
nightkr · Jul 30, 2024 · d4c357c · d4c357c
1 parent b16c46b
commit d4c357c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/app/src/main/java/se/nullable/flickboard/ui/Key.kt b/app/src/main/java/se/nullable/flickboard/ui/Key.kt
@@ -347,7 +347,14 @@ fun KeyActionIndicator(
                         ),
                         textDirection = when (layoutTextDirection) {
                             TextDirection.LeftToRight -> androidx.compose.ui.text.style.TextDirection.Ltr
-                            TextDirection.RightToLeft -> androidx.compose.ui.text.style.TextDirection.Rtl
+                            TextDirection.RightToLeft ->
+                                when {
+                                    LocalAppSettings.current.noReverseRtlBrackets.state.value ->
+                                        androidx.compose.ui.text.style.TextDirection.Content
+
+                                    else ->
+                                        androidx.compose.ui.text.style.TextDirection.Rtl
+                                }
                         }
                     ),
                 )

diff --git a/app/src/main/java/se/nullable/flickboard/ui/Keyboard.kt b/app/src/main/java/se/nullable/flickboard/ui/Keyboard.kt
@@ -96,6 +96,7 @@ fun Keyboard(
     val toneConfig = rememberUpdatedState(toneMode.value.config)
     val backgroundImage = appSettings.backgroundImage.state
     val keyboardMargin = appSettings.keyboardMargin.state
+    val noReverseRtlBrackets = appSettings.noReverseRtlBrackets.state
     var modifierState: ModifierState by remember { mutableStateOf(ModifierState()) }
     LaunchedEffect(modifierState) {
         onModifierStateUpdated(modifierState)
@@ -198,7 +199,10 @@ fun Keyboard(
                 .let {
                     when (layoutState.value.textDirection) {
                         TextDirection.LeftToRight -> it
-                        TextDirection.RightToLeft -> it.flipBrackets()
+                        TextDirection.RightToLeft -> when {
+                            noReverseRtlBrackets.value -> it
+                            else -> it.flipBrackets()
+                        }
                     }
                 }
         }

diff --git a/app/src/main/java/se/nullable/flickboard/ui/Settings.kt b/app/src/main/java/se/nullable/flickboard/ui/Settings.kt
@@ -117,6 +117,7 @@ import se.nullable.flickboard.model.layouts.messageaseNumericPhoneLayer
 import se.nullable.flickboard.model.layouts.miniNumbersCalculatorLayer
 import se.nullable.flickboard.model.layouts.miniNumbersPhoneLayer
 import se.nullable.flickboard.ui.theme.Typography
+import se.nullable.flickboard.ui.util.isSamsungDevice
 import se.nullable.flickboard.util.Boxed
 import se.nullable.flickboard.util.MaterialToneMode
 import java.io.FileOutputStream
@@ -1136,6 +1137,14 @@ class AppSettings(val ctx: SettingsContext) {
         render = { String.format(locale = Locale.getDefault(), "%.2fs", it) }
     )
 
+    val noReverseRtlBrackets = Setting.Bool(
+        key = "noReverseRtlBrackets",
+        label = "Do not reverse brackets in right-to-left languages",
+        defaultValue = isSamsungDevice,
+        ctx = ctx,
+        description = "This is required for the correct brackets to be typed on some devices (especially Samsung)",
+    )
+
     // Pseudo-option used to store history
     val emojiHistory =
         Setting.Text(key = "emojiHistory", label = "Emoji history", defaultValue = "", ctx = ctx)
@@ -1225,7 +1234,8 @@ class AppSettings(val ctx: SettingsContext) {
                 settings = listOf(
                     dropLastGesturePoint,
                     ignoreJumpsLongerThanPx,
-                    flicksMustBeLongerThanSeconds
+                    flicksMustBeLongerThanSeconds,
+                    noReverseRtlBrackets,
                 ),
             ),
             SettingsSection(

diff --git a/app/src/main/java/se/nullable/flickboard/ui/util/Workarounds.kt b/app/src/main/java/se/nullable/flickboard/ui/util/Workarounds.kt
@@ -0,0 +1,5 @@
+package se.nullable.flickboard.ui.util
+
+import android.os.Build
+
+val isSamsungDevice = Build.MANUFACTURER == "samsung"