wzray/tt9
1
0
Fork 0
Code Activity

code cleanup

Browse source
This commit is contained in:
sspanak 2025-02-02 11:36:41 +02:00 • committed by Dimo Karaivanov
parent 78e559fe19
commit 4303e03448
8 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/AppearanceScreen.java
View file

@ -25,9 +25,9 @@ public class AppearanceScreen extends BaseScreenFragment {
private void createMainSection() { private void createMainSection() {
(new ItemStatusIcon(findPreference(ItemStatusIcon.NAME), activity.getSettings())).populate(); (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()); 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 = { ItemDropDown[] items = {
new ItemSelectTheme(findPreference(ItemSelectTheme.NAME), activity), new ItemSelectTheme(findPreference(ItemSelectTheme.NAME), activity),
@ -36,14 +36,14 @@ public class AppearanceScreen extends BaseScreenFragment {
activity, activity,
(layout) -> { (layout) -> {
numpadKeyHeight.onLayoutChange(layout); numpadKeyHeight.onLayoutChange(layout);
numpadAlignment.onLayoutChange(layout); alignment.onLayoutChange(layout);
numpadWidth.onLayoutChange(layout); keyboardWidth.onLayoutChange(layout);
} }
), ),
new ItemSelectSettingsFontSize(findPreference(ItemSelectSettingsFontSize.NAME), this), new ItemSelectSettingsFontSize(findPreference(ItemSelectSettingsFontSize.NAME), this),
numpadKeyHeight, numpadKeyHeight,
numpadAlignment, alignment,
numpadWidth keyboardWidth
}; };
for (ItemDropDown item : items) { for (ItemDropDown item : items) {

6
app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadAlignment.java → app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemAlignment.java
View file

@ -12,12 +12,12 @@ import io.github.sspanak.tt9.R;
import io.github.sspanak.tt9.preferences.items.ItemDropDown; import io.github.sspanak.tt9.preferences.items.ItemDropDown;
import io.github.sspanak.tt9.preferences.settings.SettingsStore; 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"; public static final String NAME = "pref_numpad_alignment";
private final SettingsStore settings; private final SettingsStore settings;
ItemNumpadAlignment(DropDownPreference item, SettingsStore settings) { ItemAlignment(DropDownPreference item, SettingsStore settings) {
super(item); super(item);
this.settings = settings; this.settings = settings;
} }
@ -41,7 +41,7 @@ public class ItemNumpadAlignment extends ItemDropDown {
options.put(Gravity.END, context.getString(R.string.virtual_numpad_alignment_right)); options.put(Gravity.END, context.getString(R.string.virtual_numpad_alignment_right));
super.populateIntegers(options); super.populateIntegers(options);
super.setValue(settings.getNumpadAlignment() + ""); super.setValue(settings.getAlignment() + "");
onLayoutChange(settings.getMainViewLayout()); onLayoutChange(settings.getMainViewLayout());
return this; return this;

6
app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemNumpadWidth.java → app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemWidth.java
View file

@ -7,12 +7,12 @@ import java.util.LinkedHashMap;
import io.github.sspanak.tt9.preferences.items.ItemDropDown; import io.github.sspanak.tt9.preferences.items.ItemDropDown;
import io.github.sspanak.tt9.preferences.settings.SettingsStore; 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"; public static final String NAME = "pref_numpad_width";
private final SettingsStore settings; private final SettingsStore settings;
public ItemNumpadWidth(DropDownPreference item, SettingsStore settings) { public ItemWidth(DropDownPreference item, SettingsStore settings) {
super(item); super(item);
this.settings = settings; this.settings = settings;
} }
@ -25,7 +25,7 @@ public class ItemNumpadWidth extends ItemDropDown {
} }
super.populateIntegers(options); super.populateIntegers(options);
float currentValue = settings.getNumpadWidthPercent(); float currentValue = settings.getWidthPercent();
currentValue = Math.round(currentValue / 5f) * 5f; currentValue = Math.round(currentValue / 5f) * 5f;
currentValue = Math.max(Math.min(currentValue, 100f), 50f); currentValue = Math.max(Math.min(currentValue, 100f), 50f);

10
app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java
View file

@ -61,11 +61,11 @@ public class SettingsUI extends SettingsTyping {
return prefs.getBoolean("pref_haptic_feedback", true); return prefs.getBoolean("pref_haptic_feedback", true);
} }
public int getNumpadAlignment() { public int getAlignment() {
return getStringifiedInt("pref_numpad_alignment", Gravity.CENTER_HORIZONTAL); 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) { if (alignment != Gravity.CENTER_HORIZONTAL && alignment != Gravity.START && alignment != Gravity.END) {
Logger.w(getClass().getSimpleName(), "Ignoring invalid numpad key alignment: " + alignment); 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()); return getStringifiedInt("pref_numpad_key_height", getNumpadKeyDefaultHeight());
} }
public int getNumpadDefaultWidthPercent() { public int getDefaultWidthPercent() {
if (!DeviceInfo.isLandscapeOrientation(context)) { if (!DeviceInfo.isLandscapeOrientation(context)) {
return 100; return 100;
} }
@ -103,8 +103,8 @@ public class SettingsUI extends SettingsTyping {
return DEFAULT_WIDTH_LANDSCAPE = Math.round(width / 5) * 5; return DEFAULT_WIDTH_LANDSCAPE = Math.round(width / 5) * 5;
} }
public int getNumpadWidthPercent() { public int getWidthPercent() {
return getStringifiedInt("pref_numpad_width", getNumpadDefaultWidthPercent()); return getStringifiedInt("pref_numpad_width", getDefaultWidthPercent());
} }
public int getSettingsFontSize() { public int getSettingsFontSize() {

2
app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
View file

@ -230,7 +230,7 @@ class MainLayoutNumpad extends BaseMainLayout {
void render() { void render() {
getView(); getView();
setKeyHeight(getKeyHeightCompat()); setKeyHeight(getKeyHeightCompat());
setWidth(tt9.getSettings().getNumpadWidthPercent(), tt9.getSettings().getNumpadAlignment()); setWidth(tt9.getSettings().getWidthPercent(), tt9.getSettings().getAlignment());
enableClickHandlers(); enableClickHandlers();
for (SoftKey key : getKeys()) { for (SoftKey key : getKeys()) {
key.render(); key.render();

2
app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java
View file

@ -86,7 +86,7 @@ class MainLayoutTray extends BaseMainLayout {
void render() { void render() {
getView(); getView();
setSoftKeysVisibility(); setSoftKeysVisibility();
setWidth(tt9.getSettings().getNumpadWidthPercent(), tt9.getSettings().getNumpadAlignment()); setWidth(tt9.getSettings().getWidthPercent(), tt9.getSettings().getAlignment());
enableClickHandlers(); enableClickHandlers();
for (SoftKey key : getKeys()) { for (SoftKey key : getKeys()) {
key.render(); key.render();

16
app/src/main/java/io/github/sspanak/tt9/ui/main/ResizableMainView.java
View file

@ -75,14 +75,14 @@ public class ResizableMainView extends MainView implements View.OnAttachStateCha
boolean right = deltaX > 0; boolean right = deltaX > 0;
SettingsStore settings = tt9.getSettings(); SettingsStore settings = tt9.getSettings();
if (settings.getNumpadAlignment() == Gravity.START && right) { if (settings.getAlignment() == Gravity.START && right) {
settings.setNumpadAlignment(Gravity.CENTER_HORIZONTAL); settings.setAlignment(Gravity.CENTER_HORIZONTAL);
} else if (settings.getNumpadAlignment() == Gravity.END && !right) { } else if (settings.getAlignment() == Gravity.END && !right) {
settings.setNumpadAlignment(Gravity.CENTER_HORIZONTAL); settings.setAlignment(Gravity.CENTER_HORIZONTAL);
} else if (settings.getNumpadAlignment() == Gravity.CENTER_HORIZONTAL && right) { } else if (settings.getAlignment() == Gravity.CENTER_HORIZONTAL && right) {
settings.setNumpadAlignment(Gravity.END); settings.setAlignment(Gravity.END);
} else if (settings.getNumpadAlignment() == Gravity.CENTER_HORIZONTAL && !right) { } else if (settings.getAlignment() == Gravity.CENTER_HORIZONTAL && !right) {
settings.setNumpadAlignment(Gravity.START); settings.setAlignment(Gravity.START);
} }
render(); render();

2
app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKey.java
View file

@ -65,7 +65,7 @@ public class SoftKey extends BaseClickableKey {
protected float getTT9Width() { protected float getTT9Width() {
return tt9 != null ? tt9.getSettings().getNumpadWidthPercent() / 100f : 1; return tt9 != null ? tt9.getSettings().getWidthPercent() / 100f : 1;
} }