projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into release-1.4.4
[pub/Android/ownCloud.git] / res / layout / account_setup.xml
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 0fef48a..04da4be 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -1,143 +1,177 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <?xml version="1.0" encoding="utf-8"?>\r
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
-    android:background="#F7F7F7"\r
-    android:focusable="true"\r
+<!--\r
+  ownCloud Android client application\r
+\r
+  Copyright (C) 2012  Bartek Przybylski\r
+  Copyright (C) 2012-2013 ownCloud Inc.\r
+\r
+  This program is free software: you can redistribute it and/or modify\r
+  it under the terms of the GNU General Public License version 2,\r
+  as published by the Free Software Foundation.\r
+\r
+  This program is distributed in the hope that it will be useful,\r
+  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+  GNU General Public License for more details.\r
+\r
+  You should have received a copy of the GNU General Public License\r
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+-->\r
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"\r
+    android:layout_width="match_parent"\r
+    android:layout_height="match_parent"\r
+    android:layout_gravity="center"\r
+    android:fillViewport="true"\r
     android:orientation="vertical" >\r
 \r
     <LinearLayout\r
     android:orientation="vertical" >\r
 \r
     <LinearLayout\r
-        android:id="@+id/linearLayout7"\r
-        android:layout_width="fill_parent"\r
+        android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:layout_height="wrap_content"\r
-        android:layout_gravity="top"\r
-        android:background="#1D2D44"\r
-        android:gravity="center_vertical|top"\r
+        android:focusable="true"\r
+        android:gravity="center"\r
         android:orientation="vertical"\r
         android:orientation="vertical"\r
-        android:paddingBottom="2pt"\r
-        android:paddingTop="2pt" >\r
+        android:padding="8dp" >\r
 \r
         <ImageView\r
 \r
         <ImageView\r
-            android:id="@+id/main_header_small"\r
+            android:id="@+id/imageView1"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
+            android:layout_marginTop="10dp"\r
+            android:src="@drawable/logo" />\r
+\r
+        <Button\r
+            android:id="@+id/centeredRefreshButton"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:layout_gravity="center|center_vertical|center_horizontal"\r
-            android:focusable="true"\r
-            android:src="@drawable/owncloud_logo_small_white" >\r
-        </ImageView>\r
-    </LinearLayout>\r
+            android:layout_gravity="center_horizontal"\r
+            android:layout_marginBottom="10dp"\r
+            android:onClick="onRefreshClick"\r
+            android:text="@string/auth_check_server"\r
+            android:visibility="gone" />\r
 \r
 \r
