From ed651e7ec11f9a1a1f017c37c50ec3e1cbbe540b Mon Sep 17 00:00:00 2001 From: sspanak Date: Sat, 30 Nov 2024 14:54:10 +0200 Subject: [PATCH] fixed the font size of the virtual numpad keys for the 3rd time --- .../github/sspanak/tt9/ui/main/keys/SoftKey.java | 14 +++++++++++--- .../sspanak/tt9/ui/main/keys/SoftKeyAddWord.java | 2 -- .../sspanak/tt9/ui/main/keys/SoftKeyBackspace.java | 4 ---- .../sspanak/tt9/ui/main/keys/SoftKeySettings.java | 3 --- .../sspanak/tt9/ui/main/keys/SoftKeyShift.java | 3 +-- 5 files changed, 12 insertions(+), 14 deletions(-) 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 b9ee10e4..087d8876 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 @@ -232,7 +232,15 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement /** - * Multiplier for the title font size. + * Multiplier for the font size when there is only one label. + */ + protected float getSingleLabelRelativeSize() { + return 1; + } + + + /** + * Multiplier for the title font size when there are two labels. */ protected float getTitleRelativeSize() { return SettingsStore.SOFT_KEY_COMPLEX_LABEL_TITLE_RELATIVE_SIZE; @@ -240,7 +248,7 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement /** - * Multiplier for the subtitle font size. + * Multiplier for the subtitle font size when there are two labels. */ protected float getSubTitleRelativeSize() { return SettingsStore.SOFT_KEY_COMPLEX_LABEL_SUB_TITLE_RELATIVE_SIZE; @@ -273,7 +281,7 @@ public class SoftKey extends androidx.appcompat.widget.AppCompatButton implement // title styles int titleLength = title.length(); - float titleRelativeSize = subtitle == null ? getSubTitleRelativeSize() : getTitleRelativeSize(); + float titleRelativeSize = subtitle == null ? getSingleLabelRelativeSize() : getTitleRelativeSize(); sb.setSpan(new RelativeSizeSpan(titleRelativeSize), 0, titleLength, Spanned.SPAN_INCLUSIVE_INCLUSIVE); if (subtitle != null && !new Text(title).startsWithGraphic()) { diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyAddWord.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyAddWord.java index ce6a6674..d21f83af 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyAddWord.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyAddWord.java @@ -8,8 +8,6 @@ public class SoftKeyAddWord extends SoftKey { public SoftKeyAddWord(Context context, AttributeSet attrs) { super(context, attrs); } public SoftKeyAddWord(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - @Override protected float getTitleRelativeSize() { return 1; } - @Override protected float getSubTitleRelativeSize() { return 1; } @Override protected String getTitle() { return "＋"; } @Override diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java index e746e38e..34ecc504 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java @@ -27,10 +27,6 @@ public class SoftKeyBackspace extends SwipeableKey { } - @Override protected float getTitleRelativeSize() { return 1; } - @Override protected float getSubTitleRelativeSize() { return 1; } - - /** * When fast-delete is on, decrease the hold duration threshold for smoother operation. */ diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeySettings.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeySettings.java index f371dd9a..f3fcf37a 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeySettings.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeySettings.java @@ -23,9 +23,6 @@ public class SoftKeySettings extends SwipeableKey { this.mainView = mainView; } - @Override protected float getTitleRelativeSize() { return 1;} - @Override protected float getSubTitleRelativeSize() { return 1; } - // this key does not support holding at the moment, so just prevent it @Override protected float getHoldDurationThreshold() { return 1000; } @Override protected float getSwipeXThreshold(Context context) { return context.getResources().getDimensionPixelSize(R.dimen.numpad_key_height) * 0.75f; } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyShift.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyShift.java index 8d883eda..d8252fc2 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyShift.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyShift.java @@ -17,8 +17,7 @@ public class SoftKeyShift extends SoftKey { super(context, attrs, defStyleAttr); } - @Override protected float getTitleRelativeSize() { return 1.7f; } - @Override protected float getSubTitleRelativeSize() { return getTitleRelativeSize(); } + @Override protected float getSingleLabelRelativeSize() { return 1.7f; } @Override protected String getTitle() { return "⇧"; } @Override