X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstyles.xml;h=4f5e9a2e6dc24f0a4987f82d3048755ce2f4027e;hp=2cdc1eec7d1d689ece39071b9066033e5ae0a8fe;hb=568ac6354411aa26c42077d2b80f8770f6e64695;hpb=ba4a1c032dbffde044b70c804f9d3c1f1ba7b939

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2cdc1eec..4f5e9a2e 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-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,205 +18,82 @@
   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
-    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="aboutIcon">@drawable/about_light</item>
-        <item name="addTabIconTintColor">@color/gray_700</item>
+<resources>
+    <style name="PrivacyBrowser" parent="Theme.AppCompat.DayNight.NoActionBar" >
+        <!-- Colors. -->
+        <item name="android:actionModeBackground">?android:attr/colorBackground</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="blueTextColor">@color/blue_700</item>
+        <item name="blueTitleTextColor">@color/blue_900</item>
+        <item name="buttonBackgroundColorSelector">@color/button_background_color_selector_day</item>
+        <item name="buttonTextColorSelector">@color/button_text_color_selector_day</item>
         <item name="colorAccent">@color/blue_700</item>
-        <item name="dialogTabLayoutTheme">@style/PrivacyBrowserTabLayoutDialogLight</item>
+        <item name="redTextColor">@color/red_a700</item>
+
+        <!-- Tints. -->
+        <item name="addTabIconTintColor">@color/gray_925</item>
+        <item name="domainSettingsIconTintColor">@color/blue_800</item>
+        <item name="fabIconTintColor">@color/white</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="navigationIconTintColor">@color/blue_800</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="viewSourceIconTintColor">@color/black</item>
-        <item name="webViewBackground">@color/gray_50</item>
+
+        <!-- Drawables. -->
+        <item name="listSelectorDrawable">@drawable/list_selector_day</item>
+
+        <!-- Main App Bar Icons. -->
+        <item name="bookmarksAppBarIcon">@drawable/bookmarks_day</item>
+
+        <!-- Options Icons. -->
+        <item name="aboutIcon">@drawable/about_day</item>
+        <item name="closeIcon">@drawable/close_day</item>
+        <item name="copyIcon">@drawable/copy_day</item>
+        <item name="deleteIcon">@drawable/delete_day</item>
+        <item name="editIcon">@drawable/edit_day</item>
+        <item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
+        <item name="saveIcon">@drawable/save_day</item>
+        <item name="saveImageIcon">@drawable/images_options_day</item>
+        <item name="saveTextIcon">@drawable/save_text_day</item>
+        <item name="selectAllIcon">@drawable/select_all_day</item>
+        <item name="shareIcon">@drawable/share_day</item>
+        <item name="sortIcon">@drawable/sort_day</item>
     </style>
 
