Better reactivity and functionality

The app is starting to look good
2024-07-09 20:29:20 +02:00 · 2024-07-09 15:00:09 +02:00
16 changed files with 515 additions and 757 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -97,4 +97,4 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode

 iOSInjectionProject/
-.DS_Store
+
--- a/.swift-format
+++ b/.swift-format
@@ -1,69 +0,0 @@
-{
-  "fileScopedDeclarationPrivacy" : {
-    "accessLevel" : "private"
-  },
-  "indentation" : {
-    "tabs" : 1
-  },
-  "indentConditionalCompilationBlocks" : true,
-  "indentSwitchCaseLabels" : false,
-  "lineBreakAroundMultilineExpressionChainComponents" : false,
-  "lineBreakBeforeControlFlowKeywords" : false,
-  "lineBreakBeforeEachArgument" : false,
-  "lineBreakBeforeEachGenericRequirement" : false,
-  "lineLength" : 80,
-  "maximumBlankLines" : 1,
-  "multiElementCollectionTrailingCommas" : true,
-  "noAssignmentInExpressions" : {
-    "allowedFunctions" : [
-      "XCTAssertNoThrow"
-    ]
-  },
-  "prioritizeKeepingFunctionOutputTogether" : false,
-  "respectsExistingLineBreaks" : true,
-  "rules" : {
-    "AllPublicDeclarationsHaveDocumentation" : false,
-    "AlwaysUseLiteralForEmptyCollectionInit" : false,
-    "AlwaysUseLowerCamelCase" : true,
-    "AmbiguousTrailingClosureOverload" : true,
-    "BeginDocumentationCommentWithOneLineSummary" : false,
-    "DoNotUseSemicolons" : true,
-    "DontRepeatTypeInStaticProperties" : true,
-    "FileScopedDeclarationPrivacy" : true,
-    "FullyIndirectEnum" : true,
-    "GroupNumericLiterals" : true,
-    "IdentifiersMustBeASCII" : true,
-    "NeverForceUnwrap" : false,
-    "NeverUseForceTry" : false,
-    "NeverUseImplicitlyUnwrappedOptionals" : false,
-    "NoAccessLevelOnExtensionDeclaration" : true,
-    "NoAssignmentInExpressions" : true,
-    "NoBlockComments" : true,
-    "NoCasesWithOnlyFallthrough" : true,
-    "NoEmptyTrailingClosureParentheses" : true,
-    "NoLabelsInCasePatterns" : true,
-    "NoLeadingUnderscores" : false,
-    "NoParensAroundConditions" : true,
-    "NoPlaygroundLiterals" : true,
-    "NoVoidReturnOnFunctionSignature" : true,
-    "OmitExplicitReturns" : false,
-    "OneCasePerLine" : true,
-    "OneVariableDeclarationPerLine" : true,
-    "OnlyOneTrailingClosureArgument" : true,
-    "OrderedImports" : true,
-    "ReplaceForEachWithForLoop" : true,
-    "ReturnVoidInsteadOfEmptyTuple" : true,
-    "TypeNamesShouldBeCapitalized" : true,
-    "UseEarlyExits" : false,
-    "UseLetInEveryBoundCaseVariable" : true,
-    "UseShorthandTypeNames" : true,
-    "UseSingleLinePropertyGetter" : true,
-    "UseSynthesizedInitializer" : true,
-    "UseTripleSlashForDocumentationComments" : true,
-    "UseWhereClausesInForLoops" : false,
-    "ValidateDocumentationComments" : false
-  },
-  "spacesAroundRangeFormationOperators" : false,
-  "tabWidth" : 4,
-  "version" : 1
-}
--- a/Brewer.xcodeproj/project.pbxproj
+++ b/Brewer.xcodeproj/project.pbxproj
@@ -12,8 +12,6 @@
 		9E6C730C2C3D796D0056ADDC /* DownloadButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */; };
 		9E6C730E2C3DB16F0056ADDC /* UninstallButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */; };
 		9E6C73112C3DB5940056ADDC /* CaskDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C73102C3DB5940056ADDC /* CaskDetailView.swift */; };
