diff options
| author | cyberta <cyberta@riseup.net> | 2023-07-25 16:30:23 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2023-07-25 16:30:23 +0000 |
| commit | b6988c2279542f5a7ed4c993a4ddd1230bf9e25f (patch) | |
| tree | 8072357693729582a1338f72af7c0c377af850b4 /app | |
| parent | 827999508878b319af3201bdc271521dcbbeaea2 (diff) | |
| parent | 6628a36a9272251793cd2ac7ea288fc7f5f50ebf (diff) | |
Merge branch 'custom_splash_background_color' into 'master'
make it easier to set splash screen background color in custom flavor
See merge request leap/bitmask_android!251
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/custom/res/values/custom-theme.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values-v31/themes.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/normal/res/values-v31/themes.xml | 8 |
4 files changed, 6 insertions, 9 deletions
diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml index 771fd745..70e4616e 100644 --- a/app/src/custom/res/values/custom-theme.xml +++ b/app/src/custom/res/values/custom-theme.xml @@ -26,4 +26,6 @@ <color name="color_font_btn_secondary">@color/black800</color> <!-- button text colors in Alerts --> <color name="color_font_btn">@color/black800</color> + <!-- background color of the splash screen --> + <color name="windowSplashScreenBackgroundColor">@color/colorPrimary</color> </resources> diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml index 81d6c19e..b6be6192 100644 --- a/app/src/main/res/values-v31/themes.xml +++ b/app/src/main/res/values-v31/themes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> - <item name="android:windowSplashScreenBackground">@color/colorPrimary</item> + <item name="android:windowSplashScreenBackground">@color/windowSplashScreenBackgroundColor</item> <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item> <item name="android:windowSplashScreenBrandingImage">@drawable/splash_branding</item> </style> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3e33c72b..0189bacf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -80,4 +80,7 @@ <!-- default action bar colors used in other fragments than EipFragment --> <color name="colorActionBarTitleFont">@color/white</color> <color name="colorActionBarSubtitleFont">@color/black800</color> + + <!-- background color of the splash screen --> + <color name="windowSplashScreenBackgroundColor">@color/white</color> </resources> diff --git a/app/src/normal/res/values-v31/themes.xml b/app/src/normal/res/values-v31/themes.xml deleted file mode 100644 index 7ea17424..00000000 --- a/app/src/normal/res/values-v31/themes.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> - <item name="android:windowSplashScreenBackground">@color/white</item> - <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item> - <item name="android:windowSplashScreenBrandingImage">@drawable/splash_branding</item> - </style> -</resources>
\ No newline at end of file |