Add support for strict concurrency

Demo/Demo/DemoApp.swift

@@ -20,8 +20,9 @@ struct DemoApp: App {
  var body: some Scene {
  WindowGroup {
  content
- .systemNotification(context) // Context-based notifications are versatile
- .systemNotificationStyle(style)
+ .systemNotification(context) // Context-based notifications are flexible
+ .systemNotificationStyle(style) // This is how to set a global style
+ .tint(.orange)
  }
  }
 }
@@ -45,10 +46,8 @@ private extension DemoApp {
 
  var contentView: some View {
  #if os(iOS)
- TabView {
- NavigationStack {
- ContentView(style: $style)
- }
+ NavigationStack {
+ ContentView(style: $style)
  }
  #else
  ContentView()
@@ -62,7 +61,7 @@ private extension View {
  self.tabItem {
  Label(
  "Tab \(index)",
- systemImage: "0\(index).square")
+ systemImage: "0\(index).circle")
  }
  }
 }

Package.swift

@@ -21,7 +21,9 @@ let package = Package(
  targets: [
  .target(
  name: "SystemNotification",
- dependencies: []
+ swiftSettings: [
+ .enableExperimentalFeature("StrictConcurrency")
+ ]
  ),
  .testTarget(
  name: "SystemNotificationTests",

RELEASE_NOTES.md

@@ -6,6 +6,12 @@ Until then, breaking changes can happen in any version, and deprecated features
 
 
 
+## 1.1.1
+
+This version adds support for strict concurrency.
+
+
+
 ## 1.1
 
 This version adds predefined system notification messages and styles and makes it easier to present a message.

Sources/SystemNotification/SystemNotification.swift

@@ -104,15 +104,18 @@ private extension SystemNotification {
  var style: SystemNotificationStyle {
  initStyle ?? envStyle
  }
+}
+
+@MainActor
+private extension SystemNotification {
 
  func handlePresentation(_ isPresented: Bool) {
  guard isPresented else { return }
  currentId = UUID()
  let id = currentId
  DispatchQueue.main.asyncAfter(deadline: .now() + config.duration) {
- if id == currentId {
- isActive = false
- }
+ guard id == currentId else { return }
+ isActive = false
  }
  }
 }

Sources/SystemNotification/SystemNotificationConfiguration.swift

@@ -56,17 +56,15 @@ public struct SystemNotificationConfiguration {
 public extension SystemNotificationConfiguration {
 
  /// The standard system notification configuration.
- ///
- /// You can set this style to change the global default.
- static var standard = Self()
+ static var standard: Self { .init() }
 
  /// A standard toast configuration.
- ///
- /// You can set this style to change the global default.
- static var standardToast = Self(
- animation: .bouncy,
- edge: .bottom
- )
+ static var standardToast: Self {
+  .init(
+  animation: .bouncy,
+  edge: .bottom
+ )
+ }
 }
 
 public extension View {
@@ -97,7 +95,7 @@ private extension SystemNotificationConfiguration {
 
  struct Key: EnvironmentKey {
 
- static var defaultValue: SystemNotificationConfiguration = .standard
+ static var defaultValue: SystemNotificationConfiguration { .init() }
  }
 }
 

Sources/SystemNotification/SystemNotificationContext.swift

@@ -11,31 +11,35 @@ import SwiftUI
 /// This context can be used to present system notifications
 /// in a more flexible way.
 public class SystemNotificationContext: ObservableObject {
-
+ 
  public init() {}
-
+ 
  public typealias Action = () -> Void
-
+ 
  @Published
  public var content = AnyView(EmptyView())
-
+ 
  @Published
  public var isActive = false
-
-
+ 
+ 
  public var isActiveBinding: Binding<Bool> {
  .init(get: { self.isActive },
  set: { self.isActive = $0 }
  )
  }
+}
+
+@MainActor
+public extension SystemNotificationContext {
 
  /// Dismiss the current notification, if any.
- public func dismiss() {
+ func dismiss() {
  dismiss {}
  }
 
  /// Dismiss the current notification, if any.
- public func dismiss(
+ func dismiss(
  completion: @escaping Action
  ) {
  guard isActive else { return completion() }
@@ -44,7 +48,7 @@ public class SystemNotificationContext: ObservableObject {
  }
 
  /// Present a system notification.
- public func present<Content: View>(
+ func present<Content: View>(
  _ content: Content,
  afterDelay delay: TimeInterval = 0
  ) {
@@ -56,30 +60,33 @@ public class SystemNotificationContext: ObservableObject {
  }
 
  /// Present a system notification.
- public func present<Content: View>(
+ func present<Content: View>(
  afterDelay delay: TimeInterval = 0,
  @ViewBuilder content: @escaping () -> Content
  ) {
  present(content(), afterDelay: delay)
  }
 
  /// Present a system notification message.
- public func presentMessage<IconType: View>(
+ func presentMessage<IconType: View>(
  _ message: SystemNotificationMessage<IconType>,
  afterDelay delay: TimeInterval = 0
  ) {
  present(message, afterDelay: delay)
  }
 }
 
+@MainActor
 private extension SystemNotificationContext {
 
  func perform(
  _ action: @escaping Action,
  after seconds: TimeInterval
  ) {
  guard seconds > 0 else { return action() }
- DispatchQueue.main.asyncAfter(deadline: .now() + seconds, execute: action)
+ DispatchQueue.main.asyncAfter(deadline: .now() + seconds) {
+ action()
+ }
  }
 
  func perform(after seconds: TimeInterval, action: @escaping Action) {

Sources/SystemNotification/SystemNotificationMessage+Predefined.swift

@@ -119,6 +119,7 @@ private struct SilentModeBell: View {
  }
 }
 
+@MainActor
 private extension SilentModeBell {
 
  func animate() {
@@ -130,7 +131,9 @@ private extension SilentModeBell {
  }
 
  func perform(after: Double, action: @escaping () -> Void) {
- DispatchQueue.main.asyncAfter(deadline: .now() + 0.3, execute: action)
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+ action()
+ }
  }
 
  var animationDamping: Double {

Sources/SystemNotification/SystemNotificationMessageStyle.swift

@@ -98,9 +98,7 @@ public struct SystemNotificationMessageStyle {
 public extension SystemNotificationMessageStyle {
 
  /// The standard system notification message style.
- ///
- /// You can set this style to change the global default.
- static var standard = Self()
+ static var standard: Self { .init() }
 }
 
 public extension View {
@@ -117,7 +115,7 @@ private extension SystemNotificationMessageStyle {
 
  struct Key: EnvironmentKey {
 
- static var defaultValue: SystemNotificationMessageStyle = .standard
+ static var defaultValue: SystemNotificationMessageStyle { .standard }
  }
 }
 

Sources/SystemNotification/SystemNotificationStyle.swift

@@ -99,9 +99,7 @@ public struct SystemNotificationStyle {
 public extension SystemNotificationStyle {
 
  /// The standard system notification style.
- ///
- /// You can set this style to change the global default.
- static var standard = Self()
+ static var standard: Self { .init() }
 }
 
 public extension View {
@@ -132,7 +130,7 @@ private extension SystemNotificationStyle {
 
  struct Key: EnvironmentKey {
 
- static var defaultValue: SystemNotificationStyle = .standard
+ static var defaultValue: SystemNotificationStyle { .standard }
  }
 }