yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

[修复] 退出书籍提示添加书架，点击确定后主页未显示 #458

Browse Source
This commit is contained in:
HapeLee
2025-12-18 19:30:46 +08:00
parent 7f6d69b4a0
commit e8a6c8e40b
4 changed files with 27 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
-23
View File
@@ -581,29 +581,6 @@ class AudioPlayActivity :
}
}
override fun finish() {
val book = AudioPlay.book ?: return super.finish()
if (AudioPlay.inBookshelf) {
return super.finish()
}
if (!AppConfig.showAddToShelfAlert) {
viewModel.removeFromBookshelf { super.finish() }
} else {
alert(title = getString(R.string.add_to_bookshelf)) {
setMessage(getString(R.string.check_add_bookshelf, book.name))
okButton {
AudioPlay.book?.removeType(BookType.notShelf)
AudioPlay.book?.save()
AudioPlay.inBookshelf = true
setResult(RESULT_OK)
}
noButton { viewModel.removeFromBookshelf { super.finish() } }
}
}
}
override fun onDestroy() {
super.onDestroy()
if (AudioPlay.status != Status.PLAY) {
app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+27 -1
View File
@@ -22,6 +22,8 @@ import android.view.MenuItem
import android.view.View
import android.widget.CheckBox
import android.widget.LinearLayout
import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback
import androidx.activity.viewModels
import androidx.core.app.ActivityCompat
import androidx.core.app.ActivityOptionsCompat
@@ -51,6 +53,7 @@ import io.legado.app.help.book.isAudio
import io.legado.app.help.book.isImage
import io.legado.app.help.book.isLocal
import io.legado.app.help.book.isLocalTxt
import io.legado.app.help.book.isNotShelf
import io.legado.app.help.book.isWebFile
import io.legado.app.help.book.removeType
import io.legado.app.help.config.AppConfig
@@ -58,6 +61,7 @@ import io.legado.app.help.config.LocalConfig
import io.legado.app.lib.dialogs.alert
import io.legado.app.lib.dialogs.selector
import io.legado.app.model.BookCover
import io.legado.app.model.ReadBook
import io.legado.app.model.remote.RemoteBookWebDav
import io.legado.app.ui.about.AppLogDialog
import io.legado.app.ui.book.audio.AudioPlayActivity
@@ -153,7 +157,7 @@ class BookInfoActivity :
viewModel.refreshBook(book)
}
}
private lateinit var backCallback: OnBackPressedCallback
private var surfaceFinalColor: Int = 0
private var surfaceContainerFinalColor: Int = 0
private var secondaryFinalColor: Int = 0
@@ -184,6 +188,7 @@ class BookInfoActivity :
window.sharedElementReturnTransition = transform
window.sharedElementsUseOverlay = false
super.onCreate(savedInstanceState)
setupBackCallback()
surfaceFinalColor =
MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, -1)
secondaryFinalColor =
@@ -381,6 +386,27 @@ class BookInfoActivity :
// return super.dispatchTouchEvent(ev)
// }
private fun setupBackCallback() {
onBackPressedDispatcher.addCallback(this) {
if (!viewModel.inBookshelf) {
viewModel.getBook()?.let { book ->
alert(title = getString(R.string.add_to_bookshelf)) {
setMessage(getString(R.string.check_add_bookshelf, book.name))
okButton {
book.removeType(BookType.notShelf)
book.save()
viewModel.inBookshelf = true
super.finish()
}
noButton { super.finish() }
}
}
} else {
finish()
}
}
}
private fun refreshBook() {
upLoading(true)
viewModel.getBook()?.let {
app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
-22
View File
@@ -928,28 +928,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
}
}
override fun finish() {
val book = ReadManga.book ?: return super.finish()
if (ReadManga.inBookshelf) {
return super.finish()
}
if (!AppConfig.showAddToShelfAlert) {
viewModel.removeFromBookshelf { super.finish() }
} else {
alert(title = getString(R.string.add_to_bookshelf)) {
setMessage(getString(R.string.check_add_bookshelf, book.name))
okButton {
ReadManga.book?.removeType(BookType.notShelf)
ReadManga.book?.save()
ReadManga.inBookshelf = true
setResult(RESULT_OK)
}
noButton { viewModel.removeFromBookshelf { super.finish() } }
}
}
}
fun resetWindowToSystemBrightness() {
val layoutParams = window.attributes
layoutParams.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
-24
View File
@@ -1787,30 +1787,6 @@ class ReadBookActivity : BaseReadBookActivity(),
}
}
override fun finish() {
val book = ReadBook.book ?: return super.finish()
if (ReadBook.inBookshelf) {
return super.finish()
}
if (!AppConfig.showAddToShelfAlert) {
viewModel.removeFromBookshelf { super.finish() }
} else {
alert(title = getString(R.string.add_to_bookshelf)) {
setMessage(getString(R.string.check_add_bookshelf, book.name))
okButton {
ReadBook.book?.removeType(BookType.notShelf)
ReadBook.book?.save()
ReadBook.inBookshelf = true
setResult(RESULT_OK)
super.finish()
}
noButton { viewModel.removeFromBookshelf { super.finish() } }
}
}
}
override fun onDestroy() {
super.onDestroy()
tts?.clearTts()