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
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
This commit is contained in:
@@ -310,27 +310,47 @@ class ReaderActivity : BaseActivity() {
|
|||||||
ttsState.readerChapterId == state.currentChapter?.chapter?.id &&
|
ttsState.readerChapterId == state.currentChapter?.chapter?.id &&
|
||||||
state.currentChapter?.pages?.any { it is TextReaderPage } == true
|
state.currentChapter?.pages?.any { it is TextReaderPage } == true
|
||||||
if (showFloatingTts) {
|
if (showFloatingTts) {
|
||||||
IconButton(
|
Row(
|
||||||
onClick = ::toggleTts,
|
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.align(Alignment.BottomEnd)
|
.align(Alignment.BottomEnd)
|
||||||
.navigationBarsPadding()
|
.navigationBarsPadding()
|
||||||
.padding(end = 18.dp, bottom = 72.dp)
|
.padding(end = 18.dp, bottom = 72.dp),
|
||||||
.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),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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