Add UIStoryboard Extension

Author: dakeshi

samples/swift/uidemo/AppDelegate.swift

@@ -20,10 +20,6 @@ import FirebaseAuthUI
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-  
-  static var mainStoryboard: UIStoryboard {
-    return UIStoryboard(name: "Main", bundle: nil)
-  }
 
   var window: UIWindow?
 

samples/swift/uidemo/AuthViewController.swift

@@ -118,8 +118,5 @@ class AuthViewController: UIViewController {
   override func viewWillLayoutSubviews() {
     self.topConstraint.constant = self.topLayoutGuide.length
   }
-  
-  static func fromStoryboard(storyboard: UIStoryboard = AppDelegate.mainStoryboard) -> AuthViewController {
-    return storyboard.instantiateViewControllerWithIdentifier("AuthViewController") as! AuthViewController
-  }
+
 }

samples/swift/uidemo/ChatViewController.swift

@@ -128,13 +128,7 @@ class ChatViewController: UIViewController, UICollectionViewDelegateFlowLayout {
 
     self.textView.text = ""
   }
-  
-  // MARK: - Boilerplate
-  
-  static func fromStoryboard(storyboard: UIStoryboard = AppDelegate.mainStoryboard) -> ChatViewController {
-    return storyboard.instantiateViewControllerWithIdentifier("ChatViewController") as! ChatViewController
-  }
-  
+
   override func viewDidLoad() {
     super.viewDidLoad()
 

samples/swift/uidemo/Sample.swift

@@ -52,9 +52,9 @@ enum Sample: Int, RawRepresentable {
   func controller() -> UIViewController {
     switch self {
     case .Chat:
-      return ChatViewController.fromStoryboard()
+      return UIStoryboard.instantiateViewController("Main", identifier: "ChatViewController") as! ChatViewController
     case .Auth:
-      return AuthViewController.fromStoryboard()
+      return UIStoryboard.instantiateViewController("Main", identifier: "AuthViewController") as! AuthViewController
     }
   }
 }

samples/swift/uidemo/UIStoryboardExtension.swift

@@ -0,0 +1,23 @@
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import UIKit
+
+extension UIStoryboard {
+  static func instantiateViewController(storyboard: String, identifier: String) -> UIViewController {
+    return UIStoryboard(name: storyboard, bundle: nil).instantiateViewControllerWithIdentifier(identifier)
+  }
+}