X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings_fragment.xml;h=d2b5efa724d7369146cd25fdf9cf823a10f3463f;hp=c316ae2f50c03657fc611464e78b3c0322d6aedb;hb=b82022327701273b1b56419e8d6042895c0bc7b9;hpb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index c316ae2f..d2b5efa7 100644
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -18,15 +18,15 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<ScrollView
-    android:id="@+id/domain_settings_scrollview"
+<ScrollView android:id="@+id/domain_settings_scrollview"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:descendantFocusability="beforeDescendants" >
+    android:descendantFocusability="beforeDescendants"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_height="wrap_content"
@@ -52,8 +52,8 @@
                     android:layout_marginEnd="10dp"
                     android:layout_marginBottom="12dp"
                     android:layout_gravity="bottom"
-                    android:src="@drawable/domains_light"
-                    android:tint="?attr/domainSettingsIconTintColor"
+                    android:src="@drawable/domains_day"
+                    app:tint="?attr/domainSettingsIconTintColor"
                     tools:ignore="contentDescription" />
 
                 <!-- `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
@@ -96,7 +96,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/javascript_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -123,7 +123,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/first_party_cookies_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -149,9 +149,10 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/cookies_enabled"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/third_party_cookies_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -178,7 +179,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/dom_storage_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -205,7 +206,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/form_data_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -232,7 +233,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/easylist_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -259,7 +260,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/easyprivacy_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -286,7 +287,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/fanboys_annoyance_list_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -313,7 +314,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/fanboys_social_blocking_list_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -340,7 +341,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/ultralist_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -367,7 +368,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/ultraprivacy_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -394,7 +395,7 @@
                 android:layout_gravity="center_vertical"
                 tools:ignore="contentDescription" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/block_all_third_party_requests_switch"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
@@ -426,7 +427,7 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/user_agent_day"
-                    android:tint="?attr/domainSettingsIconTintColor"
+                    app:tint="?attr/domainSettingsIconTintColor"
                     android:contentDescription="@string/user_agent" />
 
                 <Spinner
@@ -474,7 +475,7 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/font_size_day"
-                    android:tint="?attr/domainSettingsIconTintColor"
+                    app:tint="?attr/domainSettingsIconTintColor"
                     android:contentDescription="@string/font_size" />
 
                 <Spinner
@@ -539,8 +540,9 @@
                 android:textSize="13sp" />
         </LinearLayout>
 
-        <!-- Night Mode. -->
+        <!-- WebView Theme. -->
         <LinearLayout
+            android:id="@+id/webview_theme_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
@@ -553,22 +555,22 @@
                 android:orientation="horizontal" >
 
                 <ImageView
-                    android:id="@+id/night_mode_imageview"
+                    android:id="@+id/webview_theme_imageview"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/night_mode" />
+                    android:contentDescription="@string/webview_theme" />
 
                 <Spinner
-                    android:id="@+id/night_mode_spinner"
+                    android:id="@+id/webview_theme_spinner"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent" />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/night_mode_textview"
+                android:id="@+id/webview_theme_textview"
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
@@ -673,14 +675,15 @@
                     android:layout_gravity="center_vertical"
                     tools:ignore="contentDescription" />
 
-                <Switch
+                <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/pinned_ssl_certificate_switch"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
                     android:layout_marginStart="8dp"
                     android:text="@string/pinned_ssl_certificate"
                     android:textColor="?android:textColorPrimary"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    tools:ignore="TooManyViews" />
             </LinearLayout>
 
             <!-- Saved Certificate -->
@@ -722,7 +725,7 @@
                             android:text="@string/issued_to"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/sslTitle" />
+                            android:textColor="?attr/blueTitleTextColor" />
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_issued_to_cname"
@@ -747,7 +750,7 @@
                             android:text="@string/issued_by"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/sslTitle"/>
+                            android:textColor="?attr/blueTitleTextColor"/>
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_issued_by_cname"
@@ -772,7 +775,7 @@
                             android:text="@string/valid_dates"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/sslTitle"/>
+                            android:textColor="?attr/blueTitleTextColor"/>
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_start_date"
@@ -824,7 +827,7 @@
                             android:text="@string/issued_to"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/sslTitle" />
+                            android:textColor="?attr/blueTitleTextColor" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_issued_to_cname"
@@ -849,7 +852,7 @@
                             android:text="@string/issued_by"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/sslTitle" />
+                            android:textColor="?attr/blueTitleTextColor" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_issued_by_cname"
@@ -874,7 +877,7 @@
                             android:text="@string/valid_dates"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/sslTitle" />
+                            android:textColor="?attr/blueTitleTextColor" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_start_date"
@@ -925,7 +928,7 @@
                     android:layout_gravity="center_vertical"
                     tools:ignore="contentDescription" />
 
-                <Switch
+                <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/pinned_ip_addresses_switch"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"