X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings.xml;h=9d335d184290184b6214614d969cac53eb357179;hb=a6a0e78b9442a402a40430cbd489c9dd60a389fe;hp=00479b52e0052094794c5b3b5ba757b7670bd16b;hpb=30b6db5cdccb01d98f19b3a6af91d9f8ae1322bf;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings.xml
index 00479b52..9d335d18 100644
--- a/app/src/main/res/layout/domain_settings.xml
+++ b/app/src/main/res/layout/domain_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -40,7 +40,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical" >
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
                     android:layout_marginBottom="12dp"
                     android:layout_gravity="bottom"
                     android:src="@drawable/domains"
-                    android:tint="@color/blue_800"
+                    android:tint="?attr/iconTintColor"
                     tools:ignore="contentDescription" />
 
                 <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
@@ -94,7 +94,6 @@
                 android:layout_width="wrap_content"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/privacy_mode"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -105,6 +104,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/javascript_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -121,7 +121,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/cookies_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -132,6 +131,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/first_party_cookies_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -149,7 +149,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/cookies_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -160,6 +159,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/third_party_cookies_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -176,7 +176,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/dom_storage_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -187,6 +186,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/dom_storage_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -194,7 +194,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/domain_settings_form_data_imageview"
@@ -203,7 +203,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/form_data_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -214,6 +213,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/form_data_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -228,7 +228,7 @@
             <LinearLayout
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:orientation="horizontal">
+                android:orientation="horizontal" >
 
                 <ImageView
                     android:layout_height="wrap_content"
@@ -236,29 +236,30 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/user_agent"
+                    android:src="@drawable/user_agent_light"
+                    android:tint="?attr/iconTintColor"
                     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"/>
+                    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_marginStart="45dp"
                 android:layout_marginEnd="36dp"
-                android:textSize="13sp"/>
+                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_marginStart="38dp"
+                android:layout_marginStart="40dp"
                 android:layout_marginEnd="60dp"
                 android:inputType="textUri" />
         </LinearLayout>
@@ -275,7 +276,8 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/font_size"
+                android:src="@drawable/font_size_light"
+                android:tint="?attr/iconTintColor"
                 android:contentDescription="@string/font_size" />
 
             <Spinner
@@ -283,7 +285,30 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"/>
+                android:layout_marginBottom="14dp" />
+        </LinearLayout>
+
+        <!-- Display Images. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_display_webpage_images_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/display_webpage_images" />
+
+            <Spinner
+                android:id="@+id/domain_settings_display_webpage_images_spinner"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file