-		9E6C73182C3E853E0056ADDC /* UpdateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C73172C3E853E0056ADDC /* UpdateButton.swift */; };
-		9E7ADB5A2C3EE41F00F2B8CA /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 9E7ADB592C3EE41F00F2B8CA /* LaunchAtLogin */; };
 		9E8CE5362C3C545600A39146 /* BrewerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8CE5352C3C545600A39146 /* BrewerApp.swift */; };
 		9E8CE5382C3C545600A39146 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8CE5372C3C545600A39146 /* ContentView.swift */; };
 		9E8CE53A2C3C545700A39146 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9E8CE5392C3C545700A39146 /* Assets.xcassets */; };
@@ -47,7 +45,6 @@
 		9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadButton.swift; sourceTree = "<group>"; };
 		9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UninstallButton.swift; sourceTree = "<group>"; };
 		9E6C73102C3DB5940056ADDC /* CaskDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaskDetailView.swift; sourceTree = "<group>"; };
-		9E6C73172C3E853E0056ADDC /* UpdateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateButton.swift; sourceTree = "<group>"; };
 		9E8CE5322C3C545600A39146 /* Brewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Brewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9E8CE5352C3C545600A39146 /* BrewerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrewerApp.swift; sourceTree = "<group>"; };
 		9E8CE5372C3C545600A39146 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -67,7 +64,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9E7ADB5A2C3EE41F00F2B8CA /* LaunchAtLogin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -92,7 +88,6 @@
 			isa = PBXGroup;
 			children = (
 				9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */,
-				9E6C73172C3E853E0056ADDC /* UpdateButton.swift */,
 				9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */,
 			);
 			path = Components;
@@ -192,9 +187,6 @@
 			dependencies = (
 			);
 			name = Brewer;
-			packageProductDependencies = (
-				9E7ADB592C3EE41F00F2B8CA /* LaunchAtLogin */,
-			);
 			productName = Brewer;
 			productReference = 9E8CE5322C3C545600A39146 /* Brewer.app */;
 			productType = "com.apple.product-type.application";
@@ -267,9 +259,6 @@
 				Base,
 			);
 			mainGroup = 9E8CE5292C3C545600A39146;
-			packageReferences = (
-				9E98BE4E2C3EE353006ED274 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */,
-			);
 			productRefGroup = 9E8CE5332C3C545600A39146 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -315,7 +304,6 @@
 				9E6C73072C3D5E570056ADDC /* SearchView.swift in Sources */,
 				9E6C730C2C3D796D0056ADDC /* DownloadButton.swift in Sources */,
 				9E8CE5382C3C545600A39146 /* ContentView.swift in Sources */,
-				9E6C73182C3E853E0056ADDC /* UpdateButton.swift in Sources */,
 				9E6C730E2C3DB16F0056ADDC /* UninstallButton.swift in Sources */,
 				9E8CE5622C3C5A6A00A39146 /* Homebrew.swift in Sources */,
 				9E6C73092C3D5E950056ADDC /* InstalledView.swift in Sources */,
@@ -481,24 +469,21 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Brewer/Brewer.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "0.1.3-beta";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Brewer/Preview Content\"";
 				DEVELOPMENT_TEAM = 96S93Z7LTG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = Brewer;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "0.1.3-beta";
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.cems.Brewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -512,24 +497,21 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Brewer/Brewer.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "0.1.3-beta";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Brewer/Preview Content\"";
 				DEVELOPMENT_TEAM = 96S93Z7LTG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = Brewer;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "0.1.3-beta";
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.cems.Brewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -649,25 +631,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCRemoteSwiftPackageReference section */
-		9E98BE4E2C3EE353006ED274 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin-Modern";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
-		};
-/* End XCRemoteSwiftPackageReference section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		9E7ADB592C3EE41F00F2B8CA /* LaunchAtLogin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9E98BE4E2C3EE353006ED274 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */;
-			productName = LaunchAtLogin;
-		};
-/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 9E8CE52A2C3C545600A39146 /* Project object */;
 }
--- a/Brewer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Brewer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,15 +0,0 @@
-{
-  "originHash" : "aae61040c30e63b9cf0f5455365680cfeabef0aac829c0941d4d6f6180010fc9",
-  "pins" : [
-    {
-      "identity" : "launchatlogin-modern",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/sindresorhus/LaunchAtLogin-Modern",
-      "state" : {
-        "branch" : "main",
-        "revision" : "a04ec1c363be3627734f6dad757d82f5d4fa8fcc"
-      }
-    }
-  ],
-  "version" : 3
-}
--- a/Brewer/BrewerApp.swift
+++ b/Brewer/BrewerApp.swift
@@ -5,7 +5,6 @@
 //  Created by Cédric MAS on 08/07/2024.
 //

