Merge branch 'develop' into fix/m7-ci-uitest-runner-sign

.gitea/workflows/macos.yml

@@ -67,21 +67,8 @@ jobs:
           NOTARIZE_PASSWORD: ${{ secrets.NOTARIZE_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
 
-      - name: Prepare Node CA bundle
-        run: |
-          NODE_CA_FILE="/tmp/macos-ca-bundle.pem"
-          security find-certificate -a -p \
-            /System/Library/Keychains/SystemRootCertificates.keychain \
-            /Library/Keychains/System.keychain \
-            > "$NODE_CA_FILE" 2>/dev/null || true
-          if [ ! -s "$NODE_CA_FILE" ] && [ -f /etc/ssl/cert.pem ]; then
-            cp /etc/ssl/cert.pem "$NODE_CA_FILE"
-          fi
-
       - name: Upload DMG artifact
         uses: actions/upload-artifact@v3
-        env:
-          NODE_EXTRA_CA_CERTS: /tmp/macos-ca-bundle.pem
         with:
           name: iccery-dmg
           path: ICCery-*.dmg

.gitignore

@@ -27,4 +27,3 @@ ICCery.xcodeproj/
 Release/
 notarization/
 build/
-docs/megaplans/

Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,61 +1,51 @@
 {
   "images" : [
     {
-      "filename" : "icon_16x16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "icon_16x16@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "icon_32x32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "icon_32x32@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "icon_128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "icon_128x128@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "icon_256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "icon_256x256@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "icon_512x512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "icon_512x512@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

Sources/ICCery/AboutView.swift

@@ -1,4 +1,3 @@
-import AppKit
 import SwiftUI
 import ICCeryCore
 
@@ -10,12 +9,10 @@ struct AboutView: View {
 
     var body: some View {
         VStack(spacing: 20) {
-            if let icon = NSImage(named: NSImage.applicationIconName) {
-                Image(nsImage: icon)
-                    .resizable()
-                    .scaledToFit()
-                    .frame(height: 64)
-            }
+            Image("ICCery-logo")
+                .resizable()
+                .scaledToFit()
+                .frame(height: 64)
 
             Text("ICCery")
                 .font(.title)

Sources/ICCery/CalibrationViewModel.swift

@@ -91,7 +91,8 @@ final class CalibrationViewModel {
             workingDirectory: cwd
         )
 
-        Task { @MainActor in
+        Task { @MainActor [weak self] in
+            guard let self else { return }
             defer { self.isGenerating = false }
 
             do {
@@ -159,7 +160,8 @@ final class CalibrationViewModel {
             channelLimits: []
         )
 
-        Task { @MainActor in
+        Task { @MainActor [weak self] in
+            guard let self else { return }
             defer { self.isComputing = false }
 
             do {

Sources/ICCery/RootView.swift

@@ -29,7 +29,7 @@ struct RootView: View {
                 if let notice = model.notice {
                     NoticeBanner(notice: notice, onClose: model.dismissNotice)
                 }
-                WizardStageContent(model: model, workflow: workflow)
+                stageContent
             }
         }
         .frame(minWidth: 1100, minHeight: 700)
@@ -61,16 +61,8 @@ struct RootView: View {
         }
     }
 
-}
-
-/// Content for the active wizard stage. Isolated into its own view so that
-/// `WizardViewModel` is tracked via `@Bindable` instead of the parent's
-/// `TargetWorkflowViewModel`, which does not observe nested `wizard` mutations.
-private struct WizardStageContent: View {
-    @Bindable var model: WizardViewModel
-    var workflow: TargetWorkflowViewModel
-
-    var body: some View {
+    @ViewBuilder
+    private var stageContent: some View {
         switch model.stage {
         case .generate:
             Stage1View(workflow: workflow)

brand/dmg-background.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 660 400" width="660" height="400">
-  <defs>
-    <!-- Logo Clip Path -->
-    <clipPath id="coneClip">
-      <path d="M 50 82 L 110 82 L 80 142 Z" />
-    </clipPath>
-    <!-- Logo Text Gradient -->
-    <linearGradient id="textGrad" x1="0%" y1="0%" x2="100%" y2="0%">
-      <stop offset="0%" stop-color="#00AEEF" />
-      <stop offset="100%" stop-color="#0066CC" />
-    </linearGradient>
-    <!-- Arrow Drop Shadow Filter -->
-    <filter id="arrowShadow" x="-20%" y="-20%" width="140%" height="140%">
-      <feDropShadow dx="0" dy="2" stdDeviation="3" flood-color="#000000" flood-opacity="0.35"/>
-    </filter>
-  </defs>
-
-  <!-- Solid Background (matches app --bg-color: #1e1e1e) -->
-  <rect width="660" height="400" fill="#1e1e1e" />
-
-  <!-- Top-Left Branding Logo & Text (standard header height) -->
-  <g transform="translate(24, 18) scale(0.44)">
-    <!-- Drop Shadow -->
-    <ellipse cx="80" cy="145" rx="25" ry="5" fill="#1E293B" opacity="0.1" />
-
-    <!-- Ice Cream Cone (Waffle) -->
-    <path d="M 50 82 L 110 82 L 80 142 Z" fill="#FAD7A1" stroke="#E59866" stroke-width="2.5" stroke-linejoin="round"/>
-    <g clip-path="url(#coneClip)" stroke="#E59866" stroke-width="2">
-      <line x1="40" y1="80" x2="120" y2="160" />
-      <line x1="55" y1="80" x2="135" y2="160" />
-      <line x1="70" y1="80" x2="150" y2="160" />
-      <line x1="85" y1="80" x2="165" y2="160" />
-
-      <line x1="120" y1="80" x2="40" y2="160" />
-      <line x1="105" y1="80" x2="25" y2="160" />
-      <line x1="90" y1="80" x2="10" y2="160" />
-      <line x1="75" y1="80" x2="-5" y2="160" />
-    </g>
-
-    <!-- CMYK Scoops (C, M, Y) -->
-    <circle cx="63" cy="72" r="22" fill="#00BCEB" stroke="#ffffff" stroke-width="2.5"/>
-    <circle cx="97" cy="72" r="22" fill="#EC008C" stroke="#ffffff" stroke-width="2.5"/>
-    <circle cx="80" cy="48" r="22" fill="#FFED00" stroke="#ffffff" stroke-width="2.5"/>
-
-    <!-- Black (Key) Cherry -->
-    <path d="M 80 23 Q 92 12 96 16" fill="none" stroke="#1E293B" stroke-width="2" stroke-linecap="round"/>
-    <circle cx="80" cy="24" r="7" fill="#1E293B" stroke="#ffffff" stroke-width="1.5"/>
-
-    <!-- Highlights on scoops for 3D effect -->
-    <circle cx="58" cy="67" r="4" fill="#ffffff" opacity="0.35"/>
-    <circle cx="92" cy="67" r="4" fill="#ffffff" opacity="0.35"/>
-    <circle cx="75" cy="43" r="4" fill="#ffffff" opacity="0.45"/>
-    <circle cx="78" cy="22" r="1.5" fill="#ffffff" opacity="0.6"/>
-
-    <!-- Text: ICCery -->
-    <text font-family="-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif" font-size="58" font-weight="800" x="140" y="105" fill="#ffffff" letter-spacing="-1">ICC<tspan fill="url(#textGrad)">ery</tspan></text>
-  </g>
-
-  <!-- Center White Arrow (Pointing right between App Icon and Applications folder) -->
-  <g filter="url(#arrowShadow)">
-    <path d="M 285 214 
-             L 342 214 
-             L 342 201 
-             Q 342 198 345 199.5
-             L 380 217.5 
-             Q 383 219 383 220 
-             Q 383 221 380 222.5 
-             L 345 240.5 
-             Q 342 242 342 239 
-             L 342 226 
-             L 285 226 
-             Q 282 226 282 223 
-             L 282 217 
-             Q 282 214 285 214 Z" 
-          fill="#ffffff" />
-  </g>
-</svg>

scripts/dmgbuild-settings.py

@@ -32,7 +32,7 @@ if background and not os.path.exists(background):
 icon = None
 
 # Window size is enough for the app icon and the Applications alias.
-window_rect = ((100, 100), (660, 400))
+window_rect = ((100, 100), (640, 480))
 
 # Use icon view without extra chrome.
 default_view = 'icon-view'
@@ -45,8 +45,8 @@ sidebar_width = 180
 
 # Position the .app on the left and the Applications alias on the right.
 icon_locations = {
-    'ICCery.app': (180, 220),
-    'Applications': (480, 220),
+    'ICCery.app': (140, 240),
+    'Applications': (500, 240),
 }
 
 # Symlink to /Applications for drag-and-drop install.

scripts/package-release.sh

@@ -132,11 +132,8 @@ dmgbuild -s scripts/dmgbuild-settings.py "$VOLUME_NAME" "$DMG"
 
 echo "DMG: $PWD/$DMG"
 
-# Notarization requires a Developer ID signature. If the app was ad-hoc
-# signed or any notarization secret is missing, skip silently — the DMG is
-# still usable for local/testing installs.
-if [ -n "${CODESIGN_IDENTITY:-}" ] && [ "$CODESIGN_IDENTITY" != "-" ] && \
-   [ -n "${NOTARIZE_APPLE_ID:-}" ] && \
+# Optional notarization/stapling when credentials are present.
+if [ -n "${NOTARIZE_APPLE_ID:-}" ] && \
    [ -n "${NOTARIZE_PASSWORD:-}" ] && \
    [ -n "${APPLE_TEAM_ID:-}" ]; then
     echo "==> Submitting $DMG for notarization"
@@ -147,4 +144,6 @@ if [ -n "${CODESIGN_IDENTITY:-}" ] && [ "$CODESIGN_IDENTITY" != "-" ] && \
         --wait
     xcrun stapler staple "$DMG"
     echo "==> Stapled $DMG"
+else
+    echo "==> Notarization credentials not set; skipping"
 fi