From 13ae92eafedf399bf5bde06968efef0eb73f36ae Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:26:16 +0200 Subject: [PATCH] Make grid spacing more uniform when labels are hidden Close #853 --- .../launcher2/ui/launcher/search/common/grid/GridItem.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt index 8d62562e..e0fe2324 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt @@ -8,9 +8,11 @@ import androidx.compose.foundation.background import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.ime @@ -115,8 +117,9 @@ fun GridItem( }, indication = null, interactionSource = remember { MutableInteractionSource() }, - ), - horizontalAlignment = Alignment.CenterHorizontally + ) then if (!showLabels) Modifier.aspectRatio(1f) else Modifier, + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, ) { val badge by viewModel.badge.collectAsStateWithLifecycle() val icon by viewModel.icon.collectAsStateWithLifecycle()