Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9765 from osmandapp/splash_test

Browse source 
Change Splash Screen background and status bar colors
This commit is contained in:
Vitaliy 2020-09-08 11:30:05 +03:00 committed by GitHub
commit 16cfc5bc1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-night/colors.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="splash_screen_background_color">@color/map_background_color_dark</color> <color name="splash_screen_background_color">@color/list_background_color_dark</color>
</resources> </resources>

10
OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
View file

@ -34,6 +34,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
public static boolean SHOW = true; public static boolean SHOW = true;
public static boolean VISIBLE = false; public static boolean VISIBLE = false;
private boolean systemDefaultNightMode;
public MapActivity getMapActivity() { public MapActivity getMapActivity() {
return (MapActivity) getActivity(); return (MapActivity) getActivity();
} }
@ -77,14 +79,14 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
OsmandApplication app = requireMyApplication(); OsmandApplication app = requireMyApplication();
FragmentActivity activity = requireActivity(); FragmentActivity activity = requireActivity();
UiUtilities iconsCache = app.getUIUtilities(); UiUtilities iconsCache = app.getUIUtilities();
boolean systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() && systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() &&
!app.getSettings().isLightSystemDefaultTheme(); !app.getSettings().isLightSystemDefaultTheme();
RelativeLayout view = new RelativeLayout(activity); RelativeLayout view = new RelativeLayout(activity);
view.setOnClickListener(null); view.setOnClickListener(null);
int backgroundColorId = systemDefaultNightMode ? int backgroundColorId = systemDefaultNightMode ?
R.color.map_background_color_dark : R.color.list_background_color_dark :
R.color.map_background_color_light; R.color.map_background_color_light;
view.setBackgroundColor(getResources().getColor(backgroundColorId)); view.setBackgroundColor(getResources().getColor(backgroundColorId));
@ -184,6 +186,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
@Override @Override
public int getStatusBarColorId() { public int getStatusBarColorId() {
return R.color.status_bar_transparent_light; return systemDefaultNightMode ?
R.color.status_bar_color_dark :
R.color.status_bar_transparent_light;
} }
} }