Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eca7a3b886 | |||
| ba1b4d2362 | |||
| 023c3bb2f1 | |||
| aec03c6c71 | |||
| c9c119689d |
@@ -20,6 +20,8 @@ import android.view.WindowManager
|
||||
import android.widget.Toast
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
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.Box
|
||||
@@ -306,28 +308,56 @@ class ReaderActivity : BaseActivity() {
|
||||
|
||||
AppBars(state = state)
|
||||
|
||||
if (ttsState.active) {
|
||||
IconButton(
|
||||
onClick = ::toggleTts,
|
||||
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 = 72.dp)
|
||||
.size(52.dp)
|
||||
.background(
|
||||
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.55f),
|
||||
shape = CircleShape,
|
||||
),
|
||||
.padding(end = 18.dp, bottom = floatingTtsBottomPadding),
|
||||
horizontalArrangement = Arrangement.spacedBy(10.dp),
|
||||
) {
|
||||
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 = ::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),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -738,9 +768,14 @@ class ReaderActivity : BaseActivity() {
|
||||
if (ttsState.playing) {
|
||||
ReaderTtsController.toggle(this)
|
||||
} else {
|
||||
val currentPageIndex = (state.currentPage - 1).coerceAtLeast(0)
|
||||
if (currentPageIndex != ttsState.readerPageIndex) {
|
||||
ReaderTtsController.resumeFromPage(this, currentPageIndex)
|
||||
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)
|
||||
}
|
||||
@@ -842,10 +877,13 @@ class ReaderActivity : BaseActivity() {
|
||||
}
|
||||
|
||||
ttsHighlightedPage = targetPage
|
||||
if (state.currentPage != targetPage.index + 1) {
|
||||
val targetPageIsVisible = state.currentPage == targetPage.index + 1
|
||||
if (ttsState.playing && !targetPageIsVisible) {
|
||||
moveToPageIndex(targetPage.index)
|
||||
}
|
||||
state.viewer?.refreshCurrentPage()
|
||||
if (ttsState.playing || targetPageIsVisible) {
|
||||
state.viewer?.refreshCurrentPage()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -57,12 +57,17 @@ object ReaderTtsController {
|
||||
)
|
||||
}
|
||||
|
||||
fun resumeFromPage(context: Context, readerPageIndex: Int) {
|
||||
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_PAGE)
|
||||
.putExtra(ReaderTtsService.EXTRA_START_PAGE_INDEX, readerPageIndex),
|
||||
.setAction(ReaderTtsService.ACTION_RESUME_FROM_SOURCE)
|
||||
.putExtra(ReaderTtsService.EXTRA_DOCUMENT_INDEX, documentIndex)
|
||||
.putExtra(ReaderTtsService.EXTRA_SOURCE_OFFSET, sourceOffset),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -46,8 +46,9 @@ class ReaderTtsService : Service() {
|
||||
when (intent?.action) {
|
||||
ACTION_START -> startSession(intent)
|
||||
ACTION_TOGGLE -> if (playing) pausePlayback() else resumePlayback()
|
||||
ACTION_RESUME_FROM_PAGE -> resumeFromPage(
|
||||
intent.getIntExtra(EXTRA_START_PAGE_INDEX, -1),
|
||||
ACTION_RESUME_FROM_SOURCE -> resumeFromSource(
|
||||
documentIndex = intent.getIntExtra(EXTRA_DOCUMENT_INDEX, -1),
|
||||
sourceOffset = intent.getLongExtra(EXTRA_SOURCE_OFFSET, -1L),
|
||||
)
|
||||
ACTION_STOP -> stopPlayback()
|
||||
ACTION_SET_SPEED -> {
|
||||
@@ -207,16 +208,47 @@ class ReaderTtsService : Service() {
|
||||
speakCurrentSegment()
|
||||
}
|
||||
|
||||
private fun resumeFromPage(readerPageIndex: Int) {
|
||||
if (!initialized || readerPageIndex < 0) return
|
||||
private fun resumeFromSource(
|
||||
documentIndex: Int,
|
||||
sourceOffset: Long,
|
||||
) {
|
||||
if (!initialized || documentIndex < 0 || sourceOffset < 0L) return
|
||||
val session = session ?: return
|
||||
val newPagePosition = session.pages.indexOfFirst { it.readerPageIndex >= readerPageIndex }
|
||||
.takeIf { it >= 0 }
|
||||
?: 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 = 0
|
||||
pageSpeechStartOffset = relativeOffset
|
||||
currentWindow = null
|
||||
currentSegments = emptyList()
|
||||
lookaheadConsumedChars = emptyMap()
|
||||
@@ -225,7 +257,18 @@ class ReaderTtsService : Service() {
|
||||
currentUtteranceBaseOffset = 0
|
||||
currentUtteranceId = null
|
||||
playing = true
|
||||
updatePlaybackState(clearHighlight = true)
|
||||
ReaderTtsController.updateState(
|
||||
ReaderTtsController.State(
|
||||
active = true,
|
||||
playing = true,
|
||||
readerChapterId = readerChapterId,
|
||||
readerPageIndex = entry.readerPageIndex,
|
||||
documentIndex = documentIndex,
|
||||
sourceSentenceStart = sourceOffset,
|
||||
sourceSentenceEndExclusive = sourceOffset,
|
||||
),
|
||||
)
|
||||
refreshNotification()
|
||||
speakCurrentSegment()
|
||||
}
|
||||
|
||||
@@ -721,7 +764,7 @@ class ReaderTtsService : Service() {
|
||||
companion object {
|
||||
const val ACTION_START = "eu.kanade.tachiyomi.reader.tts.START"
|
||||
const val ACTION_TOGGLE = "eu.kanade.tachiyomi.reader.tts.TOGGLE"
|
||||
const val ACTION_RESUME_FROM_PAGE = "eu.kanade.tachiyomi.reader.tts.RESUME_FROM_PAGE"
|
||||
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_SET_SPEED = "eu.kanade.tachiyomi.reader.tts.SET_SPEED"
|
||||
const val ACTION_SET_ENGINE = "eu.kanade.tachiyomi.reader.tts.SET_ENGINE"
|
||||
@@ -729,6 +772,8 @@ class ReaderTtsService : Service() {
|
||||
|
||||
const val EXTRA_SESSION_ID = "session_id"
|
||||
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_TITLE = "title"
|
||||
const val EXTRA_SUBTITLE = "subtitle"
|
||||
|
||||
@@ -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,6 +1110,7 @@
|
||||
<string name="pref_text_reader_tts_voice_settings">Voice data settings</string>
|
||||
<string name="reader_tts_start">Start 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_paragraph_spacing">Paragraph spacing</string>
|
||||
<string name="pref_text_reader_font_family">Font</string>
|
||||
|
||||
@@ -918,6 +918,7 @@
|
||||
<string name="pref_text_reader_tts_voice_settings">음성 데이터 설정</string>
|
||||
<string name="reader_tts_start">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_paragraph_spacing">문단 간격</string>
|
||||
<string name="pref_text_reader_font_family">글꼴</string>
|
||||
|
||||
Reference in New Issue
Block a user