-import LaunchAtLogin
 import SwiftUI

@main
@@ -13,12 +12,8 @@ struct BrewerApp: App {
  @AppStorage("isUpToDate") var isUpToDate: Bool = true
  init() {
    do {
-			let res = try shell(
-				"/opt/homebrew/bin/brew outdated --greedy-latest -g | wc -l")
-			if let number = Int(
-				res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0
-			{
-				print(number)
+      let res = try shell("/opt/homebrew/bin/brew outdated --greedy-latest -g | wc -l")
+      if let number = Int(res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0 {
        isUpToDate = false
      }
    } catch {
@@ -27,25 +22,11 @@ struct BrewerApp: App {
  }

  var body: some Scene {
+    WindowGroup {
+      EmptyView()
+    }
    MenuBarExtra {
-			VStack(spacing: 0) {
-				ContentView()
-				Form {
-					HStack {
-						LaunchAtLogin.Toggle()
-						Button {
-							NSApplication.shared.terminate(self)
-						} label: {
-							Label("Quit", systemImage: "x")
-								.symbolRenderingMode(.palette)
-								.symbolVariant(.circle)
-								.symbolVariant(.fill)
-								.foregroundStyle(.white, .red)
-						}
-						.frame(maxWidth: .infinity, alignment: .trailing)
-					}
-				}
-			}.padding()
+      ContentView().padding()
    } label: {
      if isUpToDate {
        Label("Brewer", systemImage: "sparkle.magnifyingglass")
@@ -56,9 +37,6 @@ struct BrewerApp: App {
      }
    }
    .menuBarExtraStyle(.window)
-		WindowGroup {
-			EmptyView()
-		}
  }

 }
--- a/Brewer/CaskDetailView.swift
+++ b/Brewer/CaskDetailView.swift
@@ -29,8 +29,7 @@ struct CaskDetailView: View {
        }
        if cask.installed != nil {
          ToolbarItem(placement: .primaryAction) {
-						UninstallButton(
-							name: cask.fullToken, brewListing: brewListing)
+            UninstallButton(name: cask.fullToken, brewListing: brewListing)
          }
        }
      }
--- a/Brewer/Components/UpdateButton.swift
+++ b/Brewer/Components/UpdateButton.swift
@@ -1,61 +0,0 @@
-//
-//  UpdateButton.swift
-//  Brewer
-//
-//  Created by Cédric MAS on 10/07/2024.
-//
-
-import SwiftUI
-
-struct UpdateButton: View {
-	let name: String
-	@State private var brew = Homebrew()
-	@State private var newInfo = Homebrew()
-
-	private var updated: String? {
-		if let cask = newInfo.data?.casks.first(where: { $0.fullToken == name }
-		), !cask.outdated {
-			return cask.version
-		}
-		if let formulae = newInfo.data?.formulae.first(where: {
-			$0.fullName == name
-		}), !formulae.outdated {
-			return formulae.versions.stable
-		}
-
-		return nil
-	}
-
-	var body: some View {
-		if let newVersion = updated {
-			Text("Updated: \(newVersion)")
-		} else if brew.isLoading {
-			ProgressView()
-				.controlSize(.small)
-		} else if brew.errorMessage != nil {
-			Image(systemName: "x")
-				.symbolRenderingMode(.palette)
-				.symbolVariant(.circle)
-				.symbolVariant(.fill)
-				.foregroundStyle(.white, .red)
-		} else {
-			Button {
-				Task {
-					await brew.update(name)
-					newInfo.getInfo(on: name)
-				}
-			} label: {
-				Label(
-					"Update",
-					systemImage:
-						"arrow.counterclockwise"
-				)
-				.symbolRenderingMode(.palette)
-				.symbolVariant(.circle)
-				.symbolVariant(.fill)
-				.foregroundStyle(
-					.white, .orange)
-			}
-		}
-	}
-}
--- a/Brewer/ContentView.swift
+++ b/Brewer/ContentView.swift
@@ -16,13 +16,11 @@ struct ContentView: View {
  @State private var segmentedSelection: SegementedSelection = .search
  var body: some View {
    NavigationStack {
-			VStack {
      Picker("", selection: $segmentedSelection) {
        ForEach(SegementedSelection.allCases, id: \.self) { sel in
          Text(sel.rawValue).tag(sel)
        }
      }.pickerStyle(.segmented)
-					.padding(.leading, -8)
      switch segmentedSelection {
      case .search:
        SearchView()
@@ -32,7 +30,6 @@ struct ContentView: View {
    }
  }
 }
-}

 #Preview {
  ContentView()
--- a/Brewer/InstalledView.swift
+++ b/Brewer/InstalledView.swift
@@ -19,22 +19,25 @@ struct InstalledView: View {
            Section {
              ForEach(data.casks, id: \.fullToken) { cask in
                NavigationLink {
-									CaskDetailView(
-										cask: cask, brewListing: brew)
+                  CaskDetailView(cask: cask, brewListing: brew)
                } label: {
                  HStack {
                    Text(cask.name.first ?? cask.fullToken)
                    Spacer()
                    if cask.outdated {
-											UpdateButton(name: cask.fullToken)
+                      Button {
+
+                      } label: {
+                        Label("Update", systemImage: "arrow.counterclockwise.circle.fill")
+                          .symbolRenderingMode(.palette)
+                          .foregroundStyle(.white, .orange)
+                      }
                    } else {
                      Text(cask.version)
                    }
                  }
                  .contextMenu {
-										UninstallButton(
-											name: cask.fullToken,
-											brewListing: brew)
+                    UninstallButton(name: cask.fullToken, brewListing: brew)
                  }
                }
              }
@@ -54,15 +57,19 @@ struct InstalledView: View {
                  Text(formulae.fullName)
                  Spacer()
                  if formulae.outdated {
-										UpdateButton(name: formulae.fullName)
+                    Button {
+
+                    } label: {
+                      Label("Update", systemImage: "arrow.counterclockwise.circle.fill")
+                        .symbolRenderingMode(.palette)
+                        .foregroundStyle(.white, .orange)
+                    }
                  } else {
                    Text(formulae.versions.stable)
                  }
                }
                .contextMenu {
-									UninstallButton(
-										name: formulae.fullName,
-										brewListing: brew)
+                  UninstallButton(name: formulae.fullName, brewListing: brew)
                }
              }
            } header: {
@@ -75,18 +82,13 @@ struct InstalledView: View {
          }
        }
        .listStyle(.inset(alternatesRowBackgrounds: true))
-				let areOutdated =
-					data.casks.filter(\.outdated).count
-					+ data.formulae.filter(\.outdated).count
-				let _ = UserDefaults.standard.set(
-					!(areOutdated > 0), forKey: "isUpToDate")
+        let areOutdated = data.casks.map(\.outdated).count + data.formulae.map(\.outdated).count
+        let _ = UserDefaults.standard.set(!(areOutdated > 0), forKey: "isUpToDate")
        if areOutdated > 0 {
          Button {

          } label: {
-						Label(
-							"Update all",
-							systemImage: "arrow.counterclockwise.circle.fill")
+            Label("Update all", systemImage: "arrow.counterclockwise.circle.fill")
          }
          .buttonStyle(.borderedProminent)
          .tint(.orange)
--- a/Brewer/Model/Homebrew.swift
+++ b/Brewer/Model/Homebrew.swift
@@ -41,7 +41,7 @@ struct Cask: Codable {
  let url: String
  let version: String
  let installed: String?
-	var outdated: Bool
+  let outdated: Bool

  enum CodingKeys: String, CodingKey {
    case token, tap, name, desc, homepage, url, version, installed, outdated
@@ -111,11 +111,9 @@ class Homebrew {
    self.data = nil
    Task { [weak self] in
      do {
-				let res = try shell(
-					"/opt/homebrew/bin/brew info --json=v2 \(query)")
+        let res = try shell("/opt/homebrew/bin/brew info --json=v2 \(query)")
        if let data = res.data(using: .utf8) {
-					let output = try JSONDecoder().decode(
-						InfoResponse.self, from: data)
+          let output = try JSONDecoder().decode(InfoResponse.self, from: data)
          self?.data = output
        }
      } catch {
@@ -131,11 +129,9 @@ class Homebrew {
    self.errorMessage = nil
    Task { [weak self] in
      do {
-				let res = try shell(
-					"/opt/homebrew/bin/brew info --json=v2 --installed")
+        let res = try shell("/opt/homebrew/bin/brew info --json=v2 --installed")
        if let data = res.data(using: .utf8) {
-					let output = try JSONDecoder().decode(
-						InfoResponse.self, from: data)
+          let output = try JSONDecoder().decode(InfoResponse.self, from: data)
          self?.data = output
        }
      } catch {
@@ -152,9 +148,7 @@ class Homebrew {
    self.data = nil
    let task = Task { [weak self] in
      do {
-				let res = try shell(
-					"/opt/homebrew/bin/brew list -1 \(name) >/dev/null 2>&1; echo $?"
-				)
+        let res = try shell("/opt/homebrew/bin/brew list -1 \(name) >/dev/null 2>&1; echo $?")
          .trimmingCharacters(in: .whitespacesAndNewlines)
        self?.isLoading = false
        return res == "0"
@@ -178,9 +172,7 @@ class Homebrew {
    self.data = nil
    let task = Task { [weak self] in
      do {
-				try shell(
-					"/opt/homebrew/bin/brew install \(isCask ? "--cask" : "") \(fullToken)"
-				)
+        try shell("/opt/homebrew/bin/brew install \(isCask ? "--cask" : "") \(fullToken)")
      } catch {
        self?.errorMessage = error.localizedDescription
      }
@@ -191,7 +183,7 @@ class Homebrew {
    return switch await task.result {
    case .success(let success):
      success
-		case .failure:
+    case .failure(let fail):
      false
    }
  }
@@ -201,9 +193,9 @@ class Homebrew {
    self.data = nil
    let task = Task { [weak self] in
      do {
-				try shell(
-					"/opt/homebrew/bin/brew uninstall \(fullToken)"
-				)
+        let res =
+          try shell("/opt/homebrew/bin/brew uninstall \(fullToken); echo $?")
+          .trimmingCharacters(in: .whitespacesAndNewlines)
      } catch {
        self?.errorMessage = error.localizedDescription
      }
@@ -214,35 +206,9 @@ class Homebrew {
    return switch await task.result {
    case .success(let success):
      success
-		case .failure:
+    case .failure(let failure):
      false
    }
-	}

-	func update(_ name: String) async -> Bool {
-		self.isLoading = true
-		self.errorMessage = nil
-		self.data = nil
-		let task = Task { [weak self] in
-			do {
-				let res = try shell(
-					"/opt/homebrew/bin/brew upgrade \(name); echo $?"
-				)
-				.trimmingCharacters(in: .whitespacesAndNewlines)
-				self?.isLoading = false
-				return res == "0"
-			} catch {
-				self?.errorMessage = error.localizedDescription
-			}
-			self?.isLoading = false
-			return false
-		}
-
-		return switch await task.result {
-		case .success(let success):
-			success
-		case .failure:
-			false
-		}
  }
 }
--- a/Brewer/SearchView.swift
+++ b/Brewer/SearchView.swift
@@ -13,6 +13,8 @@ struct SearchView: View {
  var body: some View {
    VStack {
      TextField("Search", text: $query)
+        .padding()
+        .padding(.bottom, 0)
        .onSubmit {
          brew.getInfo(on: query)
        }
@@ -28,14 +30,11 @@ struct SearchView: View {
                  Text(cask.fullToken)
                  Spacer()
                  if cask.installed != nil {
-										Image(
-											systemName: "checkmark.circle.fill"
-										)
+                    Image(systemName: "checkmark.circle.fill")
                      .symbolRenderingMode(.palette)
                      .foregroundStyle(.white, .green)
                  } else {
-										DownloadButton(
-											name: cask.fullToken, isCask: true)
+                    DownloadButton(name: cask.fullToken, isCask: true)
                  }
                }
              }
--- a/BrewerTests/BrewerTests.swift
+++ b/BrewerTests/BrewerTests.swift
@@ -6,7 +6,6 @@
 //

 import XCTest
-
@testable import Brewer

 final class BrewerTests: XCTestCase {
Author	SHA1	Message	Date
cdricms	c675a98309	Better reactivity and functionality	2024-07-09 20:29:20 +02:00
cdricms	bd9c351b7c	The app is starting to look good	2024-07-09 15:00:09 +02:00