瀏覽代碼

Remove redundant style

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
Joris Bodin 5 年之前
父節點
當前提交
a475af6ac6

+ 0 - 1
src/main/res/values-v19/styles.xml

@@ -29,5 +29,4 @@
         <item name="windowActionBarOverlay">true</item>
     </style>
 
-    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
 </resources>

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

@@ -76,7 +76,10 @@
         <item name="android:textColorHint">@color/secondary_text_color</item>
     </style>
 
-    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase">
+    <style name="Theme.ownCloud.noActionBar.LoginBase21" parent="Theme.ownCloud.noActionBar.LoginBase">
         <item name="android:navigationBarColor">@color/primary</item>
     </style>
+
+    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase21" />
+
 </resources>

+ 1 - 2
src/main/res/values-v27/styles.xml

@@ -40,9 +40,8 @@
         <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
 
-    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase">
+    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase21">
         <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:navigationBarColor">@color/primary</item>
     </style>
 
 </resources>

+ 2 - 2
src/main/res/values/styles.xml

@@ -95,8 +95,6 @@
 	<!-- separate style for Drawer activities needed for v21+ theming -->
 	<style name="Theme.ownCloud.Toolbar.Drawer" parent="Theme.ownCloud.Toolbar"/>
 
-    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
-
     <style name="Theme.ownCloud.noActionBar.LoginBase" parent="Theme.ownCloud.Toolbar">
 		<item name="android:windowBackground">@color/primary</item>
         <item name="colorControlNormal">@color/login_text_color</item>
@@ -106,6 +104,8 @@
 		<item name="android:textColorHint">@color/login_text_hint_color</item>
 	</style>
 
+    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
+
 	<style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:textColorPrimary">@color/primary</item>