Skip to content
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.

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

Disable range fixes and add custom line height between handles #39

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions Example/RangeSliderDemo/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,17 @@ - (void)viewDidLoad {
self.rangeSliderCustom.delegate = self;
self.rangeSliderCustom.minValue = 0;
self.rangeSliderCustom.maxValue = 100;
self.rangeSliderCustom.selectedMinimum = 40;
self.rangeSliderCustom.selectedMaximum = 60;

self.rangeSliderCustom.selectedMinimum = 40;
self.rangeSliderCustom.selectedMaximum = 60;

self.rangeSliderCustom.handleImage = [UIImage imageNamed:@"custom-handle"];
self.rangeSliderCustom.selectedHandleDiameterMultiplier = 1;
self.rangeSliderCustom.tintColorBetweenHandles = [UIColor redColor];
self.rangeSliderCustom.lineHeight = 10;

self.rangeSliderCustom.lineHeight = 7;
self.rangeSliderCustom.lineBetweenHandlesHeight = 10;

NSNumberFormatter *customFormatter = [[NSNumberFormatter alloc] init];
customFormatter.positiveSuffix = @"B";
self.rangeSliderCustom.numberFormatterOverride = customFormatter;
Expand Down
7 changes: 6 additions & 1 deletion Pod/Classes/TTRangeSlider.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,13 @@ IB_DESIGNABLE
@property (nonatomic, strong) UIColor *tintColorBetweenHandles;

/**
*Set the slider line height (default 1.0)
*Set the slider line height (default 1.0). Will reset @p lineBetweenHandlesHeight on assignment.
*/
@property (nonatomic, assign) CGFloat lineHeight;

/**
*Set the slider line between handles' height (default 1.0). Will be reset each time @p lineHeight is reset.
*/
@property (nonatomic, assign) CGFloat lineBetweenHandlesHeight;

@end
39 changes: 28 additions & 11 deletions Pod/Classes/TTRangeSlider.m
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ - (void)initialiseControl {
_selectedHandleDiameterMultiplier = 1.7;

_lineHeight = 1.0;
_lineBetweenHandlesHeight = 1.0;

//draw the slider line
self.sliderLine = [CALayer layer];
Expand Down Expand Up @@ -121,7 +122,8 @@ - (void)layoutSubviews {
self.sliderLine.frame = CGRectMake(lineLeftSide.x, lineLeftSide.y, lineRightSide.x-lineLeftSide.x, self.lineHeight);

self.sliderLine.cornerRadius = self.lineHeight / 2.0;

self.sliderLineBetweenHandles.cornerRadius = self.lineBetweenHandlesHeight / 2.0;

[self updateLabelValues];
[self updateHandlePositions];
[self updateLabelPositions];
Expand Down Expand Up @@ -222,14 +224,24 @@ - (void)updateLabelValues {

#pragma mark - Set Positions
- (void)updateHandlePositions {
CGPoint leftHandleCenter = CGPointMake([self getXPositionAlongLineForValue:self.selectedMinimum], CGRectGetMidY(self.sliderLine.frame));
self.leftHandle.position = leftHandleCenter;

CGPoint rightHandleCenter = CGPointMake([self getXPositionAlongLineForValue:self.selectedMaximum], CGRectGetMidY(self.sliderLine.frame));
self.rightHandle.position= rightHandleCenter;

//positioning for the dist slider line
self.sliderLineBetweenHandles.frame = CGRectMake(self.leftHandle.position.x, self.sliderLine.frame.origin.y, self.rightHandle.position.x-self.leftHandle.position.x, self.lineHeight);

CGFloat linePositionY = self.sliderLine.frame.origin.y;

linePositionY += (self.sliderLine.frame.size.height - self.lineBetweenHandlesHeight) / 2;

CGFloat handleCenterY = linePositionY + (self.lineBetweenHandlesHeight / 2);

CGPoint leftHandleCenter = CGPointMake([self getXPositionAlongLineForValue:self.selectedMinimum], handleCenterY);

CGPoint rightHandleCenter = CGPointMake([self getXPositionAlongLineForValue:self.selectedMaximum], handleCenterY);

//update the handle first to prevent strange animations

self.leftHandle.position = leftHandleCenter;

self.rightHandle.position = rightHandleCenter;

self.sliderLineBetweenHandles.frame = CGRectMake(self.leftHandle.position.x, linePositionY, self.rightHandle.position.x-self.leftHandle.position.x, self.lineBetweenHandlesHeight);
}

- (void)updateLabelPositions {
Expand Down Expand Up @@ -550,8 +562,7 @@ -(void)setHandleImage:(UIImage *)handleImage{
self.rightHandle.frame = startFrame;

//Force layer background to transparant
self.leftHandle.backgroundColor = [[UIColor clearColor] CGColor];
self.rightHandle.backgroundColor = [[UIColor clearColor] CGColor];
self.handleColor = [UIColor clearColor];
}

-(void)setHandleColor:(UIColor *)handleColor{
Expand All @@ -578,7 +589,13 @@ -(void)setTintColorBetweenHandles:(UIColor *)tintColorBetweenHandles{

-(void)setLineHeight:(CGFloat)lineHeight{
_lineHeight = lineHeight;
_lineBetweenHandlesHeight = lineHeight;
[self setNeedsLayout];
}

-(void)setLineBetweenHandlesHeight:(CGFloat)lineBetweenHandlesHeight{
_lineBetweenHandlesHeight = lineBetweenHandlesHeight;
[self setNeedsLayout];
}

@end
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,12 @@ If set it will update the color of the handles. Default is `tintColor`.
If set it will update the size of the handles. Default is `16.0`.
#### `selectedHandleDiameterMultiplier`
If set it update the scaling factor of the handle when selected. Default is `1.7`. If you don't want any scaling, set it to `1.0`.

#### `lineHeight`
Set the height of the line. It will automatically round the corners. If not specified, the default value will be `1.0`.
Set the height of the line. It will automatically round the corners. Will update `lineBetweenHandlesHeight` each time its set with a new value. If not specified, the default value will be `1.0`.

#### `lineBetweenHandlesHeight`
Set the height of the line. It will automatically round the corners. Will be reset to `lineHeight` each time `lineHeight` is updated. If not specified, the default value will be `1.0`.

## Author

Expand Down