From 673dd4b692420b38435bdf62a221e8f9c5df02ac Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Mon, 21 Jun 2021 14:39: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

---
 app/src/main/AndroidManifest.xml                           | 2 +-
 app/src/main/java/io/legado/app/constant/EventBus.kt       | 1 +
 .../java/io/legado/app/receiver/MediaButtonReceiver.kt     | 2 +-
 .../main/java/io/legado/app/service/AudioPlayService.kt    | 3 +--
 .../io/legado/app/ui/{ => book}/audio/AudioPlayActivity.kt | 2 +-
 .../legado/app/ui/{ => book}/audio/AudioPlayViewModel.kt   | 2 +-
 .../java/io/legado/app/ui/book/info/BookInfoActivity.kt    | 2 +-
 .../legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt  | 7 ++++++-
 .../app/ui/main/bookshelf/style1/books/BooksFragment.kt    | 5 ++++-
 .../app/ui/main/bookshelf/style2/BookshelfFragment2.kt     | 5 ++++-
 app/src/main/res/layout/activity_audio_play.xml            | 2 +-
 11 files changed, 22 insertions(+), 11 deletions(-)
 rename app/src/main/java/io/legado/app/ui/{ => book}/audio/AudioPlayActivity.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/audio/AudioPlayViewModel.kt (99%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c87caef2e..4cae9d17d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -169,7 +169,7 @@
             android:launchMode="singleTask" />
         <!-- 音频播放界面 -->
         <activity
-            android:name=".ui.audio.AudioPlayActivity"
+            android:name="io.legado.app.ui.book.audio.AudioPlayActivity"
             android:launchMode="singleTask" />
         <!-- 授权界面 -->
         <activity
diff --git a/app/src/main/java/io/legado/app/constant/EventBus.kt b/app/src/main/java/io/legado/app/constant/EventBus.kt
index adb92d961..4792d2a1b 100644
--- a/app/src/main/java/io/legado/app/constant/EventBus.kt
+++ b/app/src/main/java/io/legado/app/constant/EventBus.kt
@@ -4,6 +4,7 @@ object EventBus {
     const val MEDIA_BUTTON = "mediaButton"
     const val RECREATE = "RECREATE"
     const val UP_BOOK = "upBookToc"
+    const val BOOKSHELF_REFRESH = "bookshelfRefresh"
     const val ALOUD_STATE = "aloud_state"
     const val TTS_PROGRESS = "ttsStart"
     const val TTS_DS = "ttsDs"
diff --git a/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
index beded7255..c25ebf2f1 100644
--- a/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
+++ b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
@@ -12,7 +12,7 @@ import io.legado.app.service.AudioPlayService
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.service.help.AudioPlay
 import io.legado.app.service.help.ReadAloud
-import io.legado.app.ui.audio.AudioPlayActivity
+import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.main.MainActivity
 import io.legado.app.utils.postEvent
diff --git a/app/src/main/java/io/legado/app/service/AudioPlayService.kt b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
index a971ab95e..4c9d247ce 100644
--- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt
+++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.BitmapFactory
-import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.media.MediaPlayer
 import android.net.Uri
@@ -30,7 +29,7 @@ import io.legado.app.help.MediaHelp
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.receiver.MediaButtonReceiver
 import io.legado.app.service.help.AudioPlay
-import io.legado.app.ui.audio.AudioPlayActivity
+import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.utils.postEvent
 import io.legado.app.utils.toastOnUi
 import kotlinx.coroutines.Dispatchers.Main
diff --git a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
index 084180ca6..f04555414 100644
--- a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.audio
+package io.legado.app.ui.book.audio
 
 import android.app.Activity
 import android.graphics.drawable.Drawable
diff --git a/app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt
index c5cd330ef..7be490591 100644
--- a/app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.audio
+package io.legado.app.ui.book.audio
 
 import android.app.Application
 import android.content.Intent
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 1b647aa7c..bb011df0b 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -27,7 +27,7 @@ import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.lib.theme.bottomBackground
 import io.legado.app.lib.theme.getPrimaryTextColor
-import io.legado.app.ui.audio.AudioPlayActivity
+import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.ui.book.changecover.ChangeCoverDialog
 import io.legado.app.ui.book.changesource.ChangeSourceDialog
 import io.legado.app.ui.book.group.GroupSelectDialog
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 3fffdc73e..2ee4a5806 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -85,17 +85,22 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
                 DialogBookshelfConfigBinding.inflate(layoutInflater)
                     .apply {
                         spGroupStyle.setSelection(AppConfig.bookGroupStyle)
+                        swShowUnread.isChecked = AppConfig.showUnread
                         rgLayout.checkByIndex(bookshelfLayout)
                         rgSort.checkByIndex(bookshelfSort)
                     }
             customView { alertBinding.root }
             okButton {
                 alertBinding.apply {
-                    var changed = false
                     if (AppConfig.bookGroupStyle != spGroupStyle.selectedItemPosition) {
                         AppConfig.bookGroupStyle = spGroupStyle.selectedItemPosition
                         postEvent(EventBus.NOTIFY_MAIN, false)
                     }
+                    if (AppConfig.showUnread != swShowUnread.isChecked) {
+                        AppConfig.showUnread = swShowUnread.isChecked
+                        postEvent(EventBus.BOOKSHELF_REFRESH, "")
+                    }
+                    var changed = false
                     if (bookshelfLayout != rgLayout.getCheckedIndex()) {
                         putPrefInt(PreferKey.bookshelfLayout, rgLayout.getCheckedIndex())
                         changed = true
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
index 9deb8cc40..ea918d46a 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
@@ -20,7 +20,7 @@ import io.legado.app.databinding.FragmentBooksBinding
 import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
-import io.legado.app.ui.audio.AudioPlayActivity
+import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.ui.book.info.BookInfoActivity
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.main.MainViewModel
@@ -168,5 +168,8 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
         observeEvent<String>(EventBus.UP_BOOK) {
             booksAdapter.notification(it)
         }
+        observeEvent<String>(EventBus.BOOKSHELF_REFRESH) {
+            booksAdapter.notifyDataSetChanged()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt
index 1676710eb..7fd83f6f0 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt
@@ -22,7 +22,7 @@ import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.primaryTextColor
-import io.legado.app.ui.audio.AudioPlayActivity
+import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.ui.book.info.BookInfoActivity
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.book.search.SearchActivity
@@ -231,5 +231,8 @@ class BookshelfFragment2 : BaseBookshelfFragment(R.layout.fragment_bookshelf1),
         observeEvent<String>(EventBus.UP_BOOK) {
             booksAdapter.notification(it)
         }
+        observeEvent<String>(EventBus.BOOKSHELF_REFRESH) {
+            booksAdapter.notifyDataSetChanged()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_audio_play.xml b/app/src/main/res/layout/activity_audio_play.xml
index 235b20cb4..20c64aba6 100644
--- a/app/src/main/res/layout/activity_audio_play.xml
+++ b/app/src/main/res/layout/activity_audio_play.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background"
-    tools:context=".ui.audio.AudioPlayActivity">
+    tools:context=".ui.book.audio.AudioPlayActivity">
 
     <ImageView
         android:id="@+id/iv_bg"