Merge pull request #7007 from element-hq/renovate/androidx.compose.material3-material3-1.x

Update dependency androidx.compose.material3:material3 to v1.5.0-alpha21
This commit is contained in:
Benoit Marty
2026-07-06 18:31:45 +02:00
committed by GitHub
74 changed files with 228 additions and 160 deletions
@@ -11,7 +11,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -85,9 +86,9 @@ internal fun SelectParentSpaceOptions(
)
if (displaySelectSpaceBottomSheet) {
val sheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true,
confirmValueChange = { true },
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
)
ModalBottomSheet(
sheetState = sheetState,
@@ -200,7 +200,7 @@ private fun RoomListModalBottomSheetContent(
@Composable
internal fun RoomListContextMenuPreview(
@PreviewParameter(RoomListStateContextMenuShownProvider::class) contextMenu: RoomListState.ContextMenu.Shown
) = ElementPreview {
) = ElementPreview(fillMaxSize = true) {
RoomListContextMenu(
contextMenu = contextMenu,
canReportRoom = true,
@@ -24,7 +24,7 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
@@ -57,8 +57,9 @@ fun SpaceFiltersView(
modifier: Modifier = Modifier
) {
val isSelecting by rememberUpdatedState(state is SpaceFiltersState.Selecting)
val sheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true,
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
confirmValueChange = { sheetValueTarget ->
// This ensures the hide animation is not cancelled
when (sheetValueTarget) {
@@ -187,6 +188,6 @@ private fun SpaceFilterItem(
@PreviewsDayNight
@Composable
internal fun SpaceFiltersViewPreview(@PreviewParameter(SpaceFiltersStateProvider::class) state: SpaceFiltersState) = ElementPreview {
internal fun SpaceFiltersViewPreview(@PreviewParameter(SpaceFiltersStateProvider::class) state: SpaceFiltersState) = ElementPreview(fillMaxSize = true) {
SpaceFiltersView(state = state)
}
@@ -30,7 +30,7 @@ import androidx.compose.material3.SheetValue
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.rememberBottomSheetScaffoldState
import androidx.compose.material3.rememberStandardBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
@@ -86,7 +86,9 @@ fun MapBottomSheetScaffold(
customMapStyleUrl: AsyncData<String?>,
modifier: Modifier = Modifier,
scaffoldState: BottomSheetScaffoldState = rememberBottomSheetScaffoldState(
bottomSheetState = rememberStandardBottomSheetState(initialValue = SheetValue.PartiallyExpanded)
bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.PartiallyExpanded,
)
),
cameraState: CameraState = rememberCameraState(),
mapOptions: MapOptions = MapDefaults.options,
@@ -20,7 +20,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetScaffoldState
import androidx.compose.material3.rememberStandardBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
@@ -105,7 +105,9 @@ fun ShareLocationView(
}
val scaffoldState = rememberBottomSheetScaffoldState(
bottomSheetState = rememberStandardBottomSheetState(initialValue = SheetValue.Expanded)
bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded,
)
)
val cameraState = rememberCameraState(firstPosition = MapDefaults.defaultCameraPosition)
@@ -21,7 +21,7 @@ import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetScaffoldState
import androidx.compose.material3.rememberStandardBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
@@ -92,7 +92,9 @@ fun ShowLocationView(
}
val scaffoldState = rememberBottomSheetScaffoldState(
bottomSheetState = rememberStandardBottomSheetState(SheetValue.Expanded)
bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.Expanded,
)
)
LaunchedEffect(state.isSheetDraggable) {
if (!state.isSheetDraggable) {
@@ -31,7 +31,8 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.ReadOnlyComposable
@@ -111,7 +112,9 @@ fun ActionListView(
onVerifiedUserSendFailureClick: (TimelineItem.Event) -> Unit,
modifier: Modifier = Modifier,
) {
val sheetState = rememberModalBottomSheetState()
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
)
val coroutineScope = rememberCoroutineScope()
val targetItem = (state.target as? ActionListState.Target.Success)?.event
@@ -409,7 +412,9 @@ private fun EmojiReactionsRow(
}
Box(
modifier = Modifier.padding(end = 10.dp).requiredSize(48.dp),
modifier = Modifier
.padding(end = 10.dp)
.requiredSize(48.dp),
contentAlignment = Alignment.CenterEnd,
) {
Icon(
@@ -14,7 +14,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
@@ -43,7 +44,10 @@ fun ResolveVerifiedUserSendFailureView(
state: ResolveVerifiedUserSendFailureState,
modifier: Modifier = Modifier,
) {
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
)
var showSheet by remember { mutableStateOf(false) }
fun dismiss() {
@@ -16,7 +16,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
@@ -72,8 +73,9 @@ internal fun AttachmentsBottomSheet(
if (isVisible) {
ModalBottomSheet(
modifier = modifier,
sheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true
sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
),
onDismissRequest = { isVisible = false },
scrollable = false,
@@ -151,10 +153,11 @@ private fun AttachmentSourcePickerMenu(
@PreviewsDayNight
@Composable
internal fun AttachmentSourcePickerMenuPreview() = ElementPreview {
AttachmentSourcePickerMenu(
internal fun AttachmentsBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
AttachmentsBottomSheet(
state = aMessageComposerState(
canShareLocation = true,
showAttachmentSourcePicker = true,
),
onSendLocationClick = {},
onCreatePollClick = {},
@@ -10,7 +10,8 @@ package io.element.android.features.messages.impl.timeline.components.customreac
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
@@ -30,7 +31,9 @@ fun CustomReactionBottomSheet(
onSelectEmoji: (EventOrTransactionId, Emoji) -> Unit,
modifier: Modifier = Modifier,
) {
val sheetState = rememberModalBottomSheetState()
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
)
val coroutineScope = rememberCoroutineScope()
val target = state.target as? CustomReactionState.Target.Success
@@ -9,13 +9,13 @@
package io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
@@ -44,7 +44,9 @@ internal fun ReadReceiptBottomSheet(
) {
val isVisible = state.selectedEvent != null
val sheetState = rememberModalBottomSheetState()
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
)
val coroutineScope = rememberCoroutineScope()
if (isVisible) {
ModalBottomSheet(
@@ -115,9 +117,9 @@ private fun ReadReceiptBottomSheetContent(
@PreviewsDayNight
@Composable
internal fun ReadReceiptBottomSheetPreview(@PreviewParameter(ReadReceiptBottomSheetStateProvider::class) state: ReadReceiptBottomSheetState) = ElementPreview {
Column {
ReadReceiptBottomSheetContent(
internal fun ReadReceiptBottomSheetPreview(@PreviewParameter(ReadReceiptBottomSheetStateProvider::class) state: ReadReceiptBottomSheetState) {
ElementPreview(fillMaxSize = true) {
ReadReceiptBottomSheet(
state = state,
onUserDataClick = {},
)
@@ -12,7 +12,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
@@ -141,7 +142,10 @@ private fun ChangeOwnRoleBottomSheet(
eventSink: (RolesAndPermissionsEvents) -> Unit,
) {
val coroutineScope = rememberCoroutineScope()
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
)
fun dismiss() {
sheetState.hide(coroutineScope) {
eventSink(RolesAndPermissionsEvents.CancelPendingAction)
@@ -22,7 +22,8 @@ import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.rememberCoroutineScope
@@ -221,7 +222,10 @@ private fun RoomMemberActionsBottomSheet(
onDismiss: () -> Unit,
) {
val coroutineScope = rememberCoroutineScope()
val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
val bottomSheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
)
ModalBottomSheet(
modifier = Modifier.systemBarsPadding(),
sheetState = bottomSheetState,
@@ -18,7 +18,8 @@ import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
@@ -47,7 +48,10 @@ fun JoinRoomByAddressView(
state: JoinRoomByAddressState,
modifier: Modifier = Modifier,
) {
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
)
ModalBottomSheet(
modifier = modifier,
sheetState = sheetState,
+1 -1
View File
@@ -126,7 +126,7 @@ androidx_preference = "androidx.preference:preference:1.2.1"
androidx_webkit = "androidx.webkit:webkit:1.16.0"
androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
androidx_compose_material3 = { module = "androidx.compose.material3:material3", version = '1.5.0-alpha15' }
androidx_compose_material3 = { module = "androidx.compose.material3:material3", version = '1.5.0-alpha21' }
androidx_compose_material3_windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class" }
androidx_compose_material3_adaptive = "androidx.compose.material3:material3-adaptive-android:1.0.0-alpha06"
androidx_compose_ui = { module = "androidx.compose.ui:ui" }
@@ -17,7 +17,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
@@ -39,7 +40,10 @@ fun SimpleModalBottomSheet(
ModalBottomSheet(
onDismissRequest = onDismiss,
modifier = modifier,
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
),
scrollable = false,
) {
Column(
@@ -61,7 +65,7 @@ fun SimpleModalBottomSheet(
@PreviewsDayNight
@Composable
internal fun SimpleModalBottomSheetPreview() = ElementPreview {
internal fun SimpleModalBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
SimpleModalBottomSheet(title = "A title", onDismiss = {}) {
Text(
text = LoremIpsum(20).values.first(),
@@ -10,8 +10,13 @@ package io.element.android.libraries.designsystem.preview
import androidx.annotation.DrawableRes
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.movableContentOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.core.content.res.ResourcesCompat
import coil3.annotation.ExperimentalCoilApi
@@ -29,6 +34,7 @@ import io.element.android.libraries.designsystem.utils.CommonDrawables
fun ElementPreview(
theme: Theme = if (isSystemInDarkTheme()) Theme.Dark else Theme.Light,
showBackground: Boolean = true,
fillMaxSize: Boolean = false,
@DrawableRes
drawableFallbackForImages: Int = CommonDrawables.sample_background,
content: @Composable () -> Unit
@@ -40,11 +46,21 @@ fun ElementPreview(
}
) {
ElementTheme(theme = theme) {
val movableContent = remember { movableContentOf { content() } }
if (showBackground) {
// If we have a proper contentColor applied we need a Surface instead of a Box
Surface(content = content)
Surface(
modifier = if (fillMaxSize) Modifier.fillMaxSize() else Modifier,
content = movableContent,
)
} else {
content()
if (fillMaxSize) {
Box(modifier = Modifier.fillMaxSize()) {
movableContent()
}
} else {
movableContent()
}
}
}
}
@@ -11,12 +11,10 @@ package io.element.android.libraries.designsystem.preview
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetState
import androidx.compose.material3.SheetValue
import androidx.compose.runtime.Composable
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun sheetStateForPreview() = SheetState(
skipPartiallyExpanded = true,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
positionalThreshold = { 0.5f },
velocityThreshold = { 400f },
initialValue = SheetValue.Expanded,
@@ -21,8 +21,9 @@ import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.contentColorFor
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.movableContentOf
import androidx.compose.runtime.remember
@@ -57,7 +58,9 @@ fun ModalBottomSheet(
onDismissRequest: () -> Unit,
scrollable: Boolean,
modifier: Modifier = Modifier,
sheetState: SheetState = rememberModalBottomSheetState(),
sheetState: SheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
),
shape: Shape = BottomSheetDefaults.ExpandedShape,
containerColor: Color = MaterialTheme.colorScheme.surface,
contentColor: Color = contentColorFor(containerColor),
@@ -18,7 +18,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.SheetValue
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
@@ -47,8 +48,9 @@ fun AvatarActionBottomSheet(
modifier: Modifier = Modifier,
) {
val coroutineScope = rememberCoroutineScope()
val sheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true
val sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
)
BackHandler(enabled = isVisible) {
@@ -113,7 +115,7 @@ private fun AvatarActionBottomSheetContent(
@PreviewsDayNight
@Composable
internal fun AvatarActionBottomSheetPreview() = ElementPreview {
internal fun AvatarActionBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
AvatarActionBottomSheet(
actions = persistentListOf(AvatarAction.TakePhoto, AvatarAction.ChoosePhoto, AvatarAction.Remove),
isVisible = true,
@@ -17,8 +17,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetValue
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -75,7 +76,10 @@ fun CreateDmConfirmationBottomSheet(
ModalBottomSheet(
modifier = modifier,
onDismissRequest = onDismiss,
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
),
scrollable = false,
) {
Column(
@@ -156,7 +160,7 @@ internal fun CreateDmConfirmationBottomSheetPreview(
@PreviewParameter(
CreateDmConfirmationBottomSheetStateProvider::class
) state: CreateDmConfirmationBottomSheetState
) = ElementPreview {
) = ElementPreview(fillMaxSize = true) {
CreateDmConfirmationBottomSheet(
matrixUser = state.matrixUser,
isUserIdentityUnknown = state.isUserIdentityUnknown,
@@ -20,8 +20,9 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SheetValue
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.rememberBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -59,7 +60,10 @@ fun MediaDeleteConfirmationBottomSheet(
ModalBottomSheet(
modifier = modifier,
onDismissRequest = onDismiss,
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
sheetState = rememberBottomSheetState(
initialValue = SheetValue.Hidden,
enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
),
scrollable = false,
) {
Column(
@@ -165,7 +169,7 @@ private fun MediaRow(
@Composable
internal fun MediaDeleteConfirmationBottomSheetPreview(
@PreviewParameter(provider = MediaBottomSheetStateDeleteConfirmationProvider::class) state: MediaBottomSheetState.DeleteConfirmation,
) = ElementPreview {
) = ElementPreview(fillMaxSize = true) {
MediaDeleteConfirmationBottomSheet(
state = state,
onDelete = {},
@@ -267,7 +267,7 @@ private fun SectionText(
@Composable
internal fun MediaDetailsBottomSheetPreview(
@PreviewParameter(MediaBottomSheetStateDetailsProvider::class) state: MediaBottomSheetState.Details,
) = ElementPreview {
) = ElementPreview(fillMaxSize = true) {
MediaDetailsBottomSheet(
state = state,
onViewInTimeline = {},
@@ -71,7 +71,7 @@ fun CaptionWarningBottomSheet(
@PreviewsDayNight
@Composable
internal fun CaptionWarningBottomSheetPreview() = ElementPreview {
internal fun CaptionWarningBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
CaptionWarningBottomSheet(
onDismiss = {},
)
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aec4d2f2ec1b277afa895e47739b503d86b3104d315b6d20fce223324c57f51b
size 23960
oid sha256:6f199ef24dbc9d8c89b5b28503a887f489a6970355d591aa05d08968f25ddfce
size 23900
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82f48053958a8bd72245365ee0cc4c1649c5c06dde6f66c95c23bf5009edd2f3
size 23879
oid sha256:002bb9faa2d3222cf1b5ef4adb44e9a711ff778a6b6c9f7480620a3c3e69bd21
size 23822
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e50eaee3dc1512f76566d1170c2db8a07230d7c9f159c5f52c43ac9e810e2a72
size 25938
oid sha256:47accbc1fbd8a7d238cd540036bacc5233d9feb5499a1a1f0c9d0cb48ec6748c
size 25862
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3abd359bba25e19e231d723cc3de7dcf394c35a5948a935b2703d81940e00120
size 22391
oid sha256:afdd57a26c55f80a987c6d1e1b7c0f19728fcf99613630897e92ba29423f9f87
size 22212
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4910c5904a53dacc578b32d0033e3fe64fa084602b62dff13930b68ee83e0cf5
size 22298
oid sha256:1c91577d10dfa10f11c2fed1781559c513b5b376ce7636a6ce3dfab73933b6d2
size 22095
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82ed1ed8042d4d6f9633144cc5f34567cfc09c6303e005a7157954917837054d
size 24160
oid sha256:20c44f88a9b347569b4f8ced10b29104541637661134c1a82e2746fa00bd1a25
size 23968
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d12f0060a972296de175c7e8ea7900e3710366cb97a5a9b58065f456ddb201ba
size 32062
oid sha256:720bc9c24ee9e17a79ff9588420558b9c57ac0e50c39ec2729bd1974fbd2187f
size 31947
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1edcd2abb480c46a6c10369fe05ba6e7764b0fe4f94690239dba36b4e13989ff
size 18465
oid sha256:62d389c95049ac094d227083eeeddf36d82654e5f84a2fb92e9a62ec72db23e6
size 18357
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b3d3a5a7255368a0722a024ae72b8f864556e9da5dfd6204b8cea3504bd22a9
size 30645
oid sha256:19fffb5f139f9b0af134eb108b0b19238010a18ae32e87ae673b8b1aa8f6d246
size 30488
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8a451f8da02325bf3dd0815fa2fb76d55fb7baaa4e602b82339bd79f22bfb9a
size 17497
oid sha256:28d6a11ab288b0750b6eef0e1f2488d4a150aebb5dd3184a66c4af14f3685c71
size 17340
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bfc50e8997f52f2b0b808af90b09000a27c9943505460692fbe541a3bd95c440
size 25622
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4faa8dc1a367649a4a862e8647e733d77dd31737b34f9a8a5997f2345dab50a0
size 25035
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecda20f80c78991c5835e3e32fb18db8e08ba0ff8d8308c8a3c06ab46687006f
size 27083
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ac6266d2081724960015f80dd7a489a6746bd4bd705755b92d91500e1f7bb2f
size 25443
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0cab01f0ee35ce1c02d2cca172b90c34c27f088bfcd63075c27afe514c335b2b
size 5830
oid sha256:5cd23b8ab206543d9632589c9c6e3ae157846cbbeef683d187f0fb8a7475b27d
size 6698
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d3decc8bb6e090f11f074cd681d710fe3dbdb1670a257757d40b7d1f1bb5f03
size 11305
oid sha256:b161e07f504adbb140c80945cf9cd5b31dad4edeeb86d1b683fef4f02148a110
size 12178
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c57aa1289587a7646f1b594a44cb738425f3dc6fa057f4e48b34960ce7162af1
size 16754
oid sha256:df393203d4535dd63962cae667253c00c19dc4b6e25c887619ff5e833066f4ba
size 17596
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0fa280febb13f2df22a930ee56f1a9f92bbb2782a83ec2f5768160176445fc5
size 21849
oid sha256:6f4886f895d90cbd175fab866329841b45a13890b923ee7928673698d320b60f
size 22940
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5e6b78ae1507cba5face18a6209f535b3e8643bcbcaa5913e368d8516845e43
size 26063
oid sha256:541e50bba5a4dd70015bbc5410d8d8c9b0cd194ab119918f64baf73cefdd618d
size 27956
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38c4292a4bfd69b485f4d072fb627d457c50e675c2b13534ac3f75d62a3fc38e
size 31445
oid sha256:2023632334cfbd15b399fce33cb5ac04135f371d6cb09669fd66f97bc86e8fae
size 32655
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d49f4b65797a915e6e2858d12d044f9745442ea9d68cd502db10589e7ffe99b
size 5623
oid sha256:d7580ba96fcc879011f591ac4bacd16d3c7cdc7db51f39cc7989c7c4dffdaa69
size 5937
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:988621910e3cf4792d9f23a69f2ec42ee46ef4fdaf6248a6ffd18f919ff433dc
size 10936
oid sha256:eaf905401acff2b0000abc9c7a13b8034c55d12e355908dded5b1a24fe573fb8
size 11366
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b87ff2c70860a5d2c5f8a987440ff97ebbb97b03c5726948e00e7adcd3e38111
size 16087
oid sha256:e6dc3ec6b43eda48a6d96af60aa983c2a8c42d4da81ef48dc2bd783309de8316
size 16469
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:909bbf2ef3308f5b92a2598b32480175a2e179d6c6ec99f749594d85e9762e2e
size 21317
oid sha256:fa666b0e8ec6d77820c31ebeed2ba9fc9868d07e56eb77ff079b5cd2b2840224
size 21836
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cefa811e8c4df8643fa53a715a2509e1af9090928947538c7dd212e6fa7a791d
size 26152
oid sha256:e260c421c187424b8d139e75351aa3e654fcf28975aebc4bbcefd8f77c2d21d6
size 27082
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c126c9ee9b6039dc05b6c8133fd5879062aee404b1a9ab2104765ba676d909f6
size 31526
oid sha256:48537a0e326d7cf1fc36060fd2831bfa3b237806a79b492368471de25f331a58
size 32174
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12195a28876c3c90b0488edf00046f5b941faa8c7203e60f5ab9317dcbe35cf1
size 25757
oid sha256:8c25056de98a8d1ede49e5cbd2c233a167162302f42e2c659aa0e1695ce09375
size 25642
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6ab0c3e8353c2e3ce517065fb66c1fca10d58b96081c0dc7a44d59dd084cb3f
size 24498
oid sha256:7ffa5947893e59d3e534e070116a66e93e3c0163a76d7712b551177c2fea7bc0
size 24314
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a804cd9678ae0aa149065dfc7ce98bacb30956ac75a17f80a7f32acbbb6681c
size 13598
oid sha256:88d49b19b4ad6ec1a04e6adf0c0a7bfac5a20759b851a021cf3d41685e174508
size 13530
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44fa03d304319f972c0e9c6e297e4b86bd0603a90945126f47f657d566241911
size 12500
oid sha256:02dbdd5d3c6c8b3dda43b71cbec72448d89d5950ea70c270d4ce88270b3c8c03
size 12305
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbbe069eaeff3c1bfb39e4b3e3356e92864f10a57ca4ccb2029e38b5977b6f45
size 25648
oid sha256:06d26a7f7fa05f1844a93130ac8110c987e3d53d51da246cb474f770edd67413
size 25541
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97e6bbc6cc6d5bb90606bc7f934258c8060d7ca5fade8da6a1aae288e8558bb4
size 38390
oid sha256:70bea7e1a7e3fcfa9029b61c2f1ce49c911bb7301b14e10d532334337dd50ac9
size 38316
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b14f8a5a50deb5dd4854665cd41511228f5ba47b0719bf35b4d1675d0f20ce1
size 24527
oid sha256:0d5a96a18c59042d9560ae657e91ed0cfc7667fd430fb3b1423fe88f18d63ceb
size 24348
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:841042eabcd85626a5182108edae46b4514f84a8f22c57e324c02430536acff2
size 36738
oid sha256:f7d2e2efb9d44584e96986d8dcd69b100c75e64c2f4474e6f1e0852565d40410
size 36571
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2222b0d2d1589df67d73aad8eee9a1f30efb1392e0c5493f47f69cac01c8710b
size 31044
oid sha256:39eb057c5afa754f2a9f21789cc946901982efb7c29adadab3396680051d7a96
size 30951
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20fa72623728a8f1b8206af75dcba3b83384aeab2977fde952bc4d3000aa7d7b
size 43579
oid sha256:48bd7238ff41e9ae218c1b2369a6841ba4462194db0522ae24d4a88e04cc032b
size 43509
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ada067f89b469fccaaf4b9751c0469a9f776ef6206d5ebbb68b7b2128d77ce3c
size 29564
oid sha256:00948f7166eec146c6e7092b4b9562a12fb1fa5fbacb080256ade04e1d8cc1a8
size 29385
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f717f0e4ea67364e505e8c756931d11bdb696d7be5f11bb155f085c9f2a668cc
size 42149
oid sha256:12d4fff60ccddbbc45aa2ee15f7191a761e5b944ba990d0c7ec3d8d579b7c297
size 41992
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64f672ee115fee2fcbf9a276926fe5c2c97820f2644c4f37e2492fa1de9680a5
size 40454
oid sha256:f6bc140ee95f9971e95b1eebdc08cd524310cb9f19b5f392832a9cac42de87ab
size 40369
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ac2d77c7d905175cf7b49a8fcb4aeeef12fa40037ff8d1ff8210ffb876e066e
size 38434
oid sha256:989b79de2661de014aa33933cf46e3beaa83853f1c4a5869a64aa9569c8f4903
size 38334
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff64b6429ce00980b65cd4867bc524bcc4967be033019a5f6a731f1c17140650
size 44786
oid sha256:9a11fe51900ac2f82dd134f03cdd070e0d1eea7ef1f857098a719b737c5740c1
size 44700
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a335f858bbca40a0bdb3bd239fdc3625975d44ddc45bb653815f20acde9ffd0f
size 30710
oid sha256:640f57346441f38bb5e46bf0feabfa570cf59b1a68225621a748415b9bd36a75
size 30587
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e11cd3b0b82727388e96651b0d811911c38210eda52eccf1f9f7a98730e716b5
size 40906
oid sha256:7b6cf67bf5ed218c3506304ff0062a91e23c95f189dac2bad32540a64e6556b2
size 40821
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:535483df39fa09e9156d390867308a686c0bfb74b9eb2e5c2bb686b641585a9f
size 39533
oid sha256:3d19ed9cd344be378c3ac33cc3efe8708e7803fde0234c524d83bf1a27fc2b71
size 39320
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a90c7beaea159f4d82d4ccd5aa8dd2187c7cf23d8d4c8e9d6dea817023dab80a
size 37130
oid sha256:99a42e82444e021a1fc6b1fbbc92b525fa47b9134ba6cc1f96a625f9ed71bab1
size 36958
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:386e8650f2203d6388377ab988d2da7a9b052b96a6a2ba5d89d3972a70f24ce3
size 43805
oid sha256:0d68ba74c14b13e484ea241ca84c57790504774f305b4201da86074a2ddade7f
size 43594
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:423e92ee408ca6c3ab7c1071245810fcbc2d25a7ce62b3068f1616c933ad008c
size 29216
oid sha256:27e1ee018a732cf5583007910e3fae9301c734a25276131f74150b180ebcd049
size 29039
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8085e4ff5c8361629a3b8559fc2a5ce417b80fb3c3a347f7c3cef049c123b5fe
size 39998
oid sha256:67331c3aefde56724a506736863330168c3cc847beae6fd1220fae26c569f8c2
size 39789
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f108e1a69cf971588cb8d344fe0d908b0f175619f5d81d9fb43946a3a337826e
size 18521
oid sha256:b18bd93355bca3cbecf9534ae91959204cdd84c399671ce56782c61e8e5c69b6
size 18443
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b4897fe30d6fe2174a2272788b29e087ef63ec777886fd5ca556575137060b0
size 17368
oid sha256:1aecd66da70fbf9a065a813951e6e434d0191da0b1a4e7bf9b4f466116e8722d
size 17159