Update app and navigator to support WidgetControllerType

Author: Michael Long

RxSwiftWidgetsDemo/AppDelegate.swift

@@ -24,11 +24,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
             }
 
         let widget = MainMenuWidget()
-        let vc = UIWidgetHostController(widget)
 
         window = UIWindow(frame: UIScreen.main.bounds)
         let navigationController = UINavigationController()
-        navigationController.addChild(vc)
+        navigationController.addChild(widget.controller(with: WidgetContext()))
         window?.rootViewController = navigationController
         window?.makeKeyAndVisible()
 

Sources/RxSwiftWidgets/Core/WidgetNavigation.swift

@@ -26,38 +26,34 @@ 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: WidgetControllerType, animated: Bool = true) {
         let context = self.context.set(presentation: .pushed)
-        let viewController = UIWidgetHostController(widget, with: context)
+        let viewController = widget.controller(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>) {
-        let context = self.context.set(presentation: .pushed)
+    public func push<ReturnType>(_ widget: WidgetControllerType, animated: Bool = true,
+                                 onDismiss handler: @escaping WidgetDismissibleReturnHandler<ReturnType>) {
         let dismissible = WidgetDismissibleReturn<ReturnType>(handler)
-        let viewController = UIWidgetHostController(widget, with: context, dismissible: dismissible)
+        let context = self.context.set(presentation: .pushed).set(dismissible: dismissible)
+        let viewController = widget.controller(with: context)
         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: WidgetControllerType, animated: Bool = true) {
         let context = self.context.set(presentation: .presented)
-        let viewController = UIWidgetHostController(widget, with: context)
+        let viewController = widget.controller(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>) {
-        let context = self.context.set(presentation: .presented)
+    public func present<ReturnType>(_ widget: WidgetControllerType, animated: Bool = true,
+                                    onDismiss handler: @escaping WidgetDismissibleReturnHandler<ReturnType>) {
         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)
+        let context = self.context.set(presentation: .presented).set(dismissible: dismissible)
+        let viewController = widget.controller(with: context)
         navigationController?.present(viewController, animated: animated, completion: nil)
     }
 

Sources/RxSwiftWidgets/Extensions/UIWidgetHostController.swift

@@ -24,14 +24,6 @@ open class UIWidgetHostController: UIViewController {
             .set(viewController: self)
     }
 
-    public init(_ widget: Widget, with context: WidgetContext, dismissible: WidgetDismissibleType) {
-        super.init(nibName: nil, bundle: nil)
-        self.widget = widget
-        self.context = context.new()
-            .set(viewController: self)
-            .set(dismissible: dismissible)
-    }
-
     required public init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }

Sources/RxSwiftWidgets/Widgets/Navigation/AlertWidget.swift

@@ -7,11 +7,9 @@
 
 import UIKit
 
-public protocol WidgetController {
-    func build(with context: WidgetContext) -> UIViewController
-}
-
-public struct AlertWidget: WidgetController {
+public struct AlertWidget
+    : WidgetControllerType
+{
 
     internal let title: String?
     internal let message: String?
@@ -23,7 +21,7 @@ public struct AlertWidget: WidgetController {
         self.message = message
     }
 
-    public func build(with context: WidgetContext) -> UIViewController {
+    public func controller(with context: WidgetContext) -> UIViewController {
         let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
         let context = context.set(viewController: alert)
         for action in actions {