From b61982d0f987aeb93f41129c231d04f08edb6c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= <3lvis@users.noreply.github.com> Date: Thu, 12 May 2016 10:50:57 +0200 Subject: [PATCH 1/4] Remove unneeded closure ornamentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14be1f0..2b02d3b 100644 --- a/README.md +++ b/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) } From d44776eaf835655584a8494c375b30079c85b70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= <3lvis@users.noreply.github.com> Date: Thu, 12 May 2016 10:51:41 +0200 Subject: [PATCH 2/4] Remove unnecessary UIApplicationDelegate delegates --- Example-iOS/AppDelegate.swift | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Example-iOS/AppDelegate.swift b/Example-iOS/AppDelegate.swift index fa17ea3..d4053cc 100644 --- a/Example-iOS/AppDelegate.swift +++ b/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:. - } - - } From c0d8a7d3e8c37f06a9f088e191078b1eae6d7881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= <3lvis@users.noreply.github.com> Date: Thu, 12 May 2016 10:52:16 +0200 Subject: [PATCH 3/4] Remove unneeded closure ornamentation --- Example-iOS/demos/BasicUIScrollViewController.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Example-iOS/demos/BasicUIScrollViewController.swift b/Example-iOS/demos/BasicUIScrollViewController.swift index 09fa0ae..d9f559f 100644 --- a/Example-iOS/demos/BasicUIScrollViewController.swift +++ b/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) From 6f5b8c4e55f0b582958f507798d6e0a9b87c452d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= <3lvis@users.noreply.github.com> Date: Thu, 12 May 2016 10:55:55 +0200 Subject: [PATCH 4/4] Remove unneeded closure ornamentation --- .../demos/SimpleLayoutViewController.swift | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Example-iOS/demos/SimpleLayoutViewController.swift b/Example-iOS/demos/SimpleLayoutViewController.swift index 414d0d6..cb0d348 100644 --- a/Example-iOS/demos/SimpleLayoutViewController.swift +++ b/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() }