Skip to content

Commit e035410

Browse files
committed
update audio and video player composables
1 parent 83f532f commit e035410

File tree

2 files changed

+21
-10
lines changed
  • core/commonui/components/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/commonui/components

2 files changed

+21
-10
lines changed

core/commonui/components/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/commonui/components/AudioPlayer.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import chaintech.videoplayer.model.AudioPlayerConfig
3131
import chaintech.videoplayer.ui.audio.AlbumArt
3232
import chaintech.videoplayer.ui.audio.AudioPlayerComposable
3333
import chaintech.videoplayer.ui.audio.TimeDetails
34+
import com.livefast.eattrash.raccoonforfriendica.core.appearance.theme.Spacing
3435
import com.livefast.eattrash.raccoonforfriendica.core.l10n.LocalStrings
35-
import com.livefast.eattrash.raccoonforfriendica.core.resources.di.getCoreResources
3636

3737
@Composable
3838
fun AudioPlayer(
@@ -41,9 +41,11 @@ fun AudioPlayer(
4141
modifier: Modifier = Modifier,
4242
autoplay: Boolean = false,
4343
) {
44-
val resources = remember { getCoreResources() }
45-
val config = resources.getAudioPlayerConfig()
4644
var isInitial by remember { mutableStateOf(true) }
45+
val config =
46+
AudioPlayerConfig(
47+
controlsBottomPadding = Spacing.s,
48+
)
4749

4850
if (!autoplay && isInitial) {
4951
FakeAudioPlayerComposable(

core/commonui/components/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/commonui/components/VideoPlayer.kt

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package com.livefast.eattrash.raccoonforfriendica.core.commonui.components
33
import androidx.compose.foundation.layout.Box
44
import androidx.compose.material3.MaterialTheme
55
import androidx.compose.runtime.Composable
6-
import androidx.compose.runtime.remember
76
import androidx.compose.ui.Modifier
87
import androidx.compose.ui.layout.ContentScale
8+
import chaintech.videoplayer.host.VideoPlayerHost
9+
import chaintech.videoplayer.model.ScreenResize
10+
import chaintech.videoplayer.model.VideoPlayerConfig
911
import chaintech.videoplayer.ui.preview.VideoPreviewComposable
1012
import chaintech.videoplayer.ui.video.VideoPlayerComposable
11-
import com.livefast.eattrash.raccoonforfriendica.core.resources.di.getCoreResources
1213

1314
@Composable
1415
fun VideoPlayer(
@@ -17,15 +18,23 @@ fun VideoPlayer(
1718
contentScale: ContentScale = ContentScale.FillWidth,
1819
muted: Boolean = true,
1920
) {
20-
val resources = remember { getCoreResources() }
2121
val config =
22-
resources.getPlayerConfig(
23-
contentScale = contentScale,
24-
muted = muted,
22+
VideoPlayerConfig(
23+
isFullScreenEnabled = false,
2524
)
2625
VideoPlayerComposable(
2726
modifier = modifier,
28-
url = url,
27+
playerHost =
28+
VideoPlayerHost(
29+
url = url,
30+
isMuted = muted,
31+
initialVideoFitMode =
32+
if (contentScale == ContentScale.Fit) {
33+
ScreenResize.FIT
34+
} else {
35+
ScreenResize.FILL
36+
},
37+
),
2938
playerConfig = config,
3039
)
3140
}

0 commit comments

Comments
 (0)