dashared/GDproject
1
0
Fork 0
mirror of https://github.com/dashared/GDproject.git synced 2024-11-25 11:43:58 +03:00
Code Issues Projects Releases Wiki Activity

for iko without correct pagination (works only for general channel).

Browse Source
This commit is contained in:
Darya Rednikina 2019-05-01 23:58:04 +03:00
parent f24ae333b6
commit 659507bde9
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@ -5,4 +5,4 @@ github "macteo/Marklight"
github "Alamofire/Alamofire" "5.0.0-beta.5"
github "52inc/Pulley"
github "HeroTransitions/Hero"
github "ReactiveCocoa/ReactiveCocoa" "1c089a8"
github "ReactiveCocoa/ReactiveCocoa" ~> 9.0

6
GDproject/Controller/ News and channels/ChannelController.swift
View File

@ -25,7 +25,7 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS
var channel: Model.Channels?
var myProtocol: DataDelegate?
var fullTags: [String] = Array(Model.Channels.fullTags)
var fullTags: [String] = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: "")
var dataSourcePeople: [Model.Users] = []
@ -252,9 +252,7 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS
}
tableView.reloadData()
case 1:
dataSourceTags = fullTags.filter({ (s) -> Bool in
s.lowercased().contains(text.lowercased())
})
dataSourceTags = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: text)
tableView.reloadData()
default:
break

2
GDproject/Controller/ News and channels/NewsVC.swift
View File

@ -121,7 +121,7 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource {
self?.dataSourse.append(contentsOf: $0.posts)
$0.users.forEach { self?.dictionary[$0.key] = $0.value }
}
prevLast = indexPath.row
}
}

2
GDproject/Controller/Log In/LogInViewController.swift
View File

@ -95,7 +95,7 @@ class LogInViewController: UIViewController {
setUpView()
configureKeyboard()
let mailFieldValuesSignal: Signal<String, Never> = mailTextField.reactive.continuousTextValues
let mailFieldValuesSignal: Signal<String, NoError> = mailTextField.reactive.continuousTextValues
mailFieldValuesSignal.observeValues(logicOfLogInInputValidation())

2
GDproject/Simple model/Model.swift
View File

@ -133,7 +133,7 @@ class Model{
struct Channels: Codable {
static var fullTags = Set<String>()
// static var fullTags = Set<String>()
static var fullPeople = [Users]()
static var fullPeopleDict = [Int:Users]()