pull/84/head
kunfei 5 years ago
parent e6ea59aaff
commit cd4f3fe161
  1. 4
      app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
  2. 30
      app/src/main/res/layout/activity_rss_favorites.xml
  3. 2
      app/src/main/res/menu/main_rss.xml
  4. 2
      app/src/main/res/menu/rss_read.xml
  5. 7
      app/src/main/res/values/strings.xml

@ -101,10 +101,10 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
override fun upStarMenu() { override fun upStarMenu() {
if (viewModel.star) { if (viewModel.star) {
starMenuItem?.setIcon(R.drawable.ic_star) starMenuItem?.setIcon(R.drawable.ic_star)
starMenuItem?.setTitle(R.string.y_store_up) starMenuItem?.setTitle(R.string.in_favorites)
} else { } else {
starMenuItem?.setIcon(R.drawable.ic_star_border) 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) DrawableUtils.setTint(starMenuItem?.icon, primaryTextColor)
} }

@ -1,7 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout> <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>

@ -5,7 +5,7 @@
<item <item
android:id="@+id/menu_rss_star" android:id="@+id/menu_rss_star"
android:title="@string/store_up" android:title="@string/favorite"
android:icon="@drawable/ic_star" android:icon="@drawable/ic_star"
app:showAsAction="always" /> app:showAsAction="always" />

@ -4,7 +4,7 @@
<item <item
android:id="@+id/menu_rss_star" android:id="@+id/menu_rss_star"
android:title="@string/store_up" android:title="@string/favorite"
android:icon="@drawable/ic_star_border" android:icon="@drawable/ic_star_border"
app:showAsAction="always" /> app:showAsAction="always" />

@ -33,9 +33,10 @@
<string name="enable">启用</string> <string name="enable">启用</string>
<string name="replace_purify_search">替换净化-搜索</string> <string name="replace_purify_search">替换净化-搜索</string>
<string name="bookshelf">书架</string> <string name="bookshelf">书架</string>
<string name="store_up">收藏</string> <string name="favorites">收藏夹</string>
<string name="y_store_up">已收藏</string> <string name="favorite">收藏</string>
<string name="w_store_up">未收藏</string> <string name="in_favorites">已收藏</string>
<string name="out_favorites">未收藏</string>
<string name="rss">订阅</string> <string name="rss">订阅</string>
<string name="all">全部</string> <string name="all">全部</string>
<string name="recent_reading">最近阅读</string> <string name="recent_reading">最近阅读</string>

Loading…
Cancel
Save