Small improvements to the refresh of the files list and memory handling while synchro...

[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..65e1cd9 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -1,143 +1,178 @@
-<?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
-    android:orientation="vertical" >\r
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application\r

 \r
 \r

-    <LinearLayout\r
-        android:id="@+id/linearLayout7"\r
-        android:layout_width="fill_parent"\r
-        android:layout_height="wrap_content"\r
-        android:layout_gravity="top"\r
-        android:background="#1D2D44"\r
-        android:gravity="center_vertical|top"\r
-        android:orientation="vertical"\r
-        android:paddingBottom="2pt"\r
-        android:paddingTop="2pt" >\r
+  Copyright (C) 2012  Bartek Przybylski\r
+  This program is free software: you can redistribute it and/or modify\r
+  it under the terms of the GNU General Public License as published by\r
+  the Free Software Foundation, either version 3 of the License, or\r
+  (at your option) any later version.\r

 \r
 \r

-        <ImageView\r
-            android:id="@+id/main_header_small"\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
-\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
-            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: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
-    </LinearLayout>\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
 \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
+-->
+<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:focusable="true"
+    android:gravity="center|fill"
+    android:orientation="vertical" >
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_weight="1" >
+
+        <LinearLayout
+            android:id="@+id/LinearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:id="@+id/imageView1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:layout_weight="1"
+                android:src="@drawable/owncloud_logo" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" >
+
+                <EditText
+                    android:id="@+id/host_URL"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:hint="@string/auth_host_url"
+                    android:singleLine="true" >
+
+                    <requestFocus />
+                </EditText>
+
+                <ImageView
+                    android:id="@+id/refreshButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_action_refresh_black"
+                    android:layout_gravity="right|center_vertical"
+                    android:visibility="invisible" />
+
+            </FrameLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_weight="1" >
+
+                <ImageView
+                    android:id="@+id/action_indicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:src="@android:drawable/stat_notify_sync"
+                    android:visibility="invisible" />
+
+                <TextView
+                    android:id="@+id/status_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="TextView"
+                    android:visibility="invisible" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="@string/auth_login_details"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <EditText
+                android:id="@+id/account_username"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:ems="10"
+                android:singleLine="true"
+                android:hint="@string/auth_username" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" >
+
+                <EditText
+                    android:id="@+id/account_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:hint="@string/auth_password"
+                    android:inputType="textPassword"
+                    android:singleLine="true" />
+
+                <ImageView
+                    android:id="@+id/viewPassword"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:src="@android:drawable/ic_menu_view"
+                    android:visibility="invisible" />
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:weightSum="1" >
+
+            <Button
+                android:id="@+id/buttonCancel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight=".5"
+                android:onClick="onCancelClick"
+                android:text="@string/common_cancel" />
+
+            <Button
+                android:id="@+id/buttonOK"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight=".5"
+                android:enabled="false"
+                android:onClick="onOkClick"
+                android:text="@string/setup_btn_connect"
+                android:textColor="@android:color/black" />
+
+        </LinearLayout>
+    </RelativeLayout>
+

 </LinearLayout>
\ No newline at end of file
 </LinearLayout>
\ No newline at end of file