From b6dd388c71521023c0380b2b1248d667163c9a8a Mon Sep 17 00:00:00 2001 From: sspanak Date: Fri, 25 Apr 2025 19:14:40 +0300 Subject: [PATCH] regression: fixed incorrect labels on 0- and 1-key in Hindi --- .../main/java/io/github/sspanak/tt9/languages/Language.java | 5 +++-- .../java/io/github/sspanak/tt9/util/chars/Characters.java | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/Language.java b/app/src/main/java/io/github/sspanak/tt9/languages/Language.java index af4f74f0..da9deefc 100644 --- a/app/src/main/java/io/github/sspanak/tt9/languages/Language.java +++ b/app/src/main/java/io/github/sspanak/tt9/languages/Language.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Locale; import io.github.sspanak.tt9.languages.exceptions.InvalidLanguageCharactersException; +import io.github.sspanak.tt9.util.chars.Characters; abstract public class Language { protected int id; @@ -77,7 +78,7 @@ abstract public class Language { boolean hasCharsOn0 = false; for (String ch : getKeyCharacters(0)) { - if (Character.isAlphabetic(ch.charAt(0))) { + if (Character.isAlphabetic(ch.charAt(0)) && !Characters.isOm(ch.charAt(0))) { hasCharsOn0 = true; break; } @@ -85,7 +86,7 @@ abstract public class Language { boolean hasCharsOn1 = false; for (String ch : getKeyCharacters(1)) { - if (Character.isAlphabetic(ch.charAt(0))) { + if (Character.isAlphabetic(ch.charAt(0)) && !Characters.isOm(ch.charAt(0))) { hasCharsOn1 = true; break; } diff --git a/app/src/main/java/io/github/sspanak/tt9/util/chars/Characters.java b/app/src/main/java/io/github/sspanak/tt9/util/chars/Characters.java index 7932dfcf..1fafb5f2 100644 --- a/app/src/main/java/io/github/sspanak/tt9/util/chars/Characters.java +++ b/app/src/main/java/io/github/sspanak/tt9/util/chars/Characters.java @@ -67,4 +67,10 @@ public class Characters extends Emoji { public static boolean isFathatan(char ch) { return ch == 0x064B; } + + public static boolean isOm(char ch) { + return + ch == 0x0950 // Devanagari + || ch == 0x0AD0; // Gujarati + } }