From 2d8ca63f0ff10ba2301e81537cecc50b84047018 Mon Sep 17 00:00:00 2001 From: sspanak Date: Wed, 15 Feb 2023 11:28:57 +0200 Subject: [PATCH] Added missing special character: | --- .../github/sspanak/tt9/ime/modes/ModePredictive.java | 6 +++--- .../languages/{Punctuation.java => Characters.java} | 11 +++++++---- .../sspanak/tt9/languages/definitions/Bulgarian.java | 6 +++--- .../sspanak/tt9/languages/definitions/English.java | 6 +++--- .../sspanak/tt9/languages/definitions/Russian.java | 6 +++--- .../sspanak/tt9/languages/definitions/Spanish.java | 4 ++-- .../sspanak/tt9/languages/definitions/Ukrainian.java | 6 +++--- 7 files changed, 24 insertions(+), 21 deletions(-) rename src/io/github/sspanak/tt9/languages/{Punctuation.java => Characters.java} (81%) diff --git a/src/io/github/sspanak/tt9/ime/modes/ModePredictive.java b/src/io/github/sspanak/tt9/ime/modes/ModePredictive.java index 579bf463..7c39fce0 100644 --- a/src/io/github/sspanak/tt9/ime/modes/ModePredictive.java +++ b/src/io/github/sspanak/tt9/ime/modes/ModePredictive.java @@ -15,7 +15,7 @@ import io.github.sspanak.tt9.ime.EmptyDatabaseWarning; import io.github.sspanak.tt9.ime.helpers.InputFieldHelper; import io.github.sspanak.tt9.languages.InvalidLanguageCharactersException; import io.github.sspanak.tt9.languages.Language; -import io.github.sspanak.tt9.languages.Punctuation; +import io.github.sspanak.tt9.languages.Characters; import io.github.sspanak.tt9.preferences.SettingsStore; public class ModePredictive extends InputMode { @@ -56,7 +56,7 @@ public class ModePredictive extends InputMode { // digitSequence limiter when selecting emoji // "11" = Emoji level 0, "111" = Emoji level 1,... up to the maximum amount of 1s StringBuilder maxEmojiSequenceBuilder = new StringBuilder(); - for (int i = 0; i <= Punctuation.getEmojiLevels(); i++) { + for (int i = 0; i <= Characters.getEmojiLevels(); i++) { maxEmojiSequenceBuilder.append("1"); } maxEmojiSequence = maxEmojiSequenceBuilder.toString(); @@ -213,7 +213,7 @@ public class ModePredictive extends InputMode { suggestions = language.getKeyCharacters(1, false); } else { digitSequence = digitSequence.length() <= maxEmojiSequence.length() ? digitSequence : maxEmojiSequence; - suggestions = Punctuation.getEmoji(digitSequence.length() - 2); + suggestions = Characters.getEmoji(digitSequence.length() - 2); } } else { return false; diff --git a/src/io/github/sspanak/tt9/languages/Punctuation.java b/src/io/github/sspanak/tt9/languages/Characters.java similarity index 81% rename from src/io/github/sspanak/tt9/languages/Punctuation.java rename to src/io/github/sspanak/tt9/languages/Characters.java index 6f0db3de..553322aa 100644 --- a/src/io/github/sspanak/tt9/languages/Punctuation.java +++ b/src/io/github/sspanak/tt9/languages/Characters.java @@ -6,13 +6,13 @@ import android.os.Build; import java.util.ArrayList; import java.util.Arrays; -public class Punctuation { - final public static ArrayList Main = new ArrayList<>(Arrays.asList( +public class Characters { + final public static ArrayList Sentence = new ArrayList<>(Arrays.asList( ",", ".", "-", "(", ")", "[", "]", "&", "~", "`", "'", ";", ":", "\"", "!", "?" )); - final public static ArrayList Secondary = new ArrayList<>(Arrays.asList( - " ", "\n", "@", "_", "#", "%", "$", "{", "}", "^", "<", ">", "\\", "/", "=", "*", "+" + final public static ArrayList Special = new ArrayList<>(Arrays.asList( + " ", "\n", "@", "_", "#", "%", "$", "{", "}", "|", "^", "<", ">", "\\", "/", "=", "*", "+" )); final private static ArrayList TextEmoticons = new ArrayList<>(Arrays.asList( @@ -20,12 +20,15 @@ public class Punctuation { )); final private static ArrayList> Emoji = new ArrayList<>(Arrays.asList( + // smile -> frown new ArrayList<>(Arrays.asList( "🙂", "😀", "🤣", "😉", "😛", "😳", "😲", "😱", "😭", "😢", "🙁" )), + // hands new ArrayList<>(Arrays.asList( "👍", "👋", "✌️", "👏", "🤝", "💪", "🤘", "🖖", "👎" )), + // emotions new ArrayList<>(Arrays.asList( "❤", "🤗", "😍", "😘", "😇", "😈", "🎉", "🤓", "😎", "🤔", "🥶", "😬" )) diff --git a/src/io/github/sspanak/tt9/languages/definitions/Bulgarian.java b/src/io/github/sspanak/tt9/languages/definitions/Bulgarian.java index 9a3b333f..00c457b1 100644 --- a/src/io/github/sspanak/tt9/languages/definitions/Bulgarian.java +++ b/src/io/github/sspanak/tt9/languages/definitions/Bulgarian.java @@ -6,7 +6,7 @@ import java.util.Locale; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.languages.Language; -import io.github.sspanak.tt9.languages.Punctuation; +import io.github.sspanak.tt9.languages.Characters; public class Bulgarian extends Language { public Bulgarian() { @@ -21,8 +21,8 @@ public class Bulgarian extends Language { isPunctuationPartOfWords = false; characterMap = new ArrayList<>(Arrays.asList( - Punctuation.Secondary, // 0 - Punctuation.Main, // 1 + Characters.Special, // 0 + Characters.Sentence, // 1 new ArrayList<>(Arrays.asList("а", "б", "в", "г")), // 2 new ArrayList<>(Arrays.asList("д", "е", "ж", "з")), // 3 new ArrayList<>(Arrays.asList("и", "й", "к", "л", "ѝ")), // 4 diff --git a/src/io/github/sspanak/tt9/languages/definitions/English.java b/src/io/github/sspanak/tt9/languages/definitions/English.java index 7756eef5..7e166e87 100644 --- a/src/io/github/sspanak/tt9/languages/definitions/English.java +++ b/src/io/github/sspanak/tt9/languages/definitions/English.java @@ -6,7 +6,7 @@ import java.util.Locale; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.languages.Language; -import io.github.sspanak.tt9.languages.Punctuation; +import io.github.sspanak.tt9.languages.Characters; public class English extends Language { public English() { @@ -21,8 +21,8 @@ public class English extends Language { isPunctuationPartOfWords = true; characterMap = new ArrayList<>(Arrays.asList( - Punctuation.Secondary, // 0 - Punctuation.Main, // 1 + Characters.Special, // 0 + Characters.Sentence, // 1 new ArrayList<>(Arrays.asList("a", "b", "c")), // 2 new ArrayList<>(Arrays.asList("d", "e", "f")), // 3 new ArrayList<>(Arrays.asList("g", "h", "i")), // 4 diff --git a/src/io/github/sspanak/tt9/languages/definitions/Russian.java b/src/io/github/sspanak/tt9/languages/definitions/Russian.java index dd9e37fb..4c512a43 100644 --- a/src/io/github/sspanak/tt9/languages/definitions/Russian.java +++ b/src/io/github/sspanak/tt9/languages/definitions/Russian.java @@ -6,7 +6,7 @@ import java.util.Locale; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.languages.Language; -import io.github.sspanak.tt9.languages.Punctuation; +import io.github.sspanak.tt9.languages.Characters; public class Russian extends Language { public Russian() { @@ -21,8 +21,8 @@ public class Russian extends Language { isPunctuationPartOfWords = false; characterMap = new ArrayList<>(Arrays.asList( - Punctuation.Secondary, // 0 - Punctuation.Main, // 1 + Characters.Special, // 0 + Characters.Sentence, // 1 new ArrayList<>(Arrays.asList("а", "б", "в", "г")), // 2 new ArrayList<>(Arrays.asList("д", "е", "ё", "ж", "з")), // 3 new ArrayList<>(Arrays.asList("и", "й", "к", "л")), // 4 diff --git a/src/io/github/sspanak/tt9/languages/definitions/Spanish.java b/src/io/github/sspanak/tt9/languages/definitions/Spanish.java index eb2892be..0e8e8d72 100644 --- a/src/io/github/sspanak/tt9/languages/definitions/Spanish.java +++ b/src/io/github/sspanak/tt9/languages/definitions/Spanish.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.Locale; import io.github.sspanak.tt9.R; -import io.github.sspanak.tt9.languages.Punctuation; +import io.github.sspanak.tt9.languages.Characters; public class Spanish extends English { public Spanish() { @@ -20,7 +20,7 @@ public class Spanish extends English { isPunctuationPartOfWords = false; - characterMap.set(1, new ArrayList<>(Punctuation.Main)); + characterMap.set(1, new ArrayList<>(Characters.Sentence)); characterMap.get(1).addAll(Arrays.asList("¡", "¿")); characterMap.get(2).addAll(Collections.singletonList("á")); diff --git a/src/io/github/sspanak/tt9/languages/definitions/Ukrainian.java b/src/io/github/sspanak/tt9/languages/definitions/Ukrainian.java index 3808a988..63fd6115 100644 --- a/src/io/github/sspanak/tt9/languages/definitions/Ukrainian.java +++ b/src/io/github/sspanak/tt9/languages/definitions/Ukrainian.java @@ -6,7 +6,7 @@ import java.util.Locale; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.languages.Language; -import io.github.sspanak.tt9.languages.Punctuation; +import io.github.sspanak.tt9.languages.Characters; public class Ukrainian extends Language { public Ukrainian() { @@ -21,8 +21,8 @@ public class Ukrainian extends Language { isPunctuationPartOfWords = true; characterMap = new ArrayList<>(Arrays.asList( - Punctuation.Secondary, // 0 - Punctuation.Main, // 1 + Characters.Special, // 0 + Characters.Sentence, // 1 new ArrayList<>(Arrays.asList("а", "б", "в", "г", "ґ")), // 2 new ArrayList<>(Arrays.asList("д", "е", "є", "ж", "з")), // 3 new ArrayList<>(Arrays.asList("и", "і", "ї", "й", "к", "л")), // 4