Compare commits

..

11 Commits

Author SHA1 Message Date
BookOasis Reader c622f74c62 Preview text reader margins while dragging
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-29 10:06:10 +09:00
BookOasis Reader 95b1199f1d Add adjustable text reader side margins
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-29 08:16:09 +09:00
BookOasis Reader eca7a3b886 Move floating TTS controls above reader menu
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-27 17:03:29 +09:00
BookOasis Reader ba1b4d2362 Add floating TTS stop control
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-27 14:23:06 +09:00
BookOasis Reader 023c3bb2f1 Resume paused TTS by source position
Build & Test / Build & Test App (push) Has been cancelled
2026-09-27 14:14:59 +09:00
BookOasis Reader aec03c6c71 Keep manual reader position while TTS is paused
Build & Test / Build & Test App (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-27 09:00:49 +09:00
BookOasis Reader c9c119689d Show floating TTS control only in text reader
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-27 01:11:17 +09:00
BookOasis Reader 38a327cdf6 Improve TTS highlight contrast
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-27 00:55:01 +09:00
BookOasis Reader b25679c8de Resume TTS from current reader position
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-27 00:36:30 +09:00
BookOasis Reader dfd57544a9 Improve TTS highlighting and download detection
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-26 21:56:54 +09:00
BookOasis Reader 3a5a4c0fb2 Apply TTS setting changes during playback
Build & Test / Build & Test App (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
2026-09-26 21:31:28 +09:00
14 changed files with 705 additions and 88 deletions
@@ -2,6 +2,8 @@ package eu.kanade.presentation.reader.settings
import android.content.Intent import android.content.Intent
import android.speech.tts.TextToSpeech import android.speech.tts.TextToSpeech
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChip
@@ -34,6 +36,14 @@ private val fontFamilies = listOf(
@Composable @Composable
internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) { internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
val context = LocalContext.current val context = LocalContext.current
val ttsSettingsLauncher = rememberLauncherForActivityResult(
ActivityResultContracts.StartActivityForResult(),
) {
ReaderTtsController.refreshVoiceSettings(
context,
viewModel.preferences.textTtsEnginePackage.get(),
)
}
val fontSizePref = viewModel.preferences.textFontSize val fontSizePref = viewModel.preferences.textFontSize
val fontSize by fontSizePref.collectAsState() val fontSize by fontSizePref.collectAsState()
@@ -80,6 +90,21 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
pillColor = MaterialTheme.colorScheme.surfaceContainerHighest, pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
) )
val horizontalMarginPref = viewModel.preferences.textHorizontalMargin
val horizontalMargin by horizontalMarginPref.collectAsState()
SliderItem(
label = stringResource(MR.strings.pref_text_reader_horizontal_margin),
value = horizontalMargin,
valueRange = 0..64,
steps = 15,
valueString = "$horizontalMargin dp",
onChange = { value ->
horizontalMarginPref.set(value)
viewModel.previewAndRequestTextSettingsReload()
},
pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
)
val fontFamilyPref = viewModel.preferences.textFontFamily val fontFamilyPref = viewModel.preferences.textFontFamily
val fontFamily by fontFamilyPref.collectAsState() val fontFamily by fontFamilyPref.collectAsState()
SettingsChipRow(MR.strings.pref_text_reader_font_family) { SettingsChipRow(MR.strings.pref_text_reader_font_family) {
@@ -130,18 +155,27 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
SettingsChipRow(MR.strings.pref_text_reader_tts_engine) { SettingsChipRow(MR.strings.pref_text_reader_tts_engine) {
FilterChip( FilterChip(
selected = selectedEngine == ReaderTtsService.AUTO_ENGINE, selected = selectedEngine == ReaderTtsService.AUTO_ENGINE,
onClick = { enginePref.set(ReaderTtsService.AUTO_ENGINE) }, onClick = {
enginePref.set(ReaderTtsService.AUTO_ENGINE)
ReaderTtsController.setEngine(context, ReaderTtsService.AUTO_ENGINE)
},
label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_auto)) }, label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_auto)) },
) )
FilterChip( FilterChip(
selected = selectedEngine == ReaderTtsService.SYSTEM_DEFAULT_ENGINE, selected = selectedEngine == ReaderTtsService.SYSTEM_DEFAULT_ENGINE,
onClick = { enginePref.set(ReaderTtsService.SYSTEM_DEFAULT_ENGINE) }, onClick = {
enginePref.set(ReaderTtsService.SYSTEM_DEFAULT_ENGINE)
ReaderTtsController.setEngine(context, ReaderTtsService.SYSTEM_DEFAULT_ENGINE)
},
label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_system)) }, label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_system)) },
) )
installedEngines.forEach { (packageName, label) -> installedEngines.forEach { (packageName, label) ->
FilterChip( FilterChip(
selected = selectedEngine == packageName, selected = selectedEngine == packageName,
onClick = { enginePref.set(packageName) }, onClick = {
enginePref.set(packageName)
ReaderTtsController.setEngine(context, packageName)
},
label = { Text(label) }, label = { Text(label) },
) )
} }
@@ -150,7 +184,7 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
TextButton( TextButton(
onClick = { onClick = {
runCatching { runCatching {
context.startActivity(Intent("com.android.settings.TTS_SETTINGS")) ttsSettingsLauncher.launch(Intent("com.android.settings.TTS_SETTINGS"))
} }
}, },
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(horizontal = 16.dp),
@@ -95,7 +95,7 @@ class DownloadCache(
.stateIn(scope, SharingStarted.WhileSubscribed(), false) .stateIn(scope, SharingStarted.WhileSubscribed(), false)
private val diskCacheFile: File private val diskCacheFile: File
get() = File(context.cacheDir, "dl_index_cache_v3") get() = File(context.cacheDir, "dl_index_cache_v4")
private val rootDownloadsDirMutex = Mutex() private val rootDownloadsDirMutex = Mutex()
private var rootDownloadsDir = RootDirectory(storageManager.getDownloadsDirectory()) private var rootDownloadsDir = RootDirectory(storageManager.getDownloadsDirectory())
@@ -214,7 +214,8 @@ class DownloadManager(
mangaTitle: String, mangaTitle: String,
source: Source, source: Source,
): Boolean { ): Boolean {
return provider.findChapterDir(chapterName, chapterScanlator, chapterUrl, mangaTitle, source) != null return provider.findChapterDir(chapterName, chapterScanlator, chapterUrl, mangaTitle, source) != null ||
provider.findChapterDocument(chapterName, chapterScanlator, chapterUrl, mangaTitle, source) != null
} }
/** /**
@@ -253,8 +254,8 @@ class DownloadManager(
removeFromDownloadQueue(filteredChapters) removeFromDownloadQueue(filteredChapters)
val (mangaDir, chapterDirs) = provider.findChapterDirs(filteredChapters, manga, source) val (mangaDir, chapterDownloads) = provider.findChapterDirs(filteredChapters, manga, source)
chapterDirs.forEach { it.delete() } chapterDownloads.forEach { it.delete() }
cache.removeChapters(filteredChapters, manga) cache.removeChapters(filteredChapters, manga)
// Delete manga directory if empty // Delete manga directory if empty
@@ -149,11 +149,8 @@ class DownloadProvider(
} }
/** /**
* Returns a list of downloaded directories for the chapters that exist. * Returns downloaded chapter entries that exist, including image directories,
* * CBZ files and standalone EPUB/TXT document files.
* @param chapters the chapters to query.
* @param manga the manga of the chapter.
* @param source the source of the chapter.
*/ */
fun findChapterDirs(chapters: List<Chapter>, manga: Manga, source: Source): Pair<UniFile?, List<UniFile>> { fun findChapterDirs(chapters: List<Chapter>, manga: Manga, source: Source): Pair<UniFile?, List<UniFile>> {
val mangaDir = findMangaDir(manga.title, source) ?: return null to emptyList() val mangaDir = findMangaDir(manga.title, source) ?: return null to emptyList()
@@ -161,6 +158,13 @@ class DownloadProvider(
getValidChapterDirNames(chapter.name, chapter.scanlator, chapter.url).asSequence() getValidChapterDirNames(chapter.name, chapter.scanlator, chapter.url).asSequence()
.mapNotNull { mangaDir.findFile(it) } .mapNotNull { mangaDir.findFile(it) }
.firstOrNull() .firstOrNull()
?: findChapterDocument(
chapter.name,
chapter.scanlator,
chapter.url,
manga.title,
source,
)
} }
} }
@@ -20,13 +20,22 @@ import android.view.WindowManager
import android.widget.Toast import android.widget.Toast
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
@@ -34,6 +43,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import androidx.core.graphics.Insets import androidx.core.graphics.Insets
@@ -271,6 +281,7 @@ class ReaderActivity : BaseActivity() {
private fun ReaderActivityBinding.setComposeOverlay(): Unit = composeOverlay.setComposeContent { private fun ReaderActivityBinding.setComposeOverlay(): Unit = composeOverlay.setComposeContent {
val state by viewModel.state.collectAsState() val state by viewModel.state.collectAsState()
val showPageNumber by readerPreferences.showPageNumber.collectAsState() val showPageNumber by readerPreferences.showPageNumber.collectAsState()
val ttsState by ReaderTtsController.state.collectAsState()
val settingsviewModel = remember { val settingsviewModel = remember {
ReaderSettingsViewModel( ReaderSettingsViewModel(
readerState = viewModel.state, readerState = viewModel.state,
@@ -296,6 +307,59 @@ class ReaderActivity : BaseActivity() {
ContentOverlay(state = state) ContentOverlay(state = state)
AppBars(state = state) AppBars(state = state)
val showFloatingTts = ttsState.active &&
ttsState.readerChapterId == state.currentChapter?.chapter?.id &&
state.currentChapter?.pages?.any { it is TextReaderPage } == true
if (showFloatingTts) {
val floatingTtsBottomPadding by animateDpAsState(
targetValue = if (state.menuVisible) 144.dp else 72.dp,
animationSpec = tween(durationMillis = 200),
label = "floatingTtsBottomPadding",
)
Row(
modifier = Modifier
.align(Alignment.BottomEnd)
.navigationBarsPadding()
.padding(end = 18.dp, bottom = floatingTtsBottomPadding),
horizontalArrangement = Arrangement.spacedBy(10.dp),
) {
IconButton(
onClick = ::toggleTts,
modifier = Modifier
.size(52.dp)
.background(
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.55f),
shape = CircleShape,
),
) {
Icon(
painter = painterResource(
if (ttsState.playing) R.drawable.ic_pause_24dp else R.drawable.ic_play_arrow_24dp,
),
contentDescription = stringResource(
if (ttsState.playing) MR.strings.reader_tts_pause else MR.strings.reader_tts_start,
),
tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.92f),
)
}
IconButton(
onClick = { ReaderTtsController.stop(this@ReaderActivity) },
modifier = Modifier
.size(52.dp)
.background(
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.55f),
shape = CircleShape,
),
) {
Icon(
painter = painterResource(R.drawable.ic_stop_24dp),
contentDescription = stringResource(MR.strings.reader_tts_stop),
tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.92f),
)
}
}
}
} }
val onDismissRequest = viewModel::closeDialog val onDismissRequest = viewModel::closeDialog
@@ -701,7 +765,21 @@ class ReaderActivity : BaseActivity() {
val ttsState = ReaderTtsController.state.value val ttsState = ReaderTtsController.state.value
if (ttsState.active && ttsState.readerChapterId == chapterId) { if (ttsState.active && ttsState.readerChapterId == chapterId) {
ReaderTtsController.toggle(this) if (ttsState.playing) {
ReaderTtsController.toggle(this)
} else {
val currentPage = chapter.pages
?.getOrNull((state.currentPage - 1).coerceAtLeast(0)) as? TextReaderPage
if (currentPage != null) {
ReaderTtsController.resumeFromSource(
context = this,
documentIndex = currentPage.anchor.documentIndex,
sourceOffset = currentPage.anchor.startOffset,
)
} else {
ReaderTtsController.toggle(this)
}
}
return return
} }
@@ -751,11 +829,16 @@ class ReaderActivity : BaseActivity() {
val textPages = chapter.pages?.filterIsInstance<TextReaderPage>().orEmpty() val textPages = chapter.pages?.filterIsInstance<TextReaderPage>().orEmpty()
if (textPages.isEmpty()) return if (textPages.isEmpty()) return
val targetPage = if (ttsState.sourceHighlightStart >= 0L) { val targetSourceOffset = when {
ttsState.sourceHighlightStart >= 0L -> ttsState.sourceHighlightStart
ttsState.sourceSentenceStart >= 0L -> ttsState.sourceSentenceStart
else -> -1L
}
val targetPage = if (targetSourceOffset >= 0L) {
textPages.firstOrNull { page -> textPages.firstOrNull { page ->
page.anchor.documentIndex == ttsState.documentIndex && page.anchor.documentIndex == ttsState.documentIndex &&
ttsState.sourceHighlightStart >= page.anchor.startOffset && targetSourceOffset >= page.anchor.startOffset &&
ttsState.sourceHighlightStart < page.anchor.endOffsetExclusive targetSourceOffset < page.anchor.endOffsetExclusive
} }
} else { } else {
chapter.pages?.getOrNull(ttsState.readerPageIndex) as? TextReaderPage chapter.pages?.getOrNull(ttsState.readerPageIndex) as? TextReaderPage
@@ -765,25 +848,42 @@ class ReaderActivity : BaseActivity() {
ttsHighlightedPage?.clearTtsHighlight() ttsHighlightedPage?.clearTtsHighlight()
} }
val sentenceStart = maxOf(ttsState.sourceSentenceStart, targetPage.anchor.startOffset)
val sentenceEnd = minOf(ttsState.sourceSentenceEndExclusive, targetPage.anchor.endOffsetExclusive)
val activeStart = maxOf(ttsState.sourceHighlightStart, targetPage.anchor.startOffset)
val activeEnd = minOf(ttsState.sourceHighlightEndExclusive, targetPage.anchor.endOffsetExclusive)
if ( if (
ttsState.sourceHighlightStart >= 0L && ttsState.sourceSentenceStart >= 0L &&
ttsState.sourceHighlightEndExclusive > ttsState.sourceHighlightStart ttsState.sourceSentenceEndExclusive > ttsState.sourceSentenceStart &&
sentenceEnd > sentenceStart
) { ) {
val start = maxOf(ttsState.sourceHighlightStart, targetPage.anchor.startOffset)
val end = minOf(ttsState.sourceHighlightEndExclusive, targetPage.anchor.endOffsetExclusive)
targetPage.updateTtsHighlight( targetPage.updateTtsHighlight(
start = (start - targetPage.anchor.startOffset).toInt(), sentenceStart = (sentenceStart - targetPage.anchor.startOffset).toInt(),
endExclusive = (end - targetPage.anchor.startOffset).toInt(), sentenceEndExclusive = (sentenceEnd - targetPage.anchor.startOffset).toInt(),
activeStart = if (activeEnd > activeStart) {
(activeStart - targetPage.anchor.startOffset).toInt()
} else {
-1
},
activeEndExclusive = if (activeEnd > activeStart) {
(activeEnd - targetPage.anchor.startOffset).toInt()
} else {
-1
},
) )
} else { } else {
targetPage.clearTtsHighlight() targetPage.clearTtsHighlight()
} }
ttsHighlightedPage = targetPage ttsHighlightedPage = targetPage
if (state.currentPage != targetPage.index + 1) { val targetPageIsVisible = state.currentPage == targetPage.index + 1
if (ttsState.playing && !targetPageIsVisible) {
moveToPageIndex(targetPage.index) moveToPageIndex(targetPage.index)
} }
state.viewer?.refreshCurrentPage() if (ttsState.playing || targetPageIsVisible) {
state.viewer?.refreshCurrentPage()
}
} }
/** /**
@@ -11,6 +11,7 @@ import android.text.SpannableString
import android.text.StaticLayout import android.text.StaticLayout
import android.text.TextPaint import android.text.TextPaint
import android.text.style.BackgroundColorSpan import android.text.style.BackgroundColorSpan
import android.text.style.ForegroundColorSpan
import android.text.style.LineHeightSpan import android.text.style.LineHeightSpan
import eu.kanade.tachiyomi.ui.reader.setting.TextReaderStyle import eu.kanade.tachiyomi.ui.reader.setting.TextReaderStyle
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
@@ -26,7 +27,7 @@ internal data class PaginatedTextPage(
) )
internal object TextPageRenderer { internal object TextPageRenderer {
private const val MARGIN_DP = 32f private const val VERTICAL_MARGIN_DP = 32f
private const val STREAM_BUFFER_CHARS = 64 * 1024 private const val STREAM_BUFFER_CHARS = 64 * 1024
private const val STREAM_READ_CHARS = 8 * 1024 private const val STREAM_READ_CHARS = 8 * 1024
@@ -158,7 +159,8 @@ internal object TextPageRenderer {
fun render( fun render(
text: String, text: String,
style: TextReaderStyle, style: TextReaderStyle,
highlightRange: IntRange? = null, sentenceHighlightRange: IntRange? = null,
activeHighlightRange: IntRange? = null,
): InputStream { ): InputStream {
val metrics = resolveLayoutMetrics(style) val metrics = resolveLayoutMetrics(style)
val bitmap = Bitmap.createBitmap(metrics.pageWidth, metrics.pageHeight, Bitmap.Config.ARGB_8888) val bitmap = Bitmap.createBitmap(metrics.pageWidth, metrics.pageHeight, Bitmap.Config.ARGB_8888)
@@ -167,7 +169,13 @@ internal object TextPageRenderer {
canvas.drawColor(backgroundColor) canvas.drawColor(backgroundColor)
canvas.save() canvas.save()
canvas.translate(metrics.horizontalMargin.toFloat(), metrics.verticalMargin.toFloat()) canvas.translate(metrics.horizontalMargin.toFloat(), metrics.verticalMargin.toFloat())
createLayout(text, style, metrics.contentWidth, highlightRange).draw(canvas) createLayout(
text = text,
style = style,
contentWidth = metrics.contentWidth,
sentenceHighlightRange = sentenceHighlightRange,
activeHighlightRange = activeHighlightRange,
).draw(canvas)
canvas.restore() canvas.restore()
val output = ByteArrayOutputStream() val output = ByteArrayOutputStream()
@@ -180,7 +188,8 @@ internal object TextPageRenderer {
text: String, text: String,
style: TextReaderStyle, style: TextReaderStyle,
contentWidth: Int, contentWidth: Int,
highlightRange: IntRange? = null, sentenceHighlightRange: IntRange? = null,
activeHighlightRange: IntRange? = null,
): StaticLayout { ): StaticLayout {
val (_, textColor) = resolveColors(style) val (_, textColor) = resolveColors(style)
val paint = TextPaint().apply { val paint = TextPaint().apply {
@@ -191,7 +200,12 @@ internal object TextPageRenderer {
?.let { Typeface.create(it, Typeface.NORMAL) } ?.let { Typeface.create(it, Typeface.NORMAL) }
?: Typeface.DEFAULT ?: Typeface.DEFAULT
} }
val styledText = addTextSpans(text, style, highlightRange) val styledText = addTextSpans(
text = text,
style = style,
sentenceHighlightRange = sentenceHighlightRange,
activeHighlightRange = activeHighlightRange,
)
return StaticLayout.Builder return StaticLayout.Builder
.obtain(styledText, 0, styledText.length, paint, contentWidth) .obtain(styledText, 0, styledText.length, paint, contentWidth)
.setAlignment(Layout.Alignment.ALIGN_NORMAL) .setAlignment(Layout.Alignment.ALIGN_NORMAL)
@@ -206,9 +220,12 @@ internal object TextPageRenderer {
private fun resolveLayoutMetrics(style: TextReaderStyle): LayoutMetrics { private fun resolveLayoutMetrics(style: TextReaderStyle): LayoutMetrics {
val pageWidth = style.pageWidthPx.coerceAtLeast(1) val pageWidth = style.pageWidthPx.coerceAtLeast(1)
val pageHeight = style.pageHeightPx.coerceAtLeast(1) val pageHeight = style.pageHeightPx.coerceAtLeast(1)
val requestedMargin = (MARGIN_DP * style.density).roundToInt().coerceAtLeast(1) val requestedHorizontalMargin = (style.horizontalMarginDp * style.density)
val horizontalMargin = requestedMargin.coerceAtMost(((pageWidth - 1) / 2).coerceAtLeast(0)) .roundToInt()
val verticalMargin = requestedMargin.coerceAtMost(((pageHeight - 1) / 2).coerceAtLeast(0)) .coerceAtLeast(0)
val requestedVerticalMargin = (VERTICAL_MARGIN_DP * style.density).roundToInt().coerceAtLeast(1)
val horizontalMargin = requestedHorizontalMargin.coerceAtMost(((pageWidth - 1) / 2).coerceAtLeast(0))
val verticalMargin = requestedVerticalMargin.coerceAtMost(((pageHeight - 1) / 2).coerceAtLeast(0))
return LayoutMetrics( return LayoutMetrics(
pageWidth = pageWidth, pageWidth = pageWidth,
@@ -239,11 +256,13 @@ internal object TextPageRenderer {
private fun addTextSpans( private fun addTextSpans(
text: String, text: String,
style: TextReaderStyle, style: TextReaderStyle,
highlightRange: IntRange?, sentenceHighlightRange: IntRange?,
activeHighlightRange: IntRange?,
): CharSequence { ): CharSequence {
val needsParagraphSpacing = style.paragraphSpacingPx > 0 && '\n' in text val needsParagraphSpacing = style.paragraphSpacingPx > 0 && '\n' in text
val needsHighlight = highlightRange != null && !highlightRange.isEmpty() val needsSentenceHighlight = sentenceHighlightRange != null && !sentenceHighlightRange.isEmpty()
if (!needsParagraphSpacing && !needsHighlight) return text val needsActiveHighlight = activeHighlightRange != null && !activeHighlightRange.isEmpty()
if (!needsParagraphSpacing && !needsSentenceHighlight && !needsActiveHighlight) return text
val spannable = SpannableString(text) val spannable = SpannableString(text)
if (needsParagraphSpacing) { if (needsParagraphSpacing) {
@@ -258,26 +277,55 @@ internal object TextPageRenderer {
} }
} }
} }
if (needsHighlight) {
val start = highlightRange!!.first.coerceIn(0, text.length) val (_, baseTextColor) = resolveColors(style)
val endExclusive = (highlightRange.last + 1).coerceIn(start, text.length) val darkTheme = baseTextColor == Color.WHITE
if (start < endExclusive) { sentenceHighlightRange?.let { range ->
val highlightColor = if (resolveColors(style).first == Color.BLACK) { applyHighlightSpan(
Color.rgb(92, 82, 24) spannable = spannable,
} else { textLength = text.length,
Color.rgb(255, 245, 157) range = range,
} backgroundColor = if (darkTheme) Color.rgb(77, 66, 25) else Color.rgb(255, 243, 176),
spannable.setSpan( foregroundColor = if (darkTheme) Color.WHITE else Color.BLACK,
BackgroundColorSpan(highlightColor), )
start, }
endExclusive, activeHighlightRange?.let { range ->
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE, applyHighlightSpan(
) spannable = spannable,
} textLength = text.length,
range = range,
backgroundColor = if (darkTheme) Color.rgb(255, 193, 7) else Color.rgb(255, 179, 0),
foregroundColor = Color.BLACK,
)
} }
return spannable return spannable
} }
private fun applyHighlightSpan(
spannable: SpannableString,
textLength: Int,
range: IntRange,
backgroundColor: Int,
foregroundColor: Int,
) {
if (range.isEmpty()) return
val start = range.first.coerceIn(0, textLength)
val endExclusive = (range.last + 1).coerceIn(start, textLength)
if (start >= endExclusive) return
spannable.setSpan(
BackgroundColorSpan(backgroundColor),
start,
endExclusive,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
)
spannable.setSpan(
ForegroundColorSpan(foregroundColor),
start,
endExclusive,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
)
}
private class ParagraphSpacingSpan(private val spacing: Int) : LineHeightSpan { private class ParagraphSpacingSpan(private val spacing: Int) : LineHeightSpan {
override fun chooseHeight( override fun chooseHeight(
text: CharSequence?, text: CharSequence?,
@@ -31,10 +31,20 @@ internal class TextReaderPage(
private var style: TextReaderStyle = initialStyle private var style: TextReaderStyle = initialStyle
@Volatile @Volatile
private var highlightRange: IntRange? = null private var sentenceHighlightRange: IntRange? = null
@Volatile
private var activeHighlightRange: IntRange? = null
init { init {
stream = { TextPageRenderer.render(pageTextProvider(), style, highlightRange) } stream = {
TextPageRenderer.render(
text = pageTextProvider(),
style = style,
sentenceHighlightRange = sentenceHighlightRange,
activeHighlightRange = activeHighlightRange,
)
}
status = Page.State.Ready status = Page.State.Ready
} }
@@ -51,11 +61,26 @@ internal class TextReaderPage(
fun readText(): String = pageTextProvider() fun readText(): String = pageTextProvider()
fun updateTtsHighlight(start: Int, endExclusive: Int) { fun updateTtsHighlight(
highlightRange = if (start >= 0 && endExclusive > start) start until endExclusive else null sentenceStart: Int,
sentenceEndExclusive: Int,
activeStart: Int,
activeEndExclusive: Int,
) {
sentenceHighlightRange = if (sentenceStart >= 0 && sentenceEndExclusive > sentenceStart) {
sentenceStart until sentenceEndExclusive
} else {
null
}
activeHighlightRange = if (activeStart >= 0 && activeEndExclusive > activeStart) {
activeStart until activeEndExclusive
} else {
null
}
} }
fun clearTtsHighlight() { fun clearTtsHighlight() {
highlightRange = null sentenceHighlightRange = null
activeHighlightRange = null
} }
} }
@@ -120,6 +120,8 @@ class ReaderPreferences(
val textParagraphSpacing: Preference<Int> = preferenceStore.getInt("reader_text_paragraph_spacing", 4) val textParagraphSpacing: Preference<Int> = preferenceStore.getInt("reader_text_paragraph_spacing", 4)
val textHorizontalMargin: Preference<Int> = preferenceStore.getInt("reader_text_horizontal_margin", 32)
val textFontFamily: Preference<TextFontFamily> = preferenceStore.getEnum( val textFontFamily: Preference<TextFontFamily> = preferenceStore.getEnum(
"reader_text_font_family", "reader_text_font_family",
TextFontFamily.SYSTEM, TextFontFamily.SYSTEM,
@@ -161,6 +163,7 @@ class ReaderPreferences(
fontSize = textFontSize.get(), fontSize = textFontSize.get(),
lineSpacingPercent = textLineSpacing.get(), lineSpacingPercent = textLineSpacing.get(),
paragraphSpacing = textParagraphSpacing.get(), paragraphSpacing = textParagraphSpacing.get(),
horizontalMarginDp = textHorizontalMargin.get(),
fontFamily = textFontFamily.get(), fontFamily = textFontFamily.get(),
readerTheme = readerTheme.get(), readerTheme = readerTheme.get(),
automaticDark = (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == automaticDark = (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) ==
@@ -435,6 +438,7 @@ data class TextReaderStyle(
val fontSize: Int, val fontSize: Int,
val lineSpacingPercent: Int, val lineSpacingPercent: Int,
val paragraphSpacing: Int, val paragraphSpacing: Int,
val horizontalMarginDp: Int,
val fontFamily: ReaderPreferences.TextFontFamily, val fontFamily: ReaderPreferences.TextFontFamily,
val readerTheme: Int, val readerTheme: Int,
val automaticDark: Boolean, val automaticDark: Boolean,
@@ -51,6 +51,11 @@ class ReaderSettingsViewModel(
} }
} }
fun previewAndRequestTextSettingsReload() {
onTextSettingsPreview()
requestTextSettingsReload()
}
/** /**
* Theme-only changes do not affect page boundaries, so avoid an unnecessary * Theme-only changes do not affect page boundaries, so avoid an unnecessary
* full repagination. * full repagination.
@@ -14,6 +14,8 @@ object ReaderTtsController {
val readerChapterId: Long = -1L, val readerChapterId: Long = -1L,
val readerPageIndex: Int = -1, val readerPageIndex: Int = -1,
val documentIndex: Int = -1, val documentIndex: Int = -1,
val sourceSentenceStart: Long = -1L,
val sourceSentenceEndExclusive: Long = -1L,
val sourceHighlightStart: Long = -1L, val sourceHighlightStart: Long = -1L,
val sourceHighlightEndExclusive: Long = -1L, val sourceHighlightEndExclusive: Long = -1L,
) )
@@ -55,6 +57,20 @@ object ReaderTtsController {
) )
} }
fun resumeFromSource(
context: Context,
documentIndex: Int,
sourceOffset: Long,
) {
if (!state.value.active) return
context.startService(
Intent(context, ReaderTtsService::class.java)
.setAction(ReaderTtsService.ACTION_RESUME_FROM_SOURCE)
.putExtra(ReaderTtsService.EXTRA_DOCUMENT_INDEX, documentIndex)
.putExtra(ReaderTtsService.EXTRA_SOURCE_OFFSET, sourceOffset),
)
}
fun stop(context: Context) { fun stop(context: Context) {
if (!state.value.active) return if (!state.value.active) return
context.startService( context.startService(
@@ -70,4 +86,22 @@ object ReaderTtsController {
.putExtra(ReaderTtsService.EXTRA_SPEED, speed), .putExtra(ReaderTtsService.EXTRA_SPEED, speed),
) )
} }
fun setEngine(context: Context, enginePackage: String) {
if (!state.value.active) return
context.startService(
Intent(context, ReaderTtsService::class.java)
.setAction(ReaderTtsService.ACTION_SET_ENGINE)
.putExtra(ReaderTtsService.EXTRA_ENGINE_PACKAGE, enginePackage),
)
}
fun refreshVoiceSettings(context: Context, enginePackage: String) {
if (!state.value.active) return
context.startService(
Intent(context, ReaderTtsService::class.java)
.setAction(ReaderTtsService.ACTION_REFRESH_VOICE)
.putExtra(ReaderTtsService.EXTRA_ENGINE_PACKAGE, enginePackage),
)
}
} }
@@ -25,10 +25,17 @@ class ReaderTtsService : Service() {
private var sessionId: String? = null private var sessionId: String? = null
private var session: ReaderTtsSessionStore.SessionReader? = null private var session: ReaderTtsSessionStore.SessionReader? = null
private var pagePosition = 0 private var pagePosition = 0
private var currentPageText: String? = null private var pageSpeechStartOffset = 0
private var currentWindow: SpeechWindow? = null
private var currentSegments: List<Segment> = emptyList() private var currentSegments: List<Segment> = emptyList()
private var lookaheadConsumedChars: Map<Int, Int> = emptyMap()
private var segmentPosition = 0 private var segmentPosition = 0
private var segmentSpeechOffset = 0
private var currentUtteranceBaseOffset = 0
private var currentUtteranceId: String? = null
private var ttsGeneration = 0
private var playbackSpeed = DEFAULT_SPEED private var playbackSpeed = DEFAULT_SPEED
private var enginePreference = AUTO_ENGINE
private var readerChapterId = -1L private var readerChapterId = -1L
private var title = "Text reader" private var title = "Text reader"
private var subtitle: String? = null private var subtitle: String? = null
@@ -39,12 +46,21 @@ class ReaderTtsService : Service() {
when (intent?.action) { when (intent?.action) {
ACTION_START -> startSession(intent) ACTION_START -> startSession(intent)
ACTION_TOGGLE -> if (playing) pausePlayback() else resumePlayback() ACTION_TOGGLE -> if (playing) pausePlayback() else resumePlayback()
ACTION_RESUME_FROM_SOURCE -> resumeFromSource(
documentIndex = intent.getIntExtra(EXTRA_DOCUMENT_INDEX, -1),
sourceOffset = intent.getLongExtra(EXTRA_SOURCE_OFFSET, -1L),
)
ACTION_STOP -> stopPlayback() ACTION_STOP -> stopPlayback()
ACTION_SET_SPEED -> { ACTION_SET_SPEED -> {
playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, playbackSpeed).coerceIn(MIN_SPEED, MAX_SPEED) playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, playbackSpeed).coerceIn(MIN_SPEED, MAX_SPEED)
tts?.setSpeechRate(playbackSpeed) tts?.setSpeechRate(playbackSpeed)
if (playing && initialized) restartCurrentUtterance()
refreshNotification() refreshNotification()
} }
ACTION_SET_ENGINE, ACTION_REFRESH_VOICE -> {
val requestedEngine = intent.getStringExtra(EXTRA_ENGINE_PACKAGE).orEmpty()
reinitializeTts(requestedEngine)
}
} }
return START_NOT_STICKY return START_NOT_STICKY
} }
@@ -70,14 +86,20 @@ class ReaderTtsService : Service() {
title = intent.getStringExtra(EXTRA_TITLE).orEmpty().ifBlank { "Text reader" } title = intent.getStringExtra(EXTRA_TITLE).orEmpty().ifBlank { "Text reader" }
subtitle = intent.getStringExtra(EXTRA_SUBTITLE) subtitle = intent.getStringExtra(EXTRA_SUBTITLE)
playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, DEFAULT_SPEED).coerceIn(MIN_SPEED, MAX_SPEED) playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, DEFAULT_SPEED).coerceIn(MIN_SPEED, MAX_SPEED)
enginePreference = intent.getStringExtra(EXTRA_ENGINE_PACKAGE).orEmpty().ifBlank { AUTO_ENGINE }
val requestedPageIndex = intent.getIntExtra(EXTRA_START_PAGE_INDEX, 0) val requestedPageIndex = intent.getIntExtra(EXTRA_START_PAGE_INDEX, 0)
pagePosition = newSession.pages.indexOfFirst { it.readerPageIndex >= requestedPageIndex } pagePosition = newSession.pages.indexOfFirst { it.readerPageIndex >= requestedPageIndex }
.takeIf { it >= 0 } .takeIf { it >= 0 }
?: 0 ?: 0
currentPageText = null pageSpeechStartOffset = 0
currentWindow = null
currentSegments = emptyList() currentSegments = emptyList()
lookaheadConsumedChars = emptyMap()
segmentPosition = 0 segmentPosition = 0
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
currentUtteranceId = null
playing = false playing = false
initialized = false initialized = false
@@ -92,17 +114,23 @@ class ReaderTtsService : Service() {
), ),
) )
initializeTts(intent.getStringExtra(EXTRA_ENGINE_PACKAGE).orEmpty()) initializeTts(enginePreference, resumeAfterInit = true)
} }
private fun initializeTts(enginePreference: String) { private fun initializeTts(
requestedEnginePreference: String,
resumeAfterInit: Boolean,
) {
enginePreference = requestedEnginePreference.ifBlank { AUTO_ENGINE }
val engine = resolveEngine(enginePreference) val engine = resolveEngine(enginePreference)
val generation = ++ttsGeneration
val listener = TextToSpeech.OnInitListener { status -> val listener = TextToSpeech.OnInitListener { status ->
mainHandler.post { mainHandler.post {
if (generation != ttsGeneration) return@post
if (status != TextToSpeech.SUCCESS) { if (status != TextToSpeech.SUCCESS) {
if (engine != null) { if (engine != null) {
cleanupTts() cleanupTts()
initializeTts(SYSTEM_DEFAULT_ENGINE) initializeTts(SYSTEM_DEFAULT_ENGINE, resumeAfterInit)
} else { } else {
stopPlayback() stopPlayback()
} }
@@ -120,9 +148,9 @@ class ReaderTtsService : Service() {
) )
setOnUtteranceProgressListener(progressListener) setOnUtteranceProgressListener(progressListener)
} }
playing = true playing = resumeAfterInit
updatePlaybackState() updatePlaybackState(clearHighlight = false)
speakCurrentSegment() if (playing) speakCurrentSegment()
} }
} }
@@ -133,6 +161,24 @@ class ReaderTtsService : Service() {
} }
} }
private fun reinitializeTts(requestedEnginePreference: String) {
if (session == null) return
val resumeAfterInit = playing
currentUtteranceId = null
cleanupTts()
initializeTts(
requestedEnginePreference.ifBlank { enginePreference },
resumeAfterInit = resumeAfterInit,
)
}
private fun restartCurrentUtterance() {
if (!playing || !initialized) return
currentUtteranceId = null
tts?.stop()
speakCurrentSegment()
}
private fun resolveEngine(preference: String): String? { private fun resolveEngine(preference: String): String? {
if (preference == SYSTEM_DEFAULT_ENGINE) return null if (preference == SYSTEM_DEFAULT_ENGINE) return null
if (preference.isNotBlank() && preference != AUTO_ENGINE) return preference if (preference.isNotBlank() && preference != AUTO_ENGINE) return preference
@@ -162,33 +208,229 @@ class ReaderTtsService : Service() {
speakCurrentSegment() speakCurrentSegment()
} }
private fun resumeFromSource(
documentIndex: Int,
sourceOffset: Long,
) {
if (!initialized || documentIndex < 0 || sourceOffset < 0L) return
val session = session ?: return
val exactPosition = session.pages.indexOfFirst { entry ->
entry.documentIndex == documentIndex &&
sourceOffset >= entry.sourceStartOffset &&
sourceOffset < entry.sourceEndOffsetExclusive
}
val nextPosition = if (exactPosition < 0) {
session.pages.indexOfFirst { entry ->
entry.documentIndex == documentIndex && entry.sourceStartOffset >= sourceOffset
}
} else {
-1
}
val previousPosition = if (exactPosition < 0 && nextPosition < 0) {
session.pages.indexOfLast { entry ->
entry.documentIndex == documentIndex && entry.sourceStartOffset <= sourceOffset
}
} else {
-1
}
val newPagePosition = when {
exactPosition >= 0 -> exactPosition
nextPosition >= 0 -> nextPosition
previousPosition >= 0 -> previousPosition
else -> return
}
val entry = session.pages[newPagePosition]
val relativeOffset = (sourceOffset - entry.sourceStartOffset)
.coerceAtLeast(0L)
.coerceAtMost(Int.MAX_VALUE.toLong())
.toInt()
tts?.stop()
pagePosition = newPagePosition
pageSpeechStartOffset = relativeOffset
currentWindow = null
currentSegments = emptyList()
lookaheadConsumedChars = emptyMap()
segmentPosition = 0
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
currentUtteranceId = null
playing = true
ReaderTtsController.updateState(
ReaderTtsController.State(
active = true,
playing = true,
readerChapterId = readerChapterId,
readerPageIndex = entry.readerPageIndex,
documentIndex = documentIndex,
sourceSentenceStart = sourceOffset,
sourceSentenceEndExclusive = sourceOffset,
),
)
refreshNotification()
speakCurrentSegment()
}
private fun speakCurrentSegment() { private fun speakCurrentSegment() {
if (!playing || !initialized) return if (!playing || !initialized) return
val session = session ?: return stopPlayback()
if (currentPageText == null) { if (currentSegments.isEmpty()) {
currentPageText = session.readPage(pagePosition) if (!prepareCurrentSegments()) return
currentSegments = segmentText(currentPageText.orEmpty())
segmentPosition = 0
} }
if (currentSegments.isEmpty() || segmentPosition !in currentSegments.indices) { if (segmentPosition !in currentSegments.indices) {
advancePage() advancePage()
return return
} }
val segment = currentSegments[segmentPosition] val segment = currentSegments[segmentPosition]
val utteranceId = pagePosition.toString() + ":" + segmentPosition val speechOffset = segmentSpeechOffset.coerceIn(0, segment.text.length)
if (speechOffset >= segment.text.length) {
segmentSpeechOffset = 0
advanceSegment()
return
}
currentUtteranceBaseOffset = speechOffset
val utteranceId = "$ttsGeneration:$pagePosition:$segmentPosition:$speechOffset"
currentUtteranceId = utteranceId
val result = tts?.speak( val result = tts?.speak(
segment.text, segment.text.substring(speechOffset),
TextToSpeech.QUEUE_FLUSH, TextToSpeech.QUEUE_FLUSH,
null, null,
utteranceId, utteranceId,
) )
if (result == TextToSpeech.ERROR) advanceSegment() if (result == TextToSpeech.ERROR) {
currentUtteranceId = null
segmentSpeechOffset = 0
advanceSegment()
}
}
private fun prepareCurrentSegments(): Boolean {
val session = session ?: run {
stopPlayback()
return false
}
val currentEntry = session.pages.getOrNull(pagePosition) ?: run {
stopPlayback()
return false
}
val currentText = session.readPage(pagePosition)
val safeStart = pageSpeechStartOffset.coerceIn(0, currentText.length)
if (safeStart >= currentText.length) {
advancePage()
return false
}
val window = buildSpeechWindow(session, currentEntry.documentIndex, safeStart)
val currentPart = window.parts.firstOrNull { it.pagePosition == pagePosition } ?: run {
advancePage()
return false
}
val segments = segmentText(window.text)
.filter { it.start < currentPart.windowEndExclusive }
if (segments.isEmpty()) {
advancePage()
return false
}
currentWindow = window
currentSegments = segments
segmentPosition = 0
lookaheadConsumedChars = buildMap {
val last = segments.last()
window.parts
.asSequence()
.filter { it.pagePosition > pagePosition }
.forEach { part ->
val consumedEnd = min(last.endExclusive, part.windowEndExclusive)
if (consumedEnd > part.windowStart) {
put(part.pagePosition, consumedEnd - part.windowStart)
}
}
}
return true
}
private fun buildSpeechWindow(
session: ReaderTtsSessionStore.SessionReader,
documentIndex: Int,
currentPageStart: Int,
): SpeechWindow {
val text = StringBuilder()
val parts = mutableListOf<WindowPart>()
var candidatePage = pagePosition
var pagesAdded = 0
var firstPageEnd = -1
while (
candidatePage < session.pages.size &&
pagesAdded < MAX_LOOKAHEAD_PAGES &&
text.length < MAX_SPEECH_WINDOW_CHARS
) {
val entry = session.pages[candidatePage]
if (entry.documentIndex != documentIndex) break
val pageText = session.readPage(candidatePage)
val pageStart = if (candidatePage == pagePosition) currentPageStart else 0
if (pageStart >= pageText.length) {
candidatePage++
continue
}
if (text.isNotEmpty()) text.append(' ')
val windowStart = text.length
val available = (MAX_SPEECH_WINDOW_CHARS - text.length).coerceAtLeast(0)
if (available == 0) break
val takeCount = min(pageText.length - pageStart, available)
text.append(pageText, pageStart, pageStart + takeCount)
val windowEnd = text.length
parts += WindowPart(
windowStart = windowStart,
windowEndExclusive = windowEnd,
pagePosition = candidatePage,
documentIndex = entry.documentIndex,
sourceStartOffset = entry.sourceStartOffset + pageStart,
)
if (candidatePage == pagePosition) {
firstPageEnd = windowEnd
}
pagesAdded++
if (
candidatePage > pagePosition &&
firstPageEnd >= 0 &&
hasSentenceTerminatorAfter(text, firstPageEnd)
) {
break
}
if (takeCount < pageText.length - pageStart) break
candidatePage++
}
return SpeechWindow(
text = text.toString(),
parts = parts,
)
}
private fun hasSentenceTerminatorAfter(text: CharSequence, start: Int): Boolean {
for (index in start.coerceAtLeast(0) until text.length) {
if (text[index] in SENTENCE_TERMINATORS) return true
}
return false
} }
private fun advanceSegment() { private fun advanceSegment() {
currentUtteranceId = null
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
segmentPosition++ segmentPosition++
if (segmentPosition >= currentSegments.size) advancePage() else speakCurrentSegment() if (segmentPosition >= currentSegments.size) advancePage() else speakCurrentSegment()
} }
@@ -201,9 +443,13 @@ class ReaderTtsService : Service() {
} }
pagePosition++ pagePosition++
currentPageText = null pageSpeechStartOffset = lookaheadConsumedChars[pagePosition] ?: 0
currentWindow = null
currentSegments = emptyList() currentSegments = emptyList()
segmentPosition = 0 segmentPosition = 0
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
currentUtteranceId = null
speakCurrentSegment() speakCurrentSegment()
} }
@@ -212,8 +458,9 @@ class ReaderTtsService : Service() {
cleanupTts() cleanupTts()
session?.close() session?.close()
session = null session = null
currentPageText = null currentWindow = null
currentSegments = emptyList() currentSegments = emptyList()
lookaheadConsumedChars = emptyMap()
val oldSessionId = sessionId val oldSessionId = sessionId
sessionId = null sessionId = null
ReaderTtsSessionStore.delete(this, oldSessionId) ReaderTtsSessionStore.delete(this, oldSessionId)
@@ -223,6 +470,8 @@ class ReaderTtsService : Service() {
} }
private fun cleanupTts() { private fun cleanupTts() {
ttsGeneration++
currentUtteranceId = null
initialized = false initialized = false
tts?.stop() tts?.stop()
tts?.shutdown() tts?.shutdown()
@@ -238,8 +487,18 @@ class ReaderTtsService : Service() {
active = true, active = true,
playing = playing, playing = playing,
readerChapterId = readerChapterId, readerChapterId = readerChapterId,
readerPageIndex = page.readerPageIndex, readerPageIndex = if (!clearHighlight && previous.readerPageIndex >= 0) {
documentIndex = page.documentIndex, previous.readerPageIndex
} else {
page.readerPageIndex
},
documentIndex = if (!clearHighlight && previous.documentIndex >= 0) {
previous.documentIndex
} else {
page.documentIndex
},
sourceSentenceStart = if (clearHighlight) -1L else previous.sourceSentenceStart,
sourceSentenceEndExclusive = if (clearHighlight) -1L else previous.sourceSentenceEndExclusive,
sourceHighlightStart = if (clearHighlight) -1L else previous.sourceHighlightStart, sourceHighlightStart = if (clearHighlight) -1L else previous.sourceHighlightStart,
sourceHighlightEndExclusive = if (clearHighlight) -1L else previous.sourceHighlightEndExclusive, sourceHighlightEndExclusive = if (clearHighlight) -1L else previous.sourceHighlightEndExclusive,
), ),
@@ -253,22 +512,70 @@ class ReaderTtsService : Service() {
relativeEndExclusive: Int = segment.text.length, relativeEndExclusive: Int = segment.text.length,
) { ) {
val session = session ?: return val session = session ?: return
val page = session.pages.getOrNull(pagePosition) ?: return val window = currentWindow ?: return
val sentenceStart = window.mapStart(segment.start) ?: return
val sentenceEnd = window.mapEnd(segment.endExclusive) ?: return
val safeStart = relativeStart.coerceIn(0, segment.text.length) val safeStart = relativeStart.coerceIn(0, segment.text.length)
val safeEnd = relativeEndExclusive.coerceIn(safeStart, segment.text.length) val safeEnd = relativeEndExclusive.coerceIn(safeStart, segment.text.length)
val activeStart = if (safeEnd > safeStart) {
window.mapStart(segment.start + safeStart)
} else {
null
}
val activeEnd = if (safeEnd > safeStart) {
window.mapEnd(segment.start + safeEnd)
} else {
null
}
val activePosition = activeStart ?: sentenceStart
val page = session.pages.getOrNull(activePosition.pagePosition) ?: return
ReaderTtsController.updateState( ReaderTtsController.updateState(
ReaderTtsController.State( ReaderTtsController.State(
active = true, active = true,
playing = playing, playing = playing,
readerChapterId = readerChapterId, readerChapterId = readerChapterId,
readerPageIndex = page.readerPageIndex, readerPageIndex = page.readerPageIndex,
documentIndex = page.documentIndex, documentIndex = activePosition.documentIndex,
sourceHighlightStart = page.sourceStartOffset + segment.start + safeStart, sourceSentenceStart = sentenceStart.sourceOffset,
sourceHighlightEndExclusive = page.sourceStartOffset + segment.start + safeEnd, sourceSentenceEndExclusive = sentenceEnd.sourceOffset,
sourceHighlightStart = activeStart?.sourceOffset ?: -1L,
sourceHighlightEndExclusive = activeEnd?.sourceOffset ?: -1L,
), ),
) )
} }
private fun SpeechWindow.mapStart(windowOffset: Int): MappedPosition? {
if (text.isEmpty() || parts.isEmpty()) return null
val clamped = windowOffset.coerceIn(0, text.lastIndex)
val part = parts.firstOrNull { clamped in it.windowStart until it.windowEndExclusive }
?: parts.firstOrNull { it.windowStart > clamped }
?: parts.lastOrNull()
?: return null
val charIndex = clamped.coerceIn(part.windowStart, part.windowEndExclusive - 1)
return MappedPosition(
pagePosition = part.pagePosition,
documentIndex = part.documentIndex,
sourceOffset = part.sourceStartOffset + (charIndex - part.windowStart),
)
}
private fun SpeechWindow.mapEnd(windowEndExclusive: Int): MappedPosition? {
if (text.isEmpty() || parts.isEmpty()) return null
val clamped = (windowEndExclusive - 1).coerceIn(0, text.lastIndex)
val part = parts.firstOrNull { clamped in it.windowStart until it.windowEndExclusive }
?: parts.lastOrNull { it.windowEndExclusive <= clamped + 1 }
?: parts.firstOrNull()
?: return null
val charIndex = clamped.coerceIn(part.windowStart, part.windowEndExclusive - 1)
return MappedPosition(
pagePosition = part.pagePosition,
documentIndex = part.documentIndex,
sourceOffset = part.sourceStartOffset + (charIndex - part.windowStart) + 1L,
)
}
private fun refreshNotification() { private fun refreshNotification() {
if (session == null) return if (session == null) return
startForeground(Notifications.ID_READER_TTS, buildNotification(preparing = false)) startForeground(Notifications.ID_READER_TTS, buildNotification(preparing = false))
@@ -314,30 +621,45 @@ class ReaderTtsService : Service() {
private val progressListener = object : UtteranceProgressListener() { private val progressListener = object : UtteranceProgressListener() {
override fun onStart(utteranceId: String?) { override fun onStart(utteranceId: String?) {
mainHandler.post { mainHandler.post {
if (!playing) return@post if (!playing || utteranceId != currentUtteranceId) return@post
currentSegments.getOrNull(segmentPosition)?.let(::publishHighlight) currentSegments.getOrNull(segmentPosition)?.let { segment ->
publishHighlight(
segment = segment,
relativeStart = currentUtteranceBaseOffset,
relativeEndExclusive = (currentUtteranceBaseOffset + 1).coerceAtMost(segment.text.length),
)
}
} }
} }
override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) { override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) {
mainHandler.post { mainHandler.post {
if (!playing) return@post if (!playing || utteranceId != currentUtteranceId) return@post
currentSegments.getOrNull(segmentPosition)?.let { segment -> currentSegments.getOrNull(segmentPosition)?.let { segment ->
publishHighlight(segment, start, end) val absoluteStart = (currentUtteranceBaseOffset + start).coerceIn(0, segment.text.length)
val absoluteEnd = (currentUtteranceBaseOffset + end).coerceIn(absoluteStart, segment.text.length)
segmentSpeechOffset = absoluteStart
publishHighlight(segment, absoluteStart, absoluteEnd)
} }
} }
} }
override fun onDone(utteranceId: String?) { override fun onDone(utteranceId: String?) {
mainHandler.post { mainHandler.post {
if (playing) advanceSegment() if (!playing || utteranceId != currentUtteranceId) return@post
currentUtteranceId = null
segmentSpeechOffset = 0
advanceSegment()
} }
} }
@Deprecated("Deprecated in Java") @Deprecated("Deprecated in Java")
override fun onError(utteranceId: String?) { override fun onError(utteranceId: String?) {
mainHandler.post { mainHandler.post {
if (playing) advanceSegment() if (!playing || utteranceId != currentUtteranceId) return@post
currentUtteranceId = null
segmentSpeechOffset = 0
advanceSegment()
} }
} }
@@ -420,14 +742,38 @@ class ReaderTtsService : Service() {
val text: String, val text: String,
) )
private data class SpeechWindow(
val text: String,
val parts: List<WindowPart>,
)
private data class WindowPart(
val windowStart: Int,
val windowEndExclusive: Int,
val pagePosition: Int,
val documentIndex: Int,
val sourceStartOffset: Long,
)
private data class MappedPosition(
val pagePosition: Int,
val documentIndex: Int,
val sourceOffset: Long,
)
companion object { companion object {
const val ACTION_START = "eu.kanade.tachiyomi.reader.tts.START" const val ACTION_START = "eu.kanade.tachiyomi.reader.tts.START"
const val ACTION_TOGGLE = "eu.kanade.tachiyomi.reader.tts.TOGGLE" const val ACTION_TOGGLE = "eu.kanade.tachiyomi.reader.tts.TOGGLE"
const val ACTION_RESUME_FROM_SOURCE = "eu.kanade.tachiyomi.reader.tts.RESUME_FROM_SOURCE"
const val ACTION_STOP = "eu.kanade.tachiyomi.reader.tts.STOP" const val ACTION_STOP = "eu.kanade.tachiyomi.reader.tts.STOP"
const val ACTION_SET_SPEED = "eu.kanade.tachiyomi.reader.tts.SET_SPEED" const val ACTION_SET_SPEED = "eu.kanade.tachiyomi.reader.tts.SET_SPEED"
const val ACTION_SET_ENGINE = "eu.kanade.tachiyomi.reader.tts.SET_ENGINE"
const val ACTION_REFRESH_VOICE = "eu.kanade.tachiyomi.reader.tts.REFRESH_VOICE"
const val EXTRA_SESSION_ID = "session_id" const val EXTRA_SESSION_ID = "session_id"
const val EXTRA_START_PAGE_INDEX = "start_page_index" const val EXTRA_START_PAGE_INDEX = "start_page_index"
const val EXTRA_DOCUMENT_INDEX = "document_index"
const val EXTRA_SOURCE_OFFSET = "source_offset"
const val EXTRA_CHAPTER_ID = "chapter_id" const val EXTRA_CHAPTER_ID = "chapter_id"
const val EXTRA_TITLE = "title" const val EXTRA_TITLE = "title"
const val EXTRA_SUBTITLE = "subtitle" const val EXTRA_SUBTITLE = "subtitle"
@@ -442,6 +788,9 @@ class ReaderTtsService : Service() {
private const val MIN_SPEED = 1.2f private const val MIN_SPEED = 1.2f
private const val MAX_SPEED = 3.0f private const val MAX_SPEED = 3.0f
private const val MAX_SEGMENT_CHARS = 1200 private const val MAX_SEGMENT_CHARS = 1200
private const val MAX_LOOKAHEAD_PAGES = 3
private const val MAX_SPEECH_WINDOW_CHARS = 6000
private val SENTENCE_TERMINATORS = setOf('.', '!', '?', '。', '!', '?')
private const val REQUEST_TOGGLE = 9101 private const val REQUEST_TOGGLE = 9101
private const val REQUEST_STOP = 9102 private const val REQUEST_STOP = 9102
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6,6h12v12H6z" />
</vector>
@@ -1110,8 +1110,10 @@
<string name="pref_text_reader_tts_voice_settings">Voice data settings</string> <string name="pref_text_reader_tts_voice_settings">Voice data settings</string>
<string name="reader_tts_start">Start TTS</string> <string name="reader_tts_start">Start TTS</string>
<string name="reader_tts_pause">Pause TTS</string> <string name="reader_tts_pause">Pause TTS</string>
<string name="reader_tts_stop">Stop TTS</string>
<string name="pref_text_reader_line_spacing">Line spacing</string> <string name="pref_text_reader_line_spacing">Line spacing</string>
<string name="pref_text_reader_paragraph_spacing">Paragraph spacing</string> <string name="pref_text_reader_paragraph_spacing">Paragraph spacing</string>
<string name="pref_text_reader_horizontal_margin">Side margins</string>
<string name="pref_text_reader_font_family">Font</string> <string name="pref_text_reader_font_family">Font</string>
<string name="pref_text_reader_font_system">System</string> <string name="pref_text_reader_font_system">System</string>
<string name="pref_text_reader_font_sans">Sans-serif</string> <string name="pref_text_reader_font_sans">Sans-serif</string>
@@ -918,8 +918,10 @@
<string name="pref_text_reader_tts_voice_settings">음성 데이터 설정</string> <string name="pref_text_reader_tts_voice_settings">음성 데이터 설정</string>
<string name="reader_tts_start">TTS 시작</string> <string name="reader_tts_start">TTS 시작</string>
<string name="reader_tts_pause">TTS 일시정지</string> <string name="reader_tts_pause">TTS 일시정지</string>
<string name="reader_tts_stop">TTS 정지</string>
<string name="pref_text_reader_line_spacing">행간</string> <string name="pref_text_reader_line_spacing">행간</string>
<string name="pref_text_reader_paragraph_spacing">문단 간격</string> <string name="pref_text_reader_paragraph_spacing">문단 간격</string>
<string name="pref_text_reader_horizontal_margin">좌우 여백</string>
<string name="pref_text_reader_font_family">글꼴</string> <string name="pref_text_reader_font_family">글꼴</string>
<string name="pref_text_reader_font_system">시스템</string> <string name="pref_text_reader_font_system">시스템</string>
<string name="pref_text_reader_font_sans">고딕</string> <string name="pref_text_reader_font_sans">고딕</string>