Public Initializers on ActivityAlertView

Author: richardpiazza

Sources/CodeQuickKit/SwiftUI/ActivityAlertView.swift

@@ -8,21 +8,35 @@ import SwiftUI
 public struct ActivityAlertView: UIViewControllerRepresentable {
 
     /// A binding to a Boolean value that determines whether to present the view.
-    @Binding public var isPresented: Bool
+    public let isPresented: Binding<Bool>
     /// The header text of the presented alert
-    public let title: String?
+    public let title: Binding<String>?
     /// The body text of the presented alert
-    public let message: String?
+    public let message: Binding<String>?
     /// Inset values that should be used in place of defaults.
-    public var padding: EdgeInsets? = nil
+    public let padding: EdgeInsets?
+    
+    public init(isPresented: Binding<Bool>, title: String?, message: String?, padding: EdgeInsets? = nil) {
+        self.isPresented = isPresented
+        self.title = (title != nil) ? .constant(title!) : nil
+        self.message = (message != nil) ? .constant(message!) : nil
+        self.padding = padding
+    }
+    
+    public init(isPresented: Binding<Bool>, title: Binding<String>? = nil, message: Binding<String>? = nil, padding: EdgeInsets? = nil) {
+        self.isPresented = isPresented
+        self.title = title
+        self.message = message
+        self.padding = padding
+    }
 
     public func makeCoordinator() -> UIAlertController {
         var insets: UIEdgeInsets?
         if let padding = padding {
             insets = UIEdgeInsets(top: padding.top, left: padding.leading, bottom: padding.bottom, right: padding.trailing)
         }
 
-        return UIAlertController.makeActivityAlert(title: title, message: message, padding: insets)
+        return UIAlertController.makeActivityAlert(title: title?.wrappedValue, message: message?.wrappedValue, padding: insets)
     }
 
     public func makeUIViewController(context: Context) -> some UIViewController {
@@ -31,9 +45,14 @@ public struct ActivityAlertView: UIViewControllerRepresentable {
 
     public func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) {
         let alertController = context.coordinator
-        switch (isPresented, uiViewController.presentedViewController) {
+        switch (isPresented.wrappedValue, uiViewController.presentedViewController) {
         case (true, nil):
+            alertController.title = title?.wrappedValue
+            alertController.message = message?.wrappedValue
             uiViewController.present(alertController, animated: true)
+        case (true, _):
+            alertController.title = title?.wrappedValue
+            alertController.message = message?.wrappedValue
         case (false, alertController):
             alertController.dismiss(animated: true)
         default:

Tests/CodeQuickKitTests/Foundation/DateTests.swift

@@ -44,19 +44,14 @@ class DateTests: XCTestCase {
         XCTAssertTrue(now.isSame(today))
     }
 
-    func testLastWeek() {
+    func testLastWeek() throws {
         let now = Date()
         let lastWeek = Date.lastWeek
 
         XCTAssertTrue(lastWeek.isBefore(now))
 
-        let offset = TimeZone.current.daylightSavingTimeOffset(for: lastWeek)
-        let minutesToToday = 10080 + Int(offset / 60)
-        
-        guard let today = lastWeek.dateByAdding(minutes: minutesToToday) else {
-            XCTFail()
-            return
-        }
+        let minutesToToday = 60 * 24 * 7
+        let today = try XCTUnwrap(lastWeek.dateByAdding(minutes: minutesToToday))
 
         XCTAssertTrue(today.isAfter(lastWeek))
         XCTAssertTrue(now.isSame(today))
@@ -92,16 +87,13 @@ class DateTests: XCTestCase {
         XCTAssertTrue(now.isSame(today))
     }
 
-    func testNextWeek() {
+    func testNextWeek() throws {
         let now = Date()
         let nextWeek = Date.nextWeek
 
         XCTAssertTrue(nextWeek.isAfter(now))
 
-        guard let today = nextWeek.dateByAdding(minutes: -10080) else {
-            XCTFail()
-            return
-        }
+        let today = try XCTUnwrap(nextWeek.dateByAdding(days: -7))
 
         XCTAssertTrue(today.isBefore(nextWeek))
         XCTAssertTrue(now.isSame(today))