luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-09 16:17:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix direction of word-left & word-right with RTL scripts (#1530)

Browse source
This commit is contained in:
Eran Leshem 2025-05-03 08:02:38 +03:00 • committed by GitHub
parent 60a5fe1e03
commit 4f356086d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/helium314/keyboard/latin/RichInputMethodSubtype.kt
View file

@ -10,10 +10,11 @@ import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder
import helium314.keyboard.latin.common.Constants import helium314.keyboard.latin.common.Constants
import helium314.keyboard.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET import helium314.keyboard.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET
import helium314.keyboard.latin.common.LocaleUtils.constructLocale import helium314.keyboard.latin.common.LocaleUtils.constructLocale
import helium314.keyboard.latin.common.LocaleUtils.isRtlLanguage
import helium314.keyboard.latin.utils.LayoutType import helium314.keyboard.latin.utils.LayoutType
import helium314.keyboard.latin.utils.LayoutUtilsCustom import helium314.keyboard.latin.utils.LayoutUtilsCustom
import helium314.keyboard.latin.utils.Log import helium314.keyboard.latin.utils.Log
import helium314.keyboard.latin.utils.ScriptUtils
import helium314.keyboard.latin.utils.ScriptUtils.script
import helium314.keyboard.latin.utils.SubtypeLocaleUtils import helium314.keyboard.latin.utils.SubtypeLocaleUtils
import helium314.keyboard.latin.utils.locale import helium314.keyboard.latin.utils.locale
import java.util.Locale import java.util.Locale
@ -25,7 +26,7 @@ class RichInputMethodSubtype private constructor(val rawSubtype: InputMethodSubt
val locale: Locale = rawSubtype.locale() val locale: Locale = rawSubtype.locale()
// The subtype is considered RTL if the language of the main subtype is RTL. // The subtype is considered RTL if the language of the main subtype is RTL.
val isRtlSubtype: Boolean = isRtlLanguage(locale) val isRtlSubtype: Boolean = ScriptUtils.isScriptRtl(locale.script())
fun getExtraValueOf(key: String): String? = rawSubtype.getExtraValueOf(key) fun getExtraValueOf(key: String): String? = rawSubtype.getExtraValueOf(key)
@ -132,4 +133,4 @@ class RichInputMethodSubtype private constructor(val rawSubtype: InputMethodSubt
return DUMMY_NO_LANGUAGE_SUBTYPE return DUMMY_NO_LANGUAGE_SUBTYPE
} }
} }
} }

10
app/src/main/java/helium314/keyboard/latin/common/LocaleUtils.kt
View file

@ -171,16 +171,6 @@ object LocaleUtils {
} }
} }
@JvmStatic
fun isRtlLanguage(locale: Locale): Boolean {
val displayName = locale.getDisplayName(locale)
if (displayName.isEmpty()) return false
return when (Character.getDirectionality(displayName.codePointAt(0))) {
Character.DIRECTIONALITY_RIGHT_TO_LEFT, Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC -> true
else -> false
}
}
fun Locale.localizedDisplayName(context: Context) = fun Locale.localizedDisplayName(context: Context) =
getLocaleDisplayNameInLocale(this, context.resources, context.resources.configuration.locale()) getLocaleDisplayNameInLocale(this, context.resources, context.resources.configuration.locale())

6
app/src/main/java/helium314/keyboard/latin/inputlogic/InputLogic.java
View file

@ -765,10 +765,12 @@ public final class InputLogic {
} }
break; break;
case KeyCode.WORD_LEFT: case KeyCode.WORD_LEFT:
sendDownUpKeyEventWithMetaState(KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.META_CTRL_ON); sendDownUpKeyEventWithMetaState(ScriptUtils.isScriptRtl(currentKeyboardScript)?
KeyEvent.KEYCODE_DPAD_RIGHT : KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.META_CTRL_ON);
break; break;
case KeyCode.WORD_RIGHT: case KeyCode.WORD_RIGHT:
sendDownUpKeyEventWithMetaState(KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.META_CTRL_ON); sendDownUpKeyEventWithMetaState(ScriptUtils.isScriptRtl(currentKeyboardScript)?
KeyEvent.KEYCODE_DPAD_LEFT : KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.META_CTRL_ON);
break; break;
case KeyCode.MOVE_START_OF_PAGE: case KeyCode.MOVE_START_OF_PAGE:
sendDownUpKeyEventWithMetaState(KeyEvent.KEYCODE_MOVE_HOME, KeyEvent.META_CTRL_ON); sendDownUpKeyEventWithMetaState(KeyEvent.KEYCODE_MOVE_HOME, KeyEvent.META_CTRL_ON);

8
app/src/main/java/helium314/keyboard/latin/utils/ScriptUtils.kt
View file

@ -184,4 +184,12 @@ object ScriptUtils {
else -> SCRIPT_LATIN // use as fallback else -> SCRIPT_LATIN // use as fallback
} }
} }
@JvmStatic
fun isScriptRtl(script: String): Boolean {
return when (script) {
SCRIPT_ARABIC, SCRIPT_HEBREW -> true
else -> false
}
}
} }