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

1 files changed, 54 insertions, 0 deletions

diff --git a/client/Piztor/res/layout/new_login.xml b/client/Piztor/res/layout/new_login.xml
new file mode 100644
index 0000000..36d3eec
--- /dev/null
+++ b/client/Piztor/res/layout/new_login.xml
@@ -0,0 +1,54 @@
+<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"
+    android:gravity="center_horizontal"
+    android:orientation="vertical" >
+    
+    <ImageView
+        android:id="@+id/main_headbar_img"
+        android:layout_width="180dp"
+        android:layout_height="240dp"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/title_logo" />
+    </LinearLayout>
+
+    <LinearLayout 
+        android:orientation="vertical" 
+        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="#ff1d1d1d" 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"     android:inputType="number"/>
+        <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="#ff1d1d1d" 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>
+    
+
+    <Button 
+        android:textSize="18.0sp" 
+        android:textColor="#ff333333" 
+        android:gravity="center" 
+        android:id="@+id/login_btn_login" 
+        android:background="@android:color/white" 
+        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