From 36932f55f97b4d1010bb650fc55658a706e5402b Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Tue, 28 Jan 2025 11:01:34 +0200
Subject: [PATCH] the dark theme is automatically applied on startup again

---
 .../java/io/github/sspanak/tt9/ime/TraditionalT9.java  |  1 -
 .../main/java/io/github/sspanak/tt9/ime/UiHandler.java | 10 +++-------
 .../io/github/sspanak/tt9/ui/main/BaseMainLayout.java  |  4 ----
 .../java/io/github/sspanak/tt9/ui/main/MainView.java   | 10 ++++++----
 4 files changed, 9 insertions(+), 16 deletions(-)

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 16af5c18..3a84e637 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
@@ -52,7 +52,6 @@ public class TraditionalT9 extends MainViewHandler {
 	public View onCreateInputView() {
 		mainView.forceCreate();
 		initTray();
-		setDarkTheme();
 		statusBar.setText(mInputMode);
 		suggestionOps.set(mInputMode.getSuggestions(), mInputMode.containsGeneratedSuggestions());
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java
index d67c37ec..c94278d4 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java
@@ -29,6 +29,7 @@ abstract class UiHandler extends AbstractHandler {
 	protected void initTray() {
 		setInputView(mainView.getView());
 		createSuggestionBar();
+		getSuggestionOps().setDarkTheme();
 		statusBar = new StatusBar(mainView.getView());
 	}
 
@@ -36,8 +37,9 @@ abstract class UiHandler extends AbstractHandler {
 	public void initUi(InputMode inputMode) {
 		if (mainView.create()) {
 			initTray();
+		} else {
+			getSuggestionOps().setDarkTheme();
 		}
-		setDarkTheme();
 		setStatusIcon(inputMode);
 		statusBar.setText(inputMode);
 		mainView.hideCommandPalette();
@@ -49,12 +51,6 @@ abstract class UiHandler extends AbstractHandler {
 	}
 
 
-	protected void setDarkTheme() {
-		mainView.setDarkTheme(settings.getDarkTheme());
-		getSuggestionOps().setDarkTheme();
-	}
-
-
 	protected void setStatusIcon(InputMode mode) {
 		if (!InputModeKind.isPassthrough(mode) && settings.isStatusIconEnabled()) {
 			showStatusIcon(R.drawable.ic_status);
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java
index f228089b..513f8cb2 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java
@@ -29,10 +29,6 @@ abstract class BaseMainLayout {
 	}
 
 
-	@Deprecated
-	void setDarkTheme(boolean dark) {}
-
-
 	/**
 	 * getKeys
 	 * Returns a list of all the usable Soft Keys. Useful for attaching click handlers and changing
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainView.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainView.java
index c187d867..17685b75 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainView.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainView.java
@@ -9,6 +9,7 @@ import io.github.sspanak.tt9.util.Logger;
 public class MainView {
 	protected final TraditionalT9 tt9;
 	protected BaseMainLayout main;
+	private boolean darkTheme;
 
 
 	protected MainView(TraditionalT9 tt9) {
@@ -20,6 +21,11 @@ public class MainView {
 	public boolean create() {
 		SettingsStore settings = tt9.getSettings();
 
+		if (darkTheme != settings.getDarkTheme()) {
+			darkTheme = settings.getDarkTheme();
+			main = null;
+		}
+
 		if (settings.isMainLayoutNumpad() && !(main instanceof MainLayoutNumpad)) {
 			main = new MainLayoutNumpad(tt9);
 		} else if (settings.isMainLayoutSmall() && (main == null || !main.getClass().equals(MainLayoutSmall.class))) {
@@ -55,10 +61,6 @@ public class MainView {
 		main.render();
 	}
 
-	public void setDarkTheme(boolean darkEnabled) {
-		main.setDarkTheme(darkEnabled);
-	}
-
 	public void showCommandPalette() {
 		if (main != null) {
 			main.showCommandPalette();