From 49d2e9d74fbf95e5b287dc8e9179e8d3d977a527 Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Sun, 1 Sep 2013 05:57:40 +0800
Subject: stable version

---
 client/Piztor/res/drawable/circle_blue.png       | Bin 1070 -> 3236 bytes
 client/Piztor/res/drawable/circle_glass.png      | Bin 1173 -> 3253 bytes
 client/Piztor/res/drawable/circle_green.png      | Bin 1079 -> 3242 bytes
 client/Piztor/res/drawable/circle_metal.png      | Bin 894 -> 3196 bytes
 client/Piztor/res/drawable/circle_paper.png      | Bin 965 -> 3187 bytes
 client/Piztor/res/drawable/circle_tan.png        | Bin 916 -> 3189 bytes
 client/Piztor/res/drawable/circle_wood.png       | Bin 1359 -> 3237 bytes
 client/Piztor/res/drawable/circle_yellow.png     | Bin 946 -> 3186 bytes
 client/Piztor/res/layout/activity_login.xml      |   2 +-
 client/Piztor/res/layout/activity_settings.xml   |  15 +-
 client/Piztor/res/layout/activity_updateinfo.xml | 188 +++++++++++------------
 client/Piztor/res/layout/checkindialog.xml       |   2 +-
 client/Piztor/res/layout/subscribe_item.xml      |  26 ++--
 client/Piztor/res/layout/subscribe_settings.xml  |  22 +--
 client/Piztor/res/menu/update_info.xml           |   9 ++
 client/Piztor/res/values/strings.xml             |  34 ++--
 16 files changed, 165 insertions(+), 133 deletions(-)
 create mode 100644 client/Piztor/res/menu/update_info.xml

(limited to 'client/Piztor/res')

diff --git a/client/Piztor/res/drawable/circle_blue.png b/client/Piztor/res/drawable/circle_blue.png
index 09c3658..d174635 100644
Binary files a/client/Piztor/res/drawable/circle_blue.png and b/client/Piztor/res/drawable/circle_blue.png differ
diff --git a/client/Piztor/res/drawable/circle_glass.png b/client/Piztor/res/drawable/circle_glass.png
index 826b2b7..d5dbec4 100644
Binary files a/client/Piztor/res/drawable/circle_glass.png and b/client/Piztor/res/drawable/circle_glass.png differ
diff --git a/client/Piztor/res/drawable/circle_green.png b/client/Piztor/res/drawable/circle_green.png
index ded6938..3ab51d4 100644
Binary files a/client/Piztor/res/drawable/circle_green.png and b/client/Piztor/res/drawable/circle_green.png differ
diff --git a/client/Piztor/res/drawable/circle_metal.png b/client/Piztor/res/drawable/circle_metal.png
index d84e1ad..07c72f0 100644
Binary files a/client/Piztor/res/drawable/circle_metal.png and b/client/Piztor/res/drawable/circle_metal.png differ
diff --git a/client/Piztor/res/drawable/circle_paper.png b/client/Piztor/res/drawable/circle_paper.png
index 973787d..b8d7b0d 100644
Binary files a/client/Piztor/res/drawable/circle_paper.png and b/client/Piztor/res/drawable/circle_paper.png differ
diff --git a/client/Piztor/res/drawable/circle_tan.png b/client/Piztor/res/drawable/circle_tan.png
index 27d10ad..667cc25 100644
Binary files a/client/Piztor/res/drawable/circle_tan.png and b/client/Piztor/res/drawable/circle_tan.png differ
diff --git a/client/Piztor/res/drawable/circle_wood.png b/client/Piztor/res/drawable/circle_wood.png
index ea18f7a..b2752de 100644
Binary files a/client/Piztor/res/drawable/circle_wood.png and b/client/Piztor/res/drawable/circle_wood.png differ
diff --git a/client/Piztor/res/drawable/circle_yellow.png b/client/Piztor/res/drawable/circle_yellow.png
index 7c1dfc7..c596806 100644
Binary files a/client/Piztor/res/drawable/circle_yellow.png and b/client/Piztor/res/drawable/circle_yellow.png differ
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index 232f1e7..c408a1d 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -76,7 +76,7 @@
         android:layout_marginLeft="70.0dip"
         android:layout_marginRight="70.0dip" 
         android:layout_marginTop="12.0dip" 
-        android:text="login"    
+        android:text="@string/login"    
         android:layout_below="@id/user_layout" />
     
 </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 49e8dfe..e1712aa 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -16,14 +16,21 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dip"
             android:orientation="horizontal">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_centerVertical="true"
