Added Alert Widget and simplified push present calls

Michael Long · Michael Long · commit d1169259e4bc · 2019-09-15T14:01:45.000-05:00
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ struct UserListWidget: WidgetView {
                     .accessoryType(.disclosureIndicator)
                 }
                 .onSelect { (context, path, user) in
-                    context.navigator?.push(widget: UserDetailsWidget(user: user))
+                    context.navigator?.push(UserDetailsWidget(user: user))
                     context.tableView?.deselectRow(at: path, animated: true)
                 }
             ])
@@ -145,7 +145,7 @@ Note that while you can use a standard text-based table cell in RxSwiftWidgets,
 
 ```
     .onSelect { (context, path, user) in
-        context.navigator?.push(widget: UserDetailsWidget(user: user))
+        context.navigator?.push(UserDetailsWidget(user: user))
         context.tableView?.deselectRow(at: path, animated: true)
     }
 ```
diff --git a/RxSwiftWidgets.xcodeproj/project.pbxproj b/RxSwiftWidgets.xcodeproj/project.pbxproj
@@ -77,6 +77,7 @@
 		4CE3B6CA22F77EF000E47F57 /* ScrollWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE3B6C922F77EF000E47F57 /* ScrollWidget.swift */; };
 		4CE3B6CC22F89F4300E47F57 /* DemoScrollingWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE3B6CB22F89F4300E47F57 /* DemoScrollingWidget.swift */; };
 		4CE49AB922FCD7080030CD9D /* WidgetModifyUIControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE49AB822FCD7080030CD9D /* WidgetModifyUIControl.swift */; };
+		4CF7B65C232EB609009484AE /* AlertWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF7B65B232EB609009484AE /* AlertWidget.swift */; };
 		OBJ_341 /* BehaviorRelay+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_50 /* BehaviorRelay+Driver.swift */; };
 		OBJ_342 /* Binder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_51 /* Binder.swift */; };
 		OBJ_343 /* ControlEvent+Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_52 /* ControlEvent+Driver.swift */; };
