[重构]将晓书更新应用中四散在各处的字符串资源统一移入strings.xml

SunDaemon/res/layout/apk_list_item.xml

@@ -10,28 +10,28 @@
               android:layout_height="fill_parent"
               android:layout_width="fill_parent"
               android:layout_weight="1"
-              android:text="com.ssl.support.daemon"
+              android:text="@string/apk_update_item_default_name"
               android:gravity="center_vertical"
             />
 
     <TextView android:id="@+id/tv_table_version"
               android:layout_height="fill_parent"
               android:layout_width="70dip"
-              android:text="1"
+              android:text="@string/apk_update_item_default_version"
               android:gravity="center"
             />
 
     <TextView android:id="@+id/tv_table_progress"
               android:layout_height="fill_parent"
               android:layout_width="50dip"
-              android:text="100%"
+              android:text="@string/apk_update_item_default_progress"
               android:gravity="center"
             />
 
     <TextView android:id="@+id/tv_table_status"
               android:layout_height="fill_parent"
               android:layout_width="100dip"
-              android:text="同步成功"
+              android:text="@string/apk_update_item_default_status"
               android:gravity="center"
             />
 

SunDaemon/res/layout/apk_updates.xml

@@ -17,7 +17,7 @@
                   android:layout_height="fill_parent"
                   android:layout_width="fill_parent"
                   android:layout_weight="1"
-                  android:text="Apk名称"
+                  android:text="@string/apk_update_table_name"
                   android:gravity="center"
                   android:textColor="#111"
                 />
@@ -31,7 +31,7 @@
         <TextView android:id="@+id/tv_table_last_update"
                   android:layout_height="fill_parent"
                   android:layout_width="70dip"
-                  android:text="版本号"
+                  android:text="@string/apk_update_table_version"
                   android:gravity="center"
                   android:textColor="#111"
                 />
@@ -45,7 +45,7 @@
         <TextView android:id="@+id/tv_table_last_sync"
                   android:layout_height="fill_parent"
                   android:layout_width="50dip"
-                  android:text="下载进度"
+                  android:text="@string/apk_update_table_progress"
                   android:gravity="center"
                   android:textColor="#111"
                 />
@@ -59,7 +59,7 @@
         <TextView android:id="@+id/tv_table_last_sync_status"
                   android:layout_height="fill_parent"
                   android:layout_width="100dip"
-                  android:text="安装状态"
+                  android:text="@string/apk_update_table_installed"
                   android:gravity="center"
                   android:textColor="#111"
                 />

SunDaemon/res/layout/edit_field_view.xml

@@ -9,8 +9,8 @@
     <TextView android:id="@+id/tv_label"
               android:layout_width="fill_parent"
               android:layout_height="40dp"
-              android:text="修改内容"
-              android:textSize="20dp"
+              android:text="@string/system_config_dialog_label"
+              android:textSize="20sp"
               android:gravity="center"
               android:layout_marginTop="20dp"
             />
@@ -19,7 +19,7 @@
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:layout_margin="20dp"
-              android:textSize="20dp"
+              android:textSize="20sp"
             />
 
     <LinearLayout android:layout_width="fill_parent"
@@ -31,17 +31,17 @@
                 android:layout_height="wrap_content"
                 android:padding="16dp"
                 android:layout_weight="1"
-                android:textSize="18dp"
-                android:text="修改"
+                android:textSize="18sp"
+                android:text="@string/system_config_dialog_btn_submit"
                 />
 
         <Button android:id="@+id/btn_reset"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:padding="16dp"
                 android:layout_weight="1"
-                android:textSize="18dp"
-                android:text="重置"
+                android:textSize="18sp"
+                android:text="@string/system_config_dialog_btn_reset"
                 />
     </LinearLayout>
 

SunDaemon/res/layout/main.xml

@@ -3,8 +3,7 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               >
-
-
+
     <LinearLayout
         android:id="@+id/top"
             android:layout_width="fill_parent"
@@ -16,8 +15,8 @@
         <TextView android:id="@+id/tv_view_metadata_updates"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="查看数据"
-                android:textSize="24dp"
+                android:text="@string/main_lb_metadata_updates"
+                android:textSize="24sp"
                 android:paddingTop="24dp"
                 android:paddingBottom="24dp"
                 android:paddingLeft="48dp"
@@ -35,8 +34,8 @@
                 android:paddingTop="24dp"
                 android:paddingBottom="24dp"
                 android:paddingLeft="48dp"
