mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-11-22 00:01:00 +00:00
Code Issues Projects Releases Wiki Activity

Refresh

Browse source
This commit is contained in:
Justin Mazzocchi 2021-01-16 12:06:35 -08:00
parent 7bc3ce0de3
commit 8fb20269e3
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
7 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ServiceLayer/Sources/ServiceLayer/Services/AccountListService.swift
View file

@ -10,6 +10,7 @@ public struct AccountListService {
public let sections: AnyPublisher<[[CollectionItem]], Error>
public let nextPageMaxId: AnyPublisher<String, Never>
public let navigationService: NavigationService
public let canRefresh = false
private let accountList = CurrentValueSubject<[Account], Error>([])
private let endpoint: AccountsEndpoint

3
ServiceLayer/Sources/ServiceLayer/Services/CollectionService.swift
View file

@ -7,6 +7,7 @@ public protocol CollectionService {
var sections: AnyPublisher<[[CollectionItem]], Error> { get }
var nextPageMaxId: AnyPublisher<String, Never> { get }
var preferLastPresentIdOverNextPageMaxId: Bool { get }
var canRefresh: Bool { get }
var title: AnyPublisher<String, Never> { get }
var titleLocalizationComponents: AnyPublisher<[String], Never> { get }
var navigationService: NavigationService { get }
@ -19,6 +20,8 @@ extension CollectionService {
public var preferLastPresentIdOverNextPageMaxId: Bool { false }
public var canRefresh: Bool { true }
public var title: AnyPublisher<String, Never> { Empty().eraseToAnyPublisher() }
public var titleLocalizationComponents: AnyPublisher<[String], Never> { Empty().eraseToAnyPublisher() }

30
View Controllers/TableViewController.swift
View file

@ -47,6 +47,14 @@ class TableViewController: UITableViewController {
tableView.tableFooterView = UIView()
tableView.contentInset.bottom = Self.bottomInset
if viewModel.canRefresh {
refreshControl = UIRefreshControl()
refreshControl?.addAction(
UIAction { [weak self] _ in
self?.viewModel.request(maxId: nil, minId: nil) },
for: .valueChanged)
}
view.addSubview(webfingerIndicatorView)
webfingerIndicatorView.translatesAutoresizingMaskIntoConstraints = false
@ -208,6 +216,7 @@ extension TableViewController: ZoomAnimatorDelegate {
private extension TableViewController {
static let bottomInset: CGFloat = .newStatusButtonDimension + .defaultSpacing * 4
static let loadingFooterDebounceInterval: TimeInterval = 0.5
var visibleLoadMoreViews: [LoadMoreView] {
tableView.visibleCells.compactMap { $0.contentView as? LoadMoreView }
@ -237,13 +246,22 @@ private extension TableViewController {
viewModel.loading.receive(on: DispatchQueue.main).assign(to: &$loading)
$loading.sink { [weak self] in
guard let self = self else { return }
$loading.debounce(
for: .seconds(Self.loadingFooterDebounceInterval),
scheduler: DispatchQueue.main)
.sink { [weak self] in
guard let self = self else { return }
self.tableView.tableFooterView = $0 ? self.loadingTableFooterView : UIView()
self.sizeTableHeaderFooterViews()
}
.store(in: &cancellables)
if !$0 {
self.refreshControl?.endRefreshing()
}
let refreshControlVisibile = self.refreshControl?.isRefreshing ?? false
self.tableView.tableFooterView = $0 && !refreshControlVisibile ? self.loadingTableFooterView : UIView()
self.sizeTableHeaderFooterViews()
}
.store(in: &cancellables)
viewModel.alertItems
.compactMap { $0 }

2
ViewModels/Sources/ViewModels/CollectionItemsViewModel.swift
View file

@ -84,6 +84,8 @@ extension CollectionItemsViewModel: CollectionViewModel {
public var preferLastPresentIdOverNextPageMaxId: Bool { collectionService.preferLastPresentIdOverNextPageMaxId }
public var canRefresh: Bool { collectionService.canRefresh }
public func request(maxId: String? = nil, minId: String? = nil) {
let publisher: AnyPublisher<Never, Error>

1
ViewModels/Sources/ViewModels/CollectionViewModel.swift
View file

@ -14,6 +14,7 @@ public protocol CollectionViewModel {
var shouldAdjustContentInset: Bool { get }
var nextPageMaxId: String? { get }
var preferLastPresentIdOverNextPageMaxId: Bool { get }
var canRefresh: Bool { get }
func request(maxId: String?, minId: String?)
func viewedAtTop(indexPath: IndexPath)
func select(indexPath: IndexPath)

2
ViewModels/Sources/ViewModels/ProfileViewModel.swift
View file

@ -107,6 +107,8 @@ extension ProfileViewModel: CollectionViewModel {
collectionViewModel.value.preferLastPresentIdOverNextPageMaxId
}
public var canRefresh: Bool { collectionViewModel.value.canRefresh }
public func request(maxId: String?, minId: String?) {
if case .statuses = collection, maxId == nil {
profileService.fetchPinnedStatuses()

1
Views/LoadingTableFooterView.swift
View file

@ -10,6 +10,7 @@ final class LoadingTableFooterView: UIView {
addSubview(activityIndicatorView)
activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false
activityIndicatorView.style = .large
NSLayoutConstraint.activate([
activityIndicatorView.centerXAnchor.constraint(equalTo: centerXAnchor),