From 126715a664979057d51bea978718cc019c3d69a2 Mon Sep 17 00:00:00 2001
From: Kauserali Hafizji <ali.hafizji@gmail.com>
Date: Mon, 30 Jul 2012 09:53:14 +0530
Subject: [PATCH] - Code cleanup - Support for ARC only for the range slider

---
 RangeSlider/RangeSlider.h        | 31 ++++++-----------------------
 RangeSlider/RangeSlider.m        | 34 +++++++++++++++++++++++---------
 RangeSlider/RootViewController.m | 22 ++++++++++-----------
 3 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/RangeSlider/RangeSlider.h b/RangeSlider/RangeSlider.h
index 83a8d71..8918e43 100644
--- a/RangeSlider/RangeSlider.h
+++ b/RangeSlider/RangeSlider.h
@@ -8,29 +8,10 @@
 
 #import <UIKit/UIKit.h>
 
-@interface RangeSlider : UIControl{
-    float minimumValue;
-    float maximumValue;
-    float minimumRange;
-    float selectedMinimumValue;
-    float selectedMaximumValue;
-    float distanceFromCenter;
-
-    float _padding;
-    
-    BOOL _maxThumbOn;
-    BOOL _minThumbOn;
-    
-    UIImageView * _minThumb;
-    UIImageView * _maxThumb;
-    UIImageView * _track;
-    UIImageView * _trackBackground;
-}
-
-@property(nonatomic) float minimumValue;
-@property(nonatomic) float maximumValue;
-@property(nonatomic) float minimumRange;
-@property(nonatomic) float selectedMinimumValue;
-@property(nonatomic) float selectedMaximumValue;
-
+@interface RangeSlider : UIControl
+@property(nonatomic, readwrite) float minimumValue;
+@property(nonatomic, readwrite) float maximumValue;
+@property(nonatomic, readwrite) float minimumRange;
+@property(nonatomic, readwrite) float selectedMinimumValue;
+@property(nonatomic, readwrite) float selectedMaximumValue;
 @end
diff --git a/RangeSlider/RangeSlider.m b/RangeSlider/RangeSlider.m
index 1cd5444..a435932 100644
--- a/RangeSlider/RangeSlider.m
+++ b/RangeSlider/RangeSlider.m
@@ -8,10 +8,27 @@
 
 #import "RangeSlider.h"
 
-@interface RangeSlider (PrivateMethods)
--(float)xForValue:(float)value;
--(float)valueForX:(float)x;
--(void)updateTrackHighlight;
+@interface RangeSlider () {
+    float minimumValue;
+    float maximumValue;
+    float minimumRange;
+    float selectedMinimumValue;
+    float selectedMaximumValue;
+    float distanceFromCenter;
+    
+    float _padding;
+    
+    BOOL _maxThumbOn;
+    BOOL _minThumbOn;
+    
+    UIImageView * _minThumb;
+    UIImageView * _maxThumb;
+    UIImageView * _track;
+    UIImageView * _trackBackground;
+}
+- (float) xForValue:(float)value;
+- (float) valueForX:(float)x;
+- (void) updateTrackHighlight;
 @end
 
 @implementation RangeSlider
@@ -26,20 +43,20 @@ - (id)initWithFrame:(CGRect)frame
         _maxThumbOn = false;
         _padding = 20;
         
-        _trackBackground = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bar-background.png"]] autorelease];
+        _trackBackground = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bar-background.png"]];
         _trackBackground.center = self.center;
         [self addSubview:_trackBackground];
         
-        _track = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bar-highlight.png"]] autorelease];
+        _track = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bar-highlight.png"]];
         _track.center = self.center;
         [self addSubview:_track];
         
-        _minThumb = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"handle.png"] highlightedImage:[UIImage imageNamed:@"handle-hover.png"]] autorelease];
+        _minThumb = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"handle.png"] highlightedImage:[UIImage imageNamed:@"handle-hover.png"]];
         _minThumb.frame = CGRectMake(0,0, self.frame.size.height,self.frame.size.height);
         _minThumb.contentMode = UIViewContentModeCenter;
         [self addSubview:_minThumb];
         
-        _maxThumb = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"handle.png"] highlightedImage:[UIImage imageNamed:@"handle-hover.png"]] autorelease];
+        _maxThumb = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"handle.png"] highlightedImage:[UIImage imageNamed:@"handle-hover.png"]];
         _maxThumb.frame = CGRectMake(0,0, self.frame.size.height,self.frame.size.height);
         _maxThumb.contentMode = UIViewContentModeCenter;
         [self addSubview:_maxThumb];
@@ -48,7 +65,6 @@ - (id)initWithFrame:(CGRect)frame
     return self;
 }
 
-
 -(void)layoutSubviews
 {
     // Set the initial state
diff --git a/RangeSlider/RootViewController.m b/RangeSlider/RootViewController.m
index ba918bb..fe1e6ee 100644
--- a/RangeSlider/RootViewController.m
+++ b/RangeSlider/RootViewController.m
@@ -67,17 +67,17 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     }
 
 
-        // Configure the cell.
-        RangeSlider *slider=  [[RangeSlider alloc] initWithFrame:cell.bounds];
-        slider.minimumValue = 1;
-        slider.selectedMinimumValue = 2;
-        slider.maximumValue = 10;
-        slider.selectedMaximumValue = 8;
-        slider.minimumRange = 2;
-        [slider addTarget:self action:@selector(updateRangeLabel:) forControlEvents:UIControlEventValueChanged];
-
-        
-        [cell addSubview:slider];
+    // Configure the cell.
+    RangeSlider *slider=  [[RangeSlider alloc] initWithFrame:cell.bounds];
+    slider.minimumValue = 1;
+    slider.selectedMinimumValue = 2;
+    slider.maximumValue = 10;
+    slider.selectedMaximumValue = 8;
+    slider.minimumRange = 2;
+    [slider addTarget:self action:@selector(updateRangeLabel:) forControlEvents:UIControlEventValueChanged];
+
+    
+    [cell addSubview:slider];
     
     return cell;
 }