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

check

Browse source
This commit is contained in:
Harry Bond 2024-12-15 18:50:20 +00:00
parent 7cf9de5d05
commit 2383c021b9
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package app.organicmaps.util;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.os.Build;
import androidx.annotation.NonNull;
@ -277,7 +278,7 @@ public final class Config
{
String followSystemTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
String res = getString(KEY_MISC_UI_THEME_SETTINGS, followSystemTheme);
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isFollowSystemTheme(context, res))
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isValidThemeMode(context, res))
return res;
return followSystemTheme;

18
android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
View file

@ -107,7 +107,23 @@ public final class ThemeUtils
{
String navAutoTheme = context.getString(R.string.theme_nav_auto);
return navAutoTheme.equals(theme);
}
}
public static boolean isAutoTheme(@NonNull Context context)
{
return isFollowSystemTheme(context, Config.getCurrentUiTheme(context));
}
public static boolean isAutoTheme(@NonNull Context context, String theme)
{
String followSystemTheme = context.getString(R.string.theme_auto);
return followSystemTheme.equals(theme);
}
public static boolean isValidThemeMode(@NonNull Context context, String res)
{
return isFollowSystemTheme(context, res) || isNavAutoTheme(context, res) || isAutoTheme(context, res);
}
public static boolean isValidTheme(@NonNull Context context, String theme)
{