Merge branch 'master' of github.com:Determinant/piztor

1 files changed, 19 insertions, 7 deletions

diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index c408a1d..cb27495 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -1,10 +1,12 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
 <RelativeLayout 
     android:orientation="vertical" 
     android:id="@+id/login_layout"
     android:background="@android:color/black" 
     android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:layout_height="fill_parent">
 
     
     <LinearLayout
@@ -12,14 +14,23 @@
     android:layout_height="wrap_content"
     android:background="@android:color/black"
     android:gravity="center_horizontal"
-    android:orientation="vertical" >
+    android:orientation="vertical" 
+    android:layout_marginTop="16dip">
     
     <ImageView
         android:id="@+id/main_headbar_img"
         android:layout_width="180dp"
-        android:layout_height="190dp"
+        android:layout_height="200dp"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/title_logo" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/app_name"
+        android:textSize="30dip"
+        android:textColor="#FFFFFF"/>
     </LinearLayout>
 
     <LinearLayout 
@@ -27,7 +38,7 @@
         android:id="@+id/user_layout" 
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content" 
-        android:layout_marginTop="200.0dip" 
+        android:layout_marginTop="260.0dip" 
         android:layout_marginLeft="28.0dip" 
         android:layout_marginRight="28.0dip">
         <EditText 
@@ -75,8 +86,9 @@
         android:layout_height="wrap_content" 
         android:layout_marginLeft="70.0dip"
         android:layout_marginRight="70.0dip" 
-        android:layout_marginTop="12.0dip" 
+        android:layout_marginTop="40.0dip" 
         android:text="@string/login"    
         android:layout_below="@id/user_layout" />
     
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
+</ScrollView>
\ No newline at end of file