From 6d8b5fa85de5beaddc8951611cd73e724b8ad223 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 29 Oct 2025 15:19:11 -0400 Subject: [PATCH] Moves message button to Profile Actions --- .../ui/screen/loggedIn/profile/header/ProfileActions.kt | 2 ++ .../ui/screen/loggedIn/profile/header/ProfileHeader.kt | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileActions.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileActions.kt index f920efef3..2d7c7de83 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileActions.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileActions.kt @@ -47,6 +47,8 @@ fun ProfileActions( accountViewModel: AccountViewModel, nav: INav, ) { + MessageButton(baseUser, accountViewModel, nav) + val isMe by remember(accountViewModel) { derivedStateOf { accountViewModel.userProfile() == baseUser } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileHeader.kt index 95ebf842c..5c9b35109 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileHeader.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/ProfileHeader.kt @@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -123,6 +122,7 @@ fun ProfileHeader( .padding(top = 100.dp), ) { Row( + modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Bottom, ) { @@ -149,16 +149,12 @@ fun ProfileHeader( }, ) - Spacer(Modifier.weight(1f)) - Row( modifier = Modifier .height(Size35dp) .padding(bottom = 3.dp), ) { - MessageButton(baseUser, accountViewModel, nav) - ProfileActions(baseUser, accountViewModel, nav) } }