浏览代码

fixed splash background for light theme

sirekanian 3 年之前
父节点
当前提交
7c94498f4a

+ 1 - 2
app/src/main/AndroidManifest.xml

@@ -19,8 +19,7 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.Warmongr">
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

+ 7 - 0
app/src/main/res/values-notnight/colors.xml

@@ -0,0 +1,7 @@
+<resources>
+    <color name="appWindowBackground">#fcfcfc</color>
+    <color name="appStatusBarColor">#00000000</color>
+    <color name="appNavigationBarColor">#E6FFFFFF</color>
+    <bool name="appWindowLightStatusBar">true</bool>
+    <bool name="appWindowLightNavigationBar">true</bool>
+</resources>

+ 0 - 11
app/src/main/res/values-notnight/themes.xml

@@ -1,11 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="Theme.Warmongr" parent="android:Theme.Material.Light.NoActionBar">
-        <item name="android:windowBackground">@color/app_splash_background_color</item>
-        <item name="android:statusBarColor">#00000000</item>
-        <item name="android:navigationBarColor">#E6FFFFFF</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
-        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
-    </style>
-
-</resources>

+ 5 - 1
app/src/main/res/values/colors.xml

@@ -1,3 +1,7 @@
 <resources>
-    <color name="app_splash_background_color">#191c1d</color>
+    <color name="appWindowBackground">#201a19</color>
+    <color name="appStatusBarColor">#00000000</color>
+    <color name="appNavigationBarColor">#66000000</color>
+    <bool name="appWindowLightStatusBar">false</bool>
+    <bool name="appWindowLightNavigationBar">false</bool>
 </resources>

+ 10 - 6
app/src/main/res/values/themes.xml

@@ -1,11 +1,15 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.Warmongr" parent="android:Theme.Material.Light.NoActionBar">
-        <item name="android:windowBackground">@color/app_splash_background_color</item>
-        <item name="android:statusBarColor">#00000000</item>
-        <item name="android:navigationBarColor">#66000000</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
+    <style name="Theme.Warmongr" parent="android:Theme.Material.NoActionBar">
+        <item name="android:windowBackground">@color/appWindowBackground</item>
+        <item name="android:statusBarColor">@color/appStatusBarColor</item>
+        <item name="android:navigationBarColor">@color/appNavigationBarColor</item>
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">
+            @bool/appWindowLightStatusBar
+        </item>
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">
+            @bool/appWindowLightNavigationBar
+        </item>
     </style>
 
 </resources>