Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

[pub/Android/ownCloud.git] / res / layout / ssl_validator_layout.xml

diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 8fda8c2..df14a35 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -28,17 +28,18 @@
                android:id="@+id/header"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:id="@+id/header"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"

-        android:paddingBottom="@dimen/standard_padding"

                android:text="@string/ssl_validator_header"
                android:text="@string/ssl_validator_header"

+               android:paddingBottom="@dimen/standard_padding"

                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textAppearance="?android:attr/textAppearanceMedium"

-        />
-    
+               android:textColor="@color/black"
+                />
+

        <TextView
                android:id="@+id/reason_cert_not_trusted"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
        <TextView
                android:id="@+id/reason_cert_not_trusted"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"

-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"

                android:text="@string/ssl_validator_reason_cert_not_trusted"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
                android:text="@string/ssl_validator_reason_cert_not_trusted"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />


@@ -48,7 +49,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"

-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"

                android:text="@string/ssl_validator_reason_cert_expired"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
                android:text="@string/ssl_validator_reason_cert_expired"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />


@@ -58,7 +59,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"

-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"

                android:text="@string/ssl_validator_reason_cert_not_yet_valid"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
                android:text="@string/ssl_validator_reason_cert_not_yet_valid"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />


@@ -68,7 +69,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"

-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"

                android:text="@string/ssl_validator_reason_hostname_not_verified"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
                android:text="@string/ssl_validator_reason_hostname_not_verified"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />


@@ -76,7 +77,7 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 

-       android:padding="20dp"
+       android:padding="8dp"

         android:layout_width="wrap_content"
         android:layout_height="180dp">
         
         android:layout_width="wrap_content"
         android:layout_height="180dp">
         


@@ -94,7 +95,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_subject"
                                android:textAppearance="?android:attr/textAppearanceMedium"
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_subject"
                                android:textAppearance="?android:attr/textAppearanceMedium"

-                                       />
+                       />

                                
                                <TextView
                                    android:id="@+id/label_subject_CN"
                                
                                <TextView
                                    android:id="@+id/label_subject_CN"


@@ -102,7 +103,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_CN"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_CN"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_subject_CN"
                            
                                <TextView
                                    android:id="@+id/value_subject_CN"


@@ -111,7 +112,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_subject_O"
                                
                                <TextView
                                    android:id="@+id/label_subject_O"


@@ -119,7 +120,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_O"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_O"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_subject_O"
                            
                                <TextView
                                    android:id="@+id/value_subject_O"


@@ -128,7 +129,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_subject_OU"
                                
                                <TextView
                                    android:id="@+id/label_subject_OU"


@@ -136,7 +137,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_OU"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_OU"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_subject_OU"
                            
                                <TextView
                                    android:id="@+id/value_subject_OU"


@@ -145,7 +146,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_subject_ST"
                                
                                <TextView
                                    android:id="@+id/label_subject_ST"


@@ -153,7 +154,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_ST"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_ST"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_subject_ST"
                            
                                <TextView
                                    android:id="@+id/value_subject_ST"


@@ -162,7 +163,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

 
                                <TextView
                                    android:id="@+id/label_subject_C"
 
                                <TextView
                                    android:id="@+id/label_subject_C"


@@ -170,7 +171,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_C"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_C"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/value_subject_C"
                                
                                <TextView
                                    android:id="@+id/value_subject_C"


@@ -179,7 +180,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_subject_L"
                                
                                <TextView
                                    android:id="@+id/label_subject_L"


@@ -187,7 +188,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_L"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_L"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_subject_L"
                            
                                <TextView
                                    android:id="@+id/value_subject_L"


@@ -197,6 +198,7 @@
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                />
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                />

+                           

 
                                <TextView
                                android:id="@+id/label_issuer"
 
                                <TextView
                                android:id="@+id/label_issuer"


@@ -205,7 +207,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_issuer"
                                android:textAppearance="?android:attr/textAppearanceMedium"
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_issuer"
                                android:textAppearance="?android:attr/textAppearanceMedium"

-                               />
+                       />

                                
                                <TextView
                                    android:id="@+id/label_issuer_CN"
                                
                                <TextView
                                    android:id="@+id/label_issuer_CN"


@@ -213,7 +215,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_CN"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_CN"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_issuer_CN"
                            
                                <TextView
                                    android:id="@+id/value_issuer_CN"


@@ -222,7 +224,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_issuer_O"
                                
                                <TextView
                                    android:id="@+id/label_issuer_O"


@@ -230,7 +232,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_O"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_O"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_issuer_O"
                            
                                <TextView
                                    android:id="@+id/value_issuer_O"


@@ -239,7 +241,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_issuer_OU"
                                
                                <TextView
                                    android:id="@+id/label_issuer_OU"


@@ -247,7 +249,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_OU"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_OU"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_issuer_OU"
                            
                                <TextView
                                    android:id="@+id/value_issuer_OU"


