Addressing errors in concurrent sheet launches

Author: KC-2001MS

Package.resolved

@@ -6,6 +6,30 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "iOS App Icon 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "iOS App Icon 2.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
     {
       "filename" : "macOS16.png",
       "idiom" : "mac",

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

@@ -126,9 +126,9 @@ struct ContentView: View {
                 appVersionManager.isMajorVersionUpdated = false
             })
         }
-        .sheet(isPresented: $appVersionManager.isMajorOrMinorVersionUpdated) {
+        .sheet(isPresented: $appVersionManager.isMinorVersionUpdated) {
             NewFeatureOnboardingSheetView(action: {
-                appVersionManager.isMajorOrMinorVersionUpdated = false
+                appVersionManager.isMinorVersionUpdated = false
             })
         }
         .onboardingSheet(isPresented: $isOpenSheet, WelcomeOnboarding())

Sample/Sample/Assets.xcassets/AppIcon.appiconset/iOS App Icon 1.png

@@ -9,6 +9,8 @@ import SwiftUI
 import OnboardingUI
 
 struct NewFeatureOnboardingSheetView: View {
+    @Environment(\.dismiss) private var dismiss
+    
     var action: () -> Void
 
     init(action: @escaping () -> Void) {
@@ -41,7 +43,9 @@ struct NewFeatureOnboardingSheetView: View {
             }
 #endif
         } button: {
-            ContinueButton(color: .accentColor, action: action)
+            ContinueButton(color: .accentColor, action: {
+                dismiss()
+            })
         }
     }
 }

Sample/Sample/Assets.xcassets/AppIcon.appiconset/iOS App Icon 2.png

@@ -10,6 +10,8 @@ import SwiftUI
 import OnboardingUI
 
 struct WelcomeOnboardingSheetView: View {
+    @Environment(\.dismiss) private var dismiss
+    
     var action: () -> Void
 
     init(action: @escaping () -> Void) {
@@ -44,7 +46,9 @@ struct WelcomeOnboardingSheetView: View {
         } link: {
             Link("Check our Privacy Policy…", destination: URL(string: "https://kc-2001ms.github.io/en/privacy.html")!)
         } button: {
-            ContinueButton(color: .accentColor, action: action)
+            ContinueButton(color: .accentColor, action: {
+                dismiss()
+            })
         }
     }
 }

Sample/Sample/ContentView.swift

@@ -22,7 +22,7 @@ public class AppVersionManager {
             userDefaults.set(lastOpenedVersion, forKey: "LastOpenedVersion")
         }
     }
-    /// Whether or not this is the first activation.
+    /// Whether or not this is the first activation
     public var isTheFirstLaunch: Bool {
         get {
             return lastOpenedVersion == ""
@@ -35,22 +35,29 @@ public class AppVersionManager {
     /// Variable to detect if the major version number has increased.
     public var isMajorVersionUpdated: Bool {
         get {
-            let lastOpenedComponents = filled(splitByDot(lastOpenedVersion), count: 3)
-            let currentComponents = filled(splitByDot(version), count: 3)
-            return lastOpenedComponents[0] < currentComponents[0]
+            if !lastOpenedVersion.isEmpty {
+                let lastOpenedComponents = parseVersion(lastOpenedVersion)
+                let currentComponents = parseVersion(version)
+                return lastOpenedComponents.major < currentComponents.major
+            } else {
+                return false
+            }
         }
 
         set {
             lastOpenedVersion = version
         }
     }
     /// Variable to detect if the minor version number or higher has increased.
-    public var isMajorOrMinorVersionUpdated: Bool {
+    public var isMinorVersionUpdated: Bool {
         get {
-            let lastOpenedComponents = filled(splitByDot(lastOpenedVersion), count: 3)
-            let currentComponents = filled(splitByDot(version), count: 3)
-            return (lastOpenedComponents[0] < currentComponents[0] && lastOpenedComponents[1] <= currentComponents[1]) ||
-            (lastOpenedComponents[0] <= currentComponents[0] && lastOpenedComponents[1] < currentComponents[1])
+            if !lastOpenedVersion.isEmpty {
+                let lastOpenedComponents = parseVersion(lastOpenedVersion)
+                let currentComponents = parseVersion(version)
+                return lastOpenedComponents.major == currentComponents.major && lastOpenedComponents.minor < currentComponents.minor
+            } else {
+                return false
+            }
         }
 
         set {
@@ -59,8 +66,18 @@ public class AppVersionManager {
     }
     /// Default initializer
     public init() {
-        self.version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
-        self.lastOpenedVersion = userDefaults.string(forKey: "LastOpenedVersion") ?? ""
+        self.version = Bundle.main
+            .object(
+                forInfoDictionaryKey: "CFBundleShortVersionString"
+            ) as! String
+        self.lastOpenedVersion = userDefaults
+            .string(forKey: "LastOpenedVersion") ?? ""
+    }
+
+    func parseVersion(_ versionString: String) -> (major: Int, minor: Int, patch: Int) {
+        var components = versionString.split(separator: ".").compactMap { Int($0) }
+        components = (0..<3).map { $0 < components.count ? components[$0] : 0 }
+        return (major: components[0], minor: components[1], patch: components[2])
     }
 }
 /// AppVersionManager environment values

Sample/Sample/UI/NewFeatureOnboardingSheetView.swift

@@ -0,0 +1,38 @@
+//
+//  FeatureBuilder.swift
+//  OnboardingUI
+//
+//  Created by 茅根啓介 on 2025/04/03.
+//
+
+import Foundation
+
+/// Result builder that allows you to freely build Feature structures
+@available(iOS 17.0,macOS 14.0,tvOS 17.0,visionOS 1.0,*)
+@resultBuilder
+public struct FeatureBuilder {
+    /// Required in resultBuilder
+    public static func buildBlock(_ parts: Feature...) -> Array<Feature> {
+        parts
+    }
+    /// Enable if
+    public static func buildOptional(_ parts: [Feature]?) -> Feature {
+        parts?.first ?? Feature()
+    }
+    /// Enable if-else
+    public static func buildEither(first parts: [Feature]) -> Feature {
+        parts.first ?? Feature()
+    }
+    /// Enable if-else
+    public static func buildEither(second parts: [Feature]) -> Feature {
+        parts.first ?? Feature()
+    }
+    /// Enable for-in
+    public static func buildArray(_ parts: [[Feature]]) -> Feature {
+        parts.first?.first ?? Feature()
+    }
+    /// Enable #if
+    public static func buildLimitedAvailability(_ parts: [Feature]) -> Array<Feature> {
+        parts
+    }
+}