git.iko.soy/dashared/GDproject
on master help sign in
for iko without correct pagination (works only for general channel).
659507bDarya Rednikina
Cartfile+1−1
compare with master
unifiedsplit
@@ -5,4 +5,4 @@ github "macteo/Marklight"
5github "Alamofire/Alamofire" "5.0.0-beta.5"
5github "Alamofire/Alamofire" "5.0.0-beta.5"
6github "52inc/Pulley"
6github "52inc/Pulley"
7github "HeroTransitions/Hero"
7github "HeroTransitions/Hero"
8−github "ReactiveCocoa/ReactiveCocoa" "1c089a8"
8+github "ReactiveCocoa/ReactiveCocoa" ~> 9.0
GDproject/Controller/ News and channels/ChannelController.swift+2−4
@@ -25,7 +25,7 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS
25 var channel: Model.Channels?
25 var channel: Model.Channels?
26 var myProtocol: DataDelegate?
26 var myProtocol: DataDelegate?
27
27
28− var fullTags: [String] = Array(Model.Channels.fullTags)
28+ var fullTags: [String] = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: "")
29
29
30 var dataSourcePeople: [Model.Users] = []
30 var dataSourcePeople: [Model.Users] = []
31
31
@@ -252,9 +252,7 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS
252 }
252 }
253 tableView.reloadData()
253 tableView.reloadData()
254 case 1:
254 case 1:
255− dataSourceTags = fullTags.filter({ (s) -> Bool in
255+ dataSourceTags = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: text)
256− s.lowercased().contains(text.lowercased())
257− })
258 tableView.reloadData()
256 tableView.reloadData()
259 default:
257 default:
260 break
258 break
GDproject/Controller/ News and channels/NewsVC.swift+1−1
@@ -121,7 +121,7 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource {
121 self?.dataSourse.append(contentsOf: $0.posts)
121 self?.dataSourse.append(contentsOf: $0.posts)
122 $0.users.forEach { self?.dictionary[$0.key] = $0.value }
122 $0.users.forEach { self?.dictionary[$0.key] = $0.value }
123 }
123 }
124−
124+
125 prevLast = indexPath.row
125 prevLast = indexPath.row
126 }
126 }
127 }
127 }
GDproject/Controller/Log In/LogInViewController.swift+1−1
@@ -95,7 +95,7 @@ class LogInViewController: UIViewController {
95 setUpView()
95 setUpView()
96 configureKeyboard()
96 configureKeyboard()
97
97
98− let mailFieldValuesSignal: Signal<String, Never> = mailTextField.reactive.continuousTextValues
98+ let mailFieldValuesSignal: Signal<String, NoError> = mailTextField.reactive.continuousTextValues
99
99
100 mailFieldValuesSignal.observeValues(logicOfLogInInputValidation())
100 mailFieldValuesSignal.observeValues(logicOfLogInInputValidation())
101
101
GDproject/Simple model/Model.swift+1−1
@@ -133,7 +133,7 @@ class Model{
133
133
134 struct Channels: Codable {
134 struct Channels: Codable {
135
135
136− static var fullTags = Set<String>()
136+ // static var fullTags = Set<String>()
137 static var fullPeople = [Users]()
137 static var fullPeople = [Users]()
138 static var fullPeopleDict = [Int:Users]()
138 static var fullPeopleDict = [Int:Users]()
139
139