<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:layout_marginEnd="10dp"
android:layout_marginBottom="12dp"
android:layout_gravity="bottom"
- android:src="@drawable/domains"
+ android:src="@drawable/domains_day"
android: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:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
+ android:src="@drawable/cookies_enabled"
tools:ignore="contentDescription" />
<Switch
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"
+ tools:ignore="contentDescription" />
+
+ <Switch
+ 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/user_agent_light"
+ android:src="@drawable/user_agent_day"
android:tint="?attr/domainSettingsIconTintColor"
android:contentDescription="@string/user_agent" />
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:src="@drawable/font_size_day"
android:tint="?attr/domainSettingsIconTintColor"
android:contentDescription="@string/font_size" />
</LinearLayout>
<TextView
- android:id="@+id/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. -->
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: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/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/webview_theme" />
+
+ <Spinner
+ android:id="@+id/webview_theme_spinner"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/webview_theme_textview"
+ android:layout_height="match_parent"
+ 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="horizontal" >
<ImageView
- android:id="@+id/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/night_mode_spinner"
+ android:id="@+id/wide_viewport_spinner"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
<TextView
- android:id="@+id/night_mode_textview"
+ android:id="@+id/wide_viewport_textview"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginStart="45dp"
</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="?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: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="?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_width="match_parent" />
</LinearLayout>
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
<!-- Load An Encrypted Website Instructions. -->
<TextView
</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="?attr/blueTextColor" />
</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="?attr/blueTextColor" />
</LinearLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file