X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings_fragment.xml;h=c44dd7bd503ae7057ded2fc0f4dff26404cdb234;hp=f2c8fb64fac8ac18c621a78a2a163c93e6658a28;hb=c712e2ddec063fb29676a2df99786b262d8c4bfe;hpb=892e8297ba8d23a37c091fb38325929dcf7d17c9

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index f2c8fb64..c44dd7bd 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-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -613,198 +613,214 @@
             </LinearLayout>
 
             <!-- Saved Certificate -->
-            <LinearLayout
-                android:id="@+id/saved_ssl_certificate_linearlayout"
+            <android.support.v7.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_marginBottom="5dp"
                 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" />
-
-                    <TextView
-                        android:id="@+id/saved_ssl_certificate_issued_to_cname"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent" />
+                        android:textColor="?android:textColorPrimary" />
 
-                    <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
+                    <LinearLayout
                         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/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/sslTitle"/>
-
-                    <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" />
+                        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/sslTitle" />
+
+                        <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/sslTitle"/>
+
+                        <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/sslTitle"/>
+
+                        <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>
-            </LinearLayout>
+            </android.support.v7.widget.CardView>
 
             <!-- Current Website Certificate -->
-            <LinearLayout
-                android:id="@+id/current_website_certificate_linearlayout"
+            <android.support.v7.widget.CardView
+                android:id="@+id/current_website_certificate_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="5dp"
+                android:layout_marginBottom="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/current_website_certificate_linearlayout"
                     android:layout_height="wrap_content"
                     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/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" />
-
-                    <TextView
-                        android:id="@+id/current_website_certificate_issued_to_uname"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent" />
+                    android:orientation="vertical"
+                    android:padding="10dp" >
 
-                    <!-- Current Website 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/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" />
+                        android:textColor="?android:textColorPrimary" />
 
-                    <!-- Current Website Certificate Valid Dates. -->
-                    <TextView
+                    <LinearLayout
                         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" />
-
-                    <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" />
+                        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/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" />
+
+                        <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/sslTitle" />
+
+                        <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/sslTitle" />
+
+                        <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>
-            </LinearLayout>
+            </android.support.v7.widget.CardView>
 
             <!-- Load An Encrypted Website Instructions. -->
             <TextView