contacts navigation wip

2024-12-17 17:20:21 +01:00 · 2024-05-06 19:37:30 +04:00
parent c2443074a4
commit d222800337
2 changed files with 79 additions and 32 deletions
@@ -10,26 +10,55 @@ import SwiftUI
 import SimpleXChat

 struct ContactListNavLink: View {
+    @ObservedObject var chat: Chat
    var contact: Contact
    
    var body: some View {
-        HStack{
-            ProfileImage(imageStr: contact.image, size: 38)
-                .padding(.trailing, 2)
-            Text(contact.chatViewName)
-                .lineLimit(1)
-            if contact.contactConnIncognito {
-                Spacer()
-                Image(systemName: "theatermasks")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 22, height: 22)
-                    .foregroundColor(.secondary)
+        NavigationLink {
+            ChatInfoView(
+                chat: chat,
+                contact: contact,
+                // TODO
+                connectionStats: Binding.constant(nil),
+                customUserProfile: Binding.constant(nil),
+                localAlias: "",
+                connectionCode: Binding.constant(nil)
+            )
+        } label: {
+            HStack{
+                ProfileImage(imageStr: contact.image, size: 38)
+                    .padding(.trailing, 2)
+                Text(contact.chatViewName)
+                    .lineLimit(1)
+                if contact.contactConnIncognito {
+                    Spacer()
+                    Image(systemName: "theatermasks")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 22, height: 22)
+                        .foregroundColor(.secondary)
+                }
            }
        }
+
+//        HStack{
+//            ProfileImage(imageStr: contact.image, size: 38)
+//                .padding(.trailing, 2)
+//            Text(contact.chatViewName)
+//                .lineLimit(1)
+//            if contact.contactConnIncognito {
+//                Spacer()
+//                Image(systemName: "theatermasks")
+//                    .resizable()
+//                    .scaledToFit()
+//                    .frame(width: 22, height: 22)
+//                    .foregroundColor(.secondary)
+//            }
+//        }
+
    }
 }

 #Preview {
-    ContactListNavLink(contact: Contact.sampleData)
+    ContactListNavLink(chat: Chat.sampleData, contact: Contact.sampleData)
 }
@@ -35,12 +35,12 @@ struct ContactsView: View {
    }

    @ViewBuilder private var contactList: some View {
-        let contacts = chatModel.chats.compactMap{ $0.chatInfo.contact }
-        let filteredContacts = oneHandUI ? filteredContacts(contacts).reversed() : filteredContacts(contacts)
+        let contactChats = contactChats()
+        let filteredContactChats = oneHandUI ? filteredContactChats(contactChats).reversed() : filteredContactChats(contactChats)
        ZStack {
            VStack {
                List {
-                    if !contacts.isEmpty {
+                    if !contactChats.isEmpty {
                        ContactsSearchBar(
                            searchMode: $searchMode,
                            searchFocussed: $searchFocussed,
@@ -50,20 +50,25 @@ struct ContactsView: View {
                        .listRowSeparator(.hidden)
                        .frame(maxWidth: .infinity)
                    }
-                    ForEach(filteredContacts, id: \.id) { contact in
-                        ContactListNavLink(contact: contact)
-                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                            .padding(.trailing, -16)
-                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(contact.id))
+                    ForEach(filteredContactChats, id: \.id) { chat in
+                        switch chat.chatInfo {
+                        case let .direct(contact):
+                            ContactListNavLink(chat: chat, contact: contact)
+                                .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                                .padding(.trailing, -16)
+                                .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(contact.id))
+                        default:
+                            EmptyView()
+                        }
                    }
                    .offset(x: -8)
                }
            }
-            if filteredContacts.isEmpty && !contacts.isEmpty {
+            if filteredContactChats.isEmpty && !contactChats.isEmpty {
                Text("No filtered contacts")
                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                    .foregroundColor(.secondary)
-            } else if contacts.isEmpty {
+            } else if contactChats.isEmpty {
                Text("No contacts")
                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                    .foregroundColor(.secondary)
@@ -71,16 +76,29 @@ struct ContactsView: View {
        }
    }

-    private func filteredContacts(_ contacts: [Contact]) -> [Contact] {
-        let s = searchString()
-        return contacts.filter { contact in
-            return s == ""
-            ? true
-            : (viewNameContains(contact, s) ||
-               contact.profile.displayName.localizedLowercase.contains(s) ||
-               contact.fullName.localizedLowercase.contains(s))
+    private func contactChats() -> [Chat] {
+        return chatModel.chats.filter { chat in
+            switch chat.chatInfo {
+            case .direct: true
+            default: false
+            }
        }
-        .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
+    }
+
+    private func filteredContactChats(_ contactChats: [Chat]) -> [Chat] {
+        let s = searchString()
+        return contactChats.filter { chat in
+            switch chat.chatInfo {
+            case let .direct(contact):
+                return s == ""
+                ? true
+                : (viewNameContains(contact, s) ||
+                   contact.profile.displayName.localizedLowercase.contains(s) ||
+                   contact.fullName.localizedLowercase.contains(s))
+            default: return false
+            }
+        }
+        .sorted{ $0.chatInfo.displayName.lowercased() < $1.chatInfo.displayName.lowercased() }

        func searchString() -> String {
            searchText.trimmingCharacters(in: .whitespaces).localizedLowercase