fix Travis

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index b2973a0..3a8655f 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application\r
 \r
   Copyright (C) 2012  Bartek Przybylski\r
   ownCloud Android client application\r
 \r
   Copyright (C) 2012  Bartek Przybylski\r

-  Copyright (C) 2012-2013 ownCloud Inc.\r
+  Copyright (C) 2015 ownCloud Inc.\r

 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r
 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r


@@ -38,20 +38,22 @@
             android:id="@+id/thumbnail"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:id="@+id/thumbnail"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r

-            android:layout_marginBottom="10dp"\r
+            android:layout_marginBottom="20dp"\r

             android:layout_marginTop="10dp"\r
             android:background="@color/login_logo_background_color"\r
             android:layout_marginTop="10dp"\r
             android:background="@color/login_logo_background_color"\r

-            android:src="@drawable/logo" />\r
+            android:src="@drawable/logo"\r
+            android:contentDescription="@string/app_name"/>\r

 \r
 \r

-        <Button\r
+        <android.support.v7.widget.AppCompatButton\r

             android:id="@+id/centeredRefreshButton"\r
             android:id="@+id/centeredRefreshButton"\r

+            style="@style/ownCloud.Button"\r

             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:layout_marginBottom="10dp"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:layout_marginBottom="10dp"\r

-            android:onClick="onRefreshClick"\r

             android:text="@string/auth_check_server"\r
             android:text="@string/auth_check_server"\r

-            android:visibility="gone" />\r
+            android:visibility="gone"\r
+            android:contentDescription="@string/auth_check_server"/>\r

         \r
         <TextView\r
             android:id="@+id/instructions_message"\r
         \r
         <TextView\r
             android:id="@+id/instructions_message"\r


@@ -60,13 +62,16 @@
             android:layout_gravity="fill_horizontal"\r
             android:text="@string/auth_expired_basic_auth_toast"\r
             android:visibility="gone"\r
             android:layout_gravity="fill_horizontal"\r
             android:text="@string/auth_expired_basic_auth_toast"\r
             android:visibility="gone"\r

-            android:layout_marginBottom="10dp" />\r
+            android:layout_marginBottom="10dp"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r

 \r
            <FrameLayout \r
                android:id="@+id/hostUrlFrame"\r
                        android:layout_width="match_parent"\r
                        android:layout_height="wrap_content"\r
 \r
            <FrameLayout \r
                android:id="@+id/hostUrlFrame"\r
                        android:layout_width="match_parent"\r
                        android:layout_height="wrap_content"\r

-            android:layout_marginBottom="10dp"\r
+            android:layout_marginBottom="0dp"\r

                >\r
                        <EditText\r
                                android:id="@+id/hostUrlInput"\r
                >\r
                        <EditText\r
                                android:id="@+id/hostUrlInput"\r


@@ -77,21 +82,24 @@
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r

-                               >\r
+                android:textColorHint="@color/login_text_hint_color"\r
+                               android:contentDescription="@string/auth_host_address"\r
+                >\r

                                <requestFocus />\r
                        </EditText>\r
                        <ImageButton\r
                            android:id="@+id/embeddedRefreshButton"\r
                                <requestFocus />\r
                        </EditText>\r
                        <ImageButton\r
                            android:id="@+id/embeddedRefreshButton"\r

-                           android:layout_width="48dp"\r
-                           android:layout_height="48dp"\r
+                           android:layout_width="wrap_content"\r
+                           android:layout_height="wrap_content"\r

                            android:layout_gravity="center_vertical|right"\r
                            android:layout_marginRight="5dp"\r
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r
                            android:layout_gravity="center_vertical|right"\r
                            android:layout_marginRight="5dp"\r
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r

-                           android:src="@drawable/ic_action_refresh_black"\r
+                           android:src="@drawable/ic_action_refresh_grey"\r

                android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
                android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r

+                android:contentDescription="@string/auth_refresh_button"\r

                            />\r
                </FrameLayout>\r
 \r
                            />\r
                </FrameLayout>\r
 \r


@@ -103,7 +111,11 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r

-            android:text="@string/auth_testing_connection" />\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:text="@string/auth_testing_connection"\r
+            android:minHeight="32dp"\r
+            android:contentDescription="@string/auth_testing_connection"/>\r

 \r
         <CheckBox\r
             android:id="@+id/oauth_onOff_check"\r
 \r
         <CheckBox\r
             android:id="@+id/oauth_onOff_check"\r


@@ -113,6 +125,9 @@
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r

+            android:textColor="@color/primary"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:contentDescription="@string/oauth_check_onoff"\r

             />\r
 \r
         <EditText\r
             />\r
 \r
         <EditText\r


@@ -121,10 +136,11 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
                        android:enabled="false"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
                        android:enabled="false"\r

+            android:textColorHint="@color/login_text_hint_color"\r

             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r

-            android:visibility="gone" >\r
+            android:visibility="gone">\r

         </EditText>\r
 \r
         <EditText\r
         </EditText>\r
 \r
         <EditText\r


@@ -136,7 +152,8 @@
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r

-            android:visibility="gone" />\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:visibility="gone"/>\r

 \r
         <EditText\r
             android:id="@+id/account_username"\r
 \r
         <EditText\r
             android:id="@+id/account_username"\r


@@ -144,8 +161,10 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r

-            android:inputType="textNoSuggestions" \r
-                       />\r
+            android:inputType="textNoSuggestions"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:contentDescription="@string/auth_username"\r
+            />\r

 \r
                <EditText\r
                    android:id="@+id/account_password"\r
 \r
                <EditText\r
                    android:id="@+id/account_password"\r


@@ -154,7 +173,9 @@
                    android:drawablePadding="5dp"\r
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
                    android:drawablePadding="5dp"\r
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r

-                   android:inputType="textPassword" \r
+                   android:inputType="textPassword"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+                   android:contentDescription="@string/auth_password"\r

             />\r
         \r
         <TextView\r
             />\r
         \r
         <TextView\r


@@ -165,16 +186,21 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r

-            android:text="@string/auth_unauthorized" />\r
+            android:text="@string/auth_unauthorized"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:contentDescription="@string/auth_unauthorized"/>\r

 \r
 \r

-        <Button\r
+        <android.support.v7.widget.AppCompatButton\r

             android:id="@+id/buttonOK"\r
             android:id="@+id/buttonOK"\r

+            android:theme="@style/Button.Primary"\r
+            style="@style/Button.Primary"\r

             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r

-            android:onClick="onOkClick"\r
-            android:text="@string/setup_btn_connect" />\r
+            android:text="@string/setup_btn_connect"\r
+            android:contentDescription="@string/setup_btn_connect"/>\r

 \r
         <Button\r
             android:id="@+id/welcome_link"\r
 \r
         <Button\r
             android:id="@+id/welcome_link"\r


@@ -185,7 +211,9 @@
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r

-            android:textColor="#0000FF"/>\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
+            android:contentDescription="@string/auth_register"/>\r

 \r
     </LinearLayout>\r
 \r
 \r
     </LinearLayout>\r
 \r