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

dfrg

Browse source
This commit is contained in:
Harry Bond 2024-12-15 17:38:03 +00:00
parent d1b918c263
commit 7cf9de5d05
3 changed files with 16 additions and 8 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

@ -15,7 +15,6 @@ public enum ThemeSwitcher
{
INSTANCE;
private static final long CHECK_INTERVAL_MS = 30 * 60 * 1000;
private static boolean mRendererActive = false;
// private final Runnable mAutoThemeChecker = new Runnable()
@ -73,11 +72,7 @@ public enum ThemeSwitcher
{
mRendererActive = isRendererActive;
String theme = Config.getUiThemeSettings(mContext);
// if (ThemeUtils.isAutoTheme(mContext, theme) || ThemeUtils.isNavAutoTheme(mContext, theme))
// {
// mAutoThemeChecker.run();
// return;
// }
setAndroidTheme(theme);
final String themeToApply = ThemeUtils.getAndroidTheme(mContext);

9
android/app/src/main/res/values/string-arrays.xml
View file

@ -23,14 +23,19 @@
<item>0</item>
<item>1</item>
</string-array>
<string-array name="appearance">
<item>@string/follow_system</item>
<item>@string/nav_auto</item>
<item>@string/auto</item>
<item>@string/light</item>
<item>@string/dark</item>
</string-array>
<string-array name="appearance_values"
translatable="false">
<string-array name="appearance_values" translatable="false">
<item>@string/theme_follow_system</item>
<item>@string/theme_nav_auto</item>
<item>@string/theme_auto</item>
<item>@string/theme_default</item>
<item>@string/theme_night</item>
</string-array>

8
android/app/src/main/res/values/strings.xml
View file

@ -235,6 +235,14 @@
<string name="pref_zoom_summary">Display on the map</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Night Mode</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_appearance_title">Appearance</string>
<!-- Generic «Light» string (eg. light theme, not lamps) -->
<string name="light">Light</string>
<!-- Generic «Dark» string -->
<string name="dark">Dark</string>
<!-- Appearance setting, OM should follow the system theme -->
<string name="follow_system">Follow System</string>
<!-- Generic «Off» string -->
<string name="off">Off</string>
<!-- Generic «On» string -->