From 46fda4adeeacf3936ac8d5e3f85e68a011b6b257 Mon Sep 17 00:00:00 2001 From: sspanak Date: Mon, 8 Apr 2024 16:51:00 +0300 Subject: [PATCH] removed the separate status icons per mode and simplified the logic; now there is only one --- .../sspanak/tt9/ime/AbstractHandler.java | 3 ++- .../github/sspanak/tt9/ime/HotkeyHandler.java | 1 - .../github/sspanak/tt9/ime/TraditionalT9.java | 14 ++++++------- .../sspanak/tt9/ime/modes/InputMode.java | 1 - .../github/sspanak/tt9/ime/modes/Mode123.java | 2 -- .../github/sspanak/tt9/ime/modes/ModeABC.java | 2 -- .../tt9/ime/modes/ModePassthrough.java | 1 - .../sspanak/tt9/ime/modes/ModePredictive.java | 4 ---- .../screens/appearance/ItemStatusIcon.java | 11 ++++++++++ .../res/drawable-anydpi-v24/ic_mode_123.xml | 19 ------------------ .../res/drawable-anydpi-v24/ic_mode_abc.xml | 19 ------------------ .../ic_mode_abc_uppercase.xml | 19 ------------------ .../ic_mode_predictive.xml | 19 ------------------ .../res/drawable-anydpi-v24/ic_status.xml | 15 ++++++++++++++ .../main/res/drawable-hdpi/ic_mode_123.png | Bin 485 -> 0 bytes .../main/res/drawable-hdpi/ic_mode_abc.png | Bin 576 -> 0 bytes .../drawable-hdpi/ic_mode_abc_uppercase.png | Bin 543 -> 0 bytes .../res/drawable-hdpi/ic_mode_predictive.png | Bin 518 -> 0 bytes app/src/main/res/drawable-hdpi/ic_status.png | Bin 0 -> 368 bytes .../main/res/drawable-mdpi/ic_mode_123.png | Bin 318 -> 0 bytes .../main/res/drawable-mdpi/ic_mode_abc.png | Bin 401 -> 0 bytes .../drawable-mdpi/ic_mode_abc_uppercase.png | Bin 372 -> 0 bytes .../res/drawable-mdpi/ic_mode_predictive.png | Bin 357 -> 0 bytes app/src/main/res/drawable-mdpi/ic_status.png | Bin 0 -> 280 bytes .../main/res/drawable-xhdpi/ic_mode_123.png | Bin 568 -> 0 bytes .../main/res/drawable-xhdpi/ic_mode_abc.png | Bin 744 -> 0 bytes .../drawable-xhdpi/ic_mode_abc_uppercase.png | Bin 742 -> 0 bytes .../res/drawable-xhdpi/ic_mode_predictive.png | Bin 632 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_status.png | Bin 0 -> 311 bytes .../main/res/drawable-xxhdpi/ic_mode_123.png | Bin 911 -> 0 bytes .../main/res/drawable-xxhdpi/ic_mode_abc.png | Bin 1192 -> 0 bytes .../drawable-xxhdpi/ic_mode_abc_uppercase.png | Bin 1134 -> 0 bytes .../drawable-xxhdpi/ic_mode_predictive.png | Bin 1040 -> 0 bytes .../main/res/drawable-xxhdpi/ic_status.png | Bin 0 -> 576 bytes app/src/main/res/values-bg/strings.xml | 4 ++-- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values-fr/strings.xml | 4 ++-- app/src/main/res/values-it/strings.xml | 4 ++-- app/src/main/res/values-iw/strings.xml | 4 ++-- app/src/main/res/values-lt/strings.xml | 4 ++-- app/src/main/res/values-nl/strings.xml | 4 ++-- app/src/main/res/values-pt-rBR/strings.xml | 4 ++-- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values-uk/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 46 files changed, 59 insertions(+), 119 deletions(-) delete mode 100644 app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml delete mode 100644 app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml delete mode 100644 app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml delete mode 100644 app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_status.xml delete mode 100644 app/src/main/res/drawable-hdpi/ic_mode_123.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_mode_abc.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_mode_abc_uppercase.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_mode_predictive.png create mode 100644 app/src/main/res/drawable-hdpi/ic_status.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_mode_123.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_mode_abc.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_mode_abc_uppercase.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_mode_predictive.png create mode 100644 app/src/main/res/drawable-mdpi/ic_status.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_123.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_abc.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_abc_uppercase.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_predictive.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_status.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_123.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_abc.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_abc_uppercase.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_predictive.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_status.png diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java index 52ec8d7d..900c9001 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/AbstractHandler.java @@ -5,6 +5,7 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; +import io.github.sspanak.tt9.ime.modes.InputMode; import io.github.sspanak.tt9.preferences.settings.SettingsStore; abstract public class AbstractHandler extends InputMethodService { @@ -29,7 +30,7 @@ abstract public class AbstractHandler extends InputMethodService { abstract protected void createSuggestionBar(View mainView); abstract protected void forceShowWindowIfHidden(); abstract protected void renderMainView(); - abstract protected void setStatusIcon(int iconResource); + abstract protected void setStatusIcon(InputMode mode); abstract protected void setStatusText(String status); abstract protected boolean shouldBeVisible(); abstract protected boolean shouldBeOff(); diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java index 5f5e2662..e810ee21 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java @@ -256,7 +256,6 @@ public abstract class HotkeyHandler extends TypingHandler { suggestionOps.scheduleDelayedAccept(mInputMode.getAutoAcceptTimeout()); // restart the timer nextInputMode(); renderMainView(); - setStatusIcon(mInputMode.getIcon()); forceShowWindowIfHidden(); return true; diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java index 1a879a07..b3de2c9e 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java @@ -11,10 +11,10 @@ import android.view.inputmethod.InputMethodManager; import androidx.annotation.NonNull; +import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.db.DictionaryLoader; import io.github.sspanak.tt9.db.WordStoreAsync; import io.github.sspanak.tt9.ime.modes.InputMode; -import io.github.sspanak.tt9.ime.modes.ModePassthrough; import io.github.sspanak.tt9.preferences.settings.SettingsStore; import io.github.sspanak.tt9.ui.UI; import io.github.sspanak.tt9.ui.dialogs.PopupDialog; @@ -78,7 +78,7 @@ public class TraditionalT9 extends HotkeyHandler { if (mainView.createView()) { initTray(); } - setStatusIcon(mInputMode.getIcon()); + setStatusIcon(mInputMode); setStatusText(mInputMode.toString()); setDarkTheme(); mainView.render(); @@ -110,7 +110,7 @@ public class TraditionalT9 extends HotkeyHandler { @Override protected void onFinishTyping() { - if (!(mInputMode instanceof ModePassthrough)) { + if (!mInputMode.isPassthrough()) { DictionaryLoader.autoLoad(this, mLanguage); } super.onFinishTyping(); @@ -121,7 +121,7 @@ public class TraditionalT9 extends HotkeyHandler { protected void onStop() { onFinishTyping(); suggestionOps.clear(); - setStatusIcon(mInputMode.getIcon()); + setStatusIcon(mInputMode); setStatusText(mInputMode.toString()); if (isInputViewShown()) { @@ -182,9 +182,9 @@ public class TraditionalT9 extends HotkeyHandler { @Override - protected void setStatusIcon(int iconResource) { - if (iconResource > 0 && settings.isStatusIconEnabled()) { - showStatusIcon(iconResource); + protected void setStatusIcon(InputMode mode) { + if (!mode.isPassthrough() && settings.isStatusIconEnabled()) { + showStatusIcon(R.drawable.ic_status); } else { hideStatusIcon(); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java index 8ae6635f..ce1dec16 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/InputMode.java @@ -85,7 +85,6 @@ abstract public class InputMode { // Utility abstract public int getId(); - abstract public int getIcon(); public int getSequenceLength() { return digitSequence.length(); } // The number of key presses for the current word. public int getAutoAcceptTimeout() { return autoAcceptTimeout; diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java index c965bbce..aa19b9ca 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/Mode123.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.ime.helpers.InputType; import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.NaturalLanguage; @@ -14,7 +13,6 @@ import io.github.sspanak.tt9.util.Characters; public class Mode123 extends ModePassthrough { @Override public int getId() { return MODE_123; } - @Override public int getIcon() { return R.drawable.ic_mode_123; } @Override @NonNull public String toString() { return "123"; } @Override public final boolean is123() { return true; } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java index 40b70007..b03968d8 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeABC.java @@ -2,7 +2,6 @@ package io.github.sspanak.tt9.ime.modes; import androidx.annotation.NonNull; -import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.LanguageKind; import io.github.sspanak.tt9.languages.NaturalLanguage; @@ -13,7 +12,6 @@ public class ModeABC extends InputMode { private boolean shouldSelectNextLetter = false; @Override public int getId() { return MODE_ABC; } - @Override public int getIcon() { return textCase == CASE_UPPER ? R.drawable.ic_mode_abc_uppercase : R.drawable.ic_mode_abc; } ModeABC(SettingsStore settings, Language lang) { this.settings = settings; diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java index 6af351fe..b97ac74d 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePassthrough.java @@ -10,7 +10,6 @@ public class ModePassthrough extends InputMode { } @Override public int getId() { return MODE_PASSTHROUGH; } - @Override public int getIcon() { return 0; } @Override public int getSequenceLength() { return 0; } @Override @NonNull public String toString() { return "--"; } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java index 95e5b1f6..c9b2617f 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java @@ -4,7 +4,6 @@ import androidx.annotation.NonNull; import java.util.ArrayList; -import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.db.WordStoreAsync; import io.github.sspanak.tt9.ime.helpers.InputType; import io.github.sspanak.tt9.ime.helpers.TextField; @@ -22,12 +21,9 @@ import io.github.sspanak.tt9.util.Text; public class ModePredictive extends InputMode { private final String LOG_TAG = getClass().getSimpleName(); - - private final SettingsStore settings; public int getId() { return MODE_PREDICTIVE; } - public int getIcon() { return R.drawable.ic_mode_predictive; } private String lastAcceptedWord = ""; diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java index f0f5cf02..086d28aa 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/appearance/ItemStatusIcon.java @@ -2,6 +2,7 @@ package io.github.sspanak.tt9.preferences.screens.appearance; import androidx.preference.SwitchPreferenceCompat; +import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.settings.SettingsStore; public class ItemStatusIcon { @@ -13,6 +14,7 @@ public class ItemStatusIcon { public ItemStatusIcon(SwitchPreferenceCompat item, SettingsStore settings) { this.item = item; this.settings = settings; + addAppNameToSummary(); } public void populate() { @@ -20,4 +22,13 @@ public class ItemStatusIcon { item.setChecked(settings.isStatusIconEnabled()); } } + + private void addAppNameToSummary() { + if (item == null) { + return; + } + + String summary = item.getContext().getString(R.string.pref_status_icon_summary, item.getContext().getString(R.string.app_name)); + item.setSummary(summary); + } } diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml deleted file mode 100644 index 4189fd93..00000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_mode_123.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml deleted file mode 100644 index 11db7ad9..00000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml deleted file mode 100644 index 8e9aeb30..00000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_mode_abc_uppercase.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml b/app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml deleted file mode 100644 index a138321c..00000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_mode_predictive.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v24/ic_status.xml b/app/src/main/res/drawable-anydpi-v24/ic_status.xml new file mode 100644 index 00000000..89145801 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_status.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_mode_123.png b/app/src/main/res/drawable-hdpi/ic_mode_123.png deleted file mode 100644 index 8616d01cd86e1acb5db2e9779f44f8c21f460ff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 485 zcmVC73HuCn( z&hE_KULo0E@{-&A-h1=ij`uNHFd^de#!lyUp)@&)|n4j`}CdHH&;grtGfSMWTn`)=jlM4mAUI-Nn+y|D_QwXPZ76amw z+yz$E69hNtEEGg1pf9Q_{)_NIC8ZWZY>qp?wtAxACY=?5$Qb9rzIvkJHl5{RI^UU3 zif^f>6jT_zkm)>(G3V+DLP~pkYFlY=sH%Zf&|<@R$risAJA%Q bYAWCdfG%5m=^+^R00000NkvXXu0mjfuFl!& diff --git a/app/src/main/res/drawable-hdpi/ic_mode_abc.png b/app/src/main/res/drawable-hdpi/ic_mode_abc.png deleted file mode 100644 index 10bae3f327e4bbc3906d01399ef8df31da941da5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmV-G0>AxM35C{<@bs7t?vGNCqU?WyZXOSud3rQ(9 z79ti}D0Vi2gaiUHlQaA7UC%wcuDfYOd>;(E?|o-xhh^`+y1Ja4oO_0uJw?6nQg*w5*3>ibyOeEEUjjnys6GqN zrcldqg617d7kaLqfuE)9xcUN?9m}7nD+-rIdmX#s*q6hy-(_S;r62oa3fxLEAYe5t zHPEadcP#=-p$ zl-XAAf!`EZN41c9Y1fa9gBareh@}hpW5fSG-l84{?~kZO%J}Ct=^PI>hvrIrwHi*D zWq+!F>00s6d!{prKz3R7fK`5=CPJp_g~D|w>M-6TPEnoOpOcgG;P?jt)~hA&=UVds O0000N&TX5mLH z6m^|z&Y5@S`|h3hY^?65PMP!loa4m2nM@`S2m}Iu!x*z@A~rF1p?nulR0mWuIF||< zeAnABccJ|hbmF`hl6!HQ7)1|J?h#cEs)uS-Ij>Y%+~I`8Js#Sp+TowC(L>m?lrR%0 zn^0ai<}pahs)0eOyu3gciN^c~S(G<|SqzdU#a6v%ZY^sUkvWt8pgd+VNV;cvL-m%p z_o-ck9gFuM%2wFG$crMmaSH(d%}qBGrd-rnKXPq%D@qj_j7RUCac| zlenbn!dWM3Xx@>HNr;)C=ItYW2z6y@|3c$9UjqsKVqzw!Wkt*^DzEn*8dhEb^C}cx zu=K)1u6khS4(BbLS-b~XC_fPqvtOv+5ba6_?y#sh>7a#rd#o@Q?MltMV~>z@(5!NE zm|NkI!yC*Ha@J&%BNLJivTt(d4jZ;adrT|lE|fpy>3a{Ntf0I%%&lseDqm>3LkTjhPQ}r)3EGX*n~luMJcAcMWhgWA208Mm1OcicvjZ hrT!g(Kp^nn`~bL#Y`pXgT5N06u_3W-W3QHX-jP--+jglKhwghC-vNfbmODg}i^loAOA z@h8W5X5P%5Yu@b4tgXy1IkCIv+?$iJd2dUlf`WpAzXw2#>ZiJ?vi5($&=&R7q-JCG zu29d2@=4uL6`c>Dxu=HmupsueQ@1)0!-VV+Kx3R*bZ9@E$6AbUH7xes1rxvp#M9vG zAw-{Ar}a|7fmJa)pnVN9qauH*eFH!5qQ3mhrS=m+_Ch-%-=lpCynT*4MDy_8)7C7 z^J}uK=TgDJK6pR6j5@UM0^Z>`5AW$*`G3u|(yOxt1qJ__ZxSs|!zCT#Hvj+t07*qo IM6N<$f_p^pasU7T diff --git a/app/src/main/res/drawable-hdpi/ic_status.png b/app/src/main/res/drawable-hdpi/ic_status.png new file mode 100644 index 0000000000000000000000000000000000000000..e273b682e3d3488b0682e2561d77f982c44fcc85 GIT binary patch literal 368 zcmV-$0gwKPP)+ zc_FS9%^1vq3qR-n!qFKl6f&7iM4WRKKcmRAqdTVf#iL8dlaATYZzN!ggYNV;0S_EB z)Y}A%te{&zB}^UefSf!Fr{ubDN917xlOoraw~8}a{F-1 z{|n+H+k;#5$PUScBa?_<9a(J5pnLc6&n1@4fOXW@d}Iot`kCY)UK;I82qGblDW$l^yqvrD}w?(1P)!AS8nwg)^seA06cWNSZ~c$m@vKEQ6uxAN z-I;l_+3ZFle|`$3R1T^`EvU*qgG?D3Kyy(S%5qKzH_$pebPMcXd1nCG7<80ggMAOL4j>nYw$f>{f5$5W$Rwbhz1EDrBk^#5K Q)c^nh07*qoM6N<$f()~UF#rGn diff --git a/app/src/main/res/drawable-mdpi/ic_mode_abc.png b/app/src/main/res/drawable-mdpi/ic_mode_abc.png deleted file mode 100644 index b6d77838d73d78595421630aadbcba98b1214f55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)snplMl!z?Ab$C41dLnGRBT1E5>xusE05ojD7w`>y zRkT4Ifa@-M&f(#hZ;K78Z}`RC-{xd(z#9C?^((Kc?bxGD8#!#B4JU!y0M%)zwa6zu zFBF20a5FF)@ZdRXv#edlnij|4Rd`*}IafbvI^=A?p64dvuZZxTO}PqL8!+d&3H&|N zgY^L$j$O`bcbRZvHlXUc3H&3|gLM=Ba+!{#`(JeAxk>lR>?i41wp_;e6gMgw@a8#d zE37pU)l diff --git a/app/src/main/res/drawable-mdpi/ic_mode_abc_uppercase.png b/app/src/main/res/drawable-mdpi/ic_mode_abc_uppercase.png deleted file mode 100644 index a7bd3fd19a58f11ba068b303a90ef64e5cd64af5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 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 S*DfXi0000@!Q-K-Edovq&+lA2fAB`m%+2lM zrswQDE7oFM`XXRZvi^srhQKC3L~HYnT8Me wtF?GHrN5JV_is;~iP`)4*INagbo#U>yx2A|W0(1EU`Q}{y85}Sb4q9e07jCA5dZ)H literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_123.png b/app/src/main/res/drawable-xxhdpi/ic_mode_123.png deleted file mode 100644 index a11b9f45b1635a1353b80d906f7ec4eb28c6823a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 911 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 diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_predictive.png b/app/src/main/res/drawable-xxhdpi/ic_mode_predictive.png deleted file mode 100644 index 804b89d585183b3a7e1867a4dc5a5d1186b00df1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1040 zcmV+r1n>KaP)YOuvyI9ymajti>YJGbHh%?Ye0i695Am4$^Mfa zVxAjzGF}4;?^5G1uLxa!mG#sw$@n+H1v?q90li{jHO#ysbp25lH0zn`f?Z5I2h`HL zj?^E}9_G4W7vnXc=PVpBuLxa!n)S>%=DJ`P<29fsEF3Ve2#H4|SspUi1-lrp0bOC? zfO$noymrgPTo-I&yau$6g-tJW^U!q*CB9>2V!jJDF)jlNSlHZSULLxxpM|P1-vyf( z&jH;&>9vu;RvLQ`B^k?j>cQ8ABXE)u!(USP@wf5v4IJ% zCwFPx`BC_KUgJ}BQk83bAYfk?Y+_so z6iECtndl>)Ji-aVWj+|NrwcYQ?gI+6?o5q0Y*xTlt8<4>sK@N*f?Z5o22`Q-w`;s+ z(*_1KI;+-a4SDKaYUCmD_2z@dkj99{sC^CRK8Kkf{M}}a-OO{rE@sjO)C_LctYV%E zb}^+LknZguH!Dqk2#^aqnKBP(n46UbpXj!XolGeQr2FdTMokxU-LR7>>ws=?qiTeC zuGr0#Za})HE!?Cz!dzGEW=b_6i8p6t9h8kS*Bv{W(hNxAooHFYg>HM^+N-gvaUGDv z-+*x8c}jBJ%~7Gb7ixA@>mu{pf?Z8J21Mb4GhBFXmU!n`kHpuR{Zi)x$0{v-bW{jC zo5>hZv%=ZZH1=p4b~j}mP(N$89d}^72Q*jXJDU{nOj@}OxE0#?Y)0&4UaKUYDz4Qy zQ~9oQ2zyz^TK^6G=4VU1yFQ!`RigcG-AR%pNs=Tf&UMYTMzxSACT>aXRyN2Z-6jdXZn3YfAIs5TM(;9<*S)+nh zcae;yojIPL#g=n#ITBOn`ItqW+w4e<$pS?`(VUi_1`A?;?~Y7zh+E!Z7yMOY!fJQ( z@AFD?`L_1Yx3$k3YPD^@n_01jFtLfe5SeiA+ppb<;Z@SowOq&cP5poI;(D8n z`A_$M%8j~iU-%mCls~GnV54C~ZP3xTmtP$`yEpAuSl#a0Q(x9@NuRZ?66$*Um*y`; z0yrfC8W>rj!~+e+t9Id9Започвай всеки ред с главна буква, дори и да е в средата на изречение. Езици Изтрий всички - Икона за режима на писане - Покажи текущия режим на писане с уведомителна икона. + Икона за активност + Показвай икона, когато %1$s е активен. Отмени зареждането Неуспешно зареждане. Невалидна дума „%1$s“ на ред %2$d за език „%3$s“. Несупешно зареждане на речник за език „%1$s“ (%2$s). diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e84e340e..f8353ba0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -33,8 +33,8 @@ Jede Zeile mit einem Großbuchstaben beginnen, auch wenn es mitten im Satz ist. Sprachen - Icon für den Schreibmodus - Den aktuellen Schreibmodus mit einem Icon anzeigen. + Aktivitäticon + Ein Icon anzeigen, wenn %1$s aktiv ist. Laden abbrechen Laden abgebrochen. Wörterbuch laden abgeschlossen. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2b9ab5d7..6a60a412 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -46,8 +46,8 @@ Borrar todos Borrar no seleccionados Diccionario eliminado con éxito. - Icono del modo de escritura - Indicar el modo de escritura actual con un icono. + Icono de actividad + Mostrar un icono cuando %1$s está activo. Cancelar la carga Mayúsculas automáticas Escribir la primera letra de cada frase en mayúscula. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cf3c65a2..134c34d6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -23,8 +23,8 @@ Commencer chaque ligne avec une majuscule, même si elle est au milieu d\'une phrase. Langues Supprimer tous - Icône du mode de saisie - Indiquer le mode de saisie actuel avec une icône. + Icône d\'activité + Afficher une icône lorsque %1$s est actif. Annuler le chargement Echec du chargement de dictionnaire pour langue «%1$s» (%2$s). Chargement du dictionnaire terminé. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 411cf69a..df0a5750 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -34,8 +34,8 @@ Iniziare ogni riga con una lettera maiuscola, anche se è nel mezzo di una frase. Lingue - Icona modalità di digitazione - Indicare la modalità di digitazione attuale con un\'icona. + Icona di attività + Mostrare un\'icona quando %1$s è attivo. Annullare il caricamento Caricamento del dizionario terminato. Caricamento del dizionario (%1$s)… diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 1656614e..51819050 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -46,8 +46,8 @@ רשימת מילים בלבד עזרה - סמל מצב הקלדה - לציין את מצב הקלדה הנוכחי באמצעות סמל. + סמל הפעילות + להציג סמל כאשר %1$s פעיל. ביטול טעינה הטעינה נכשלה. מילה לא חוקית \"%1$s\" בשורה %2$d עבור \"%3$s\". נכשלה טעינת המילון עבור \"%1$s\" (%2$s). diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index daac60fc..fe9bb1ed 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -55,8 +55,8 @@ Atvirkštinė klavišų tvarka Įjunkite šį nustatymą jei pirmoje eilutėje turite 7–8–9, o ne 1–2–3. - Rašymo režimo piktograma - Nurodyti dabartinį rašymo režimą piktograma. + Aktyvumo piktograma + Rodyti piktogramą, kai %1$s yra aktyvus. Atšaukti įkėlimą Įkelti \"%3$s\" kalbos nepavyko. Klaida %2$d eilutėje, netinkamas žodis - \"%1$s\". Klaida įkeliant \"%1$s\" (%2$s) kalbos žodyną. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f182fe3b..159c156e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -31,8 +31,8 @@ Automatische hoofdletters op elke regel Elke regel beginnen met een hoofdletter, zelfs als het midden van een zin is. Talen - Typemodus-icoon - Geef de huidige typmodus aan met een icoon. + Activiteitsicoon + " Een icoon tonen wanneer %1$s actief is." Laden annuleren Laden geannuleerd. Woordenboek laden voltooid. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2497bea5..289ebb53 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -47,8 +47,8 @@ Apenas lista de palavras Ajuda - Ícone do modo de digitação - Indique o modo de digitação atual com um ícone. + Ícone de ativação + Mostrar um ícone quando %1$s está ativo. Cancelar Carregamento Falha no carregamento. \"%1$s\" na linha %2$d do idioma \"%3$s\". Falha no carregamento do dicionário para o idioma \"%1$s\" (%2$s). diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9845c921..05be7227 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -23,8 +23,8 @@ Начинать каждую строку с заглавной буквы, даже если она в середине предложения. Языки Удалить все - Иконка режима ввода - Отображать текущий режим ввода с помощью иконки. + Иконка активности + Показать иконку, когда %1$s активен. Отменить загрузку Ошибка загрузки словаря для языка «%1$s» (%2$s). Загрузка словаря завершена. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 926427fd..f5c40f6f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -60,8 +60,8 @@ Зворотній порядок клавіш Використовуйте це налаштування, якщо у вас в першому ряді 7–8–9 замість 1–2–3. - Іконка режиму введення - Показати поточний режим введення за допомогою іконка. + Іконка активності + Показати іконку, коли %1$s активний. Скасувати завантаження Завантаження не вдалося. Невірне слово \"%1$s\" у рядку %2$d мови \"%3$s\". Не вдалося завантажити словник для мови \"%1$s\" (%2$s). diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b9729d1..65a863e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,8 +66,8 @@ Suggestion list only Reverse Key Order Use this if you have 7–8–9 on the first row, instead of 1–2–3. - Typing Mode Icon - Show a status icon indicating the current typing mode. + Activeness Icon + Show an icon when %1$s is active. Cancel Loading Loading failed. Invalid word \"%1$s\" on line %2$d of language \"%3$s\".