From ba1b4d2362cf78853b192a9e1848ccd7c4d864d2 Mon Sep 17 00:00:00 2001 From: BookOasis Reader Date: Sun, 27 Sep 2026 14:23:06 +0900 Subject: [PATCH] Add floating TTS stop control --- .../tachiyomi/ui/reader/ReaderActivity.kt | 54 +++++++++++++------ app/src/main/res/drawable/ic_stop_24dp.xml | 9 ++++ .../moko-resources/base/strings.xml | 1 + .../commonMain/moko-resources/ko/strings.xml | 1 + 4 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable/ic_stop_24dp.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 50f895edd..b9746b840 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -310,27 +310,47 @@ class ReaderActivity : BaseActivity() { ttsState.readerChapterId == state.currentChapter?.chapter?.id && state.currentChapter?.pages?.any { it is TextReaderPage } == true if (showFloatingTts) { - IconButton( - onClick = ::toggleTts, + 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 = 72.dp), + 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), + ) + } } } } diff --git a/app/src/main/res/drawable/ic_stop_24dp.xml b/app/src/main/res/drawable/ic_stop_24dp.xml new file mode 100644 index 000000000..1d775406a --- /dev/null +++ b/app/src/main/res/drawable/ic_stop_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml index 6a44e36a1..afd87d798 100644 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -1110,6 +1110,7 @@ Voice data settings Start TTS Pause TTS + Stop TTS Line spacing Paragraph spacing Font diff --git a/i18n/src/commonMain/moko-resources/ko/strings.xml b/i18n/src/commonMain/moko-resources/ko/strings.xml index 4993cbd21..b213568aa 100644 --- a/i18n/src/commonMain/moko-resources/ko/strings.xml +++ b/i18n/src/commonMain/moko-resources/ko/strings.xml @@ -918,6 +918,7 @@ 음성 데이터 설정 TTS 시작 TTS 일시정지 + TTS 정지 행간 문단 간격 글꼴