Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eca7a3b886 | |||
| ba1b4d2362 | |||
| 023c3bb2f1 | |||
| aec03c6c71 | |||
| c9c119689d | |||
| 38a327cdf6 |
@@ -20,6 +20,8 @@ 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.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
|
||||||
@@ -306,28 +308,56 @@ class ReaderActivity : BaseActivity() {
|
|||||||
|
|
||||||
AppBars(state = state)
|
AppBars(state = state)
|
||||||
|
|
||||||
if (ttsState.active) {
|
val showFloatingTts = ttsState.active &&
|
||||||
IconButton(
|
ttsState.readerChapterId == state.currentChapter?.chapter?.id &&
|
||||||
onClick = ::toggleTts,
|
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
|
modifier = Modifier
|
||||||
.align(Alignment.BottomEnd)
|
.align(Alignment.BottomEnd)
|
||||||
.navigationBarsPadding()
|
.navigationBarsPadding()
|
||||||
.padding(end = 18.dp, bottom = 72.dp)
|
.padding(end = 18.dp, bottom = floatingTtsBottomPadding),
|
||||||
.size(52.dp)
|
horizontalArrangement = Arrangement.spacedBy(10.dp),
|
||||||
.background(
|
|
||||||
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.55f),
|
|
||||||
shape = CircleShape,
|
|
||||||
),
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
IconButton(
|
||||||
painter = painterResource(
|
onClick = ::toggleTts,
|
||||||
if (ttsState.playing) R.drawable.ic_pause_24dp else R.drawable.ic_play_arrow_24dp,
|
modifier = Modifier
|
||||||
),
|
.size(52.dp)
|
||||||
contentDescription = stringResource(
|
.background(
|
||||||
if (ttsState.playing) MR.strings.reader_tts_pause else MR.strings.reader_tts_start,
|
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.55f),
|
||||||
),
|
shape = CircleShape,
|
||||||
tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.92f),
|
),
|
||||||
)
|
) {
|
||||||
|
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) {
|
if (ttsState.playing) {
|
||||||
ReaderTtsController.toggle(this)
|
ReaderTtsController.toggle(this)
|
||||||
} else {
|
} else {
|
||||||
val currentPageIndex = (state.currentPage - 1).coerceAtLeast(0)
|
val currentPage = chapter.pages
|
||||||
if (currentPageIndex != ttsState.readerPageIndex) {
|
?.getOrNull((state.currentPage - 1).coerceAtLeast(0)) as? TextReaderPage
|
||||||
ReaderTtsController.resumeFromPage(this, currentPageIndex)
|
if (currentPage != null) {
|
||||||
|
ReaderTtsController.resumeFromSource(
|
||||||
|
context = this,
|
||||||
|
documentIndex = currentPage.anchor.documentIndex,
|
||||||
|
sourceOffset = currentPage.anchor.startOffset,
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
ReaderTtsController.toggle(this)
|
ReaderTtsController.toggle(this)
|
||||||
}
|
}
|
||||||
@@ -842,10 +877,13 @@ class ReaderActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
@@ -274,13 +275,15 @@ internal object TextPageRenderer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val darkBackground = resolveColors(style).first == Color.BLACK
|
val (_, baseTextColor) = resolveColors(style)
|
||||||
|
val darkTheme = baseTextColor == Color.WHITE
|
||||||
sentenceHighlightRange?.let { range ->
|
sentenceHighlightRange?.let { range ->
|
||||||
applyHighlightSpan(
|
applyHighlightSpan(
|
||||||
spannable = spannable,
|
spannable = spannable,
|
||||||
textLength = text.length,
|
textLength = text.length,
|
||||||
range = range,
|
range = range,
|
||||||
color = if (darkBackground) Color.rgb(72, 68, 40) else Color.rgb(255, 249, 196),
|
backgroundColor = if (darkTheme) Color.rgb(77, 66, 25) else Color.rgb(255, 243, 176),
|
||||||
|
foregroundColor = if (darkTheme) Color.WHITE else Color.BLACK,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
activeHighlightRange?.let { range ->
|
activeHighlightRange?.let { range ->
|
||||||
@@ -288,7 +291,8 @@ internal object TextPageRenderer {
|
|||||||
spannable = spannable,
|
spannable = spannable,
|
||||||
textLength = text.length,
|
textLength = text.length,
|
||||||
range = range,
|
range = range,
|
||||||
color = if (darkBackground) Color.rgb(150, 117, 0) else Color.rgb(255, 193, 7),
|
backgroundColor = if (darkTheme) Color.rgb(255, 193, 7) else Color.rgb(255, 179, 0),
|
||||||
|
foregroundColor = Color.BLACK,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
return spannable
|
return spannable
|
||||||
@@ -298,14 +302,21 @@ internal object TextPageRenderer {
|
|||||||
spannable: SpannableString,
|
spannable: SpannableString,
|
||||||
textLength: Int,
|
textLength: Int,
|
||||||
range: IntRange,
|
range: IntRange,
|
||||||
color: Int,
|
backgroundColor: Int,
|
||||||
|
foregroundColor: Int,
|
||||||
) {
|
) {
|
||||||
if (range.isEmpty()) return
|
if (range.isEmpty()) return
|
||||||
val start = range.first.coerceIn(0, textLength)
|
val start = range.first.coerceIn(0, textLength)
|
||||||
val endExclusive = (range.last + 1).coerceIn(start, textLength)
|
val endExclusive = (range.last + 1).coerceIn(start, textLength)
|
||||||
if (start >= endExclusive) return
|
if (start >= endExclusive) return
|
||||||
spannable.setSpan(
|
spannable.setSpan(
|
||||||
BackgroundColorSpan(color),
|
BackgroundColorSpan(backgroundColor),
|
||||||
|
start,
|
||||||
|
endExclusive,
|
||||||
|
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
|
||||||
|
)
|
||||||
|
spannable.setSpan(
|
||||||
|
ForegroundColorSpan(foregroundColor),
|
||||||
start,
|
start,
|
||||||
endExclusive,
|
endExclusive,
|
||||||
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
|
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
|
||||||
|
|||||||
@@ -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
|
if (!state.value.active) return
|
||||||
context.startService(
|
context.startService(
|
||||||
Intent(context, ReaderTtsService::class.java)
|
Intent(context, ReaderTtsService::class.java)
|
||||||
.setAction(ReaderTtsService.ACTION_RESUME_FROM_PAGE)
|
.setAction(ReaderTtsService.ACTION_RESUME_FROM_SOURCE)
|
||||||
.putExtra(ReaderTtsService.EXTRA_START_PAGE_INDEX, readerPageIndex),
|
.putExtra(ReaderTtsService.EXTRA_DOCUMENT_INDEX, documentIndex)
|
||||||
|
.putExtra(ReaderTtsService.EXTRA_SOURCE_OFFSET, sourceOffset),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,8 +46,9 @@ 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_PAGE -> resumeFromPage(
|
ACTION_RESUME_FROM_SOURCE -> resumeFromSource(
|
||||||
intent.getIntExtra(EXTRA_START_PAGE_INDEX, -1),
|
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 -> {
|
||||||
@@ -207,16 +208,47 @@ class ReaderTtsService : Service() {
|
|||||||
speakCurrentSegment()
|
speakCurrentSegment()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resumeFromPage(readerPageIndex: Int) {
|
private fun resumeFromSource(
|
||||||
if (!initialized || readerPageIndex < 0) return
|
documentIndex: Int,
|
||||||
|
sourceOffset: Long,
|
||||||
|
) {
|
||||||
|
if (!initialized || documentIndex < 0 || sourceOffset < 0L) return
|
||||||
val session = session ?: return
|
val session = session ?: return
|
||||||
val newPagePosition = session.pages.indexOfFirst { it.readerPageIndex >= readerPageIndex }
|
|
||||||
.takeIf { it >= 0 }
|
val exactPosition = session.pages.indexOfFirst { entry ->
|
||||||
?: return
|
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()
|
tts?.stop()
|
||||||
pagePosition = newPagePosition
|
pagePosition = newPagePosition
|
||||||
pageSpeechStartOffset = 0
|
pageSpeechStartOffset = relativeOffset
|
||||||
currentWindow = null
|
currentWindow = null
|
||||||
currentSegments = emptyList()
|
currentSegments = emptyList()
|
||||||
lookaheadConsumedChars = emptyMap()
|
lookaheadConsumedChars = emptyMap()
|
||||||
@@ -225,7 +257,18 @@ class ReaderTtsService : Service() {
|
|||||||
currentUtteranceBaseOffset = 0
|
currentUtteranceBaseOffset = 0
|
||||||
currentUtteranceId = null
|
currentUtteranceId = null
|
||||||
playing = true
|
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()
|
speakCurrentSegment()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -721,7 +764,7 @@ class ReaderTtsService : Service() {
|
|||||||
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_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_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_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_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"
|
||||||
|
|||||||
@@ -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="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_font_family">Font</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="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_font_family">글꼴</string>
|
<string name="pref_text_reader_font_family">글꼴</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user