-    <!-- `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>
+    <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
         <item name="android:textColorHighlight">@color/blue_200</item>
-        <item name="android:actionModeBackground">@color/blue_700</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>
-        <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="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="popupsTheme">@style/PrivacyBrowserPopupsLight</item>
-        <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutLight</item>
     </style>
 
-    <!-- `colorPrimaryDark` is the color of the status bar. -->
-    <style name="PrivacyBrowserSettingsLight" parent="Theme.AppCompat.Light.DarkActionBar" >
-        <item name="colorPrimary">@color/blue_700</item>
-        <item name="colorPrimaryDark">@color/blue_900</item>
+    <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >
+        <!-- Colors. -->
         <item name="colorAccent">@color/blue_700</item>
-        <item name="downloadIcon">@drawable/downloads_enabled_light</item>
-        <item name="fontSizeIcon">@drawable/font_size_light</item>
-        <item name="homepageIcon">@drawable/home_enabled_light</item>
-        <item name="searchIcon">@drawable/search_enabled_light</item>
-        <item name="userAgentIcon">@drawable/user_agent_light</item>
+        <item name="colorPrimary">?android:attr/colorBackground</item>  <!-- `colorPrimary` sets the background color of the app bar. -->
+
+        <!-- Icons. -->
+        <item name="appThemeIcon">@drawable/app_theme_day</item>
+        <item name="downloadIcon">@drawable/downloads_enabled_day</item>
+        <item name="fontSizeIcon">@drawable/font_size_day</item>
+        <item name="homepageIcon">@drawable/home_enabled_day</item>
+        <item name="searchIcon">@drawable/search_enabled_day</item>
+        <item name="userAgentIcon">@drawable/user_agent_day</item>
     </style>
 
-    <!-- `ThemeOverlay.AppCompat.ActionBar` makes the hamburger icons dark. -->
-    <style name="PrivacyBrowserAppBarLight" parent="ThemeOverlay.AppCompat.ActionBar" />
-
-    <!-- `ThemeOverlay.AppCompat.Dark.ActionBar` makes the text and the icons in the AppBar white. -->
-    <style name="PrivacyBrowserAppBarWhiteText" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <!-- `ThemeOverlay.AppCompat.Light` makes the popups have a light background with dark text. -->
-    <style name="PrivacyBrowserPopupsLight" parent="ThemeOverlay.AppCompat.Light" />
-
-    <!-- Configure the About and Guide `TabLayouts`. -->
-    <style name="PrivacyBrowserTabLayoutLight" parent="Widget.Design.TabLayout" >
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/blue_100</item>
-        <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" >
+    <style name="PrivacyBrowserAlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert" >
+        <!-- Colors. -->
         <item name="colorAccent">@color/blue_700</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="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="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="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="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="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="domainSettingsIconTintColor">@color/blue_600</item>
-        <item name="deleteIcon">@drawable/delete_dark</item>
-        <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="popupsTheme">@style/PrivacyBrowserPopupsDark</item>
-        <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutDark</item>
-    </style>
-
-    <style name="PrivacyBrowserSettingsDark" parent="Theme.AppCompat" >
-        <item name="android:textColorPrimary">@color/primary_text_color_selector_dark</item>
-        <item name="colorPrimary">@color/blue_800</item>
-        <item name="colorPrimaryDark">@color/blue_900</item>
-        <item name="colorAccent">@color/blue_600</item>
-        <item name="downloadIcon">@drawable/downloads_enabled_dark</item>
-        <item name="fontSizeIcon">@drawable/font_size_dark</item>
-        <item name="homepageIcon">@drawable/home_enabled_dark</item>
-        <item name="searchIcon">@drawable/search_enabled_dark</item>
-        <item name="userAgentIcon">@drawable/user_agent_dark</item>
-    </style>
-
-    <!-- `ThemeOverlay.AppCompat.Dark.ActionBar` makes the text and the icons in the AppBar white. -->
-    <style name="PrivacyBrowserAppBarDark" parent="ThemeOverlay.AppCompat.Dark.ActionBar" >
-        <item name="android:textColorPrimary">@color/gray_300</item>
-    </style>
-
-    <!-- Configure the About and Guide `TabLayouts`. -->
-    <style name="PrivacyBrowserTabLayoutDark" parent="Widget.Design.TabLayout" >
-        <item name="tabBackground">@color/blue_800</item>
-        <item name="android:textColorSecondary">@color/blue_300</item>
-        <item name="tabIndicatorColor">@color/gray_300</item>
-    </style>
-
-    <style name="PrivacyBrowserAlertDialogDark" parent="Theme.AppCompat.Dialog.Alert" >
-        <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" >
-        <item name="android:textColor">@color/gray_300</item>
-    </style>
 
-    <!-- `ThemeOverlay.AppCompat.Dark` makes the popups have a dark background with light text. -->
-    <style name="PrivacyBrowserPopupsDark" parent="ThemeOverlay.AppCompat.Dark" >
-        <item name="android:textColorPrimary">@color/primary_text_color_selector_dark</item>
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_day</item>
+        <item name="blockAdsBlueIcon">@drawable/block_ads_enabled_day</item>
+        <item name="copyBlueIcon">@drawable/copy_enabled_day</item>
+        <item name="domainsBlueIcon">@drawable/domains_day</item>
+        <item name="domStorageBlueIcon">@drawable/dom_storage_cleared_day</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_day</item>
+        <item name="imagesBlueIcon">@drawable/images_enabled_day</item>
+        <item name="lockBlueIcon">@drawable/lock_day</item>
+        <item name="moveToFolderBlueIcon">@drawable/move_to_folder_blue_day</item>
+        <item name="proxyBlueIcon">@drawable/proxy_enabled_day</item>
+        <item name="saveBlueIcon">@drawable/save_dialog_day</item>
+        <item name="saveTextBlueIcon">@drawable/save_text_blue_day</item>
+        <item name="sslCertificateBlueIcon">@drawable/ssl_certificate_enabled_day</item>
     </style>
 </resources>
\ No newline at end of file