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

rename get/setThemeSettings - no longer just UI theme

Browse source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond 2024-12-28 12:14:52 +00:00
parent 637a051033
commit 4b420f8c5b
6 changed files with 15 additions and 20 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.getUiThemeSettings(context);
mUiThemeOnPause = Config.getThemeSettings(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.getUiThemeSettings(context));
return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.getThemeSettings(context));
}
// Engine

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

@ -1,7 +1,6 @@
package app.organicmaps.base;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.content.res.Configuration;
@ -14,7 +13,6 @@ import androidx.activity.SystemBarStyle;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
@ -27,7 +25,6 @@ import app.organicmaps.SplashActivity;
import app.organicmaps.util.Config;
import app.organicmaps.util.RtlUtils;
import app.organicmaps.util.ThemeSwitcher;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
@ -68,7 +65,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
protected final void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
mThemeName = Config.getUiThemeSettings(getApplicationContext());
mThemeName = Config.getThemeSettings(getApplicationContext());
//setTheme(getThemeResourceId(mThemeName));
EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
RtlUtils.manageRtl(this);
@ -128,7 +125,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
public void onPostResume()
{
super.onPostResume();
if (!mThemeName.equals(Config.getUiThemeSettings(getApplicationContext())))
if (!mThemeName.equals(Config.getThemeSettings(getApplicationContext())))
{
// Workaround described in https://code.google.com/p/android/issues/detail?id=93731
UiThread.runLater(this::recreate);

4
android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
View file

@ -395,12 +395,12 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
{
final ListPreference pref = getPreference(getString(R.string.pref_map_style));
String curTheme = Config.getUiThemeSettings(requireContext());
String curTheme = Config.getThemeSettings(requireContext());
pref.setValue(curTheme);
pref.setSummary(pref.getEntry());
pref.setOnPreferenceChangeListener((preference, newValue) -> {
final String themeName = (String) newValue;
if (!Config.setUiThemeSettings(requireContext(), themeName))
if (!Config.setThemeSettings(requireContext(), themeName))
return true;
ThemeSwitcher.INSTANCE.restart(false);

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

@ -2,7 +2,6 @@ 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;
@ -253,7 +252,7 @@ public final class Config
}
@NonNull
public static String getUiThemeSettings(@NonNull Context context)
public static String getThemeSettings(@NonNull Context context)
{
// Fallback & default theme
String fallbackTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
@ -264,9 +263,9 @@ public final class Config
return fallbackTheme;
}
public static boolean setUiThemeSettings(@NonNull Context context, @NonNull String theme)
public static boolean setThemeSettings(@NonNull Context context, @NonNull String theme)
{
if (getUiThemeSettings(context).equals(theme))
if (getThemeSettings(context).equals(theme))
return false;
setString(KEY_MISC_UI_THEME, theme);

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

@ -69,7 +69,7 @@ public enum ThemeSwitcher
public void restart(boolean isRendererActive)
{
mRendererActive = isRendererActive;
String storedTheme = Config.getUiThemeSettings(mContext);
String storedTheme = Config.getThemeSettings(mContext);
int currentMapStyle = Framework.nativeGetMapStyle();
// Resolve dynamic themes (follow-system, nav-auto etc.)

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

@ -7,7 +7,6 @@ import android.util.TypedValue;
import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import app.organicmaps.R;
@ -66,7 +65,7 @@ public final class ThemeUtils
public static boolean isDefaultTheme(@NonNull Context context)
{
return isDefaultTheme(context, Config.getUiThemeSettings(context));
return isDefaultTheme(context, Config.getThemeSettings(context));
}
public static boolean isDefaultTheme(@NonNull Context context, String theme)
@ -77,7 +76,7 @@ public final class ThemeUtils
public static boolean isNightTheme(@NonNull Context context)
{
return isNightTheme(context, Config.getUiThemeSettings(context));
return isNightTheme(context, Config.getThemeSettings(context));
}
public static boolean isNightTheme(@NonNull Context context, String theme)
@ -88,7 +87,7 @@ public final class ThemeUtils
public static boolean isSystemTheme(@NonNull Context context)
{
return isSystemTheme(context, Config.getUiThemeSettings(context));
return isSystemTheme(context, Config.getThemeSettings(context));
}
public static boolean isSystemTheme(@NonNull Context context, String theme)
@ -99,7 +98,7 @@ public final class ThemeUtils
public static boolean isNavAutoTheme(@NonNull Context context)
{
return isNavAutoTheme(context, Config.getUiThemeSettings(context));
return isNavAutoTheme(context, Config.getThemeSettings(context));
}
public static boolean isNavAutoTheme(@NonNull Context context, String theme)
@ -110,7 +109,7 @@ public final class ThemeUtils
public static boolean isAutoTheme(@NonNull Context context)
{
return isSystemTheme(context, Config.getUiThemeSettings(context));
return isSystemTheme(context, Config.getThemeSettings(context));
}
public static boolean isAutoTheme(@NonNull Context context, String theme)