diff options
2 files changed, 11 insertions, 19 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt index 4e72dfef82e1..090750e046a7 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt @@ -312,12 +312,12 @@ private fun BoxScope.CommunalHubLazyGrid( contentType = { index -> list[index].key }, span = { index -> GridItemSpan(list[index].size.span) }, ) { index -> - val cardModifier = Modifier.width(Dimensions.CardWidth) val size = SizeF( Dimensions.CardWidth.value, list[index].size.dp().value, ) + val cardModifier = Modifier.size(width = size.width.dp, height = size.height.dp) if (viewModel.isEditMode && dragDropState != null) { val selected by remember(index) { derivedStateOf { list[index].key == selectedKey.value } } @@ -326,7 +326,6 @@ private fun BoxScope.CommunalHubLazyGrid( selected = selected, enabled = list[index] is CommunalContentModel.Widget, index = index, - size = size ) { isDragging -> CommunalContent( modifier = cardModifier, @@ -536,11 +535,10 @@ private fun CommunalContent( when (model) { is CommunalContentModel.Widget -> WidgetContent(viewModel, model, size, selected, widgetConfigurator, modifier) - is CommunalContentModel.WidgetPlaceholder -> HighlightedItem(size) - is CommunalContentModel.CtaTileInViewMode -> - CtaTileInViewModeContent(viewModel, size, modifier) + is CommunalContentModel.WidgetPlaceholder -> HighlightedItem(modifier) + is CommunalContentModel.CtaTileInViewMode -> CtaTileInViewModeContent(viewModel, modifier) is CommunalContentModel.CtaTileInEditMode -> - CtaTileInEditModeContent(size, modifier, onOpenWidgetPicker) + CtaTileInEditModeContent(modifier, onOpenWidgetPicker) is CommunalContentModel.Smartspace -> SmartspaceContent(model, modifier) is CommunalContentModel.Tutorial -> TutorialContent(modifier) is CommunalContentModel.Umo -> Umo(viewModel, modifier) @@ -549,9 +547,9 @@ private fun CommunalContent( /** Creates an empty card used to highlight a particular spot on the grid. */ @Composable -fun HighlightedItem(size: SizeF, modifier: Modifier = Modifier) { +fun HighlightedItem(modifier: Modifier = Modifier) { Card( - modifier = modifier.size(Dp(size.width), Dp(size.height)), + modifier = modifier, colors = CardDefaults.cardColors(containerColor = Color.Transparent), border = BorderStroke(CardOutlineWidth, LocalAndroidColorScheme.current.tertiaryFixed), shape = RoundedCornerShape(16.dp) @@ -562,12 +560,11 @@ fun HighlightedItem(size: SizeF, modifier: Modifier = Modifier) { @Composable private fun CtaTileInViewModeContent( viewModel: BaseCommunalViewModel, - size: SizeF, modifier: Modifier = Modifier, ) { val colors = LocalAndroidColorScheme.current Card( - modifier = modifier.height(size.height.dp).padding(CardOutlineWidth), + modifier = modifier.padding(CardOutlineWidth), colors = CardDefaults.cardColors( containerColor = colors.primary, @@ -630,7 +627,6 @@ private fun CtaTileInViewModeContent( /** Presents a CTA tile at the end of the hub in edit mode, to add more widgets. */ @Composable private fun CtaTileInEditModeContent( - size: SizeF, modifier: Modifier = Modifier, onOpenWidgetPicker: (() -> Unit)? = null, ) { @@ -639,7 +635,7 @@ private fun CtaTileInEditModeContent( } val colors = LocalAndroidColorScheme.current Card( - modifier = modifier.height(size.height.dp).padding(CardOutlineWidth), + modifier = modifier.padding(CardOutlineWidth), colors = CardDefaults.cardColors(containerColor = Color.Transparent), border = BorderStroke(1.dp, colors.primary), shape = RoundedCornerShape(200.dp), @@ -677,12 +673,11 @@ private fun WidgetContent( modifier: Modifier = Modifier, ) { Box( - modifier = modifier.height(size.height.dp), + modifier = modifier, ) { val paddingInPx = with(LocalDensity.current) { CardOutlineWidth.toPx().toInt() } AndroidView( - modifier = - modifier.align(Alignment.Center).allowGestures(allowed = !viewModel.isEditMode), + modifier = Modifier.fillMaxSize().allowGestures(allowed = !viewModel.isEditMode), factory = { context -> val view = model.appWidgetHost diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt index a1959532fbb9..beb8ddef949d 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt @@ -16,7 +16,6 @@ package com.android.systemui.communal.ui.compose -import android.util.SizeF import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.fadeIn @@ -36,7 +35,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.alpha import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.pointer.pointerInput @@ -245,7 +243,6 @@ fun LazyGridItemScope.DraggableItem( index: Int, enabled: Boolean, selected: Boolean, - size: SizeF, modifier: Modifier = Modifier, content: @Composable (isDragging: Boolean) -> Unit ) { @@ -276,7 +273,7 @@ fun LazyGridItemScope.DraggableItem( enter = fadeIn(), exit = fadeOut() ) { - HighlightedItem(size) + HighlightedItem() } Box(modifier = draggingModifier, propagateMinConstraints = true) { content(dragging) } } |