From 9b5a032e5903fd231c91752031c3e5a9ee4c3b30 Mon Sep 17 00:00:00 2001 From: another-simple-pixel Date: Mon, 18 May 2026 09:48:03 -0700 Subject: [PATCH] Revert "AddGroupView/AddChannelView: wrap action buttons + toggles in SectionView card" This reverts commit 4d9319d12af6eebb2b344b1d8d627b4510c644ab. --- .../common/views/newchat/AddChannelView.kt | 42 +++++++++---------- .../common/views/newchat/AddGroupView.kt | 37 ++++++++-------- 2 files changed, 37 insertions(+), 42 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt index b456334184..b39349fc90 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt @@ -311,29 +311,27 @@ private fun ProfileStepView( } Spacer(Modifier.height(8.dp)) - SectionView { - SettingsActionItem( - painterResource(MR.images.ic_wifi_tethering), - generalGetString(MR.strings.configure_relays), - click = { - ModalManager.start.showCustomModal { close -> - NetworkAndServersView(close) - } - }, - textColor = if (hasRelays.value) MaterialTheme.colors.primary else WarningOrange, - iconColor = if (hasRelays.value) MaterialTheme.colors.primary else WarningOrange - ) + SettingsActionItem( + painterResource(MR.images.ic_wifi_tethering), + generalGetString(MR.strings.configure_relays), + click = { + ModalManager.start.showCustomModal { close -> + NetworkAndServersView(close) + } + }, + textColor = if (hasRelays.value) MaterialTheme.colors.primary else WarningOrange, + iconColor = if (hasRelays.value) MaterialTheme.colors.primary else WarningOrange + ) - val canCreate = canCreateProfile(displayName.value) && hasRelays.value && !creationInProgress.value - SettingsActionItem( - painterResource(MR.images.ic_check), - generalGetString(MR.strings.create_channel_button), - click = createChannel, - textColor = MaterialTheme.colors.primary, - iconColor = MaterialTheme.colors.primary, - disabled = !canCreate - ) - } + val canCreate = canCreateProfile(displayName.value) && hasRelays.value && !creationInProgress.value + SettingsActionItem( + painterResource(MR.images.ic_check), + generalGetString(MR.strings.create_channel_button), + click = createChannel, + textColor = MaterialTheme.colors.primary, + iconColor = MaterialTheme.colors.primary, + disabled = !canCreate + ) SectionTextFooter( if (!hasRelays.value) { diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt index b0d56e0cd2..b1529a7dfa 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt @@ -1,7 +1,6 @@ package chat.simplex.common.views.newchat import SectionTextFooter -import SectionView import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.foundation.* import androidx.compose.foundation.layout.* @@ -151,26 +150,24 @@ fun AddGroupLayout( } Spacer(Modifier.height(8.dp)) - SectionView { - SettingsActionItem( - painterResource(MR.images.ic_check), - stringResource(MR.strings.create_group_button), - click = { - createGroup(incognito.value, GroupProfile( - displayName = displayName.value.trim(), - fullName = "", - shortDescr = null, - image = profileImage.value, - groupPreferences = GroupPreferences(history = GroupPreference(GroupFeatureEnabled.ON)) - )) - }, - textColor = MaterialTheme.colors.primary, - iconColor = MaterialTheme.colors.primary, - disabled = !canCreateProfile(displayName.value) - ) + SettingsActionItem( + painterResource(MR.images.ic_check), + stringResource(MR.strings.create_group_button), + click = { + createGroup(incognito.value, GroupProfile( + displayName = displayName.value.trim(), + fullName = "", + shortDescr = null, + image = profileImage.value, + groupPreferences = GroupPreferences(history = GroupPreference(GroupFeatureEnabled.ON)) + )) + }, + textColor = MaterialTheme.colors.primary, + iconColor = MaterialTheme.colors.primary, + disabled = !canCreateProfile(displayName.value) + ) - IncognitoToggle(incognitoPref, incognito) { ModalManager.start.showModal { IncognitoView() } } - } + IncognitoToggle(incognitoPref, incognito) { ModalManager.start.showModal { IncognitoView() } } SectionTextFooter( buildAnnotatedString {