From 47c7d4c164cc5ab0010f016e875706ccd24eda13 Mon Sep 17 00:00:00 2001
From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com>
Date: Fri, 7 Aug 2020 21:08:57 -0700
Subject: [PATCH] Cleanup

---
 Development Assets/DevelopmentModels.swift       | 8 ++------
 Shared/View Models/MainNavigationViewModel.swift | 4 ++--
 iOS/TabNavigation.swift                          | 6 +++---
 macOS/SidebarNavigation.swift                    | 6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Development Assets/DevelopmentModels.swift b/Development Assets/DevelopmentModels.swift
index 40cd93b..9002158 100644
--- a/Development Assets/DevelopmentModels.swift	
+++ b/Development Assets/DevelopmentModels.swift	
@@ -92,20 +92,16 @@ extension AppEnvironment {
         webAuthSessionType: SuccessfulStubbingWebAuthSession.self)
 }
 
-extension IdentityRepository {
-    static let development = try! IdentityRepository(identityID: devIdentityID, appEnvironment: .development)
-}
-
 extension RootViewModel {
     static let development = RootViewModel(environment: .development)
 }
 
 extension MainNavigationViewModel {
-    static let development = MainNavigationViewModel(identityRepository: .development)
+    static let development = RootViewModel.development.mainNavigationViewModel(identityID: devIdentityID)!
 }
 
 extension SecondaryNavigationViewModel {
-    static let development = MainNavigationViewModel.development.settingsViewModel()
+    static let development = MainNavigationViewModel.development.secondaryNavigationViewModel()
 }
 
 extension IdentitiesViewModel {
diff --git a/Shared/View Models/MainNavigationViewModel.swift b/Shared/View Models/MainNavigationViewModel.swift
index dbabbb5..1321f5d 100644
--- a/Shared/View Models/MainNavigationViewModel.swift	
+++ b/Shared/View Models/MainNavigationViewModel.swift	
@@ -6,7 +6,7 @@ import Combine
 class MainNavigationViewModel: ObservableObject {
     @Published private(set) var identity: Identity
     @Published private(set) var recentIdentities = [Identity]()
-    @Published var presentingSettings = false
+    @Published var presentingSecondaryNavigation = false
     @Published var alertItem: AlertItem?
     var selectedTab: Tab? = .timelines
 
@@ -46,7 +46,7 @@ extension MainNavigationViewModel {
             .store(in: &cancellables)
     }
 
-    func settingsViewModel() -> SecondaryNavigationViewModel {
+    func secondaryNavigationViewModel() -> SecondaryNavigationViewModel {
         SecondaryNavigationViewModel(identityRepository: identityRepository)
     }
 }
diff --git a/iOS/TabNavigation.swift b/iOS/TabNavigation.swift
index d681d61..4bfd418 100644
--- a/iOS/TabNavigation.swift
+++ b/iOS/TabNavigation.swift
@@ -22,8 +22,8 @@ struct TabNavigation: View {
                 .tag(tab)
             }
         }
-        .sheet(isPresented: $viewModel.presentingSettings) {
-            SecondaryNavigationView(viewModel: viewModel.settingsViewModel())
+        .sheet(isPresented: $viewModel.presentingSecondaryNavigation) {
+            SecondaryNavigationView(viewModel: viewModel.secondaryNavigationViewModel())
                 .environmentObject(rootViewModel)
         }
         .alertItem($viewModel.alertItem)
@@ -44,7 +44,7 @@ private extension TabNavigation {
                 .navigationBarTitle(viewModel.identity.handle, displayMode: .inline)
                 .navigationBarItems(
                     leading: Button {
-                        viewModel.presentingSettings.toggle()
+                        viewModel.presentingSecondaryNavigation.toggle()
                     } label: {
                         KFImage(viewModel.identity.image,
                                 options: .downsampled(dimension: 28, scaleFactor: displayScale))
diff --git a/macOS/SidebarNavigation.swift b/macOS/SidebarNavigation.swift
index 8896be9..3afecf7 100644
--- a/macOS/SidebarNavigation.swift
+++ b/macOS/SidebarNavigation.swift
@@ -61,7 +61,7 @@ private extension SidebarNavigation {
         var body: some View {
             VStack(alignment: .leading, spacing: 0) {
                 Divider()
-                Button(action: { viewModel.presentingSettings.toggle() }) {
+                Button(action: { viewModel.presentingSecondaryNavigation.toggle() }) {
                     KFImage(viewModel.identity.image,
                              options: .downsampled(dimension: 28, scaleFactor: displayScale))
                         .placeholder { Image(systemName: "gear") }
@@ -76,8 +76,8 @@ private extension SidebarNavigation {
                 .padding(.horizontal, 16)
                 .buttonStyle(PlainButtonStyle())
             }
-            .sheet(isPresented: $viewModel.presentingSettings) {
-                SecondaryNavigationView(viewModel: viewModel.settingsViewModel())
+            .sheet(isPresented: $viewModel.presentingSecondaryNavigation) {
+                SecondaryNavigationView(viewModel: viewModel.secondaryNavigationViewModel())
                     .environmentObject(viewModel)
                     .environmentObject(rootViewModel)
             }