diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java b/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java index a8db773f..f1d0f8e2 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java @@ -28,6 +28,8 @@ import io.github.sspanak.tt9.preferences.screens.keypad.KeyPadScreen; import io.github.sspanak.tt9.preferences.screens.languageSelection.LanguageSelectionScreen; import io.github.sspanak.tt9.preferences.screens.languages.LanguagesScreen; import io.github.sspanak.tt9.preferences.screens.main.MainSettingsScreen; +import io.github.sspanak.tt9.preferences.screens.modeAbc.ModeAbcScreen; +import io.github.sspanak.tt9.preferences.screens.modePredictive.ModePredictiveScreen; import io.github.sspanak.tt9.preferences.screens.setup.SetupScreen; import io.github.sspanak.tt9.ui.ActivityWithNavigation; import io.github.sspanak.tt9.util.Logger; @@ -146,6 +148,10 @@ public class PreferencesActivity extends ActivityWithNavigation implements Prefe return new LanguagesScreen(this); case LanguageSelectionScreen.NAME: return new LanguageSelectionScreen(this); + case ModePredictiveScreen.NAME: + return new ModePredictiveScreen(this); + case ModeAbcScreen.NAME: + return new ModeAbcScreen(this); case SetupScreen.NAME: return new SetupScreen(this); case UsageStatsScreen.NAME: diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java index 6dea4cd2..e67b7946 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java @@ -2,7 +2,6 @@ package io.github.sspanak.tt9.preferences.screens.keypad; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.PreferencesActivity; -import io.github.sspanak.tt9.preferences.items.ItemDropDown; import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; public class KeyPadScreen extends BaseScreenFragment { @@ -17,17 +16,7 @@ public class KeyPadScreen extends BaseScreenFragment { @Override protected void onCreate() { (new ItemHapticFeedback(findPreference(ItemHapticFeedback.NAME), activity.getSettings())).populate().enableClickHandler(); - - ItemDropDown[] items = { - new ItemSelectZeroKeyCharacter(findPreference(ItemSelectZeroKeyCharacter.NAME), activity), - new ItemSelectABCAutoAccceptTime(findPreference(ItemSelectABCAutoAccceptTime.NAME), activity), - new ItemKeyPadDebounceTime(findPreference(ItemKeyPadDebounceTime.NAME), activity) - }; - - for (ItemDropDown item : items) { - item.populate().enableClickHandler().preview(); - } - + (new ItemKeyPadDebounceTime(findPreference(ItemKeyPadDebounceTime.NAME), activity)).populate().enableClickHandler().preview(); resetFontSize(false); } } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectABCAutoAccceptTime.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modeAbc/ItemSelectAbcAutoAccceptTime.java similarity index 79% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectABCAutoAccceptTime.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/modeAbc/ItemSelectAbcAutoAccceptTime.java index 7a83dcb4..9441361a 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectABCAutoAccceptTime.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modeAbc/ItemSelectAbcAutoAccceptTime.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.screens.keypad; +package io.github.sspanak.tt9.preferences.screens.modeAbc; import android.content.Context; @@ -10,16 +10,16 @@ import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.items.ItemDropDown; -public class ItemSelectABCAutoAccceptTime extends ItemDropDown { +public class ItemSelectAbcAutoAccceptTime extends ItemDropDown { public static final String NAME = "pref_abc_auto_accept_time"; private final Context context; - public ItemSelectABCAutoAccceptTime(DropDownPreference item, Context context) { + public ItemSelectAbcAutoAccceptTime(DropDownPreference item, Context context) { super(item); this.context = context; } - public ItemSelectABCAutoAccceptTime populate() { + public ItemSelectAbcAutoAccceptTime populate() { LinkedHashMap dropDownOptions = new LinkedHashMap<>(); dropDownOptions.put("-1", context.getString(R.string.pref_abc_auto_accept_off)); dropDownOptions.put("350", context.getString(R.string.pref_abc_auto_accept_fastest)); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modeAbc/ModeAbcScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modeAbc/ModeAbcScreen.java new file mode 100644 index 00000000..885fe7c5 --- /dev/null +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modeAbc/ModeAbcScreen.java @@ -0,0 +1,23 @@ +package io.github.sspanak.tt9.preferences.screens.modeAbc; + +import io.github.sspanak.tt9.R; +import io.github.sspanak.tt9.preferences.PreferencesActivity; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; + +public class ModeAbcScreen extends BaseScreenFragment { + public static final String NAME = "ModeAbc"; + + public ModeAbcScreen() { init(); } + public ModeAbcScreen(PreferencesActivity activity) { init(activity); } + + @Override public String getName() { return NAME; } + @Override protected int getTitle() { return R.string.pref_category_abc_mode; } + @Override protected int getXml() { return R.xml.prefs_screen_mode_abc; } + + @Override + protected void onCreate() { + new ItemSelectAbcAutoAccceptTime(findPreference(ItemSelectAbcAutoAccceptTime.NAME), activity).populate().enableClickHandler().preview(); + resetFontSize(false); + } +} + diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectZeroKeyCharacter.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modePredictive/ItemSelectZeroKeyCharacter.java similarity index 93% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectZeroKeyCharacter.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/modePredictive/ItemSelectZeroKeyCharacter.java index fab06dcd..05593769 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectZeroKeyCharacter.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modePredictive/ItemSelectZeroKeyCharacter.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.screens.keypad; +package io.github.sspanak.tt9.preferences.screens.modePredictive; import android.content.Context; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modePredictive/ModePredictiveScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modePredictive/ModePredictiveScreen.java new file mode 100644 index 00000000..68b4e9eb --- /dev/null +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/modePredictive/ModePredictiveScreen.java @@ -0,0 +1,22 @@ +package io.github.sspanak.tt9.preferences.screens.modePredictive; + +import io.github.sspanak.tt9.R; +import io.github.sspanak.tt9.preferences.PreferencesActivity; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; + +public class ModePredictiveScreen extends BaseScreenFragment { + public static final String NAME = "ModePredictive"; + + public ModePredictiveScreen() { init(); } + public ModePredictiveScreen(PreferencesActivity activity) { init(activity); } + + @Override public String getName() { return NAME; } + @Override protected int getTitle() { return R.string.pref_category_predictive_mode; } + @Override protected int getXml() { return R.xml.prefs_screen_mode_predictive; } + + @Override + protected void onCreate() { + new ItemSelectZeroKeyCharacter(findPreference(ItemSelectZeroKeyCharacter.NAME), activity).populate().enableClickHandler().preview(); + resetFontSize(false); + } +} diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d40b9871..c8d3f28b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -98,6 +98,7 @@ Зареждане на речник Неуспешно изтегляне на речника за език „%1$s“. Проверете връзката с интернет. Зареждането е отменено. + Режими на писане Автоматичен избор на буква Изключен Много бърз diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0b0e063d..1fcdcbb0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -23,6 +23,7 @@ Vibrieren beim Drücken einer virtuellen Taste. Hilfe Dunkles Thema + Eingabemodi Automatische Buchstabenauswahl Aus Sehr schnell diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd04d071..56e1ea86 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -55,6 +55,7 @@ Cancelar la carga Mayúsculas automáticas Escribir la primera letra de cada frase en mayúscula. + Modos de escritura Selección automática de letra Apagada Muy rápido diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 540b59f8..77c692b6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -53,6 +53,7 @@ Échec du téléchargement du dictionnaire pour la langue « %1$s ». Vérifiez la connexion Internet. Chargement est annulé. Saisie intuitive + Modes de saisie Sélection de lettre automatique Désactivée Très rapide diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ba594cc8..683a7437 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -25,6 +25,7 @@ Vibrare alla pressione di un tasto virtuale. Aiuto Tema scuro + Modalità di digitazione Selezione automatica delle lettere Spenta Molto veloce diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 2fa14f34..fa856c00 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -27,6 +27,7 @@ בחר מקשי קיצור מקלדת + מצבי הקלדה בחירת אותיות אוטומטית כבויה מאוד מהיר diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 1b4efed0..2ae45f59 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -27,6 +27,7 @@ Mygtukai Pradiniai nustatymai + Įvedimo režimai Automatinis raidės pasirinkimas Išjungtas Labai greitas diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a8889bb5..29fd8d83 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -22,6 +22,7 @@ Trillen bij het indrukken van een virtuele toets. Helpen Donker thema + Typen modi Automatische letterselectie Uit Zeer snel diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c4769923..874b7e94 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -28,6 +28,7 @@ Teclado Configuração inicial + Modos de digitação Seleção automática de letras Desligada Muito rápido diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b49a3ba5..cb03c2e7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -51,6 +51,7 @@ Cовместимость Внешний вид Горячие клавиши + Режимы ввода Автоматический выбор буквы Выключено Очень быстро diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ce44adbb..ac6aad77 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -23,6 +23,7 @@ Sanal bir tuşa basıldığında titremek. Yardım Karanlık Tema + Yazma Modları Otomatik Harf Seçimi Devre Dışı Çok Hızlı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 63a2d283..5edc2c2c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -29,6 +29,7 @@ Клавіатура Початкові налаштування + Режими введення Автоматичний вибір літери Вимкнено Дуже швидко diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e4ce1b1b..919851cc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,15 +28,16 @@ About ABC Mode - Added Words - Delete Added Words - Compatibility Appearance + Added Words Debug Options - Predictive Mode + Delete Added Words Select Hotkeys + Compatibility Keypad + Predictive Mode Initial Setup + Typing Modes Usage Stats Automatic Letter Selection diff --git a/app/src/main/res/xml/prefs_screen_keypad.xml b/app/src/main/res/xml/prefs_screen_keypad.xml index b61840a0..b966f2fc 100644 --- a/app/src/main/res/xml/prefs_screen_keypad.xml +++ b/app/src/main/res/xml/prefs_screen_keypad.xml @@ -1,77 +1,46 @@ + android:orderingFromXml="true"> + android:fragment="io.github.sspanak.tt9.preferences.screens.hotkeys.HotkeysScreen" + android:key="screen_hotkeys" + android:title="@string/pref_category_function_keys" /> + android:defaultValue="false" + android:key="backspace_acceleration" + android:title="@string/pref_backspace_acceleration" + android:summary="@string/pref_backspace_acceleration_summary" /> + android:key="pref_haptic_feedback" + android:title="@string/pref_haptic_feedback" + android:summary="@string/pref_haptic_feedback_summary"/> - + + - - - - - - - - - - - - - - - + + android:key="pref_key_pad_debounce_time" + android:title="@string/pref_hack_key_pad_debounce_time" /> + android:defaultValue="false" + android:key="pref_upside_down_keys" + android:summary="@string/pref_upside_down_keys_summary" + android:title="@string/pref_upside_down_keys" /> diff --git a/app/src/main/res/xml/prefs_screen_mode_abc.xml b/app/src/main/res/xml/prefs_screen_mode_abc.xml new file mode 100644 index 00000000..471b6fb7 --- /dev/null +++ b/app/src/main/res/xml/prefs_screen_mode_abc.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/xml/prefs_screen_mode_predictive.xml b/app/src/main/res/xml/prefs_screen_mode_predictive.xml new file mode 100644 index 00000000..1c9f43de --- /dev/null +++ b/app/src/main/res/xml/prefs_screen_mode_predictive.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + +