X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstyles.xml;h=6bbaedf504ac8274b8d74867fab20da16c2d5179;hb=adbf486b6abcc9387ff89f87c97503a8c58aedb2;hp=b785fde08ae8be2f3127c50650dc84501aa65663;hpb=012e5595c82d6e8d0b8a46f1ef18a02a56341182;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b785fde0..6bbaedf5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,43 +18,48 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<resources>
+<resources
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- Light theme styles. -->
 
     <!-- `android:windowTranslucentStatus` makes the system status bar translucent.  When it is specified the root layout should include `android:fitsSystemWindows="true"`. -->
     <style name="PrivacyBrowserLight" parent="Theme.AppCompat.Light.NoActionBar" >
-        <item name="android:windowTranslucentStatus">true</item>
+        <item name="aboutIcon">@drawable/about_light</item>
+        <item name="addTabIconTintColor">@color/gray_700</item>
+        <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="android:textColorPrimary">@color/primary_text_color_selector_light</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="appBarTheme">@style/PrivacyBrowserAppBarLight</item>
         <item name="colorAccent">@color/blue_700</item>
-        <item name="android:textColorHighlight">@color/blue_200</item>
+        <item name="dialogTabLayoutTheme">@style/PrivacyBrowserTabLayoutDialogLight</item>
+        <item name="findOnPageIconTintColor">@color/blue_800</item>
+        <item name="mainStatusBarBackground">@color/gray_500</item>
         <item name="navigationHeaderBackground">@color/blue_700</item>
         <item name="navigationHeaderTextColor">@color/white</item>
-        <item name="appBarTheme">@style/PrivacyBrowserAppBarLight</item>
-        <item name="progressTintColor">@color/blue_700</item>
         <item name="navigationIconTintColor">@color/blue_800</item>
-        <item name="findOnPageIconTintColor">@color/blue_800</item>
-        <item name="viewSourceIconTintColor">@color/black</item>
+        <item name="progressTintColor">@color/blue_700</item>
+        <item name="redText">@color/red_a700</item>
         <item name="sslHeader">@color/blue_700</item>
         <item name="sslTitle">@color/blue_900</item>
         <item name="urlHistoryText">@color/black</item>
-        <item name="redText">@color/red_a700</item>
-        <item name="aboutIcon">@drawable/about_light</item>
-        <item name="dialogTabLayoutTheme">@style/PrivacyBrowserTabLayoutDialogLight</item>
+        <item name="viewSourceIconTintColor">@color/black</item>
+        <item name="webViewBackground">@color/gray_50</item>
     </style>
 
-    <!-- `windowActionModeOverlay` makes the contextual app bar cover the support app bar.  `colorPrimaryDark` goes behind the status bar, which is then darkened by the overlay.-->
+    <!-- `windowActionModeOverlay` makes the contextual app bar cover the support app bar. -->
     <style name="PrivacyBrowserLight.SecondaryActivity" >
         <item name="windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">false</item>
         <item name="colorPrimaryDark">@color/blue_700</item>
+        <item name="android:statusBarColor" tools:targetApi="21">@color/blue_900</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="android:actionModeBackground">@color/blue_700</item>
-        <item name="bookmarksSpinnerHeaderTextColor">@color/white</item>
-        <item name="bookmarksSpinnerTextColorSelector">@color/bookmarks_spinner_color_selector_light</item>
-        <item name="bookmarksSpinnerBackground">@color/blue_750</item>
-        <item name="editBookmarkSpinnerTextColorSelector">@color/edit_bookmark_spinner_color_selector_light</item>
-        <item name="requestsSpinnerHeaderTextColor">@color/white</item>
-        <item name="requestsSpinnerTextColorSelector">@color/requests_spinner_color_selector_light</item>
-        <item name="requestsSpinnerBackground">@color/blue_750</item>
+        <item name="spinnerHeaderTextColor">@color/white</item>
+        <item name="spinnerBackground">@color/blue_750</item>
+        <item name="spinnerTextColorSelector">@color/spinner_color_selector_light</item>
+        <item name="appbarSpinnerTextColorSelector">@color/appbar_spinner_color_selector_light</item>
+        <item name="buttonBackgroundColorSelector">@color/button_background_color_selector_light</item>
+        <item name="buttonTextColorSelector">@color/button_text_color_selector_light</item>
         <item name="listSelectorDrawable">@drawable/list_selector_light</item>
         <item name="aboutTitle">@color/blue_900</item>
         <item name="aboutText">@color/blue_700</item>
@@ -64,13 +69,17 @@
         <item name="addIcon">@drawable/add_light</item>
         <item name="addBookmarkIcon">@drawable/create_bookmark_light</item>
         <item name="addFolderIcon">@drawable/create_folder_light</item>
+        <item name="copyIcon">@drawable/copy_light</item>
+        <item name="clearIcon">@drawable/clear_light</item>
         <item name="selectAllIcon">@drawable/select_all_light</item>
         <item name="editIcon">@drawable/edit_light</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_light</item>
+        <item name="saveIcon">@drawable/save_light</item>
+        <item name="sortIcon">@drawable/sort_light</item>
         <item name="actionBarPopupTheme">@style/PrivacyBrowserPopupsLight</item>
         <item name="appBarTextTheme">@style/PrivacyBrowserAppBarWhiteText</item>
-        <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutLight</item>
         <item name="popupsTheme">@style/PrivacyBrowserPopupsLight</item>
+        <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutLight</item>
     </style>
 
     <!-- `colorPrimaryDark` is the color of the status bar. -->
