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

banish is{theme} checkers

Browse source 
nav-auto not working, RoutingController.get().isVehicleNavigation() doesn't work??? maybe called too early before it's set?
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond 2025-03-04 17:37:34 +00:00
parent 6074f4bfd1
commit b65e4cfa30
3 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
View file

@ -46,7 +46,7 @@ public class TrafficButton
void turnOff()
{
stopWaitingAnimation();
// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
// TODO: Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
// mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
// : R.drawable.ic_traffic_on);
}
@ -54,7 +54,7 @@ public class TrafficButton
void turnOn()
{
stopWaitingAnimation();
// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
// TODO: Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
// mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
// : R.drawable.ic_traffic_on);
}
@ -62,7 +62,7 @@ public class TrafficButton
void markAsOutdated()
{
stopWaitingAnimation();
// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
// TODO: Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
// mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_outdated_night
// : R.drawable.ic_traffic_outdated);
}

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

@ -93,7 +93,7 @@ public enum ThemeSwitcher
return calcAutoTheme();
else if (ThemeUtils.isNavAutoTheme(mContext, theme))
{
// navauto always falls back to light mode
// navauto should always be light, except in nav mode
if (RoutingController.get().isVehicleNavigation())
return calcAutoTheme();
else

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

@ -50,44 +50,24 @@ public final class ThemeUtils
return defaultTheme.equals(theme);
}
public static boolean isNightTheme(@NonNull Context context)
{
return isNightTheme(context, Config.getThemeSettings(context));
}
public static boolean isNightTheme(@NonNull Context context, String theme)
{
String nightTheme = context.getString(R.string.theme_night);
return nightTheme.equals(theme);
}
public static boolean isSystemTheme(@NonNull Context context)
{
return isSystemTheme(context, Config.getThemeSettings(context));
}
public static boolean isSystemTheme(@NonNull Context context, String theme)
{
String followSystemTheme = context.getString(R.string.theme_follow_system);
return followSystemTheme.equals(theme);
}
public static boolean isNavAutoTheme(@NonNull Context context)
{
return isNavAutoTheme(context, Config.getThemeSettings(context));
}
public static boolean isNavAutoTheme(@NonNull Context context, String theme)
{
String navAutoTheme = context.getString(R.string.theme_nav_auto);
return navAutoTheme.equals(theme);
}
public static boolean isAutoTheme(@NonNull Context context)
{
return isSystemTheme(context, Config.getThemeSettings(context));
}
public static boolean isAutoTheme(@NonNull Context context, String theme)
{
String followSystemTheme = context.getString(R.string.theme_auto);