TouchInstinct
/
LeadKit
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issues resolved

This commit is contained in:
Artur Azarau 2019-02-07 19:02:14 +03:00
parent 71ef4d6895
commit 8e295d701c
3 changed files with 48 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Sources/Classes/Search/BaseSearchViewController.swift
View File

@ -26,24 +26,21 @@ import RxSwift
open class BaseSearchViewController<Item,
ItemViewModel,
ViewModel,
ResultsVC: SearchResultsViewController,
CustomView>: UIViewController, ConfigurableController
where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, CustomView: TableViewHolder {
CustomView: UIView & TableViewHolder>: BaseCustomViewController<ViewModel, CustomView>
where ViewModel: BaseSearchViewModel<Item, ItemViewModel> {
// MARK: - Properties
public let viewModel: ViewModel
private let disposeBag = DisposeBag()
let customView = CustomView()
private let searchResultsViewController = ResultsVC()
private let searchResultsViewController: UIViewController & SearchResultsViewController
private lazy var searchController = UISearchController(searchResultsController: searchResultsViewController)
private var didEnterText = false
// MARK: - Initialization
init(viewModel: ViewModel) {
self.viewModel = viewModel
super.init(nibName: nil, bundle: nil)
init(viewModel: ViewModel, searchResultsController: UIViewController & SearchResultsViewController) {
self.searchResultsViewController = searchResultsController
super.init(viewModel: viewModel)
}
required public init?(coder aDecoder: NSCoder) {
@ -58,11 +55,11 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, C
// MARK: - Configurable Controller
public func configureBarButtons() {
open override func configureBarButtons() {
// override in subclass
}
public func bindViews() {
open override func bindViews() {
viewModel.itemsViewModelsDriver
.drive(onNext: { [weak self] viewModels in
self?.handle(itemViewModels: viewModels)
@ -86,7 +83,7 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, C
.disposed(by: disposeBag)
}
public func addViews() {
open override func addViews() {
if #available(iOS 11.0, *) {
navigationItem.searchController = searchController
} else {
@ -95,19 +92,20 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, C
searchController.view.addSubview(statusBarView)
}
public func configureAppearance() {
open override func configureAppearance() {
definesPresentationContext = true
customView.tableView.tableHeaderView?.backgroundColor = searchBarColor
}
public func localize() {
open override func localize() {
searchController.searchBar.placeholder = searchBarPlaceholder
}
// MARK: - Search Controller Functionality
func createRows(from itemsViewModels: [ItemViewModel]) -> [Row] {
fatalError("createRows(from:) has not been implemented")
open func createRows(from itemsViewModels: [ItemViewModel]) -> [Row] {
assertionFailure("createRows(from:) has not been implemented")
return []
}
var searchBarPlaceholder: String {
@ -118,7 +116,7 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, C
return .gray
}
var statusBarView: UIView {
open var statusBarView: UIView {
let statusBarSize = UIApplication.shared.statusBarFrame.size
let statusBarView = UIView(frame: CGRect(x: 0,
y: 0,
@ -162,7 +160,7 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, C
}
func handle(searchResultsState state: SearchResultsViewControllerState) {
searchResultsViewController.update(from: state)
searchResultsViewController.update(for: state)
}
func handle(searchText: String?) {
@ -170,11 +168,12 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel>, CustomView: UIView, C
}
private func setTableViewInsets() {
if !didEnterText {
didEnterText = true
searchResultsViewController.resultsView?.tableView.contentInset = tableViewInsets
searchResultsViewController.resultsView?.tableView.scrollIndicatorInsets = tableViewInsets
guard !didEnterText else {
return
}
didEnterText = true
searchResultsViewController.searchResultsView.tableView.contentInset = tableViewInsets
searchResultsViewController.searchResultsView.tableView.scrollIndicatorInsets = tableViewInsets
}
}

68
Sources/Classes/Search/BaseSearchViewModel.swift
View File

@ -23,6 +23,22 @@
import RxSwift
import RxCocoa
private protocol OptionalType {
associatedtype Wrapped
var optional: Wrapped? { get }
}
extension Optional: OptionalType {
public var optional: Wrapped? { return self }
}
private extension Observable where Element: OptionalType {
func filterNil() -> Observable<Element.Wrapped> {
return flatMap { value -> Observable<Element.Wrapped> in
value.optional.map { .just($0) } ?? .empty()
}
}
}
open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel<[Item]> {
typealias ItemsList = [Item]
@ -30,7 +46,7 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
private let searchTextRelay = BehaviorRelay(value: "")
init(dataSource: Single<ItemsList>) {
super.init(dataSource: dataSource, emptyResultChecker: { _ in false })
super.init(dataSource: dataSource, emptyResultChecker: { $0.isEmpty })
}
open var itemsViewModelsDriver: Driver<[ItemViewModel]> {
@ -38,13 +54,7 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
.map { [weak self] items in
self?.viewModels(from: items)
}
.flatMap({ element -> Observable<[ItemViewModel]> in
if let value = element {
return .just(value)
} else {
return .empty()
}
})
.filterNil()
.share(replay: 1, scope: .forever)
.asDriver(onErrorDriveWith: .empty())
}
@ -58,18 +68,12 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
.map { [weak self] items in
self?.viewModels(from: items)
}
.flatMap({ element -> Observable<[ItemViewModel]> in
if let value = element {
return .just(value)
} else {
return .empty()
}
})
.filterNil()
.share(replay: 1, scope: .forever)
.asDriver(onErrorDriveWith: .empty())
}
func viewModel(from item: Item) -> ItemViewModel {
open func viewModel(from item: Item) -> ItemViewModel {
fatalError("viewModel(from:) has not been implemented")
}
@ -92,39 +96,15 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
var loadingResultObservable: Observable<ResultType> {
return loadingStateDriver
.asObservable()
.map { state -> ResultType? in
guard case let .result(data, _) = state else {
return nil
}
return data
}
.flatMap({ element -> Observable<ResultType> in
if let value = element {
return .just(value)
} else {
return .empty()
}
})
.map { $0.result }
.filterNil()
}
var loadingErrorObservable: Observable<Error> {
return loadingStateDriver
.asObservable()
.map { state -> Error? in
guard case let .error(error) = state else {
return nil
}
return error
}
.flatMap({ element -> Observable<Error> in
if let value = element {
return .just(value)
} else {
return .empty()
}
})
.map { $0.error }
.filterNil()
}
var firstLoadingResultObservable: Single<ResultType> {

6
Sources/Protocols/Controllers/SearchResultsViewController.swift
View File

@ -20,10 +20,10 @@
// THE SOFTWARE.
//
public protocol SearchResultsViewController where Self: UIViewController {
public protocol SearchResultsViewController {
var resultsView: TableViewHolder? { get set }
var searchResultsView: TableViewHolder { get set }
func update(from state: SearchResultsViewControllerState)
func update(for state: SearchResultsViewControllerState)
}