Merge branch 'adjusted-terminal-output-matching.navigation' into main.adjusted-terminal-output-matching

Author: buresdv

Cork/ContentView.swift

@@ -32,6 +32,7 @@ struct ContentView: View, Sendable
     @Environment(\.openWindow) var openWindow: OpenWindowAction
 
     @InjectedObservable(\.appState) var appState: AppState
+    @InjectedObservable(\.navigationManager) var navigationManager
 
     @Environment(BrewPackagesTracker.self) var brewPackagesTracker: BrewPackagesTracker
     @Environment(TapTracker.self) var tapTracker: TapTracker
@@ -97,25 +98,22 @@ struct ContentView: View, Sendable
         NavigationSplitView(columnVisibility: self.$columnVisibility)
         {
             let _ = print("Parent appState: \(ObjectIdentifier(appState))")
-            let _ = print("Parent navigationManager: \(ObjectIdentifier(appState.navigationManager))")
-            
+            let _ = print("Parent navigationManager: \(ObjectIdentifier(navigationManager))")
+
             SidebarView()
         } detail: {
-            NavigationStack(path: Bindable(appState).navigationManager.path)
+            switch navigationManager.openedScreen
             {
+            case .package(let package):
+                PackageDetailView(package: package)
+                    .frame(minWidth: 600, minHeight: 500)
+            case .tap(let tap):
+                TapDetailView(tap: tap)
+                    .frame(minWidth: 600, minHeight: 500)
+            case nil:
                 StartPage()
                     .frame(minWidth: 600, minHeight: 500)
             }
-            .navigationDestination(for: AppState.NavigationManager.DetailDestination.self)
-            { destination in
-                switch destination
-                {
-                case .package(let package):
-                    PackageDetailView(package: package)
-                case .tap(let tap):
-                    TapDetailView(tap: tap)
-                }
-            }
         }
         .navigationTitle("app-name")
         .navigationSubtitle("navigation.installed-packages.count-\(self.brewPackagesTracker.numberOfInstalledPackages)")
@@ -705,4 +703,3 @@ private extension ContentView
         await self.topPackagesTracker.loadTopPackages(numberOfDays: self.discoverabilityDaySpan.rawValue, appState: self.appState)
     }
 }
-

Cork/CorkApp.swift

@@ -26,9 +26,9 @@ struct CorkApp: App
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate: AppDelegate
 
     @InjectedObservable(\.appState) var appState: AppState
+    @InjectedObservable(\.navigationManager) var navigationManager
     @InjectedObservable(\.brewfileManager) var brewfileManager: BrewfileManager
 
-    
     @State var brewPackagesTracker: BrewPackagesTracker = .init()
     @State var tapTracker: TapTracker = .init()
 
@@ -418,11 +418,11 @@ struct CorkApp: App
     {
         Button
         {
-            appState.navigationManager.dismissScreen()
+            navigationManager.dismissScreen()
         } label: {
             Label("action.go-to-status-page.menu-bar", systemImage: "house")
         }
-        .disabled(!appState.navigationManager.isAnyScreenOpened)
+        .disabled(!navigationManager.isAnyScreenOpened)
         Divider()
     }
 

Cork/Protocols/View/Dismissable Pane.swift

@@ -12,9 +12,6 @@ import FactoryKit
 
 protocol DismissablePane: View
 {
-    /// Has to be loaded from the `@Environment`
-    var appState: AppState { get }
-    
     /// Dismisss this pane from the detail view
     func dismissPane()
 }
@@ -23,6 +20,8 @@ extension DismissablePane
 {
     func dismissPane()
     {
-        self.appState.navigationManager.dismissScreen()
+        let navigationManager: CorkModels.NavigationManager = Container.shared.navigationManager.resolve()
+        
+        navigationManager.dismissScreen()
     }
 }

Cork/Views/Packages/Package Details/Package Details.swift

