From 1454b3c36480ade6951f03921e79b6177faf5994 Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Wed, 28 May 2025 16:12:38 +0100 Subject: [PATCH] Fix theme switching to light in auto themes Signed-off-by: Harry Bond --- .../src/main/java/app/organicmaps/util/ThemeSwitcher.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java index 92ee3b8e1..9bcfe77c3 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java @@ -32,17 +32,17 @@ public enum ThemeSwitcher @Override public void run() { - boolean navAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext); + boolean isNavAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext); // Cancel old checker UiThread.cancelDelayedTasks(mAutoThemeChecker); - if (navAuto || ThemeUtils.isAutoTheme(mContext)) + if (isNavAuto || ThemeUtils.isAutoTheme(mContext)) { UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS); setThemeAndMapStyle(calcAutoTheme()); } - else - setThemeAndMapStyle(Config.getCurrentUiTheme(mContext)); + else // Only reached when an auto mode should be light + setThemeAndMapStyle(mContext.getResources().getString(R.string.theme_default)); } };