💥 fix does not work transition [#59]

Example/Sample1/AppDelegate.swift

@@ -13,32 +13,29 @@ import KabuKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
-    var producer: Producer?
+
     var root: UIViewController?
+
+    var sequence: SceneSequence<Void, SampleSequenceRule>?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 
         root = UIViewController()
 
         // Override point for customization after application launch.
         self.window = UIWindow(frame: UIScreen.main.bounds)
-        self.window!.rootViewController = UINavigationController(rootViewController: root!)
-        self.window!.rootViewController?.view.backgroundColor = UIColor.brown
-        self.window!.backgroundColor = UIColor.white
+        let nav = UINavigationController(rootViewController: root!)
+        self.window!.rootViewController = nav
         self.window!.makeKeyAndVisible()
 
         root?.navigationController?.setNavigationBarHidden(true, animated: true)
-//        root?.view.autoresizeMask = super.autoresizeMask
-//        root?.view.autoresizingMask
         let scene = Sample1AViewController(nibName: "Sample1AViewController", bundle: Bundle.main)
-        producer = Producer.run(sequence: SceneSequence(root!, scene, false) { (stage, scene) in
-            stage.view.autoresizingMask = (self.root?.view.autoresizingMask)!
-
-            stage.addChildViewController(scene)
-            stage.view.addSubview(scene.view)
-            scene.view.frame = (self.root?.view.frame)!
-        })
-
+        let rule = SampleSequenceRule()
+        sequence = SceneSequence<Void, SampleSequenceRule>(rule)
+
+        sequence?.startWith(nav, scene, false) { (firstScene, stage) in
+            nav.pushViewController(firstScene, animated: true)
+        }
         return true
     }
 

Example/Sample1/Sequence/SampleSequenceRule.swift

@@ -0,0 +1,40 @@
+//
+//  Copyright © 2017年 DWANGO Co., Ltd.
+//
+
+import Foundation
+import KabuKit
+
+class SampleALink : Link<Bool> {}
+class SampleBLink : Link<Void> {}
+
+class SampleSequenceRule : SequenceRule {
+    typealias StageType = UINavigationController
+
+    let scenario = Scenario<UINavigationController>()
+    .at(Sample1AViewController.self) { (term) in
+        term.when(SampleALink.self, to: { Sample1AViewController() }) { (from, stage, next) in
+            stage.pushViewController(next, animated: true)
+        }
+
+        term.when(SampleBLink.self, to: { Sample1BViewController() }) { (from, stage, next) in
+            stage.pushViewController(next, animated: true)
+        }
+
+    }.at(Sample1BViewController.self) { (term) in
+
+        term.when(SampleALink.self, to: { Sample1AViewController() }) { (from, stage, next) in
+            stage.pushViewController(next, animated: true)
+        }
+
+        term.when(SampleBLink.self, to: { Sample1BViewController() }) { (from, stage, next) in
+            stage.pushViewController(next, animated: true)
+        }
+    }
+
+
+    func onEnd<S>(page: S, stage: UINavigationController) where S : Page {
+        stage.popViewController(animated: true)
+    }
+
+}

Example/Sample1/Scenes/Sample1A/Sample1AScene.swift → Example/Sample1/Sequence/Scenes/Sample1A/Sample1AScene.swift

@@ -11,14 +11,15 @@ extension Sample1AViewController: Scene {
     typealias ContextType = Bool
 
     func onPressAButton(sender: UIButton) {
-        jumpTo(Link<String>(""))
+        jumpTo(SampleALink(true))
     }
 
     func onPressBButton(sender: UIButton) {
+        jumpTo(SampleBLink())
     }
 
     func onPressPrevButton(sender: UIButton) {
-
+        prev()
     }
 
     // MARK: - Override
@@ -34,7 +35,4 @@ extension Sample1AViewController: Scene {
         nextButtonB.addTarget(self, action: #selector(onPressBButton(sender:)), for: .touchUpInside)
         prevButton.addTarget(self, action: #selector(onPressPrevButton(sender:)), for: .touchUpInside)
     }
-
-    override func viewDidDisappear(_ animated: Bool) {
-    }
 }

Example/Sample1/Sequence/Scenes/Sample1B/Sample1BScene.swift

@@ -0,0 +1,34 @@
+//
+//  Sample1BScene.swift
+//  Example
+//
+//  Created by crexista on 2016/11/24.
+//  Copyright © crexista. All rights reserved.
+//
+
+import Foundation
+import KabuKit
+
+extension Sample1BViewController : Scene {
+
+    typealias ContextType = Void
+
+    func onPressAButton(sender: UIButton) {
+        jumpTo(SampleALink(true))
+    }
+
+    func onPressBButton(sender: UIButton) {
+        jumpTo(SampleBLink())
+    }
+
+    func onPressPrevButton(sender: UIButton) {
+        prev()
+    }
+
+    // MARK: - Override
+    override func viewDidLoad() {
+        nextButtonA.addTarget(self, action: #selector(onPressAButton(sender:)), for: .touchUpInside)
+        nextButtonB.addTarget(self, action: #selector(onPressBButton(sender:)), for: .touchUpInside)
+        prevButton.addTarget(self, action: #selector(onPressPrevButton(sender:)), for: .touchUpInside)
+    }
+}