From 3166bb5cc3e1a22842e966addfb13be8d72b8f9a Mon Sep 17 00:00:00 2001 From: Yaoliang Date: Wed, 10 Jul 2024 08:32:56 +0800 Subject: [PATCH] fix: minor changes --- app/src/main/java/io/legado/app/data/entities/Book.kt | 2 +- app/src/main/java/io/legado/app/model/ReadBook.kt | 5 ++--- .../java/io/legado/app/ui/book/read/BaseReadBookActivity.kt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt index 379bc055e..bbf4dd0a1 100644 --- a/app/src/main/java/io/legado/app/data/entities/Book.kt +++ b/app/src/main/java/io/legado/app/data/entities/Book.kt @@ -452,4 +452,4 @@ data class Book( @TypeConverter fun stringToReadConfig(json: String?) = GSON.fromJsonObject(json).getOrNull() } -} +} \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt index 2f11adb6f..5641204eb 100644 --- a/app/src/main/java/io/legado/app/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -591,8 +591,7 @@ object ReadBook : CoroutineScope by MainScope() { } } - // put a log to avoid Kotlin K2 compiler take "when" as a return statement - AppLog.putDebug("contentLoadFinish done") + return@async }.onError { AppLog.put("ChapterProvider ERROR", it) appCtx.toastOnUi("ChapterProvider ERROR:\n${it.stackTraceStr}") @@ -729,4 +728,4 @@ object ReadBook : CoroutineScope by MainScope() { fun notifyBookChanged() } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt index d17c0fc06..702112f4e 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt @@ -61,7 +61,6 @@ abstract class BaseReadBookActivity : override val binding by viewBinding(ActivityBookReadBinding::inflate) override val viewModel by viewModels() - val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") var bottomDialog = 0 set(value) { @@ -311,6 +310,7 @@ abstract class BaseReadBookActivity : } fun showSimulatedReading() { + val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") ReadBook.book?.let { book -> alert(titleResource = R.string.simulated_reading) { val alertBinding = DialogSimulatedReadingBinding.inflate(layoutInflater).apply {