Fix player controls not showing on attachment preview.

This commit is contained in:
Benoit Marty 2024-12-02 17:38:47 +01:00 committed by Benoit Marty
parent f0c07c15a8
commit 919c3e17bf

View file

@ -11,12 +11,14 @@ import androidx.activity.compose.BackHandler
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@ -81,8 +83,9 @@ fun AttachmentsPreviewView(
title = {}, title = {},
) )
} }
) { ) { paddingValues ->
AttachmentPreviewContent( AttachmentPreviewContent(
modifier = Modifier.padding(paddingValues),
state = state, state = state,
localMediaRenderer = localMediaRenderer, localMediaRenderer = localMediaRenderer,
onSendClick = ::postSendAttachment, onSendClick = ::postSendAttachment,
@ -134,14 +137,16 @@ private fun AttachmentPreviewContent(
state: AttachmentsPreviewState, state: AttachmentsPreviewState,
localMediaRenderer: LocalMediaRenderer, localMediaRenderer: LocalMediaRenderer,
onSendClick: () -> Unit, onSendClick: () -> Unit,
modifier: Modifier = Modifier,
) { ) {
Box( Column(
modifier = Modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.navigationBarsPadding(), .navigationBarsPadding(),
) { ) {
Box( Box(
modifier = Modifier.fillMaxSize(), modifier = Modifier
.weight(1f),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
when (val attachment = state.attachment) { when (val attachment = state.attachment) {
@ -157,7 +162,6 @@ private fun AttachmentPreviewContent(
.fillMaxWidth() .fillMaxWidth()
.background(ElementTheme.colors.bgCanvasDefault) .background(ElementTheme.colors.bgCanvasDefault)
.height(IntrinsicSize.Min) .height(IntrinsicSize.Min)
.align(Alignment.BottomCenter)
.imePadding(), .imePadding(),
) )
} }