詹子聪 6 vuotta sitten
vanhempi
commit
75361230f1

+ 4 - 4
app/src/main/res/layout/activity_login.xml

@@ -19,7 +19,7 @@
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:layout_marginTop="@dimen/margin_default"
-        android:hint="请输入账号"
+        android:hint="@string/login_account"
         app:boxBackgroundMode="outline"
         app:boxCornerRadiusBottomEnd="4dp"
         app:boxCornerRadiusBottomStart="4dp"
@@ -47,7 +47,7 @@
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:layout_marginTop="@dimen/margin_default"
-        android:hint="请输入并牢记本机密码"
+        android:hint="@string/login_password"
         app:boxBackgroundMode="outline"
         app:boxCornerRadiusBottomEnd="4dp"
         app:boxCornerRadiusBottomStart="4dp"
@@ -74,7 +74,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_message"
         android:layout_marginEnd="@dimen/margin_default"
-        android:text="忘记密码"
+        android:text="@string/login_forget"
         android:textColor="@color/gray_hint"
         android:textStyle="bold"
         android:textSize="@dimen/text_s"
@@ -92,7 +92,7 @@
         android:layout_marginEnd="@dimen/margin_default"
         android:paddingTop="@dimen/padding_full_width"
         android:paddingBottom="@dimen/padding_full_width"
-        android:text="登录或注册"
+        android:text="@string/login_in_up"
         android:textColor="@color/white"
         android:textStyle="bold"
         android:background="@drawable/selector_btn"

+ 9 - 10
app/src/main/res/layout/activity_mine.xml

@@ -27,7 +27,7 @@
                 android:layout_marginStart="@dimen/margin_default"
                 android:layout_marginEnd="@dimen/margin_default"
                 android:layout_marginTop="@dimen/margin_default"
-                android:hint="请输入要升级的账号"
+                android:hint="@string/mine_upgrade_account"
                 app:boxBackgroundMode="outline"
                 app:boxCornerRadiusBottomEnd="4dp"
                 app:boxCornerRadiusBottomStart="4dp"
@@ -54,7 +54,7 @@
                 android:layout_margin="@dimen/margin_default"
                 android:paddingTop="@dimen/padding_full_width"
                 android:paddingBottom="@dimen/padding_full_width"
-                android:text="升级为VIP用户"
+                android:text="@string/mine_upgrade_vip"
                 android:textColor="@color/white"
                 android:textStyle="bold"
                 android:background="@drawable/selector_btn"
@@ -69,7 +69,7 @@
                 android:layout_marginStart="@dimen/margin_default"
                 android:layout_marginEnd="@dimen/margin_default"
                 android:layout_marginTop="@dimen/margin_default"
-                android:hint="请输入新的支付链接"
+                android:hint="@string/mine_new_pay_account"
                 app:boxBackgroundMode="outline"
                 app:boxCornerRadiusBottomEnd="4dp"
                 app:boxCornerRadiusBottomStart="4dp"
@@ -96,7 +96,7 @@
                 android:layout_margin="@dimen/margin_default"
                 android:paddingTop="@dimen/padding_full_width"
                 android:paddingBottom="@dimen/padding_full_width"
-                android:text="设置新的支付链接"
+                android:text="@string/mine_set_new_pay"
                 android:textColor="@color/white"
                 android:textStyle="bold"
                 android:background="@drawable/selector_btn"
@@ -112,7 +112,6 @@
                 android:gravity="center_vertical"
                 android:paddingStart="@dimen/activity_horizontal_margin"
                 android:paddingEnd="@dimen/activity_horizontal_margin"
-                android:text="增加图片"
                 android:textColor="@color/black_text"
                 android:visibility="gone"/>
 
@@ -126,7 +125,7 @@
                 android:gravity="center_vertical"
                 android:layout_marginStart="@dimen/margin_default"
                 android:layout_marginEnd="@dimen/margin_default"
-                android:text="是否限制访问伊甸园"/>
+                android:text="@string/mine_limit_data"/>
 
             <include layout="@layout/view_divider_common" />
 
@@ -137,7 +136,7 @@
                 android:gravity="center_vertical"
                 android:layout_marginStart="@dimen/margin_default"
                 android:layout_marginEnd="@dimen/margin_default"
-                android:text="是否在下次启动爬虫"/>
+                android:text="@string/mine_walk_next_time"/>
 
             <include layout="@layout/view_divider_common" />
 
@@ -148,7 +147,7 @@
                 android:gravity="center_vertical"
                 android:layout_marginStart="@dimen/margin_default"
                 android:layout_marginEnd="@dimen/margin_default"
-                android:text="是否启动广告模式"/>
+                android:text="@string/mine_ad_mode"/>
 
             <include layout="@layout/view_divider_common" />
         </LinearLayout>
