Forráskód Böngészése

Merge pull request #6244 from nextcloud/blackNavBar

black nav bar on image preview
Tobias Kaminsky 4 éve
szülő
commit
b2ff37505e

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

@@ -1,32 +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>
-
-    <style name="Theme.ownCloud.Overlay" parent="Theme.ownCloud">
-        <item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <!-- Support library compatibility -->
-        <item name="actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
-        <item name="windowActionBarOverlay">true</item>
-    </style>
-
-</resources>

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

@@ -82,4 +82,8 @@
 
     <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>

+ 3 - 1
src/main/res/values/styles.xml

@@ -183,7 +183,7 @@
 	</style>
 
 	<!-- separat translucent action bar style -->
-	<style name="Theme.ownCloud.Overlay" parent="@style/Theme.ownCloud">
+	<style name="Theme.ownCloud.OverlayBase" parent="Theme.ownCloud">
 		<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
 		<item name="android:windowActionBarOverlay">true</item>
 		<item name="android:windowFullscreen">true</item>
@@ -192,6 +192,8 @@
 		<item name="windowActionBarOverlay">true</item>
 	</style>
 
+    <style name="Theme.ownCloud.Overlay" parent="Theme.ownCloud.OverlayBase" />
+
 	<!-- ACTION BAR STYLES -->
 	<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.MaterialComponents.Toolbar">
 		<item name="android:background">@color/color_transparent</item>