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

ios: fix not showing link creation and add group members pages (#5020)

Browse Source
This commit is contained in:
Stanislav Dmitrenko
2024-10-10 19:08:03 +01:00
committed by GitHub
parent e9a99dfb3c
commit 0d8c179861
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/Chat/ChatView.swift
+8 -3
View File
@@ -137,6 +137,14 @@ struct ChatView: View {
}
}
}
// it should be presented on top level in order to prevent a bug in SwiftUI on iOS 16 related to .focused() modifier in AddGroupMembersView's search field
.appSheet(isPresented: $showAddMembersSheet) {
Group {
if case let .group(groupInfo) = cInfo {
AddGroupMembersView(chat: chat, groupInfo: groupInfo)
}
}
}
.sheet(isPresented: Binding(
get: { !forwardedChatItems.isEmpty },
set: { isPresented in
@@ -304,9 +312,6 @@ struct ChatView: View {
}
} else {
addMembersButton()
.appSheet(isPresented: $showAddMembersSheet) {
AddGroupMembersView(chat: chat, groupInfo: groupInfo)
}
}
}
Menu {
apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
+3 -2
View File
@@ -14,7 +14,8 @@ enum ContactType: Int {
}
struct NewChatMenuButton: View {
@EnvironmentObject var chatModel: ChatModel
// do not use chatModel here because it prevents showing AddGroupMembersView after group creation and QR code after link creation on iOS 16
// @EnvironmentObject var chatModel: ChatModel
@State private var showNewChatSheet = false
@State private var alert: SomeAlert? = nil
@State private var pendingConnection: PendingContactConnection? = nil
@@ -32,7 +33,7 @@ struct NewChatMenuButton: View {
NewChatSheet(pendingConnection: $pendingConnection)
.environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
.onDisappear {
alert = cleanupPendingConnection(chatModel: chatModel, contactConnection: pendingConnection)
alert = cleanupPendingConnection(contactConnection: pendingConnection)
pendingConnection = nil
}
}
apps/ios/Shared/Views/NewChat/NewChatView.swift
+4 -4
View File
@@ -45,10 +45,10 @@ enum NewChatOption: Identifiable {
var id: Self { self }
}
func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingContactConnection?) -> SomeAlert? {
func cleanupPendingConnection(contactConnection: PendingContactConnection?) -> SomeAlert? {
var alert: SomeAlert? = nil
if !(chatModel.showingInvitation?.connChatUsed ?? true),
if !(ChatModel.shared.showingInvitation?.connChatUsed ?? true),
let conn = contactConnection {
alert = SomeAlert(
alert: Alert(
@@ -68,7 +68,7 @@ func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingCo
)
}
chatModel.showingInvitation = nil
ChatModel.shared.showingInvitation = nil
return alert
}
@@ -157,7 +157,7 @@ struct NewChatView: View {
}
.onDisappear {
if !choosingProfile {
parentAlert = cleanupPendingConnection(chatModel: m, contactConnection: contactConnection)
parentAlert = cleanupPendingConnection(contactConnection: contactConnection)
contactConnection = nil
}
}