diff options
author | Teddy <[email protected]> | 2013-09-02 14:35:01 +0800 |
---|---|---|
committer | Teddy <[email protected]> | 2013-09-02 14:35:01 +0800 |
commit | a0dda37816df15e226def457e41ba6abfa778d63 (patch) | |
tree | a17c944bc2ec89a64a51ce20f37dde224ef138dc /client/Piztor/res | |
parent | e2dac93affbf75bde6ae29570f7141e58cdd3e09 (diff) | |
parent | 4886fe2f439e7df2ab5451893a8915705d39b6fd (diff) |
Merge branch 'game' of github.com:Determinant/piztor into game
Diffstat (limited to 'client/Piztor/res')
-rw-r--r-- | client/Piztor/res/layout/activity_login.xml | 13 | ||||
-rw-r--r-- | client/Piztor/res/layout/checkindialog.xml | 2 | ||||
-rw-r--r-- | client/Piztor/res/values/strings.xml | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml index cb27495..16b11a0 100644 --- a/client/Piztor/res/layout/activity_login.xml +++ b/client/Piztor/res/layout/activity_login.xml @@ -18,9 +18,9 @@ android:layout_marginTop="16dip"> <ImageView - android:id="@+id/main_headbar_img" + android:id="@+id/login_img" android:layout_width="180dp" - android:layout_height="200dp" + android:layout_height="180dp" android:layout_gravity="center_horizontal" android:src="@drawable/title_logo" /> <TextView @@ -31,6 +31,15 @@ android:text="@string/app_name" android:textSize="30dip" android:textColor="#FFFFFF"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="Game version" + android:textSize="15dip" + android:textStyle="italic" /> + </LinearLayout> <LinearLayout diff --git a/client/Piztor/res/layout/checkindialog.xml b/client/Piztor/res/layout/checkindialog.xml index b84404b..1c1cff7 100644 --- a/client/Piztor/res/layout/checkindialog.xml +++ b/client/Piztor/res/layout/checkindialog.xml @@ -13,7 +13,7 @@ <ProgressBar android:id="@+id/checkin_progress" - android:layout_width="wrap_content" + android:layout_width="200dip" android:layout_height="wrap_content" android:max="10000" android:layout_gravity="center" diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml index 25e980a..d0aa35b 100644 --- a/client/Piztor/res/values/strings.xml +++ b/client/Piztor/res/values/strings.xml @@ -4,7 +4,7 @@ <string name="app_name">Piztor</string> <string name="action_settings">Settings</string> <string name="hello_world">Hello world!</string> - <string name="settings">设置</string> + <string name="settings">开始</string> <string name="search">搜索</string> <string name="fetch">上传</string> <string name="checkin">签到</string> |