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

Connect account header text view

Browse source
This commit is contained in:
Justin Mazzocchi 2020-09-26 00:45:39 -07:00
parent 07521837a9
commit 582ff3623c
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
5 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
View Controllers/CollectionViewController.swift
View file

@ -171,10 +171,10 @@ private extension CollectionViewController {
.dropFirst()
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
accountHeaderView.viewModel = accountsStatusesViewModel
self?.sizeTableHeaderFooterViews()
}
.store(in: &cancellables)
accountHeaderView.viewModel = accountsStatusesViewModel
self?.sizeTableHeaderFooterViews()
}
.store(in: &cancellables)
tableView.tableHeaderView = accountHeaderView
}
}

11
ViewModels/Sources/ViewModels/AccountStatusesViewModel.swift
View file

@ -28,6 +28,17 @@ public class AccountStatusesViewModel: StatusListViewModel {
.assign(to: &$accountViewModel)
}
public override var navigationEvents: AnyPublisher<NavigationEvent, Never> {
$accountViewModel.compactMap { $0 }
.flatMap(\.events)
.flatMap { $0 }
.map(NavigationEvent.init)
.compactMap { $0 }
.assignErrorsToAlertItem(to: \.alertItem, on: self)
.merge(with: super.navigationEvents)
.eraseToAnyPublisher()
}
public override func request(maxID: String? = nil, minID: String? = nil) {
if case .statuses = collection, maxID == nil {
accountStatusesService.fetchPinnedStatuses()

2
ViewModels/Sources/ViewModels/Entities/NavigationEvent.swift
View file

@ -11,7 +11,7 @@ public enum NavigationEvent {
}
extension NavigationEvent {
init?(_ event: CollectionItemEvent) {
public init?(_ event: CollectionItemEvent) {
switch event {
case .ignorableOutput:
return nil

4
ViewModels/Sources/ViewModels/StatusListViewModel.swift
View file

@ -8,7 +8,6 @@ import ServiceLayer
public class StatusListViewModel: ObservableObject {
@Published public private(set) var items = [[CollectionItem]]()
@Published public var alertItem: AlertItem?
public let navigationEvents: AnyPublisher<NavigationEvent, Never>
public private(set) var nextPageMaxID: String?
public private(set) var maintainScrollPositionOfItem: CollectionItem?
@ -22,7 +21,6 @@ public class StatusListViewModel: ObservableObject {
init(statusListService: StatusListService) {
self.statusListService = statusListService
navigationEvents = navigationEventsSubject.eraseToAnyPublisher()
statusListService.statusSections
.combineLatest(statusListService.filters.map { $0.regularExpression() })
@ -43,6 +41,8 @@ public class StatusListViewModel: ObservableObject {
.store(in: &cancellables)
}
public var navigationEvents: AnyPublisher<NavigationEvent, Never> { navigationEventsSubject.eraseToAnyPublisher() }
public var title: AnyPublisher<String?, Never> { Just(statusListService.title).eraseToAnyPublisher() }
public func request(maxID: String? = nil, minID: String? = nil) {

18
Views/AccountHeaderView.swift
View file

@ -44,6 +44,23 @@ class AccountHeaderView: UIView {
}
}
extension AccountHeaderView: UITextViewDelegate {
func textView(
_ textView: UITextView,
shouldInteractWith URL: URL,
in characterRange: NSRange,
interaction: UITextItemInteraction) -> Bool {
switch interaction {
case .invokeDefaultAction:
viewModel?.accountViewModel?.urlSelected(URL)
return false
case .preview: return false
case .presentActions: return false
@unknown default: return false
}
}
}
private extension AccountHeaderView {
func initializationActions() {
let baseStackView = UIStackView()
@ -55,6 +72,7 @@ private extension AccountHeaderView {
baseStackView.axis = .vertical
noteTextView.isScrollEnabled = false
noteTextView.delegate = self
baseStackView.addArrangedSubview(noteTextView)
for (index, collection) in AccountStatusCollection.allCases.enumerated() {