+ New empty states for searching

Author: buresdv

Cork/Assets.xcassets/custom.apple.terminal.badge.magnifyingglass.symbolset/Contents.json

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

Cork/Assets.xcassets/custom.apple.terminal.badge.magnifyingglass.symbolset/custom.apple.terminal.badge.magnifyingglass.svg

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

Cork/Assets.xcassets/custom.macwindow.badge.magnifyingglass.symbolset/Contents.json

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

Cork/Assets.xcassets/custom.macwindow.badge.magnifyingglass.symbolset/custom.macwindow.badge.magnifyingglass.svg

@@ -9,6 +9,7 @@ import AppIntents
 import Charts
 import CorkShared
 import Foundation
+import SwiftUI
 
 enum PackageType: String, CustomStringConvertible, Plottable, AppEntity, Codable {
     case formula
@@ -23,6 +24,17 @@ enum PackageType: String, CustomStringConvertible, Plottable, AppEntity, Codable
             return String(localized: "package-details.type.cask")
         }
     }
+    
+    /// Localization keys for description of the package type
+    var localizableDescription: LocalizedStringKey
+    {
+        switch self {
+        case .formula:
+            return "package-details.type.formula"
+        case .cask:
+            return "package-details.type.cask"
+        }
+    }
 
     /// Parent folder for this package type
     var parentFolder: URL {

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

@@ -7138,6 +7138,16 @@
         }
       }
     },
+    "action.search-again" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Search Again"
+          }
+        }
+      }
+    },
     "action.show" : {
       "localizations" : {
         "cs" : {
@@ -11340,6 +11350,16 @@
         }
       }
     },
+    "add-package.search.results.casks.none-found" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "No Casks found"
+          }
+        }
+      }
+    },
     "add-package.search.results.formulae" : {
       "localizations" : {
         "cs" : {
@@ -11428,6 +11448,26 @@
         }
       }
     },
+    "add-package.search.results.formulae.none-found" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "No Formulae found"
+          }
+        }
+      }
+    },
+    "add-package.search.results.packages.none-found" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "No results found"
+          }
+        }
+      }
+    },
     "add-package.searching-%@" : {
       "localizations" : {
         "cs" : {
@@ -13801,6 +13841,16 @@
         }
       }
     },
