From f17336b6157f0fe7624dc4150c6965ee732b7de9 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 21 Mar 2022 15:25:12 +0100 Subject: [PATCH] Fix list item spacing --- .../mm20/launcher2/ui/launcher/search/files/FileItem.kt | 8 +++----- .../launcher2/ui/launcher/search/shortcut/ShortcutItem.kt | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt index e389cf68..4ef20d80 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt @@ -53,13 +53,10 @@ fun FileItem( Row( verticalAlignment = Alignment.Top ) { - val textPadding by transition.animateDp(label = "textPadding") { - if (it) 16.dp else 12.dp - } Column( modifier = Modifier .weight(1f) - .padding(start = 16.dp, top = textPadding, end = 16.dp) + .padding(16.dp) ) { val textStyle by animateTextStyleAsState( if (showDetails) MaterialTheme.typography.titleMedium @@ -76,7 +73,8 @@ fun FileItem( file.getFileType(context), style = MaterialTheme.typography.bodySmall, maxLines = 1, - overflow = TextOverflow.Ellipsis + overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(top = 2.dp) ) } AnimatedVisibility(showDetails) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt index 2342dd3b..f4153c50 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt @@ -54,18 +54,15 @@ fun AppShortcutItem( modifier = modifier ) { Row { - val topPadding by transition.animateDp(label = "topPadding") { - if (it) 16.dp else 14.dp - } Column( modifier = Modifier .weight(1f) - .padding(start = 16.dp, top = topPadding, bottom = 16.dp, end = 16.dp) + .padding(16.dp) ) { val titleStyle by animateTextStyleAsState(if (showDetails) MaterialTheme.typography.titleMedium else MaterialTheme.typography.titleSmall) Text(text = shortcut.label, style = titleStyle, maxLines = 1, overflow = TextOverflow.Ellipsis) val textSpace by transition.animateDp(label = "textSpace") { - if (it) 4.dp else 0.dp + if (it) 4.dp else 2.dp } Text( text = stringResource(R.string.shortcut_summary, shortcut.appName),