ref HeroTransitions#623 - improve initializer of SwiftUIMatchExampleV…

…iewController and readability of tuple
nick-potts · Dec 16, 2019 · f912539 · f912539
1 parent 3d9dbad
commit f912539
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Examples/MainViewController.swift b/Examples/MainViewController.swift
@@ -3,7 +3,7 @@ import CollectionKit
 
 class MainViewController: UIViewController {
 
-  typealias SourceData = (UIViewController.Type, String)
+  typealias SourceData = (makeViewController: ()->(UIViewController), exampleTitle:String)
 
   let collectionView = CollectionView()
 
@@ -22,18 +22,18 @@ class MainViewController: UIViewController {
 
   func setupcollection() {
     let dataSource = ArrayDataSource<SourceData>(data: [
-      (BuiltInTransitionExampleViewController1.self, "Built In Animations"),
-      (MatchExampleViewController1.self, "Match Animation"),
-      (MatchInCollectionExampleViewController1.self, "Match Cell in Collection"),
-      (AppStoreViewController1.self, "App Store Transition"),
+      ({ BuiltInTransitionExampleViewController1() }, "Built In Animations"),
+      ({ MatchExampleViewController1() }, "Match Animation"),
+      ({ MatchInCollectionExampleViewController1() }, "Match Cell in Collection"),
+      ({ AppStoreViewController1() }, "App Store Transition"),
       ])
 
     if #available(iOS 13.0, *) {
-      dataSource.data.insert((SwiftUIMatchExampleViewController.self, "Match SwiftUI"), at: 2)
+      dataSource.data.insert(({ SwiftUIMatchExampleViewController() }, "Match SwiftUI"), at: 2)
     }
 
     let viewSource = ClosureViewSource { (label: UILabel, data: SourceData, index) in
-      label.text = "\(index + 1). \(data.1)"
+      label.text = "\(index + 1). \(data.exampleTitle)"
       label.textAlignment = .center
       if #available(iOS 13.0, *) {
         label.textColor = .label
@@ -57,7 +57,7 @@ class MainViewController: UIViewController {
       sizeSource: sizeSource,
       layout: FlowLayout(lineSpacing: 10))
     { (context) in
-      let vc = context.data.0.init()
+      let vc = context.data.makeViewController()
       vc.modalPresentationStyle = .fullScreen
       self.present(vc, animated: true, completion: nil)
     }

diff --git a/Examples/SwiftUIMatchExample.swift b/Examples/SwiftUIMatchExample.swift
@@ -6,14 +6,14 @@ import SwiftUI
 @available(iOS 13.0, *)
 class SwiftUIMatchExampleViewController: UIHostingController<ImagesTableView> {
 
-  override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+  required init() {
     super.init(rootView: ImagesTableView())
 
     rootView.onTapRow = { image in
 
       let destinationViewController = UIHostingController(rootView: ImageViewWrapper(name: image.name, heroID: image.name)
-                                                                      .onTapGesture { [weak self] in
-        self?.presentedViewController?.dismiss(animated: true, completion: nil)
+        .onTapGesture { [weak self] in
+          self?.presentedViewController?.dismiss(animated: true, completion: nil)
       })
 
       destinationViewController.isHeroEnabled = true