alert 수정

Example-iOS/TestSwiftHelper.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		200019CB2C9D0B9D00E2094A /* MemoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 200019CA2C9D0B9D00E2094A /* MemoryViewController.swift */; };
 		200019CF2C9D2CAC00E2094A /* ScopeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 200019CE2C9D2CAC00E2094A /* ScopeViewController.swift */; };
-		2092293C2CEAFCF300E4B140 /* SwiftHelper in Frameworks */ = {isa = PBXBuildFile; productRef = 2092293B2CEAFCF300E4B140 /* SwiftHelper */; };
+		200EB4BD2CEDC0BD0011BD7B /* SwiftHelper in Frameworks */ = {isa = PBXBuildFile; productRef = 200EB4BC2CEDC0BD0011BD7B /* SwiftHelper */; };
 		520F389721229A890081B956 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520F389621229A890081B956 /* AppDelegate.swift */; };
 		520F389921229A890081B956 /* TestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520F389821229A890081B956 /* TestViewController.swift */; };
 		520F389C21229A890081B956 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 520F389A21229A890081B956 /* Main.storyboard */; };
@@ -38,7 +38,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2092293C2CEAFCF300E4B140 /* SwiftHelper in Frameworks */,
+				200EB4BD2CEDC0BD0011BD7B /* SwiftHelper in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -111,7 +111,7 @@
 			);
 			name = TestSwiftHelper;
 			packageProductDependencies = (
-				2092293B2CEAFCF300E4B140 /* SwiftHelper */,
+				200EB4BC2CEDC0BD0011BD7B /* SwiftHelper */,
 			);
 			productName = Test;
 			productReference = 520F389321229A890081B956 /* TestSwiftHelper.app */;
@@ -143,7 +143,7 @@
 			);
 			mainGroup = 520F388A21229A890081B956;
 			packageReferences = (
-				20DE3CFD2CEAFC5700B5F86A /* XCLocalSwiftPackageReference "../../SwiftHelper" */,
+				200EB4BB2CEDC0BD0011BD7B /* XCLocalSwiftPackageReference "../../SwiftHelper" */,
 			);
 			productRefGroup = 520F389421229A890081B956 /* Products */;
 			projectDirPath = "";
