X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3eb602f81a7a0becf84f24a4a2b246536dd84ab9..40d8a2b2bb257a74f4e4ac392c3acc3a2853aa4e:/res/layout/account_setup.xml

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 22583045..6b9ce79f 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,
@@ -17,59 +17,90 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-	android:padding="8dip"
     android:fillViewport="true"
-    android:orientation="vertical"
+    android:orientation="vertical" 
+    android:id="@+id/scroll"
     >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-		android:layout_margin="8dip"
+        android:background="@color/login_background_color"
         android:gravity="center"
-        android:orientation="vertical" 
-        android:focusable="true"
-        >
+        android:orientation="vertical"
+        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_marginTop="10dp"
-            android:src="@drawable/logo" />
+            android:background="@color/login_logo_background_color"
+            android:src="@drawable/logo"
+            android:contentDescription="@string/app_name"/>
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <EditText
-                android:id="@+id/hostUrlInput"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/auth_host_url"
-                android:inputType="textUri" >
-
-                <requestFocus />
-            </EditText>
-
-            <ImageView
-                android:id="@+id/refreshButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:src="@drawable/ic_action_refresh_black"
+        <Button
+            android:id="@+id/centeredRefreshButton"
+            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: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: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"
+	        >
+			<EditText
+				android:id="@+id/hostUrlInput"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom"
+				android:hint="@string/auth_host_url"
+				android:inputType="textUri"
+				android:drawablePadding="5dp"
+				android:paddingRight="55dp"
+				android:contentDescription="@string/auth_host_address"
+                >
+				<requestFocus />
+			</EditText>
+			<ImageButton
+			    android:id="@+id/embeddedRefreshButton"
+			    android:layout_width="48dp"
+			    android:layout_height="48dp"
+			    android:layout_gravity="center_vertical|right"
+			    android:layout_marginRight="5dp"
+			    android:padding="0dp"
+			    android:scaleType="fitCenter"
+			    android:src="@drawable/ic_action_refresh_black"
             	android:onClick="onRefreshClick"
-                android:visibility="invisible" />
-        </FrameLayout>
+				android:visibility="gone"
+				android:background="@android:color/transparent"
+                android:contentDescription="@string/auth_refresh_button"
+			    />
+		</FrameLayout>
 
-        <TextView
+		<TextView
             android:id="@+id/server_status_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -77,7 +108,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
-            android:text="@string/auth_testing_connection" />
+            android:text="@string/auth_testing_connection"
+            android:contentDescription="@string/auth_testing_connection"/>
 
         <CheckBox
             android:id="@+id/oauth_onOff_check"
@@ -87,17 +119,19 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:visibility="gone" />
+            android:contentDescription="@string/oauth_check_onoff"
+            />
 
         <EditText
             android:id="@+id/oAuthEntryPoint_1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ems="10"
-            android:inputType="textUri"
-            android:singleLine="true"
+			android:enabled="false"
             android:text="@string/oauth2_url_endpoint_auth"
-            android:visibility="gone" >
+            android:singleLine="true"
+            android:inputType="textUri"
+            android:visibility="gone">
         </EditText>
 
         <EditText
@@ -105,10 +139,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ems="10"
-            android:inputType="textUri"
-            android:singleLine="true"
+			android:enabled="false"
             android:text="@string/oauth2_url_endpoint_access"
-            android:visibility="gone" />
+            android:singleLine="true"
+            android:inputType="textUri"
+            android:visibility="gone"/>
 
         <EditText
             android:id="@+id/account_username"
@@ -116,30 +151,21 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:hint="@string/auth_username"
-            android:inputType="textNoSuggestions" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <EditText
-                android:id="@+id/account_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/auth_password"
-                android:inputType="textPassword" />
-
-            <ImageView
-                android:id="@+id/viewPasswordButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:onClick="onViewPasswordClick"
-                android:src="@android:drawable/ic_menu_view"
-                android:visibility="invisible" />
-        </FrameLayout>
+            android:inputType="textNoSuggestions"
+            android:contentDescription="@string/auth_username"
+            />
 
+		<EditText
+		    android:id="@+id/account_password"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:drawablePadding="5dp"
+		    android:ems="10"
+		    android:hint="@string/auth_password"
+		    android:inputType="textPassword"
+		    android:contentDescription="@string/auth_password"
+            />
+        
         <TextView
             android:id="@+id/auth_status_text"
             android:layout_width="match_parent"
@@ -148,7 +174,8 @@
             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:contentDescription="@string/auth_unauthorized"/>
 
         <Button
             android:id="@+id/buttonOK"
@@ -158,19 +185,20 @@
             android:enabled="false"
             android:onClick="onOkClick"
             android:text="@string/setup_btn_connect"
-            android:textColor="@android:color/black" />
+            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"
-            android:textColor="#0000FF" 
             android:onClick="onRegisterClick"
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            />
+            android:textColor="#0000FF"
+            android:contentDescription="@string/auth_register"/>
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file