@@ -603,6 +604,7 @@
 		4CE3B6C922F77EF000E47F57 /* ScrollWidget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollWidget.swift; sourceTree = "<group>"; };
 		4CE3B6CB22F89F4300E47F57 /* DemoScrollingWidget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DemoScrollingWidget.swift; path = RxSwiftWidgetsDemo/Application/Features/DemoScrollingWidget.swift; sourceTree = SOURCE_ROOT; };
 		4CE49AB822FCD7080030CD9D /* WidgetModifyUIControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WidgetModifyUIControl.swift; sourceTree = "<group>"; };
+		4CF7B65B232EB609009484AE /* AlertWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertWidget.swift; sourceTree = "<group>"; };
 		OBJ_100 /* RxScrollViewDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxScrollViewDelegateProxy.swift; sourceTree = "<group>"; };
 		OBJ_101 /* RxSearchBarDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxSearchBarDelegateProxy.swift; sourceTree = "<group>"; };
 		OBJ_102 /* RxSearchControllerDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxSearchControllerDelegateProxy.swift; sourceTree = "<group>"; };
@@ -1160,6 +1162,14 @@
 			path = Models;
 			sourceTree = "<group>";
 		};
+		4CF7B65A232EB5E0009484AE /* Navigation */ = {
+			isa = PBXGroup;
+			children = (
+				4CF7B65B232EB609009484AE /* AlertWidget.swift */,
+			);
+			path = Navigation;
+			sourceTree = "<group>";
+		};
 		OBJ_156 /* RxCocoaRuntime */ = {
 			isa = PBXGroup;
 			children = (
@@ -1399,8 +1409,9 @@
 			children = (
 				4C12006F23087520003B060C /* Containers */,
 				4C12007023087559003B060C /* Controls */,
-				4C120072230875B7003B060C /* TableView */,
+				4CF7B65A232EB5E0009484AE /* Navigation */,
 				4C1200712308758C003B060C /* General */,
+				4C120072230875B7003B060C /* TableView */,
 			);
 			path = Widgets;
 			sourceTree = "<group>";
@@ -2243,6 +2254,7 @@
 				OBJ_667 /* WidgetModifyUIViewLayer.swift in Sources */,
 				OBJ_668 /* WidgetModifyUIViewRx.swift in Sources */,
 				4CE3B6C522F77C3D00E47F57 /* TextFieldWidget.swift in Sources */,
+				4CF7B65C232EB609009484AE /* AlertWidget.swift in Sources */,
 				4C585DD822FB7BD7007E4F5F /* ObservableListBuilder.swift in Sources */,
 				4C120077230A15C6003B060C /* TableCellWidget.swift in Sources */,
 				4CE3B69E22F4BCBC00E47F57 /* WidgetAnimation.swift in Sources */,
diff --git a/RxSwiftWidgetsDemo/Application/Features/DemoDismissibleWidget.swift b/RxSwiftWidgetsDemo/Application/Features/DemoDismissibleWidget.swift
@@ -31,10 +31,10 @@ struct DemoDismissibleWidget: WidgetView {
                     .numberOfLines(0)
                     .padding(h: 0, v: 15),
 
-                ButtonWidget("Dismiss Returning Value")
+                ButtonWidget("Return Random Number")
                     .color(.orange)
                     .onTap { context in
-                        context.navigator?.dismiss(returning: "Return Value")
+                        context.navigator?.dismiss(returning: "\(Int.random(in: 1..<1000))")
                     },
 
                 ButtonWidget("Dismiss")
diff --git a/RxSwiftWidgetsDemo/Application/Features/FeaturesWidget.swift b/RxSwiftWidgetsDemo/Application/Features/FeaturesWidget.swift
@@ -27,25 +27,32 @@ struct FeaturesWidget: WidgetView {
                         .padding(20),
 
                     MainMenuItemWidget(text: "Property Binding", onTap: { (context) in
-                         context.navigator?.push(widget: DemoBindingWidget(title: self.$title))
+                         context.navigator?.push(DemoBindingWidget(title: self.$title))
                     }),
 
                     MainMenuItemWidget(text: "Dismissible", onTap: { context in
-                        context.navigator?.present(widget: DemoDismissibleWidget(), onDismiss: { (value: String) in
-                            print(value)
+                        context.navigator?.present(DemoDismissibleWidget(), onDismiss: { (value: String) in
+                            OperationQueue.main.addOperation {
+                                context.navigator?.present(
+                                    AlertWidget(title: "Returned", message: value)
+                                        .addAction(title: "Okay") { (context) in
+                                            context.navigator?.dismiss()
+                                        }
+                                )
+                            }
                         })
                     }),
 
                     MainMenuItemWidget(text: "Positioning", onTap: { context in
-                        context.navigator?.push(widget: DemoPositioningWidget())
+                        context.navigator?.push(DemoPositioningWidget())
                     }),
 
                     MainMenuItemWidget(text: "Scrolling", onTap: { context in
-                        context.navigator?.push(widget: DemoScrollingWidget())
+                        context.navigator?.push(DemoScrollingWidget())
                     }),
 
                     MainMenuItemWidget(text: "Static TableView", onTap: { context in
-                        context.navigator?.push(widget: DemoStaticTableViewWidget())
+                        context.navigator?.push(DemoStaticTableViewWidget())
                     }),
 
                     ButtonWidget("Reset Title")
diff --git a/RxSwiftWidgetsDemo/Application/MainMenu/MainMenuWidget.swift b/RxSwiftWidgetsDemo/Application/MainMenu/MainMenuWidget.swift
@@ -28,19 +28,19 @@ struct MainMenuWidget: WidgetView {
                         ),
 
                     MainMenuItemWidget(text: "Account Details", onTap: { context in
-                        context.navigator?.push(widget: AccountDetailsWidget())
+                        context.navigator?.push(AccountDetailsWidget())
                     }),
 
                     MainMenuItemWidget(text: "Login Form", onTap: { context in
-                        context.navigator?.push(widget: LoginFormWidget())
+                        context.navigator?.push(LoginFormWidget())
                     }),
 
                     MainMenuItemWidget(text: "User List", onTap: { context in
-                        context.navigator?.push(widget: UserListWidget())
+                        context.navigator?.push(UserListWidget())
                     }),
 
                     MainMenuItemWidget(text: "Features", onTap: { context in
-                        context.navigator?.push(widget: FeaturesWidget())
+                        context.navigator?.push(FeaturesWidget())
                     }),
 
                     ]) // VStackWidget
diff --git a/RxSwiftWidgetsDemo/Application/Users/UserListWidget.swift b/RxSwiftWidgetsDemo/Application/Users/UserListWidget.swift
@@ -38,7 +38,7 @@ struct UserListWidget: WidgetView {
                     .accessoryType(.disclosureIndicator)
                 }
                 .onSelect { (context, path, user) in
-                    context.navigator?.push(widget: UserDetailsWidget(user: user))
+                    context.navigator?.push(UserDetailsWidget(user: user))
                     context.tableView?.deselectRow(at: path, animated: true)
                 }
             ]) // TableWidget
diff --git a/Sources/RxSwiftWidgets/Core/WidgetDismissible.swift b/Sources/RxSwiftWidgets/Core/WidgetDismissible.swift
@@ -22,6 +22,8 @@ public struct WidgetDismissibleReturn<Value>: WidgetDismissibleType {
 }
 
 public enum WidgetDismissiblePresentationType {
+    case alert
     case presented
     case pushed
+    case sheet
 }
diff --git a/Sources/RxSwiftWidgets/Core/WidgetNavigation.swift b/Sources/RxSwiftWidgets/Core/WidgetNavigation.swift
@@ -26,35 +26,41 @@ public struct WidgetNavigator {
     // dismissible functionality
 
     /// Pushes the widget onto the navigation stack in a new UIWidgetHostController.
-    public func push(widget: Widget, animated: Bool = true) {
+    public func push(_ widget: Widget, animated: Bool = true) {
         let context = self.context.set(presentation: .pushed)
         let viewController = UIWidgetHostController(widget, with: context)
         navigationController?.pushViewController(viewController, animated: animated)
     }
 
     /// Pushes the widget onto the navigation stack in a new UIWidgetHostController with a return value handler.
-    public func push<ReturnType>(widget: Widget, animated: Bool = true, onDismiss handler: @escaping WidgetDismissibleReturnHandler<ReturnType>) {
+    public func push<ReturnType>(_ widget: Widget, animated: Bool = true, onDismiss handler: @escaping WidgetDismissibleReturnHandler<ReturnType>) {
         let context = self.context.set(presentation: .pushed)
         let dismissible = WidgetDismissibleReturn<ReturnType>(handler)
         let viewController = UIWidgetHostController(widget, with: context, dismissible: dismissible)
         navigationController?.pushViewController(viewController, animated: animated)
     }
 
     /// Presents a widget on the navigation stack in a new UIWidgetHostController.
-    public func present(widget: Widget, animated: Bool = true) {
+    public func present(_ widget: Widget, animated: Bool = true) {
         let context = self.context.set(presentation: .presented)
         let viewController = UIWidgetHostController(widget, with: context)
         navigationController?.present(viewController, animated: animated, completion: nil)
     }
 
     /// Presents a widget on the navigation stack in a new UIWidgetHostController with a return value handler.
-    public func present<ReturnType>(widget: Widget, animated: Bool = true, onDismiss handler: @escaping WidgetDismissibleReturnHandler<ReturnType>) {
+    public func present<ReturnType>(_ widget: Widget, animated: Bool = true, onDismiss handler: @escaping WidgetDismissibleReturnHandler<ReturnType>) {
         let context = self.context.set(presentation: .presented)
         let dismissible = WidgetDismissibleReturn<ReturnType>(handler)
         let viewController = UIWidgetHostController(widget, with: context, dismissible: dismissible)
         navigationController?.present(viewController, animated: animated, completion: nil)
     }
 
+    public func present(_ widget: WidgetController, animated: Bool = true) {
+        let context = self.context.set(presentation: .alert)
+        let viewController = widget.build(with: context)
+        navigationController?.present(viewController, animated: animated, completion: nil)
+    }
+
     /// Pops or dismisses the current view controller, returning a value that will be passed to the onDismiss handler.
     public func dismiss<Value>(returning value: Value, animated: Bool = true) {
         if let dimissible = context.dismissible as? WidgetDismissibleReturn<Value> {
@@ -69,7 +75,7 @@ public struct WidgetNavigator {
             return
         }
         switch self.context.presentation {
-        case .presented:
+        case .alert, .presented, .sheet:
             viewController.dismiss(animated: animated, completion: nil)
         case .pushed:
             viewController.navigationController?.popToViewController(viewController, animated: false)
diff --git a/Sources/RxSwiftWidgets/Widgets/Navigation/AlertWidget.swift b/Sources/RxSwiftWidgets/Widgets/Navigation/AlertWidget.swift
@@ -0,0 +1,49 @@
+//
+//  AlertWidget.swift
+//  RxSwiftWidgets
+//
+//  Created by Michael Long on 9/15/19.
+//
+
+import UIKit
+
+public protocol WidgetController {
+    func build(with context: WidgetContext) -> UIViewController
+}
+
+public struct AlertWidget: WidgetController {
+
+    internal let title: String?
+    internal let message: String?
+
+    internal var actions: [WidgetAlertAction] = []
+
+    public init(title: String?, message: String?) {
+        self.title = title
+        self.message = message
+    }
+
+    public func build(with context: WidgetContext) -> UIViewController {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        let context = context.set(viewController: alert)
+        for action in actions {
+            alert.addAction(UIAlertAction(title: action.title, style: action.style, handler: { (_) in
+                action.handler(context)
+            }))
+        }
+        return alert
+    }
+
+    public func addAction(title: String?, style: UIAlertAction.Style = .default, handler: @escaping (_ context: WidgetContext) -> Void) -> Self {
+        var widget = self
+        widget.actions.append(WidgetAlertAction(title: title, style: style, handler: handler))
+        return widget
+    }
+
+}
+
+internal struct WidgetAlertAction {
+    let title: String?
+    let style: UIAlertAction.Style
+    let handler: (_ context: WidgetContext) -> Void
+}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ struct UserListWidget: WidgetView {`
`78`	`78`	`.accessoryType(.disclosureIndicator)`
`79`	`79`	`}`
`80`	`80`	`.onSelect { (context, path, user) in`
`81`		`- context.navigator?.push(widget: UserDetailsWidget(user: user))`
	`81`	`+ context.navigator?.push(UserDetailsWidget(user: user))`
`82`	`82`	`context.tableView?.deselectRow(at: path, animated: true)`
`83`	`83`	`}`
`84`	`84`	`])`
`@@ -145,7 +145,7 @@ Note that while you can use a standard text-based table cell in RxSwiftWidgets,`
`145`	`145`
`146`	`146`	```
`147`	`147`	`.onSelect { (context, path, user) in`
`148`		`- context.navigator?.push(widget: UserDetailsWidget(user: user))`
	`148`	`+ context.navigator?.push(UserDetailsWidget(user: user))`
`149`	`149`	`context.tableView?.deselectRow(at: path, animated: true)`
`150`	`150`	`}`
`151`	`151`	```
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ struct UserListWidget: WidgetView {`
`38`	`38`	`.accessoryType(.disclosureIndicator)`
`39`	`39`	`}`
`40`	`40`	`.onSelect { (context, path, user) in`
`41`		`- context.navigator?.push(widget: UserDetailsWidget(user: user))`
	`41`	`+ context.navigator?.push(UserDetailsWidget(user: user))`
`42`	`42`	`context.tableView?.deselectRow(at: path, animated: true)`
`43`	`43`	`}`
`44`	`44`	`]) // TableWidget`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ public struct WidgetDismissibleReturn<Value>: WidgetDismissibleType {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public enum WidgetDismissiblePresentationType {`
	`25`	`+ case alert`
`25`	`26`	`case presented`
`26`	`27`	`case pushed`
	`28`	`+ case sheet`
`27`	`29`	`}`