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

srfdtghjhfgh

Browse source
This commit is contained in:
Harry Bond 2024-12-16 21:58:31 +00:00
parent 6b0c05bdc8
commit ce9822f950
6 changed files with 71 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/java/app/organicmaps/Map.java
View file

@ -253,7 +253,7 @@ public final class Map
public void onPause(final Context context)
{
mUiThemeOnPause = Config.getCurrentUiTheme(context);
mUiThemeOnPause = Config.getUiThemeSettings(context);
// Pause/Resume can be called without surface creation/destroy.
if (mSurfaceAttached)
@ -363,7 +363,7 @@ public final class Map
private boolean isThemeChangingProcess(final Context context)
{
return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.getCurrentUiTheme(context));
return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.getUiThemeSettings(context));
}
// Engine

2
android/app/src/main/java/app/organicmaps/SplashActivity.java
View file

@ -62,7 +62,7 @@ public class SplashActivity extends AppCompatActivity
super.onCreate(savedInstanceState);
final Context context = getApplicationContext();
final String theme = Config.getCurrentUiTheme(context);
final String theme = Config.getUiThemeSettings(context);
if (ThemeUtils.isDefaultTheme(context, theme))
setTheme(R.style.MwmTheme_Splash);
else if (ThemeUtils.isNightTheme(context, theme))

4
android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
View file

@ -67,7 +67,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
protected final void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
mThemeName = Config.getCurrentUiTheme(getApplicationContext());
mThemeName = Config.getUiThemeSettings(getApplicationContext());
setTheme(getThemeResourceId(mThemeName));
EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
RtlUtils.manageRtl(this);
@ -127,7 +127,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
public void onPostResume()
{
super.onPostResume();
if (!mThemeName.equals(Config.getCurrentUiTheme(getApplicationContext())))
if (!mThemeName.equals(Config.getUiThemeSettings(getApplicationContext())))
{
// Workaround described in https://code.google.com/p/android/issues/detail?id=93731
UiThread.runLater(this::recreate);

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

@ -25,7 +25,6 @@ public final class Config
private static final String KEY_MISC_KAYAK_ACCEPTED = "IsKayakApproved";
private static final String KEY_MISC_LOCATION_REQUESTED = "LocationRequested";
private static final String KEY_MISC_UI_THEME = "UiTheme";
private static final String KEY_MISC_UI_THEME_SETTINGS = "UiThemeSettings";
private static final String KEY_MISC_USE_MOBILE_DATA = "UseMobileData";
private static final String KEY_MISC_USE_MOBILE_DATA_TIMESTAMP = "UseMobileDataTimestamp";
private static final String KEY_MISC_USE_MOBILE_DATA_ROAMING = "UseMobileDataRoaming";
@ -254,7 +253,7 @@ public final class Config
}
@NonNull
public static String getCurrentUiTheme(@NonNull Context context)
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);
@ -265,35 +264,36 @@ public final class Config
return defaultTheme;
}
static void setCurrentUiTheme(@NonNull Context context, @NonNull String theme)
{
if (getCurrentUiTheme(context).equals(theme))
return;
setString(KEY_MISC_UI_THEME, theme);
}
@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)
public static boolean setUiThemeSettings(@NonNull Context context, @NonNull String theme)
{
if (getUiThemeSettings(context).equals(theme))
return false;
setString(KEY_MISC_UI_THEME_SETTINGS, theme);
setString(KEY_MISC_UI_THEME, theme);
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();

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

@ -69,12 +69,23 @@ public enum ThemeSwitcher
{
mRendererActive = isRendererActive;
// First, set the last saved theme
String theme = Config.getUiThemeSettings(mContext);
int currentStyle = Framework.nativeGetMapStyle();
setAndroidTheme(theme);
String storedTheme = Config.getUiThemeSettings(mContext);
Config.setUiThemeSettings(mContext, storedTheme);
int currentMapStyle = Framework.nativeGetMapStyle();
// If current style is different to the style from theme, only set theme
// To handle case of debug commands
if (currentMapStyle != getMapStyle(storedTheme))
{
SetMapStyle(getMapStyle(storedTheme));
setAndroidTheme(storedTheme);
}
else
{
setAndroidTheme(storedTheme);
}
final String themeToApply = ThemeUtils.getUiTheme(mContext);
// final int style = getStyle(theme);
// final String themeToApply = ThemeUtils.getUiTheme(mContext);
// final int style = ;
// setThemeAndMapStyle(theme, style);
}
@ -83,16 +94,16 @@ 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);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
else if (ThemeUtils.isNavAutoTheme(mContext, theme)) //TODO: Proper behaviour
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
else if (ThemeUtils.isNightTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
else if (ThemeUtils.isDefaultTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
}
private int getStyle(@NonNull String theme)
private int getMapStyle(@NonNull String theme)
{
@Framework.MapStyle
int style;
@ -105,7 +116,7 @@ public enum ThemeSwitcher
else
style = Framework.MAP_STYLE_DARK;
}
else//TODO: and here?
else
{
if (RoutingController.get().isVehicleNavigation())
style = Framework.MAP_STYLE_VEHICLE_CLEAR;

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

@ -46,28 +46,28 @@ public final class ThemeUtils
return VALUE_BUFFER.resourceId;
}
public static String getUiTheme(@NonNull Context context)
{
String nightTheme = context.getString(R.string.theme_night);
String defaultTheme = context.getString(R.string.theme_default);
if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES)
return nightTheme;
if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO)
return defaultTheme;
int nightModeFlags = context.getResources()
.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES)
return nightTheme;
else
return defaultTheme;
}
// public static String getUiTheme(@NonNull Context context)
// {
// String nightTheme = context.getString(R.string.theme_night);
// String defaultTheme = context.getString(R.string.theme_default);
//
// if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES)
// return nightTheme;
//
// if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO)
// return defaultTheme;
//
// int nightModeFlags = context.getResources()
// .getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
// if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES)
// return nightTheme;
// else
// return defaultTheme;
// }
public static boolean isDefaultTheme(@NonNull Context context)
{
return isDefaultTheme(context, Config.getCurrentUiTheme(context));
return isDefaultTheme(context, Config.getUiThemeSettings(context));
}
public static boolean isDefaultTheme(@NonNull Context context, String theme)
@ -78,7 +78,7 @@ public final class ThemeUtils
public static boolean isNightTheme(@NonNull Context context)
{
return isNightTheme(context, Config.getCurrentUiTheme(context));
return isNightTheme(context, Config.getUiThemeSettings(context));
}
public static boolean isNightTheme(@NonNull Context context, String theme)
@ -89,7 +89,7 @@ public final class ThemeUtils
public static boolean isFollowSystemTheme(@NonNull Context context)
{
return isFollowSystemTheme(context, Config.getCurrentUiTheme(context));
return isFollowSystemTheme(context, Config.getUiThemeSettings(context));
}
public static boolean isFollowSystemTheme(@NonNull Context context, String theme)
@ -111,7 +111,7 @@ public final class ThemeUtils
public static boolean isAutoTheme(@NonNull Context context)
{
return isFollowSystemTheme(context, Config.getCurrentUiTheme(context));
return isFollowSystemTheme(context, Config.getUiThemeSettings(context));
}
public static boolean isAutoTheme(@NonNull Context context, String theme)