From b260545a2a41a24e6706c26f11452a3db0634424 Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Sun, 13 Nov 2022 12:01:15 -0800 Subject: [PATCH] Refactoring --- Views/SwiftUI/RootView.swift | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/Views/SwiftUI/RootView.swift b/Views/SwiftUI/RootView.swift index abb24e0..431d24a 100644 --- a/Views/SwiftUI/RootView.swift +++ b/Views/SwiftUI/RootView.swift @@ -8,29 +8,26 @@ struct RootView: View { @StateObject var viewModel: RootViewModel var body: some View { - Group { - if let navigationViewModel = viewModel.navigationViewModel { - MainNavigationView { navigationViewModel } - .id(navigationViewModel.identityContext.identity.id) - .environmentObject(viewModel) - .transition(.opacity) - .edgesIgnoringSafeArea(.all) - .onReceive(navigationViewModel.identityContext.$appPreferences.map(\.colorScheme), - perform: setColorScheme) - } else { - NavigationView { - AddIdentityView( - viewModelClosure: { viewModel.addIdentityViewModel() }, - displayWelcome: true) - .navigationBarTitleDisplayMode(.inline) - .navigationBarHidden(true) - } + if let navigationViewModel = viewModel.navigationViewModel { + MainNavigationView { navigationViewModel } + .id(navigationViewModel.identityContext.identity.id) .environmentObject(viewModel) - .navigationViewStyle(StackNavigationViewStyle()) .transition(.opacity) + .edgesIgnoringSafeArea(.all) + .onReceive(navigationViewModel.identityContext.$appPreferences.map(\.colorScheme), + perform: setColorScheme) + } else { + NavigationView { + AddIdentityView( + viewModelClosure: { viewModel.addIdentityViewModel() }, + displayWelcome: true) + .navigationBarTitleDisplayMode(.inline) + .navigationBarHidden(true) } + .environmentObject(viewModel) + .navigationViewStyle(StackNavigationViewStyle()) + .transition(.opacity) } - } }