From 73303612899204487d5ef10dc85c76b8c3d23604 Mon Sep 17 00:00:00 2001 From: Diogo Date: Thu, 5 Sep 2024 22:33:52 +0100 Subject: [PATCH] chevron and gradient --- .../views/chatlist/UserPicker.android.kt | 61 ++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt index 1e0be144ac..2d46855dd3 100644 --- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt +++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt @@ -30,7 +30,9 @@ actual fun UserPickerInactiveUsersSection( if (users.isNotEmpty()) { SectionItemView(minHeight = 80.dp, padding = PaddingValues(start = 16.dp), disabled = stopped) { Box { - Row(modifier = Modifier.padding(end = DEFAULT_PADDING * 1.9f).horizontalScroll(scrollState)) { + Row( + modifier = Modifier.padding(end = DEFAULT_PADDING + 30.dp).horizontalScroll(scrollState) + ) { users.forEach { u -> UserPickerInactiveUserBadge(u, stopped) { onUserClicked(it) @@ -39,39 +41,42 @@ actual fun UserPickerInactiveUsersSection( } Spacer(Modifier.width(60.dp)) } - Box( - contentAlignment = Alignment.CenterEnd, - modifier = Modifier.padding(end = DEFAULT_PADDING * 0.7f).fillMaxWidth() + Row( + horizontalArrangement = Arrangement.End, + modifier = Modifier + .fillMaxWidth() + .padding(end = DEFAULT_PADDING + 30.dp) + .height(80.dp) ) { - Row( - horizontalArrangement = Arrangement.End, - modifier = Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING).height(60.dp) - ) { - Canvas(modifier = Modifier.height(60.dp).width(100.dp)) { - drawRect( - brush = Brush.linearGradient( - colors = listOf( - Color.Transparent, - CurrentColors.value.colors.surface, - ) - ), - ) - } + Canvas(modifier = Modifier.size(60.dp)) { + drawRect( + brush = Brush.horizontalGradient( + colors = listOf( + Color.Transparent, + CurrentColors.value.colors.surface, + ) + ), + ) } + } + Row( + horizontalArrangement = Arrangement.End, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .height(60.dp) + .fillMaxWidth() + .padding(end = DEFAULT_PADDING) + ) { IconButton( onClick = onShowAllProfilesClicked, enabled = !stopped ) { - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.padding(end = DEFAULT_PADDING_HALF) - ) { - Icon( - painterResource(MR.images.ic_arrow_forward_ios), - stringResource(MR.strings.your_chat_profiles), - tint = MaterialTheme.colors.secondary, - ) - } + Icon( + painterResource(MR.images.ic_chevron_right), + stringResource(MR.strings.your_chat_profiles), + tint = MaterialTheme.colors.secondary, + modifier = Modifier.size(34.dp) + ) } } }