feat(mac): new configuration and installation UI 🍎

mac/Config/Config.xcodeproj/project.pbxproj

@@ -33,6 +33,23 @@
 		D88F03DD2F50ED5100C02A31 /* ConfigUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ConfigUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
+/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+		375D21122FF2F21800FCD24A /* Exceptions for "Config" folder in "Config" target */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				ConfigTests/ConfigTests.swift,
+			);
+			target = D88F03C52F50ED5000C02A31 /* Config */;
+		};
+		375D21132FF2F21800FCD24A /* Exceptions for "Config" folder in "ConfigTests" target */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				ConfigTests/ConfigTests.swift,
+			);
+			target = D88F03D22F50ED5100C02A31 /* ConfigTests */;
+		};
+/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
+
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		D87D6F492FAF95400083A95E /* Installation */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
@@ -41,14 +58,13 @@
 		};
 		D88F03C82F50ED5000C02A31 /* Config */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				375D21122FF2F21800FCD24A /* Exceptions for "Config" folder in "Config" target */,
+				375D21132FF2F21800FCD24A /* Exceptions for "Config" folder in "ConfigTests" target */,
+			);
 			path = Config;
 			sourceTree = "<group>";
 		};
-		D88F03D62F50ED5100C02A31 /* ConfigTests */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			path = ConfigTests;
-			sourceTree = "<group>";
-		};
 		D88F03E02F50ED5100C02A31 /* ConfigUITests */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			path = ConfigUITests;
@@ -87,7 +103,6 @@
 			children = (
 				D87D6F492FAF95400083A95E /* Installation */,
 				D88F03C82F50ED5000C02A31 /* Config */,
-				D88F03D62F50ED5100C02A31 /* ConfigTests */,
 				D88F03E02F50ED5100C02A31 /* ConfigUITests */,
 				D88F04022F512FE800C02A31 /* Frameworks */,
 				D88F03C72F50ED5000C02A31 /* Products */,
@@ -151,9 +166,6 @@
 			dependencies = (
 				D88F03D52F50ED5100C02A31 /* PBXTargetDependency */,
 			);
-			fileSystemSynchronizedGroups = (
-				D88F03D62F50ED5100C02A31 /* ConfigTests */,
-			);
 			name = ConfigTests;
 			packageProductDependencies = (
 			);
@@ -416,7 +428,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = Config/ConfigDebug.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -455,7 +467,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = Config/ConfigRelease.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;

mac/Config/Config/Assets.xcassets/AccessibilityPermission.imageset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "AccessibilityPermissionLight.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "AccessibilityPermissionDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "AccessibilityPermissionLight 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "AccessibilityPermissionDark 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "AccessibilityPermissionLight 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "AccessibilityPermissionDark 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mac/Config/Config/Assets.xcassets/EnableKeyman.imageset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "EnableKeymanLight.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "EnableKeymanDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "EnableKeymanLight 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "EnableKeymanDark 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "EnableKeymanLight 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "EnableKeymanDark 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mac/Config/Config/Assets.xcassets/InstallerIcon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "InstallerIcon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "InstallerIcon 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "InstallerIcon 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mac/Config/Config/Assets.xcassets/Keyman-256.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Keyman-256.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Keyman-256 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Keyman-256 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mac/Config/Config/Assets.xcassets/KeymanLogo-BIG.imageset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "keyman logo BIG (2) 3.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Keyman_Logo_BIG_Dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "keyman logo BIG (2) 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Keyman_Logo_BIG_Dark 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "keyman logo BIG (2) 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Keyman_Logo_BIG_Dark 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mac/Config/Config/ConfigApp.swift

@@ -16,6 +16,23 @@ struct ConfigApp: App {
   @Environment(\.openWindow) private var openWindow
 
   var body: some Scene {
+    Window("Configuration", id: "main-config") {
+      MainConfigView()
+        .environmentObject(settings)
+        .task {
+          if !installation.getHasDisplayedInstallationComplete() {
+            openWindow(id: "install")
+          }
+        }
+        .onReceive(NotificationCenter.default.publisher(for: .installationRepairStarted)) { notification in openWindow(id: "install")
+        }
+    }
+    Window("Installation", id: "install") {
+      MainInstallView()
+        .environmentObject(installation)
+    }
+    .windowResizability(.contentSize)
+    .defaultSize(width: 600, height: 500)
     Window("Config Test", id: "config-debug") {
       ConfigDebugView()
         .environmentObject(settings)

mac/Config/Config/ConfigDebugView.swift

@@ -21,9 +21,6 @@ struct ConfigDebugView: View {
           .foregroundColor(.accentColor)
         Text("multiple keyboard package count = \(settings.multiKeyboardPackages.count)")
         Text("single keyboard package count = \(settings.singleKeyboardPackages.count)")
-        Button("debug") {
-          settings.debug()
-        }
         Button("log defaults") {
           settings.logUserDefaults()
         }
@@ -50,22 +47,6 @@ struct ConfigDebugView: View {
           ForEach(Array(settings.singleKeyboardPackages.enumerated()), id: \.offset) { index, package in
             VStack {
               HStack(alignment: .center, spacing: 10) {
-                VStack(spacing: 16) {
-                    Text("Scan to visit website:")
-                        .font(.headline)
-
-                  if let qrImage = package.generateSharePackageQRCode(size: 200) {
-                        Image(nsImage: qrImage)
-                            .interpolation(.none) // important: keeps the QR edges sharp
-                            .resizable()
-                            .frame(width: 200, height: 200)
-                            .background(Color.white) // ensures good scanning contrast
-                    } else {
-                        Text("Failed to generate QR Code")
-                            .foregroundColor(.red)
-                    }
-                }
-                .padding()
                 Text(package.packageName)
                   .font(.headline)
                 Text(package.packageVersion)