Skip to content

Commit 396d4f5

Browse files
RishabhTayalRishabhTayal
committed
swift 3.0 convert
1 parent 16af531 commit 396d4f5

29 files changed

+306
-290
lines changed

‎Spring/AsyncButton.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public class AsyncButton: UIButton {
3434
placeholderImage[state.rawValue] = placeholder
3535

3636
if let urlString = url?.absoluteString {
37-
ImageLoader.sharedLoader.imageForUrl(urlString) { [weak self] image, url in
37+
ImageLoader.sharedLoader.imageForUrl(urlString: urlString) { [weak self] image, url in
3838

3939
if let strongSelf = self {
40-
dispatch_async(dispatch_get_main_queue(), { () -> Void in
40+
DispatchQueue.main().asynchronously(execute: { () -> Void in
4141
if strongSelf.imageURL[state.rawValue]?.absoluteString == url {
42-
strongSelf.setImage(image, forState: state)
42+
strongSelf.setImage(image, for: state)
4343
}
4444
})
4545
}

‎Spring/AsyncImageView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public class AsyncImageView: UIImageView {
3030
didSet {
3131
self.image = placeholderImage
3232
if let urlString = url?.absoluteString {
33-
ImageLoader.sharedLoader.imageForUrl(urlString) { [weak self] image, url in
33+
ImageLoader.sharedLoader.imageForUrl(urlString: urlString) { [weak self] image, url in
3434
if let strongSelf = self {
35-
dispatch_async(dispatch_get_main_queue(), { () -> Void in
35+
DispatchQueue.main().asynchronously(execute: { () -> Void in
3636
if strongSelf.url?.absoluteString == url {
3737
strongSelf.image = image ?? strongSelf.placeholderImage
3838
}

‎Spring/AutoTextView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010

1111
public class AutoTextView: UITextView {
1212
override public func intrinsicContentSize() -> CGSize {
13-
var size = self.sizeThatFits(CGSizeMake(self.frame.size.width, CGFloat.max))
13+
var size = self.sizeThatFits(CGSize(width: self.frame.size.width, height: CGFloat.greatestFiniteMagnitude))
1414
size.width = self.frame.size.width
1515
if text.length == 0 {
1616
size.height = 0
@@ -21,4 +21,4 @@ public class AutoTextView: UITextView {
2121

2222
return size
2323
}
24-
}
24+
}

‎Spring/BlurView.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import UIKit
2424

2525
public func insertBlurView (view: UIView, style: UIBlurEffectStyle) -> UIVisualEffectView {
26-
view.backgroundColor = UIColor.clearColor()
26+
view.backgroundColor = UIColor.clear()
2727

2828
let blurEffect = UIBlurEffect(style: style)
2929
let blurEffectView = UIVisualEffectView(effect: blurEffect)
3030
blurEffectView.frame = view.bounds
31-
view.insertSubview(blurEffectView, atIndex: 0)
31+
view.insertSubview(blurEffectView, at: 0)
3232
return blurEffectView
33-
}
33+
}

‎Spring/DesignableButton.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import UIKit
2424

2525
@IBDesignable public class DesignableButton: SpringButton {
2626

27-
@IBInspectable public var borderColor: UIColor = UIColor.clearColor() {
27+
@IBInspectable public var borderColor: UIColor = UIColor.clear() {
2828
didSet {
29-
layer.borderColor = borderColor.CGColor
29+
layer.borderColor = borderColor.cgColor
3030
}
3131
}
3232

@@ -42,9 +42,9 @@ import UIKit
4242
}
4343
}
4444

45-
@IBInspectable public var shadowColor: UIColor = UIColor.clearColor() {
45+
@IBInspectable public var shadowColor: UIColor = UIColor.clear() {
4646
didSet {
47-
layer.shadowColor = shadowColor.CGColor
47+
layer.shadowColor = shadowColor.cgColor
4848
}
4949
}
5050

‎Spring/DesignableImageView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import UIKit
2424

2525
@IBDesignable public class DesignableImageView: SpringImageView {
2626

27-
@IBInspectable public var borderColor: UIColor = UIColor.clearColor() {
27+
@IBInspectable public var borderColor: UIColor = UIColor.clear() {
2828
didSet {
29-
layer.borderColor = borderColor.CGColor
29+
layer.borderColor = borderColor.cgColor
3030
}
3131
}
3232

‎Spring/DesignableTabBarController.swift

+19-19
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@ import UIKit
2424

2525
@IBDesignable class DesignableTabBarController: UITabBarController {
2626

27-
@IBInspectable var normalTint: UIColor = UIColor.clearColor() {
27+
@IBInspectable var normalTint: UIColor = UIColor.clear() {
2828
didSet {
2929
UITabBar.appearance().tintColor = normalTint
30-
UITabBarItem.appearance().setTitleTextAttributes([NSForegroundColorAttributeName: normalTint], forState: UIControlState.Normal)
30+
UITabBarItem.appearance().setTitleTextAttributes([NSForegroundColorAttributeName: normalTint], for: UIControlState.normal)
3131
}
3232
}
3333

34-
@IBInspectable var selectedTint: UIColor = UIColor.clearColor() {
34+
@IBInspectable var selectedTint: UIColor = UIColor.clear() {
3535
didSet {
3636
UITabBar.appearance().tintColor = selectedTint
37-
UITabBarItem.appearance().setTitleTextAttributes([NSForegroundColorAttributeName: selectedTint], forState:UIControlState.Selected)
37+
UITabBarItem.appearance().setTitleTextAttributes([NSForegroundColorAttributeName: selectedTint], for:UIControlState.selected)
3838
}
3939
}
4040

4141
@IBInspectable var fontName: String = "" {
4242
didSet {
43-
UITabBarItem.appearance().setTitleTextAttributes([NSForegroundColorAttributeName: normalTint, NSFontAttributeName: UIFont(name: fontName, size: 11)!], forState: UIControlState.Normal)
43+
UITabBarItem.appearance().setTitleTextAttributes([NSForegroundColorAttributeName: normalTint, NSFontAttributeName: UIFont(name: fontName, size: 11)!], for: UIControlState.normal)
4444
}
4545
}
4646

4747
@IBInspectable var firstSelectedImage: UIImage? {
4848
didSet {
4949
if let image = firstSelectedImage {
5050
var tabBarItems = self.tabBar.items as [UITabBarItem]!
51-
tabBarItems[0].selectedImage = image.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
51+
tabBarItems?[0].selectedImage = image.withRenderingMode(UIImageRenderingMode.alwaysTemplate)
5252
}
5353
}
5454
}
@@ -57,7 +57,7 @@ import UIKit
5757
didSet {
5858
if let image = secondSelectedImage {
5959
var tabBarItems = self.tabBar.items as [UITabBarItem]!
60-
tabBarItems[1].selectedImage = image.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
60+
tabBarItems?[1].selectedImage = image.withRenderingMode(UIImageRenderingMode.alwaysTemplate)
6161
}
6262
}
6363
}
@@ -66,7 +66,7 @@ import UIKit
6666
didSet {
6767
if let image = thirdSelectedImage {
6868
var tabBarItems = self.tabBar.items as [UITabBarItem]!
69-
tabBarItems[2].selectedImage = image.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
69+
tabBarItems?[2].selectedImage = image.withRenderingMode(UIImageRenderingMode.alwaysTemplate)
7070
}
7171
}
7272
}
@@ -75,7 +75,7 @@ import UIKit
7575
didSet {
7676
if let image = fourthSelectedImage {
7777
var tabBarItems = self.tabBar.items as [UITabBarItem]!
78-
tabBarItems[3].selectedImage = image.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
78+
tabBarItems?[3].selectedImage = image.withRenderingMode(UIImageRenderingMode.alwaysTemplate)
7979
}
8080
}
8181
}
@@ -84,7 +84,7 @@ import UIKit
8484
didSet {
8585
if let image = fifthSelectedImage {
8686
var tabBarItems = self.tabBar.items as [UITabBarItem]!
87-
tabBarItems[4].selectedImage = image.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
87+
tabBarItems?[4].selectedImage = image.withRenderingMode(UIImageRenderingMode.alwaysTemplate)
8888
}
8989
}
9090
}
@@ -94,7 +94,7 @@ import UIKit
9494

9595
for item in self.tabBar.items as [UITabBarItem]! {
9696
if let image = item.image {
97-
item.image = image.imageWithColor(self.normalTint).imageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
97+
item.image = image.imageWithColor(tintColor: self.normalTint).withRenderingMode(UIImageRenderingMode.alwaysOriginal)
9898
}
9999
}
100100
}
@@ -105,18 +105,18 @@ extension UIImage {
105105
UIGraphicsBeginImageContextWithOptions(self.size, false, self.scale)
106106

107107
let context = UIGraphicsGetCurrentContext()
108-
CGContextTranslateCTM(context, 0, self.size.height)
109-
CGContextScaleCTM(context, 1.0, -1.0);
110-
CGContextSetBlendMode(context, CGBlendMode.Normal)
108+
context!.translate(x: 0, y: self.size.height)
109+
context!.scale(x: 1.0, y: -1.0);
110+
context!.setBlendMode(CGBlendMode.normal)
111111

112-
let rect = CGRectMake(0, 0, self.size.width, self.size.height) as CGRect
113-
CGContextClipToMask(context, rect, self.CGImage)
112+
let rect = CGRect(0, 0, self.size.width, self.size.height)
113+
CGContextClipToMask(context!, rect, self.cgImage!)
114114
tintColor.setFill()
115-
CGContextFillRect(context, rect)
115+
CGContextFillRect(context!, rect)
116116

117-
let newImage = UIGraphicsGetImageFromCurrentImageContext() as UIImage
117+
let newImage = UIGraphicsGetImageFromCurrentImageContext()! as UIImage
118118
UIGraphicsEndImageContext()
119119

120120
return newImage
121121
}
122-
}
122+
}

‎Spring/DesignableTextField.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import UIKit
2424

2525
@IBDesignable public class DesignableTextField: SpringTextField {
2626

27-
@IBInspectable public var placeholderColor: UIColor = UIColor.clearColor() {
27+
@IBInspectable public var placeholderColor: UIColor = UIColor.clear() {
2828
didSet {
29-
attributedPlaceholder = NSAttributedString(string: placeholder!, attributes: [NSForegroundColorAttributeName: placeholderColor])
29+
attributedPlaceholder = AttributedString(string: placeholder!, attributes: [NSForegroundColorAttributeName: placeholderColor])
3030
layoutSubviews()
3131

3232
}
@@ -36,10 +36,10 @@ import UIKit
3636
didSet {
3737
let padding = UIView(frame: CGRectMake(0, 0, sidePadding, sidePadding))
3838

39-
leftViewMode = UITextFieldViewMode.Always
39+
leftViewMode = UITextFieldViewMode.always
4040
leftView = padding
4141

42-
rightViewMode = UITextFieldViewMode.Always
42+
rightViewMode = UITextFieldViewMode.always
4343
rightView = padding
4444
}
4545
}
@@ -48,7 +48,7 @@ import UIKit
4848
didSet {
4949
let padding = UIView(frame: CGRectMake(0, 0, leftPadding, 0))
5050

51-
leftViewMode = UITextFieldViewMode.Always
51+
leftViewMode = UITextFieldViewMode.always
5252
leftView = padding
5353
}
5454
}
@@ -57,14 +57,14 @@ import UIKit
5757
didSet {
5858
let padding = UIView(frame: CGRectMake(0, 0, rightPadding, 0))
5959

60-
rightViewMode = UITextFieldViewMode.Always
60+
rightViewMode = UITextFieldViewMode.always
6161
rightView = padding
6262
}
6363
}
6464

65-
@IBInspectable public var borderColor: UIColor = UIColor.clearColor() {
65+
@IBInspectable public var borderColor: UIColor = UIColor.clear() {
6666
didSet {
67-
layer.borderColor = borderColor.CGColor
67+
layer.borderColor = borderColor.cgColor
6868
}
6969
}
7070

‎Spring/DesignableTextView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import UIKit
2424

2525
@IBDesignable public class DesignableTextView: SpringTextView {
2626

27-
@IBInspectable public var borderColor: UIColor = UIColor.clearColor() {
27+
@IBInspectable public var borderColor: UIColor = UIColor.clear() {
2828
didSet {
29-
layer.borderColor = borderColor.CGColor
29+
layer.borderColor = borderColor.cgColor
3030
}
3131
}
3232

‎Spring/DesignableView.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import UIKit
2424

2525
@IBDesignable public class DesignableView: SpringView {
2626

27-
@IBInspectable public var borderColor: UIColor = UIColor.clearColor() {
27+
@IBInspectable public var borderColor: UIColor = UIColor.clear() {
2828
didSet {
29-
layer.borderColor = borderColor.CGColor
29+
layer.borderColor = borderColor.cgColor
3030
}
3131
}
3232

@@ -42,9 +42,9 @@ import UIKit
4242
}
4343
}
4444

45-
@IBInspectable public var shadowColor: UIColor = UIColor.clearColor() {
45+
@IBInspectable public var shadowColor: UIColor = UIColor.clear() {
4646
didSet {
47-
layer.shadowColor = shadowColor.CGColor
47+
layer.shadowColor = shadowColor.cgColor
4848
}
4949
}
5050

@@ -65,4 +65,4 @@ import UIKit
6565
layer.shadowOffset.height = shadowOffsetY
6666
}
6767
}
68-
}
68+
}

‎Spring/ImageLoader.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import Foundation
2626

2727
public class ImageLoader {
2828

29-
var cache = NSCache()
29+
var cache = Cache()
3030

3131
public class var sharedLoader : ImageLoader {
3232
struct Static {
@@ -36,18 +36,18 @@ public class ImageLoader {
3636
}
3737

3838
public func imageForUrl(urlString: String, completionHandler:(image: UIImage?, url: String) -> ()) {
39-
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), {()in
39+
DispatchQueue.global(Int(UInt64(DispatchQueue.GlobalAttributes.qosBackground.rawValue)), 0).asynchronously(execute: {()in
4040
let data: NSData? = self.cache.objectForKey(urlString) as? NSData
4141

4242
if let goodData = data {
43-
let image = UIImage(data: goodData)
44-
dispatch_async(dispatch_get_main_queue(), {() in
43+
let image = UIImage(data: goodData as Data)
44+
DispatchQueue.main().asynchronously(execute: {() in
4545
completionHandler(image: image, url: urlString)
4646
})
4747
return
4848
}
4949

50-
let downloadTask: NSURLSessionDataTask = NSURLSession.sharedSession().dataTaskWithURL(NSURL(string: urlString)!, completionHandler: { (data, response, error) -> Void in
50+
let downloadTask: URLSessionDataTask = URLSession.sharedSession().dataTaskWithURL(NSURL(string: urlString)! as URL, completionHandler: { (data, response, error) -> Void in
5151
if (error != nil) {
5252
completionHandler(image: nil, url: urlString)
5353
return
@@ -67,4 +67,4 @@ public class ImageLoader {
6767
})
6868

6969
}
70-
}
70+
}

0 commit comments

Comments
 (0)