core: update event name, ios: types/api/ui (wip) to switch connection to another address, fix contact/member info view, fix setting multiple servers (#1281)

* core: update event name, ios: types/api/ui (wip) to switch connection to another address, fix contact/member info view, fix setting multiple servers * fix * update strings Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>
2022-11-01 20:30:53 +00:00
parent 0d0de1da86
commit d5fc0d7dfc
12 changed files with 123 additions and 38 deletions
--- a/apps/ios/Shared/Views/Chat/ChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatInfoView.swift
@@ -30,7 +30,14 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
@ViewBuilder func smpServers(_ title: LocalizedStringKey, _ servers: [String]?) -> some View {
    if let servers = servers,
       servers.count > 0 {
-        infoRow(title, serverHost(servers[0]))
+        HStack {
+            Text(title).frame(width: 120, alignment: .leading)
+            Button(serverHost(servers[0])) {
+                UIPasteboard.general.string = servers.joined(separator: ";")
+            }
+            .foregroundColor(.secondary)
+            .lineLimit(1)
+        }
    }
 }

@@ -47,7 +54,7 @@ struct ChatInfoView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @ObservedObject var chat: Chat
    var contact: Contact
-    var connectionStats: ConnectionStats?
+    @Binding var connectionStats: ConnectionStats?
    var customUserProfile: Profile?
    @State var localAlias: String
    @FocusState private var aliasTextFieldFocused: Bool
@@ -88,12 +95,15 @@ struct ChatInfoView: View {
                    }
                }

-                if let connStats = connectionStats {
-                    Section("Servers") {
-                        networkStatusRow()
-                            .onTapGesture {
-                                alert = .networkStatusAlert
-                            }
+                Section("Servers") {
+                    networkStatusRow()
+                        .onTapGesture {
+                            alert = .networkStatusAlert
+                        }
+                    Button("Switch receiving address") {
+                        
+                    }
+                    if let connStats = connectionStats {
                        smpServers("Receiving via", connStats.rcvServers)
                        smpServers("Sending via", connStats.sndServers)
                    }
@@ -258,6 +268,11 @@ struct ChatInfoView: View {

 struct ChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
-        ChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []), contact: Contact.sampleData, localAlias: "")
+        ChatInfoView(
+            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
+            contact: Contact.sampleData,
+            connectionStats: Binding.constant(nil),
+            localAlias: ""
+        )
    }
 }
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIGroupEventView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIGroupEventView.swift
@@ -1,5 +1,5 @@
 //
-//  CIGroupEventView.swift
+//  CIEventView.swift
 //  SimpleX (iOS)
 //
 //  Created by JRoberts on 20.07.2022.
@@ -9,7 +9,7 @@
 import SwiftUI
 import SimpleXChat

-struct CIGroupEventView: View {
+struct CIEventView: View {
    var chatItem: ChatItem

    var body: some View {
@@ -43,8 +43,8 @@ struct CIGroupEventView: View {
    }
 }

-struct CIGroupEventView_Previews: PreviewProvider {
+struct CIEventView_Previews: PreviewProvider {
    static var previews: some View {
-        CIGroupEventView(chatItem: ChatItem.getGroupEventSample())
+        CIEventView(chatItem: ChatItem.getGroupEventSample())
    }
 }
--- a/apps/ios/Shared/Views/Chat/ChatItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemView.swift
@@ -27,8 +27,10 @@ struct ChatItemView: View {
        case .rcvIntegrityError: IntegrityErrorItemView(chatItem: chatItem, showMember: showMember)
        case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
        case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvGroupEvent: groupEventItemView()
-        case .sndGroupEvent: groupEventItemView()
+        case .rcvGroupEvent: eventItemView()
+        case .sndGroupEvent: eventItemView()
+        case .rcvConnEvent: eventItemView()
+        case .sndConnEvent: eventItemView()
        }
    }

@@ -52,8 +54,8 @@ struct ChatItemView: View {
        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chatInfo.incognito)
    }

-    private func groupEventItemView() -> some View {
-        CIGroupEventView(chatItem: chatItem)
+    private func eventItemView() -> some View {
+        CIEventView(chatItem: chatItem)
    }
 }

--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -107,7 +107,7 @@ struct ChatView: View {
                        connectionStats = nil
                        customUserProfile = nil
                    }) {
-                        ChatInfoView(chat: chat, contact: contact, connectionStats: connectionStats, customUserProfile: customUserProfile, localAlias: chat.chatInfo.localAlias)
+                        ChatInfoView(chat: chat, contact: contact, connectionStats: $connectionStats, customUserProfile: customUserProfile, localAlias: chat.chatInfo.localAlias)
                    }
                } else if case let .group(groupInfo) = cInfo {
                    Button {
@@ -393,7 +393,7 @@ struct ChatView: View {
                            }
                        }
                        .sheet(item: $selectedMember, onDismiss: { memberConnectionStats = nil }) { member in
-                            GroupMemberInfoView(groupInfo: groupInfo, member: member, connectionStats: memberConnectionStats)
+                            GroupMemberInfoView(groupInfo: groupInfo, member: member, connectionStats: $memberConnectionStats)
                        }
                } else {
                    Rectangle().fill(.clear)
--- a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
@@ -72,7 +72,7 @@ struct GroupChatInfoView: View {
                    AddGroupMembersView(chat: chat, groupInfo: groupInfo)
                }
                .sheet(item: $selectedMember, onDismiss: { connectionStats = nil }) { member in
-                    GroupMemberInfoView(groupInfo: groupInfo, member: member, connectionStats: connectionStats)
+                    GroupMemberInfoView(groupInfo: groupInfo, member: member, connectionStats: $connectionStats)
                }
                .sheet(isPresented: $showGroupProfile) {
                    GroupProfileView(groupId: groupInfo.apiId, groupProfile: groupInfo.groupProfile)
--- a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
@@ -14,7 +14,7 @@ struct GroupMemberInfoView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    var groupInfo: GroupInfo
    @State var member: GroupMember
-    var connectionStats: ConnectionStats?
+    @Binding var connectionStats: ConnectionStats?
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
@@ -77,9 +77,12 @@ struct GroupMemberInfoView: View {
                    }
                }

-                if let connStats = connectionStats {
-                    Section("Servers") {
-                        // TODO network connection status
+                Section("Servers") {
+                    // TODO network connection status
+                    Button("Switch receiving address") {
+                        
+                    }
+                    if let connStats = connectionStats {
                        smpServers("Receiving via", connStats.rcvServers)
                        smpServers("Sending via", connStats.sndServers)
                    }
@@ -214,6 +217,10 @@ struct GroupMemberInfoView: View {

 struct GroupMemberInfoView_Previews: PreviewProvider {
    static var previews: some View {
-        GroupMemberInfoView(groupInfo: GroupInfo.sampleData, member: GroupMember.sampleData)
+        GroupMemberInfoView(
+            groupInfo: GroupInfo.sampleData,
+            member: GroupMember.sampleData,
+            connectionStats: Binding.constant(nil)
+        )
    }
 }