Issue #56 + Issue #14 + Issue #143

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index ded27e2..1cfc49d 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -1,190 +1,189 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 <!--

-  ownCloud Android client application\r
-\r
+  ownCloud Android client application
+

   Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2012-2013 ownCloud Inc.
   Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2012-2013 ownCloud Inc.

-\r
-  This program is free software: you can redistribute it and/or modify\r
+
+  This program is free software: you can redistribute it and/or modify

   it under the terms of the GNU General Public License version 2,
   it under the terms of the GNU General Public License version 2,

-  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
+  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/>.

 -->
 -->

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     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:inputType="textNoSuggestions" >
-                    <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:hint="@string/auth_username"
-                android:inputType="textNoSuggestions" />
-
-            <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"/>
-
-                <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">
-
-        <LinearLayout
-            android:id="@+id/buttons_layout"
-            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>
-        
-               <Button
-                       android:id="@+id/account_register"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_below="@id/buttons_layout"
-                       android:layout_centerHorizontal="true"
-                       android:onClick="onRegisterClick"
-                       android:paddingTop="10dp"
-                       android:paddingBottom="10dp"
-                       android:textColor="#0000FF"
-                       android:background="@android:color/transparent" />
-                       <!-- android:text="@string/app_name @string/auth_register" /-->
-        
-    </RelativeLayout>
-
-</LinearLayout>
+    android:orientation="vertical">
+    
+       <LinearLayout
+           android:layout_width="fill_parent"
+           android:layout_height="wrap_content"
+           android:layout_gravity="center"
+           android:focusable="true"
+           android:gravity="center"
+           android:orientation="vertical" >
+           
+           <FrameLayout
+               android:layout_width="match_parent"
+               android:layout_height="0dip"
+               android:layout_gravity="center"
+               android:layout_marginBottom="50dip"
+               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: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:ems="10"
+                           android:hint="@string/auth_host_url"
+                           android:inputType="textNoSuggestions" >
+                           <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:hint="@string/auth_username"
+                       android:inputType="textNoSuggestions" />
+       
+                   <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:ems="10"
+                           android:hint="@string/auth_password"
+                           android:inputType="textPassword"/>
+       
+                       <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">
+       
+               <LinearLayout
+                   android:id="@+id/buttons_layout"
+                   android:layout_width="fill_parent"
+                   android:layout_height="wrap_content"
+                   android:weightSum="1">
+       
+                   <Button
+                       android:id="@+id/buttonOK"
+                       android:layout_width="match_parent"
+                       android:layout_height="wrap_content"
+                           android:layout_gravity="center_horizontal"
+                               android:layout_marginLeft="16dip"
+                           android:layout_marginRight="16dip"
+                       android:enabled="false"
+                       android:onClick="onOkClick"
+                       android:text="@string/setup_btn_connect"
+                       android:textColor="@android:color/black" />
+       
+               </LinearLayout>
+               
+                       <Button
+                               android:id="@+id/account_register"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:layout_below="@id/buttons_layout"
+                               android:layout_centerHorizontal="true"
+                               android:onClick="onRegisterClick"
+                               android:paddingTop="10dp"
+                               android:paddingBottom="10dp"
+                               android:textColor="#0000FF"
+                               android:background="@android:color/transparent" />
+               
+           </RelativeLayout>
+           
+       </LinearLayout>
+       
+</ScrollView>
\ No newline at end of file

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ccbea5f..1c2ad7d 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,7 +47,7 @@
     <string name="prefs_log_summary_history">This shows the recorded logs</string>
     <string name="prefs_log_delete_history_button">Delete History</string>
     
     <string name="prefs_log_summary_history">This shows the recorded logs</string>
     <string name="prefs_log_delete_history_button">Delete History</string>
     

-    <string name="auth_host_url">URL</string>
+    <string name="auth_host_url">Server address</string>

     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
     <string name="auth_register">I am new to %1$s</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
     <string name="auth_register">I am new to %1$s</string>