Preferences cleanup

* DictionariesScreen -> LanguagesScreen

  * reorganized the Preference Items

  * removed unnecessary public access

  * Load Dictionary -> Load Selected

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:

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 {

app/src/main/java/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java

@@ -92,8 +92,8 @@ public class MainSettingsScreen extends BaseScreenFragment {
 
 		ArrayList<Preference> screens = new ArrayList<>(Arrays.asList(
 			findPreference("screen_appearance"),
-			findPreference("screen_dictionaries"),
+			findPreference("screen_keypad"),
-			findPreference("screen_keypad")
+			findPreference("screen_languages")
 		));
 
 		for (Preference goToScreen : screens) {

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";

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;
 	}

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 {

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);
 	}
 

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";

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;

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;
 

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<String, String> KEYS = new LinkedHashMap<>();
 
-	public ItemSelectZeroKeyCharacter(DropDownPreference dropDown, Context context) {
+	ItemSelectZeroKeyCharacter(DropDownPreference dropDown, Context context) {
 		this.item = dropDown;
 
 		Resources resources = context.getResources();

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";

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;

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);
 	}
 

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();

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;

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<String> newLanguages = (HashSet<String>) newValue;
-			if (newLanguages.size() == 0) {
+			if (newLanguages.isEmpty()) {
 				newLanguages.add("1");
 			}
 

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;

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;
 	}

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.screens.BaseScreenFragment;
-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;
 
-public class DictionariesScreen extends BaseScreenFragment {
+public class LanguagesScreen extends BaseScreenFragment {
-	public static final String NAME = "Dictionaries";
+	public static final String NAME = "Languages";
 
 	private final ArrayList<ItemClickable> clickables = new ArrayList<>();
 
@@ -24,12 +19,12 @@ public class DictionariesScreen extends BaseScreenFragment {
 	private ItemExportDictionary exportDictionaryItem;
 	private ItemExportCustomWords exportCustomWordsItem;
 
-	public DictionariesScreen() { init(); }
+	public LanguagesScreen() { init(); }
-	public DictionariesScreen(PreferencesActivity activity) { init(activity); }
+	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() {

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;
 	}

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;
 

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;
 	}

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.screens.BaseScreenFragment;
-import io.github.sspanak.tt9.preferences.items.ItemSelectGlobalKeyboard;
-import io.github.sspanak.tt9.preferences.items.ItemSetDefaultGlobalKeyboard;
 
 public class SetupScreen extends BaseScreenFragment {
 	final public static String NAME = "Setup";

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);
 	}

app/src/main/res/values-bg/strings.xml

@@ -22,7 +22,7 @@
 	<string name="dictionary_loaded">Зареждането на речник приключи.</string>
 	<string name="dictionary_loading">Зареждане на речник (%1$s)…</string>
 	<string name="dictionary_loading_please_wait">Моля, изчакайте да завърши зареждането на речник.</string>
-	<string name="dictionary_load_title">Зареди речник</string>
+	<string name="dictionary_load_title">Зареди избраните</string>
 	<string name="dictionary_not_found">Неуспешно зареждане. Липсва речник за „%1$s“.</string>
 	<string name="dictionary_truncated">Речникът е изтрит успешно.</string>
 	<string name="pref_category_abc_mode">Режим АБВ</string>

app/src/main/res/values-de/strings.xml

@@ -17,7 +17,7 @@
 
 	<string name="dictionary_loading">Lade Wörterbuch (%1$s)…</string>
 	<string name="dictionary_loading_please_wait">Bitte warten Sie, bis das Wörterbuch geladen ist.</string>
-	<string name="dictionary_load_title">Wörterbuch laden</string>
+	<string name="dictionary_load_title">Ausgewählte laden</string>
 	<string name="dictionary_not_found">Wird nicht geladen. Wörterbuch für \"%1$s\" nicht gefunden.</string>
 	<string name="pref_category_hacks">Kompatibilität</string>
 	<string name="dictionary_loading_indeterminate">Lade Wörterbuch</string>

app/src/main/res/values-es/strings.xml

@@ -27,7 +27,7 @@
 	<string name="setup_default_keyboard">Selecciona teclado predeterminado</string>
 	<string name="char_newline">Nueva línea</string>
 	<string name="dictionary_loading_please_wait">Por favor, espera a que se cargue el diccionario.</string>
-	<string name="dictionary_load_title">Cargar diccionario</string>
+	<string name="dictionary_load_title">Cargar los seleccionados</string>
 	<string name="dictionary_loading_indeterminate">Cargando diccionario</string>
 	<string name="dictionary_loading">Cargando diccionario (%1$s)…</string>
 	<string name="pref_category_about">Acerca de esta aplicación</string>

app/src/main/res/values-fr/strings.xml

@@ -21,7 +21,7 @@
 	<string name="dictionary_loaded">Chargement du dictionnaire terminé.</string>
 	<string name="dictionary_loading">Chargement du dictionnaire (%1$s)…</string>
 	<string name="dictionary_loading_please_wait">Veuillez patienter pendant le chargement du dictionnaire.</string>
-	<string name="dictionary_load_title">Charger le dictionnaire</string>
+	<string name="dictionary_load_title">Charger les sélectionnées</string>
 	<string name="dictionary_not_found">Echec du chargement. Dictionnaire «%1$s» introuvable.</string>
 	<string name="pref_category_function_keys">Raccourcis clavier</string>
 	<string name="pref_category_abc_mode">Saisie ABC</string>

app/src/main/res/values-it/strings.xml

@@ -20,7 +20,7 @@
 	<string name="dictionary_loaded">Caricamento del dizionario terminato.</string>
 	<string name="dictionary_loading">Caricamento del dizionario (%1$s)…</string>
 	<string name="dictionary_loading_please_wait">Attendi che il dizionario si carichi, per favore.</string>
-	<string name="dictionary_load_title">Carica il dizionario</string>
+	<string name="dictionary_load_title">Carica le selezionate</string>
 	<string name="dictionary_not_found">Impossibile caricare. Dizionario per “%1$s” non trovato.</string>
 	<string name="pref_category_hacks">Compatibilità</string>
 	<string name="pref_category_function_keys">Scorciatoie da tastiera</string>

app/src/main/res/values-iw/strings.xml

@@ -35,9 +35,9 @@
 	<string name="dictionary_loading">טוען מילון (%1$s)…</string>
 	<string name="dictionary_loading_indeterminate">טוען מילון</string>
 	<string name="dictionary_loading_please_wait">אנא המתינו עד שהמילון יטען.</string>
-	<string name="dictionary_load_title">טעינת מילון</string>
 	<string name="setup_keyboard_status">סטטוס</string>
 	<string name="setup_default_keyboard">בחר מקלדת ברירת מחדל</string>
+	<string name="dictionary_load_title">טען את הנבחרים</string>
 	<string name="dictionary_not_found">הטעינה נכשלה, לא נמצא מילון עבור \"%1$s\".</string>
 	<string name="dictionary_truncate_title">מחק הכל</string>
 	<string name="dictionary_truncate_unselected">מחק את הבלתי נבחר</string>

app/src/main/res/values-nl/strings.xml

@@ -15,7 +15,7 @@
 	<string name="pref_choose_languages">Talen</string>
 	<string name="dictionary_loading">Woordenboek laden (%1$s)…</string>
 	<string name="dictionary_loading_please_wait">Wacht alsjeblieft tot het woordenboek geladen is.</string>
-	<string name="dictionary_load_title">Woordenboek laden</string>
+	<string name="dictionary_load_title">Geselecteerde laden</string>
 	<string name="dictionary_not_found">Laden mislukt. Woordenboek voor %1$s niet gevonden.</string>
 	<string name="dictionary_truncated">Woordenboek succesvol gewist.</string>
 	<string name="pref_category_hacks">Compatibiliteit</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -36,7 +36,7 @@
 	<string name="dictionary_loading">Carregando dicionário (%1$s)…</string>
 	<string name="dictionary_loading_indeterminate">Carregando dicionário…</string>
 	<string name="dictionary_loading_please_wait">Aguarde o carregamento do dicionário, por favor</string>
-	<string name="dictionary_load_title">Carregar Dicionário</string>
+	<string name="dictionary_load_title">Carregar os selecionados</string>
 	<string name="dictionary_not_found">Falha no carregamento. Não foi encontrado um dicionário para o idioma \"%1$s\".</string>
 	<string name="dictionary_truncate_title">Limpar Dicionário</string>
 	<string name="dictionary_truncated">Dicionário apagado com sucesso.</string>

app/src/main/res/values-ru/strings.xml

@@ -21,7 +21,7 @@
 	<string name="dictionary_loaded">Загрузка словаря завершена.</string>
 	<string name="dictionary_loading">Загрузка словаря (%1$s)…</string>
 	<string name="dictionary_loading_please_wait">Пожалуйста, подождите, пока словарь загружается.</string>
-	<string name="dictionary_load_title">Загрузить словарь</string>
+	<string name="dictionary_load_title">Загрузить выбранные</string>
 	<string name="dictionary_not_found">Ошибка загрузки. Словарь «%1$s» не найден.</string>
 	<string name="dictionary_truncated">Словарь успешно удален.</string>
 	<string name="dictionary_loading_indeterminate">Загрузка словаря</string>
@@ -79,7 +79,7 @@
 	<string name="pref_dark_theme_no">Нет</string>
 	<string name="pref_dark_theme_auto">Автоматически</string>
 	<string name="add_word_confirm">Добавить слово «%1$s» в %2$s?</string>
-	<string name="dictionary_export">Экспорт выбранные</string>
+	<string name="dictionary_export">Экспортировать выбранные</string>
 	<string name="dictionary_export_custom_words_button">Экспортировать</string>
 	<string name="dictionary_export_custom_words_summary">Экспорт CSV со всеми добавленными словами в: «%1$s».</string>
 	<string name="dictionary_export_failed">Ошибка экспорта</string>

app/src/main/res/values-uk/strings.xml

@@ -57,14 +57,14 @@
 	<string name="dictionary_loading">Словник завантажується (%1$s)…</string>
 	<string name="dictionary_loading_indeterminate">Словник завантажується</string>
 	<string name="dictionary_loading_please_wait">Будь ласка, дочекайтесь завантаження словника.</string>
-	<string name="dictionary_load_title">Завантажити словник</string>
+	<string name="dictionary_load_title">Завантажити вибрані</string>
 	<string name="dictionary_not_found">Помилка завантаження. Словник для мови \"%1$s\" не знайдений.</string>
 	<string name="dictionary_truncate_title">Видалити все</string>
 	<string name="dictionary_truncate_unselected">Видалити невибрані</string>
 	<string name="dictionary_truncated">Словник видалено.</string>
 	<string name="dictionary_truncating">Видаляється…</string>
 
-	<string name="dictionary_export">Експорт вибрані</string>
+	<string name="dictionary_export">Експортувати вибрані</string>
 	<string name="dictionary_export_custom_words_button">Експортувати</string>
 	<string name="dictionary_export_custom_words_summary">Експорт CSV з усіма доданими словами в: \"%1$s\".</string>
 	<string name="dictionary_export_failed">Помилка експорту</string>

app/src/main/res/values/strings.xml

@@ -65,7 +65,7 @@
 	<string name="dictionary_loading">Loading dictionary (%1$s)…</string>
 	<string name="dictionary_loading_indeterminate">Loading dictionary</string>
 	<string name="dictionary_loading_please_wait">Please wait for the dictionary to load.</string>
-	<string name="dictionary_load_title">Load Dictionary</string>
+	<string name="dictionary_load_title">Load Selected</string>
 	<string name="dictionary_not_found">Loading failed. Dictionary for \"%1$s\" not found.</string>
 	<string name="dictionary_truncate_title">Delete All</string>
 	<string name="dictionary_truncate_unselected">Delete Unselected</string>

app/src/main/res/xml/prefs.xml

@@ -21,8 +21,8 @@
 		app:title="@string/pref_category_appearance" />
 
 	<Preference
-		app:fragment="io.github.sspanak.tt9.preferences.DictionariesScreen"
+		app:fragment="io.github.sspanak.tt9.preferences.LanguagesScreen"
-		app:key="screen_dictionaries"
+		app:key="screen_languages"
 		app:layout="@layout/pref_text"
 		app:title="@string/pref_choose_languages" />