From 0410d0b9c6bb502f8467c3f2c62183e9a74e69fc Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Sun, 1 Sep 2013 00:32:38 +0800
Subject: update for 0831. preparing for rc1

---
 client/Piztor/res/layout/activity_login.xml              |  3 ++-
 client/Piztor/res/layout/activity_subscribe_settings.xml | 16 ++++++++++++++++
 client/Piztor/res/layout/checkindialog.xml               |  4 +++-
 client/Piztor/res/menu/subscribe_settings.xml            |  9 +++++++++
 client/Piztor/res/values/strings.xml                     |  3 +++
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 client/Piztor/res/layout/activity_subscribe_settings.xml
 create mode 100644 client/Piztor/res/menu/subscribe_settings.xml

(limited to 'client/Piztor/res')

diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index a8cf47f..232f1e7 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" 
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/checkindialog.xml b/client/Piztor/res/layout/checkindialog.xml
index 4174deb..d72f223 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="Checking in..."
+        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/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/values/strings.xml b/client/Piztor/res/values/strings.xml
index a0843df..8752b0d 100644
--- a/client/Piztor/res/values/strings.xml
+++ b/client/Piztor/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name">Piztor</string>
@@ -25,5 +26,7 @@
     <string name="update_info">My Account</string>
     <string name="subscribe_info">Subscribe information</string>
     <string name="change">Check &amp; Update</string>
+    <string name="title_activity_subscribesettings">SubscribeSettings</string>
+    <string name="title_activity_subscribe_settings">SubscribeSettings</string>
 
 </resources>
-- 
cgit v1.2.3-70-g09d2