diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java index 9b2d81b4..2f14b960 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java @@ -25,9 +25,9 @@ public class AppearanceScreen extends BaseScreenFragment { private void createMainSection() { (new ItemStatusIcon(findPreference(ItemStatusIcon.NAME), activity.getSettings())).populate(); - ItemNumpadAlignment numpadAlignment = new ItemNumpadAlignment(findPreference(ItemNumpadAlignment.NAME), activity.getSettings()); + ItemAlignment alignment = new ItemAlignment(findPreference(ItemAlignment.NAME), activity.getSettings()); ItemNumpadKeyHeight numpadKeyHeight = new ItemNumpadKeyHeight(findPreference(ItemNumpadKeyHeight.NAME), activity.getSettings()); - ItemNumpadWidth numpadWidth = new ItemNumpadWidth(findPreference(ItemNumpadWidth.NAME), activity.getSettings()); + ItemWidth keyboardWidth = new ItemWidth(findPreference(ItemWidth.NAME), activity.getSettings()); ItemDropDown[] items = { new ItemSelectTheme(findPreference(ItemSelectTheme.NAME), activity), @@ -36,14 +36,14 @@ public class AppearanceScreen extends BaseScreenFragment { activity, (layout) -> { numpadKeyHeight.onLayoutChange(layout); - numpadAlignment.onLayoutChange(layout); - numpadWidth.onLayoutChange(layout); + alignment.onLayoutChange(layout); + keyboardWidth.onLayoutChange(layout); } ), new ItemSelectSettingsFontSize(findPreference(ItemSelectSettingsFontSize.NAME), this), numpadKeyHeight, - numpadAlignment, - numpadWidth + alignment, + keyboardWidth }; for (ItemDropDown item : items) { diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadAlignment.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemAlignment.java similarity index 88% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadAlignment.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemAlignment.java index 5be59d79..508982cb 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadAlignment.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemAlignment.java @@ -12,12 +12,12 @@ import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.items.ItemDropDown; import io.github.sspanak.tt9.preferences.settings.SettingsStore; -public class ItemNumpadAlignment extends ItemDropDown { +public class ItemAlignment extends ItemDropDown { public static final String NAME = "pref_numpad_alignment"; private final SettingsStore settings; - ItemNumpadAlignment(DropDownPreference item, SettingsStore settings) { + ItemAlignment(DropDownPreference item, SettingsStore settings) { super(item); this.settings = settings; } @@ -41,7 +41,7 @@ public class ItemNumpadAlignment extends ItemDropDown { options.put(Gravity.END, context.getString(R.string.virtual_numpad_alignment_right)); super.populateIntegers(options); - super.setValue(settings.getNumpadAlignment() + ""); + super.setValue(settings.getAlignment() + ""); onLayoutChange(settings.getMainViewLayout()); return this; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadWidth.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemWidth.java similarity index 84% rename from app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadWidth.java rename to app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemWidth.java index ce4cb2e4..bc9e4490 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadWidth.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemWidth.java @@ -7,12 +7,12 @@ import java.util.LinkedHashMap; import io.github.sspanak.tt9.preferences.items.ItemDropDown; import io.github.sspanak.tt9.preferences.settings.SettingsStore; -public class ItemNumpadWidth extends ItemDropDown { +public class ItemWidth extends ItemDropDown { public static final String NAME = "pref_numpad_width"; private final SettingsStore settings; - public ItemNumpadWidth(DropDownPreference item, SettingsStore settings) { + public ItemWidth(DropDownPreference item, SettingsStore settings) { super(item); this.settings = settings; } @@ -25,7 +25,7 @@ public class ItemNumpadWidth extends ItemDropDown { } super.populateIntegers(options); - float currentValue = settings.getNumpadWidthPercent(); + float currentValue = settings.getWidthPercent(); currentValue = Math.round(currentValue / 5f) * 5f; currentValue = Math.max(Math.min(currentValue, 100f), 50f); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java index 4c39d440..0b3288cd 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java @@ -61,11 +61,11 @@ public class SettingsUI extends SettingsTyping { return prefs.getBoolean("pref_haptic_feedback", true); } - public int getNumpadAlignment() { + public int getAlignment() { return getStringifiedInt("pref_numpad_alignment", Gravity.CENTER_HORIZONTAL); } - public void setNumpadAlignment(int alignment) { + public void setAlignment(int alignment) { if (alignment != Gravity.CENTER_HORIZONTAL && alignment != Gravity.START && alignment != Gravity.END) { Logger.w(getClass().getSimpleName(), "Ignoring invalid numpad key alignment: " + alignment); } @@ -82,7 +82,7 @@ public class SettingsUI extends SettingsTyping { return getStringifiedInt("pref_numpad_key_height", getNumpadKeyDefaultHeight()); } - public int getNumpadDefaultWidthPercent() { + public int getDefaultWidthPercent() { if (!DeviceInfo.isLandscapeOrientation(context)) { return 100; } @@ -103,8 +103,8 @@ public class SettingsUI extends SettingsTyping { return DEFAULT_WIDTH_LANDSCAPE = Math.round(width / 5) * 5; } - public int getNumpadWidthPercent() { - return getStringifiedInt("pref_numpad_width", getNumpadDefaultWidthPercent()); + public int getWidthPercent() { + return getStringifiedInt("pref_numpad_width", getDefaultWidthPercent()); } public int getSettingsFontSize() { diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java index d48b3dd3..28830c23 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java @@ -230,7 +230,7 @@ class MainLayoutNumpad extends BaseMainLayout { void render() { getView(); setKeyHeight(getKeyHeightCompat()); - setWidth(tt9.getSettings().getNumpadWidthPercent(), tt9.getSettings().getNumpadAlignment()); + setWidth(tt9.getSettings().getWidthPercent(), tt9.getSettings().getAlignment()); enableClickHandlers(); for (SoftKey key : getKeys()) { key.render(); diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java index 30b8405a..c7206bb0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java @@ -86,7 +86,7 @@ class MainLayoutTray extends BaseMainLayout { void render() { getView(); setSoftKeysVisibility(); - setWidth(tt9.getSettings().getNumpadWidthPercent(), tt9.getSettings().getNumpadAlignment()); + setWidth(tt9.getSettings().getWidthPercent(), tt9.getSettings().getAlignment()); enableClickHandlers(); for (SoftKey key : getKeys()) { key.render(); diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/ResizableMainView.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/ResizableMainView.java index 34288a38..d59533e0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/ResizableMainView.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/ResizableMainView.java @@ -75,14 +75,14 @@ public class ResizableMainView extends MainView implements View.OnAttachStateCha boolean right = deltaX > 0; SettingsStore settings = tt9.getSettings(); - if (settings.getNumpadAlignment() == Gravity.START && right) { - settings.setNumpadAlignment(Gravity.CENTER_HORIZONTAL); - } else if (settings.getNumpadAlignment() == Gravity.END && !right) { - settings.setNumpadAlignment(Gravity.CENTER_HORIZONTAL); - } else if (settings.getNumpadAlignment() == Gravity.CENTER_HORIZONTAL && right) { - settings.setNumpadAlignment(Gravity.END); - } else if (settings.getNumpadAlignment() == Gravity.CENTER_HORIZONTAL && !right) { - settings.setNumpadAlignment(Gravity.START); + if (settings.getAlignment() == Gravity.START && right) { + settings.setAlignment(Gravity.CENTER_HORIZONTAL); + } else if (settings.getAlignment() == Gravity.END && !right) { + settings.setAlignment(Gravity.CENTER_HORIZONTAL); + } else if (settings.getAlignment() == Gravity.CENTER_HORIZONTAL && right) { + settings.setAlignment(Gravity.END); + } else if (settings.getAlignment() == Gravity.CENTER_HORIZONTAL && !right) { + settings.setAlignment(Gravity.START); } render(); diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java index 95462ae0..eb89806a 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java @@ -65,7 +65,7 @@ public class SoftKey extends BaseClickableKey { protected float getTT9Width() { - return tt9 != null ? tt9.getSettings().getNumpadWidthPercent() / 100f : 1; + return tt9 != null ? tt9.getSettings().getWidthPercent() / 100f : 1; }