@@ -118,36 +127,40 @@
 
     <!-- `android:windowTranslucentStatus` makes the system status bar translucent.  When it is specified the root layout should include `android:fitsSystemWindows="true"`. -->
     <style name="PrivacyBrowserDark" parent="Theme.AppCompat.NoActionBar" >
-        <item name="android:windowTranslucentStatus">true</item>
+        <item name="aboutIcon">@drawable/about_dark</item>
+        <item name="addTabIconTintColor">@color/gray_400</item>
+        <item name="android:textColorHighlight">@color/blue_800</item>
         <item name="android:textColorPrimary">@color/primary_text_color_selector_dark</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="appBarTheme">@style/PrivacyBrowserAppBarDark</item>
         <item name="colorAccent">@color/blue_600</item>
-        <item name="android:textColorHighlight">@color/blue_800</item>
+        <item name="findOnPageIconTintColor">@color/blue_600</item>
+        <item name="mainStatusBarBackground">@color/black</item>
         <item name="navigationHeaderBackground">@color/blue_800</item>
         <item name="navigationHeaderTextColor">@color/gray_300</item>
-        <item name="appBarTheme">@style/PrivacyBrowserAppBarDark</item>
-        <item name="progressTintColor">@color/blue_600</item>
         <item name="navigationIconTintColor">@color/blue_600</item>
-        <item name="findOnPageIconTintColor">@color/blue_600</item>
-        <item name="viewSourceIconTintColor">@color/gray_300</item>
+        <item name="progressTintColor">@color/blue_600</item>
+        <item name="redText">@color/red_900</item>
         <item name="sslHeader">@color/blue_400</item>
         <item name="sslTitle">@color/blue_700</item>
         <item name="urlHistoryText">@color/gray_200</item>
-        <item name="redText">@color/red_900</item>
-        <item name="aboutIcon">@drawable/about_dark</item>
+        <item name="viewSourceIconTintColor">@color/gray_300</item>
+        <item name="webViewBackground">@color/gray_900</item>
     </style>
 
     <!-- `windowActionModeOverlay` makes the contextual app bar cover the support app bar.  `colorPrimaryDark` goes behind the status bar, which is then darkened by the overlay.-->
     <style name="PrivacyBrowserDark.SecondaryActivity" >
         <item name="windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">false</item>
         <item name="colorPrimaryDark">@color/blue_800</item>
+        <item name="android:statusBarColor" tools:targetApi="21">@color/blue_900</item>
         <item name="android:actionModeBackground">@color/blue_800</item>
-        <item name="bookmarksSpinnerHeaderTextColor">@color/gray_300</item>
-        <item name="bookmarksSpinnerTextColorSelector">@color/bookmarks_spinner_color_selector_dark</item>
-        <item name="bookmarksSpinnerBackground">@color/blue_830</item>
-        <item name="editBookmarkSpinnerTextColorSelector">@color/edit_bookmark_spinner_color_selector_dark</item>
-        <item name="requestsSpinnerHeaderTextColor">@color/gray_300</item>
-        <item name="requestsSpinnerTextColorSelector">@color/requests_spinner_color_selector_dark</item>
-        <item name="requestsSpinnerBackground">@color/blue_830</item>
+        <item name="spinnerHeaderTextColor">@color/gray_300</item>
+        <item name="spinnerBackground">@color/blue_830</item>
+        <item name="spinnerTextColorSelector">@color/spinner_color_selector_dark</item>
+        <item name="appbarSpinnerTextColorSelector">@color/appbar_spinner_color_selector_dark</item>
+        <item name="buttonTextColorSelector">@color/button_text_color_selector_dark</item>
+        <item name="buttonBackgroundColorSelector">@color/button_background_color_selector_dark</item>
         <item name="aboutTitle">@color/blue_600</item>
         <item name="aboutText">@color/blue_400</item>
         <item name="aboutBackground">@color/gray_850</item>
@@ -157,13 +170,17 @@
         <item name="addIcon">@drawable/add_dark</item>
         <item name="addBookmarkIcon">@drawable/create_bookmark_dark</item>
         <item name="addFolderIcon">@drawable/create_folder_dark</item>
+        <item name="clearIcon">@drawable/clear_dark</item>
+        <item name="copyIcon">@drawable/copy_dark</item>
         <item name="selectAllIcon">@drawable/select_all_dark</item>
         <item name="editIcon">@drawable/edit_dark</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_dark</item>
+        <item name="saveIcon">@drawable/save_dark</item>
+        <item name="sortIcon">@drawable/sort_dark</item>
+        <item name="android:spinnerDropDownItemStyle">@style/PrivacyBrowserSpinnerDropDownItemStyleDark</item>
         <item name="appBarTextTheme">@style/PrivacyBrowserAppBarDark</item>
-        <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutDark</item>
         <item name="popupsTheme">@style/PrivacyBrowserPopupsDark</item>
-        <item name="android:spinnerDropDownItemStyle">@style/PrivacyBrowserSpinnerDropDownItemStyleDark</item>
+        <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutDark</item>
     </style>
 
     <style name="PrivacyBrowserSettingsDark" parent="Theme.AppCompat" >
@@ -184,7 +201,7 @@
 
     <!-- Configure the About and Guide `TabLayouts`. -->
     <style name="PrivacyBrowserTabLayoutDark" parent="Widget.Design.TabLayout" >
-        <item name="tabBackground">@color/blue_900</item>
+        <item name="tabBackground">@color/blue_800</item>
         <item name="android:textColorSecondary">@color/blue_300</item>
         <item name="tabIndicatorColor">@color/gray_300</item>
     </style>