Merge branch 'macos-14.tahoe-preparation'

Author: buresdv

.mise.toml

@@ -1,2 +1,2 @@
 [tools]
-tuist = "4.50.2"
+tuist = "latest"

Cork/Assets.xcassets/custom.brain.slash.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "custom.brain.slash.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Cork/Assets.xcassets/custom.brain.slash.symbolset/custom.brain.slash.svg

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "custom.shippingbox.badge.plus.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Cork/Assets.xcassets/custom.shippingbox.badge.plus.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "custom.spigot.badge.plus.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Cork/Assets.xcassets/custom.shippingbox.badge.plus.symbolset/custom.shippingbox.badge.plus.svg

@@ -65,38 +65,6 @@ struct ContentView: View, Sendable
         .disabled(self.outdatedPackagesTracker.isCheckingForPackageUpdates)
     }
 
-    @ViewBuilder private var addTapButton: some View
-    {
-        Button
-        {
-            appState.showSheet(ofType: .tapAddition)
-        } label: {
-            Label
-            {
-                Text("navigation.add-tap")
-            } icon: {
-                Image(systemName: "spigot")
-            }
-        }
-        .help("navigation.add-tap.help")
-    }
-
-    @ViewBuilder private var installPackageButton: some View
-    {
-        Button
-        {
-            appState.showSheet(ofType: .packageInstallation)
-        } label: {
-            Label
-            {
-                Text("navigation.install-package")
-            } icon: {
-                Image(systemName: "plus")
-            }
-        }
-        .help("navigation.install-package.help")
-    }
-
     @ViewBuilder private var performMaintenanceButton: some View
     {
         Button
@@ -158,17 +126,17 @@ struct ContentView: View, Sendable
 
             ToolbarItem(id: "upgradePackages", placement: .primaryAction)
             {
-                self.upgradePackagesButton
+                UpgradePackagesButton(appState: appState)
             }
 
             ToolbarItem(id: "addTap", placement: .primaryAction)
             {
-                self.addTapButton
+                AddTapButton(appState: appState)
             }
 
             ToolbarItem(id: "installPackage", placement: .primaryAction)
             {
-                self.installPackageButton
+                InstallPackageButton(appState: appState)
             }
 
             ToolbarItem(id: "maintenance", placement: .primaryAction)

Cork/Assets.xcassets/custom.spigot.badge.plus.symbolset/Contents.json

@@ -441,6 +441,7 @@ struct CorkApp: App
             SettingsView()
                 .environment(appDelegate.appState)
         }
+        .windowResizability(.contentSize)
 
         // MARK: - Menu Bar Extra
 
@@ -464,7 +465,7 @@ struct CorkApp: App
         {
             openWindow(id: .aboutWindowID)
         } label: {
-            Text("navigation.about")
+            Label("navigation.about", systemImage: "info.circle")
         }
     }
 
@@ -478,12 +479,14 @@ struct CorkApp: App
                 {
                     NSWorkspace.shared.open(URL(string: "https://github.com/buresdv/Cork/issues/new?assignees=&labels=Bug&projects=&template=bug_report.yml")!)
                 } label: {
-                    Text("action.report-bugs.git-hub")
+                    Label("action.report-bugs.git-hub", systemImage: "exclamationmark.bubble")
                 }
 
