From 32638aca461015ad72c4f48c31cd3e4bd986aa31 Mon Sep 17 00:00:00 2001 From: sspanak Date: Fri, 5 Apr 2024 19:55:49 +0300 Subject: [PATCH] fixed Backspace not being correctly mirrored for RTL languages, in the small Main View --- .../sspanak/tt9/ui/main/MainLayoutSmall.java | 16 ++++++++-------- .../sspanak/tt9/ui/main/MainLayoutTray.java | 15 +++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java index 045c4a93..f4782d52 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutSmall.java @@ -23,6 +23,14 @@ class MainLayoutSmall extends MainLayoutTray { } } + @Override + protected ArrayList getKeys() { + if (view != null && keys.isEmpty()) { + keys = getKeysFromContainer(view.findViewById(R.id.main_soft_keys)); + } + return keys; + } + @Override public void setDarkTheme(boolean darkEnabled) { if (view == null) { @@ -45,12 +53,4 @@ class MainLayoutSmall extends MainLayoutTray { view.findViewById(R.id.main_separator_left).setBackground(separatorColor); view.findViewById(R.id.main_separator_right).setBackground(separatorColor); } - - @Override - protected ArrayList getKeys() { - if (view != null && keys.isEmpty()) { - keys = getKeysFromContainer(view.findViewById(R.id.main_soft_keys)); - } - return keys; - } } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java index de57babb..2b68dc17 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutTray.java @@ -22,10 +22,8 @@ class MainLayoutTray extends BaseMainLayout { } @Override - public void render() { - getView(); - enableClickHandlers(); - setSoftKeysVisibility(); + protected ArrayList getKeys() { + return keys; } @Override @@ -42,7 +40,12 @@ class MainLayoutTray extends BaseMainLayout { } @Override - protected ArrayList getKeys() { - return keys; + public void render() { + getView(); + enableClickHandlers(); + setSoftKeysVisibility(); + for (SoftKey key : getKeys()) { + key.render(); + } } }