-    <LinearLayout\r
-        android:id="@+id/linearLayout2"\r
-        android:layout_width="fill_parent"\r
-        android:layout_height="fill_parent"\r
-        android:layout_gravity="center|center_vertical"\r
-        android:gravity="center_vertical"\r
-        android:orientation="vertical" >\r
-\r
-        <TableLayout\r
-            android:id="@+id/tableLayout1"\r
-            android:layout_width="fill_parent"\r
+           <FrameLayout \r
+               android:id="@+id/hostUrlFrame"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
+               >\r
+                       <EditText\r
+                               android:id="@+id/hostUrlInput"\r
+                               android:layout_width="match_parent"\r
+                               android:layout_height="wrap_content"\r
+                               android:layout_gravity="bottom"\r
+                               android:hint="@string/auth_host_url"\r
+                               android:inputType="textUri"\r
+                               android:drawablePadding="5dp"\r
+                               android:paddingRight="55dp"\r
+                               >\r
+                               <requestFocus />\r
+                       </EditText>\r
+                       <ImageButton\r
+                           android:id="@+id/embeddedRefreshButton"\r
+                           android:layout_width="48dp"\r
+                           android:layout_height="48dp"\r
+                           android:layout_gravity="center_vertical|right"\r
+                           android:layout_marginRight="5dp"\r
+                           android:padding="0dp"\r
+                           android:scaleType="fitCenter"\r
+                           android:src="@drawable/ic_action_refresh_black"\r
+               android:onClick="onRefreshClick"\r
+                               android:visibility="gone"\r
+                               android:background="@android:color/transparent"\r
+                           />\r
+               </FrameLayout>\r
+\r
+               <TextView\r
+            android:id="@+id/server_status_text"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
+            android:drawableLeft="@android:drawable/stat_notify_sync"\r
+            android:drawablePadding="5dp"\r
+            android:gravity="center_vertical"\r
+            android:text="@string/auth_testing_connection" />\r
+\r
+        <CheckBox\r
+            android:id="@+id/oauth_onOff_check"\r
+            android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:gravity="center_horizontal" >\r
-\r
-            <TableRow\r
-                android:id="@+id/tableRow1"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:gravity="center_horizontal" >\r
-\r
-                <TextView\r
-                    android:id="@+id/textView1"\r
-                    android:layout_width="wrap_content"\r
-                    android:layout_height="wrap_content"\r
-                    android:layout_marginBottom="15dip"\r
-                    android:layout_marginTop="15dip"\r
-                    android:text="@string/setup_title"\r
-                    android:textColor="@android:color/black"\r
-                    android:textSize="7pt"\r
-                    android:textStyle="bold" >\r
-                </TextView>\r
-            </TableRow>\r
-\r
-            <TableRow\r
-                android:id="@+id/tableRow2"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:gravity="center_horizontal"\r
-                android:weightSum="1.0" >\r
-\r\r\r
-                <EditText\r
-                    android:id="@+id/host_URL"\r
-                    android:layout_width="fill_parent"\r
-                    android:layout_height="wrap_content"\r
-                    android:layout_weight="0.75"\r
-                    android:hint="@string/setup_hint_address"\r
-                    android:inputType="textUri"\r
-                    android:singleLine="true" >\r
-\r
-                    <requestFocus>\r
-                    </requestFocus>\r
-                </EditText>\r
-            </TableRow>\r
-\r
-            <TableRow\r
-                android:id="@+id/tableRow3"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:gravity="center_horizontal"\r
-                android:weightSum="1.0" >\r
-\r\r
-                <EditText\r
-                    android:id="@+id/account_username"\r
-                    android:layout_width="fill_parent"\r
-                    android:layout_height="wrap_content"\r
-                    android:layout_weight=".75"\r
-                    android:hint="@string/setup_hint_username"\r
-                    android:singleLine="true"\r
-                    android:textColor="@android:color/black" >\r
-\r
-                </EditText>\r
-            </TableRow>\r
-\r
-            <TableRow\r
-                android:id="@+id/tableRow4"\r
-                android:layout_width="fill_parent"\r
-                android:layout_height="wrap_content"\r
-                android:gravity="center_horizontal"\r
-                android:weightSum="1.0" >\r
-\r\r
-                <EditText\r
-                    android:id="@+id/account_password"\r
-                    android:layout_width="fill_parent"\r
-                    android:layout_height="wrap_content"\r
-                    android:layout_weight=".75"\r
-                    android:hint="@string/setup_hint_password"\r
-                    android:inputType="textPassword"\r
-                    android:singleLine="true"\r
-                    android:textColor="@android:color/black" >\r
-\r
-                </EditText>\r
-            </TableRow>\r
-        </TableLayout>\r
-\r
-        <LinearLayout\r
-            android:id="@+id/linearLayout1"\r
-            android:layout_width="fill_parent"\r
+            android:checked="false"\r
+            android:onClick="onCheckClick"\r
+            android:text="@string/oauth_check_onoff"\r
+            android:textAppearance="?android:attr/textAppearanceSmall"\r
+            android:visibility="gone" />\r
+\r
+        <EditText\r
+            android:id="@+id/oAuthEntryPoint_1"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:ems="10"\r
+            android:inputType="textUri"\r
+            android:singleLine="true"\r
+            android:text="@string/oauth2_url_endpoint_auth"\r
+            android:visibility="gone" >\r
+        </EditText>\r
+\r
+        <EditText\r
+            android:id="@+id/oAuthEntryPoint_2"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:ems="10"\r
+            android:inputType="textUri"\r
+            android:singleLine="true"\r
+            android:text="@string/oauth2_url_endpoint_access"\r
+            android:visibility="gone" />\r
+\r
+        <EditText\r
+            android:id="@+id/account_username"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:ems="10"\r
+            android:hint="@string/auth_username"\r
+            android:inputType="textNoSuggestions" />\r
+\r
+               <EditText\r
+                   android:id="@+id/account_password"\r
+                   android:layout_width="match_parent"\r
+                   android:layout_height="wrap_content"\r
+                   android:drawablePadding="5dp"\r
+                   android:ems="10"\r
+                   android:hint="@string/auth_password"\r
+                   android:inputType="textPassword" />\r
+        \r
+        <TextView\r
+            android:id="@+id/auth_status_text"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
+            android:drawableLeft="@android:drawable/stat_notify_sync"\r
+            android:drawablePadding="5dp"\r
+            android:gravity="center_vertical"\r
+            android:text="@string/auth_unauthorized" />\r
+\r
+        <Button\r
+            android:id="@+id/buttonOK"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="center_horizontal"\r
+            android:enabled="false"\r
+            android:onClick="onOkClick"\r
+            android:text="@string/setup_btn_connect"\r
+            />\r
+\r
+        <Button\r
+            android:id="@+id/account_register"\r
+            android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:gravity="center_horizontal"\r
-            android:orientation="horizontal"\r
-            android:weightSum="1.0" >\r
-\r
-            <Button\r
-                android:id="@+id/buttonOK"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_weight=".50"\r
-                android:onClick="onOkClick"\r
-                android:text="@string/setup_btn_connect" >\r
-            </Button>\r
-        </LinearLayout>\r
+            android:background="@android:color/transparent"\r
+            android:textColor="#0000FF" \r
+            android:onClick="onRegisterClick"\r
+            android:paddingBottom="5dp"\r
+            android:paddingTop="5dp"\r
+            android:text="@string/auth_register"\r
+            />\r
     </LinearLayout>\r
 \r
     </LinearLayout>\r
 \r
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
ownCloud Android App