mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-21 20:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into merge_upstream

Browse source
This commit is contained in:
LuftVerbot 2023-11-24 23:21:58 +01:00
commit e4283fe416
2 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/StreamsCatalogSheet.kt
View file

@ -68,23 +68,25 @@ fun StreamsCatalogSheet(
Column( Column(
modifier = Modifier modifier = Modifier
.padding(vertical = TabbedDialogPaddings.Vertical) .padding(vertical = TabbedDialogPaddings.Vertical)
.verticalScroll(rememberScrollState()),
) { ) {
@Composable fun QualityTracksPage() = StreamsPageBuilder( @Composable
fun QualityTracksPage() = StreamsPageBuilder(
externalTrackCode = null, externalTrackCode = null,
stream = videoStreams.quality, stream = videoStreams.quality,
openContentFd = openContentFd, openContentFd = openContentFd,
onTrackSelected = onQualitySelected, onTrackSelected = onQualitySelected,
) )
@Composable fun SubtitleTracksPage() = StreamsPageBuilder( @Composable
fun SubtitleTracksPage() = StreamsPageBuilder(
externalTrackCode = "sub", externalTrackCode = "sub",
stream = videoStreams.subtitle, stream = videoStreams.subtitle,
openContentFd = openContentFd, openContentFd = openContentFd,
onTrackSelected = onSubtitleSelected, onTrackSelected = onSubtitleSelected,
) )
@Composable fun AudioTracksPage() = StreamsPageBuilder( @Composable
fun AudioTracksPage() = StreamsPageBuilder(
externalTrackCode = "audio", externalTrackCode = "audio",
stream = videoStreams.audio, stream = videoStreams.audio,
openContentFd = openContentFd, openContentFd = openContentFd,
@ -172,22 +174,28 @@ private fun StreamsPageBuilder(
} }
} }
tracks.forEachIndexed { i, track -> Column(
val selected = index == i modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState()),
) {
tracks.forEachIndexed { i, track ->
val selected = index == i
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clickable(onClick = { onSelected(i) }) .clickable(onClick = { onSelected(i) })
.padding(sheetDialogPadding), .padding(sheetDialogPadding),
) { ) {
Text( Text(
text = track.lang, text = track.lang,
fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal, fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal,
fontStyle = if (selected) FontStyle.Italic else FontStyle.Normal, fontStyle = if (selected) FontStyle.Italic else FontStyle.Normal,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = if (selected) MaterialTheme.colorScheme.primary else Color.Unspecified, color = if (selected) MaterialTheme.colorScheme.primary else Color.Unspecified,
) )
}
} }
} }
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/VideoChaptersSheet.kt
View file

@ -5,6 +5,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.MaterialTheme 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
@ -40,7 +42,9 @@ fun VideoChaptersSheet(
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
) { ) {
Column( Column(
modifier = Modifier.padding(MaterialTheme.padding.medium), modifier = Modifier
.padding(MaterialTheme.padding.medium)
.verticalScroll(rememberScrollState()),
) { ) {
Text( Text(
text = stringResource(id = R.string.chapter_dialog_header), text = stringResource(id = R.string.chapter_dialog_header),