+    "add.package.search.results.packages.none-found.description" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Try searching for another package"
+          }
+        }
+      }
+    },
     "add.package.uninstall.requires-sudo-password.terminal-instructions-%@" : {
       "localizations" : {
         "cs" : {

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

@@ -28,22 +28,57 @@ struct PresentingSearchResultsView: View
     @State private var isCasksSectionCollapsed: Bool = false
 
     @State var isSearchFieldFocused: Bool = true
+    
+    var wereAnyPackagesFound: Bool
+    {
+        if searchResultTracker.foundFormulae.isEmpty && searchResultTracker.foundCasks.isEmpty
+        {
+            return false
+        }
+        else
+        {
+            return true
+        }
+    }
 
     var body: some View
     {
         VStack
         {
             List(selection: $foundPackageSelection)
             {
-                SearchResultsSection(
-                    sectionType: .formula,
-                    packageList: searchResultTracker.foundFormulae
-                )
-
-                SearchResultsSection(
-                    sectionType: .cask,
-                    packageList: searchResultTracker.foundCasks
-                )
+                if !wereAnyPackagesFound
+                {
+                    if #available(macOS 14.0, *)
+                    {
+                        ContentUnavailableView {
+                            Label("add-package.search.results.packages.none-found", image: "custom.shippingbox.badge.magnifyingglass")
+                        } description: {
+                            Text("add.package.search.results.packages.none-found.description")
+                        } actions: {
+                            EmptyView()
+                        }
+
+                    } else {
+                        VStack(alignment: .center, spacing: 5) {
+                            Text("add-package.search.results.packages.none-found")
+                            
+                            restartSearchButton
+                        }
+                    }
+                }
+                else
+                {
+                    SearchResultsSection(
+                        sectionType: .formula,
+                        packageList: searchResultTracker.foundFormulae
+                    )
+
+                    SearchResultsSection(
+                        sectionType: .cask,
+                        packageList: searchResultTracker.foundCasks
+                    )
+                }
             }
             .listStyle(.bordered(alternatesRowBackgrounds: true))
             .frame(minHeight: 200)
@@ -59,15 +94,16 @@ struct PresentingSearchResultsView: View
             {
                 searchForPackageButton
             }
-            
-            ToolbarItem(placement: .primaryAction) {
+
+            ToolbarItem(placement: .primaryAction)
+            {
                 startInstallProcessButton
             }
-            
+
             ToolbarItemGroup(placement: .automatic)
             {
                 previewPackageButton
-                
+
                 startInstallProcessButton
             }
         }
@@ -90,7 +126,7 @@ struct PresentingSearchResultsView: View
         }
         .disabled(foundPackageSelection == nil)
     }
-    
+
     @ViewBuilder
     var searchForPackageButton: some View
     {
@@ -103,7 +139,7 @@ struct PresentingSearchResultsView: View
         .keyboardShortcut(.defaultAction)
         .disabled(packageRequested.isEmpty || !isSearchFieldFocused)
     }
-    
+
     @ViewBuilder
     var startInstallProcessButton: some View
     {
@@ -118,6 +154,17 @@ struct PresentingSearchResultsView: View
         .keyboardShortcut(.defaultAction)
         .disabled(foundPackageSelection == nil)
     }
+
+    @ViewBuilder
+    var restartSearchButton: some View
+    {
+        Button
+        {
+            packageInstallationProcessStep = .ready
+        } label: {
+            Text("action.search-again")
+        }
+    }
 
     private func getRequestedPackages()
     {
@@ -149,30 +196,55 @@ struct PresentingSearchResultsView: View
 
 private struct SearchResultsSection: View
 {
-    fileprivate enum SectionType
-    {
-        case formula, cask
-    }
-
-    let sectionType: SectionType
+    let sectionType: PackageType
 
     let packageList: [BrewPackage]
 
     @State private var isSectionCollapsed: Bool = false
 
     var body: some View
     {
-        Section
+        if packageList.isEmpty
+        {
+            Group
+            {
+                if #available(macOS 14.0, *)
+                {
+                    switch sectionType
+                    {
+                    case .formula:
+                        SmallerContentUnavailableView(label: "add-package.search.results.formulae.none-found", image: "custom.apple.terminal.badge.magnifyingglass")
+                    case .cask:
+                        SmallerContentUnavailableView(label: "add-package.search.results.casks.none-found", image: "custom.macwindow.badge.magnifyingglass")
+                    }
+                }
+                else
+                {
+                    switch sectionType
+                    {
+                    case .formula:
+                        Text("add-package.search.results.formulae.none-found")
+                    case .cask:
+                        Text("add-package.search.results.casks.none-found")
+                    }
+                }
+            }
+            .frame(minWidth: 0, maxWidth: .infinity, alignment: .center)
+        }
+        else
         {
-            if !isSectionCollapsed
+            Section
             {
-                ForEach(packageList)
-                { package in
-                    SearchResultRow(searchedForPackage: package, context: .searchResults, downloadCount: nil)
+                if !isSectionCollapsed
+                {
+                    ForEach(packageList)
+                    { package in
+                        SearchResultRow(searchedForPackage: package, context: .searchResults, downloadCount: nil)
+                    }
                 }
+            } header: {
+                CollapsibleSectionHeader(headerText: sectionType == .formula ? "add-package.search.results.formulae" : "add-package.search.results.casks", isCollapsed: $isSectionCollapsed)
             }
-        } header: {
-            CollapsibleSectionHeader(headerText: sectionType == .formula ? "add-package.search.results.formulae" : "add-package.search.results.casks", isCollapsed: $isSectionCollapsed)
         }
     }
 }

Cork/Enums/Packages/Package Types.swift

@@ -0,0 +1,56 @@
+//
+//  Inline Content Unavailable View.swift
+//  Cork
+//
+//  Created by David Bureš - P on 14.04.2025.
+//
+
+import SwiftUI
+
+struct InlineContentUnavailableView: View
+{
+    let label: LocalizedStringKey
+    let image: String
+    
+    var body: some View
+    {
+        HStack(alignment: .center, spacing: 5)
+        {
+            Image(image)
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 30)
+                .foregroundStyle(.tertiary)
+            
+            Text(label)
+                .font(.headline)
+                .foregroundStyle(.secondary)
+        }
+    }
+}
+
+struct SmallerContentUnavailableView: View
+{
+    let label: LocalizedStringKey
+    let image: String
+    
+    var body: some View
+    {
+        VStack(alignment: .center, spacing: 5)
+        {
+            Image(image)
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 40)
+                .foregroundStyle(.tertiary)
+            
+            Text(label)
+                .font(.headline)
+                .foregroundStyle(.secondary)
+        }
+    }
+}
+
+#Preview {
+    InlineContentUnavailableView(label: "add-package.search.results.casks.none-found", image: "custom.macwindow.badge.magnifyingglass")
+}