From cd4f3fe161f01c06988569f880e85eff62913eaa Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 4 Feb 2020 21:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/rss/read/ReadRssActivity.kt |  4 +--
 .../res/layout/activity_rss_favorites.xml     | 30 ++++++++++++++++---
 app/src/main/res/menu/main_rss.xml            |  2 +-
 app/src/main/res/menu/rss_read.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  7 +++--
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
index 7bbf4e741..ffb5c4994 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
@@ -101,10 +101,10 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
     override fun upStarMenu() {
         if (viewModel.star) {
             starMenuItem?.setIcon(R.drawable.ic_star)
-            starMenuItem?.setTitle(R.string.y_store_up)
+            starMenuItem?.setTitle(R.string.in_favorites)
         } else {
             starMenuItem?.setIcon(R.drawable.ic_star_border)
-            starMenuItem?.setTitle(R.string.w_store_up)
+            starMenuItem?.setTitle(R.string.out_favorites)
         }
         DrawableUtils.setTint(starMenuItem?.icon, primaryTextColor)
     }
diff --git a/app/src/main/res/layout/activity_rss_favorites.xml b/app/src/main/res/layout/activity_rss_favorites.xml
index d829e291c..5b80c0714 100644
--- a/app/src/main/res/layout/activity_rss_favorites.xml
+++ b/app/src/main/res/layout/activity_rss_favorites.xml
@@ -1,7 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+    <io.legado.app.ui.widget.TitleBar
+        android:id="@+id/title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/favorites"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout
+        android:id="@+id/content_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title_bar">
+
+        <io.legado.app.ui.widget.recycler.RefreshRecyclerView
+            android:id="@+id/refresh_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_rss.xml b/app/src/main/res/menu/main_rss.xml
index 4403621bd..97343e877 100644
--- a/app/src/main/res/menu/main_rss.xml
+++ b/app/src/main/res/menu/main_rss.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/menu_rss_star"
-        android:title="@string/store_up"
+        android:title="@string/favorite"
         android:icon="@drawable/ic_star"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/menu/rss_read.xml b/app/src/main/res/menu/rss_read.xml
index f32d01d2e..7afb7f128 100644
--- a/app/src/main/res/menu/rss_read.xml
+++ b/app/src/main/res/menu/rss_read.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_rss_star"
-        android:title="@string/store_up"
+        android:title="@string/favorite"
         android:icon="@drawable/ic_star_border"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5d27918a..8b283bb42 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,9 +33,10 @@
     <string name="enable">启用</string>
     <string name="replace_purify_search">替换净化-搜索</string>
     <string name="bookshelf">书架</string>
-    <string name="store_up">收藏</string>
-    <string name="y_store_up">已收藏</string>
-    <string name="w_store_up">未收藏</string>
+    <string name="favorites">收藏夹</string>
+    <string name="favorite">收藏</string>
+    <string name="in_favorites">已收藏</string>
+    <string name="out_favorites">未收藏</string>
     <string name="rss">订阅</string>
     <string name="all">全部</string>
     <string name="recent_reading">最近阅读</string>