Adding the ability to pass in an image for the circle slider view. #4
Conversation
Also adding the ability to specify which direction the slider will transition from.
Current coverage is 72.80% (diff: 48.00%)@@ master #4 diff @@
==========================================
Files 4 4
Lines 94 125 +31
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 82 91 +9
- Misses 12 34 +22
Partials 0 0
|
| var borderWidth: CGFloat | ||
| var borderColor: CGColor | ||
|
|
||
| public init(borderWidth width: CGFloat, borderColor color: CGColor) { |
| self.firstView = firstView | ||
| self.secondView = secondView | ||
| sliderCircle = SlidableImage.setupSliderCircle() | ||
| self.sliderCircle = SlidableImage.setupSliderCircle(sliderImage: sliderImage) | ||
| self.slideDirection = slideDirection ?? .right |
There was a problem hiding this comment.
instead of this it would be clearer if you move it to init declaration slideDirection: SlideDirection? = .right
There was a problem hiding this comment.
If I move it to the init declaration then you can not call the init without a slideDirection param. Since this is an optional pram, it made more since to do the defaulting in the optional coalescing.
| @@ -42,11 +63,11 @@ open class SlidableImage: UIView { | |||
| /// - frame: Frame size | |||
| /// - firstImage: First image for sliding | |||
| /// - secondImage: Second image for sliding | |||
| convenience public init(frame: CGRect, firstImage: UIImage, secondImage: UIImage) { | |||
| convenience public init(frame: CGRect, firstImage: UIImage, secondImage: UIImage, sliderImage: UIImage? = nil, slideDirection: SlideDirection? = nil) { | |||
| let mask = CAShapeLayer() | ||
| switch slideDirection { | ||
| case .left: | ||
| maskRectPath = UIBezierPath(rect: CGRect(x: maskLocation, |
There was a problem hiding this comment.
Just CGRect declaration should be in case, it would be clearer what is really switching
There was a problem hiding this comment.
I am unsure what you mean here. Can you elaborate?
| mask.path = maskRectPath.cgPath | ||
| secondView.layer.mask = mask | ||
|
|
||
| sliderCircle.center.x = maskLocation | ||
| if slideDirection == .left || slideDirection == .right { |
There was a problem hiding this comment.
this should be
switch slideDirection {
case .left, .right:
sliderCircle.center.x = maskLocation
case .top, .bottom:
sliderCircle.center.y = maskLocation
}| } | ||
|
|
||
| /// Private wrapper for setup view | ||
| fileprivate func initializeViews() { | ||
| clipsToBounds = true | ||
| sliderCircle.center = center | ||
| updateMask(location: center.x) | ||
|
|
||
| if slideDirection == .left || slideDirection == .right { |
| } | ||
|
|
||
| /// Private wrapper for setup circle slider view | ||
| /// | ||
| /// - Returns: Slider circle | ||
| private class func setupSliderCircle() -> UIView { | ||
| private class func setupSliderCircle(sliderImage: UIImage? = nil) -> UIView { |
There was a problem hiding this comment.
if you change method declaration you should update comments
| @@ -8,6 +8,23 @@ | |||
|
|
|||
| import UIKit | |||
|
|
|||
| public enum SlideDirection: Int { | |||
| case bottom | ||
| } | ||
|
|
||
| public struct SlidableImageBorder { |
| @@ -88,24 +135,28 @@ open class SlidableImage: UIView { | |||
| @objc private func gestureHandler(_ panGestureRecognizer: UIPanGestureRecognizer) { | |||
| let location = panGestureRecognizer.location(in: firstView) | |||
|
|
|||
| guard (bounds.minX...bounds.maxX ~= location.x) else { | |||
| return | |||
| if slideDirection == .left || slideDirection == .right { | |||
|
Also, sorry for delay, something went wrong with slack notifications |
|
Ive added the requested changes that I understood. No worries on the delay, we've all been there :). |
|
I resolved conflicts, thanks for contribution 👍 |
Also adding the ability to specify which direction the slider will transition from.