Mythic v0.4.1 | "Silver Chariot", Part 2

Mythic.xcodeproj/project.pbxproj

@@ -764,7 +764,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3027;
+				CURRENT_PROJECT_VERSION = 3037;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"Mythic/Preview Content\"";
@@ -811,7 +811,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3027;
+				CURRENT_PROJECT_VERSION = 3037;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"Mythic/Preview Content\"";

Mythic/Utilities/Legendary/LegendaryInterface.swift

@@ -263,6 +263,20 @@ final class Legendary {
                     return
                 }
 
+                if output.stderr.contains("Verification finished successfully.") {
+                    Task { @MainActor in
+                        let alert = NSAlert()
+                        alert.messageText = "Successfully verified \"\(args.game.title)\"."
+                        alert.informativeText = "\"\(args.game.title)\" is now ready to be played."
+                        alert.alertStyle = .informational
+                        alert.addButton(withTitle: "OK")
+
+                        if let window = NSApp.windows.first {
+                            alert.beginSheetModal(for: window)
+                        }
+                    }
+                }
+
                 if let match = try? progressRegex.firstMatch(in: output.stderr) {
                     Task { @MainActor in
                         operation.status.progress = GameOperation.InstallStatus.Progress(
@@ -597,23 +611,30 @@ final class Legendary {
      */
     static func getImage(of game: Mythic.Game, type: ImageType) -> String {
         let metadata = try? getGameMetadata(game: game)
-        var imageURL: String = .init()
+        let keyImages = metadata?["metadata"]["keyImages"].array ?? .init()
 
-        if let keyImages = metadata?["metadata"]["keyImages"].array {
-            for image in keyImages {
-                if type == .normal {
-                    if image["type"] == "DieselGameBox" {
-                        imageURL = image["url"].stringValue
-                    }
-                } else if type == .tall {
-                    if image["type"] == "DieselGameBoxTall" {
-                        imageURL = image["url"].stringValue
-                    }
-                }
+        let prioritisedTypes: [String] = {
+            switch type {
+            case .normal: return ["DieselGameBoxWide", "DieselGameBox"]
+            case .tall: return ["DieselGameBoxTall"]
             }
+        }()
+
+        if let imageURL = keyImages.first(where: { prioritisedTypes.contains($0["type"].stringValue) })?["url"].stringValue {
+            return imageURL
+        }
+
+        // fallback #1
+        if let fallbackURL = keyImages.first(where: {
+            guard let width = $0["width"].int, let height = $0["height"].int else { return false }
+
+            return (type == .normal && width >= height) || (type == .tall && height > width) // check aspect ratios
+        })?["url"].stringValue {
+            return fallbackURL
         }
 
-        return imageURL
+        // fallback #2
+        return keyImages.first?["url"].stringValue ?? .init()
     }
 
     // MARK: - Is Alias Method

Mythic/Utilities/Local/LocalGames.swift

@@ -57,7 +57,11 @@ final class LocalGames {
             if FileManager.default.fileExists(atPath: game.path ?? .init()) {
                 workspace.open(
                     URL(filePath: game.path ?? .init()),
-                    configuration: .init(),
+                    configuration: {
+                        let configuration = NSWorkspace.OpenConfiguration()
+                        configuration.arguments = game.launchArguments
+                        return configuration
+                    }(),
                     completionHandler: { (_/*game*/, error) in
                         if let error = error {
                             log.error("Error launching local macOS game \"\(game.title)\": \(error)")

Mythic/Views/Navigation/AccountsView.swift

@@ -24,7 +24,8 @@ struct AccountsView: View {
     @State private var signedIn: Bool = false
 
     @State private var isHoveringOverDestructiveSteamButton: Bool = false
-
+
+    // Spacer()s here are necessary
     var body: some View {
         VStack {
             HStack {

Mythic/Views/Navigation/SettingsView.swift

@@ -63,48 +63,35 @@ struct SettingsView: View {
                 Toggle("Force quit all games when Mythic closes", isOn: $quitOnClose)
 
                 HStack {
-                    VStack {
-                        HStack {
-                            Text("Choose the default base path for games:")
-                            Spacer()
-                        }
-                        HStack {
-                            Text(installBaseURL.prettyPath())
-                                .foregroundStyle(.placeholder)
-
-                            Spacer()
-                        }
+                    VStack(alignment: .leading) {
+                        Text("Choose the default base path for games:")
+                        Text(installBaseURL.prettyPath())
+                            .foregroundStyle(.placeholder)
                     }
-                    
+
                     Spacer()
 
                     if !FileLocations.isWritableFolder(url: installBaseURL) {
                         Image(systemName: "exclamationmark.triangle.fill")
                             .help("Folder is not writable.")
                     }
-
-                    VStack {
-                        HStack {
-                            Spacer()
-                            Button("Browse...") { // TODO: replace with .fileImporter
-                                let openPanel = NSOpenPanel()
-                                openPanel.canChooseDirectories = true
-                                openPanel.canChooseFiles = false
-                                openPanel.canCreateDirectories = true
-                                openPanel.allowsMultipleSelection = false
-
-                                if openPanel.runModal() == .OK {
-                                    installBaseURL = openPanel.urls.first!
-                                }
+
+                    VStack(alignment: .trailing) {
+                        Button("Browse...") { // TODO: replace with .fileImporter
+                            let openPanel = NSOpenPanel()
+                            openPanel.canChooseDirectories = true
+                            openPanel.canChooseFiles = false
+                            openPanel.canCreateDirectories = true
+                            openPanel.allowsMultipleSelection = false
+
+                            if openPanel.runModal() == .OK {
+                                installBaseURL = openPanel.urls.first!
                             }
-                            .buttonStyle(.borderedProminent)
                         }
-
-                        HStack {
-                            Spacer()
-                            Button("Reset to Default") {
-                                installBaseURL = Bundle.appGames!
-                            }
+                        .buttonStyle(.borderedProminent)
+
+                        Button("Reset to Default") {
+                            installBaseURL = Bundle.appGames!
                         }
                     }
                 }

Mythic/Views/OnboardingViewR2.swift

@@ -594,6 +594,7 @@ struct OnboardingR2: View { // TODO: ViewModel
 
             VStack {
                 Spacer()
+
                 Text("(alpha)")
                     .font(.footnote)
                     .foregroundStyle(.placeholder)

Mythic/Views/Unified/ContainerListView.swift

@@ -42,12 +42,13 @@ struct ContainerListView: View {
                     .buttonStyle(.accessoryBar)
 
                     Spacer()
-                    Button(action: {
+
+                    Button {
                         selectedContainerURL = container.url
                         isContainerConfigurationViewPresented = true
-                    }, label: {
+                    } label: {
                         Image(systemName: "gear")
-                    })
+                    }
                     .buttonStyle(.borderless)
                     .help("Modify default settings for \"\(container.name)\"")
 

Mythic/Views/Unified/Models/GameCardVM.swift

@@ -209,7 +209,6 @@ import Shimmer
                 }
                 .sheet(isPresented: $isUninstallSheetPresented) {
                     UninstallViewEvo(game: $game, isPresented: $isUninstallSheetPresented)
-                        .padding()
                 }
             }
 

Mythic/Views/Unified/Modules/GameCard.swift

@@ -79,14 +79,14 @@ struct FadeInModifier: ViewModifier {
 extension GameCard {
     struct ImageCard: View {
         @Binding var game: Game
-        var withBlur: Bool = true
 
         /// Binding that updates when image is empty (default to true)
         @Binding var isImageEmpty: Bool
-
+
+        var withBlur: Bool = true
+
         var body: some View {
-            RoundedRectangle(cornerRadius: 20)
-                .fill(.background)
+            blankImageView
                 .aspectRatio(3/4, contentMode: .fit)
                 .overlay {
                     gameImage
@@ -108,12 +108,12 @@ extension GameCard {
                             withAnimation { isImageEmpty = false }
                         }
                 case .failure:
-                    blankImageView
+                    EmptyView()
                         .onAppear {
                             withAnimation { isImageEmpty = true }
                         }
                 @unknown default:
-                    blankImageView
+                    EmptyView()
                         .onAppear {
                             withAnimation { isImageEmpty = true }
                         }

Mythic/Views/Unified/Modules/GameInstallProgressView.swift

@@ -30,7 +30,9 @@ struct GameInstallProgressView: View {
             HStack {
                 OperationProgressView(withPercentage: withPercentage)
 
-                infoButton()
+                if operation.current?.type != .repair {
+                    infoButton()
+                }
 
                 stopButton()
             }

Mythic/Views/Unified/Modules/GameListCard.swift

@@ -25,8 +25,7 @@ struct GameListCard: View {
                 CachedAsyncImage(url: URL(string: Legendary.getImage(of: game, type: .normal))) { phase in
                     switch phase {
                     case .empty:
-                        RoundedRectangle(cornerRadius: 20)
-                            .fill(.background)
+                        EmptyView()
                             .onAppear {
                                 withAnimation { isImageEmpty = true }
                             }
@@ -43,16 +42,12 @@ struct GameListCard: View {
                                 withAnimation { isImageEmpty = false }
                             }
                     case .failure:
-                        RoundedRectangle(cornerRadius: 20)
-                            .fill(.background)
-                            .overlay { Image(systemName: "exclamationmark.triangle.fill") }
+                        EmptyView()
                             .onAppear {
                                 withAnimation { isImageEmpty = true }
                             }
                     @unknown default:
-                        RoundedRectangle(cornerRadius: 20)
-                            .fill(.background)
-                            .overlay { Image(systemName: "questionmark.circle.fill") }
+                        EmptyView()
                             .onAppear {
                                 withAnimation { isImageEmpty = true }
                             }

Mythic/Views/Unified/Sheets/ContainerCreationView.swift

@@ -40,19 +40,13 @@ struct ContainerCreationView: View {
                 TextField("Choose a name for your container:", text: $containerName)
 
                 HStack {
-                    VStack {
-                        HStack {
-                            Text("Where do you want the container's base path to be located?")
-                            Spacer()
-                        }
-                        HStack {
-                            Text(containerURL.prettyPath())
-                                .foregroundStyle(.placeholder)
-
-                            Spacer()
-                        }
+                    VStack(alignment: .leading) {
+                        Text("Where do you want the container's base path to be located?")
+
+                        Text(containerURL.prettyPath())
+                            .foregroundStyle(.placeholder)
                     }
-                    
+
                     Spacer()
 
                     if !FileLocations.isWritableFolder(url: containerURL) {

Mythic/Views/Unified/Sheets/GameSettingsView.swift

@@ -228,8 +228,25 @@ private extension GameSettingsView {
             }
 
             Spacer()
-            TextField("", text: $typingArgument)
+
+            TextField("", text: Binding(
+                get: { typingArgument },
+                set: { newValue in
+                    withAnimation{
+                        typingArgument = newValue
+                    }
+                }
+            ))
                 .onSubmit(submitLaunchArgument)
+
+            if !typingArgument.isEmpty {
+                Button {
+                    submitLaunchArgument()
+                } label: {
+                    Image(systemName: "return")
+                }
+                .buttonStyle(.plain)
+            }
         }
     }
 

Mythic/Views/Unified/Sheets/UninstallGameView.swift

@@ -32,25 +32,20 @@ struct UninstallViewEvo: View {
         VStack {
             Text("Uninstall \"\(game.title)\"")
                 .font(.title)
-
+                .padding([.horizontal, .top])
+
             Form {
-                HStack {
-                    Toggle(isOn: $deleteFiles) {
-                        Text("Remove game files")
-                    }
-                    Spacer()
+                Toggle(isOn: $deleteFiles) {
+                    Text("Remove game files")
                 }
-
-                HStack {
-                    Toggle(isOn: $runUninstaller) {
-                        Text("Run specialised uninstaller (If applicable)")
-                    }
-                    .disabled(game.source == .local)
-                    Spacer()
+
+                Toggle(isOn: $runUninstaller) {
+                    Text("Run specialised uninstaller (If applicable)")
                 }
+                .disabled(game.source == .local)
             }
             .formStyle(.grouped)
-            
+
             HStack {
                 Button("Cancel", role: .cancel) {
                     isPresented = false
@@ -133,8 +128,8 @@ struct UninstallViewEvo: View {
                     )
                 }
             }
+            .padding([.horizontal, .bottom])
         }
-        .interactiveDismissDisabled()
     }
 }