From b49de6ddfb5ad1742874d1ba6fa8b9cef4f43a58 Mon Sep 17 00:00:00 2001 From: sspanak Date: Tue, 4 Feb 2025 17:41:18 +0200 Subject: [PATCH] fixed voice input not being correctly indicated when it is on --- .../tt9/ui/main/keys/SoftKeyBackspace.java | 2 +- .../sspanak/tt9/ui/main/keys/SoftKeyRF3.java | 23 ++++++------------- 2 files changed, 8 insertions(+), 17 deletions(-) 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 6a75bf1a..d13212ee 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 @@ -163,9 +163,9 @@ public class SoftKeyBackspace extends BaseSwipeableKey { @Override public void render() { - super.render(); if (tt9 != null) { setEnabled(!tt9.isVoiceInputActive()); } + super.render(); } } 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 433d6040..83a0c407 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 @@ -11,19 +11,10 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { public SoftKeyRF3(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - private boolean isVoiceInputMissing() { - return tt9 != null && tt9.isVoiceInputMissing(); - } - - - private boolean isTextEditingMissing() { - return tt9 != null && tt9.isInputLimited(); - } - - - private boolean isTextEditingActive() { - return tt9 != null && tt9.isTextEditingActive(); - } + private boolean isVoiceInputActive() { return tt9 != null && tt9.isVoiceInputActive(); } + private boolean isVoiceInputMissing() { return tt9 != null && tt9.isVoiceInputMissing(); } + private boolean isTextEditingActive() { return tt9 != null && tt9.isTextEditingActive(); } + private boolean isTextEditingMissing() { return tt9 != null && tt9.isInputLimited(); } @Override @@ -64,7 +55,7 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { @Override protected String getTitle() { - if (isTextEditingActive()) { + if (isTextEditingActive() || isVoiceInputActive()) { return ""; } @@ -82,7 +73,7 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { return R.drawable.ic_keyboard; } - if (isTextEditingMissing() && !isVoiceInputMissing()) { + if (isVoiceInputActive() || (isTextEditingMissing() && !isVoiceInputMissing())) { return R.drawable.ic_fn_voice; } @@ -92,7 +83,7 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons { @Override protected int getHoldIcon() { - if (isTextEditingActive() || isTextEditingMissing() || isVoiceInputMissing()) { + if (isVoiceInputActive() || isTextEditingActive() || isTextEditingMissing() || isVoiceInputMissing()) { return -1; }