From 014c6923fb3e9cafd8c14bfb822623167fa5dede Mon Sep 17 00:00:00 2001 From: sspanak Date: Fri, 29 Nov 2024 21:33:56 +0200 Subject: [PATCH] adjust font size --- .../tt9/ui/main/keys/SoftKeyAddWord.java | 9 ++++----- .../tt9/ui/main/keys/SoftKeyBackspace.java | 18 +++++++----------- .../tt9/ui/main/keys/SoftKeySettings.java | 3 +++ .../sspanak/tt9/ui/main/keys/SoftKeyShift.java | 10 ++++------ 4 files changed, 18 insertions(+), 22 deletions(-) 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 e5e3ac1c..ce6a6674 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,6 +8,10 @@ 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 protected boolean handleRelease() { if (validateTT9Handler()) { @@ -18,11 +22,6 @@ public class SoftKeyAddWord extends SoftKey { return false; } - @Override - protected String getTitle() { - return "+"; - } - @Override public void render() { super.render(); 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 67e8e0b2..e746e38e 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 @@ -17,17 +17,9 @@ public class SoftKeyBackspace extends SwipeableKey { private final Handler waitForSwipe = new Handler(); - public SoftKeyBackspace(Context context) { - super(context); - } - - public SoftKeyBackspace(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public SoftKeyBackspace(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } + public SoftKeyBackspace(Context context) { super(context); } + public SoftKeyBackspace(Context context, AttributeSet attrs) { super(context, attrs); } + public SoftKeyBackspace(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } private boolean isFastDeleteOn() { @@ -35,6 +27,10 @@ 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 f3fcf37a..f371dd9a 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,6 +23,9 @@ 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 d761aec3..8d883eda 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,19 +17,17 @@ public class SoftKeyShift extends SoftKey { super(context, attrs, defStyleAttr); } + @Override protected float getTitleRelativeSize() { return 1.7f; } + @Override protected float getSubTitleRelativeSize() { return getTitleRelativeSize(); } + @Override protected String getTitle() { return "⇧"; } + @Override protected boolean handleRelease() { return validateTT9Handler() && tt9.onKeyNextTextCase(false); } - @Override - protected String getTitle() { - return "⇧"; - } - @Override public void render() { - setTextSize(36); setTypeface(Typeface.DEFAULT_BOLD); super.render(); setEnabled(tt9 != null && !tt9.isVoiceInputActive() && !tt9.isInputModePhone() && !tt9.isNumericModeSigned());