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

UI adjustments

Browse source
This commit is contained in:
Justin Mazzocchi 2021-01-31 00:12:10 -08:00
parent 108e553788
commit 6395349a5c
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
View Controllers/AddIdentityViewController.swift
View file

@ -185,29 +185,9 @@ private extension AddIdentityViewController {
} }
func setupViewModelBindings() { func setupViewModelBindings() {
viewModel.$loading.sink { [weak self] in viewModel.$instance.combineLatest(viewModel.$isPublicTimelineAvailable, viewModel.$loading)
guard let self = self else { return }
if $0 {
self.activityIndicator.startAnimating()
self.logInButton.isHidden_stackViewSafe = true
self.joinButton.isHidden_stackViewSafe = true
self.browseButton.isHidden_stackViewSafe = true
self.whatIsMastodonButton.isHidden_stackViewSafe = true
} else {
self.activityIndicator.stopAnimating()
self.logInButton.isHidden_stackViewSafe = false
self.joinButton.isHidden_stackViewSafe = !(self.viewModel.instance?.registrations ?? false)
self.browseButton.isHidden_stackViewSafe = !self.viewModel.isPublicTimelineAvailable
self.whatIsMastodonButton.isHidden_stackViewSafe =
!self.displayWelcome || self.viewModel.instance == nil
}
}
.store(in: &cancellables)
viewModel.$instance.combineLatest(viewModel.$isPublicTimelineAvailable)
.throttle(for: .seconds(.defaultAnimationDuration), scheduler: DispatchQueue.main, latest: true) .throttle(for: .seconds(.defaultAnimationDuration), scheduler: DispatchQueue.main, latest: true)
.sink { [weak self] in self?.configure(instance: $0, isPublicTimelineAvailable: $1) } .sink { [weak self] in self?.configure(instance: $0, isPublicTimelineAvailable: $1, loading: $2) }
.store(in: &cancellables) .store(in: &cancellables)
viewModel.$alertItem viewModel.$alertItem
@ -266,8 +246,16 @@ private extension AddIdentityViewController {
} }
} }
func configure(instance: Instance?, isPublicTimelineAvailable: Bool) { func configure(instance: Instance?, isPublicTimelineAvailable: Bool, loading: Bool) {
if loading {
self.activityIndicator.startAnimating()
} else {
self.activityIndicator.stopAnimating()
}
UIView.animate(withDuration: .zeroIfReduceMotion(.defaultAnimationDuration)) { UIView.animate(withDuration: .zeroIfReduceMotion(.defaultAnimationDuration)) {
self.logInButton.isHidden_stackViewSafe = loading
if let instance = instance { if let instance = instance {
self.instanceTitleLabel.text = instance.title self.instanceTitleLabel.text = instance.title
self.instanceURLLabel.text = instance.uri self.instanceURLLabel.text = instance.uri
@ -284,18 +272,19 @@ private extension AddIdentityViewController {
} }
self.joinButton.setTitle(joinButtonTitle, for: .normal) self.joinButton.setTitle(joinButtonTitle, for: .normal)
self.joinButton.isHidden_stackViewSafe = false self.joinButton.isHidden_stackViewSafe = loading
} else { } else {
self.joinButton.isHidden_stackViewSafe = true self.joinButton.isHidden_stackViewSafe = true
} }
self.browseButton.isHidden_stackViewSafe = !isPublicTimelineAvailable self.browseButton.isHidden_stackViewSafe = !isPublicTimelineAvailable || loading
self.whatIsMastodonButton.isHidden_stackViewSafe = true self.whatIsMastodonButton.isHidden_stackViewSafe = true
} else { } else {
self.instanceStackView.isHidden_stackViewSafe = true self.instanceStackView.isHidden_stackViewSafe = true
self.joinButton.isHidden_stackViewSafe = true self.joinButton.isHidden_stackViewSafe = true
self.browseButton.isHidden_stackViewSafe = true self.browseButton.isHidden_stackViewSafe = true
self.whatIsMastodonButton.isHidden_stackViewSafe = !self.displayWelcome || self.logInButton.alpha < 1 self.whatIsMastodonButton.isHidden_stackViewSafe =
!self.displayWelcome || self.logInButton.alpha < 1 || loading
} }
} }
} }