<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017-2018 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
- xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_margin="12dp"
android:layout_marginBottom="12dp"
android:layout_gravity="bottom"
android:src="@drawable/domains"
- android:tint="?attr/domainSettingsIconTintColor"
+ app:tint="?attr/domainSettingsIconTintColor"
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:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_javascript_imageview"
+ android:id="@+id/javascript_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/domain_settings_javascript_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/domain_settings_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/domain_settings_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:text="@string/cookies"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- Third-Party Cookies. -->
+ <!-- DOM Storage. -->
<LinearLayout
- android:id="@+id/domain_settings_third_party_cookies_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_third_party_cookies_imageview"
+ android:id="@+id/dom_storage_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/domain_settings_third_party_cookies_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/third_party_cookies_enabled"
+ android:text="@string/dom_storage_preference"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- DOM Storage. -->
+ <!-- Form Data. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_dom_storage_imageview"
+ android:id="@+id/form_data_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/domain_settings_dom_storage_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/dom_storage_enabled"
+ android:text="@string/form_data"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- Form Data. -->
+ <!-- EasyList. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_form_data_imageview"
+ android:id="@+id/easylist_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/domain_settings_form_data_switch"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/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/form_data_enabled"
+ android:text="@string/easylist"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- EasyList. -->
+ <!-- EasyPrivacy. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_easylist_imageview"
+ android:id="@+id/easyprivacy_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/domain_settings_easylist_switch"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/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/easylist"
+ android:text="@string/easyprivacy"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- EasyPrivacy. -->
+ <!-- Fanboy's Annoyance List. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_easyprivacy_imageview"
+ android:id="@+id/fanboys_annoyance_list_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/domain_settings_easyprivacy_switch"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/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/easyprivacy"
+ android:text="@string/fanboys_annoyance_list"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- Fanboy's Annoyance List. -->
+ <!-- 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_annoyance_list_imageview"
+ android:id="@+id/fanboys_social_blocking_list_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/domain_settings_fanboys_annoyance_list_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_marginStart="8dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="14dp"
- android:text="@string/fanboy_annoyance_list"
+ android:text="@string/fanboys_social_blocking_list"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
- <!-- Fanboy's Social Blocking List. -->
+ <!-- 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"
+ 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_width="match_parent"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:id="@+id/ultraprivacy_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" />
+
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/ultraprivacy_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/ultraprivacy"
+ android:textColor="?android:textColorPrimary"
+ android:textSize="18sp" />
+ </LinearLayout>
+
+ <!-- Block All Third Party Requests. -->
<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:id="@+id/block_all_third_party_requests_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/domain_settings_fanboys_social_blocking_list_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_marginStart="8dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="14dp"
- android:text="@string/fanboy_social_blocking_list"
+ android:text="@string/block_all_third_party_requests"
android:textColor="?android:textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
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:id="@+id/domain_settings_user_agent_spinner"
+ android:id="@+id/user_agent_spinner"
android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:labelFor="@+id/domain_settings_custom_user_agent_edittext" />
+ android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_user_agent_textview"
+ android:id="@+id/user_agent_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:textSize="13sp" />
<EditText
- android:id="@id/domain_settings_custom_user_agent_edittext"
+ android:id="@+id/custom_user_agent_edittext"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginStart="40dp"
android:layout_marginEnd="60dp"
android:inputType="textUri"
- android:hint="@string/custom_user_agent"/>
+ android:hint="@string/custom_user_agent"
+ 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="?attr/domainSettingsIconTintColor"
android:contentDescription="@string/font_size" />
<Spinner
- android:id="@+id/domain_settings_font_size_spinner"
+ android:id="@+id/font_size_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_font_size_textview"
+ android:id="@+id/default_font_size_textview"
android:layout_height="match_parent"
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. -->
+ <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/swipe_to_refresh_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/swipe_to_refresh" />
+
+ <Spinner
+ android:id="@+id/swipe_to_refresh_spinner"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/swipe_to_refresh_textview"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_marginStart="45dp"
+ android:layout_marginEnd="36dp"
+ android:textSize="13sp" />
</LinearLayout>
- <!-- Display Images. -->
+ <!-- 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/domain_settings_display_webpage_images_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/display_webpage_images" />
+ android:contentDescription="@string/webview_theme" />
<Spinner
- android:id="@+id/domain_settings_display_webpage_images_spinner"
+ android:id="@+id/webview_theme_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_display_webpage_images_textview"
+ android:id="@+id/webview_theme_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:textSize="13sp" />
</LinearLayout>
- <!-- Night Mode. -->
+ <!-- Wide Viewport. -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_night_mode_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:contentDescription="@string/night_mode" />
+ android:contentDescription="@string/wide_viewport" />
<Spinner
- android:id="@+id/domain_settings_night_mode_spinner"
+ android:id="@+id/wide_viewport_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/domain_settings_night_mode_textview"
+ android:id="@+id/wide_viewport_textview"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_marginStart="45dp"
+ android:layout_marginEnd="36dp"
+ android:textSize="13sp" />
+ </LinearLayout>
+
+ <!-- Display Images. -->
+ <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/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/display_webpage_images_spinner"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/display_webpage_images_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_marginTop="18dp"
- android:layout_marginBottom="32dp" >
+ android:layout_marginBottom="18dp" >
<!-- Switch -->
<LinearLayout
android:orientation="horizontal" >
<ImageView
- android:id="@+id/domain_settings_pinned_ssl_certificate_imageview"
+ android:id="@+id/pinned_ssl_certificate_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/domain_settings_pinned_ssl_certificate_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 -->
- <LinearLayout
- android:id="@+id/saved_ssl_certificate_linearlayout"
+ <androidx.cardview.widget.CardView
+ android:id="@+id/saved_ssl_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" >
- <RadioButton
- android:id="@+id/saved_ssl_certificate_radiobutton"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/saved_ssl_certificate"
- android:textSize="17sp"
- android:textAllCaps="true"
- android:textStyle="bold" />
-
<LinearLayout
+ android:id="@+id/saved_ssl_certificate_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginStart="32dp"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ android:padding="10dp" >
- <!-- Saved Certificate Issued To. -->
- <TextView
+ <RadioButton
+ android:id="@+id/saved_ssl_certificate_radiobutton"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:text="@string/issued_to"
+ android:text="@string/saved_ssl_certificate"
+ android:textSize="17sp"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?android:textColorPrimary" />
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_to_cname"
+ <LinearLayout
android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:layout_width="match_parent"
+ android:layout_marginStart="32dp"
+ android:orientation="vertical" >
+
+ <!-- Saved Certificate Issued To. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/issued_to"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/blueTitleTextColor" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_to_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_to_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_to_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"/>
+
+ <!-- Saved Certificate Issued By. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/issued_by"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/blueTitleTextColor"/>
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_by_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_by_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_by_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <!-- Saved Certificate Valid Dates. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/valid_dates"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/blueTitleTextColor"/>
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_start_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_end_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_to_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ <!-- Current Website Certificate -->
+ <androidx.cardview.widget.CardView
+ android:id="@+id/current_website_certificate_cardview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_margin="10dp" >
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_to_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ <LinearLayout
+ android:id="@+id/current_website_certificate_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
- <!-- Saved Certificate Issued By. -->
- <TextView
+ <RadioButton
+ android:id="@+id/current_website_certificate_radiobutton"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/issued_by"
+ android:text="@string/current_website_ssl_certificate"
+ android:textSize="17sp"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
-
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_by_cname"
+ android:textColor="?android:textColorPrimary" />
+ <LinearLayout
android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:layout_width="match_parent"
+ android:layout_marginStart="32dp"
+ android:orientation="vertical" >
+
+ <!-- Current Website Certificate Issued To. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/issued_to"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/blueTitleTextColor" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_to_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_to_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_to_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <!-- Current Website Certificate Issued By. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/issued_by"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/blueTitleTextColor" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_by_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_by_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_by_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <!-- Current Website Certificate Valid Dates. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/valid_dates"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/blueTitleTextColor" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_start_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_end_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_by_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ <!-- Load An Encrypted Website Instructions. -->
+ <TextView
+ android:id="@+id/no_current_website_certificate"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:layout_marginStart="40dp"
+ android:layout_marginEnd="40dp"
+ android:gravity="center_horizontal"
+ android:text="@string/load_an_encrypted_website" />
+ </LinearLayout>
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_by_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ <!-- Pinned IP Addresses -->
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_marginTop="18dp"
+ android:layout_marginBottom="18dp" >
- <!-- Saved Certificate Valid Dates. -->
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/valid_dates"
- android:textAllCaps="true"
- android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ <!-- Switch -->
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="horizontal" >
- <TextView
- android:id="@+id/saved_ssl_certificate_start_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ <ImageView
+ android:id="@+id/pinned_ip_addresses_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" />
- <TextView
- android:id="@+id/saved_ssl_certificate_end_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
- </LinearLayout>
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/pinned_ip_addresses_switch"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginStart="8dp"
+ android:text="@string/pinned_ip_addresses"
+ android:textColor="?android:textColorPrimary"
+ android:textSize="18sp" />
</LinearLayout>
- <!-- Current Website Certificate -->
- <LinearLayout
- android:id="@+id/current_website_certificate_linearlayout"
+ <!-- Saved IP Addresses -->
+ <androidx.cardview.widget.CardView
+ android:id="@+id/saved_ip_addresses_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="8dp"
+ android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" >
- <RadioButton
- android:id="@+id/current_website_certificate_radiobutton"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/current_website_ssl_certificate"
- android:textSize="17sp"
- android:textAllCaps="true"
- android:textStyle="bold" />
-
<LinearLayout
+ android:id="@+id/saved_ip_addresses_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginStart="32dp"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ android:padding="10dp" >
- <!-- Current Website Certificate Issued To. -->
- <TextView
+ <RadioButton
+ android:id="@+id/saved_ip_addresses_radiobutton"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:text="@string/issued_to"
+ android:text="@string/saved_ip_addresses"
+ android:textSize="17sp"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_to_cname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_to_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:textColor="?android:textColorPrimary" />
<TextView
- android:id="@+id/current_website_certificate_issued_to_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <!-- Current Website Certificate Issued By. -->
- <TextView
+ android:id="@+id/saved_ip_addresses_textview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/issued_by"
- android:textAllCaps="true"
- android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_by_cname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:layout_marginStart="32dp"
+ android:textColor="?attr/blueTextColor" />
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
- <TextView
- android:id="@+id/current_website_certificate_issued_by_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ <androidx.cardview.widget.CardView
+ android:id="@+id/current_ip_addresses_cardview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_margin="10dp">
- <TextView
- android:id="@+id/current_website_certificate_issued_by_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ <LinearLayout
+ android:id="@+id/current_ip_addresses_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp" >
- <!-- Current Website Certificate Valid Dates. -->
- <TextView
+ <RadioButton
+ android:id="@+id/current_ip_addresses_radiobutton"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/valid_dates"
+ android:text="@string/current_ip_addresses"
+ android:textSize="17sp"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?android:textColorPrimary" />
<TextView
- android:id="@+id/current_website_certificate_start_date"
+ android:id="@+id/current_ip_addresses_textview"
android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_end_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:layout_width="match_parent"
+ android:layout_marginStart="32dp"
+ android:textColor="?attr/blueTextColor" />
</LinearLayout>
- </LinearLayout>
-
- <!-- Load An Encrypted Website Instructions. -->
- <TextView
- android:id="@+id/no_current_website_certificate"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_marginTop="10dp"
- android:layout_marginStart="40dp"
- android:layout_marginEnd="40dp"
- android:gravity="center_horizontal"
- android:text="@string/load_an_encrypted_website" />
+ </androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff