+ Displayable installed packages

Author: David Bureš - Virtual

Cork/Models/Trackers/Brew Packages Tracker.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import SwiftUI
+import Defaults
 
 @Observable @MainActor
 class BrewPackagesTracker
@@ -31,6 +32,21 @@ class BrewPackagesTracker
         })
     }
 
+    /// Formulae than can be displayed, depending on whether the user set only to display intentionally installed packages
+    var displayableSuccessfullyLoadedFormulae: Set<BrewPackage>
+    {
+        let displayOnlyIntentionallyInstalledPackagesByDefault: Bool = Defaults[.displayOnlyIntentionallyInstalledPackagesByDefault]
+        
+        if displayOnlyIntentionallyInstalledPackagesByDefault
+        {
+            return self.successfullyLoadedFormulae.filter(\.installedIntentionally)
+        }
+        else
+        {
+            return self.successfullyLoadedFormulae
+        }
+    }
+    
     /// Collected errors from failed Formulae loading
     var unsuccessfullyLoadedFormulaeErrors: [PackageLoadingError]
     {
@@ -62,6 +78,20 @@ class BrewPackagesTracker
         })
     }
 
+    var displayableSuccessfullyLoadedCasks: Set<BrewPackage>
+    {
+        let displayOnlyIntentionallyInstalledPackagesByDefault: Bool = Defaults[.displayOnlyIntentionallyInstalledPackagesByDefault]
+        
+        if displayOnlyIntentionallyInstalledPackagesByDefault
+        {
+            return self.successfullyLoadedCasks.filter(\.installedIntentionally)
+        }
+        else
+        {
+            return self.successfullyLoadedCasks
+        }
+    }
+    
     /// Collected errors from failed Casks loading
     var unsuccessfullyLoadedCasksErrors: [PackageLoadingError]
     {
@@ -93,23 +123,15 @@ class BrewPackagesTracker
 
 extension BrewPackagesTracker
 {
+    
     var numberOfInstalledFormulae: Int
     {
-        let displayOnlyIntentionallyInstalledPackagesByDefault: Bool = UserDefaults.standard.bool(forKey: "displayOnlyIntentionallyInstalledPackagesByDefault")
-        
-        if displayOnlyIntentionallyInstalledPackagesByDefault
-        {
-            return self.successfullyLoadedFormulae.filter(\.installedIntentionally).count
-        }
-        else
-        {
-            return self.successfullyLoadedFormulae.count
-        }
+        return self.displayableSuccessfullyLoadedFormulae.count
     }
 
     var numberOfInstalledCasks: Int
     {
-        return self.successfullyLoadedCasks.count
+        return self.displayableSuccessfullyLoadedCasks.count
     }
 
     var numberOfInstalledPackages: Int

Cork/Views/Start Page/Sub-Views/Package And Tap Overview Box.swift

@@ -22,7 +22,7 @@ struct PackageAndTapOverviewBox: View
         {
             GroupBoxHeadlineGroup(
                 image: "terminal",
-                title: LocalizedStringKey("start-page.installed-formulae.count-\(displayOnlyIntentionallyInstalledPackagesByDefault ? brewPackagesTracker.successfullyLoadedFormulae.filter(\.installedIntentionally).count : brewPackagesTracker.installedFormulae.count)"),
+                title: LocalizedStringKey("start-page.installed-formulae.count-\(brewPackagesTracker.numberOfInstalledFormulae)"),
                 mainText: "start-page.installed-formulae.description",
                 animateNumberChanges: true
             )
@@ -38,7 +38,7 @@ struct PackageAndTapOverviewBox: View
 
             GroupBoxHeadlineGroup(
                 image: "macwindow",
-                title: LocalizedStringKey("start-page.installed-casks.count-\(brewPackagesTracker.installedCasks.count)"),
+                title: LocalizedStringKey("start-page.installed-casks.count-\(brewPackagesTracker.numberOfInstalledCasks)"),
                 mainText: "start-page.installed-casks.description",
                 animateNumberChanges: true
             )