-                android:text="查看应用程序"
-                android:textSize="24dp"
+                android:text="@string/main_lb_app_updates"
+                android:textSize="24sp"
                 android:clickable="true"
                 />
 
@@ -52,8 +51,8 @@
                   android:paddingTop="24dp"
                   android:paddingBottom="24dp"
                   android:paddingLeft="48dp"
-                  android:text="参数设置（请勿随意修改）"
-                  android:textSize="24dp"
+                  android:text="@string/main_lb_system_config"
+                  android:textSize="24sp"
                   android:clickable="true"
                 />
 
@@ -82,8 +81,8 @@
                 android:paddingBottom="20dp"
                 android:paddingLeft="60dp"
                 android:paddingRight="5dp"
-                android:text="刘聪"
-                android:textSize="30dp"
+                android:text="@string/main_lb_username"
+                android:textSize="30sp"
                 android:textStyle="bold"
                 android:clickable="true"
                 />
@@ -93,8 +92,8 @@
                 android:paddingTop="20dp"
                 android:paddingBottom="20dp"
                 android:paddingRight="15dp"
-                android:text="欢迎来到“晓书”"
-                android:textSize="20dp"
+                android:text="@string/main_lb_welcome"
+                android:textSize="20sp"
                 android:clickable="true"
                 />
 
@@ -114,19 +113,19 @@
         <Button android:id="@+id/btn_update_metadata"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:textSize="24dp"
+                android:textSize="24sp"
                 android:padding="24dp"
-                android:text="同步数据"
+                android:text="@string/main_btn_update_metadata"
                 />
 
         <Button android:id="@+id/btn_update_app"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:textSize="24dp"
+                android:textSize="24sp"
                 android:layout_marginTop="24dp"
                 android:padding="24dp"
-                android:text="安装/更新应用程序"
+                android:text="@string/main_btn_update_app"
                 />
-
     </LinearLayout>
+
 </RelativeLayout>

SunDaemon/res/layout/metadata_list_item.xml

@@ -10,28 +10,28 @@
               android:layout_height="fill_parent"
               android:layout_width="fill_parent"
               android:layout_weight="1"
-              android:text="Activities"
+              android:text="@string/metadata_update_item_default_name"
               android:gravity="center"
             />
 
     <TextView android:id="@+id/tv_table_last_update"
               android:layout_height="fill_parent"
               android:layout_width="160dip"
-              android:text="2010-10-17 23:56:48"
+              android:text="@string/metadata_update_item_default_last_update"
               android:gravity="center"
             />
 
     <TextView android:id="@+id/tv_table_last_sync"
               android:layout_height="fill_parent"
               android:layout_width="160dip"
-              android:text="2010-10-17 11:42:32"
+              android:text="@string/metadata_update_item_default_last_sync"
               android:gravity="center"
             />
 
     <TextView android:id="@+id/tv_table_last_sync_status"
               android:layout_height="fill_parent"
               android:layout_width="80dip"
-              android:text="同步成功"
+              android:text="@string/metadata_update_item_default_last_sync_status"
               android:gravity="center"
             />
 

SunDaemon/res/layout/metadata_updates.xml

@@ -17,7 +17,7 @@
                   android:layout_height="fill_parent"
                   android:layout_width="fill_parent"
                   android:layout_weight="1"
-                  android:text="列表名称"
+                  android:text="@string/metadata_update_table_name"
                   android:gravity="center"
                   android:textColor="#111"
                 />
@@ -31,7 +31,7 @@
         <TextView android:id="@+id/tv_table_last_update"
                   android:layout_height="fill_parent"
                   android:layout_width="160dip"
-                  android:text="最后更改时间"
+                  android:text="@string/metadata_update_table_last_update"
                   android:gravity="center"
                   android:textColor="#111"
                 />
@@ -45,7 +45,7 @@
         <TextView android:id="@+id/tv_table_last_sync"
                   android:layout_height="fill_parent"
                   android:layout_width="160dip"
-                  android:text="上次同步时间"
+                  android:text="@string/metadata_update_table_last_sync"
                   android:gravity="center"
                   android:textColor="#111"
                 />
@@ -59,7 +59,7 @@
         <TextView android:id="@+id/tv_table_last_sync_status"
                   android:layout_height="fill_parent"
                   android:layout_width="80dip"
-                  android:text="同步状态"
+                  android:text="@string/metadata_update_table_last_sync_status"
                   android:gravity="center"
                   android:textColor="#111"
                 />

