From 31a8445df247c8806e4ba67ef0e6a29051982da2 Mon Sep 17 00:00:00 2001
From: Ash <glaxyinfinite@outlook.com>
Date: Sun, 3 Apr 2022 00:47:50 +0800
Subject: [PATCH] Improve display text

---
 .../java/me/ash/reader/ui/page/home/read/ReadPage.kt   |  1 +
 app/src/main/res/values-zh-rCN/strings.xml             | 10 +++++-----
 app/src/main/res/values/strings.xml                    | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt
index 8caa2ea..a75c175 100644
--- a/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt
+++ b/app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt
@@ -86,6 +86,7 @@ fun ReadPage(
                 ) {
                     TopBar(
                         isShow = viewState.articleWithFeed == null || !isScrollDown,
+                        isShowActions = viewState.articleWithFeed != null,
                         onScrollToPage = onScrollToPage,
                         onClearArticle = {
                             readViewModel.dispatch(ReadViewAction.ClearArticle)
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 00cad5e..541bdfc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -33,9 +33,9 @@
     <string name="open_with">打开 %1$s</string>
     <string name="options">选项</string>
     <string name="delete">删除</string>
-    <string name="has_been_deleted">%1$s 已被删除</string>
+    <string name="has_been_deleted">“%1$s” 已被删除</string>
     <string name="unsubscribe">取消订阅</string>
-    <string name="unsubscribe_tip">不再订阅 %1$s，同时删除其所有已归档的文章。</string>
+    <string name="unsubscribe_tip">不再订阅 “%1$s”，同时删除其所有已归档的文章。</string>
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
     <string name="date_at_time">%1$s %2$s</string>
@@ -47,7 +47,7 @@
     <string name="mark_as_read_one_day">超过 1 天标记为已读</string>
     <string name="mark_as_read_three_days">超过 3 天标记为已读</string>
     <string name="mark_as_read_seven_days">超过 7 天标记为已读</string>
-    <string name="one_day">1 天</string>
-    <string name="three_days">3 天</string>
-    <string name="seven_days">7 天</string>
+    <string name="one_day">1天</string>
+    <string name="three_days">3天</string>
+    <string name="seven_days">7天</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc30b97..142939f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,9 +33,9 @@
     <string name="open_with">Open %1$s</string>
     <string name="options">Options</string>
     <string name="delete">Delete</string>
-    <string name="has_been_deleted">%1$s has been deleted</string>
+    <string name="has_been_deleted">"%1$s" has been deleted</string>
     <string name="unsubscribe">Unsubscribe</string>
-    <string name="unsubscribe_tip">Unsubscribe %1$s and delete all its archived articles.</string>
+    <string name="unsubscribe_tip">Unsubscribe "%1$s" and delete all its archived articles.</string>
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>
     <string name="date_at_time">%1$s At %2$s</string>
@@ -47,7 +47,7 @@
     <string name="mark_as_read_one_day">Mark as Read More Than 1 Day</string>
     <string name="mark_as_read_three_days">Mark as Read More Than 3 Days</string>
     <string name="mark_as_read_seven_days">Mark as Read More Than 7 Days</string>
-    <string name="one_day">1 d</string>
-    <string name="three_days">3 d</string>
-    <string name="seven_days">7 d</string>
+    <string name="one_day">1d</string>
+    <string name="three_days">3d</string>
+    <string name="seven_days">7d</string>
 </resources>
\ No newline at end of file