Browse Source

reoder variables a little bit

cyberta 3 years ago
parent
commit
59f9b8e1a2
1 changed files with 15 additions and 13 deletions
  1. 15 13
      deltachat-ios/Chat/ChatViewController.swift

+ 15 - 13
deltachat-ios/Chat/ChatViewController.swift

@@ -27,11 +27,6 @@ class ChatViewController: UITableViewController {
     private var isVisibleToUser: Bool = false
     private var keepKeyboard: Bool = false
 
-    // search related
-    private var isSearchActive: Bool = false
-    private var searchMessageIds: [Int] = []
-    private var searchResultIndex: Int = 0
-
     lazy var isGroupChat: Bool = {
         return dcContext.getChat(chatId: chatId).isGroup
     }()
@@ -41,7 +36,13 @@ class ChatViewController: UITableViewController {
         return draft
     }()
 
-    private lazy var searchController: UISearchController = {
+    // search related
+    var activateSearchOnAppear: Bool = false
+    private var isSearchActive: Bool = false
+    private var searchMessageIds: [Int] = []
+    private var searchResultIndex: Int = 0
+
+    lazy var searchController: UISearchController = {
         let searchController = UISearchController(searchResultsController: nil)
         searchController.obscuresBackgroundDuringPresentation = false
         searchController.searchBar.placeholder = String.localized("search")
@@ -52,6 +53,14 @@ class ChatViewController: UITableViewController {
         return searchController
     }()
 
+    public lazy var searchAccessoryBar: ChatSearchAccessoryBar = {
+        let view = ChatSearchAccessoryBar()
+        view.delegate = self
+        view.translatesAutoresizingMaskIntoConstraints = false
+        view.isEnabled = false
+        return view
+    }()
+
     /// The `InputBarAccessoryView` used as the `inputAccessoryView` in the view controller.
     open var messageInputBar = ChatInputBar()
 
@@ -70,13 +79,6 @@ class ChatViewController: UITableViewController {
         return view
     }()
 
-    public lazy var searchAccessoryBar: ChatSearchAccessoryBar = {
-        let view = ChatSearchAccessoryBar()
-        view.delegate = self
-        view.translatesAutoresizingMaskIntoConstraints = false
-        return view
-    }()
-
     public lazy var contactRequestBar: ChatContactRequestBar = {
         let chat = dcContext.getChat(chatId: chatId)
         let view = ChatContactRequestBar(useDeleteButton: chat.isGroup && !chat.isMailinglist)