SunDaemon/res/layout/simple_spinner_item.xml

@@ -11,7 +11,7 @@
         android:gravity="center"
         android:textStyle="bold"
         android:textColor="@android:color/black"
-        android:textSize="25dp"
-        android:text="学生"
+        android:textSize="25sp"
+        android:text="@string/signin_account_type_spinner_name"
         />
 </LinearLayout>

SunDaemon/res/layout/system_configs.xml

@@ -7,7 +7,7 @@
     <TextView android:layout_height="wrap_content"
               android:layout_width="fill_parent"
               android:background="@drawable/bg_bar_gradient"
-              android:text="本地设置"
+              android:text="@string/system_config_local_setting"
               android:textColor="#222"
               android:paddingLeft="20dp"
               android:paddingTop="10dp"

SunDaemon/res/values/strings.xml

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">更新晓书</string>
-    <string name="default_api_server_address">api.sunshine-library.org</string>
-    <string name="default_upload_server_address">upload.sunshine-library.org</string>
-    <string name="default_log_server_address">log.sunshine-library.org</string>
-
-    <string name="metadata_download_success">同步成功</string>
-    <string name="metadata_download_syncing">正在同步</string>
-    <string name="metadata_download_failure">同步失败</string>
-    <string name="metadata_download_all_success">成功更新数据！</string>
 
+    <!-- the string resources for signin activity -->
     <string name="signin_heading">登录晓书</string>
     <string name="name_input_legend">姓名</string>
     <string name="birthday_input_legend">生日</string>
@@ -21,6 +14,8 @@
 
     <string name="error_login_name_is_empty">姓名不能为空！</string>
 
+    <string name="signin_account_type_spinner_name">学生</string>
+
     <string-array name="account_type_array">
         <item>学生</item>
         <item>教师</item>
@@ -47,4 +42,52 @@
         <item>5班</item>
         <item>6班</item>
     </string-array>
+
+    <!-- the string resources for main activity -->
+    <string name="main_lb_metadata_updates">查看数据</string>
+    <string name="main_lb_app_updates">查看应用程序</string>
+    <string name="main_lb_system_config">参数设置（请勿随意更改）</string>
+    <string name="main_lb_username">刘聪</string>
+    <string name="main_lb_welcome">欢迎来到“晓书”</string>
+    <string name="main_btn_update_metadata">同步数据</string>
+    <string name="main_btn_update_app">安装/更新应用程序</string>
+
+    <!-- the string resources for system config view -->
+    <string name="system_config_local_setting">本地设置</string>
+
+    <string name="system_config_dialog_label">修改内容</string>
+    <string name="system_config_dialog_btn_submit">修改</string>
+    <string name="system_config_dialog_btn_reset">重置</string>
+
+    <string name="default_api_server_address">api.sunshine-library.org</string>
+    <string name="default_upload_server_address">upload.sunshine-library.org</string>
+    <string name="default_log_server_address">log.sunshine-library.org</string>
+
+    <!-- the string resources for apk update table view -->
+    <string name="apk_update_table_name">Apk名称</string>
+    <string name="apk_update_table_version">版本号</string>
+    <string name="apk_update_table_progress">下载进度</string>
+    <string name="apk_update_table_installed">安装状态</string>
+
+    <string name="apk_update_item_default_name">com.ssl.support.daemon</string>
+    <string name="apk_update_item_default_version">1</string>
+    <string name="apk_update_item_default_progress">100%</string>
+    <string name="apk_update_item_default_status">同步成功</string>
+
+    <!-- the string resource for metadata update table view -->
+    <string name="metadata_update_table_name">列表名称</string>
+    <string name="metadata_update_table_last_update">最后更改时间</string>
+    <string name="metadata_update_table_last_sync">上次同步时间</string>
+    <string name="metadata_update_table_last_sync_status">同步状态</string>
+
+    <string name="metadata_update_item_default_name">Activities</string>
+    <string name="metadata_update_item_default_last_update">2010-10-17 23:56:48</string>
+    <string name="metadata_update_item_default_last_sync">2010-10-17 11:42:32</string>
+    <string name="metadata_update_item_default_last_sync_status">同步成功</string>
+
+    <string name="metadata_download_success">同步成功</string>
+    <string name="metadata_download_syncing">正在同步</string>
+    <string name="metadata_download_failure">同步失败</string>
+    <string name="metadata_download_all_success">成功更新数据！</string>
+
 </resources>