From 3eedd9043e9489803ad04c5705d7b6536b5fcd49 Mon Sep 17 00:00:00 2001 From: sspanak Date: Wed, 29 Jan 2025 12:35:24 +0200 Subject: [PATCH] the fitler key now has an icon for a more compact appearance --- .../sspanak/tt9/ui/main/keys/SoftKey.java | 4 +++ .../tt9/ui/main/keys/SoftKeyFilter.java | 26 ++++--------------- app/src/main/res/drawable/ic_fn_filter.xml | 3 +++ .../main/res/drawable/ic_fn_filter_off.xml | 4 +++ .../main/res/layout/panel_numpad_right.xml | 6 +---- app/src/main/res/values/dimens.xml | 25 ++++++++++++------ app/src/main/res/values/styles.xml | 12 ++++++--- 7 files changed, 43 insertions(+), 37 deletions(-) create mode 100644 app/src/main/res/drawable/ic_fn_filter.xml create mode 100644 app/src/main/res/drawable/ic_fn_filter_off.xml 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 8d96c7e4..53e8fcea 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 @@ -281,6 +281,8 @@ public class SoftKey extends com.google.android.material.button.MaterialButton i private Drawable getIconCompat() { if (icon == null && getCentralIcon() > 0) { icon = AppCompatResources.getDrawable(getContext(), getCentralIcon()); + } else if (getCentralIcon() <= 0) { + icon = null; } return icon; @@ -293,6 +295,8 @@ public class SoftKey extends com.google.android.material.button.MaterialButton i private Drawable getHoldIconCompat() { if (holdIcon == null && getHoldIcon() > 0) { holdIcon = AppCompatResources.getDrawable(getContext(), getHoldIcon()); + } else if (getHoldIcon() <= 0) { + holdIcon = null; } return holdIcon; diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java index 0a874a37..a83a3579 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java @@ -2,8 +2,8 @@ package io.github.sspanak.tt9.ui.main.keys; import android.content.Context; import android.util.AttributeSet; -import android.view.Gravity; +import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.languages.LanguageKind; import io.github.sspanak.tt9.ui.Vibration; @@ -12,16 +12,10 @@ public class SoftKeyFilter extends SoftKey { public SoftKeyFilter(Context context, AttributeSet attrs) { super(context, attrs); } public SoftKeyFilter(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - @Override - protected float getTitleScale() { - return isKorean() ? 1.5f * getTT9Height() : Math.min(getTT9Width(), getTT9Height()); - } - private boolean isKorean() { return tt9 != null && LanguageKind.isKorean(tt9.getLanguage()); } - @Override protected void handleHold() { if (isKorean()) { @@ -51,24 +45,14 @@ public class SoftKeyFilter extends SoftKey { } - @Override - protected String getTitle() { - return isKorean() ? "␣" : "FLTR"; - } - - - @Override - protected String getHoldText() { - return isKorean() ? null : "CLR"; - } + @Override protected String getTitle() { return isKorean() ? "␣" : ""; } + @Override protected int getCentralIcon() { return isKorean() ? 0 : R.drawable.ic_fn_filter; } + @Override protected int getHoldIcon() { return isKorean() ? 0 : R.drawable.ic_fn_filter_off; } + @Override protected float getTitleScale() { return isKorean() ? 1.5f * getTT9Height() : 1; } @Override public void render() { - setGravity( - isKorean() ? Gravity.TOP | Gravity.CENTER_HORIZONTAL: Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL - ); - if (tt9 != null) { setEnabled( !tt9.isInputModeNumeric() diff --git a/app/src/main/res/drawable/ic_fn_filter.xml b/app/src/main/res/drawable/ic_fn_filter.xml new file mode 100644 index 00000000..3ebe284d --- /dev/null +++ b/app/src/main/res/drawable/ic_fn_filter.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_fn_filter_off.xml b/app/src/main/res/drawable/ic_fn_filter_off.xml new file mode 100644 index 00000000..bb446bb7 --- /dev/null +++ b/app/src/main/res/drawable/ic_fn_filter_off.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/layout/panel_numpad_right.xml b/app/src/main/res/layout/panel_numpad_right.xml index f049d320..fe17e7d7 100644 --- a/app/src/main/res/layout/panel_numpad_right.xml +++ b/app/src/main/res/layout/panel_numpad_right.xml @@ -9,20 +9,16 @@ android:id="@+id/soft_key_numpad_backspace" /> - - - + - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d9a863b2..8893343b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,14 +1,23 @@ - 26sp - 16sp - 18sp + + + + 18dp + + + 26dp + 16dp + + 6sp 32sp - 46dp - 65dp + 46dp 48dp @@ -34,11 +43,11 @@ 0.675 666dp - 13sp - 11sp + 13dp + 11dp 2dp - 17sp + 17dp 40dp 36dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 73f02ee8..a5673ef9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -44,7 +44,7 @@ match_parent match_parent - @dimen/status_bar_font_size + @dimen/status_bar_text_size italic @color/keyboard_text_color @@ -64,7 +64,11 @@ @dimen/main_small_suggestion_padding_horizontal @dimen/main_small_suggestion_padding_horizontal - @dimen/main_small_suggestion_font_size + + @dimen/main_text_size @@ -93,6 +97,7 @@ 0dp 0dp @style/TextAppearance.AppCompat.Medium + @dimen/main_text_size @color/key_num_color @color/key_num_background @@ -123,7 +128,7 @@ 0dp @style/TextAppearance.AppCompat - @dimen/status_bar_font_size + @dimen/status_bar_text_size @color/key_num_color @color/key_num_color @@ -290,6 +295,7 @@ 0dp @style/TextAppearance.AppCompat.Medium + @dimen/main_text_size @color/keyboard_text_color @color/key_fn_background