@@ -256,7 +258,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_issuer_ST"
                                
                                <TextView
                                    android:id="@+id/label_issuer_ST"


@@ -264,7 +266,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_ST"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_ST"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_issuer_ST"
                            
                                <TextView
                                    android:id="@+id/value_issuer_ST"


@@ -273,7 +275,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

 
                                <TextView
                                    android:id="@+id/label_issuer_C"
 
                                <TextView
                                    android:id="@+id/label_issuer_C"


@@ -281,7 +283,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_C"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_C"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/value_issuer_C"
                                
                                <TextView
                                    android:id="@+id/value_issuer_C"


@@ -290,7 +292,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_issuer_L"
                                
                                <TextView
                                    android:id="@+id/label_issuer_L"


@@ -298,7 +300,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_L"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_L"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_issuer_L"
                            
                                <TextView
                                    android:id="@+id/value_issuer_L"


@@ -307,7 +309,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                android:id="@+id/label_validity"
                            
                                <TextView
                                android:id="@+id/label_validity"


@@ -316,7 +318,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_validity"
                                android:textAppearance="?android:attr/textAppearanceMedium"
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_validity"
                                android:textAppearance="?android:attr/textAppearanceMedium"

-                               />
+                       />

                                
                                <TextView
                                    android:id="@+id/label_validity_from"
                                
                                <TextView
                                    android:id="@+id/label_validity_from"


@@ -324,7 +326,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_validity_from"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_validity_from"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_validity_from"
                            
                                <TextView
                                    android:id="@+id/value_validity_from"


@@ -333,7 +335,7 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                                
                                <TextView
                                    android:id="@+id/label_validity_to"
                                
                                <TextView
                                    android:id="@+id/label_validity_to"


@@ -341,7 +343,7 @@
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_validity_to"
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:layout_height="wrap_content"
                                    android:text="@string/ssl_validator_label_validity_to"
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />

                            
                                <TextView
                                    android:id="@+id/value_validity_to"
                            
                                <TextView
                                    android:id="@+id/value_validity_to"


@@ -350,7 +352,8 @@
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"
                                    android:paddingBottom="5dp"
                                    android:text=""
                                    android:textAppearance="?android:attr/textAppearanceSmall"

-                                       />
+                               />
+                               

 
                                <TextView
                                android:id="@+id/label_signature"
 
                                <TextView
                                android:id="@+id/label_signature"


@@ -359,7 +362,7 @@
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_signature"
                                android:textAppearance="?android:attr/textAppearanceMedium"
                                        android:paddingBottom="5dp"
                                android:text="@string/ssl_validator_label_signature"
                                android:textAppearance="?android:attr/textAppearanceMedium"

-                               />
+                       />

                                
                                <TextView
                                android:id="@+id/label_signature_algorithm"
                                
                                <TextView
                                android:id="@+id/label_signature_algorithm"


@@ -367,17 +370,18 @@
                                android:layout_height="wrap_content"
                                android:text="@string/ssl_validator_label_signature_algorithm"
                                android:textAppearance="?android:attr/textAppearanceSmall"
                                android:layout_height="wrap_content"
                                android:text="@string/ssl_validator_label_signature_algorithm"
                                android:textAppearance="?android:attr/textAppearanceSmall"

-                               />
+                       />

                                
                                

-                               <TextView
+                                                               <TextView

                                android:id="@+id/value_signature_algorithm"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                        android:paddingBottom="5dp"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"
                                android:id="@+id/value_signature_algorithm"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                        android:paddingBottom="5dp"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"

-                               />
-
+                       />
+                                                                                                                                                                                               
+                                                               

                                <TextView
                                android:id="@+id/value_signature"
                                android:layout_width="wrap_content"
                                <TextView
                                android:id="@+id/value_signature"
                                android:layout_width="wrap_content"


@@ -385,7 +389,7 @@
                                        android:paddingBottom="5dp"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"
                                        android:paddingBottom="5dp"
                                android:text=""
                                android:textAppearance="?android:attr/textAppearanceSmall"

-                               />
+                       />

                                
                </LinearLayout>
                
                                
                </LinearLayout>
                


@@ -395,7 +399,7 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

-        android:paddingTop="@dimen/standard_padding"
+               android:paddingTop="@dimen/standard_padding"

         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >


@@ -408,27 +412,27 @@
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"

-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"

-            android:text="@string/common_cancel" />
+            android:text="@string/common_no" />

 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"

-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

-            android:layout_weight="1"
+            android:layout_weight="2"

             android:text="@string/ssl_validator_btn_details_see" />
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
             android:text="@string/ssl_validator_btn_details_see" />
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"

-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"

-            android:text="@string/common_ok" />
+            android:text="@string/common_yes" />

 
     </LinearLayout>
 
 
     </LinearLayout>