Skip to content

Converted to Swift 3. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsldh merged 1 commit into from
Sep 24, 2016
Merged

Converted to Swift 3. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Example/.DS_Store
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions Loader.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
TargetAttributes = {
BE3156731C149D0F00BA4E59 = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -258,6 +259,7 @@
PRODUCT_BUNDLE_IDENTIFIER = Ekhoo.Loader;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -271,6 +273,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = Ekhoo.Loader;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
Binary file added Source/.DS_Store
View file
Open in desktop
Binary file not shown.
32 changes: 16 additions & 16 deletions Source/Loader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class Loader: UIView {

private var switchView: UIView?
private var switchAnimationSide: Bool = false
private var animationTimer: NSTimer?
private var animationTimer: Timer?

var loaderColor: UIColor {
didSet {
Expand All @@ -30,17 +30,17 @@ public class Loader: UIView {
}

override init(frame: CGRect) {
self.loaderColor = UIColor.whiteColor()
self.switchColor = UIColor(red: 175.0 / 255.0, green: 85.0 / 255.0, blue: 255.0 / 255.0, alpha: 1.0)
self.loaderColor = UIColor.white
self.switchColor = UIColor(red: 255.0 / 255.0, green: 195.0 / 255.0, blue: 117.0 / 255.0, alpha: 1.0)

super.init(frame: frame)

self.switchView = UIView(frame: CGRectMake(kInset, kInset, frame.size.height - 2 * kInset, frame.size.height - 2 * kInset))
self.switchView = UIView(frame: CGRect(x: kInset, y: kInset, width: frame.size.height - 2 * kInset, height: frame.size.height - 2 * kInset))
self.switchView!.backgroundColor = self.switchColor
self.switchView!.layer.cornerRadius = round(self.switchView!.frame.size.width / 2)
self.switchView!.layer.masksToBounds = true

self.backgroundColor = UIColor.clearColor()
self.backgroundColor = UIColor.clear

self.addSubview(self.switchView!)
}
Expand All @@ -54,24 +54,24 @@ public class Loader: UIView {
return;
}

UIView.animateWithDuration(0.3, delay: 0.0, options: UIViewAnimationOptions.AllowAnimatedContent, animations: { () -> Void in
UIView.animate(withDuration: 0.3, delay: 0.0, options: UIViewAnimationOptions.allowAnimatedContent, animations: { () -> Void in
let frame: CGRect = self.bounds

if self.switchView!.frame.origin.x > kInset {
self.switchView!.frame = CGRectMake(kInset, self.switchView!.frame.origin.y, frame.width - 2 * kInset, self.switchView!.frame.height)
self.switchView!.frame = CGRect(x: kInset, y: self.switchView!.frame.origin.y, width: frame.width - 2 * kInset, height: self.switchView!.frame.height)
} else {
self.switchView!.frame = CGRectMake(self.switchView!.frame.origin.x, self.switchView!.frame.origin.y, frame.width - 2 * kInset, self.switchView!.frame.height)
self.switchView!.frame = CGRect(x: self.switchView!.frame.origin.x, y: self.switchView!.frame.origin.y, width: frame.width - 2 * kInset, height: self.switchView!.frame.height)
}

self.switchView!.setNeedsDisplay()
}) { (finished) -> Void in
UIView.animateWithDuration(0.30, animations: { () -> Void in
UIView.animate(withDuration: 0.30, animations: { () -> Void in
let frame: CGRect = self.bounds

if self.switchAnimationSide {
self.switchView!.frame = CGRectMake(kInset, self.switchView!.frame.origin.y, self.switchView!.frame.size.height, self.switchView!.frame.height)
self.switchView!.frame = CGRect(x: kInset, y: self.switchView!.frame.origin.y, width: self.switchView!.frame.size.height, height: self.switchView!.frame.height)
} else {
self.switchView!.frame = CGRectMake(frame.size.width - self.switchView!.frame.height - kInset, self.switchView!.frame.origin.y, self.switchView!.frame.size.height, self.switchView!.frame.height)
self.switchView!.frame = CGRect(x: frame.size.width - self.switchView!.frame.height - kInset, y: self.switchView!.frame.origin.y, width: self.switchView!.frame.size.height, height: self.switchView!.frame.height)
}

self.switchAnimationSide = !self.switchAnimationSide
Expand All @@ -82,15 +82,15 @@ public class Loader: UIView {
}

@objc private func animateLoader() {
UIView.animateWithDuration(0.4) { () -> Void in
self.transform = CGAffineTransformRotate(self.transform, CGFloat(M_PI_2));
UIView.animate(withDuration: 0.4) { () -> Void in
self.transform = self.transform.rotated(by: CGFloat(M_PI_2));
}

animateSwitch()
}

public func startAnimating() {
self.animationTimer = NSTimer.scheduledTimerWithTimeInterval(0.4, target: self, selector: "animateLoader", userInfo: nil, repeats: true)
self.animationTimer = Timer.scheduledTimer(timeInterval: 0.4, target: self, selector: "animateLoader", userInfo: nil, repeats: true)
}

public func stopAnimating() {
Expand All @@ -101,8 +101,8 @@ public class Loader: UIView {
}
}

override public func drawRect(rect: CGRect) {
let rectanglePath = UIBezierPath(roundedRect: CGRectMake(0.0, 0.0, rect.size.width, rect.size.height), cornerRadius: round(rect.size.width / 2.0))
override public func draw(_ rect: CGRect) {
let rectanglePath = UIBezierPath(roundedRect: CGRect(x: 0.0, y: 0.0, width: rect.size.width, height: rect.size.height), cornerRadius: round(rect.size.width / 2.0))
self.loaderColor.setFill()
rectanglePath.fill()
}
Expand Down
6 changes: 3 additions & 3 deletions Source/Switch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ class Switch: UIView {
override init(frame: CGRect) {
super.init(frame: frame)

self.backgroundColor = UIColor.clearColor()
self.backgroundColor = UIColor.clear
}

required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

override func drawRect(rect: CGRect) {
let rectanglePath = UIBezierPath(roundedRect: CGRectMake(0.0, 0.0, rect.size.width, rect.size.height), cornerRadius: rect.size.width / 2.0)
override func draw(_ rect: CGRect) {
let rectanglePath = UIBezierPath(roundedRect: CGRect(x: 0.0, y: 0.0, width: rect.size.width, height: rect.size.height), cornerRadius: rect.size.width / 2.0)
self.switchColor.setFill()
rectanglePath.fill()
}
Expand Down