Mastodon
/
metatext-app-ios-iphone-ipad
mirror of https://github.com/metabolist/metatext
1
0
Fork 0
Code Issues Releases Wiki Activity

Cleanup

This commit is contained in:
Justin Mazzocchi 2020-09-09 03:12:38 -07:00
parent e75791f670
commit 7161c21807
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Views/SecondaryNavigationView.swift
View File

@ -7,7 +7,6 @@ import ViewModels
struct SecondaryNavigationView: View { struct SecondaryNavigationView: View {
@EnvironmentObject var identification: Identification @EnvironmentObject var identification: Identification
@EnvironmentObject var tabNavigationViewModel: TabNavigationViewModel @EnvironmentObject var tabNavigationViewModel: TabNavigationViewModel
@Environment(\.presentationMode) var presentationMode
@Environment(\.displayScale) var displayScale: CGFloat @Environment(\.displayScale) var displayScale: CGFloat
var body: some View { var body: some View {
@ -69,7 +68,7 @@ struct SecondaryNavigationView: View {
.toolbar { .toolbar {
ToolbarItem(placement: .cancellationAction) { ToolbarItem(placement: .cancellationAction) {
Button { Button {
presentationMode.wrappedValue.dismiss() tabNavigationViewModel.presentingSecondaryNavigation = false
} label: { } label: {
Image(systemName: "xmark.circle.fill") Image(systemName: "xmark.circle.fill")
} }

1
Views/TabNavigationView.swift
View File

@ -27,6 +27,7 @@ struct TabNavigationView: View {
.sheet(isPresented: $viewModel.presentingSecondaryNavigation) { .sheet(isPresented: $viewModel.presentingSecondaryNavigation) {
SecondaryNavigationView() SecondaryNavigationView()
.environmentObject(viewModel) .environmentObject(viewModel)
.environmentObject(rootViewModel)
} }
.alertItem($viewModel.alertItem) .alertItem($viewModel.alertItem)
.onAppear(perform: viewModel.refreshIdentity) .onAppear(perform: viewModel.refreshIdentity)