Fix TTS in a fixed-layout EPUB (#555)

readium · Aug 13, 2024 · 6ea996f · 6ea996f
1 parent 7c08d29
commit 6ea996f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. Take a look
 #### Navigator
 
 * Fixed computing the total progression of audiobook locators.
+* Fixed starting the TTS from the current resource in a fixed-layout EPUB.
 
 
 ## [3.0.0-beta.2]

diff --git a/readium/navigator/src/main/java/org/readium/r2/navigator/epub/EpubNavigatorFragment.kt b/readium/navigator/src/main/java/org/readium/r2/navigator/epub/EpubNavigatorFragment.kt
@@ -1008,12 +1008,19 @@ public class EpubNavigatorFragment internal constructor(
     override suspend fun firstVisibleElementLocator(): Locator? {
         if (!::resourcePager.isInitialized) return null
 
-        val resource = readingOrder[resourcePager.currentItem]
-        return currentReflowablePageFragment?.webView?.findFirstVisibleLocator()
-            ?.copy(
-                href = resource.url(),
-                mediaType = resource.mediaType ?: MediaType.XHTML
-            )
+        return when (viewModel.layout) {
+            EpubLayout.FIXED ->
+                currentLocator.value
+
+            EpubLayout.REFLOWABLE -> {
+                val resource = readingOrder[resourcePager.currentItem]
+                currentReflowablePageFragment?.webView?.findFirstVisibleLocator()
+                    ?.copy(
+                        href = resource.url(),
+                        mediaType = resource.mediaType ?: MediaType.XHTML
+                    )
+            }
+        }
     }
 
     /**