X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings_fragment.xml;h=769072a7449d463182fd8b804eb85d28f8d01342;hb=c040f68d2825cd08a2e236f2cc272536d54ebc9c;hp=b27a1c4180ac908122c3bc3cfe98554e860d6d81;hpb=5fb34c1fa70b7c42a0fc3c0b5af8e856d3af2695;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index b27a1c41..769072a7 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 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -54,7 +54,7 @@
                     android:layout_marginBottom="12dp"
                     android:layout_gravity="bottom"
                     android:src="@drawable/domains"
-                    android:tint="?attr/iconTintColor"
+                    android:tint="?attr/domainSettingsIconTintColor"
                     tools:ignore="contentDescription" />
 
                 <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
@@ -105,7 +105,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/javascript_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -132,7 +132,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/first_party_cookies_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -160,7 +160,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/third_party_cookies_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -187,7 +187,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/dom_storage_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -214,7 +214,115 @@
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
                 android:text="@string/form_data_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- EasyList. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_easylist_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_easylist_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/easylist"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- EasyPrivacy. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_easyprivacy_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_easyprivacy_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/easyprivacy"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Fanboy's Annoyance List. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_fanboys_annoyance_list_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_fanboys_annoyance_list_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/fanboy_annoyance_list"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Fanboy's Social Blocking List. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_fanboys_social_blocking_list_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_fanboys_social_blocking_list_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/fanboy_social_blocking_list"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
 
@@ -238,7 +346,7 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/user_agent_light"
-                    android:tint="?attr/iconTintColor"
+                    android:tint="?attr/domainSettingsIconTintColor"
                     android:contentDescription="@string/user_agent" />
 
                 <Spinner
@@ -262,7 +370,8 @@
                 android:layout_width="match_parent"
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="60dp"
-                android:inputType="textUri" />
+                android:inputType="textUri"
+                android:hint="@string/custom_user_agent"/>
         </LinearLayout>
 
         <!-- Font Size. -->
@@ -285,7 +394,7 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/font_size_light"
-                    android:tint="?attr/iconTintColor"
+                    android:tint="?attr/domainSettingsIconTintColor"
                     android:contentDescription="@string/font_size" />
 
                 <Spinner
@@ -341,6 +450,43 @@
                 android:textSize="13sp" />
         </LinearLayout>
 
+        <!-- Night Mode. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="14dp" >
+
+            <LinearLayout
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/domain_settings_night_mode_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" />
+
+                <Spinner
+                    android:id="@+id/domain_settings_night_mode_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/domain_settings_night_mode_textview"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
+        </LinearLayout>
+
         <!-- Pinned SSL Certificate -->
         <LinearLayout
             android:layout_height="wrap_content"
@@ -370,7 +516,7 @@
                     android:layout_width="match_parent"
                     android:layout_marginStart="8dp"
                     android:text="@string/pinned_ssl_certificate"
-                    android:textColor="?attr/primaryTextColorSelector"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="18sp" />
             </LinearLayout>