X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/20b5ecbac1bac258ae69a64ae02927da3ca23f63..88eca70dbf417507da2f4c6ae0aa024ba794a9fe:/res/layout/account_setup.xml

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index c263daf5..3a8655fa 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
+  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,
@@ -35,37 +35,43 @@
         android:padding="8dp" >
 
         <ImageView
-            android:id="@+id/imageView1"
+            android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="20dp"
             android:layout_marginTop="10dp"
-            android:src="@drawable/logo" />
+            android:background="@color/login_logo_background_color"
+            android:src="@drawable/logo"
+            android:contentDescription="@string/app_name"/>
 
-        <Button
+        <android.support.v7.widget.AppCompatButton
             android:id="@+id/centeredRefreshButton"
+            style="@style/ownCloud.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="10dp"
-            android:onClick="onRefreshClick"
             android:text="@string/auth_check_server"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:contentDescription="@string/auth_check_server"/>
         
         <TextView
-            android:id="@+id/auth_message"
+            android:id="@+id/instructions_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill_horizontal"
             android:text="@string/auth_expired_basic_auth_toast"
             android:visibility="gone"
-            android:layout_marginBottom="10dp" />
+            android:layout_marginBottom="10dp"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
+            android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
 	    <FrameLayout 
 	        android:id="@+id/hostUrlFrame"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="0dp"
 	        >
 			<EditText
 				android:id="@+id/hostUrlInput"
@@ -76,21 +82,24 @@
 				android:inputType="textUri"
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
-				>
+                android:textColorHint="@color/login_text_hint_color"
+				android:contentDescription="@string/auth_host_address"
+                >
 				<requestFocus />
 			</EditText>
 			<ImageButton
 			    android:id="@+id/embeddedRefreshButton"
-			    android:layout_width="48dp"
-			    android:layout_height="48dp"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
 			    android:layout_gravity="center_vertical|right"
 			    android:layout_marginRight="5dp"
 			    android:padding="0dp"
 			    android:scaleType="fitCenter"
-			    android:src="@drawable/ic_action_refresh_black"
+			    android:src="@drawable/ic_action_refresh_grey"
             	android:onClick="onRefreshClick"
 				android:visibility="gone"
 				android:background="@android:color/transparent"
+                android:contentDescription="@string/auth_refresh_button"
 			    />
 		</FrameLayout>
 
@@ -102,7 +111,11 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
-            android:text="@string/auth_testing_connection" />
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
+            android:text="@string/auth_testing_connection"
+            android:minHeight="32dp"
+            android:contentDescription="@string/auth_testing_connection"/>
 
         <CheckBox
             android:id="@+id/oauth_onOff_check"
@@ -112,6 +125,9 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/primary"
+            android:textColorHint="@color/login_text_hint_color"
+            android:contentDescription="@string/oauth_check_onoff"
             />
 
         <EditText
@@ -120,10 +136,11 @@
             android:layout_height="wrap_content"
             android:ems="10"
 			android:enabled="false"
+            android:textColorHint="@color/login_text_hint_color"
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
             android:inputType="textUri"
-            android:visibility="gone" >
+            android:visibility="gone">
         </EditText>
 
         <EditText
@@ -135,7 +152,8 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
-            android:visibility="gone" />
+            android:textColorHint="@color/login_text_hint_color"
+            android:visibility="gone"/>
 
         <EditText
             android:id="@+id/account_username"
@@ -143,8 +161,10 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:hint="@string/auth_username"
-            android:inputType="textNoSuggestions" 
-			/>
+            android:inputType="textNoSuggestions"
+            android:textColorHint="@color/login_text_hint_color"
+            android:contentDescription="@string/auth_username"
+            />
 
 		<EditText
 		    android:id="@+id/account_password"
@@ -153,7 +173,9 @@
 		    android:drawablePadding="5dp"
 		    android:ems="10"
 		    android:hint="@string/auth_password"
-		    android:inputType="textPassword" 
+		    android:inputType="textPassword"
+            android:textColorHint="@color/login_text_hint_color"
+		    android:contentDescription="@string/auth_password"
             />
         
         <TextView
@@ -164,21 +186,24 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
-            android:text="@string/auth_unauthorized" />
+            android:text="@string/auth_unauthorized"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
+            android:contentDescription="@string/auth_unauthorized"/>
 
-        <Button
+        <android.support.v7.widget.AppCompatButton
             android:id="@+id/buttonOK"
+            android:theme="@style/Button.Primary"
+            style="@style/Button.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:drawable/btn_default"
             android:layout_gravity="center_horizontal"
             android:enabled="false"
-            android:onClick="onOkClick"
             android:text="@string/setup_btn_connect"
-            />
+            android:contentDescription="@string/setup_btn_connect"/>
 
         <Button
-            android:id="@+id/account_register"
+            android:id="@+id/welcome_link"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -186,8 +211,9 @@
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            android:textColor="#0000FF"
-            android:visibility="gone" />
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
+            android:contentDescription="@string/auth_register"/>
 
     </LinearLayout>