Merge pull request #1898 from todoXu/main

feat:阅读设置里增加按钮切换新旧目录显示

app/src/main/java/io/legado/app/constant/PreferKey.kt

@@ -383,6 +383,7 @@ object PreferKey {
     const val bookshelfShowLatestChapter = "bookshelfShowLatestChapter"
     const val bookshelfIntroMaxLines = "bookshelfIntroMaxLines"
     const val sliderVibrator = "sliderVibrator"
+    const val useNewTocSheet = "useNewTocSheet"
     const val selectVibrator = "selectVibrator"
     const val audioCacheCleanTime = "audioCacheCleanTime"
     const val audioPreDownloadNum = "audioPreDownloadNum"

app/src/main/java/io/legado/app/data/repository/ReadSettingsRepository.kt

@@ -122,6 +122,9 @@ class ReadSettingsRepository(
     suspend fun setSliderVibrator(value: Boolean) =
         settingsRepository.putBoolean(PreferKey.sliderVibrator, value)
 
+    suspend fun setUseNewTocSheet(value: Boolean) =
+        settingsRepository.putBoolean(PreferKey.useNewTocSheet, value)
+
     suspend fun setSelectVibrator(value: Boolean) =
         settingsRepository.putBoolean(PreferKey.selectVibrator, value)
 
@@ -358,6 +361,7 @@ class ReadSettingsRepository(
             keyPageOnLongPress = compatDsValue(Keys.KeyPageOnLongPress, false),
             pageTouchSlop = compatDsValue(Keys.PageTouchSlop, 0),
             sliderVibrator = compatDsValue(Keys.SliderVibrator, false),
+            useNewTocSheet = compatDsValue(Keys.UseNewTocSheet, true),
             selectVibrator = compatDsValue(Keys.SelectVibrator, false),
             autoChangeSource = compatDsValue(Keys.AutoChangeSource, true),
             autoSuggestDayNight = compatDsValue(Keys.AutoSuggestDayNight, false),
@@ -470,6 +474,7 @@ class ReadSettingsRepository(
         val KeyPageOnLongPress = booleanPreferencesKey(PreferKey.keyPageOnLongPress)
         val PageTouchSlop = intPreferencesKey(PreferKey.pageTouchSlop)
         val SliderVibrator = booleanPreferencesKey(PreferKey.sliderVibrator)
+        val UseNewTocSheet = booleanPreferencesKey(PreferKey.useNewTocSheet)
         val SelectVibrator = booleanPreferencesKey(PreferKey.selectVibrator)
         val AutoChangeSource = booleanPreferencesKey(PreferKey.autoChangeSource)
         val AutoSuggestDayNight = booleanPreferencesKey(PreferKey.autoSuggestDayNight)
@@ -584,6 +589,7 @@ internal fun ReadSettings.toGatewayPrefMap(): Map<String, Any?> = mapOf(
     PreferKey.keyPageOnLongPress to keyPageOnLongPress,
     PreferKey.pageTouchSlop to pageTouchSlop,
     PreferKey.sliderVibrator to sliderVibrator,
+    PreferKey.useNewTocSheet to useNewTocSheet,
     PreferKey.selectVibrator to selectVibrator,
     PreferKey.autoChangeSource to autoChangeSource,
     PreferKey.autoSuggestDayNight to autoSuggestDayNight,

app/src/main/java/io/legado/app/domain/model/settings/ReadSettings.kt

@@ -31,6 +31,7 @@ data class ReadSettings(
     val keyPageOnLongPress: Boolean = false,
     val pageTouchSlop: Int = 0,
     val sliderVibrator: Boolean = false,
+    val useNewTocSheet: Boolean = true,
     val selectVibrator: Boolean = false,
     val autoChangeSource: Boolean = true,
     val autoSuggestDayNight: Boolean = false,

app/src/main/java/io/legado/app/ui/book/read/ReadBookContract.kt

@@ -900,6 +900,8 @@ sealed interface ReadBookEffect {
     // Source actions
     data class ShowLogin(val sourceUrl: String) : ReadBookEffect
     data class OpenSourceEdit(val sourceUrl: String) : ReadBookEffect
+    data class OpenBookInfo(val name: String, val author: String, val bookUrl: String) : ReadBookEffect
+    data class OpenChapterList(val bookUrl: String) : ReadBookEffect
     data class OpenWebView(
         val title: String,
         val url: String,

app/src/main/java/io/legado/app/ui/book/read/ReadBookController.kt

@@ -1054,6 +1054,8 @@ class ReadBookController(
 
             // Launcher-dependent effects — handled by route layer, ignored here
             is ReadBookEffect.OpenSourceEdit,
+            is ReadBookEffect.OpenChapterList,
+            is ReadBookEffect.OpenBookInfo,
             is ReadBookEffect.OpenSearchActivity,
             is ReadBookEffect.ShowLogin,
             is ReadBookEffect.OpenWebView,

app/src/main/java/io/legado/app/ui/book/read/ReadBookRouteScreen.kt

@@ -58,6 +58,7 @@ import io.legado.app.ui.book.read.sheet.ReaderBookSheetRoute
 import io.legado.app.ui.book.read.sheet.TextSelectMenuConfigSheet
 import io.legado.app.ui.book.searchContent.SearchContentResult
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
+import io.legado.app.ui.book.toc.TocActivityResult
 import io.legado.app.ui.browser.WebViewActivity
 import io.legado.app.ui.login.SourceLoginActivity
 import io.legado.app.ui.replace.ReplaceEditRoute
@@ -181,6 +182,11 @@ fun ReadBookRouteScreen(
             viewModel.onIntent(ReadBookIntent.SourceEditResult)
         }
     }
+    val tocLauncher = rememberLauncherForActivityResult(TocActivityResult()) { result ->
+        result?.let { (index, chapterPos, _) ->
+            viewModel.onIntent(ReadBookIntent.OpenChapterResult(index, chapterPos))
+        }
+    }
 
     val replaceLauncher = rememberLauncherForActivityResult(
         ActivityResultContracts.StartActivityForResult()
@@ -319,6 +325,16 @@ fun ReadBookRouteScreen(
                             is ReadBookEffect.OpenSourceEdit -> {
                                 sourceEditLauncher.launch { putExtra("sourceUrl", effect.sourceUrl) }
                             }
+                            is ReadBookEffect.OpenChapterList -> {
+                                tocLauncher.launch(effect.bookUrl)
+                            }
+                            is ReadBookEffect.OpenBookInfo -> {
+                                bookInfoLauncher.launch {
+                                    putExtra("name", effect.name)
+                                    putExtra("author", effect.author)
+                                    putExtra("bookUrl", effect.bookUrl)
+                                }
+                            }
                             is ReadBookEffect.ShowLogin -> {
                                 context.startActivity(
                                     Intent(context, SourceLoginActivity::class.java).apply {

app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -667,25 +667,40 @@ class ReadBookViewModel(
             is ReadBookIntent.OpenBookInfo -> {
                 if (ReadBook.book != null) {
                     closeReadMenu()
-                    _uiState.update {
-                        it.copy(
-                            activeSheet = ReadBookSheet.BookNavigation(
-                                io.legado.app.ui.book.read.sheet.ReaderBookSheetTab.Information
+                    if (readSettingsRepository.currentSettings.useNewTocSheet) {
+                        _uiState.update {
+                            it.copy(
+                                activeSheet = ReadBookSheet.BookNavigation(
+                                    io.legado.app.ui.book.read.sheet.ReaderBookSheetTab.Information
+                                )
                             )
-                        )
+                        }
+                    } else{
+                        ReadBook.book?.let { book ->
+                            _effects.tryEmit(ReadBookEffect.OpenBookInfo(book.name, book.author, book.bookUrl))
+                        }
                     }
+
                 }
             }
             is ReadBookIntent.OpenChapterList -> {
                 if (ReadBook.book != null) {
                     closeReadMenu()
-                    _uiState.update { state ->
-                        state.copy(
-                            activeSheet = ReadBookSheet.BookNavigation(
-                                io.legado.app.ui.book.read.sheet.ReaderBookSheetTab.Toc
+                    if (readSettingsRepository.currentSettings.useNewTocSheet)
+                    {
+                        _uiState.update { state ->
+                            state.copy(
+                                activeSheet = ReadBookSheet.BookNavigation(
+                                    io.legado.app.ui.book.read.sheet.ReaderBookSheetTab.Toc
+                                )
                             )
-                        )
+                        }
+                    }else{
+                        ReadBook.book?.bookUrl?.let { bookUrl ->
+                            _effects.tryEmit(ReadBookEffect.OpenChapterList(bookUrl))
+                        }
                     }
+
                 }
             }
             is ReadBookIntent.OpenChapterUrl -> openChapterUrl()

app/src/main/java/io/legado/app/ui/config/readConfig/ReadConfig.kt

@@ -76,6 +76,7 @@ object ReadConfig {
     val volumeKeyPageOnPlay get() = read.volumeKeyPageOnPlay
     val keyPageOnLongPress get() = read.keyPageOnLongPress
     val sliderVibrator get() = read.sliderVibrator
+    val useNewTocSheet get() = read.useNewTocSheet
     val selectVibrator get() = read.selectVibrator
 
     val speechRatePlay get() = if (aloud.ttsFollowSys) 5 else aloud.ttsSpeechRate

app/src/main/java/io/legado/app/ui/config/readConfig/ReadConfigContract.kt

@@ -32,6 +32,7 @@ data class ReadConfigUiState(
     val keyPageOnLongPress: Boolean = false,
     val pageTouchSlop: Int = 0,
     val sliderVibrator: Boolean = false,
+    val useNewTocSheet: Boolean = true,
     val selectVibrator: Boolean = false,
     val autoChangeSource: Boolean = true,
     val autoSuggestDayNight: Boolean = false,
@@ -92,6 +93,7 @@ sealed interface ReadConfigIntent {
     data class KeyPageOnLongPressChanged(val value: Boolean) : ReadConfigIntent
     data class PageTouchSlopChanged(val value: Int) : ReadConfigIntent
     data class SliderVibratorChanged(val value: Boolean) : ReadConfigIntent
+    data class UseNewTocSheetChanged(val value: Boolean) : ReadConfigIntent
     data class SelectVibratorChanged(val value: Boolean) : ReadConfigIntent
     data class AutoChangeSourceChanged(val value: Boolean) : ReadConfigIntent
     data class SelectTextChanged(val value: Boolean) : ReadConfigIntent

app/src/main/java/io/legado/app/ui/config/readConfig/ReadConfigScreen.kt

@@ -297,6 +297,14 @@ fun ReadConfigScreen(
                     }
                 )
 
+                SwitchSettingItem(
+                    title = stringResource(R.string.use_new_toc_sheet),
+                    checked = settings.useNewTocSheet,
+                    onCheckedChange = {
+                        onIntent(ReadConfigIntent.UseNewTocSheetChanged(it))
+                    }
+                )
+
                 SwitchSettingItem(
                     title = stringResource(R.string.enable_select_vibrator),
                     checked = settings.selectVibrator,

app/src/main/java/io/legado/app/ui/config/readConfig/ReadConfigViewModel.kt

@@ -129,6 +129,7 @@ private fun ReadConfigIntent.toSettingsTransform(): (ReadSettings) -> ReadSettin
     is ReadConfigIntent.KeyPageOnLongPressChanged -> { settings -> settings.copy(keyPageOnLongPress = value) }
     is ReadConfigIntent.PageTouchSlopChanged -> { settings -> settings.copy(pageTouchSlop = value) }
     is ReadConfigIntent.SliderVibratorChanged -> { settings -> settings.copy(sliderVibrator = value) }
+    is ReadConfigIntent.UseNewTocSheetChanged -> { settings -> settings.copy(useNewTocSheet = value) }
     is ReadConfigIntent.SelectVibratorChanged -> { settings -> settings.copy(selectVibrator = value) }
     is ReadConfigIntent.AutoChangeSourceChanged -> { settings -> settings.copy(autoChangeSource = value) }
     is ReadConfigIntent.AutoSuggestDayNightChanged -> { settings -> settings.copy(autoSuggestDayNight = value) }
@@ -196,6 +197,7 @@ private fun ReadSettings.toUiState(
         keyPageOnLongPress = keyPageOnLongPress,
         pageTouchSlop = pageTouchSlop,
         sliderVibrator = sliderVibrator,
+        useNewTocSheet = useNewTocSheet,
         selectVibrator = selectVibrator,
         autoChangeSource = autoChangeSource,
         autoSuggestDayNight = autoSuggestDayNight,

app/src/main/res/values-zh-rCN/strings.xml

@@ -1755,6 +1755,7 @@
     <string name="cover_show_stroke">显示字体描边</string>
     <string name="default_color">使用默认字体颜色</string>
     <string name="enable_slider_vibrator">滑动进度条时震动</string>
+    <string name="use_new_toc_sheet">使用新版目录</string>
     <string name="edit_remark">编辑备注</string>
     <string name="book_remark">书籍备注</string>
     <string name="save_to_local">保存至本地</string>

app/src/main/res/values/strings.xml

@@ -1814,6 +1814,7 @@
     <string name="cover_show_stroke">Show Font Stroke</string>
     <string name="default_color">Use Default Font Color</string>
     <string name="enable_slider_vibrator">Vibrate While Sliding Progress Bar</string>
+    <string name="use_new_toc_sheet">Use New TOC Sheet</string>
     <string name="edit_remark">Edit remark</string>
     <string name="book_remark">Book Alias</string>
     <string name="save_to_local">Save to local</string>