<?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_marginEnd="10dp"
android:layout_marginBottom="12dp"
android:layout_gravity="bottom"
- android:src="@drawable/domains_light"
- android:tint="?attr/domainSettingsIconTintColor"
+ android:src="@drawable/domains"
+ app:tint="?attr/domainSettingsIconTintColor"
tools:ignore="contentDescription" />
<!-- `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
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_gravity="center_vertical"
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_gravity="center_vertical"
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_gravity="center_vertical"
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_gravity="center_vertical"
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_gravity="center_vertical"
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_gravity="center_vertical"
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_gravity="center_vertical"
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:layout_gravity="center_vertical"
tools:ignore="contentDescription" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/ultralist_switch"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="center_vertical"
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_gravity="center_vertical"
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="?attr/domainSettingsIconTintColor"
android:contentDescription="@string/user_agent" />
<Spinner
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="?attr/domainSettingsIconTintColor"
android:contentDescription="@string/font_size" />
<Spinner
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: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:id="@+id/webview_theme_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:layout_gravity="center_vertical"
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:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<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="?attr/blueTitleTextColor"/>
<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="?attr/blueTitleTextColor"/>
<TextView
android:id="@+id/saved_ssl_certificate_start_date"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<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="?attr/blueTitleTextColor" />
<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="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/current_website_certificate_start_date"
android:layout_gravity="center_vertical"
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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="32dp"
- android:textColor="?attr/aboutText" />
+ android:textColor="?attr/blueTextColor" />
</LinearLayout>
</androidx.cardview.widget.CardView>
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="32dp"
- android:textColor="?attr/aboutText" />
+ android:textColor="?attr/blueTextColor" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>