+				android:layout_centerHorizontal="true"
+                >
         	<TextView
 	        	android:id="@+id/settings_GPSrefreshrate_text"
 	        	android:layout_width="wrap_content"
 	        	android:layout_height="wrap_content"
 	        	android:layout_gravity="center"
+	        	android:gravity="center"
 	        	android:layout_marginTop="10dip"
-	        	android:layout_marginLeft="60dip"
-	        	android:text="GPS refresh rate"
+	        	android:text="@string/GPSrefreshrate"
 	        	android:textColor="@android:color/white"
 	        	android:textSize="20dip" />
         	<TextView
@@ -32,12 +39,12 @@
             	android:layout_height="wrap_content"
             	android:textSize="20dip"
            		android:layout_marginTop="10dip"
-           		android:layout_marginLeft="20dip"
+           		android:layout_marginLeft="10dip"
             	android:layout_gravity="center_vertical"
             	android:textColor="@android:color/white"
             	android:layout_toRightOf="@+id/settings_GPSrefreshrate_text"
             	android:text="30s"/>
-
+		</LinearLayout>
 		</RelativeLayout>
 		
 	    <SeekBar
diff --git a/client/Piztor/res/layout/activity_updateinfo.xml b/client/Piztor/res/layout/activity_updateinfo.xml
index de9ecc6..5d0c66c 100644
--- a/client/Piztor/res/layout/activity_updateinfo.xml
+++ b/client/Piztor/res/layout/activity_updateinfo.xml
@@ -7,7 +7,7 @@
 
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-       	android:layout_marginTop="20dip"
+        android:layout_marginTop="20dip"
         android:orientation="vertical" >
 
         <include layout="@layout/settings_headbar"></include>
@@ -17,105 +17,105 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="10dip"
-        	android:gravity="center"
+            android:gravity="center"
             android:textSize="20dip"
             android:textColor="#FFFFFF"
-            android:text="haha"
-            android:id="@+id/username_text" />
+            android:id="@+id/username" />
         <View
-	        android:layout_width="fill_parent"
-	        android:layout_height="1.0px"
-	        android:layout_marginTop="10dip"
-	        android:layout_marginBottom="20dip"
-	        android:layout_marginLeft="20dip"
-	        android:layout_marginRight="20dip"
-	        android:background="#ffc0c3c4" />
+            android:layout_width="fill_parent"
+            android:layout_height="1.0px"
+            android:layout_marginTop="10dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:background="#ffc0c3c4" />
 
-	    <EditText
-	        android:id="@+id/editText1"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="25dip"
-	        android:layout_marginRight="25dip"
-	        android:hint=" new nickname"
-	        android:ems="10" >
-	    </EditText>
-	    <View
-	        android:layout_width="fill_parent"
-	        android:layout_height="1.0px"
-	        android:layout_marginTop="20dip"
-	        android:layout_marginBottom="20dip"
-	        android:layout_marginLeft="20dip"
-	        android:layout_marginRight="20dip"
-	        android:background="#ffc0c3c4" />
+        <TextView
+            android:id="@+id/nickname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginLeft="25dip"
+            android:layout_marginRight="25dip"
+            android:textSize="20dip"
+            android:ems="10" >
+        </TextView>
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1.0px"
+            android:layout_marginTop="20dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:background="#ffc0c3c4" />
 
-	    <EditText
-	        android:id="@+id/editText2"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="25dip"
-	        android:layout_marginRight="25dip"
-	        android:ems="10"
-	        android:inputType="textPassword" 
-	        android:hint=" * old password"/>
-	    <TextView
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="25dip"
-	        android:layout_marginRight="25dip"
-	        android:layout_marginBottom="10dip"
-	        android:layout_gravity="center"
-	        android:gravity="center"
-	        android:textSize="14dip"
-	        android:text="Must enter your current password"
-	        android:textColor="#808080"/>
+        <EditText
+            android:id="@+id/password_old"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dip"
+            android:layout_marginRight="25dip"
+            android:ems="10"
+            android:inputType="textPassword" 
+            android:hint="@string/old_password"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dip"
+            android:layout_marginRight="25dip"
+            android:layout_marginBottom="10dip"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textSize="14dip"
+            android:textColor="#808080"/>
 
