Merge remote-tracking branch 'origin/master'

Esqarrouth · Dec 19, 2015 · 9bc51ba · 9bc51ba
2 parents ce3cfdb + 8d208c0
commit 9bc51ba
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -356,6 +356,14 @@ override func viewDidAppear(animated: Bool) {
 
     dismissVC(completion: nil) // Instead of dismissViewControllerAnimated(true, completion: completion)}
 ```
+
+Easily add UIViewControllers:
+
+``` swift
+    let myViewController = myViewController()
+    addAsChildViewController(myViewController, toView: self.anySubview) // Adding view controller as a child view controller to subview
+```
+
 ##UIView Extensions
 
 Easily initialize your objects:

diff --git a/Sources/EZSwiftExtensions.swift b/Sources/EZSwiftExtensions.swift
@@ -11,6 +11,12 @@ import UIKit
 
 public struct ez {
 
+    /// EZSwift Extensions
+    public static var appDisplayName: String {
+        return NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleDisplayName") as? String
+            ?? NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as! String
+    }
+
     /// EZSwift Extensions
     public static var appVersion: String {
         return NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleShortVersionString") as! String

diff --git a/Sources/UIViewControllerExtensions.swift b/Sources/UIViewControllerExtensions.swift
@@ -214,5 +214,13 @@ extension UIViewController {
     public func dismissVC(completion completion: (() -> Void)? ) {
         dismissViewControllerAnimated(true, completion: completion)
     }
+
+    /// EZSwiftExtensions
+    public func addAsChildViewController(vc: UIViewController, toView: UIView){
+        vc.view.frame = toView.frame
+        toView.addSubview(vc.view)
+        self.addChildViewController(vc)
+        vc.didMoveToParentViewController(self)
+    }
 }