Merge branch 'develop' of github.com:SnapKit/SnapKit into develop

Example-iOS/AppDelegate.swift

@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
         
         self.window = UIWindow(frame: UIScreen.mainScreen().bounds)
@@ -28,29 +27,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         
         return true
     }
-
-    func applicationWillResignActive(application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-    }
-
-    func applicationDidEnterBackground(application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-    }
-
-    func applicationWillEnterForeground(application: UIApplication) {
-        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-    }
-
-    func applicationDidBecomeActive(application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
-
-    func applicationWillTerminate(application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-    }
-
-
 }
 

Example-iOS/demos/BasicUIScrollViewController.swift

@@ -43,16 +43,16 @@ class BasicUIScrollViewController: UIViewController {
         
         if (!didSetupConstraints) {
             
-            scrollView.snp_makeConstraints { (make) -> Void in
+            scrollView.snp_makeConstraints { make in
                 make.edges.equalTo(view).inset(UIEdgeInsetsZero)
             }
             
-            contentView.snp_makeConstraints { (make) -> Void in
+            contentView.snp_makeConstraints { make in
                 make.edges.equalTo(scrollView).inset(UIEdgeInsetsZero)
                 make.width.equalTo(scrollView)
             }
             
-            label.snp_makeConstraints { (make) -> Void in
+            label.snp_makeConstraints { make in
                 make.top.equalTo(contentView).inset(20)
                 make.leading.equalTo(contentView).inset(20)
                 make.trailing.equalTo(contentView).inset(20)

Example-iOS/demos/SimpleLayoutViewController.swift

@@ -11,87 +11,87 @@ import UIKit
 class SimpleLayoutViewController: UIViewController {
 
     var didSetupConstraints = false
-    
+
     let blackView: UIView = {
         let view = UIView()
         view.backgroundColor = .blackColor()
         return view
     }()
-    
+
     let redView: UIView = {
         let view = UIView()
         view.backgroundColor = .redColor()
         return view
     }()
-    
+
     let yellowView: UIView = {
         let view = UIView()
         view.backgroundColor = .yellowColor()
         return view
     }()
-    
+
     let blueView: UIView = {
         let view = UIView()
         view.backgroundColor = .blueColor()
         return view
     }()
-    
+
     let greenView: UIView = {
         let view = UIView()
         view.backgroundColor = .greenColor()
         return view
     }()
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         view.backgroundColor = UIColor.whiteColor()
-        
+
         view.addSubview(blackView)
         view.addSubview(redView)
         view.addSubview(yellowView)
         view.addSubview(blueView)
         view.addSubview(greenView)
-        
+
         view.setNeedsUpdateConstraints()
     }
 
     override func updateViewConstraints() {
-        
+
         if (!didSetupConstraints) {
-            
+
-            blackView.snp_makeConstraints(closure: { (make) -> Void in
+            blackView.snp_makeConstraints { make in
                 make.center.equalTo(view)
                 make.size.equalTo(CGSizeMake(100.0, 100.0))
-            })
+            }
-            
+
-            redView.snp_makeConstraints(closure: { (make) -> Void in
+            redView.snp_makeConstraints { make in
                 make.top.equalTo(blackView.snp_bottom).offset(20.0)
                 make.left.equalTo(20.0)
                 make.size.equalTo(CGSizeMake(100.0, 100.0))
-            })
+            }
-            
+
-            yellowView.snp_makeConstraints(closure: { (make) -> Void in
+            yellowView.snp_makeConstraints { make in
                 make.top.equalTo(blackView.snp_bottom).offset(20.0)
                 make.left.equalTo(blackView.snp_right).offset(20.0)
                 make.size.equalTo(CGSizeMake(100.0, 100.0))
-            })
+            }
-            
+
-            blueView.snp_makeConstraints(closure: { (make) -> Void in
+            blueView.snp_makeConstraints { make in
                 make.bottom.equalTo(blackView.snp_top).offset(-20.0)
                 make.left.equalTo(blackView.snp_right).offset(20.0)
                 make.size.equalTo(CGSizeMake(100.0, 100.0))
-            })
+            }
-            
+
-            greenView.snp_makeConstraints(closure: { (make) -> Void in
+            greenView.snp_makeConstraints { make in
                 make.bottom.equalTo(blackView.snp_top).offset(-20.0)
                 make.right.equalTo(blackView.snp_left).offset(-20.0)
                 make.size.equalTo(CGSizeMake(100.0, 100.0))
-            })
+            }
-            
+
             didSetupConstraints = true
         }
-        
+
         super.updateViewConstraints()
     }
 

README.md

@@ -17,7 +17,7 @@ class MyViewController: UIViewController {
         super.viewDidLoad()
 
         self.view.addSubview(box)
-        box.snp_makeConstraints { (make) -> Void in
+        box.snp_makeConstraints { make in
            make.width.height.equalTo(50)
            make.center.equalTo(self.view)
         }