git.iko.soy/dashared/GDproject
on master help sign in
for iko without correct pagination (works only for general channel).
commit659507bde9929a88373d2070c355260a7d217d41 authorDarya Rednikina <rednikina.com@yandex.ru> dateWed 1 May 2019, 23:58 (7 years ago) parentf24ae33
5 files changed+6−8
compare with master
unifiedsplit
Cartfile+1−1 GDproject/Controller/ News and channels/ChannelController.swift+2−4 GDproject/Controller/ News and channels/NewsVC.swift+1−1 GDproject/Controller/Log In/LogInViewController.swift+1−1 GDproject/Simple model/Model.swift+1−1
Cartfile+1−1
@@ -5,4 +5,4 @@ github "macteo/Marklight"
55github "Alamofire/Alamofire" "5.0.0-beta.5"
66github "52inc/Pulley"
77github "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
2525 var channel: Model.Channels?
2626 var myProtocol: DataDelegate?
2727
28− var fullTags: [String] = Array(Model.Channels.fullTags)
28+ var fullTags: [String] = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: "")
2929
3030 var dataSourcePeople: [Model.Users] = []
3131
@@ -252,9 +252,7 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS
252252 }
253253 tableView.reloadData()
254254 case 1:
255− dataSourceTags = fullTags.filter({ (s) -> Bool in
256− s.lowercased().contains(text.lowercased())
257− })
255+ dataSourceTags = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: text)
258256 tableView.reloadData()
259257 default:
260258 break
GDproject/Controller/ News and channels/NewsVC.swift+1−1
@@ -121,7 +121,7 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource {
121121 self?.dataSourse.append(contentsOf: $0.posts)
122122 $0.users.forEach { self?.dictionary[$0.key] = $0.value }
123123 }
124−
124+
125125 prevLast = indexPath.row
126126 }
127127 }
GDproject/Controller/Log In/LogInViewController.swift+1−1
@@ -95,7 +95,7 @@ class LogInViewController: UIViewController {
9595 setUpView()
9696 configureKeyboard()
9797
98− let mailFieldValuesSignal: Signal<String, Never> = mailTextField.reactive.continuousTextValues
98+ let mailFieldValuesSignal: Signal<String, NoError> = mailTextField.reactive.continuousTextValues
9999
100100 mailFieldValuesSignal.observeValues(logicOfLogInInputValidation())
101101
GDproject/Simple model/Model.swift+1−1
@@ -133,7 +133,7 @@ class Model{
133133
134134 struct Channels: Codable {
135135
136− static var fullTags = Set<String>()
136+ // static var fullTags = Set<String>()
137137 static var fullPeople = [Users]()
138138 static var fullPeopleDict = [Int:Users]()
139139