X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstyles.xml;h=73954b2cdfa136bf63870b47bab64e0f30cb6489;hb=6fa1563622642855d342cd7bcb523a8c1b6bbc44;hp=ffe929a1c18c3f3467427e7abd9ca712be8d5c92;hpb=922fa1656fdc20242c266346ea30d4c2e9489eb9;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ffe929a1..73954b2c 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-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -24,6 +24,8 @@
     <!-- `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="android:textColorPrimary">@color/primary_text_color_selector_light</item>
         <item name="colorAccent">@color/blue_700</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="navigationHeaderBackground">@color/blue_700</item>
@@ -31,28 +33,41 @@
         <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_700</item>
+        <item name="findOnPageIconTintColor">@color/blue_800</item>
+        <item name="viewSourceIconTintColor">@color/black</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>
     </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="colorPrimaryDark">@color/blue_700</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="android:actionModeBackground">@color/blue_700</item>
-        <item name="primaryTextColorSelector">@color/primary_text_color_selector_light</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="buttonTextColorSelector">@color/button_text_color_selector_light</item>
+        <item name="buttonBackgroundColorSelector">@color/button_background_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>
-        <item name="iconTintColor">@color/blue_800</item>
+        <item name="aboutBackground">@color/white</item>
+        <item name="domainSettingsIconTintColor">@color/blue_800</item>
         <item name="deleteIcon">@drawable/delete_light</item>
         <item name="addIcon">@drawable/add_light</item>
-        <item name="createFolderIcon">@drawable/create_folder_light</item>
+        <item name="addBookmarkIcon">@drawable/create_bookmark_light</item>
+        <item name="addFolderIcon">@drawable/create_folder_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="sortIcon">@drawable/sort_light</item>
         <item name="actionBarPopupTheme">@style/PrivacyBrowserPopupsLight</item>
         <item name="appBarTextTheme">@style/PrivacyBrowserAppBarWhiteText</item>
         <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutLight</item>
@@ -86,44 +101,67 @@
         <item name="tabIndicatorColor">@color/white</item>
     </style>
 
+    <style name="PrivacyBrowserTabLayoutDialogLight" parent="Widget.Design.TabLayout" >
+        <item name="android:textColorPrimary">@color/blue_700</item>
+        <item name="android:textColorSecondary">@color/blue_700_50</item>
+    </style>
+
     <style name="PrivacyBrowserAlertDialogLight" parent="Theme.AppCompat.Light.Dialog.Alert" >
         <item name="colorAccent">@color/blue_700</item>
     </style>
 
+    <style name="PrivacyBrowserProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" >
+        <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
+    </style>
+
+
     <!-- Dark theme styles. -->
 
     <!-- `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="android:textColorPrimary">@color/primary_text_color_selector_dark</item>
         <item name="colorAccent">@color/blue_600</item>
         <item name="android:textColorHighlight">@color/blue_800</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_800</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="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>
     </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="colorPrimaryDark">@color/blue_800</item>
+        <item name="colorPrimaryDark">@color/blue_900</item>
         <item name="android:actionModeBackground">@color/blue_800</item>
-        <item name="primaryTextColorSelector">@color/primary_text_color_selector_dark</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>
         <item name="listSelectorDrawable">@drawable/list_selector_dark</item>
-        <item name="iconTintColor">@color/blue_600</item>
+        <item name="domainSettingsIconTintColor">@color/blue_600</item>
         <item name="deleteIcon">@drawable/delete_dark</item>
         <item name="addIcon">@drawable/add_dark</item>
-        <item name="createFolderIcon">@drawable/create_folder_dark</item>
+        <item name="addBookmarkIcon">@drawable/create_bookmark_dark</item>
+        <item name="addFolderIcon">@drawable/create_folder_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="sortIcon">@drawable/sort_dark</item>
         <item name="appBarTextTheme">@style/PrivacyBrowserAppBarDark</item>
         <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutDark</item>
         <item name="popupsTheme">@style/PrivacyBrowserPopupsDark</item>
@@ -154,8 +192,10 @@
     </style>
 
     <style name="PrivacyBrowserAlertDialogDark" parent="Theme.AppCompat.Dialog.Alert" >
-        <item name="android:windowBackground">@color/gray_900</item>
-        <item name="android:textColor">@color/gray_300</item>
+        <item name="android:windowBackground">@color/gray_850</item>
+        <item name="android:textColorPrimary">@color/gray_300</item>
+        <item name="android:textColorSecondary">@color/gray_300</item>
+        <item name="colorAccent">@color/blue_600</item>
     </style>
 
     <style name="PrivacyBrowserSpinnerDropDownItemStyleDark" parent="Base.Widget.AppCompat.TextView.SpinnerItem" >