@@ -161,7 +160,7 @@
             android:gravity="center_vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:text="我的收藏"
+            android:text="@string/mine_my_star"
             android:textColor="@color/black_text" />
 
         <include layout="@layout/view_divider_common" />
@@ -179,7 +178,7 @@
             android:layout_marginEnd="@dimen/margin_default"
             android:paddingTop="@dimen/padding_full_width"
             android:paddingBottom="@dimen/padding_full_width"
-            android:text="退出当前账号"
+            android:text="@string/mine_exit_account"
             android:textColor="@color/white"
             android:textStyle="bold"
             android:background="@drawable/selector_btn_exit"

+ 2 - 2
app/src/main/res/layout/activity_search.xml

@@ -30,7 +30,7 @@
             android:paddingTop="@dimen/margin_ss"
             android:paddingBottom="@dimen/margin_ss"
             android:textSize="@dimen/text_normal_p"
-            android:hint="请输入关键字"
+            android:hint="@string/search_hint_keyword"
             android:textColor="@color/black_text_comfortable"
             android:textColorHint="@color/gray_text_hint"
             android:maxLength="512" />
@@ -63,7 +63,7 @@
             android:layout_marginEnd="@dimen/margin_default"
             android:paddingTop="@dimen/padding_full_width"
             android:paddingBottom="@dimen/padding_full_width"
-            android:text="立即搜索"
+            android:text="@string/search_now"
             android:textColor="@color/white"
             android:textStyle="bold"
             android:background="@drawable/selector_btn"

+ 1 - 1
app/src/main/res/layout/activity_tab.xml

@@ -35,7 +35,7 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="伊甸园"
+                android:text="@string/app_name"
                 android:textStyle="bold"
                 android:textColor="@color/white"
                 android:textSize="@dimen/size_hello" />

+ 8 - 9
app/src/main/res/layout/fragment_about.xml

@@ -37,7 +37,7 @@
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="伊甸园"
+            android:text="@string/app_name"
             android:textColor="@color/black_theme"
             android:textSize="@dimen/text_normal_p"
             android:textStyle="bold" />
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/margin_default"
         android:paddingEnd="@dimen/margin_default"
-        android:text="注意:会员仅限本手机使用,请牢记首次进入APP时设置的密码。不要轻易对本机进行刷机、root等操作,请勿重复卸载安装本应用,否则可能造成会员失效。"
+        android:text="@string/about_attention"
         android:textColor="@color/red_2"
         android:textSize="@dimen/text_normal"
         android:layout_marginTop="@dimen/margin_s"/>
@@ -60,7 +60,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/margin_default"
         android:paddingEnd="@dimen/margin_default"
-        android:text="点击下方的“立即激活”进行转账,备注当前要升级的账号(非常重要),退出应用稍等片刻重新打开APP,即可完成激活。一定要在备注填写需要激活的账号,否则无法完成激活。"
+        android:text="@string/about_description"
         android:textColor="@color/black_droid_text"
         android:textSize="@dimen/text_normal"
         android:layout_marginTop="@dimen/margin_s"/>
@@ -79,7 +79,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="本机账号:"
+            android:text="@string/about_current_account"
             android:textColor="@color/black_droid_text"
             android:textSize="@dimen/text_normal" />
         <TextView
@@ -97,7 +97,7 @@
         android:layout_marginTop="@dimen/margin_default"
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
-        android:text="立即激活"
+        android:text="@string/about_upgrade_now"
         android:textColor="@color/green_logo"
         android:textSize="@dimen/text_normal_s"
         android:textStyle="bold"
@@ -110,7 +110,7 @@
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:layout_marginTop="@dimen/margin_default"
-        android:text="检查更新"
+        android:text="@string/about_check_new"
         android:textColor="@color/green_logo"
         android:textSize="@dimen/text_normal_s"
         android:textStyle="bold"
@@ -123,7 +123,7 @@
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:layout_marginTop="@dimen/margin_default"
-        android:text="意见反馈"
+        android:text="@string/about_feedback"
         android:textColor="@color/green_logo"
         android:textSize="@dimen/text_normal_s"
         android:textStyle="bold"
@@ -137,7 +137,6 @@
         android:layout_marginTop="@dimen/margin_default"
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
-        android:text="更多应用"
         android:textColor="@color/green_logo"
         android:textSize="@dimen/text_normal_s"
         android:textStyle="bold"
@@ -158,7 +157,7 @@
         android:layout_height="@dimen/height_sliding_tab"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
-        android:text="隐私权限 · 服务条款"
+        android:text="@string/about_privacy"
         android:textColor="@color/black_title"
         android:textSize="@dimen/text_s"
         android:visibility="gone"/>