@@ -394,16 +394,15 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		20DE3CFD2CEAFC5700B5F86A /* XCLocalSwiftPackageReference "../../SwiftHelper" */ = {
+		200EB4BB2CEDC0BD0011BD7B /* XCLocalSwiftPackageReference "../../SwiftHelper" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = ../../SwiftHelper;
 		};
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		2092293B2CEAFCF300E4B140 /* SwiftHelper */ = {
+		200EB4BC2CEDC0BD0011BD7B /* SwiftHelper */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 20DE3CFD2CEAFC5700B5F86A /* XCLocalSwiftPackageReference "../../SwiftHelper" */;
 			productName = SwiftHelper;
 		};
 /* End XCSwiftPackageProductDependency section */

Example-iOS/TestSwiftHelper/VC/Base.lproj/Main.storyboard

@@ -86,7 +86,7 @@
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TAb-HP-PfS">
                                 <rect key="frame" x="119" y="316" width="136" height="35"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="mainQueue"/>
+                                <state key="normal" title="PopupQueue"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                         <real key="value" value="2"/>

Example-iOS/TestSwiftHelper/VC/ClosureQueueController.swift

@@ -15,13 +15,13 @@ class ClosureQueueController: UIViewController, RouterProtocol {
     override func viewDidLoad() {
         super.viewDidLoad()
         ActionQueue.shared.addAction { _ in
-            UIAlertController.alert(title: "Test 111")
+            alert(title: "Test 111", message: nil)
         }
         ActionQueue.shared.addAction { _ in
-            UIAlertController.alert(title:"Test 222")
+            alert(title:"Test 222", message: nil)
         }
         ActionQueue.shared.addAction { _ in
-            UIAlertController.alert(title:"Test 333")
+            alert(title:"Test 333", message: nil)
         }
     }
 
@@ -30,27 +30,31 @@ class ClosureQueueController: UIViewController, RouterProtocol {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
+
     @IBAction func onInQueue(_ sender: UIButton) {
         sender.tag += 1
         let count = sender.tag
         ActionQueue.shared.addAction { _ in
-            UIAlertController.alert(title:"Test \(count)")
+            alert(title:"Test \(count)", message: nil)
         }
     }
 
     @IBAction func onDequeue(_ sender: UIButton) {
         ActionQueue.shared.nextRun()
     }
 
-
     @IBAction func onMainQueue(_ sender: UIButton) {
-        DispatchQueue.global(qos: .userInteractive).async {
-            for i in 0..<999 {
-                DispatchQueue.main.async {
-                    print(i)
+        for i in 0..<5 {
+            alert(title:"Test __(\(i))", message: nil, cancelButtonTitle: "취소", otherButtonTitles: ["확인"]) { alertVC,buttonIndex in
+                print(buttonIndex)
+            }
+        }
+        gcd_main_after(0.5) {
+            for i in 10..<15 {
+                alert(title:"Test __(\(i))", message: nil, cancelButtonTitle: "취소", otherButtonTitles: ["확인"]) { alertVC,buttonIndex in
+                    print(buttonIndex)
                 }
             }
         }
-
     }
 }

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/SwiftHelper/Dispatc/DispatchQueue.swift

@@ -98,21 +98,22 @@ public final class ActionQueue: Sendable {
 
     public init() {}
 
-    @preconcurrency public func nextRun(_ value: [String: Any]? = nil) {
+    public func nextRun(_ value: [String: Any]? = nil) {
         queue.sync {
             guard !self.actions.isEmpty, let work = self.actions.first else { return }
-            let ucsw = UncheckedSendableWrappers(value1: work, value2: value)
+            let workWrapper = UncheckedSendableWrapper(work)
+            let valueWrapper = UncheckedSendableWrapper(value)
             self.actions.removeFirst()
             DispatchQueue.main.async {
-                ucsw.value1(ucsw.value2)
+                workWrapper.value(valueWrapper.value)
             }
         }
     }
 
-    @preconcurrency public func addAction(_ work: @escaping @convention(block) (_ value: [String: Any]?) -> Void) {
-        let ucsw = UncheckedSendableWrapper(work)
+    public func addAction(_ work: @escaping @convention(block) (_ value: [String: Any]?) -> Void) {
+        let workWrapper = UncheckedSendableWrapper(work)
         self.queue.async(flags: .barrier) {
-            self.actions.append(ucsw.value)
+            self.actions.append(workWrapper.value)
         }
     }
 }

Sources/SwiftHelper/Json/JSONSerializableExtension.swift

@@ -133,14 +133,3 @@ extension JSONSerializable {
         }
     }
 }
-
-extension Optional: JSONSerializable {
-    public var JSONRepresentation: [String: Any] {
-        guard let x = self else { return [String: Any]() }
-        if let value: JSONSerializable = x as? JSONSerializable {
-            return value.JSONRepresentation
-        }
-        return [String: Any]()
-    }
-
-}

Sources/SwiftHelper/UI/UIAlertControllerExtension.swift

@@ -8,7 +8,44 @@
 
 import UIKit
 
-public typealias UIAlertControllerClosure = (_ alertVC: UIAlertController, _ buttonIndex: Int) -> Void
+@MainActor
+class AlertQueue {
+    static var actions: [() -> Void] = []
+
+    public static func nextRun() {
+        DispatchQueue.main.async {
+            guard !self.actions.isEmpty, let work = self.actions.first else { return }
+            work()
+            self.actions.removeFirst()
+        }
+    }
+
+    public static func addAction(work: @escaping () -> Void) {
+        self.actions.append(work)
+    }
+}
+
+@MainActor
+public func alert(title: String?,
+                message: String?,
+                cancelButtonTitle: String? = "확인",
+                otherButtonTitles: [String]? = nil,
+                closure: ((_ alertVC: UIAlertController, _ buttonIndex: Int) -> Void)? = nil) {
+    AlertQueue.addAction {
+        UIAlertController.alert(title: title,
+                                message: message,
+                                cancelButtonTitle: cancelButtonTitle,
+                                otherButtonTitles: otherButtonTitles,
+                                isAutoHide: false,
+                                autoHideClosure: nil) { (alertVC, buttonIndex) in
+            closure?(alertVC, buttonIndex)
+            AlertQueue.nextRun()
+        }
+    }
+    if AlertQueue.actions.count == 1 {
+        AlertQueue.nextRun()
+    }
+}
 
 extension UIAlertController {
     public func getActionIndex(_ action: UIAlertAction) -> Int {
@@ -68,50 +105,49 @@ extension UIAlertController {
     }
 
     public static func alert(title: String?,
-                      message: String? = nil,
-                      cancelButtonTitle: String? = "확인",
-                      otherButtonTitles: String?...,
-                      isAutoHide: Bool = false,
-                             closure: UIAlertControllerClosure? = nil,
-                             autoHideClosure: VoidClosure? = nil) {
-        let alert: UIAlertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-
-        if let cancelTitle = cancelButtonTitle {
-            let cancelAction: UIAlertAction = UIAlertAction(title: cancelTitle, style: .cancel, handler: { (action: UIAlertAction) in
-                if let callBack = closure {
-                    callBack(alert, alert.getActionIndex(action))
-                }
-            })
+                             message: String?,
+                             cancelButtonTitle: String?,
+                             otherButtonTitles: [String]? = nil,
+                             isAutoHide: Bool = false,
+                             autoHideClosure: VoidClosure? = nil,
+                             closure: ((_ alertVC: UIAlertController, _ buttonIndex: Int) -> Void)? = nil) {
+        let alertVC: UIAlertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+
+        let cancelAction: UIAlertAction = UIAlertAction(title: cancelButtonTitle, style: .cancel, handler: { (action: UIAlertAction) in
+            if let closure {
+                closure(alertVC, alertVC.getActionIndex(action))
+            }
+        })
 
-            alert.addAction(cancelAction)
-        }
+        alertVC.addAction(cancelAction)
 
-        for title in otherButtonTitles {
-            guard let title else { continue }
-            let otherAction: UIAlertAction = UIAlertAction(title: title, style: .default, handler: { (action: UIAlertAction) in
-                if let callBack = closure {
-                    callBack(alert, alert.getActionIndex(action))
-                }
-            })
+        if let otherButtonTitles {
+            for title in otherButtonTitles {
+                let otherAction: UIAlertAction = UIAlertAction(title: title, style: .default, handler: { (action: UIAlertAction) in
+                    if let closure {
+                        closure(alertVC, alertVC.getActionIndex(action))
+                    }
+                })
 
-            alert.addAction(otherAction)
+                alertVC.addAction(otherAction)
+            }
         }
 
-        alert.show()
+        alertVC.show()
 
         if isAutoHide {
             // auto close
             let deadlineTime: DispatchTime = DispatchTime.now() + .seconds(2)
             DispatchQueue.main.asyncAfter(deadline: deadlineTime) {
-                alert.dismiss(animated: true, completion: autoHideClosure)
+                alertVC.dismiss(animated: true, completion: autoHideClosure)
             }
         }
     }
 
     public static func actionSheet(title: String? = nil,
-                            message: String? = nil,
-                            buttonTitles: [String],
-                            closure: UIAlertControllerClosure? = nil) {
+                                   message: String? = nil,
+                                   buttonTitles: [String],
+                                   closure: ((_ alertVC: UIAlertController, _ buttonIndex: Int) -> Void)? = nil) {
         guard buttonTitles.count > 0 else { return }
 
         let alert: UIAlertController = UIAlertController(title: title, message: message, preferredStyle: .actionSheet)

Sources/SwiftHelper/UI/UIImageExtension.swift

@@ -387,7 +387,7 @@ extension UIImage {
 
         defer {
             if success == false {
-                UIAlertController.alert(title: "", message: "최대 \(Int(maxSize))MB 까지 등록 가능합니다.")
+                alert(title: nil, message: "최대 \(Int(maxSize))MB 까지 등록 가능합니다.")
             }
         }
 

Sources/SwiftHelper/UI/UILabelExtensions.swift

@@ -146,7 +146,8 @@ extension UILabel {
             guard let owner else { return }
             print("\n 🌸 Show Class Name : \(owner.className)\n")
             UIPasteboard.general.string = owner.className
-            UIAlertController.alert(title: nil, message: "\(owner.className) 복사되었습니다!")
+            alert(title: nil, message: "\(owner.className) 복사되었습니다!")
+//            UIAlertController.alert(title: nil, message: "\(owner.className) 복사되었습니다!")
         }
         label.addTapGesture { [weak label] recognizer in
             guard let label else { return }

Sources/SwiftHelper/UI/UITextFieldExtensions.swift

@@ -35,31 +35,6 @@ extension UITextField {
         self.leftViewMode = UITextField.ViewMode.always
     }
 
-    ///   Ways to validate by comparison
-    public enum textFieldValidationOptions: Int {
-        case equalTo
-        case greaterThan
-        case greaterThanOrEqualTo
-        case lessThan
-        case lessThanOrEqualTo
-    }
-
-    ///   Validation length of character counts in UITextField
-    public func validateLength(ofCount count: Int, option: UITextField.textFieldValidationOptions) -> Bool {
-        switch option {
-        case .equalTo:
-            return self.text!.count == count
-        case .greaterThan:
-            return self.text!.count > count
-        case .greaterThanOrEqualTo:
-            return self.text!.count >= count
-        case .lessThan:
-            return self.text!.count < count
-        case .lessThanOrEqualTo:
-            return self.text!.count <= count
-        }
-    }
-
     ///   Validation of email format based on https://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address and https://stackoverflow.com/questions/2049502/what-characters-are-allowed-in-an-email-address
     // TODO match String.isEmail method
     public func validateEmail() -> Bool {