-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
362 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
app/shared/video-player/common/ui/progress/SubtitleLanguage.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package me.him188.ani.app.videoplayer.ui.progress | ||
|
|
||
| import androidx.compose.runtime.Immutable | ||
| import androidx.compose.runtime.Stable | ||
| import me.him188.ani.app.videoplayer.ui.state.SubtitleTrack | ||
| import me.him188.ani.datasources.api.topic.SubtitleLanguage | ||
|
|
||
| @Immutable | ||
| class SubtitlePresentation( | ||
| val subtitleTrack: SubtitleTrack, | ||
| val displayName: String, | ||
| ) | ||
|
|
||
| @Stable | ||
| val SubtitleTrack.subtitleLanguage: SubtitleLanguage | ||
| get() { | ||
| for (label in labels) { | ||
| SubtitleLanguage.tryParse(label.value)?.let { return it } | ||
| } | ||
| return SubtitleLanguage.Other(labels.firstOrNull()?.value ?: language ?: "Unknown") | ||
| } | ||
|
|
99 changes: 99 additions & 0 deletions
99
app/shared/video-player/common/ui/progress/SubtitleSwitcher.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package me.him188.ani.app.videoplayer.ui.progress | ||
|
|
||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.Stable | ||
| import androidx.compose.runtime.derivedStateOf | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.rememberUpdatedState | ||
| import androidx.compose.ui.Modifier | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.combine | ||
| import kotlinx.coroutines.flow.flowOn | ||
| import kotlinx.coroutines.flow.map | ||
| import me.him188.ani.app.ui.foundation.AbstractViewModel | ||
| import me.him188.ani.app.videoplayer.ui.state.SubtitleTrack | ||
| import me.him188.ani.app.videoplayer.ui.state.TrackGroup | ||
| import moe.tlaster.precompose.flow.collectAsStateWithLifecycle | ||
|
|
||
| @Stable | ||
| class SubtitleTrackState( | ||
| current: StateFlow<SubtitleTrack?>, | ||
| candidates: Flow<List<SubtitleTrack>>, | ||
| ) : AbstractViewModel() { | ||
| val options = candidates.map { tracks -> | ||
| tracks.map { track -> | ||
| SubtitlePresentation(track, track.subtitleLanguage.displayName) | ||
| } | ||
| }.flowOn(Dispatchers.Default).shareInBackground() | ||
|
|
||
| val value = combine(options, current) { options, current -> | ||
| options.firstOrNull { it.subtitleTrack.id == current?.id } | ||
| }.flowOn(Dispatchers.Default) | ||
| } | ||
|
|
||
|
|
||
| @Composable | ||
| fun PlayerControllerDefaults.SubtitleSwitcher( | ||
| playerState: TrackGroup<SubtitleTrack>, | ||
| modifier: Modifier = Modifier, | ||
| onSelect: (SubtitleTrack?) -> Unit = { playerState.select(it) }, | ||
| ) { | ||
| val state = remember(playerState) { | ||
| SubtitleTrackState(playerState.current, playerState.candidates) | ||
| } | ||
| SubtitleSwitcher(state, onSelect, modifier) | ||
| } | ||
|
|
||
| @Composable | ||
| fun PlayerControllerDefaults.SubtitleSwitcher( | ||
| state: SubtitleTrackState, | ||
| onSelect: (SubtitleTrack?) -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| val options by state.options.collectAsStateWithLifecycle(emptyList()) | ||
| SubtitleSwitcher( | ||
| value = state.value.collectAsStateWithLifecycle(null).value, | ||
| onValueChange = { onSelect(it?.subtitleTrack) }, | ||
| optionsProvider = { options }, | ||
| modifier, | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * 选字幕 | ||
| */ | ||
| @Composable | ||
| fun PlayerControllerDefaults.SubtitleSwitcher( | ||
| value: SubtitlePresentation?, | ||
| onValueChange: (SubtitlePresentation?) -> Unit, | ||
| optionsProvider: () -> List<SubtitlePresentation>, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| val optionsProviderUpdated by rememberUpdatedState(optionsProvider) | ||
| val options by remember { | ||
| derivedStateOf { | ||
| optionsProviderUpdated() + null | ||
| } | ||
| } | ||
| if (options.size <= 1) return // 1 for `null` | ||
| return OptionsSwitcher( | ||
| value = value, | ||
| onValueChange = onValueChange, | ||
| optionsProvider = { options }, | ||
| renderValue = { | ||
| if (it == null) { | ||
| Text("自动") | ||
| } else { | ||
| Text(it.displayName) | ||
| } | ||
| }, | ||
| renderValueExposed = { | ||
| Text(remember(it) { it?.displayName ?: "字幕" }) | ||
| }, | ||
| modifier, | ||
| ) | ||
| } |
Oops, something went wrong.