dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-08-28 09:44:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "AddGroupView/AddChannelView: wrap action buttons + toggles in SectionView card"

Browse Source 
This reverts commit 4d9319d12a.
This commit is contained in:
another-simple-pixel
2026-05-18 09:48:03 -07:00
parent 6d3b28a8e6
commit 9b5a032e59
2 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt
+20 -22
View File
@@ -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) {
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
+17 -20
View File
@@ -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 {