diff options
Diffstat (limited to 'client/Piztor/res')
18 files changed, 249 insertions, 148 deletions
diff --git a/client/Piztor/res/drawable/circle_blue.png b/client/Piztor/res/drawable/circle_blue.png Binary files differindex 09c3658..d174635 100644 --- a/client/Piztor/res/drawable/circle_blue.png +++ b/client/Piztor/res/drawable/circle_blue.png diff --git a/client/Piztor/res/drawable/circle_glass.png b/client/Piztor/res/drawable/circle_glass.png Binary files differindex 826b2b7..d5dbec4 100644 --- a/client/Piztor/res/drawable/circle_glass.png +++ b/client/Piztor/res/drawable/circle_glass.png diff --git a/client/Piztor/res/drawable/circle_green.png b/client/Piztor/res/drawable/circle_green.png Binary files differindex ded6938..3ab51d4 100644 --- a/client/Piztor/res/drawable/circle_green.png +++ b/client/Piztor/res/drawable/circle_green.png diff --git a/client/Piztor/res/drawable/circle_metal.png b/client/Piztor/res/drawable/circle_metal.png Binary files differindex d84e1ad..07c72f0 100644 --- a/client/Piztor/res/drawable/circle_metal.png +++ b/client/Piztor/res/drawable/circle_metal.png diff --git a/client/Piztor/res/drawable/circle_paper.png b/client/Piztor/res/drawable/circle_paper.png Binary files differindex 973787d..b8d7b0d 100644 --- a/client/Piztor/res/drawable/circle_paper.png +++ b/client/Piztor/res/drawable/circle_paper.png diff --git a/client/Piztor/res/drawable/circle_tan.png b/client/Piztor/res/drawable/circle_tan.png Binary files differindex 27d10ad..667cc25 100644 --- a/client/Piztor/res/drawable/circle_tan.png +++ b/client/Piztor/res/drawable/circle_tan.png diff --git a/client/Piztor/res/drawable/circle_wood.png b/client/Piztor/res/drawable/circle_wood.png Binary files differindex ea18f7a..b2752de 100644 --- a/client/Piztor/res/drawable/circle_wood.png +++ b/client/Piztor/res/drawable/circle_wood.png diff --git a/client/Piztor/res/drawable/circle_yellow.png b/client/Piztor/res/drawable/circle_yellow.png Binary files differindex 7c1dfc7..c596806 100644 --- a/client/Piztor/res/drawable/circle_yellow.png +++ b/client/Piztor/res/drawable/circle_yellow.png diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml index a8cf47f..c408a1d 100644 --- a/client/Piztor/res/layout/activity_login.xml +++ b/client/Piztor/res/layout/activity_login.xml @@ -39,7 +39,8 @@ android:paddingLeft="12.0dip" android:layout_width="fill_parent" android:layout_height="44.0dip" - android:hint="@string/username" android:maxLines="1" + android:hint="@string/username" + android:maxLines="1" android:maxLength="16"/> <View android:background="#ffc0c3c4" @@ -75,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..36bacf3 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 @@ -80,24 +87,22 @@ android:layout_marginLeft="20dip" android:layout_marginRight="20dip" android:background="#ffc0c3c4" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:gravity="center" - android:textSize="30dip" - android:textColor="@android:color/white" - android:text="@string/subscribe_info"/> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:layout_marginTop="20dip" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" + android:layout_marginTop="10dip" android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:textSize="30dip" + android:textColor="@android:color/white" + android:text="@string/subscribe_info"/> + <Button android:id="@+id/settings_btn_subscribe" android:layout_width="wrap_content" @@ -116,6 +121,45 @@ android:layout_marginRight="20dip" android:background="#ffc0c3c4" /> <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20dip" + android:text="@string/colormode" + android:textColor="#FFFFFF"/> + <RadioGroup + android:id="@+id/radioGroup" + android:contentDescription="@string/colormode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:orientation="horizontal"> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/show_by_team" + android:text="@string/show_team" + android:checked="true"/> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/show_by_sex" + android:text="@string/show_sex"/> + </RadioGroup> + </LinearLayout> + <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="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="50dip" diff --git a/client/Piztor/res/layout/activity_subscribe_settings.xml b/client/Piztor/res/layout/activity_subscribe_settings.xml new file mode 100644 index 0000000..53ff8ee --- /dev/null +++ b/client/Piztor/res/layout/activity_subscribe_settings.xml @@ -0,0 +1,16 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context=".SubscribeSettings" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/hello_world" /> + +</RelativeLayout> 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 4174deb..b84404b 100644 --- a/client/Piztor/res/layout/checkindialog.xml +++ b/client/Piztor/res/layout/checkindialog.xml @@ -8,12 +8,14 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:text="Checking in..."/> + android:text="正在签到..." + android:id="@+id/checkin_info"/> <ProgressBar android:id="@+id/checkin_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:max="10000" android:layout_gravity="center" android:gravity="center" /> 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/subscribe_settings.xml b/client/Piztor/res/menu/subscribe_settings.xml new file mode 100644 index 0000000..c002028 --- /dev/null +++ b/client/Piztor/res/menu/subscribe_settings.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/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 a0843df..82132ed 100644 --- a/client/Piztor/res/values/strings.xml +++ b/client/Piztor/res/values/strings.xml @@ -1,29 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> <resources> <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="show_sex">Show sex: </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">按性别</string> <string name="male">Male</string> <string name="female">Female</string> - <string name="show_team">Show team: </string> + <string name="show_team">按班级</string> <string name="all">All</string> <string name="mine">Mine</string> <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 & 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> + <string name="colormode">着色方式</string> </resources> |
