X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dc7cafe677ff5513587ee84306b762c525c64cf9..9fe217ea4a329f3de125e207f839bcbf509c0b98:/res/layout/account_setup.xml

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 3a9cb4e6..65237a8b 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -1,197 +1,163 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/eu.alefzero.owncloud"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#F7F7F7"
-    android:focusable="true"
-    android:orientation="vertical" >
+<!--
+  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:padding="8dip"
+    android:fillViewport="true"
+    android:orientation="vertical"
+    >
 
     <LinearLayout
-        android:id="@+id/linearLayout7"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:background="#1D2D44"
-        android:gravity="center_vertical|top"
-        android:orientation="vertical"
-        android:paddingBottom="2pt"
-        android:paddingTop="2pt" >
+		android:layout_margin="8dip"
+        android:gravity="center"
+        android:orientation="vertical" 
+        android:focusable="true"
+        >
 
         <ImageView
-            android:id="@+id/main_header_small"
+            android:id="@+id/imageView1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/logo" />
+
+		<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"
+			android:drawablePadding="5dp"
+			>
+			<requestFocus />
+		</EditText>
+
+        <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:layout_gravity="center|center_vertical|center_horizontal"
-            android:focusable="true"
-            android:src="@drawable/owncloud_logo_small_white" >
-        </ImageView>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center|center_vertical"
-        android:gravity="center_vertical"
-        android:orientation="vertical" >
-
-        <TableLayout
-            android:id="@+id/tableLayout1"
-            android:layout_width="fill_parent"
+            android:checked="false"
+            android:onClick="onCheckClick"
+            android:text="@string/oauth_check_onoff"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_1"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal" >
-
-            <TableRow
-                android:id="@+id/tableRow1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal" >
-
-                <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dip"
-                    android:layout_marginTop="15dip"
-                    android:text="@string/setup_title"
-                    android:textColor="@android:color/black"
-                    android:textSize="7pt"
-                    android:textStyle="bold" >
-                </TextView>
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0" >
-


-                <eu.alefzero.owncloud.widgets.ActionEditText
-                    android:id="@+id/host_URL"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.75"
-                    android:hint="@string/setup_hint_address"
-                    android:inputType="textUri"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"
-                    oc:optionOneString="SSL"
-                    oc:optionTwoString="NO SSL"
-                    oc:optionOneColor="#00ff00"
-                    oc:optionTwoColor="#ff0000"
-                    oc:onBadgeClick="sslBadgeClick">
-
-                    <requestFocus>
-                    </requestFocus>
-                </eu.alefzero.owncloud.widgets.ActionEditText>
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0" >
-

-                <EditText
-                    android:id="@+id/account_username"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".75"
-                    android:hint="@string/setup_hint_username"
-                    android:singleLine="true"
-                    android:textColor="@android:color/black" >
-
-                </EditText>
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/tableRow4"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0" >
-

-                <eu.alefzero.owncloud.widgets.ActionEditText
-                    android:id="@+id/account_password"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".75"
-                    android:hint="@string/setup_hint_password"
-                    android:inputType="textPassword"
-                    android:singleLine="true"
-                    android:textColor="@android:color/black" 
-                    oc:optionOneString="Show"
-                    oc:optionTwoString="Hide"
-                    oc:optionOneColor="#00ff00"
-                    oc:optionTwoColor="#ff0000"
-                    oc:onBadgeClick="passwordBadgeClick">
-
-                </eu.alefzero.owncloud.widgets.ActionEditText>
-            </TableRow>
-            <TableRow android:id="@+id/tableRow5"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0">
-                
-                <CheckBox
-					android:id="@+id/show_password"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight=".75"
-					android:hint="@string/setup_hint_show_password"
-					android:textColor="@android:color/black"
-					android:onClick="onCheckboxClick"/>
-            </TableRow>
-            <TableRow android:id="@+id/tableRow6"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:weightSum="1.0">
-                
-                <CheckBox
-          android:id="@+id/use_ssl"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight=".75"
-          android:hint="@string/use_ssl"
-          android:textColor="@android:color/black"
-          android:onClick="onCheckboxClick"/>
-            </TableRow>
-        </TableLayout>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="fill_parent"
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_auth"
+            android:visibility="gone" >
+        </EditText>
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_2"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:weightSum="1.0" >
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_access"
+            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" />
 
-            <Button
-                android:id="@+id/buttonOK"
-                android:layout_width="wrap_content"
+        <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:layout_weight=".50"
-                android:onClick="onOkClick"
-                android:textColor="@android:color/black"
-                android:text="@string/setup_btn_connect" >
-            </Button>
-
-            <Button
-                android:id="@+id/buttonNotUser"
+                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_weight=".50"
-                android:onClick="onNotUserClick"
-                android:textColor="@android:color/black"
-                android:text="Get started!" >
-            </Button>
-            
-        </LinearLayout>
+                android:layout_gravity="right|center_vertical"
+                android:onClick="onViewPasswordClick"
+                android:src="@android:drawable/ic_menu_view"
+                android:visibility="invisible" />
+        </FrameLayout>
+
+        <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"
+            android:textColor="@android:color/black" />
+
+        <Button
+            android:id="@+id/account_register"
+            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"
+            />
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file