fix Travis

[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 7426e48..4cbd46a 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -2,12 +2,12 @@
 <!-- 
     ownCloud Android client application
 
-    Copyright (C) 2012  Bartek Przybylski
-    This program 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.
+    Copyright (C) 2015 ownCloud Inc.
 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2,
+    as published by the Free Software Foundation.
+  
     This program 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
@@ -21,23 +21,25 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+       android:padding="16dp">
 
        <TextView
                android:id="@+id/header"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/ssl_validator_header"
-               android:padding="5dp"
+               android:paddingBottom="16dp"
                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"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_not_trusted"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -47,7 +49,7 @@
                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"
                 />
@@ -57,7 +59,7 @@
                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"
                 />
@@ -67,7 +69,7 @@
                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"
                 />
@@ -75,11 +77,11 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-       android:padding="20dp"
+       android:padding="8dp"
         android:layout_width="wrap_content"
         android:layout_height="180dp">
         
-               <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+               <LinearLayout
                android:id="@+id/details_view"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@@ -397,7 +399,7 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-               android:padding="5dp"
+               android:paddingTop="16dp"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >
@@ -406,28 +408,31 @@
        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal" >
+        android:gravity="center" >
 
-        <Button
+               <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_no" />
 
-        <Button
+               <android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
+                       style="@style/Button.Borderless"
             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" />
 
-        <Button
+               <android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_ok" />
+            android:text="@string/common_yes" />
 
     </LinearLayout>