RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: logic and positioning for user dropdown 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-06-05 15:10:42 +02:00
parent e9c3b8ec95
commit 3127b95d9e
1 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/chat/revolt/components/screens/settings/UserButtons.kt
View File

@ -5,7 +5,6 @@ import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
@ -218,21 +217,12 @@ fun UserButtons(
"BlockedOther" -> Box(Modifier.weight(1f)) "BlockedOther" -> Box(Modifier.weight(1f))
} }
when (user.relationship) { if (user.relationship != "User") {
"Friend", "Incoming", "Outgoing", "None", "Blocked", "BlockedOther" -> { Row { // Prevent the dropdown menu from counting towards arrangement spacing
Column { // Prevent the dropdown menu from counting towards arrangement spacing DropdownMenu(
IconButton( expanded = menuOpen,
onClick = { onDismissRequest = { menuOpen = false }
menuOpen = true
}
) { ) {
Icon(
imageVector = Icons.Default.MoreVert,
contentDescription = stringResource(R.string.menu)
)
}
DropdownMenu(expanded = menuOpen, onDismissRequest = { menuOpen = false }) {
when (user.relationship) { when (user.relationship) {
"Friend" -> { "Friend" -> {
DropdownMenuItem( DropdownMenuItem(
@ -293,6 +283,16 @@ fun UserButtons(
} }
) )
} }
IconButton(
onClick = {
menuOpen = true
}
) {
Icon(
imageVector = Icons.Default.MoreVert,
contentDescription = stringResource(R.string.menu)
)
} }
} }
} }