Merge branch 'main' of https://github.com/wangz-code/legado-tts

Author: wangz-code

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

@@ -164,6 +164,7 @@ object PreferKey {
     const val streamReadAloudAudio = "streamReadAloudAudio"
     const val pauseReadAloudWhilePhoneCalls = "pauseReadAloudWhilePhoneCalls"
     const val readAloudByMediaButton = "readAloudByMediaButton"
+    const val readAloudLoopChapter = "readAloudLoopChapter"
     const val showMangaUi = "showMangaUi"
     const val disableMangaScale = "disableMangaScale"
     const val paddingDisplayCutouts = "paddingDisplayCutouts"

app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@@ -123,6 +123,7 @@ abstract class BaseReadAloudService : BaseService(),
     private var needResumeOnAudioFocusGain = false
     private var needResumeOnCallStateIdle = false
     private var registeredPhoneStateListener = false
+    private var manualNextChapter = false
     private var dsJob: Job? = null
     private var upNotificationJob: Coroutine<*>? = null
     private var cover: Bitmap =
@@ -220,7 +221,10 @@ abstract class BaseReadAloudService : BaseService(),
             IntentAction.prevParagraph -> prevP()
             IntentAction.nextParagraph -> nextP()
             IntentAction.prev -> prevChapter()
-            IntentAction.next -> nextChapter()
+            IntentAction.next -> {
+                manualNextChapter = true
+                nextChapter()
+            }
             IntentAction.addTimer -> addTimer()
             IntentAction.setTimer -> setTimer(intent.getIntExtra("minute", 0))
             IntentAction.stop -> stopSelf()
@@ -477,6 +481,7 @@ abstract class BaseReadAloudService : BaseService(),
 
                 override fun onSkipToNext() {
                     if (getPrefBoolean("mediaButtonPerNext", false)) {
+                        manualNextChapter = true
                         nextChapter()
                     } else {
                         nextP()
@@ -682,6 +687,12 @@ abstract class BaseReadAloudService : BaseService(),
     }
 
     open fun nextChapter() {
+        if (!manualNextChapter && getPrefBoolean(PreferKey.readAloudLoopChapter, false)) {
+            manualNextChapter = false
+            loopCurrentChapter()
+            return
+        }
+        manualNextChapter = false
         ReadBook.upReadTime()
         AppLog.putDebug("${ReadBook.curTextChapter?.chapter?.title} 朗读结束跳转下一章并朗读")
         play()
@@ -690,6 +701,13 @@ abstract class BaseReadAloudService : BaseService(),
         }
     }
 
+    private fun loopCurrentChapter() {
+        ReadBook.upReadTime()
+        AppLog.putDebug("${ReadBook.curTextChapter?.chapter?.title} 朗读结束，循环当前章节")
+        playStop()
+        ReadBook.setPageIndex(0)
+    }
+
     private fun initPhoneStateListener() {
         val needRegister = AppConfig.ignoreAudioFocus && AppConfig.pauseReadAloudWhilePhoneCalls
         if (needRegister && registeredPhoneStateListener) {

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

@@ -1188,6 +1188,8 @@
     <string name="read_aloud_read_phone_state_permission_rationale">阅读需要读取手机状态实现来电期间暂停朗读功能</string>
     <string name="read_aloud_by_media_button_title">耳机按键启动朗读</string>
     <string name="read_aloud_by_media_button_summary">通过耳机按键来启动朗读</string>
+    <string name="read_aloud_loop_chapter">循环当前章节</string>
+    <string name="read_aloud_loop_chapter_summary">朗读到章节结尾后，从本章开头继续朗读</string>
     <string name="show_same_source">显示重复书源</string>
     <string name="theme_config">主题配置</string>
     <string name="show_manga_ui">漫画浏览</string>

app/src/main/res/xml/pref_config_aloud.xml

@@ -48,6 +48,13 @@
             android:key="readAloudByPage"
             app:iconSpaceReserved="false" />
 
+        <io.legado.app.lib.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:title="@string/read_aloud_loop_chapter"
+            android:summary="@string/read_aloud_loop_chapter_summary"
+            android:key="readAloudLoopChapter"
+            app:iconSpaceReserved="false" />
+
         <io.legado.app.lib.prefs.SwitchPreference
             android:defaultValue="false"
             android:title="@string/stream_read_aloud_audio"
@@ -69,4 +76,4 @@
 
     </io.legado.app.lib.prefs.PreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>