X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues-v21%2Fstyles.xml;h=6d4b83926e54708bee0b1d1fa4640b7cc53302d3;hp=6854a1060c88a27445e555fbaf4d4b4df2a5b1e7;hb=e7380180e2936dc8ebafaae1999a4b6789309c13;hpb=06f516f2f5c745981e292451d01b9df7d1fd57eb

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6854a106..6d4b8392 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -23,24 +23,26 @@
 
     <!-- `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="mainStatusBarBackground">@color/gray_500</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="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. -->
@@ -51,13 +53,12 @@
         <item name="android:statusBarColor">@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>
@@ -67,13 +68,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. -->
@@ -121,23 +126,25 @@
 
     <!-- `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="mainStatusBarBackground">@color/black</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="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="navigationIconTintColor">@color/blue_600</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.-->
@@ -147,13 +154,12 @@
         <item name="colorPrimaryDark">@color/blue_800</item>
         <item name="android:statusBarColor">@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>
@@ -163,13 +169,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" >