diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt index 3d1cef88e8..67868be7dc 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt @@ -26,7 +26,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter @@ -40,6 +39,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.IconButton import io.element.android.libraries.designsystem.theme.components.Slider import io.element.android.libraries.designsystem.theme.components.Text +import io.element.android.libraries.mediaviewer.impl.util.bgCanvasWithTransparency import io.element.android.libraries.ui.strings.CommonStrings @Composable @@ -58,7 +58,7 @@ fun MediaPlayerControllerView( ) { Box( modifier = Modifier - .background(color = Color(0x99101317)) + .background(color = bgCanvasWithTransparency) .padding(horizontal = 8.dp, vertical = 4.dp), contentAlignment = Alignment.Center, ) { diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt new file mode 100644 index 0000000000..5105f1ba9b --- /dev/null +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt @@ -0,0 +1,16 @@ +/* + * Copyright 2025 New Vector Ltd. + * + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial + * Please see LICENSE files in the repository root for full details. + */ + +package io.element.android.libraries.mediaviewer.impl.util + +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import io.element.android.compound.theme.ElementTheme + +val bgCanvasWithTransparency: Color + @Composable + get() = ElementTheme.colors.bgCanvasDefault.copy(alpha = 0.6f) diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt index dea8ee1df3..1b99cdfa03 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt @@ -16,6 +16,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import io.element.android.compound.theme.ElementTheme import kotlinx.coroutines.delay import me.saket.telephoto.flick.FlickToDismiss import me.saket.telephoto.flick.FlickToDismissState @@ -90,5 +91,5 @@ private fun backgroundColorFor(flickState: FlickToDismissState): Color { }, label = "Background alpha", ) - return Color.Black.copy(alpha = animatedAlpha) + return ElementTheme.colors.bgCanvasDefault.copy(alpha = animatedAlpha) } diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt index ddb9c0923c..1ce74b03a1 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt @@ -78,6 +78,7 @@ import io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomS import io.element.android.libraries.mediaviewer.impl.local.LocalMediaView import io.element.android.libraries.mediaviewer.impl.local.PlayableState import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState +import io.element.android.libraries.mediaviewer.impl.util.bgCanvasWithTransparency import io.element.android.libraries.ui.strings.CommonStrings import kotlinx.coroutines.delay import me.saket.telephoto.zoomable.ZoomSpec @@ -209,7 +210,7 @@ fun MediaViewerView( } }, colors = TopAppBarDefaults.topAppBarColors( - containerColor = Color.Black.copy(alpha = 0.6f), + containerColor = bgCanvasWithTransparency, ), navigationIcon = { BackButton(onClick = onBackClick) }, ) @@ -455,7 +456,7 @@ private fun MediaViewerTopBar( } }, colors = TopAppBarDefaults.topAppBarColors( - containerColor = Color.Black.copy(alpha = 0.6f), + containerColor = bgCanvasWithTransparency, ), navigationIcon = { BackButton(onClick = onBackClick) }, actions = { @@ -501,7 +502,7 @@ private fun MediaViewerBottomBar( Column( modifier = modifier .fillMaxWidth() - .background(Color(0x99101317)) + .background(bgCanvasWithTransparency) .onSizeChanged { onHeightChange(it.height) },