@@ -138,6 +138,8 @@ struct PackageDetailView: View, Sendable, DismissablePane
         .frame(minWidth: 450, minHeight: 400, alignment: .topLeading)
         .task(id: package.id)
         {
+            AppConstants.shared.logger.info("Will start loading of details for package \(package.name(withPrecision: .general))")
+            
             isLoadingDetails = true
             defer
             {

Cork/Views/Sidebar/Components/Sidebar Package Row.swift

@@ -18,12 +18,14 @@ struct SidebarPackageRow: View
     @Default(.enableSwipeActions) var enableSwipeActions: Bool
 
     @InjectedObservable(\.appState) var appState: AppState
+    @InjectedObservable(\.navigationManager) var navigationManager
+    
     @Environment(BrewPackagesTracker.self) var brewPackagesTracker: BrewPackagesTracker
     @Environment(OutdatedPackagesTracker.self) var outdatedPackagesTracker: OutdatedPackagesTracker
 
     var body: some View
     {
-        NavigationLink(value: AppState.NavigationManager.DetailDestination.package(package: package))
+        NavigationLink(value: NavigationManager.DetailDestination.package(package: package))
         {
             PackageListItem(packageItem: package)
         }

Cork/Views/Sidebar/Components/Taps Section.swift

@@ -14,6 +14,8 @@ import FactoryKit
 struct TapsSection: View
 {
     @InjectedObservable(\.appState) var appState: AppState
+    @InjectedObservable(\.navigationManager) var navigationManager
+    
     @Environment(TapTracker.self) var tapTracker: TapTracker
 
     let searchText: String
@@ -40,7 +42,7 @@ struct TapsSection: View
                 {
                     ForEach(displayedTaps.sorted(by: { $0.nameInternal < $1.nameInternal }))
                     { tap in
-                        NavigationLink(value: AppState.NavigationManager.DetailDestination.tap(tap: tap))
+                        NavigationLink(value: NavigationManager.DetailDestination.tap(tap: tap))
                         {
                             Text(tap.name(withPrecision: .full))
 

Cork/Views/Sidebar/Sidebar View.swift

@@ -16,6 +16,7 @@ struct SidebarView: View
     @Default(.allowMoreCompleteUninstallations) var allowMoreCompleteUninstallations: Bool
 
     @InjectedObservable(\.appState) var appState: AppState
+    @InjectedObservable(\.navigationManager) var navigationManager
 
     @State private var isShowingSearchField: Bool = false
     @State private var searchText: String = ""
@@ -41,9 +42,9 @@ struct SidebarView: View
     var body: some View
     {
         let _ = print("Sidebar appState: \(ObjectIdentifier(appState))")
-        let _ = print("Sidebar navigationManager \(ObjectIdentifier(appState.navigationManager))")
+        let _ = print("Sidebar navigationManager \(ObjectIdentifier(navigationManager))")
         /// Navigation selection enables "Home" button behaviour. [2023.09]
-        List(selection: Bindable(appState).navigationManager.path)
+        List(selection: Bindable(navigationManager).openedScreen)
         {
             if currentTokens.isEmpty || currentTokens.contains(.formula) || currentTokens.contains(.intentionallyInstalledPackage)
             {
@@ -85,13 +86,13 @@ struct SidebarView: View
             {
                 Button
                 {
-                    appState.navigationManager.dismissScreen()
+                    navigationManager.dismissScreen()
                 } label: {
                     Label("action.go-to-status-page", systemImage: "house")
                 }
                 .help("action.go-to-status-page")
                 .disabled(
-                    !appState.navigationManager.isAnyScreenOpened || !searchText.isEmpty || !currentTokens.isEmpty
+                    !navigationManager.isAnyScreenOpened || !searchText.isEmpty || !currentTokens.isEmpty
                 )
                 .accessibilityLabel("accessibility.label.return-to-status-page")
             }

Modules/Packages/PackagesModels/App State.swift

@@ -11,6 +11,7 @@ import Foundation
 import Observation
 @preconcurrency import UserNotifications
 import SwiftUI
+import SwiftNavigation
 
 /// Class that holds the global state of the app, excluding services
 @Observable @MainActor
@@ -32,45 +33,6 @@ public final class AppState
 
     public var licensingState: LicensingState = .notBoughtOrHasNotActivatedDemo
 
-    /// Class for controlling the opened panes, and providing information about the status of the currently opened pane
-    @Observable @MainActor
-    public final class NavigationManager
-    {
-        /// Possible things to show in the detail pane
-        /// Can be either a ``BrewPackage`` for a Formula or Cask, or ``BrewTap`` for a Tap
-        public enum DetailDestination: Hashable
-        {
-            case package(package: BrewPackage)
-            case tap(tap: BrewTap)
-        }
-
-        /// Which pane is opened in the detail
-        public var openedScreen: DetailDestination?
-        
-        public var path: [DetailDestination] = .init()
-
-        /// Dismiss the currently opened screen and return to the status page
-        public func dismissScreen()
-        {
-            self.openedScreen = nil
-        }
-
-        /// Check whether any panes are currently opened
-        public var isAnyScreenOpened: Bool
-        {
-            if self.openedScreen == nil
-            {
-                return false
-            }
-            else
-            {
-                return true
-            }
-        }
-    }
-
-    public var navigationManager: NavigationManager = .init()
-
     // MARK: - Notifications
 
     public var notificationEnabledInSystemSettings: Bool?

Modules/Packages/PackagesModels/Dependencies/Navigation Manager Dependency.swift

@@ -8,3 +8,15 @@
 import Foundation
 import FactoryKit
 
+public extension Container
+{
+    @MainActor
+    var navigationManager: Factory<NavigationManager>
+    {
+        Factory(self)
+        {
+            NavigationManager()
+        }
+        .singleton
+    }
+}

Modules/Packages/PackagesModels/Logic/Packages/Load Up Package Info.swift

@@ -9,11 +9,11 @@ import CorkShared
 import Foundation
 import CorkTerminalFunctions
 
-enum BrewPackageInfoLoadingError: LocalizedError
+public enum BrewPackageInfoLoadingError: LocalizedError
 {
     case didNotGetAnyTerminalOutput, standardErrorNotEmpty(presentError: String), couldNotConvertOutputToData, couldNotRetrievePackageFromOutput, couldNotDecodeOutput(presentError: String)
 
-    var errorDescription: String?
+    public var errorDescription: String?
     {
         switch self
         {
@@ -257,7 +257,7 @@ extension BrewPackage
 
     /// Load package details
     @MainActor
-    public func loadDetails() async throws -> BrewPackage.BrewPackageDetails
+    public func loadDetails() async throws(BrewPackageInfoLoadingError) -> BrewPackage.BrewPackageDetails
     {
         let decoder: JSONDecoder = {
             let decoder: JSONDecoder = .init()
@@ -312,6 +312,8 @@ extension BrewPackage
 
             throw BrewPackageInfoLoadingError.couldNotConvertOutputToData
         }
+        
+        AppConstants.shared.logger.debug("Converted package details JSON to parseable data. Data size: \(decodableData.count)")
 
         // MARK: - Decoding