From 7e43bcc11413077e057817e5381ec593d6f43bb5 Mon Sep 17 00:00:00 2001 From: sspanak Date: Tue, 10 Jun 2025 15:52:34 +0300 Subject: [PATCH] replaced on-screen RF3 scissors icon with a material scissors icon --- .../sspanak/tt9/ui/main/keys/SoftKeyRF3.java | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyRF3.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyRF3.java index 905cc65c..43c83987 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyRF3.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyRF3.java @@ -16,10 +16,8 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { private boolean isTextEditingActive() { return tt9 != null && tt9.isTextEditingActive(); } private boolean isTextEditingMissing() { return tt9 != null && tt9.isInputLimited(); } - - @Override - protected float getTitleScale() { - return super.getTitleScale() / 0.85f; + private boolean isKeySmall() { + return getTT9Height() < 0.8f && getTT9Width() < 0.7f; } @@ -53,20 +51,6 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { } - @Override - protected String getTitle() { - if (isTextEditingActive() || isVoiceInputActive()) { - return ""; - } - - if (isTextEditingMissing() && !isVoiceInputMissing()) { - return ""; - } - - return "✂"; - } - - @Override protected int getCentralIcon() { if (isTextEditingActive()) { @@ -77,7 +61,18 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { return R.drawable.ic_fn_voice_off; } - return -1; + return R.drawable.ic_txt_cut; + } + + + @Override + protected float getCentralIconScale() { + float scale = 1; + if (!isVoiceInputActive() && !isTextEditingActive() && !isTextEditingMissing()) { + scale = isKeySmall() ? 0.7f : 0.8f; + } + + return super.getCentralIconScale() * scale; } @@ -90,6 +85,7 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { return R.drawable.ic_fn_voice; } + @Override public void render() { resetIconCache();