-
Notifications
You must be signed in to change notification settings - Fork 615
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* CircleView -> AuxiliaryView with multiple shapes * Circle geometry on DayView * Types globalisation * Refactoring
- Loading branch information
1 parent
413c044
commit 36712c6
Showing
22 changed files
with
638 additions
and
412 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| // | ||
| // CVAuxiliaryView.swift | ||
| // CVCalendar Demo | ||
| // | ||
| // Created by Eugene Mozharovsky on 22/03/15. | ||
| // Copyright (c) 2015 GameApp. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class CVAuxiliaryView: UIView { | ||
| var shape: CVShape! | ||
| var strokeColor: UIColor! { | ||
| didSet { | ||
| setNeedsDisplay() | ||
| } | ||
| } | ||
|
|
||
| var fillColor: UIColor! { | ||
| didSet { | ||
| setNeedsDisplay() | ||
| } | ||
| } | ||
|
|
||
| let defaultFillColor = UIColor.colorFromCode(0xe74c3c) | ||
|
|
||
| private var radius: CGFloat { | ||
| get { | ||
| return (min(frame.height, frame.width) - 10) / 2 | ||
| } | ||
| } | ||
|
|
||
| init(frame: CGRect, shape: CVShape) { | ||
| super.init(frame: frame) | ||
| self.shape = shape | ||
|
|
||
| strokeColor = UIColor.clearColor() | ||
| fillColor = UIColor.colorFromCode(0xe74c3c) | ||
|
|
||
| layer.cornerRadius = 5 | ||
| backgroundColor = .clearColor() | ||
| } | ||
|
|
||
| override func didMoveToSuperview() { | ||
| setNeedsDisplay() | ||
| } | ||
|
|
||
| required init(coder aDecoder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| override func drawRect(rect: CGRect) { | ||
| let context = UIGraphicsGetCurrentContext() | ||
| var path: UIBezierPath! | ||
|
|
||
| if let shape = shape { | ||
| switch shape { | ||
| case .RightFlag: path = rightFlagPath() | ||
| case .LeftFlag: path = leftFlagPath() | ||
| case .Circle: path = circlePath() | ||
| case .Rect: path = rectPath() | ||
| } | ||
| } | ||
|
|
||
| strokeColor.setStroke() | ||
| fillColor.setFill() | ||
|
|
||
| if let path = path { | ||
| path.lineWidth = 1 | ||
| path.stroke() | ||
| path.fill() | ||
| } | ||
| } | ||
|
|
||
| deinit { | ||
| println("Deinited") | ||
| } | ||
| } | ||
|
|
||
| extension CVAuxiliaryView { | ||
| func circlePath() -> UIBezierPath { | ||
| let arcCenter = CGPointMake(frame.width / 2, frame.height / 2) | ||
| let startAngle = CGFloat(0) | ||
| let endAngle = CGFloat(M_PI * 2.0) | ||
| let clockwise = true | ||
|
|
||
| let path = UIBezierPath(arcCenter: arcCenter, radius: radius, startAngle: startAngle, endAngle: endAngle, clockwise: clockwise) | ||
|
|
||
| return path | ||
|
|
||
| } | ||
|
|
||
| func rightFlagPath() -> UIBezierPath { | ||
| let appearance = Appearance.sharedCalendarViewAppearance | ||
| let offset = appearance.spaceBetweenDayViews! | ||
|
|
||
| let flag = UIBezierPath() | ||
| flag.moveToPoint(CGPointMake(bounds.width / 2, bounds.height / 2 - radius)) | ||
| flag.addLineToPoint(CGPointMake(bounds.width, bounds.height / 2 - radius)) | ||
| flag.addLineToPoint(CGPointMake(bounds.width, bounds.height / 2 + radius )) | ||
| flag.addLineToPoint(CGPointMake(bounds.width / 2, bounds.height / 2 + radius)) | ||
|
|
||
| var path = CGPathCreateMutable() | ||
| CGPathAddPath(path, nil, circlePath().CGPath) | ||
| CGPathAddPath(path, nil, flag.CGPath) | ||
|
|
||
| return UIBezierPath(CGPath: path) | ||
| } | ||
|
|
||
| func leftFlagPath() -> UIBezierPath { | ||
| let flag = UIBezierPath() | ||
| flag.moveToPoint(CGPointMake(bounds.width / 2, bounds.height / 2 + radius)) | ||
| flag.addLineToPoint(CGPointMake(0, bounds.height / 2 + radius)) | ||
| flag.addLineToPoint(CGPointMake(0, bounds.height / 2 - radius)) | ||
| flag.addLineToPoint(CGPointMake(bounds.width / 2, bounds.height / 2 - radius)) | ||
|
|
||
| var path = CGPathCreateMutable() | ||
| CGPathAddPath(path, nil, circlePath().CGPath) | ||
| CGPathAddPath(path, nil, flag.CGPath) | ||
|
|
||
| return UIBezierPath(CGPath: path) | ||
| } | ||
|
|
||
| func rectPath() -> UIBezierPath { | ||
| let midX = bounds.width / 2 | ||
| let midY = bounds.height / 2 | ||
|
|
||
| let appearance = Appearance.sharedCalendarViewAppearance | ||
| let offset = appearance.spaceBetweenDayViews! | ||
|
|
||
| println("offset = \(offset)") | ||
|
|
||
| let path = UIBezierPath(rect: CGRectMake(0 - offset, midY - radius, bounds.width + offset / 2, radius * 2)) | ||
|
|
||
| return path | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.