diff options
Diffstat (limited to 'client/Piztor/res')
38 files changed, 95 insertions, 30 deletions
diff --git a/client/Piztor/res/drawable/circle_red.png b/client/Piztor/res/drawable/circle_red.png Binary files differnew file mode 100644 index 0000000..034cea8 --- /dev/null +++ b/client/Piztor/res/drawable/circle_red.png diff --git a/client/Piztor/res/drawable/footbar_checkin.png b/client/Piztor/res/drawable/footbar_checkin.png Binary files differindex 90afba7..0a4b148 100644 --- a/client/Piztor/res/drawable/footbar_checkin.png +++ b/client/Piztor/res/drawable/footbar_checkin.png diff --git a/client/Piztor/res/drawable/footbar_checkin_1.png b/client/Piztor/res/drawable/footbar_checkin_1.png Binary files differindex a478d36..6fb89ac 100644 --- a/client/Piztor/res/drawable/footbar_checkin_1.png +++ b/client/Piztor/res/drawable/footbar_checkin_1.png diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png Binary files differindex 32d24d2..138ef6a 100644 --- a/client/Piztor/res/drawable/footbar_fetch.png +++ b/client/Piztor/res/drawable/footbar_fetch.png diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png Binary files differindex 208094f..0d098ab 100644 --- a/client/Piztor/res/drawable/footbar_fetch_1.png +++ b/client/Piztor/res/drawable/footbar_fetch_1.png diff --git a/client/Piztor/res/drawable/footbar_marker.png b/client/Piztor/res/drawable/footbar_marker.png Binary files differindex 3de909f..e84bffa 100644 --- a/client/Piztor/res/drawable/footbar_marker.png +++ b/client/Piztor/res/drawable/footbar_marker.png diff --git a/client/Piztor/res/drawable/footbar_marker_1.png b/client/Piztor/res/drawable/footbar_marker_1.png Binary files differindex 08c8715..75005a4 100644 --- a/client/Piztor/res/drawable/footbar_marker_1.png +++ b/client/Piztor/res/drawable/footbar_marker_1.png diff --git a/client/Piztor/res/drawable/footbar_search.png b/client/Piztor/res/drawable/footbar_search.png Binary files differindex 3549f84..8d3681f 100644 --- a/client/Piztor/res/drawable/footbar_search.png +++ b/client/Piztor/res/drawable/footbar_search.png diff --git a/client/Piztor/res/drawable/footbar_search_1.png b/client/Piztor/res/drawable/footbar_search_1.png Binary files differindex 1e6ac28..ab52656 100644 --- a/client/Piztor/res/drawable/footbar_search_1.png +++ b/client/Piztor/res/drawable/footbar_search_1.png diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png Binary files differindex 455bd0b..a6987f8 100644 --- a/client/Piztor/res/drawable/footbar_settings.png +++ b/client/Piztor/res/drawable/footbar_settings.png diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png Binary files differindex 6b0a2ab..8b61042 100644 --- a/client/Piztor/res/drawable/footbar_settings_1.png +++ b/client/Piztor/res/drawable/footbar_settings_1.png diff --git a/client/Piztor/res/drawable/icon_marka.png b/client/Piztor/res/drawable/icon_marka.png Binary files differnew file mode 100644 index 0000000..144f3db --- /dev/null +++ b/client/Piztor/res/drawable/icon_marka.png diff --git a/client/Piztor/res/drawable/marka.png b/client/Piztor/res/drawable/marka.png Binary files differdeleted file mode 100644 index a478d36..0000000 --- a/client/Piztor/res/drawable/marka.png +++ /dev/null diff --git a/client/Piztor/res/drawable/marker1.png b/client/Piztor/res/drawable/marker1.png Binary files differnew file mode 100644 index 0000000..3ba8760 --- /dev/null +++ b/client/Piztor/res/drawable/marker1.png diff --git a/client/Piztor/res/drawable/marker2.png b/client/Piztor/res/drawable/marker2.png Binary files differnew file mode 100644 index 0000000..90afba7 --- /dev/null +++ b/client/Piztor/res/drawable/marker2.png diff --git a/client/Piztor/res/drawable/navigation_back.png b/client/Piztor/res/drawable/navigation_back.png Binary files differindex 3bdda98..348dc3d 100644 --- a/client/Piztor/res/drawable/navigation_back.png +++ b/client/Piztor/res/drawable/navigation_back.png diff --git a/client/Piztor/res/drawable/navigation_back_1.png b/client/Piztor/res/drawable/navigation_back_1.png Binary files differindex a20b4ef..07578fb 100644 --- a/client/Piztor/res/drawable/navigation_back_1.png +++ b/client/Piztor/res/drawable/navigation_back_1.png diff --git a/client/Piztor/res/drawable/pop.png b/client/Piztor/res/drawable/pop.png Binary files differnew file mode 100644 index 0000000..07e897a --- /dev/null +++ b/client/Piztor/res/drawable/pop.png diff --git a/client/Piztor/res/drawable/popup.png b/client/Piztor/res/drawable/popup.png Binary files differnew file mode 100644 index 0000000..3dd9e51 --- /dev/null +++ b/client/Piztor/res/drawable/popup.png diff --git a/client/Piztor/res/drawable/popup_down.png b/client/Piztor/res/drawable/popup_down.png Binary files differnew file mode 100644 index 0000000..8dad382 --- /dev/null +++ b/client/Piztor/res/drawable/popup_down.png diff --git a/client/Piztor/res/drawable/popup_left.png b/client/Piztor/res/drawable/popup_left.png Binary files differnew file mode 100644 index 0000000..98c81b6 --- /dev/null +++ b/client/Piztor/res/drawable/popup_left.png diff --git a/client/Piztor/res/drawable/popup_middle.png b/client/Piztor/res/drawable/popup_middle.png Binary files differnew file mode 100644 index 0000000..750b455 --- /dev/null +++ b/client/Piztor/res/drawable/popup_middle.png diff --git a/client/Piztor/res/drawable/popup_right.png b/client/Piztor/res/drawable/popup_right.png Binary files differnew file mode 100644 index 0000000..84745ff --- /dev/null +++ b/client/Piztor/res/drawable/popup_right.png diff --git a/client/Piztor/res/drawable/popup_side.png b/client/Piztor/res/drawable/popup_side.png Binary files differnew file mode 100644 index 0000000..49135ca --- /dev/null +++ b/client/Piztor/res/drawable/popup_side.png 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/custom_text_view.xml b/client/Piztor/res/layout/custom_text_view.xml new file mode 100644 index 0000000..5ef1c9f --- /dev/null +++ b/client/Piztor/res/layout/custom_text_view.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + > + + <TextView + android:id="@+id/popleft" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/popup_side" + android:gravity="center" + android:textStyle="bold" + android:textColor="#3814ed" + android:text="更新位置" + android:textSize="12sp" /> + + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:id="@+id/popinfo" + > + + <TextView + android:id="@+id/textcache" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/popup_middle" + android:gravity="center" + android:textStyle="bold" + android:textColor="@android:color/black" + android:textSize="12sp" /> + + <TextView + android:id="@+id/popdown" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="@drawable/popup_down" + android:textColor="@android:color/black" + android:textSize="12sp" /> + + + </LinearLayout> + + + <TextView + android:id="@+id/popright" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/popup_side" + android:textColor="#3814ed" + android:gravity="center" + android:textStyle="bold" + android:text="更新marker" + android:textSize="12sp" /> + +</LinearLayout> 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"/> diff --git a/client/Piztor/res/menu/init.xml b/client/Piztor/res/menu/init.xml index c002028..5e4b11a 100644 --- a/client/Piztor/res/menu/init.xml +++ b/client/Piztor/res/menu/init.xml @@ -3,7 +3,6 @@ <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/login.xml b/client/Piztor/res/menu/login.xml index c002028..5e4b11a 100644 --- a/client/Piztor/res/menu/login.xml +++ b/client/Piztor/res/menu/login.xml @@ -3,7 +3,6 @@ <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/main.xml b/client/Piztor/res/menu/main.xml index c002028..5e4b11a 100644 --- a/client/Piztor/res/menu/main.xml +++ b/client/Piztor/res/menu/main.xml @@ -3,7 +3,6 @@ <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/setting.xml b/client/Piztor/res/menu/setting.xml index c002028..5e4b11a 100644 --- a/client/Piztor/res/menu/setting.xml +++ b/client/Piztor/res/menu/setting.xml @@ -3,7 +3,6 @@ <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-v11/styles.xml b/client/Piztor/res/values-v11/styles.xml index 3c02242..aeeae24 100644 --- a/client/Piztor/res/values-v11/styles.xml +++ b/client/Piztor/res/values-v11/styles.xml @@ -4,7 +4,7 @@ Base application theme for API 11+. This theme completely replaces AppBaseTheme from res/values/styles.xml on API 11+ devices. --> - <style name="AppBaseTheme" parent="android:Theme.Holo.Light"> + <style name="AppBaseTheme" parent="android:Theme.Light"> <!-- API 11 theme customizations can go here. --> </style> diff --git a/client/Piztor/res/values-v14/styles.xml b/client/Piztor/res/values-v14/styles.xml index a91fd03..afb7b31 100644 --- a/client/Piztor/res/values-v14/styles.xml +++ b/client/Piztor/res/values-v14/styles.xml @@ -5,7 +5,7 @@ AppBaseTheme from BOTH res/values/styles.xml and res/values-v11/styles.xml on API 14+ devices. --> - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar"> + <style name="AppBaseTheme" parent="android:Theme.Light"> <!-- API 14 theme customizations can go here. --> </style> diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml index 5500982..192d392 100644 --- a/client/Piztor/res/values/strings.xml +++ b/client/Piztor/res/values/strings.xml @@ -1,6 +1,6 @@ <resources> - <string name="app_name">piztor</string> + <string name="app_name">Piztor</string> <string name="action_settings">Settings</string> <string name="hello_world">Hello world!</string> <string name="settings">Settings</string> @@ -17,6 +17,9 @@ <string name="title_activity_login">Login</string> <string name="title_activity_main">Main</string> <string name="title_activity_settings">Settings</string> - <string name="title_activity_mapmaker">MapMaker</string> + <string name="password">password</string> + <string name="username">username</string> + <string name="login">login</string> + <string name="desc">desc</string> </resources> |
