From 68ed59a88f2409f632c3731c0e5dc246713676a2 Mon Sep 17 00:00:00 2001
From: Goblin911 <goblinliu@gmail.com>
Date: Wed, 28 Aug 2013 16:32:26 +0800
Subject: Fixed screen-rotation bug

---
 client/Piztor/res/layout/activity_login.xml    | 12 ++++++------
 client/Piztor/res/layout/activity_main.xml     |  2 +-
 client/Piztor/res/layout/activity_settings.xml |  5 +++--
 client/Piztor/res/layout/gather_footbar.xml    | 10 +++++-----
 client/Piztor/res/layout/main_footbar.xml      | 16 ++++++++++------
 client/Piztor/res/layout/settings_headbar.xml  |  4 ++--
 6 files changed, 27 insertions(+), 22 deletions(-)

(limited to 'client/Piztor/res/layout')

diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index b1f2f5b..670a3dc 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -17,7 +17,7 @@
     <ImageView
         android:id="@+id/main_headbar_img"
         android:layout_width="180dp"
-        android:layout_height="240dp"
+        android:layout_height="190dp"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/title_logo" />
     </LinearLayout>
@@ -27,7 +27,7 @@
         android:id="@+id/user_layout" 
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content" 
-        android:layout_marginTop="220.0dip" 
+        android:layout_marginTop="200.0dip" 
         android:layout_marginLeft="28.0dip" 
         android:layout_marginRight="28.0dip">
         <EditText 
@@ -39,7 +39,7 @@
             android:paddingLeft="12.0dip" 
             android:layout_width="fill_parent" 
             android:layout_height="44.0dip" 
-            android:hint="account" android:maxLines="1" 
+            android:hint="@string/username" android:maxLines="1" 
             android:maxLength="16"/>
         <View 
             android:background="#ffc0c3c4" 
@@ -57,7 +57,7 @@
             android:paddingLeft="12.0dip" 
             android:layout_width="fill_parent" 
             android:layout_height="44.0dip" 
-            android:hint="password" 
+            android:hint="@string/password" 
             android:maxLines="1" 
             android:maxLength="16" 
             android:inputType="textPassword" />
@@ -72,9 +72,9 @@
         android:paddingTop="5.0dip" 
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" 
-        android:layout_marginLeft="28.0dip" 
+        android:layout_marginLeft="70.0dip"
+        android:layout_marginRight="70.0dip" 
         android:layout_marginTop="12.0dip" 
-        android:layout_marginRight="28.0dip" 
         android:text="login"    
         android:layout_below="@id/user_layout" />
     
diff --git a/client/Piztor/res/layout/activity_main.xml b/client/Piztor/res/layout/activity_main.xml
index f72ac62..49ff03c 100644
--- a/client/Piztor/res/layout/activity_main.xml
+++ b/client/Piztor/res/layout/activity_main.xml
@@ -31,4 +31,4 @@
         android:layout_below="@+id/main_headbar_layout"
         android:clickable="true" />
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
index c386ae2..3080be0 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -80,7 +80,8 @@
 	        android:id="@+id/settings_sex_layout"
 	        android:layout_width="match_parent"
 	        android:layout_height="wrap_content"
-	        android:layout_marginTop="10dip" >
+	        android:layout_marginTop="50dip"
+	         >
 
 	        <TextView
 	            android:id="@+id/settings_sex_text"
@@ -117,7 +118,7 @@
 	        android:id="@+id/settings_team_layout"
 	        android:layout_width="match_parent"
 	        android:layout_height="wrap_content"
-	        android:layout_marginTop="10dip" >
+	        android:layout_marginTop="50dip" >
 
 	        <TextView
 	            android:id="@+id/settings_team_text"
diff --git a/client/Piztor/res/layout/gather_footbar.xml b/client/Piztor/res/layout/gather_footbar.xml
index e573032..2dfb6b6 100644
--- a/client/Piztor/res/layout/gather_footbar.xml
+++ b/client/Piztor/res/layout/gather_footbar.xml
@@ -15,7 +15,7 @@
 		android:layout_weight="1">
 		<ImageButton 
 			android:id="@+id/footbar_btn_search"
