Fix swift6

oversizedev · Dec 27, 2024 · 4fb66e9 · 4fb66e9
1 parent 437c040
commit 4fb66e9
Show file tree

Hide file tree

Showing 35 changed files with 1,838 additions and 1,796 deletions.
diff --git a/Sources/OversizeComponents/Activity/ActivityViewController.swift b/Sources/OversizeComponents/Activity/ActivityViewController.swift
@@ -4,27 +4,31 @@
 //
 
 #if os(iOS)
-    import SwiftUI
-    import UIKit
+import SwiftUI
+import UIKit
 
-    public struct ActivityViewController: UIViewControllerRepresentable {
-        public init(activityItems: [Any], applicationActivities: [UIActivity]? = nil) {
-            self.activityItems = activityItems
-            self.applicationActivities = applicationActivities
-        }
-
-        var activityItems: [Any]
-        var applicationActivities: [UIActivity]?
+public struct ActivityViewController: UIViewControllerRepresentable {
+    public init(activityItems: [Any], applicationActivities: [UIActivity]? = nil) {
+        self.activityItems = activityItems
+        self.applicationActivities = applicationActivities
+    }
 
-        public func makeUIViewController(context _: UIViewControllerRepresentableContext<ActivityViewController>)
-            -> UIActivityViewController
-        {
-            let controller = UIActivityViewController(activityItems: activityItems,
-                                                      applicationActivities: applicationActivities)
-            return controller
-        }
+    var activityItems: [Any]
+    var applicationActivities: [UIActivity]?
 
-        public func updateUIViewController(_: UIActivityViewController,
-                                           context _: UIViewControllerRepresentableContext<ActivityViewController>) {}
+    public func makeUIViewController(context _: UIViewControllerRepresentableContext<ActivityViewController>)
+        -> UIActivityViewController
+    {
+        let controller = UIActivityViewController(
+            activityItems: activityItems,
+            applicationActivities: applicationActivities
+        )
+        return controller
     }
+
+    public func updateUIViewController(
+        _: UIActivityViewController,
+        context _: UIViewControllerRepresentableContext<ActivityViewController>
+    ) {}
+}
 #endif
diff --git a/Sources/OversizeComponents/AsyncIllustrationView/AsyncIllustrationView.swift b/Sources/OversizeComponents/AsyncIllustrationView/AsyncIllustrationView.swift
@@ -10,13 +10,13 @@ import SwiftUI
 
 public struct AsyncIllustrationView: View {
     #if os(iOS) || os(macOS)
-        @Environment(\.controlSize) var controlSize: ControlSize
+    @Environment(\.controlSize) var controlSize: ControlSize
     #endif
 
     #if os(iOS)
-        let scale = UIScreen.main.scale
+    let scale = UIScreen.main.scale
     #else
-        let scale: CGFloat = 2
+    let scale: CGFloat = 2
     #endif
 
     let path: String
@@ -40,28 +40,28 @@ public struct AsyncIllustrationView: View {
 
     var scaleLabel: String {
         if scale == 3 {
-            return "@\(String(format: "%.0f", scale))x"
+            "@\(String(format: "%.0f", scale))x"
         } else {
-            return ""
+            ""
         }
     }
 
     var illustrationSize: CGFloat {
         #if os(iOS) || os(macOS)
-            switch controlSize {
-            case .mini:
-                return 16
-            case .small:
-                return 24
-            case .regular:
-                return 32
-            case .large, .extraLarge:
-                return 48
-            @unknown default:
-                return 24
-            }
-        #else
+        switch controlSize {
+        case .mini:
+            return 16
+        case .small:
+            return 24
+        case .regular:
+            return 32
+        case .large, .extraLarge:
+            return 48
+        @unknown default:
             return 24
+        }
+        #else
+        return 24
         #endif
     }
 }
diff --git a/Sources/OversizeComponents/FieldScreen/FieldScreenView.swift b/Sources/OversizeComponents/FieldScreen/FieldScreenView.swift
@@ -24,16 +24,17 @@ public struct FieldScreenView: View {
 
     @Environment(\.dismiss) var dismiss
 
-    public init(_ label: String,
-                placeholder: String,
-                text: Binding<String>,
-                helperText: Binding<String> = .constant(""),
-                showHelper: Binding<Bool> = .constant(false),
-                leadingImage: IconsNames = .none,
-                trallingImage: IconsNames = .none,
-                buttonText: String = "Save",
-                buttonAction: @escaping () -> Void)
-    {
+    public init(
+        _ label: String,
+        placeholder: String,
+        text: Binding<String>,
+        helperText: Binding<String> = .constant(""),
+        showHelper: Binding<Bool> = .constant(false),
+        leadingImage: IconsNames = .none,
+        trallingImage: IconsNames = .none,
+        buttonText: String = "Save",
+        buttonAction: @escaping () -> Void
+    ) {
         self.label = label
         self.placeholder = placeholder
         _text = text

diff --git a/Sources/OversizeComponents/FloatingTabBar/FloatingTabBar.swift b/Sources/OversizeComponents/FloatingTabBar/FloatingTabBar.swift
@@ -44,7 +44,9 @@ public struct FloatingTabBar<Content: View>: View {
         }
         .ignoresSafeArea()
         .onPreferenceChange(TabItemPreferenceKey.self) { value in
-            tabs = value
+            Task { @MainActor in
+                tabs = value
+            }
         }
     }
 

diff --git a/Sources/OversizeComponents/FloatingTabBar/TabItem.swift b/Sources/OversizeComponents/FloatingTabBar/TabItem.swift
@@ -5,7 +5,7 @@
 
 import SwiftUI
 
-public struct TabItem: Identifiable, Equatable {
+public struct TabItem: Identifiable, Equatable, Sendable {
     public var id = UUID()
     public var text: String?
     public var icon: Image

diff --git a/Sources/OversizeComponents/FloatingTabBar/TabItemPreferenceKey.swift b/Sources/OversizeComponents/FloatingTabBar/TabItemPreferenceKey.swift
@@ -5,7 +5,7 @@
 
 import SwiftUI
 
-struct TabItemPreferenceKey: PreferenceKey {
+struct TabItemPreferenceKey: PreferenceKey, Sendable {
     static var defaultValue: [TabItem] {
         []
     }