merge theme for minSDK=21

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

src/main/res/values-night-v21/styles.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 Nextcloud
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <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>

src/main/res/values-v21/styles.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- General ownCloud app style -->
-    <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="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>
-        <item name="android:windowBackground">@color/bg_default</item>
-        <item name="android:textColor">@color/fg_inverse</item>
-        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
-        <item name="colorControlHighlight">@color/bg_fallback_highlight</item>
-        <item name="colorControlActivated">@color/bg_fallback_highlight</item>
-    </style>
-
-    <style name="DatePickerStyle" parent="">
-        <item name="android:headerBackground">@color/bg_fallback_highlight</item>
-        <item name="android:datePickerMode">calendar</item>
-    </style>
-
-    <style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
-        <item name="colorPrimary">#424242</item>
-        <item name="colorPrimaryDark">#212121</item>
-        <item name="colorAccent">#757575</item>
-        <item name="windowNoTitle">false</item>
-        <item name="android:windowBackground">@color/bg_default</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <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" />
-
-    <!-- Launch screen -->
-    <style name="Theme.ownCloud.Launcher">
-        <item name="android:statusBarColor">@color/primary</item>
-        <item name="android:navigationBarColor">@color/primary</item>
-        <item name="android:windowBackground">@drawable/launch_screen</item>
-        <item name="android:textColorHint">@color/secondary_text_color</item>
-    </style>
-
-    <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" />
-
-    <style name="Theme.ownCloud.Overlay" parent="Theme.ownCloud.OverlayBase">
-        <item name="android:navigationBarColor">@color/black</item>
-    </style>
-
-</resources>

src/main/res/values-v27/styles.xml

@@ -22,25 +22,21 @@
 
     <style name="Theme.ownCloud.Toolbar.Drawer" parent="Theme.ownCloud.Toolbar.DrawerBase">
         <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">
+    <style name="Theme.ownCloud" parent="BaseTheme.ownCloud">
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
 
-    <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase21">
+    <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase">
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
 
-    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase21">
+    <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase">
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 

src/main/res/values/styles.xml

@@ -35,6 +35,9 @@
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorSecondary">@color/secondary_text_color</item>
         <item name="searchViewStyle">@style/ownCloud.SearchView</item>
+        <item name="android:actionModeBackground">@color/action_mode_background</item>
+        <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
+        <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
 
     <style name="Theme.ownCloud" parent="BaseTheme.ownCloud" />
@@ -48,6 +51,9 @@
         <item name="android:windowBackground">@color/bg_default</item>
         <item name="colorSecondary">@color/secondary_text_color</item>
         <item name="dialogTheme">@style/FallbackTheming.Dialog</item>
+        <item name="android:actionModeBackground">@color/action_mode_background</item>
+        <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
+        <item name="android:navigationBarColor">@color/bg_default</item>
     </style>
 
     <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase" />
@@ -64,13 +70,14 @@
 
     <style name="DatePickerStyle" parent="">
         <item name="android:headerBackground">@color/bg_fallback_highlight</item>
+        <item name="android:datePickerMode">calendar</item>
     </style>
 
     <style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
-		<item name="colorPrimary">#424242</item>
-		<item name="colorPrimaryDark">#212121</item>
-		<item name="colorAccent">#757575</item>
-		<item name="windowNoTitle">false</item>
+        <item name="colorPrimary">#424242</item>
+        <item name="colorPrimaryDark">#212121</item>
+        <item name="colorAccent">#757575</item>
+        <item name="windowNoTitle">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:textAllCaps">false</item>
 	</style>
@@ -91,10 +98,21 @@
         <item name="windowNoTitle">true</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>
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
+
+    <style name="Theme.ownCloud.Toolbar" parent="Theme.ownCloud.ToolbarBase" />
 
-	<!-- separate style for Drawer activities needed for v21+ theming -->
-	<style name="Theme.ownCloud.Toolbar.Drawer" parent="Theme.ownCloud.Toolbar"/>
+    <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">
+        <item name="android:navigationBarColor">@color/bg_default</item>
+    </style>
 
     <style name="Theme.ownCloud.noActionBar.LoginBase" parent="Theme.ownCloud.Toolbar">
 		<item name="android:windowBackground">@color/primary</item>
@@ -103,6 +121,7 @@
         <item name="colorControlHighlight">@color/login_text_color</item>
 		<item name="colorAccent">@color/login_text_hint_color</item>
 		<item name="android:textColorHint">@color/login_text_hint_color</item>
+        <item name="android:navigationBarColor">@color/primary</item>
 	</style>
 
     <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
@@ -204,7 +223,9 @@
 		<item name="windowActionBarOverlay">true</item>
 	</style>
 
-    <style name="Theme.ownCloud.Overlay" parent="Theme.ownCloud.OverlayBase" />
+    <style name="Theme.ownCloud.Overlay" parent="Theme.ownCloud.OverlayBase">
+        <item name="android:navigationBarColor">@color/black</item>
+    </style>
 
 	<!-- ACTION BAR STYLES -->
 	<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.MaterialComponents.Toolbar">
@@ -217,7 +238,9 @@
 
 	<!-- Launch screen -->
 	<style name="Theme.ownCloud.Launcher">
-		<item name="android:windowBackground">@drawable/launch_screen</item>
+        <item name="android:statusBarColor">@color/primary</item>
+        <item name="android:navigationBarColor">@color/primary</item>
+        <item name="android:windowBackground">@drawable/launch_screen</item>
         <item name="android:textColorHint">@color/secondary_text_color</item>
 	</style>