Quick fixes before v1.2

milanvarady · Sep 16, 2023 · 30eb4a5 · 30eb4a5
1 parent 2769cfe
commit 30eb4a5
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 41 deletions.
diff --git a/Applite.xcodeproj/project.pbxproj b/Applite.xcodeproj/project.pbxproj
@@ -670,7 +670,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.aerolite.Applite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -705,7 +705,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.aerolite.Applite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Applite/Model/Cask Data/Cask.swift b/Applite/Model/Cask Data/Cask.swift
@@ -281,15 +281,15 @@ final class Cask: Identifiable, Decodable, Hashable, ObservableObject {
                 }
             }
 
-            appPath = "\(applicationsDirectory)/\(self.name).app"
+            appPath = "\"\(applicationsDirectory)/\(self.name).app\""
         } else {
             // Open normal app
             let brewDirectory = BrewPaths.currentBrewDirectory
 
             appPath = "\(brewDirectory.replacingOccurrences(of: " ", with: "\\ ") )/Caskroom/\(self.id)/*/*.app"
         }
 
-        let result = shell("open \"\(appPath)\"")
+        let result = shell("open \(appPath)")
 
         if result.didFail {
             Self.logger.error("Couldn't launch app at path: \(appPath). Output: \(result.output)")

diff --git a/Applite/Views/Detail Views/BrewManagementView.swift b/Applite/Views/Detail Views/BrewManagementView.swift
@@ -16,33 +16,36 @@ struct BrewManagementView: View {
 
     var body: some View {
         ScrollView {
-            VStack(alignment: .leading) {
-                // Title
-                Text("Manage Homebrew")
-                    .font(.system(size: 32, weight: .bold))
-
-                Text("This application uses the [Homebrew](https://brew.sh/) (brew for short) package manager to download apps. Homebrew is a free and open source command line utility that can download useful developer tools as well as desktop applications.")
+            VStack {
+                VStack(alignment: .leading) {
+                    // Title
+                    Text("Manage Homebrew")
+                        .font(.system(size: 32, weight: .bold))
+
+                    Text("This application uses the [Homebrew](https://brew.sh/) (brew for short) package manager to download apps. Homebrew is a free and open source command line utility that can download useful developer tools as well as desktop applications.")
+                        .padding(.bottom)
+
+                    section(title: "Info") {
+                        InfoView()
+                    }
                     .padding(.bottom)
-
-                section(title: "Info") {
-                    InfoView()
-                }
-                .padding(.bottom)
-
-                section(title: "Actions") {
-                    ActionsView(modifyingBrew: $modifyingBrew)
-                }
-                .padding(.bottom)
-
-                section(title: "Import/Export apps") {
-                    ExportView()
+
+                    section(title: "Actions") {
+                        ActionsView(modifyingBrew: $modifyingBrew)
+                    }
+                    .padding(.bottom)
+
+                    section(title: "Import/Export apps") {
+                        ExportView()
+                    }
+
+                    Spacer()
                 }
-
-                Spacer()
+                .frame(maxWidth: 800)
+                .padding(12)
             }
-            .padding(12)
+            .frame(maxWidth: .infinity)
         }
-        .frame(maxWidth: 800)
     }
 
     func section<Content: View>(title: LocalizedStringKey, @ViewBuilder content: ()->Content) -> some View {
@@ -151,6 +154,10 @@ struct BrewManagementView: View {
             // Reinstall brew button
             HStack {
                 reinstallButton
+                    .task {
+                        // Check if brew is installed in application support
+                        isAppBrewInstalled = isBrewPathValid(path: BrewPaths.getBrewExectuablePath(for: .appPath))
+                    }
 
                 if reinstallDone {
                     Image(systemName: "checkmark")
@@ -172,14 +179,6 @@ struct BrewManagementView: View {
                     SmallProgressView()
                 }
             }
-
-            EmptyView()
-            .task {
-                // Check if brew is installed in application support
-                print("checking \(BrewPaths.getBrewExectuablePath(for: .appPath))")
-                isAppBrewInstalled = isBrewPathValid(path: BrewPaths.getBrewExectuablePath(for: .appPath))
-                print("result \(isAppBrewInstalled)")
-            }
         }
 
         private var updateButton: some View {
@@ -328,8 +327,6 @@ struct BrewManagementView: View {
                         do {
                             let casks = try readCaskFile(url: url[0])
 
-                            print(casks)
-
                             installImported(casks: casks)
                         } catch {
                             logger.error("Failed to import cask. Reason: \(error.localizedDescription)")

diff --git a/Applite/Views/SettingsView.swift b/Applite/Views/SettingsView.swift
@@ -102,11 +102,11 @@ fileprivate struct GeneralSettingsView: View {
                     // Set color scheme to system
                     colorSchemePreference = darkMode ? .dark : .light
                     // Wait
-                    try? await Task.sleep(for: .seconds(0.001))
+                    try? await Task.sleep(for: .seconds(0.1))
                     // Set it back to nil (.system)
                     colorSchemePreference = .system
                     // Wait
-                    try? await Task.sleep(for: .seconds(0.001))
+                    try? await Task.sleep(for: .seconds(0.1))
                     // Set fixing color back to false
                     await MainActor.run { self.fixingColor = false }
                 }

diff --git a/Applite/Views/SetupView.swift b/Applite/Views/SetupView.swift
@@ -198,11 +198,11 @@ struct SetupView: View {
 
                 VStack(alignment: .leading) {
                     BrewPathSelectorView(isSelectedPathValid: $isBrewPathValid)
-                        .padding(.bottom)
 
                     Text("Selected brew path is invalid!")
                         .foregroundColor(.red)
                         .opacity(isBrewPathValid ? 0 : 1)
+                        .padding(.bottom)
 
                     Text("Appdir (optional)")
                         .font(.system(size: 16, weight: .bold))

diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -1597,7 +1597,7 @@
         "hu" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Függőségek telepítése"
+            "value" : "Tartozékok telepítése"
           }
         }
       }