+ 0 - 1
app/src/main/res/layout/item_goods.xml

@@ -105,7 +105,6 @@
                     android:paddingTop="@dimen/padding_tag"
                     android:paddingEnd="@dimen/margin_tag"
                     android:paddingBottom="@dimen/padding_tag"
-                    android:text=" 好评 "
                     android:textColor="@color/white_slight"
                     android:textSize="@dimen/text_sss"
                     android:visibility="gone"/>

+ 1 - 1
app/src/main/res/menu/menu_done.xml

@@ -4,6 +4,6 @@
     <item
         android:id="@+id/action_done"
         android:orderInCategory="100"
-        android:title="  完成  "
+        android:title="@string/menu_finish"
         app:showAsAction="ifRoom" />
 </menu>

+ 23 - 0
app/src/main/res/values-zh-rCN/strings.xml

@@ -75,4 +75,27 @@
     <string name="mine_set_fail">设置失败</string>
     <string name="response_permission_denied">没有权限</string>
     <string name="about_upgrade_not_available">激活通道暂时关闭</string>
+    <string name="login_account">请输入账号</string>
+    <string name="login_password">请输入并牢记本机密码</string>
+    <string name="login_forget">忘记密码</string>
+    <string name="login_in_up">登录或注册</string>
+    <string name="mine_upgrade_account">请输入要升级的账号</string>
+    <string name="mine_upgrade_vip">升级为VIP用户</string>
+    <string name="mine_new_pay_account">请输入新的支付链接</string>
+    <string name="mine_set_new_pay">设置新的支付链接</string>
+    <string name="mine_limit_data">是否限制访问伊甸园</string>
+    <string name="mine_walk_next_time">是否在下次启动爬虫</string>
+    <string name="mine_ad_mode">是否启动广告模式</string>
+    <string name="mine_my_star">我的收藏</string>
+    <string name="mine_exit_account">退出当前账号</string>
+    <string name="search_hint_keyword">请输入关键字</string>
+    <string name="search_now">立即搜索</string>
+    <string name="about_attention">注意:会员仅限本手机使用,请牢记首次进入APP时设置的密码。不要轻易对本机进行刷机、root等操作,请勿重复卸载安装本应用,否则可能造成会员失效。</string>
+    <string name="about_description">点击下方的“立即激活”进行转账,备注当前要升级的账号(非常重要),退出应用稍等片刻重新打开APP,即可完成激活。一定要在备注填写需要激活的账号,否则无法完成激活。</string>
+    <string name="about_current_account">本机账号:</string>
+    <string name="about_upgrade_now">立即激活</string>
+    <string name="about_check_new">检查更新</string>
+    <string name="about_feedback">意见反馈</string>
+    <string name="about_privacy">隐私权限 · 服务条款</string>
+    <string name="menu_finish">完成</string>
 </resources>

+ 23 - 0
app/src/main/res/values/strings.xml

@@ -75,4 +75,27 @@
     <string name="mine_set_fail">Set failed</string>
     <string name="response_permission_denied">Permission denied</string>
     <string name="about_upgrade_not_available">Upgrading not available</string>
+    <string name="login_account">Please input account</string>
+    <string name="login_password">Please input and remember the password</string>
+    <string name="login_forget">Forget</string>
+    <string name="login_in_up">LOGIN OR REGISTER</string>
+    <string name="mine_upgrade_account">Input account to upgrade</string>
+    <string name="mine_upgrade_vip">Upgrade to VIP</string>
+    <string name="mine_new_pay_account">Input new payment link</string>
+    <string name="mine_set_new_pay">Set New Payment Accout</string>
+    <string name="mine_limit_data">Set data limited</string>
+    <string name="mine_walk_next_time">Walking next starting up</string>
+    <string name="mine_ad_mode">Advertise mode</string>
+    <string name="mine_my_star">My star</string>
+    <string name="mine_exit_account">Exit current account</string>
+    <string name="search_hint_keyword">Input keyword</string>
+    <string name="search_now">SEARCH</string>
+    <string name="about_attention">Attention: VIP is only for current phone, please remember password you set when registering. Please don\'t reset or root your phone, and don\'t uninstall current app, or the VIP may be invalid.</string>
+    <string name="about_description">Click following button to upgrade, and paste your account to the remarks(Very important) when you pay, and restart current app for a minute.</string>
+    <string name="about_current_account">Current account:</string>
+    <string name="about_upgrade_now">Upgrade Now</string>
+    <string name="about_check_new">Check version</string>
+    <string name="about_feedback">Feedback</string>
+    <string name="about_privacy">Privacy permissions &amp; Service items</string>
+    <string name="menu_finish">FINISH</string>
 </resources>