-	    <EditText
-	        android:id="@+id/editText3"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="25dip"
-	        android:layout_marginRight="25dip"
-	        android:ems="10"
-	        android:inputType="textPassword" 
-	        android:hint=" new password"/>
-	    <TextView
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="25dip"
-	        android:layout_marginRight="25dip"
-	        android:layout_gravity="center"
-	        android:gravity="center"
-	        android:textSize="14dip"
-	        android:text="Keep this blank if you don't want to change"
-	        android:textColor="#808080"/>
-	    <View
-	        android:layout_width="fill_parent"
-	        android:layout_height="1.0px"
-	        android:layout_marginTop="20dip"
-	        android:layout_marginBottom="20dip"
-	        android:layout_marginLeft="20dip"
-	        android:layout_marginRight="20dip"
-	        android:background="#ffc0c3c4" />
+        <EditText
+            android:id="@+id/password_new"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dip"
+            android:layout_marginRight="25dip"
+            android:ems="10"
+            android:inputType="textPassword" 
+            android:hint="@string/new_password"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dip"
+            android:layout_marginRight="25dip"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textSize="14dip"
+            android:textColor="#808080"/>
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1.0px"
+            android:layout_marginTop="20dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:background="#ffc0c3c4" />
 
-	    <LinearLayout
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content" 
-	        android:orientation="horizontal"
-	        android:layout_gravity="center"
-	        android:gravity="center">
-	        <Button
-	            android:layout_height="wrap_content"
-	            android:layout_width="wrap_content"
-	            android:paddingLeft="30dip"
-	            android:paddingRight="30dip"
-	            android:paddingTop="4dip"
-	            android:paddingBottom="4dip"
-	            android:background="#0F9D58"
-	            android:textColor="#FFFFFF"
-	            android:textSize="25dip"
-	            android:text="Submit"/>
-	    </LinearLayout>
-	    
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" 
+            android:orientation="horizontal"
+            android:layout_gravity="center"
+            android:gravity="center">
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="30dip"
+                android:paddingRight="30dip"
+                android:paddingTop="4dip"
+                android:paddingBottom="4dip"
+                android:background="#0F9D58"
+                android:textColor="#FFFFFF"
+                android:textSize="25dip"
+                android:text="@string/submit"/>
+        </LinearLayout>
+        
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/client/Piztor/res/layout/checkindialog.xml b/client/Piztor/res/layout/checkindialog.xml
index d72f223..b84404b 100644
--- a/client/Piztor/res/layout/checkindialog.xml
+++ b/client/Piztor/res/layout/checkindialog.xml
@@ -8,7 +8,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
-        android:text="Checking in..."
+        android:text="正在签到..."
         android:id="@+id/checkin_info"/>
 
     <ProgressBar
diff --git a/client/Piztor/res/layout/subscribe_item.xml b/client/Piztor/res/layout/subscribe_item.xml
index 902da5a..2d53865 100644
--- a/client/Piztor/res/layout/subscribe_item.xml
+++ b/client/Piztor/res/layout/subscribe_item.xml
@@ -4,33 +4,39 @@
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
   android:orientation="horizontal">
+  <View
+      	android:id="@+id/seperator"
+     	android:layout_width="fill_parent"
+	    android:layout_height="1.0px"
+	    android:layout_alignParentTop="true"
+	    android:layout_marginTop="10dip"
+	    android:layout_marginBottom="10dip"
+	    android:layout_marginLeft="20dip"
+	    android:layout_marginRight="20dip"
+	    android:background="#ffc0c3c4" />
   <TextView 
       android:layout_width="wrap_content" 
       android:layout_height="wrap_content" 
       android:id="@+id/textView1" 
+      android:layout_below="@+id/seperator"
       android:textSize="20dip"
       android:layout_marginLeft="10dip"
       android:layout_alignParentLeft="true" 
       android:text="company section"/>
   <Button 
-      android:text="remove" 
+      android:text="@string/remove" 
       android:layout_width="100dip" 
       android:layout_height="wrap_content" 
       android:layout_alignParentRight="true"
       android:layout_marginRight="10dip"
+      android:paddingTop="3dip"
+      android:paddingBottom="3dip"
+      android:layout_below="@+id/seperator"
       android:textColor="#FFFFFF"
       android:background="#DB4437"
       android:id="@+id/button_delete"
       android:textSize="20dip"
       />
-  <View
-     	android:layout_width="fill_parent"
-	    android:layout_height="1.0px"
-	    android:layout_below="@+id/button_delete"
-	    android:layout_marginTop="20dip"
-	    android:layout_marginBottom="20dip"
-	    android:layout_marginLeft="20dip"
-	    android:layout_marginRight="20dip"
-	    android:background="#ffc0c3c4" />
+  
     
 </RelativeLayout>
