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

dfdfg

Browse source
This commit is contained in:
Harry Bond 2024-12-16 22:15:21 +00:00
parent ce9822f950
commit bfad3195ad
1 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,13 +255,13 @@ public final class Config
@NonNull
public static String getUiThemeSettings(@NonNull Context context)
{
String defaultTheme = MwmApplication.from(context).getString(R.string.theme_default);
String res = getString(KEY_MISC_UI_THEME, defaultTheme);
if (ThemeUtils.isValidTheme(context, res))
// Fallback & default theme
String fallbackTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
String res = getString(KEY_MISC_UI_THEME, fallbackTheme);
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isValidThemeMode(context, res))
return res;
return defaultTheme;
return fallbackTheme;
}
public static boolean setUiThemeSettings(@NonNull Context context, @NonNull String theme)
@ -273,27 +273,6 @@ public final class Config
return true;
}
// @NonNull
// public static String getUiThemeSettings(@NonNull Context context)
// {
// // 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 fallbackTheme;
// }
//
// public static boolean setUiThemeSettings(@NonNull Context context, String theme)
// {
// if (getUiThemeSettings(context).equals(theme))
// return false;
//
// setString(KEY_MISC_UI_THEME_SETTINGS, theme);
// return true;
// }
public static boolean isLargeFontsSize()
{
return nativeGetLargeFontsSize();