Add color changes to domain settings icons.

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / domain_settings.xml

diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings.xml
index 725041ea1ab702a6299b659dbaa5aab6b91e65e7..1ea1417c46723b2a21824e0649911018787a8ecb 100644 (file)
--- a/app/src/main/res/layout/domain_settings.xml
+++ b/app/src/main/res/layout/domain_settings.xml
@@ -46,6 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginBottom="26dp"
+                android:layout_marginEnd="10dp"
                 android:layout_gravity="bottom"
                 android:src="@drawable/domains"
                 android:tint="@color/blue_800"
@@ -75,8 +76,10 @@
             android:orientation="horizontal" >
 
             <ImageView
+                android:id="@+id/domain_settings_javascript_imageview"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/privacy_mode"
                 tools:ignore="contentDescription" />
@@ -99,12 +102,14 @@
             android:orientation="horizontal" >
 
             <ImageView
+                android:id="@+id/domain_settings_first_party_cookies_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:src="@drawable/cookies_enabled"
-                android:tint="@color/blue_800"
+                android:tint="@color/domain_settings_icon_yellow_tint_selector"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -125,12 +130,14 @@
             android:orientation="horizontal" >
 
             <ImageView
+                android:id="@+id/domain_settings_third_party_cookies_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:src="@drawable/cookies_enabled"
-                android:tint="@color/blue_800"
+                android:tint="@color/domain_settings_icon_red_tint_selector"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -151,12 +158,14 @@
             android:orientation="horizontal" >
 
             <ImageView
+                android:id="@+id/domain_settings_dom_storage_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:src="@drawable/dom_storage_enabled"
-                android:tint="@color/blue_800"
+                android:tint="@color/domain_settings_icon_yellow_tint_selector"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -177,12 +186,14 @@
             android:orientation="horizontal">
 
             <ImageView
+                android:id="@+id/domain_settings_form_data_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:src="@drawable/form_data_enabled"
-                android:tint="@color/blue_800"
+                android:tint="@color/domain_settings_icon_yellow_tint_selector"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -200,23 +211,47 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal">
+            android:orientation="vertical"
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="14dp" >
 
-            <ImageView
+            <LinearLayout
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/user_agent"
-                android:tint="@color/blue_800"
-                android:contentDescription="@string/user_agent" />
+                android:layout_width="match_parent"
+                android:orientation="horizontal">
 
-            <Spinner
-                android:id="@+id/domain_settings_user_agent_spinner"
+                <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:src="@drawable/user_agent"
+                    android:tint="@color/blue_800"
+                    android:contentDescription="@string/user_agent" />
+
+                <Spinner
+                    android:id="@+id/domain_settings_user_agent_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:labelFor="@+id/domain_settings_custom_user_agent_edittext"/>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/domain_settings_user_agent_textview"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:layout_marginStart="43dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp"/>
+
+            <EditText
+                android:id="@id/domain_settings_custom_user_agent_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp" />
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="60dp"
+                android:inputType="textUri" />
         </LinearLayout>
 
         <!-- Font Size. -->
@@ -231,6 +266,7 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/font_size"
                 android:tint="@color/blue_800"