X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a6a56bae2acae4f69c421fa5b8166a3cd5ebaf9f..2636e07289924b4e2ff6853b4a7d3cbde2a0d149:/res/layout-land/account_setup.xml

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index bff91f5d..d5d6ab0f 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/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,
@@ -20,23 +20,26 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/login_background_color"
 	android:padding="8dip"
     >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/buttonOK"
+        android:layout_above="@+id/bottom_block"
         android:layout_alignParentTop="true"
         android:orientation="horizontal" >
         
 		<ImageView
-			android:id="@+id/imageView1"
+			android:id="@+id/thumbnail"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:layout_gravity="center"
-			android:src="@drawable/logo" 
+			android:background="@color/login_logo_background_color"
+			android:src="@drawable/logo"
+            android:contentDescription="@string/app_name"
 			/>
 		
 		<ScrollView
@@ -63,8 +66,19 @@
 					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/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: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"
@@ -80,6 +94,9 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
+						android:textColor="@color/login_text_color"
+						android:textColorHint="@color/login_text_hint_color"
+						android:contentDescription="@string/auth_host_address"
 						>
 						<requestFocus />
 					</EditText>
@@ -95,6 +112,7 @@
             			android:onClick="onRefreshClick"
 					    android:visibility="gone"
 						android:background="@android:color/transparent"
+                        android:contentDescription="@string/auth_refresh_button"
 					    />
 				</FrameLayout>
 		
@@ -106,7 +124,10 @@
 					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:contentDescription="@string/auth_testing_connection"/>
 		             
 				<CheckBox
 					android:id="@+id/oauth_onOff_check"
@@ -115,7 +136,10 @@
 					android:checked="false"
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:contentDescription="@string/oauth_check_onoff"
 					/>
 		
 				<EditText
@@ -127,7 +151,9 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:visibility="gone" >
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
+					android:visibility="gone">
 				</EditText>            
 				
 				<EditText
@@ -139,7 +165,9 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:visibility="gone" >
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
+					android:visibility="gone">
 					<requestFocus />
 				</EditText>            
 		
@@ -149,7 +177,11 @@
 					android:layout_height="wrap_content"
 					android:ems="10"
 					android:hint="@string/auth_username"
-					android:inputType="textNoSuggestions" />
+					android:inputType="textNoSuggestions"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
+					android:contentDescription="@string/auth_username"
+					/>
 		
 				<EditText
 				    android:id="@+id/account_password"
@@ -159,6 +191,9 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
+					android:contentDescription="@string/auth_password"
 					/>
 		        
 				<TextView
@@ -169,6 +204,9 @@
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
+                    android:contentDescription="@string/auth_unauthorized"
 					/>
 
 			</LinearLayout>
@@ -177,29 +215,35 @@
 						           
 	</LinearLayout>
        
-	<Button
-		android:id="@id/buttonOK"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_above="@id/account_register"
-		android:layout_centerHorizontal="true"
-		android:enabled="false"
-		android:onClick="onOkClick"
-		android:text="@string/setup_btn_connect"
-		/>
-
-	<Button
-		android:id="@+id/account_register"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
+    <LinearLayout
+        android:id="@id/bottom_block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
-		android:background="@android:color/transparent"
-		android:textColor="#0000FF"
-		android:onClick="onRegisterClick"
-		android:paddingTop="5dp"
-		android:paddingBottom="5dp"
-		android:text="@string/auth_register" 
-		/>
-	
+        android:orientation="vertical" >
+        
+		<Button
+		    android:id="@+id/buttonOK"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    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/welcome_link"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_gravity="center_horizontal"
+		    android:background="@android:color/transparent"
+		    android:onClick="onRegisterClick"
+		    android:paddingBottom="5dp"
+		    android:paddingTop="5dp"
+		    android:text="@string/auth_register"
+			android:textColor="@color/login_text_color"
+            android:contentDescription="@string/auth_register"/>
+	</LinearLayout>
+		
 </RelativeLayout>