highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-29 03:02:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

show videos as links

Browse Source
This commit is contained in:
greenart7c3
2023-07-13 18:07:57 -03:00
parent 63888d55fd
commit 7c525e2f2f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
View File

@@ -131,7 +131,7 @@ fun VideoView1(
thumb: VideoThumb? = null, thumb: VideoThumb? = null,
onDialog: ((Boolean) -> Unit)? = null, onDialog: ((Boolean) -> Unit)? = null,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
alwaysShowVideo: Boolean = false, alwaysShowVideo: Boolean = false
) { ) {
var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) } var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) }
val defaultToStart by remember { mutableStateOf(DefaultMutedSetting.value) } val defaultToStart by remember { mutableStateOf(DefaultMutedSetting.value) }
@@ -166,7 +166,7 @@ fun VideoView(
thumb: VideoThumb? = null, thumb: VideoThumb? = null,
onDialog: ((Boolean) -> Unit)? = null, onDialog: ((Boolean) -> Unit)? = null,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
alwaysShowVideo: Boolean = false, alwaysShowVideo: Boolean = false
) { ) {
val (_, elapsed) = measureTimedValue { val (_, elapsed) = measureTimedValue {
VideoView1(videoUri, description, exoPlayerData, defaultToStart, thumb, onDialog, accountViewModel, alwaysShowVideo) VideoView1(videoUri, description, exoPlayerData, defaultToStart, thumb, onDialog, accountViewModel, alwaysShowVideo)
@@ -183,7 +183,7 @@ fun VideoView1(
thumb: VideoThumb? = null, thumb: VideoThumb? = null,
onDialog: ((Boolean) -> Unit)? = null, onDialog: ((Boolean) -> Unit)? = null,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
alwaysShowVideo: Boolean = false, alwaysShowVideo: Boolean = false
) { ) {
val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current) val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
@@ -194,12 +194,13 @@ fun VideoView1(
val automaticallyStartPlayback = remember { val automaticallyStartPlayback = remember {
mutableStateOf( mutableStateOf(
if (alwaysShowVideo) true else if (alwaysShowVideo) { true } else {
when (settings.automaticallyStartPlayback) { when (settings.automaticallyStartPlayback) {
true -> !isMobile true -> !isMobile
false -> false false -> false
else -> true else -> true
} }
}
) )
} }
@@ -227,7 +228,11 @@ fun VideoView1(
prepare() prepare()
} }
if (!automaticallyStartPlayback.value) {
ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
} else {
RenderVideoPlayer(exoPlayerData, thumb, automaticallyStartPlayback, onDialog) RenderVideoPlayer(exoPlayerData, thumb, automaticallyStartPlayback, onDialog)
}
DisposableEffect(Unit) { DisposableEffect(Unit) {
val observer = LifecycleEventObserver { _, event -> val observer = LifecycleEventObserver { _, event ->