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

Improve presentation state management

Browse source
This commit is contained in:
Justin Mazzocchi 2021-02-05 11:10:01 -08:00
parent 16413aa074
commit e821dd98ac
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
View Controllers/MainNavigationViewController.swift
View file

@ -33,7 +33,7 @@ final class MainNavigationViewController: UITabBarController {
} }
.store(in: &cancellables) .store(in: &cancellables)
viewModel.$presentingSecondaryNavigation.removeDuplicates().sink { [weak self] in viewModel.$presentingSecondaryNavigation.sink { [weak self] in
if $0 { if $0 {
self?.presentSecondaryNavigation() self?.presentSecondaryNavigation()
} else { } else {
@ -137,6 +137,14 @@ private extension MainNavigationViewController {
} }
func presentSecondaryNavigation() { func presentSecondaryNavigation() {
if let presentedViewController = presentedViewController {
if presentedViewController.view.tag == Self.secondaryNavigationViewTag {
return
} else {
dismiss(animated: true)
}
}
let secondaryNavigationView = SecondaryNavigationView(viewModel: viewModel) let secondaryNavigationView = SecondaryNavigationView(viewModel: viewModel)
.environmentObject(rootViewModel) .environmentObject(rootViewModel)
let hostingController = UIHostingController(rootView: secondaryNavigationView) let hostingController = UIHostingController(rootView: secondaryNavigationView)
@ -160,6 +168,14 @@ private extension MainNavigationViewController {
} }
func presentNewStatus(newStatusViewModel: NewStatusViewModel) { func presentNewStatus(newStatusViewModel: NewStatusViewModel) {
if let presentedViewController = presentedViewController {
if presentedViewController.view.tag == Self.newStatusViewTag {
return
} else {
dismiss(animated: true)
}
}
let newStatusViewController = NewStatusViewController(viewModel: newStatusViewModel, let newStatusViewController = NewStatusViewController(viewModel: newStatusViewModel,
rootViewModel: rootViewModel) rootViewModel: rootViewModel)
let navigationController = UINavigationController(rootViewController: newStatusViewController) let navigationController = UINavigationController(rootViewController: newStatusViewController)