dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-10 17:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: adjust create channel ui (#6950)

Browse Source
This commit is contained in:
spaced4ndy
2026-05-08 06:27:26 +00:00
committed by GitHub
parent fb88a0e52c
commit d9cfc9bd3d
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/NewChat/AddChannelView.swift
+3 -5
View File
@@ -338,6 +338,9 @@ struct AddChannelView: View {
.compactSectionSpacing()
Section {
Button("Cancel and delete channel", role: .destructive) {
showCancelChannelAlert(gInfo)
}
Button("Continue") {
if activeCount >= total {
showLinkStep = true
@@ -365,11 +368,6 @@ struct AddChannelView: View {
}
.navigationTitle("Creating channel")
.navigationBarBackButtonHidden(true)
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Button("Delete channel") { showCancelChannelAlert(gInfo) }
}
}
.onDisappear {
if !showLinkStep && m.creatingChannelId == gInfo.id {
showCancelChannelAlert(gInfo)
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
+7 -2
View File
@@ -281,8 +281,13 @@ fun GroupLinkLayout(
)
}
if (creatingGroup && close != null) {
Spacer(Modifier.height(DEFAULT_PADDING_HALF))
ContinueButton(close)
SettingsActionItem(
painterResource(MR.images.ic_check),
stringResource(MR.strings.continue_to_next_step),
click = close,
iconColor = MaterialTheme.colors.primary,
textColor = MaterialTheme.colors.primary,
)
}
}
}
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt
+8 -6
View File
@@ -404,11 +404,6 @@ private fun ProgressStepView(
ModalView(
close = { showCancelAlert() },
showClose = false,
endButtons = {
TextButton(onClick = { showCancelAlert() }) {
Text(generalGetString(MR.strings.button_delete_channel))
}
}
) {
ColumnWithScrollBar {
AppBarTitle(generalGetString(MR.strings.creating_channel))
@@ -481,9 +476,16 @@ private fun ProgressStepView(
Spacer(Modifier.height(16.dp))
SectionView {
SettingsActionItem(
painterResource(MR.images.ic_delete),
generalGetString(MR.strings.button_cancel_and_delete_channel),
click = { showCancelAlert() },
textColor = Color.Red,
iconColor = Color.Red,
)
val enabled = activeCount > 0
SettingsActionItem(
painterResource(MR.images.ic_link),
painterResource(MR.images.ic_check),
generalGetString(MR.strings.continue_to_next_step),
click = {
if (activeCount >= total) {
apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+1
View File
@@ -1887,6 +1887,7 @@
<string name="group_info_member_you">you: %1$s</string>
<string name="button_delete_group">Delete group</string>
<string name="button_delete_channel">Delete channel</string>
<string name="button_cancel_and_delete_channel">Cancel and delete channel</string>
<string name="button_delete_chat">Delete chat</string>
<string name="delete_group_question">Delete group?</string>
<string name="delete_channel_question">Delete channel?</string>