Skip to content

Commit

Permalink
rename isFirstPageLoaded to isFirstPageRequested
Browse files Browse the repository at this point in the history
  • Loading branch information
jdisho committed Jan 6, 2020
1 parent a3766e3 commit 4a8e47d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Papr/Scenes/Home/HomeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class HomeViewController: UIViewController, BindableType {
.bind(to: rightBarButtonItem.rx.image)
.disposed(by: disposeBag)

outputs.isFirstPageLoaded
outputs.isFirstPageRequested
.negate()
.bind(to: inputs.refreshProperty)
.disposed(by: disposeBag)
Expand Down
8 changes: 4 additions & 4 deletions Papr/Scenes/Home/HomeViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ protocol HomeViewModelOutput {
/// Emits an OrderBy value when an OrderBy option is chosen
var isOrderBy: Observable<OrderBy> { get }

/// Emits a boolean when the first page is loaded
var isFirstPageLoaded: Observable<Bool> { get }
/// Emits a boolean when the first page is requested
var isFirstPageRequested: Observable<Bool> { get }

/// Emites the child viewModels
var homeViewCellModelTypes: Observable<[HomeViewCellModelType]> { get }
Expand All @@ -58,7 +58,7 @@ final class HomeViewModel: HomeViewModelType, HomeViewModelInput, HomeViewModelO
let isRefreshing: Observable<Bool>
let isLoadingMore: Observable<Bool>
let isOrderBy: Observable<OrderBy>
let isFirstPageLoaded: Observable<Bool>
let isFirstPageRequested: Observable<Bool>
let homeViewCellModelTypes: Observable<[HomeViewCellModelType]>

// MARK: Private
Expand Down Expand Up @@ -123,7 +123,7 @@ final class HomeViewModel: HomeViewModelType, HomeViewModelInput, HomeViewModelO
isRefreshing = refreshProperty
isLoadingMore = loadMoreProperty
isOrderBy = orderByProperty
isFirstPageLoaded = firstResult.map(to: true)
isFirstPageRequested = firstResult.map(to: true)

homeViewCellModelTypes = Observable.combineLatest(requestedPhotos, cache.getAllObjects(ofType: Photo.self))
.map { photos, cachedPhotos -> [Photo] in
Expand Down

0 comments on commit 4a8e47d

Please sign in to comment.