gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

cvbg

Browse source
This commit is contained in:
Harry Bond 2024-12-15 19:39:45 +00:00
parent 2383c021b9
commit 54c8a4c8ed
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/app/src/main/java/app/organicmaps/util/Config.java
View file

@ -276,12 +276,13 @@ public final class Config
@NonNull
public static String getUiThemeSettings(@NonNull Context context)
{
String followSystemTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
String res = getString(KEY_MISC_UI_THEME_SETTINGS, followSystemTheme);
// Fallback & default theme
String fallbackTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
String res = getString(KEY_MISC_UI_THEME_SETTINGS, fallbackTheme);
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isValidThemeMode(context, res))
return res;
return followSystemTheme;
return fallbackTheme;
}
public static boolean setUiThemeSettings(@NonNull Context context, String theme)

6
android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
View file

@ -84,6 +84,10 @@ public enum ThemeSwitcher
{
if (ThemeUtils.isFollowSystemTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
else if (ThemeUtils.isAutoTheme(mContext, theme)) //TODO: Proper behaviour
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
else if (ThemeUtils.isNavAutoTheme(mContext, theme)) //TODO: Proper behaviour
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
else if (ThemeUtils.isNightTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
else if (ThemeUtils.isDefaultTheme(mContext, theme))
@ -103,7 +107,7 @@ public enum ThemeSwitcher
else
style = Framework.MAP_STYLE_DARK;
}
else
else//TODO: and here?
{
if (RoutingController.get().isVehicleNavigation())
style = Framework.MAP_STYLE_VEHICLE_CLEAR;