From 6538cbd9da898046f5e2bb350bc4345716846cf2 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 22 May 2024 17:45:18 -0400 Subject: [PATCH] Fixes padding of the chat list elements. --- .../com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt | 4 +++- .../vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt | 2 -- .../main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt index 010f29856..c0db96fd8 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt @@ -82,7 +82,7 @@ fun ChannelNamePreview() { } }, supportingContent = { - Row(verticalAlignment = Alignment.CenterVertically) { + Row { Text("This is a message from this person", Modifier.weight(1f)) NewItemsBubble() } @@ -96,6 +96,8 @@ fun ChannelNamePreview() { ) }, ) + + HorizontalDivider(thickness = DividerThickness) } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt index 943f81a7e..1d88fe089 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt @@ -38,7 +38,6 @@ import com.vitorpamplona.amethyst.ui.note.ChatroomHeaderCompose import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.FeedPadding -import com.vitorpamplona.amethyst.ui.theme.StdTopPadding @Composable fun ChatroomListFeedView( @@ -112,7 +111,6 @@ private fun FeedLoaded( } HorizontalDivider( - modifier = StdTopPadding, thickness = DividerThickness, ) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt index e027cee5e..6dc2bfd53 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt @@ -169,7 +169,7 @@ val NotificationIconModifier = Modifier.width(55.dp).padding(end = 5.dp) val NotificationIconModifierSmaller = Modifier.width(55.dp).padding(end = 4.dp) val ZapPictureCommentModifier = Modifier.height(35.dp).widthIn(min = 35.dp) -val ChatHeadlineBorders = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp) +val ChatHeadlineBorders = StdPadding val VolumeBottomIconSize = Modifier.size(70.dp).padding(10.dp) val PinBottomIconSize = Modifier.size(70.dp).padding(10.dp)