-			android:layout_width="30dip"
+			android:layout_width="61dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
 			android:background="@drawable/footbar_btn_search_style"/>
@@ -40,7 +40,7 @@
 		android:layout_weight="1">
 		<ImageButton
 			android:id="@+id/footbar_btn_fetch"
-			android:layout_width="30dip"
+			android:layout_width="61dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
 			android:background="@drawable/footbar_btn_fetch_style"/>
@@ -65,7 +65,7 @@
 		android:orientation="vertical">
 		<ImageButton 
 			android:id="@+id/footbar_btn_checkin"
-			android:layout_width="30dip"
+			android:layout_width="61dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
 			android:background="@drawable/footbar_btn_checkin_style"
@@ -91,7 +91,7 @@
 		android:layout_weight="1">
 		<ImageButton 
 			android:id="@+id/footbar_btn_focus"
-			android:layout_width="30dip"
+			android:layout_width="61dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
 			android:background="@drawable/footbar_btn_focus_style"/>
@@ -116,7 +116,7 @@
 		android:layout_weight="1">
 		<ImageButton
 			android:id="@+id/footbar_btn_settings"
-			android:layout_width="30dip"
+			android:layout_width="61dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
 			android:background="@drawable/footbar_btn_settings_style"/>
diff --git a/client/Piztor/res/layout/main_footbar.xml b/client/Piztor/res/layout/main_footbar.xml
index 69760c0..b4659ff 100644
--- a/client/Piztor/res/layout/main_footbar.xml
+++ b/client/Piztor/res/layout/main_footbar.xml
@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent"
 	android:layout_height="48dip"
 	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
+	android:background="@drawable/footbar_background" android:baselineAligned="false">
 
 	<LinearLayout 
 		android:id="@+id/footbar_btn_search_layout"
@@ -15,12 +15,13 @@
 		android:layout_weight="1">
 		<ImageButton
 			android:id="@+id/footbar_btn_search"
-			android:layout_width="30dip"
+			android:layout_width="90dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
+			android:contentDescription="@string/desc"
 			android:background="@drawable/footbar_btn_search_style"/>
 		<TextView 
-			android:id="@+id/footbar_btn_search"
+			android:id="@+id/footbar_btn_search_text"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
@@ -40,9 +41,10 @@
 		android:layout_weight="1">
 		<ImageButton 
 			android:id="@+id/footbar_btn_fetch"
-			android:layout_width="30dip"
+			android:layout_width="90dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
+			android:contentDescription="@string/desc"
 			android:background="@drawable/footbar_btn_fetch_style"/>
 		<TextView 
 			android:id="@+id/footbar_btn_fetch_text"
@@ -65,9 +67,10 @@
 		android:layout_weight="1">
 		<ImageButton 
 			android:id="@+id/footbar_btn_focus"
-			android:layout_width="30dip"
+			android:layout_width="90dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
+			android:contentDescription="@string/desc"
 			android:background="@drawable/footbar_btn_focus_style"/>
 		<TextView 
 			android:id="@+id/footbar_btn_focus_text"
@@ -90,9 +93,10 @@
 		android:layout_weight="1">
 		<ImageButton 
 			android:id="@+id/footbar_btn_settings"
-			android:layout_width="30dip"
+			android:layout_width="90dip"
 			android:layout_height="30dip"
 			android:layout_gravity="center"
+			android:contentDescription="@string/desc"
 			android:background="@drawable/footbar_btn_settings_style"/>
 		<TextView 
 			android:id="@+id/footbar_btn_settings_text"
diff --git a/client/Piztor/res/layout/settings_headbar.xml b/client/Piztor/res/layout/settings_headbar.xml
index 9065bdb..606c172 100644
--- a/client/Piztor/res/layout/settings_headbar.xml
+++ b/client/Piztor/res/layout/settings_headbar.xml
@@ -7,9 +7,9 @@
 
 	<ImageButton 
         android:id="@+id/settings_btn_back"
-        android:layout_width="40dip"
+        android:layout_width="110dip"
         android:layout_height="40dip"
-        android:layout_marginLeft="5dip"
+        android:layout_marginLeft="0dip"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:background="@drawable/navigation_back"/>
-- 
cgit v1.2.3-70-g09d2