drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 05:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Use nav-auto theme setting by default

Browse Source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond
2025-05-20 18:14:08 +01:00
parent 158c9b1ee9
commit 1813e3da3c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/java/app/organicmaps/util/Config.java
View File

@@ -231,6 +231,7 @@ public final class Config
@NonNull @NonNull
public static String getCurrentUiTheme(@NonNull Context context) public static String getCurrentUiTheme(@NonNull Context context)
{ {
// This is the actual map theme, only set to theme_default/night
String defaultTheme = MwmApplication.from(context).getString(R.string.theme_default); String defaultTheme = MwmApplication.from(context).getString(R.string.theme_default);
String res = getString(KEY_MISC_UI_THEME, defaultTheme); String res = getString(KEY_MISC_UI_THEME, defaultTheme);
@@ -251,7 +252,8 @@ public final class Config
@NonNull @NonNull
public static String getUiThemeSettings(@NonNull Context context) public static String getUiThemeSettings(@NonNull Context context)
{ {
String defaultSetting = MwmApplication.from(context).getString(R.string.theme_default); // This is the default theme *mode*, eg. auto/dark/nav_auto/light.
String defaultSetting = MwmApplication.from(context).getString(R.string.theme_nav_auto);
String res = getString(KEY_MISC_UI_THEME_SETTINGS, defaultSetting); String res = getString(KEY_MISC_UI_THEME_SETTINGS, defaultSetting);
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res) || ThemeUtils.isNavAutoTheme(context, res)) if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res) || ThemeUtils.isNavAutoTheme(context, res))
return res; return res;