From f704dab97c7cecd9c881a04549ceec43989f89fa Mon Sep 17 00:00:00 2001 From: sspanak Date: Sat, 10 Feb 2024 19:36:38 +0200 Subject: [PATCH] Backspace is properly mirrored for RTL languages --- src/io/github/sspanak/tt9/languages/Characters.java | 8 ++++++-- .../sspanak/tt9/ui/main/keys/SoftBackspaceKey.java | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/io/github/sspanak/tt9/languages/Characters.java b/src/io/github/sspanak/tt9/languages/Characters.java index 34ff9d62..321f98f3 100644 --- a/src/io/github/sspanak/tt9/languages/Characters.java +++ b/src/io/github/sspanak/tt9/languages/Characters.java @@ -54,14 +54,18 @@ public class Characters { )) )); + public static boolean noEmojiSupported() { + return Build.VERSION.SDK_INT < Build.VERSION_CODES.M; + } + public static int getEmojiLevels() { - return (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 1 : Emoji.size(); + return noEmojiSupported() ? 1 : Emoji.size(); } public static ArrayList getEmoji(int level) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + if (noEmojiSupported()) { return new ArrayList<>(TextEmoticons); } diff --git a/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java b/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java index 5f869ffa..38cd2ba8 100644 --- a/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java +++ b/src/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java @@ -3,6 +3,9 @@ package io.github.sspanak.tt9.ui.main.keys; import android.content.Context; import android.util.AttributeSet; +import io.github.sspanak.tt9.languages.Characters; +import io.github.sspanak.tt9.languages.Language; + public class SoftBackspaceKey extends SoftKey { public SoftBackspaceKey(Context context) { @@ -31,4 +34,14 @@ public class SoftBackspaceKey extends SoftKey { final protected boolean handleRelease() { return false; } + + @Override + protected String getTitle() { + if (Characters.noEmojiSupported()) { + return "Del"; + } + + Language language = getCurrentLanguage(); + return language != null && (language.isArabic() || language.isHebrew()) ? "⌦" : "⌫"; + } }