mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Fix player controls not showing on attachment preview.
This commit is contained in:
committed by
Benoit Marty
parent
3c5454f0b7
commit
89aee0446a
+9
-5
@@ -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(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user