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

1 files changed, 65 insertions, 76 deletions

diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index cd2d34c..b1f2f5b 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-	android:layout_height="fill_parent"
-	android:background="@android:color/black"
-	android:orientation="vertical">
-	
-<LinearLayout
+<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">
+
+    
+    <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@android:color/black"
@@ -18,75 +20,62 @@
         android:layout_height="240dp"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/title_logo" />
+    </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+    <LinearLayout 
         android:orientation="vertical" 
-        android:layout_gravity="center">
-
-        <TableLayout 
-            android:layout_width="match_parent" 
-            android:layout_height="wrap_content">
-
-            <TableRow 
-                android:layout_marginBottom="15dp"
-                android:layout_marginTop="15dp">
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content" 
-                    android:layout_weight="0.25"
-                    android:gravity="right" 
-                    android:id="@+id/user_id_text" 
-                    android:text="User ID" 
-                    android:textColor="@android:color/white"
-                     />
-
-                <EditText  
-                    android:layout_width="0dp"
-                                android:layout_weight="0.75"
-                    android:id="@+id/user_id"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-                    <requestFocus/>
-            </TableRow>
-
-            <TableRow>
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.25" 
-                    android:gravity="right" 
-                    android:id="@+id/user_pass_text" 
-                    android:text="Password" 
-                    android:textColor="@android:color/black"
-                />
-
-                <EditText  
-                    android:layout_width="0dp" 
-                    android:layout_weight="0.75"
-                    android:id="@+id/user_pass"           
-                    android:password="true"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-             </TableRow>     
-        </TableLayout>
-    </LinearLayout>
-	
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        >
-    <Button
-        android:id="@+id/login_btn_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="Login"
-        android:textColor="@android:color/white" />
+        android:id="@+id/user_layout" 
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content" 
+        android:layout_marginTop="220.0dip" 
+        android:layout_marginLeft="28.0dip" 
+        android:layout_marginRight="28.0dip">
+        <EditText 
+            android:textSize="16.0sp" 
+            android:textColor="@android:color/white"
+            android:textColorHint="#ff666666" 
+            android:id="@+id/user_id" 
+            android:background="#00ffffff" 
+            android:paddingLeft="12.0dip" 
+            android:layout_width="fill_parent" 
+            android:layout_height="44.0dip" 
+            android:hint="account" android:maxLines="1" 
+            android:maxLength="16"/>
+        <View 
+            android:background="#ffc0c3c4" 
+            android:layout_width="fill_parent" 
+            android:layout_height="1.0px" 
+            android:layout_marginLeft="1.0px" 
+            android:layout_marginRight="1.0px" />
+        <EditText 
+            android:textSize="16.0sp" 
+            android:textColor="@android:color/white" 
+            android:textColorHint="#ff666666" 
+            android:gravity="center_vertical" 
+            android:id="@+id/user_pass" 
+            android:background="#00ffffff" 
+            android:paddingLeft="12.0dip" 
+            android:layout_width="fill_parent" 
+            android:layout_height="44.0dip" 
+            android:hint="password" 
+            android:maxLines="1" 
+            android:maxLength="16" 
+            android:inputType="textPassword" />
     </LinearLayout>
+    
 
-</LinearLayout>
-</RelativeLayout>
+    <Button 
+        android:textSize="18.0sp" 
+        android:textColor="#ff333333" 
+        android:gravity="center" 
+        android:id="@+id/login_btn_login"
+        android:paddingTop="5.0dip" 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" 
+        android:layout_marginLeft="28.0dip" 
+        android:layout_marginTop="12.0dip" 
+        android:layout_marginRight="28.0dip" 
+        android:text="login"    
+        android:layout_below="@id/user_layout" />
+    
+</RelativeLayout>
\ No newline at end of file