From 6e0c32b17d3d5341115a73eb6091f76aac250c71 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Wed, 30 Apr 2025 18:06:11 +0300
Subject: [PATCH] the LF4 key now displays the language in Predictive mode
 (also no more toast on mode change, except in invisible mode)

---
 .../java/io/github/sspanak/tt9/ime/HotkeyHandler.java |  6 +++---
 .../io/github/sspanak/tt9/ime/MainViewHandler.java    |  2 +-
 .../io/github/sspanak/tt9/languages/LocaleCompat.java | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

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 92be7420..7fb0ec7d 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
@@ -318,7 +318,7 @@ public abstract class HotkeyHandler extends CommandHandler {
 		statusBar.setText(mInputMode);
 		suggestionOps.setRTL(isLanguageRTL);
 		mainView.render();
-		if (!suggestionOps.isEmpty() || settings.isMainLayoutStealth()) {
+		if (settings.isMainLayoutStealth() && !settings.isStatusIconEnabled()) {
 			UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
 		}
 
@@ -347,7 +347,7 @@ public abstract class HotkeyHandler extends CommandHandler {
 		statusBar.setText(mInputMode);
 		mainView.render();
 
-		if (settings.isMainLayoutStealth()) {
+		if (settings.isMainLayoutStealth() && !settings.isStatusIconEnabled()) {
 			UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
 		}
 
@@ -373,7 +373,7 @@ public abstract class HotkeyHandler extends CommandHandler {
 		statusBar.setText(mInputMode);
 		mainView.render();
 
-		if (settings.isMainLayoutStealth()) {
+		if (settings.isMainLayoutStealth() && !settings.isStatusIconEnabled()) {
 			UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
 		}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java
index 8b9a9fbd..96c1ba13 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java
@@ -136,7 +136,7 @@ abstract public class MainViewHandler extends HotkeyHandler {
 		} else if (InputModeKind.isKatakana(mInputMode)) {
 			return "ア";
 		}  else if (InputModeKind.isPredictive(mInputMode)) {
-			return "T9";
+			return mLanguage != null ? mLanguage.getCode().toUpperCase(mLanguage.getLocale()) : "T9";
 		} else if (InputModeKind.isNumeric(mInputMode)){
 			return "123";
 		} else {
diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/LocaleCompat.java b/app/src/main/java/io/github/sspanak/tt9/languages/LocaleCompat.java
index dee25934..c73d213e 100644
--- a/app/src/main/java/io/github/sspanak/tt9/languages/LocaleCompat.java
+++ b/app/src/main/java/io/github/sspanak/tt9/languages/LocaleCompat.java
@@ -41,15 +41,22 @@ class LocaleCompat {
 		return switch (language) {
 			case "ar" -> "ع";
 			case "bg" -> "бг";
-			case "en" -> ("in".equals(country)) ? "hn" : language; // en-IN = Hinglish
+			case "en" -> "in".equals(country) ? "hn" : language; // en-IN = Hinglish
 			case "fa" -> "ف";
 			case "fi" -> "su";
+			case "el" -> "ελ";
+			case "gu" -> "ગુ";
 			case "he", "iw" -> "אב";
+			case "hi" -> "ह";
 			case "hu" -> "mg";
 			case "ji", "yi" -> "יי";
+			case "ja" -> "漢";
+			case "ko" -> "한";
 			case "ru" -> "ру";
+			case "th" -> "ไท";
 			case "uk" -> "ук";
-			case "zgh" -> "tm";
+			case "zgh" -> "dz".equals(country) ? "tm" : "ⵜⵎ";
+			case "zh" -> "cn".equals(country) ? "拼" : language;
 			case "ca", "ga", "sw" -> language;
 			default -> country;
 		};