<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
- This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
- Privacy Browser is free software: you can redistribute it and/or modify
+ Privacy Browser Android is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- Privacy Browser is distributed in the hope that it will be useful,
+ Privacy Browser Android is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>. -->
+ along with Privacy Browser Android. 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"
android:layout_marginBottom="12dp"
android:layout_gravity="bottom"
android:src="@drawable/domains"
- android:tint="?attr/domainSettingsIconTintColor"
+ app:tint="@color/blue_icon"
tools:ignore="contentDescription" />
- <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
- <android.support.design.widget.TextInputLayout
+ <!-- `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+ <com.google.android.material.textfield.TextInputLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="6dp" >
<!-- `android:inputType="textUri"` disables spell check in the `EditText`. -->
- <android.support.design.widget.TextInputEditText
+ <com.google.android.material.textfield.TextInputEditText
android:id="@+id/domain_settings_name_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/domain_name"
android:inputType="textUri" />
- </android.support.design.widget.TextInputLayout>
+ </com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<TextView
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"
android:layout_marginStart="8dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="14dp"
- android:text="@string/javascript_enabled"
+ android:text="@string/javascript"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- First-Party Cookies. -->
+ <!-- Cookies. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/first_party_cookies_imageview"
+ android:id="@+id/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"
+ app:tint="@color/yellow_icon_selector"
tools:ignore="contentDescription" />
- <Switch
- android:id="@+id/first_party_cookies_switch"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/cookies_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/first_party_cookies_enabled"
- android:textColor="?android:textColorPrimary"
- android:textSize="18sp" />
- </LinearLayout>
-
- <!-- Third-Party Cookies. -->
- <LinearLayout
- android:id="@+id/third_party_cookies_linearlayout"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:orientation="horizontal" >
-
- <ImageView
- android:id="@+id/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"
- tools:ignore="contentDescription" />
-
- <Switch
- android:id="@+id/third_party_cookies_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/third_party_cookies_enabled"
+ android:text="@string/cookies"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/dom_storage_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/dom_storage_enabled"
+ android:text="@string/dom_storage_preference"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/form_data_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/form_data_enabled"
+ android:text="@string/form_data"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/easylist_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/easyprivacy_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/fanboys_annoyance_list_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/fanboys_social_blocking_list_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textSize="18sp" />
</LinearLayout>
+ <!-- UltraList. -->
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:id="@+id/ultralist_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/block_ads_enabled"
+ app:tint="@color/blue_icon_selector"
+ tools:ignore="contentDescription" />
+
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/ultralist_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/ultralist"
+ android:textColor="?android:textColorPrimary"
+ android:textSize="18sp" />
+ </LinearLayout>
+
<!-- UltraPrivacy. -->
<LinearLayout
android:layout_height="wrap_content"
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/ultraprivacy_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
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" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/block_all_third_party_requests_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
- android:src="@drawable/user_agent_light"
- android:tint="?attr/domainSettingsIconTintColor"
+ android:src="@drawable/user_agent"
+ app:tint="@color/blue_icon"
android:contentDescription="@string/user_agent" />
<Spinner
<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"
android:layout_marginEnd="60dp"
android:inputType="textUri"
android:hint="@string/custom_user_agent"
- android:importantForAutofill="no"
- tools:targetApi="26" />
+ android:importantForAutofill="no" />
</LinearLayout>
<!-- Font Size. -->
android:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
- android:src="@drawable/font_size_light"
- android:tint="?attr/domainSettingsIconTintColor"
+ android:src="@drawable/font_size"
+ app:tint="@color/blue_icon"
android:contentDescription="@string/font_size" />
<Spinner
</LinearLayout>
<TextView
- android:id="@+id/font_size_textview"
- android:layout_height="match_parent"
+ android:id="@+id/default_font_size_textview"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:layout_marginEnd="36dp"
android:textSize="13sp" />
+ <EditText
+ android:id="@+id/custom_font_size_edittext"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="40dp"
+ android:layout_marginEnd="60dp"
+ android:inputType="number"
+ android:hint="@string/font_size"
+ android:importantForAutofill="no" />
</LinearLayout>
<!-- Swipe to Refresh. -->
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
<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"
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"
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:src="@drawable/webview_light_theme"
+ app:tint="@color/blue_icon_selector"
+ 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:layout_height="match_parent"
+ android:id="@+id/webview_theme_textview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="45dp"
+ android:layout_marginEnd="36dp"
+ android:textSize="13sp" />
+ </LinearLayout>
+
+ <!-- Wide Viewport. -->
+ <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/wide_viewport_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/wide_viewport_enabled"
+ app:tint="@color/blue_icon_selector"
+ android:contentDescription="@string/wide_viewport" />
+
+ <Spinner
+ android:id="@+id/wide_viewport_spinner"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/wide_viewport_textview"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:layout_marginEnd="36dp"
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
<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"
android:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
+ android:src="@drawable/ssl_certificate"
+ app:tint="@color/blue_icon_selector"
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 -->
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
android:id="@+id/saved_ssl_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="@color/blue_title_text" />
<TextView
android:id="@+id/saved_ssl_certificate_issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ android:textColor="@color/blue_title_text"/>
<TextView
android:id="@+id/saved_ssl_certificate_issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ android:textColor="@color/blue_title_text"/>
<TextView
android:id="@+id/saved_ssl_certificate_start_date"
android:layout_width="match_parent" />
</LinearLayout>
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
<!-- Current Website Certificate -->
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
android:id="@+id/current_website_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="@color/blue_title_text" />
<TextView
android:id="@+id/current_website_certificate_issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="@color/blue_title_text" />
<TextView
android:id="@+id/current_website_certificate_issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="@color/blue_title_text" />
<TextView
android:id="@+id/current_website_certificate_start_date"
android:layout_width="match_parent" />
</LinearLayout>
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
<!-- Load An Encrypted Website Instructions. -->
<TextView
android:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
+ android:src="@drawable/ssl_certificate"
+ app:tint="@color/blue_icon_selector"
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"
</LinearLayout>
<!-- Saved IP Addresses -->
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
android:id="@+id/saved_ip_addresses_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="32dp"
- android:textColor="?attr/aboutText" />
+ android:textColor="@color/blue_text" />
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
android:id="@+id/current_ip_addresses_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="32dp"
- android:textColor="?attr/aboutText" />
+ android:textColor="@color/blue_text" />
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>