X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings_fragment.xml;h=1f647a9dd4133074ee7261ed8e7634f46ebd7adb;hp=48d3590d540d2027fa379539b50d7e902c96d74e;hb=2bd8b7edef80b4b10cb809a198b4624c6c740c86;hpb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index 48d3590d..1f647a9d 100644
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -53,7 +53,7 @@
                     android:layout_marginBottom="12dp"
                     android:layout_gravity="bottom"
                     android:src="@drawable/domains"
-                    app:tint="?attr/domainSettingsIconTintColor"
+                    app:tint="@color/blue_icon"
                     tools:ignore="contentDescription" />
 
                 <!-- `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
@@ -121,6 +121,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/cookies_enabled"
+                app:tint="@color/yellow_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -148,6 +150,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/dom_storage_enabled"
+                app:tint="@color/yellow_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -175,6 +179,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/form_data_enabled"
+                app:tint="@color/yellow_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -202,6 +208,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/block_ads_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -229,6 +237,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/block_tracking_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -256,6 +266,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/social_media_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -283,6 +295,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/social_media_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -310,6 +324,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/block_ads_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -337,6 +353,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/block_tracking_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -364,6 +382,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/block_all_third_party_requests_enabled"
+                app:tint="@color/blue_icon_selector"
                 tools:ignore="contentDescription" />
 
             <androidx.appcompat.widget.SwitchCompat
@@ -398,7 +418,7 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/user_agent"
-                    app:tint="?attr/domainSettingsIconTintColor"
+                    app:tint="@color/blue_icon"
                     android:contentDescription="@string/user_agent" />
 
                 <Spinner
@@ -409,7 +429,7 @@
 
             <TextView
                 android:id="@+id/user_agent_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -446,7 +466,7 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/font_size"
-                    app:tint="?attr/domainSettingsIconTintColor"
+                    app:tint="@color/blue_icon"
                     android:contentDescription="@string/font_size" />
 
                 <Spinner
@@ -457,7 +477,7 @@
 
             <TextView
                 android:id="@+id/default_font_size_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -494,6 +514,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/refresh_enabled"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/swipe_to_refresh" />
 
                 <Spinner
@@ -504,7 +526,7 @@
 
             <TextView
                 android:id="@+id/swipe_to_refresh_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -532,6 +554,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/webview_light_theme"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/webview_theme" />
 
                 <Spinner
@@ -542,7 +566,7 @@
 
             <TextView
                 android:id="@+id/webview_theme_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -569,6 +593,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/wide_viewport_enabled"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/wide_viewport" />
 
                 <Spinner
@@ -579,7 +605,7 @@
 
             <TextView
                 android:id="@+id/wide_viewport_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -606,6 +632,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/images_enabled"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/display_webpage_images" />
 
                 <Spinner
@@ -616,7 +644,7 @@
 
             <TextView
                 android:id="@+id/display_webpage_images_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -644,6 +672,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/ssl_certificate_enabled"
+                    app:tint="@color/blue_icon_selector"
                     tools:ignore="contentDescription" />
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -696,7 +726,7 @@
                             android:text="@string/issued_to"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_issued_to_cname"
@@ -721,7 +751,7 @@
                             android:text="@string/issued_by"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor"/>
+                            android:textColor="@color/blue_title_text"/>
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_issued_by_cname"
@@ -746,7 +776,7 @@
                             android:text="@string/valid_dates"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor"/>
+                            android:textColor="@color/blue_title_text"/>
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_start_date"
@@ -798,7 +828,7 @@
                             android:text="@string/issued_to"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_issued_to_cname"
@@ -823,7 +853,7 @@
                             android:text="@string/issued_by"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_issued_by_cname"
@@ -848,7 +878,7 @@
                             android:text="@string/valid_dates"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_start_date"
@@ -897,6 +927,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/ssl_certificate_enabled"
+                    app:tint="@color/blue_icon_selector"
                     tools:ignore="contentDescription" />
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -940,7 +972,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:layout_marginStart="32dp"
-                        android:textColor="?attr/blueTextColor" />
+                        android:textColor="@color/blue_text" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
@@ -972,9 +1004,9 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:layout_marginStart="32dp"
-                        android:textColor="?attr/blueTextColor" />
+                        android:textColor="@color/blue_text" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>