@@ -8,44 +8,8 @@
88
99import UIKit
1010
11−protocol SelectableDialog: class {
12− func openDialog(with dialog: Model.Dialog)
13−}
11+class MessagesViewController: UITableViewController {
1412
15−class MessagesViewController: UITableViewController, UISearchControllerDelegate, UISearchResultsUpdating, SelectableDialog {
16−
17− func openDialog(with dialog: Model.Dialog) {
18− onDialogDisplay?((dialog, users))
19− }
20−
21− func updateSearchResults(for searchController: UISearchController) {
22−
23− let filteredData = currentActiveDialogs
24− let inputText = searchController.searchBar.text ?? ""
25−
26− let filteredResults = filteredData.filter {
27−
28− switch $0 {
29− case .groupChat(let gropuChat):
30− return gropuChat.group.name.contains(inputText)
31−
32− case .userChat(let userChat):
33− let user = users[userChat.user]
34− guard let u = user else { return false }
35− return u.fullName().contains(inputText)
36−
37− }
38−
39− }
40−
41− // Apply the filtered results to the search results table.
42− if let resultsController = searchController.searchResultsController as? SuggestedDialogsTableViewController {
43− resultsController.users = users
44− resultsController.currentDialogs = filteredResults
45− resultsController.tableView.reloadData()
46− }
47− }
48−
4913 // curreent Active which can be displayed
5014 var currentActiveDialogs: [Model.Dialog] = [] {
5115 didSet {
@@ -53,17 +17,6 @@ class MessagesViewController: UITableViewController, UISearchControllerDelegate,
5317 }
5418 }
5519
56− func setUpSearchContr(){
57−
58− searchController?.delegate = self
59− searchController?.obscuresBackgroundDuringPresentation = true
60− navigationItem.searchController = searchController
61− definesPresentationContext = true
62− searchController?.searchResultsUpdater = self
63− searchController?.searchBar.placeholder = "Search dialogs"
64−
65− }
66−
6720 // curreent users
6821 var users: [Int: Model.Users] = [:]
6922
@@ -71,22 +24,17 @@ class MessagesViewController: UITableViewController, UISearchControllerDelegate,
7124
7225 var onDialogDisplay: (((dialog: Model.Dialog, users: [Int:Model.Users]))->())?
7326
74− var searchController: UISearchController?
27+ let searchC = UISearchController(searchResultsController: nil)
7528
7629 override func viewDidLoad() {
7730 super.viewDidLoad()
78−
79− let updater = SuggestedDialogsTableViewController()
80−
81− updater.delegate = self
82− searchController = UISearchController(searchResultsController: updater)
83−
31+
8432 // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
8533 self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Write", style: .plain, target: self, action: #selector(choosePerson))
8634
8735 self.navigationItem.title = "Messages"
8836 // self.navigationItem.largeTitleDisplayMode = .always
89− setUpSearchContr()
37+ self.navigationItem.searchController = searchC
9038 navigationController?.navigationBar.prefersLargeTitles = true
9139 self.navigationItem.hidesSearchBarWhenScrolling = false
9240 }
@@ -116,15 +64,18 @@ class MessagesViewController: UITableViewController, UISearchControllerDelegate,
11664
11765 override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell
11866 {
119− let cell = tableView.dequeueReusableCell(withIdentifier: "MessageViewCell", for: indexPath) as! MessageViewCell
67+ let cell = tableView.dequeueReusableCell(withIdentifier: "MessagesCell", for: indexPath)
12068
12169 switch currentActiveDialogs[indexPath.row].self {
122− case .groupChat:
123− cell.fill(with: currentActiveDialogs[indexPath.row])
70+
71+ case .groupChat(let group):
72+ cell.textLabel?.text = group.group.name
73+ cell.detailTextLabel?.text = group.lastMessage?.body.markdown
12474 case .userChat(let userChat):
125− cell.fill(with: currentActiveDialogs[indexPath.row], user: users[userChat.user])
75+ cell.textLabel?.text = "👤 \(users[userChat.user]!.fullName())"
76+ cell.detailTextLabel?.text = userChat.lastMessage?.body.markdown
12677 }
127−
78+
12879 return cell
12980 }
13081
@@ -133,49 +84,3 @@ class MessagesViewController: UITableViewController, UISearchControllerDelegate,
13384 onDialogDisplay?(tuple)
13485 }
13586}
136−
137−
138−class SuggestedDialogsTableViewController: UITableViewController {
139−
140− var idCell = "cell"
141−
142− var users: [Int: Model.Users] = [:]
143−
144− weak var delegate: SelectableDialog?
145−
146− var currentDialogs: [Model.Dialog] = []
147−
148− override func viewDidLoad() {
149− super.viewDidLoad()
150− tableView.register(UITableViewCell.self, forCellReuseIdentifier: idCell)
151− tableView.reloadData()
152− }
153−
154− override func numberOfSections(in tableView: UITableView) -> Int {
155− return 1
156− }
157−
158− override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
159− return currentDialogs.count
160− }
161−
162− override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell
163− {
164− let cell = tableView.dequeueReusableCell(withIdentifier: idCell, for: indexPath)
165−
166− switch currentDialogs[indexPath.row] {
167− case .groupChat(let groupChat):
168− cell.textLabel?.text = groupChat.group.name
169− case .userChat(let userChat):
170− cell.textLabel?.text = users[userChat.user]?.fullName()
171− }
172−
173− cell.accessoryType = .disclosureIndicator
174− return cell
175− }
176−
177− override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
178− delegate?.openDialog(with: currentDialogs[indexPath.row])
179− // self.dismiss(animated: true)
180− }
181−}