From 9d4e37a27cbe6bfb648c8776c720cfa4a57ff83c Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:54:35 +0400
Subject: [PATCH] chat list buttons

---
 .../Shared/Views/ChatList/ChatListView.swift  | 57 +++++++++----------
 .../Views/NewChat/NewChatMenuButton.swift     |  7 +++
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/apps/ios/Shared/Views/ChatList/ChatListView.swift b/apps/ios/Shared/Views/ChatList/ChatListView.swift
index 6bf63bb2e3..54d689096e 100644
--- a/apps/ios/Shared/Views/ChatList/ChatListView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListView.swift
@@ -20,6 +20,7 @@ struct ChatListView: View {
     @State private var newChatMenuOption: NewChatMenuOption? = nil
     @State private var userPickerVisible = false
     @State private var showConnectDesktop = false
+    @State private var showServersSummary = false
     @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
 
     var body: some View {
@@ -62,6 +63,9 @@ struct ChatListView: View {
         .sheet(isPresented: $showConnectDesktop) {
             ConnectDesktopView()
         }
+        .sheet(isPresented: $showServersSummary) {
+            Text("Servers summary view")
+        }
     }
 
     private var chatListView: some View {
@@ -115,9 +119,7 @@ struct ChatListView: View {
                 HStack(spacing: 4) {
                     Text("Chats")
                         .font(.headline)
-                    if chatModel.chats.count > 0 {
-                        toggleFilterButton()
-                    }
+                    subscriptionsStatusIcon()
                 }
                 .frame(maxWidth: .infinity, alignment: .center)
             }
@@ -131,11 +133,11 @@ struct ChatListView: View {
         }
     }
 
-    private func toggleFilterButton() -> some View {
+    private func subscriptionsStatusIcon() -> some View {
         Button {
-            showUnreadAndFavorites = !showUnreadAndFavorites
+            showServersSummary = true
         } label: {
-            Image(systemName: "line.3.horizontal.decrease.circle" + (showUnreadAndFavorites ? ".fill" : ""))
+            Image(systemName: "wifi")
                 .foregroundColor(.accentColor)
         }
     }
@@ -282,9 +284,9 @@ struct ChatListSearchBar: View {
     @Binding var searchShowingSimplexLink: Bool
     @Binding var searchChatFilteredBySimplexLink: String?
     @State private var ignoreSearchTextChange = false
-    @State private var showScanCodeSheet = false
     @State private var alert: PlanAndConnectAlert?
     @State private var sheet: PlanAndConnectActionSheet?
+    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
 
     var body: some View {
         VStack(spacing: 12) {
@@ -301,26 +303,6 @@ struct ChatListSearchBar: View {
                             .onTapGesture {
                                 searchText = ""
                             }
-                    } else if !searchFocussed {
-                        HStack(spacing: 24) {
-                            if m.pasteboardHasStrings {
-                                Image(systemName: "doc")
-                                    .onTapGesture {
-                                        if let str = UIPasteboard.general.string {
-                                            searchText = str
-                                        }
-                                    }
-                            }
-
-                            Image(systemName: "qrcode")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 20, height: 20)
-                                .onTapGesture {
-                                    showScanCodeSheet = true
-                                }
-                        }
-                        .padding(.trailing, 2)
                     }
                 }
                 .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
@@ -335,14 +317,12 @@ struct ChatListSearchBar: View {
                             searchText = ""
                             searchFocussed = false
                         }
+                } else if m.chats.count > 0 {
+                    toggleFilterButton()
                 }
             }
             Divider()
         }
-        .sheet(isPresented: $showScanCodeSheet) {
-            NewChatView(selection: .connect, showQRCodeScanner: true)
-                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil) // fixes .refreshable in ChatListView affecting nested view
-        }
         .onChange(of: searchFocussed) { sf in
             withAnimation { searchMode = sf }
         }
@@ -376,6 +356,21 @@ struct ChatListSearchBar: View {
         }
     }
 
+    private func toggleFilterButton() -> some View {
+        ZStack {
+            Color.clear
+                .frame(width: 22, height: 22)
+            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
+                .resizable()
+                .scaledToFit()
+                .foregroundColor(showUnreadAndFavorites ? .accentColor : .secondary)
+                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
+                .onTapGesture {
+                    showUnreadAndFavorites = !showUnreadAndFavorites
+                }
+        }
+    }
+
     private func connect(_ link: String) {
         planAndConnect(
             link,
diff --git a/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift b/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
index c3452ce18d..3be1095bfd 100644
--- a/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
@@ -10,6 +10,7 @@ import SwiftUI
 
 enum NewChatMenuOption: Identifiable {
     case newContact
+    case scanPaste
     case newGroup
 
     var id: Self { self }
@@ -25,6 +26,11 @@ struct NewChatMenuButton: View {
             } label: {
                 Text("Add contact")
             }
+            Button {
+                newChatMenuOption = .scanPaste
+            } label: {
+                Text("Scan / Paste link")
+            }
             Button {
                 newChatMenuOption = .newGroup
             } label: {
@@ -39,6 +45,7 @@ struct NewChatMenuButton: View {
         .sheet(item: $newChatMenuOption) { opt in
             switch opt {
             case .newContact: NewChatView(selection: .invite)
+            case .scanPaste: NewChatView(selection: .connect, showQRCodeScanner: true)
             case .newGroup: AddGroupView()
             }
         }