diff --git a/client/Piztor/res/layout/subscribe_settings.xml b/client/Piztor/res/layout/subscribe_settings.xml
index c27e3c8..1bfd975 100644
--- a/client/Piztor/res/layout/subscribe_settings.xml
+++ b/client/Piztor/res/layout/subscribe_settings.xml
@@ -4,6 +4,14 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
+    <TextView 
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content" 
+        android:id="@+id/textView1" 
+        android:text="TextView" 
+        android:layout_alignParentBottom="true" 
+        android:layout_centerHorizontal="true" 
+        android:layout_marginBottom="10dp"/>
 	<RelativeLayout
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
@@ -16,7 +24,7 @@
 	        android:layout_alignParentLeft="true"
 	        android:layout_marginLeft="10dip"
 	        android:textSize="20dip"
-	        android:hint="company"
+	        android:hint="@string/company"
 	        android:phoneNumber="true"
 	 		android:id="@+id/subscribe_company"/>
 	    <EditText
@@ -25,7 +33,7 @@
 	        android:layout_marginLeft="10dip"
 	        android:layout_toRightOf="@+id/subscribe_company"
 	        android:textSize="20dip"
-	        android:hint="section"
+	        android:hint="@string/section"
 	        android:phoneNumber="true"
 	        android:id="@+id/subscribe_section"/>
 	    <Button 
@@ -33,7 +41,7 @@
         	android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
 			android:layout_marginRight="10dip"
-        	android:text="add" 
+        	android:text="@string/add" 
         	android:textColor="#FFFFFF"
         	android:background="#0F9D58"
         	android:textSize="20dip"
@@ -55,12 +63,4 @@
             android:focusable="true">
         </ListView>
     </LinearLayout>
-    <TextView 
-        android:layout_width="wrap_content" 
-        android:layout_height="wrap_content" 
-        android:id="@+id/textView1" 
-        android:text="TextView" 
-        android:layout_alignParentBottom="true" 
-        android:layout_centerHorizontal="true" 
-        android:layout_marginBottom="10dp"/>
 </LinearLayout>
diff --git a/client/Piztor/res/menu/update_info.xml b/client/Piztor/res/menu/update_info.xml
new file mode 100644
index 0000000..c002028
--- /dev/null
+++ b/client/Piztor/res/menu/update_info.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
index 8752b0d..7cf728c 100644
--- a/client/Piztor/res/values/strings.xml
+++ b/client/Piztor/res/values/strings.xml
@@ -4,11 +4,11 @@
     <string name="app_name">Piztor</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-    <string name="settings">Settings</string>
-    <string name="search">Search</string>
-    <string name="fetch">Fetch</string>
-    <string name="checkin">Checkin</string>
-    <string name="focus">Focus</string>
+    <string name="settings">设置</string>
+    <string name="search">搜索</string>
+    <string name="fetch">获取</string>
+    <string name="checkin">签到</string>
+    <string name="focus">聚焦</string>
     <string name="show_sex">Show sex: </string>
     <string name="male">Male</string>
     <string name="female">Female</string>
@@ -18,15 +18,25 @@
     <string name="title_activity_login">Login</string>
     <string name="title_activity_main">Main</string>
     <string name="title_activity_settings">Settings</string>
-    <string name="password">password</string>
-    <string name="username">username</string>
-    <string name="login">login</string>
+    <string name="password">密码</string>
+    <string name="username">用户名</string>
+    <string name="login">登录</string>
     <string name="desc">desc</string>
-    <string name="logout">Logout</string>
-    <string name="update_info">My Account</string>
-    <string name="subscribe_info">Subscribe information</string>
-    <string name="change">Check &amp; Update</string>
+    <string name="logout">注销</string>
+    <string name="update_info">修改密码</string>
+    <string name="subscribe_info">关注信息</string>
+    <string name="change">查看及修改</string>
     <string name="title_activity_subscribesettings">SubscribeSettings</string>
     <string name="title_activity_subscribe_settings">SubscribeSettings</string>
+    <string name="title_activity_update_info">UpdateInfo</string>
+    <string name="cancel">取消</string>
+    <string name="remove">移除</string>
+    <string name="company">连队</string>
+    <string name="section">班级</string>
+    <string name="add">添加</string>
+    <string name="GPSrefreshrate">GPS刷新率</string>
+    <string name="old_password">旧密码</string>
+    <string name="new_password">新密码</string>
+    <string name="submit">提交</string>
 
 </resources>
-- 
cgit v1.2.3-70-g09d2