+                /*
                 ButtonThatOpensWebsites(
                     websiteURL: URL(string: "https://forum.rikidar.eu/forumdisplay.php?fid=8")!, buttonText: "actiton.report-bugs.forum"
                 )
+                 */
 
                 /*
                  Button
@@ -516,15 +519,15 @@ struct CorkApp: App
         {
             hasFinishedOnboarding = false
         } label: {
-            Text("onboarding.start")
+            Label("onboarding.start", systemImage: "person.crop.circle.badge.checkmark")
         }
         .disabled(!hasFinishedOnboarding)
 
         Button
         {
             hasFinishedLicensingWorkflow = false
         } label: {
-            Text("licensing.title")
+            Label("licensing.title", systemImage: "checkmark.seal")
         }
 
         Divider()
@@ -537,7 +540,7 @@ struct CorkApp: App
         {
             appDelegate.appState.navigationManager.dismissScreen()
         } label: {
-            Text("action.go-to-status-page.menu-bar")
+            Label("action.go-to-status-page.menu-bar", systemImage: "house")
         }
         .disabled(!appDelegate.appState.navigationManager.isAnyScreenOpened)
         Divider()
@@ -571,7 +574,7 @@ struct CorkApp: App
                 }
             }
         } label: {
-            Text("navigation.menu.import-export.export-brewfile")
+            Label("navigation.menu.import-export.export-brewfile", systemImage: "square.and.arrow.up")
         }
         .asyncButtonStyle(.plainStyle)
 
@@ -620,7 +623,7 @@ struct CorkApp: App
                 }
             }
         } label: {
-            Text("navigation.menu.import-export.import-brewfile")
+            Label("navigation.menu.import-export.import-brewfile", systemImage: "square.and.arrow.down")
         }
         .asyncButtonStyle(.plainStyle)
     }
@@ -634,29 +637,19 @@ struct CorkApp: App
         {
             appDelegate.appState.isSearchFieldFocused = true
         } label: {
-            Text("navigation.menu.search")
+            Label("navigation.menu.search", systemImage: "magnifyingglass")
         }
         .keyboardShortcut("f", modifiers: .command)
     }
 
     @ViewBuilder
     var packagesMenuBarSection: some View
     {
-        Button
-        {
-            appDelegate.appState.showSheet(ofType: .packageInstallation)
-        } label: {
-            Text("navigation.menu.packages.install")
-        }
-        .keyboardShortcut("n")
+        InstallPackageButton(appState: appDelegate.appState)
+            .keyboardShortcut("n")
 
-        Button
-        {
-            appDelegate.appState.showSheet(ofType: .tapAddition)
-        } label: {
-            Text("navigation.menu.packages.add-tap")
-        }
-        .keyboardShortcut("n", modifiers: [.command, .option])
+        AddTapButton(appState: appDelegate.appState)
+            .keyboardShortcut("n", modifiers: [.command, .option])
 
         Divider()
 
@@ -681,30 +674,20 @@ struct CorkApp: App
         {
             openWindow(id: .servicesWindowID)
         } label: {
-            Text("navigation.menu.services.open-window")
+            Label("navigation.menu.services.open-window", systemImage: "square.stack.3d.down.right")
         }
         .keyboardShortcut("s", modifiers: .command)
     }
 
     @ViewBuilder
     var maintenanceMenuBarSection: some View
     {
-        Button
-        {
-            appDelegate.appState.showSheet(ofType: .maintenance(fastCacheDeletion: false))
-        } label: {
-            Text("navigation.menu.maintenance.perform")
-        }
-        .keyboardShortcut("m", modifiers: [.command, .shift])
+        OpenMaintenanceSheetButton(appState: appDelegate.appState, labelType: .performMaintenance)
+            .keyboardShortcut("m", modifiers: [.command, .shift])
 
-        Button
-        {
-            appDelegate.appState.showSheet(ofType: .maintenance(fastCacheDeletion: true))
-        } label: {
-            Text("navigation.menu.maintenance.delete-cached-downloads")
-        }
-        .keyboardShortcut("m", modifiers: [.command, .option])
-        .disabled(cachedDownloadsTracker.cachedDownloadsSize == 0)
+        DeleteCachedDownloadsButton(appState: appDelegate.appState)
+            .keyboardShortcut("m", modifiers: [.command, .option])
+            .disabled(cachedDownloadsTracker.cachedDownloadsSize == 0)
     }
 
     @ViewBuilder

Cork/Assets.xcassets/custom.spigot.badge.plus.symbolset/custom.spigot.badge.plus.svg

@@ -8426,6 +8426,7 @@
       }
     },
     "actiton.report-bugs.forum" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -31847,6 +31848,7 @@
       }
     },
     "navigation.add-tap" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -31935,6 +31937,7 @@
       }
     },
     "navigation.add-tap.help" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -33143,6 +33146,7 @@
       }
     },
     "navigation.menu.maintenance.delete-cached-downloads" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {