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

minor rename

Browse source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond 2025-01-19 19:54:34 +00:00
parent 2ab8eb336f
commit 36b136bed5
1 changed files with 3 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/ThemeSwitcher.java
View file

@ -47,7 +47,7 @@ public enum ThemeSwitcher
mRendererActive = isRendererActive;
String storedTheme = Config.getThemeSettings(mContext);
// TODO: Handle debug commands
String resolvedTheme = resolveCustomThemes(storedTheme);
String resolvedTheme = resolveBasicTheme(storedTheme);
setAndroidTheme(resolvedTheme);
// Depends on Android theme being set due to follow-system, so has to be after setAndroidTheme.
int resolvedMapStyle = resolveMapStyle(resolvedTheme);
@ -68,7 +68,6 @@ public enum ThemeSwitcher
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
else
throw new IllegalArgumentException(theme+" passed, but only follow-system/theme_light/dark are allowed.");
}
private void setMapStyle(@Framework.MapStyle int style)
@ -86,10 +85,10 @@ public enum ThemeSwitcher
}
/**
* Process custom themes (auto, navauto) to default ones (light, dark, follow-system)
* resolve custom themes (auto, navauto) to basic system ones (light, dark, follow-system)
* @return theme handle-able by android theme system.
*/
private String resolveCustomThemes(@NonNull String theme)
public String resolveBasicTheme(@NonNull String theme)
{
if (ThemeUtils.isAutoTheme(mContext, theme))
return calcAutoTheme();