dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-27 11:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

move your chat profiles inside android specific

Browse Source
This commit is contained in:
Diogo
2024-09-05 11:33:00 +01:00
parent 4b61beb237
commit 140bc679ab
2 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
+47 -39
View File
@@ -28,52 +28,60 @@ actual fun UserPickerInactiveUsersSection(
) {
val scrollState = rememberScrollState()
SectionItemView(minHeight = 80.dp, padding = PaddingValues(start = 16.dp), disabled = stopped) {
Box {
Row(modifier = Modifier.padding(end = DEFAULT_PADDING).horizontalScroll(scrollState)) {
users.forEach { u ->
val size = 60
UserPickerInactiveUserBadge(u, stopped) {
onUserClicked(it)
}
Spacer(Modifier.width((size * 0.618).dp))
}
}
Box(
contentAlignment = Alignment.CenterEnd,
modifier = Modifier.fillMaxWidth()
) {
Row(
horizontalArrangement = Arrangement.End,
modifier = Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING).height(60.dp)
) {
Canvas(modifier = Modifier.height(60.dp).width(200.dp)) {
drawRect(
brush = Brush.linearGradient(
colors = listOf(
Color.Transparent,
CurrentColors.value.colors.surface,
)
),
)
if (users.isNotEmpty()) {
SectionItemView(minHeight = 80.dp, padding = PaddingValues(start = 16.dp), disabled = stopped) {
Box {
Row(modifier = Modifier.padding(end = DEFAULT_PADDING).horizontalScroll(scrollState)) {
users.forEach { u ->
val size = 60
UserPickerInactiveUserBadge(u, stopped) {
onUserClicked(it)
}
Spacer(Modifier.width((size * 0.618).dp))
}
}
IconButton(
onClick = onShowAllProfilesClicked,
enabled = !stopped,
Box(
contentAlignment = Alignment.CenterEnd,
modifier = Modifier.fillMaxWidth()
) {
Box(
contentAlignment = Alignment.CenterEnd
Row(
horizontalArrangement = Arrangement.End,
modifier = Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING).height(60.dp)
) {
Icon(
painterResource(MR.images.ic_chevron_right),
stringResource(MR.strings.your_chat_profiles),
tint = MaterialTheme.colors.secondary,
modifier = Modifier.size(60.dp * fontSizeSqrtMultiplier)
)
Canvas(modifier = Modifier.height(60.dp).width(200.dp)) {
drawRect(
brush = Brush.linearGradient(
colors = listOf(
Color.Transparent,
CurrentColors.value.colors.surface,
)
),
)
}
}
IconButton(
onClick = onShowAllProfilesClicked,
enabled = !stopped,
) {
Box(
contentAlignment = Alignment.CenterEnd
) {
Icon(
painterResource(MR.images.ic_chevron_right),
stringResource(MR.strings.your_chat_profiles),
tint = MaterialTheme.colors.secondary,
modifier = Modifier.size(60.dp * fontSizeSqrtMultiplier)
)
}
}
}
}
}
} else {
UserPickerOptionRow(
painterResource(MR.images.ic_manage_accounts),
stringResource(MR.strings.your_chat_profiles),
onShowAllProfilesClicked
)
}
}
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+7 -16
View File
@@ -45,8 +45,7 @@ import dev.icerock.moko.resources.compose.stringResource
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
@Composable
private fun UserPickerOptionRow(icon: Painter, text: String, click: (() -> Unit)? = null, disabled: Boolean = false) {
@Composable fun UserPickerOptionRow(icon: Painter, text: String, click: (() -> Unit)? = null, disabled: Boolean = false) {
SectionItemView(click, disabled = disabled) {
Icon(icon, text, tint = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.secondary)
TextIconSpaced()
@@ -221,20 +220,12 @@ private fun GlobalSettingsSection(
}
SectionView {
if (users.isNotEmpty()) {
UserPickerInactiveUsersSection(
users = users,
onShowAllProfilesClicked = onShowAllProfilesClicked,
onUserClicked = onUserClicked,
stopped = stopped
)
} else {
UserPickerOptionRow(
painterResource(MR.images.ic_manage_accounts),
stringResource(MR.strings.your_chat_profiles),
onShowAllProfilesClicked
)
}
UserPickerInactiveUsersSection(
users = users,
onShowAllProfilesClicked = onShowAllProfilesClicked,
onUserClicked = onUserClicked,
stopped = stopped
)
if (appPlatform.isAndroid) {
val text = generalGetString(MR.strings.settings_section_title_use_from_desktop).lowercase().capitalize(Locale.current)