瀏覽代碼

Fix navigationbar in all activity

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
Joris Bodin 5 年之前
父節點
當前提交
183e1eb77b
共有 3 個文件被更改,包括 39 次插入4 次删除
  1. 13 0
      src/main/res/values-night-v21/styles.xml
  2. 10 4
      src/main/res/values-v21/styles.xml
  3. 16 0
      src/main/res/values-v27/styles.xml

+ 13 - 0
src/main/res/values-night-v21/styles.xml

@@ -22,4 +22,17 @@
     <style name="Theme.ownCloud.Toolbar.Drawer">
         <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
+
+    <style name="Theme.ownCloud.Toolbar" parent="Theme.ownCloud.ToolbarBase">
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
+    <style name="Theme.ownCloud" parent="Theme.ownCloudBase">
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
+    <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase21">
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
 </resources>

+ 10 - 4
src/main/res/values-v21/styles.xml

@@ -18,16 +18,20 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- General ownCloud app style -->
-    <style name="Theme.ownCloud" parent="BaseTheme.ownCloud">
+    <style name="Theme.ownCloudBase" parent="BaseTheme.ownCloud">
         <item name="android:actionModeBackground">@color/action_mode_background</item>
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
     </style>
 
-    <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase">
+    <style name="Theme.ownCloud" parent="Theme.ownCloudBase" />
+
+    <style name="FallbackThemingThemeBase21" parent="FallbackThemingThemeBase">
         <item name="android:actionModeBackground">@color/action_mode_background</item>
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
     </style>
 
+    <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase21" />
+
     <style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
         <item name="colorPrimary">@color/bg_default</item>
         <item name="android:textAllCaps">false</item>
@@ -51,16 +55,18 @@
         <item name="android:windowBackground">@color/bg_default</item>
     </style>
 
-    <style name="Theme.ownCloud.Toolbar" parent="BaseTheme.ownCloud.Toolbar">
+    <style name="Theme.ownCloud.ToolbarBase" parent="BaseTheme.ownCloud.Toolbar">
         <item name="android:actionModeBackground">@color/action_mode_background</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
+    <style name="Theme.ownCloud.Toolbar" parent="Theme.ownCloud.ToolbarBase" />
+
     <style name="Theme.ownCloud.Toolbar.DrawerBase" parent="Theme.ownCloud.Toolbar">
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="Theme.ownCloud.Toolbar.Drawer" parent="Theme.ownCloud.Toolbar.DrawerBase"/>
+    <style name="Theme.ownCloud.Toolbar.Drawer" parent="Theme.ownCloud.Toolbar.DrawerBase" />
 
     <!-- Launch screen -->
     <style name="Theme.ownCloud.Launcher">

+ 16 - 0
src/main/res/values-v27/styles.xml

@@ -24,4 +24,20 @@
         <item name="android:windowLightNavigationBar">true</item>
         <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
+
+    <style name="Theme.ownCloud.Toolbar" parent="Theme.ownCloud.ToolbarBase">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
+    <style name="Theme.ownCloud" parent="Theme.ownCloudBase">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
+    <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase21">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
 </resources>