From 5a43fba3d5b6fecced2a1b7e31be2d463981ee80 Mon Sep 17 00:00:00 2001 From: sspanak Date: Wed, 6 Mar 2024 10:12:45 +0200 Subject: [PATCH] Preferences cleanup * DictionariesScreen -> LanguagesScreen * reorganized the Preference Items * removed unnecessary public access * Load Dictionary -> Load Selected --- .../tt9/preferences/PreferencesActivity.java | 16 ++++++++-------- .../tt9/preferences/SettingsStore.java | 2 +- .../screens/MainSettingsScreen.java | 4 ++-- .../{ => appearance}/AppearanceScreen.java | 4 ++-- .../appearance}/ItemSelectTheme.java | 7 ++++--- .../screens/{ => debug}/DebugScreen.java | 4 ++-- .../debug}/ItemLogLevel.java | 7 ++++--- .../screens/{ => hotkeys}/HotkeysScreen.java | 5 ++--- .../hotkeys}/ItemResetKeys.java | 7 ++++--- .../hotkeys}/SectionKeymap.java | 2 +- .../keypad}/ItemSelectZeroKeyCharacter.java | 6 +++--- .../screens/{ => keypad}/KeyPadScreen.java | 4 ++-- .../languages}/ItemExportAbstract.java | 7 ++++--- .../languages}/ItemExportCustomWords.java | 6 +++--- .../languages}/ItemExportDictionary.java | 8 +++++--- .../languages}/ItemLoadDictionary.java | 7 ++++--- .../languages}/ItemSelectLanguage.java | 8 ++++---- .../languages}/ItemTruncateAll.java | 7 ++++--- .../languages}/ItemTruncateUnselected.java | 6 +++--- .../LanguagesScreen.java} | 19 +++++++------------ .../setup}/ItemKeyPadDebounceTime.java | 7 ++++--- .../setup}/ItemSelectGlobalKeyboard.java | 7 ++++--- .../setup}/ItemSetDefaultGlobalKeyboard.java | 7 ++++--- .../screens/{ => setup}/SetupScreen.java | 6 ++---- .../tt9/ui/DictionaryNotification.java | 4 ++-- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values-uk/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/prefs.xml | 4 ++-- ...onaries.xml => prefs_screen_languages.xml} | 0 38 files changed, 100 insertions(+), 97 deletions(-) rename app/src/main/java/io/github/sspanak/tt9/preferences/screens/{ => appearance}/AppearanceScreen.java (84%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/appearance}/ItemSelectTheme.java (82%) rename app/src/main/java/io/github/sspanak/tt9/preferences/screens/{ => debug}/DebugScreen.java (96%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/debug}/ItemLogLevel.java (80%) rename app/src/main/java/io/github/sspanak/tt9/preferences/screens/{ => hotkeys}/HotkeysScreen.java (89%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/hotkeys}/ItemResetKeys.java (72%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/hotkeys}/SectionKeymap.java (98%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/keypad}/ItemSelectZeroKeyCharacter.java (90%) rename app/src/main/java/io/github/sspanak/tt9/preferences/screens/{ => keypad}/KeyPadScreen.java (84%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemExportAbstract.java (88%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemExportCustomWords.java (79%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemExportDictionary.java (86%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemLoadDictionary.java (88%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemSelectLanguage.java (90%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemTruncateAll.java (82%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/languages}/ItemTruncateUnselected.java (80%) rename app/src/main/java/io/github/sspanak/tt9/preferences/screens/{DictionariesScreen.java => languages/LanguagesScreen.java} (77%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/setup}/ItemKeyPadDebounceTime.java (74%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/setup}/ItemSelectGlobalKeyboard.java (68%) rename app/src/main/java/io/github/sspanak/tt9/preferences/{items => screens/setup}/ItemSetDefaultGlobalKeyboard.java (57%) rename app/src/main/java/io/github/sspanak/tt9/preferences/screens/{ => setup}/SetupScreen.java (88%) rename app/src/main/res/xml/{prefs_screen_dictionaries.xml => prefs_screen_languages.xml} (100%) 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 2bd3c26c..3bfcea98 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 @@ -20,15 +20,15 @@ import io.github.sspanak.tt9.db.WordStoreAsync; import io.github.sspanak.tt9.ime.helpers.InputModeValidator; import io.github.sspanak.tt9.ime.helpers.SystemSettings; import io.github.sspanak.tt9.preferences.helpers.Hotkeys; -import io.github.sspanak.tt9.preferences.screens.AppearanceScreen; import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; -import io.github.sspanak.tt9.preferences.screens.DebugScreen; -import io.github.sspanak.tt9.preferences.screens.DictionariesScreen; -import io.github.sspanak.tt9.preferences.screens.HotkeysScreen; -import io.github.sspanak.tt9.preferences.screens.KeyPadScreen; import io.github.sspanak.tt9.preferences.screens.MainSettingsScreen; -import io.github.sspanak.tt9.preferences.screens.SetupScreen; import io.github.sspanak.tt9.preferences.screens.UsageStatsScreen; +import io.github.sspanak.tt9.preferences.screens.appearance.AppearanceScreen; +import io.github.sspanak.tt9.preferences.screens.debug.DebugScreen; +import io.github.sspanak.tt9.preferences.screens.hotkeys.HotkeysScreen; +import io.github.sspanak.tt9.preferences.screens.keypad.KeyPadScreen; +import io.github.sspanak.tt9.preferences.screens.languages.LanguagesScreen; +import io.github.sspanak.tt9.preferences.screens.setup.SetupScreen; public class PreferencesActivity extends AppCompatActivity implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback { public SettingsStore settings; @@ -110,12 +110,12 @@ public class PreferencesActivity extends AppCompatActivity implements Preference return new AppearanceScreen(this); case DebugScreen.NAME: return new DebugScreen(this); - case DictionariesScreen.NAME: - return new DictionariesScreen(this); case HotkeysScreen.NAME: return new HotkeysScreen(this); case KeyPadScreen.NAME: return new KeyPadScreen(this); + case LanguagesScreen.NAME: + return new LanguagesScreen(this); case SetupScreen.NAME: return new SetupScreen(this); case UsageStatsScreen.NAME: diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java b/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java index 9cd6805a..e6f78c19 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/SettingsStore.java @@ -16,7 +16,7 @@ import java.util.Set; import io.github.sspanak.tt9.Logger; import io.github.sspanak.tt9.ime.modes.InputMode; import io.github.sspanak.tt9.languages.LanguageCollection; -import io.github.sspanak.tt9.preferences.items.SectionKeymap; +import io.github.sspanak.tt9.preferences.screens.hotkeys.SectionKeymap; public class SettingsStore { diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java index 253b38bf..0a8985d3 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java @@ -92,8 +92,8 @@ public class MainSettingsScreen extends BaseScreenFragment { ArrayList screens = new ArrayList<>(Arrays.asList( findPreference("screen_appearance"), - findPreference("screen_dictionaries"), - findPreference("screen_keypad") + findPreference("screen_keypad"), + findPreference("screen_languages") )); for (Preference goToScreen : screens) { diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/AppearanceScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java similarity index 84% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/AppearanceScreen.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java index baee3a8a..5209e0b0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/AppearanceScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java @@ -1,8 +1,8 @@ -package io.github.sspanak.tt9.preferences.screens; +package io.github.sspanak.tt9.preferences.screens.appearance; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.PreferencesActivity; -import io.github.sspanak.tt9.preferences.items.ItemSelectTheme; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; public class AppearanceScreen extends BaseScreenFragment { final public static String NAME = "Appearance"; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectTheme.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemSelectTheme.java similarity index 82% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectTheme.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemSelectTheme.java index a9b77762..0eeb8496 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectTheme.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemSelectTheme.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.appearance; import android.content.Context; @@ -9,13 +9,14 @@ import androidx.preference.Preference; import java.util.LinkedHashMap; import io.github.sspanak.tt9.R; +import io.github.sspanak.tt9.preferences.items.ItemDropDown; -public class ItemSelectTheme extends ItemDropDown { +class ItemSelectTheme extends ItemDropDown { public static final String NAME = "pref_theme"; private final Context context; - public ItemSelectTheme(Context context, DropDownPreference item) { + ItemSelectTheme(Context context, DropDownPreference item) { super(item); this.context = context; } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/DebugScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/DebugScreen.java similarity index 96% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/DebugScreen.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/DebugScreen.java index ab82d52d..b6c10f32 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/DebugScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/DebugScreen.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.screens; +package io.github.sspanak.tt9.preferences.screens.debug; import android.content.ClipData; import android.content.ClipboardManager; @@ -15,7 +15,7 @@ import java.io.InputStreamReader; import io.github.sspanak.tt9.Logger; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.PreferencesActivity; -import io.github.sspanak.tt9.preferences.items.ItemLogLevel; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; import io.github.sspanak.tt9.ui.UI; public class DebugScreen extends BaseScreenFragment { diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemLogLevel.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemLogLevel.java similarity index 80% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemLogLevel.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemLogLevel.java index 3f735444..9d258cf0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemLogLevel.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/debug/ItemLogLevel.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.debug; import android.util.Log; @@ -8,11 +8,12 @@ import androidx.preference.Preference; import java.util.LinkedHashMap; import io.github.sspanak.tt9.Logger; +import io.github.sspanak.tt9.preferences.items.ItemDropDown; -public class ItemLogLevel extends ItemDropDown { +class ItemLogLevel extends ItemDropDown { public static final String NAME = "pref_log_level"; - public ItemLogLevel(DropDownPreference item) { + ItemLogLevel(DropDownPreference item) { super(item); } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java similarity index 89% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java index 4d091c5c..b0c62055 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/HotkeysScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java @@ -1,13 +1,12 @@ -package io.github.sspanak.tt9.preferences.screens; +package io.github.sspanak.tt9.preferences.screens.hotkeys; import androidx.preference.DropDownPreference; import java.util.Arrays; import io.github.sspanak.tt9.R; -import io.github.sspanak.tt9.preferences.items.ItemResetKeys; import io.github.sspanak.tt9.preferences.PreferencesActivity; -import io.github.sspanak.tt9.preferences.items.SectionKeymap; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; public class HotkeysScreen extends BaseScreenFragment { final public static String NAME = "Hotkeys"; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemResetKeys.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/ItemResetKeys.java similarity index 72% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemResetKeys.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/ItemResetKeys.java index c712e63b..f4b793ec 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemResetKeys.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/ItemResetKeys.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.hotkeys; import android.content.Context; @@ -7,10 +7,11 @@ import androidx.preference.Preference; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.SettingsStore; import io.github.sspanak.tt9.preferences.helpers.Hotkeys; +import io.github.sspanak.tt9.preferences.items.ItemClickable; import io.github.sspanak.tt9.ui.UI; -public class ItemResetKeys extends ItemClickable { +class ItemResetKeys extends ItemClickable { public static final String NAME = "reset_keys"; private final Context context; @@ -18,7 +19,7 @@ public class ItemResetKeys extends ItemClickable { private final SettingsStore settings; - public ItemResetKeys(Preference item, Context context, SettingsStore settings, SectionKeymap dropdowns) { + ItemResetKeys(Preference item, Context context, SettingsStore settings, SectionKeymap dropdowns) { super(item); this.context = context; this.dropdowns = dropdowns; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/SectionKeymap.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java similarity index 98% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/SectionKeymap.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java index 95231593..896cc305 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/SectionKeymap.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/SectionKeymap.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.hotkeys; import android.content.Context; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectZeroKeyCharacter.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectZeroKeyCharacter.java similarity index 90% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectZeroKeyCharacter.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectZeroKeyCharacter.java index 4a9b8f93..9b55e20f 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectZeroKeyCharacter.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/ItemSelectZeroKeyCharacter.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.keypad; import android.content.Context; import android.content.res.Resources; @@ -10,13 +10,13 @@ import java.util.LinkedHashMap; import io.github.sspanak.tt9.Logger; import io.github.sspanak.tt9.R; -public class ItemSelectZeroKeyCharacter { +class ItemSelectZeroKeyCharacter { public static final String NAME = "pref_double_zero_char"; private final DropDownPreference item; private final LinkedHashMap KEYS = new LinkedHashMap<>(); - public ItemSelectZeroKeyCharacter(DropDownPreference dropDown, Context context) { + ItemSelectZeroKeyCharacter(DropDownPreference dropDown, Context context) { this.item = dropDown; Resources resources = context.getResources(); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/KeyPadScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java similarity index 84% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/KeyPadScreen.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java index b5564507..9853049b 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/KeyPadScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/keypad/KeyPadScreen.java @@ -1,8 +1,8 @@ -package io.github.sspanak.tt9.preferences.screens; +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.ItemSelectZeroKeyCharacter; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; public class KeyPadScreen extends BaseScreenFragment { final public static String NAME = "KeyPad"; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportAbstract.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportAbstract.java similarity index 88% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportAbstract.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportAbstract.java index 61c0bbe1..edbb0ce0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportAbstract.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportAbstract.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import android.app.Activity; @@ -6,14 +6,15 @@ import androidx.preference.Preference; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.db.exporter.AbstractExporter; +import io.github.sspanak.tt9.preferences.items.ItemClickable; import io.github.sspanak.tt9.ui.DictionaryNotification; -abstract public class ItemExportAbstract extends ItemClickable { +abstract class ItemExportAbstract extends ItemClickable { final protected Activity activity; final private Runnable onStart; final private Runnable onFinish; - public ItemExportAbstract(Preference item, Activity activity, Runnable onStart, Runnable onFinish) { + ItemExportAbstract(Preference item, Activity activity, Runnable onStart, Runnable onFinish) { super(item); this.activity = activity; this.onStart = onStart; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportCustomWords.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportCustomWords.java similarity index 79% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportCustomWords.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportCustomWords.java index 2bbe057e..71952374 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportCustomWords.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportCustomWords.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import android.app.Activity; @@ -7,11 +7,11 @@ import androidx.preference.Preference; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.db.exporter.CustomWordsExporter; -public class ItemExportCustomWords extends ItemExportAbstract { +class ItemExportCustomWords extends ItemExportAbstract { final public static String NAME = "dictionary_export_custom"; - public ItemExportCustomWords(Preference item, Activity activity, Runnable onStart, Runnable onFinish) { + ItemExportCustomWords(Preference item, Activity activity, Runnable onStart, Runnable onFinish) { super(item, activity, onStart, onFinish); } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportDictionary.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportDictionary.java similarity index 86% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportDictionary.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportDictionary.java index 460a9348..6174904f 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemExportDictionary.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemExportDictionary.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import android.app.Activity; @@ -11,17 +11,18 @@ import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.preferences.SettingsStore; -public class ItemExportDictionary extends ItemExportAbstract { +class ItemExportDictionary extends ItemExportAbstract { final public static String NAME = "dictionary_export"; protected final SettingsStore settings; - public ItemExportDictionary(Preference item, Activity activity, SettingsStore settings, Runnable onStart, Runnable onFinish) { + ItemExportDictionary(Preference item, Activity activity, SettingsStore settings, Runnable onStart, Runnable onFinish) { super(item, activity, onStart, onFinish); this.settings = settings; } + @Override public ItemExportAbstract refreshStatus() { if (item != null) { @@ -30,6 +31,7 @@ public class ItemExportDictionary extends ItemExportAbstract { return super.refreshStatus(); } + @Override protected DictionaryExporter getExporter() { return DictionaryExporter.getInstance(); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemLoadDictionary.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemLoadDictionary.java similarity index 88% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemLoadDictionary.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemLoadDictionary.java index 7fa788f5..ef305f1f 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemLoadDictionary.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemLoadDictionary.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import android.content.Context; import android.os.Bundle; @@ -12,11 +12,12 @@ import io.github.sspanak.tt9.db.DictionaryLoader; import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.preferences.SettingsStore; +import io.github.sspanak.tt9.preferences.items.ItemClickable; import io.github.sspanak.tt9.ui.DictionaryLoadingBar; import io.github.sspanak.tt9.ui.UI; -public class ItemLoadDictionary extends ItemClickable { +class ItemLoadDictionary extends ItemClickable { public final static String NAME = "dictionary_load"; private final Context context; @@ -28,7 +29,7 @@ public class ItemLoadDictionary extends ItemClickable { private final DictionaryLoadingBar progressBar; - public ItemLoadDictionary(Preference item, Context context, SettingsStore settings, Runnable onStart, Runnable onFinish) { + ItemLoadDictionary(Preference item, Context context, SettingsStore settings, Runnable onStart, Runnable onFinish) { super(item); this.context = context; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectLanguage.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemSelectLanguage.java similarity index 90% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectLanguage.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemSelectLanguage.java index 169c59d7..4e612bb6 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectLanguage.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemSelectLanguage.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import android.content.Context; @@ -13,14 +13,14 @@ import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.preferences.SettingsStore; import io.github.sspanak.tt9.ui.UI; -public class ItemSelectLanguage { +class ItemSelectLanguage { public static final String NAME = "pref_languages"; private final Context context; private final SettingsStore settings; private final MultiSelectListPreference item; - public ItemSelectLanguage(Context context, MultiSelectListPreference multiSelect, SettingsStore settings) { + ItemSelectLanguage(Context context, MultiSelectListPreference multiSelect, SettingsStore settings) { this.context = context; this.item = multiSelect; this.settings = settings; @@ -63,7 +63,7 @@ public class ItemSelectLanguage { item.setOnPreferenceChangeListener((preference, newValue) -> { @SuppressWarnings("unchecked") HashSet newLanguages = (HashSet) newValue; - if (newLanguages.size() == 0) { + if (newLanguages.isEmpty()) { newLanguages.add("1"); } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemTruncateAll.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemTruncateAll.java similarity index 82% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemTruncateAll.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemTruncateAll.java index 9db54553..076f59d8 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemTruncateAll.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemTruncateAll.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import androidx.preference.Preference; @@ -9,10 +9,11 @@ import io.github.sspanak.tt9.db.WordStoreAsync; import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.preferences.PreferencesActivity; +import io.github.sspanak.tt9.preferences.items.ItemClickable; import io.github.sspanak.tt9.ui.UI; -public class ItemTruncateAll extends ItemClickable { +class ItemTruncateAll extends ItemClickable { public static final String NAME = "dictionary_truncate"; protected final PreferencesActivity activity; @@ -20,7 +21,7 @@ public class ItemTruncateAll extends ItemClickable { private final Runnable onFinish; - public ItemTruncateAll(Preference item, PreferencesActivity activity, Runnable onStart, Runnable onFinish) { + ItemTruncateAll(Preference item, PreferencesActivity activity, Runnable onStart, Runnable onFinish) { super(item); this.activity = activity; this.onStart = onStart; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemTruncateUnselected.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemTruncateUnselected.java similarity index 80% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemTruncateUnselected.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemTruncateUnselected.java index 15f2ffb2..751e27e5 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemTruncateUnselected.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemTruncateUnselected.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.languages; import androidx.preference.Preference; @@ -11,13 +11,13 @@ import io.github.sspanak.tt9.preferences.PreferencesActivity; import io.github.sspanak.tt9.preferences.SettingsStore; -public class ItemTruncateUnselected extends ItemTruncateAll { +class ItemTruncateUnselected extends ItemTruncateAll { public static final String NAME = "dictionary_truncate_unselected"; private final SettingsStore settings; - public ItemTruncateUnselected(Preference item, PreferencesActivity context, SettingsStore settings, Runnable onStart, Runnable onFinish) { + ItemTruncateUnselected(Preference item, PreferencesActivity context, SettingsStore settings, Runnable onStart, Runnable onFinish) { super(item, context, onStart, onFinish); this.settings = settings; } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/DictionariesScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/LanguagesScreen.java similarity index 77% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/DictionariesScreen.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/LanguagesScreen.java index aaa31f53..1377ab81 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/DictionariesScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/LanguagesScreen.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.screens; +package io.github.sspanak.tt9.preferences.screens.languages; import java.util.ArrayList; @@ -8,15 +8,10 @@ import io.github.sspanak.tt9.db.exporter.CustomWordsExporter; import io.github.sspanak.tt9.db.exporter.DictionaryExporter; import io.github.sspanak.tt9.preferences.PreferencesActivity; import io.github.sspanak.tt9.preferences.items.ItemClickable; -import io.github.sspanak.tt9.preferences.items.ItemExportCustomWords; -import io.github.sspanak.tt9.preferences.items.ItemExportDictionary; -import io.github.sspanak.tt9.preferences.items.ItemLoadDictionary; -import io.github.sspanak.tt9.preferences.items.ItemSelectLanguage; -import io.github.sspanak.tt9.preferences.items.ItemTruncateAll; -import io.github.sspanak.tt9.preferences.items.ItemTruncateUnselected; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; -public class DictionariesScreen extends BaseScreenFragment { - public static final String NAME = "Dictionaries"; +public class LanguagesScreen extends BaseScreenFragment { + public static final String NAME = "Languages"; private final ArrayList clickables = new ArrayList<>(); @@ -24,12 +19,12 @@ public class DictionariesScreen extends BaseScreenFragment { private ItemExportDictionary exportDictionaryItem; private ItemExportCustomWords exportCustomWordsItem; - public DictionariesScreen() { init(); } - public DictionariesScreen(PreferencesActivity activity) { init(activity); } + public LanguagesScreen() { init(); } + public LanguagesScreen(PreferencesActivity activity) { init(activity); } @Override public String getName() { return NAME; } @Override protected int getTitle() { return R.string.pref_choose_languages; } - @Override protected int getXml() { return R.xml.prefs_screen_dictionaries; } + @Override protected int getXml() { return R.xml.prefs_screen_languages; } @Override protected void onCreate() { diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemKeyPadDebounceTime.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemKeyPadDebounceTime.java similarity index 74% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemKeyPadDebounceTime.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemKeyPadDebounceTime.java index 575ab72c..4b6e7618 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemKeyPadDebounceTime.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemKeyPadDebounceTime.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.setup; import android.content.Context; @@ -7,13 +7,14 @@ import androidx.preference.DropDownPreference; import java.util.LinkedHashMap; import io.github.sspanak.tt9.R; +import io.github.sspanak.tt9.preferences.items.ItemDropDown; -public class ItemKeyPadDebounceTime extends ItemDropDown { +class ItemKeyPadDebounceTime extends ItemDropDown { public static final String NAME = "pref_key_pad_debounce_time"; private final Context context; - public ItemKeyPadDebounceTime(Context context, DropDownPreference item) { + ItemKeyPadDebounceTime(Context context, DropDownPreference item) { super(item); this.context = context; } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectGlobalKeyboard.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java similarity index 68% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectGlobalKeyboard.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java index 1c8d24fc..71f591d4 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSelectGlobalKeyboard.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java @@ -1,4 +1,4 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.setup; import android.content.Intent; import android.provider.Settings; @@ -6,12 +6,13 @@ import android.provider.Settings; import androidx.preference.Preference; import io.github.sspanak.tt9.preferences.PreferencesActivity; +import io.github.sspanak.tt9.preferences.items.ItemClickable; -public class ItemSelectGlobalKeyboard extends ItemClickable { +class ItemSelectGlobalKeyboard extends ItemClickable { private final Intent clickIntent; private final PreferencesActivity activity; - public ItemSelectGlobalKeyboard(Preference item, PreferencesActivity prefs) { + ItemSelectGlobalKeyboard(Preference item, PreferencesActivity prefs) { super(item); this.activity = prefs; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSetDefaultGlobalKeyboard.java similarity index 57% rename from app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSetDefaultGlobalKeyboard.java index 31a59d54..aaecaa64 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/items/ItemSetDefaultGlobalKeyboard.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSetDefaultGlobalKeyboard.java @@ -1,14 +1,15 @@ -package io.github.sspanak.tt9.preferences.items; +package io.github.sspanak.tt9.preferences.screens.setup; import androidx.preference.Preference; import io.github.sspanak.tt9.preferences.PreferencesActivity; +import io.github.sspanak.tt9.preferences.items.ItemClickable; import io.github.sspanak.tt9.ui.UI; -public class ItemSetDefaultGlobalKeyboard extends ItemClickable { +class ItemSetDefaultGlobalKeyboard extends ItemClickable { private final PreferencesActivity activity; - public ItemSetDefaultGlobalKeyboard(Preference item, PreferencesActivity prefs) { + ItemSetDefaultGlobalKeyboard(Preference item, PreferencesActivity prefs) { super(item); this.activity = prefs; } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/SetupScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/SetupScreen.java similarity index 88% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/SetupScreen.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/SetupScreen.java index 32a22b1e..b8420151 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/SetupScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/SetupScreen.java @@ -1,13 +1,11 @@ -package io.github.sspanak.tt9.preferences.screens; +package io.github.sspanak.tt9.preferences.screens.setup; import androidx.preference.Preference; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.ime.helpers.SystemSettings; import io.github.sspanak.tt9.preferences.PreferencesActivity; -import io.github.sspanak.tt9.preferences.items.ItemKeyPadDebounceTime; -import io.github.sspanak.tt9.preferences.items.ItemSelectGlobalKeyboard; -import io.github.sspanak.tt9.preferences.items.ItemSetDefaultGlobalKeyboard; +import io.github.sspanak.tt9.preferences.screens.BaseScreenFragment; public class SetupScreen extends BaseScreenFragment { final public static String NAME = "Setup"; diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/DictionaryNotification.java b/app/src/main/java/io/github/sspanak/tt9/ui/DictionaryNotification.java index 95e56cf4..82741bde 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/DictionaryNotification.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/DictionaryNotification.java @@ -13,7 +13,7 @@ import androidx.core.app.NotificationCompat; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.PreferencesActivity; -import io.github.sspanak.tt9.preferences.screens.DictionariesScreen; +import io.github.sspanak.tt9.preferences.screens.languages.LanguagesScreen; public abstract class DictionaryNotification { private static DictionaryNotification self; @@ -57,7 +57,7 @@ public abstract class DictionaryNotification { private PendingIntent createNavigationIntent(Context context) { Intent intent = new Intent(context, PreferencesActivity.class); - intent.putExtra("screen", DictionariesScreen.NAME); + intent.putExtra("screen", LanguagesScreen.NAME); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); return PendingIntent.getActivity(context, 0, intent,PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index b5a980c0..202a5875 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -22,7 +22,7 @@ Зареждането на речник приключи. Зареждане на речник (%1$s)… Моля, изчакайте да завърши зареждането на речник. - Зареди речник + Зареди избраните Неуспешно зареждане. Липсва речник за „%1$s“. Речникът е изтрит успешно. Режим АБВ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6c0b61b1..f8172622 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -17,7 +17,7 @@ Lade Wörterbuch (%1$s)… Bitte warten Sie, bis das Wörterbuch geladen ist. - Wörterbuch laden + Ausgewählte laden Wird nicht geladen. Wörterbuch für \"%1$s\" nicht gefunden. Kompatibilität Lade Wörterbuch diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index df486abc..c85c2488 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -27,7 +27,7 @@ Selecciona teclado predeterminado Nueva línea Por favor, espera a que se cargue el diccionario. - Cargar diccionario + Cargar los seleccionados Cargando diccionario Cargando diccionario (%1$s)… Acerca de esta aplicación diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 423a6b38..d39258b9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -21,7 +21,7 @@ Chargement du dictionnaire terminé. Chargement du dictionnaire (%1$s)… Veuillez patienter pendant le chargement du dictionnaire. - Charger le dictionnaire + Charger les sélectionnées Echec du chargement. Dictionnaire «%1$s» introuvable. Raccourcis clavier Saisie ABC diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3a3e2620..e3aecd0f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -20,7 +20,7 @@ Caricamento del dizionario terminato. Caricamento del dizionario (%1$s)… Attendi che il dizionario si carichi, per favore. - Carica il dizionario + Carica le selezionate Impossibile caricare. Dizionario per “%1$s” non trovato. Compatibilità Scorciatoie da tastiera diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index abdc1985..7e443f5a 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -35,9 +35,9 @@ טוען מילון (%1$s)… טוען מילון אנא המתינו עד שהמילון יטען. - טעינת מילון סטטוס בחר מקלדת ברירת מחדל + טען את הנבחרים הטעינה נכשלה, לא נמצא מילון עבור \"%1$s\". מחק הכל מחק את הבלתי נבחר diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 79d89c9d..0fbf6f0e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -15,7 +15,7 @@ Talen Woordenboek laden (%1$s)… Wacht alsjeblieft tot het woordenboek geladen is. - Woordenboek laden + Geselecteerde laden Laden mislukt. Woordenboek voor %1$s niet gevonden. Woordenboek succesvol gewist. Compatibiliteit diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6e75f915..b8da6951 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -36,7 +36,7 @@ Carregando dicionário (%1$s)… Carregando dicionário… Aguarde o carregamento do dicionário, por favor - Carregar Dicionário + Carregar os selecionados Falha no carregamento. Não foi encontrado um dicionário para o idioma \"%1$s\". Limpar Dicionário Dicionário apagado com sucesso. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e3444dfa..2a46cf9c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -21,7 +21,7 @@ Загрузка словаря завершена. Загрузка словаря (%1$s)… Пожалуйста, подождите, пока словарь загружается. - Загрузить словарь + Загрузить выбранные Ошибка загрузки. Словарь «%1$s» не найден. Словарь успешно удален. Загрузка словаря @@ -79,7 +79,7 @@ Нет Автоматически Добавить слово «%1$s» в %2$s? - Экспорт выбранные + Экспортировать выбранные Экспортировать Экспорт CSV со всеми добавленными словами в: «%1$s». Ошибка экспорта diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 90cbfef9..95b8d4e3 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -57,14 +57,14 @@ Словник завантажується (%1$s)… Словник завантажується Будь ласка, дочекайтесь завантаження словника. - Завантажити словник + Завантажити вибрані Помилка завантаження. Словник для мови \"%1$s\" не знайдений. Видалити все Видалити невибрані Словник видалено. Видаляється… - Експорт вибрані + Експортувати вибрані Експортувати Експорт CSV з усіма доданими словами в: \"%1$s\". Помилка експорту diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f2a7ef59..64f14d41 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,7 +65,7 @@ Loading dictionary (%1$s)… Loading dictionary Please wait for the dictionary to load. - Load Dictionary + Load Selected Loading failed. Dictionary for \"%1$s\" not found. Delete All Delete Unselected diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index 41ca5791..1a1ba09c 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -21,8 +21,8 @@ app:title="@string/pref_category_appearance" /> diff --git a/app/src/main/res/xml/prefs_screen_dictionaries.xml b/app/src/main/res/xml/prefs_screen_languages.xml similarity index 100% rename from app/src/main/res/xml/prefs_screen_dictionaries.xml rename to app/src/main/res/xml/prefs_screen_languages.xml