X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/154bb85cf1cc5347333be1cea339907b13cc746a..8cfafef514b1cd7979d7a8a4e71f34a9737a0cff:/res/layout/account_setup.xml?ds=sidebyside

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 855c5ffb..e3321f94 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -1,29 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical" android:background="#F7F7F7" android:focusable="true">
-    <LinearLayout android:id="@+id/linearLayout7" android:paddingBottom="2pt" android:gravity="center_vertical|top" android:layout_gravity="top" android:layout_height="wrap_content" android:paddingTop="2pt" android:orientation="vertical" android:layout_width="fill_parent" android:background="#1D2D44">
-        <ImageView android:id="@+id/main_header_small" android:src="@drawable/owncloud_logo_small_white" android:layout_gravity="center|center_vertical|center_horizontal" android:layout_height="wrap_content" android:layout_width="wrap_content" android:focusable="true"></ImageView>
-    </LinearLayout>
-	<LinearLayout android:id="@+id/linearLayout2" android:layout_width="fill_parent" android:orientation="vertical" android:gravity="center_vertical" android:layout_gravity="center|center_vertical" android:layout_height="fill_parent">
-		<TableLayout android:id="@+id/tableLayout1" android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent">
-			<TableRow android:layout_height="wrap_content" android:id="@+id/tableRow1" android:layout_width="wrap_content" android:gravity="center_horizontal">
-				<TextView android:id="@+id/textView1" android:text="@string/setup_title" android:layout_marginBottom="15dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/black" android:textStyle="bold" android:layout_marginTop="15dip" android:textSize="7pt"></TextView>
-			</TableRow>
-			<TableRow android:layout_height="wrap_content" android:weightSum="1.0" android:id="@+id/tableRow2" android:layout_width="wrap_content" android:gravity="center_horizontal">
-				<EditText android:id="@+id/host_URL" android:layout_weight="0.75" android:layout_width="fill_parent" android:layout_height="wrap_content" android:hint="@string/setup_hint_address">
-					<requestFocus></requestFocus>
-				</EditText>
-			</TableRow>
-			<TableRow android:layout_height="wrap_content" android:weightSum="1.0" android:id="@+id/tableRow3" android:layout_width="wrap_content" android:gravity="center_horizontal">
-				<EditText android:id="@+id/account_username" android:layout_weight=".75" android:layout_width="fill_parent" android:layout_height="wrap_content" android:textColor="@android:color/black" android:hint="@string/setup_hint_username"></EditText>
-			</TableRow>
-			<TableRow android:layout_height="wrap_content" android:weightSum="1.0" android:id="@+id/tableRow4" android:layout_width="fill_parent" android:gravity="center_horizontal">
-				<EditText android:id="@+id/account_password" android:layout_weight=".75" android:layout_width="fill_parent" android:inputType="textPassword" android:layout_height="wrap_content" android:textColor="@android:color/black" android:hint="@string/setup_hint_password"></EditText>
-			</TableRow>
-		</TableLayout>
-		<LinearLayout android:layout_height="wrap_content" android:weightSum="1.0" android:id="@+id/linearLayout1" android:layout_width="fill_parent" android:gravity="center_horizontal" android:orientation="horizontal">
-			<Button android:id="@+id/buttonOK" android:text="@string/setup_btn_connect" android:layout_width="wrap_content" android:layout_weight=".50" android:layout_height="wrap_content" android:onClick="onOkClick"></Button>
-		</LinearLayout>
-	</LinearLayout>
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 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
+  GNU General Public License for more details.
+
+  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:fillViewport="true"
+    android:orientation="vertical" 
+    android:id="@+id/scroll"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/login_background_color"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="8dp" >
+
+        <ImageView
+            android:id="@+id/imageView1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/login_logo_background_color"
+            android:src="@drawable/logo" />
+
+        <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" />
+        
+        <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" />
+
+	    <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"
+				>
+				<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="gone"
+				android:background="@android:color/transparent"
+			    />
+		</FrameLayout>
+
+		<TextView
+            android:id="@+id/server_status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:drawableLeft="@android:drawable/stat_notify_sync"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/auth_testing_connection" />
+
+        <CheckBox
+            android:id="@+id/oauth_onOff_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:onClick="onCheckClick"
+            android:text="@string/oauth_check_onoff"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            />
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+			android:enabled="false"
+            android:text="@string/oauth2_url_endpoint_auth"
+            android:singleLine="true"
+            android:inputType="textUri"
+            android:visibility="gone" >
+        </EditText>
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+			android:enabled="false"
+            android:text="@string/oauth2_url_endpoint_access"
+            android:singleLine="true"
+            android:inputType="textUri"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/account_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/auth_username"
+            android:inputType="textNoSuggestions" 
+			/>
+
+		<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" 
+            />
+        
+        <TextView
+            android:id="@+id/auth_status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:drawableLeft="@android:drawable/stat_notify_sync"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/auth_unauthorized" />
+
+        <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" />
+
+        <Button
+            android:id="@+id/welcome_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:onClick="onRegisterClick"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            android:text="@string/auth_register"
+            android:textColor="#0000FF"/>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file