UserPicker.android: align profile boxes with menu card left edge (CARD_PADDING)

This commit is contained in:
another-simple-pixel
2026-05-18 01:55:26 -07:00
parent 426208fdda
commit 963140e9a0
@@ -1,5 +1,6 @@
package chat.simplex.common.views.chatlist
import CARD_PADDING
import SectionItemView
import androidx.compose.foundation.*
import androidx.compose.foundation.gestures.Orientation
@@ -50,7 +51,7 @@ actual fun UserPickerUsersSection(
Row(
modifier = Modifier.horizontalScroll(scrollState),
) {
Spacer(Modifier.width(DEFAULT_PADDING))
Spacer(Modifier.width(CARD_PADDING))
Row(horizontalArrangement = Arrangement.spacedBy(USER_PICKER_ROW_PADDING)) {
users.forEach { u ->
UserPickerUserBox(u, stopped, modifier = Modifier.userBoxWidth(u.user, users.size, screenWidthDp)) {
@@ -62,7 +63,7 @@ actual fun UserPickerUsersSection(
}
}
}
Spacer(Modifier.width(DEFAULT_PADDING))
Spacer(Modifier.width(CARD_PADDING))
}
}
}
@@ -219,10 +220,10 @@ private fun Modifier.draggableBottomDrawerModifier(
private fun Modifier.userBoxWidth(user: User, totalUsers: Int, windowWidth: Dp): Modifier {
return if (totalUsers == 1) {
this.width(windowWidth - DEFAULT_PADDING * 2)
this.width(windowWidth - CARD_PADDING * 2)
} else if (user.activeUser) {
this.width(windowWidth - DEFAULT_PADDING - (USER_PICKER_ROW_PADDING * 3) - USER_PICKER_IMAGE_SIZE)
this.width(windowWidth - CARD_PADDING - (USER_PICKER_ROW_PADDING * 3) - USER_PICKER_IMAGE_SIZE)
} else {
this.widthIn(max = (windowWidth - (DEFAULT_PADDING * 2)) * 0.618f)
this.widthIn(max = (windowWidth - (CARD_PADDING * 2)) * 0.618f)
}
}