Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Zedenem/UICircularSlider
base: master
...
head fork: coryalder/ZMCircularSlider
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 20 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 14, 2012
@coryalder coryalder Moved thumb color into the drawThumbAtPoint: method
This is in preparation for adding the capability of an image thumb
9b99f9e
@coryalder coryalder Can now set a UIImage for the thumb 0bc68ba
@coryalder coryalder Added slider thumb images to the test project. ba71acd
@coryalder coryalder Refactored UICircularSlider into ZMCircularSlider. Best to avoid the …
…UI prefix, as that "namespace" pretty much "belongs" to Apple.
46df29d
Commits on Apr 16, 2012
@coryalder coryalder Huge refactor. Changed project files and targets of everything to ZMC…
…ircularSlider (removed UI prefix)
91993d0
@coryalder coryalder Missed AppledocSettings.plist during rename. 0f249d2
@coryalder coryalder Removed UIGestureRecognizer code.
Implemented touch by overriding UIControl's methods
edec3b7
@coryalder coryalder Added note about current state of the `continuous` property 0e5c8bd
@coryalder coryalder Fixed example code: UIProgressView's initial value
It was being set to NaN, due to uninitialized max/min values in ZMCircularSlider.
Adding an updateProgress: call after initialization fixes this.
7619d70
@coryalder coryalder Added ignoreTouchesExceptOnThumb. Mimics UISlider.
Enforces grabbing the thumb to change the value.
82f11b9
Commits on Apr 24, 2012
@coryalder coryalder Set background to clear (default was white) 816b336
@coryalder coryalder Added titleLabel property for titled sliders f078dc5
Commits on Jul 21, 2012
@coryalder coryalder Merged with Zedenem's re-licensed version (MIT) 02d0153
Commits on Nov 22, 2012
@coryalder coryalder Added podspec, tagging 0.0.1 9e032b6
@coryalder coryalder Updated podspec 8880f37
Showing with 249 additions and 185 deletions.
  1. +1 −1  AppledocSettings.plist
  2. +15 −0 ZMCircularSlider.podspec
  3. +37 −17 UICircularSlider/UICircularSlider.h → ZMCircularSlider/ZMCircularSlider.h
  4. +68 −42 UICircularSlider/UICircularSlider.m → ZMCircularSlider/ZMCircularSlider.m
  5. +0 −22 test_project/UICircularSlider/UICircularSliderAppDelegate.h
  6. +55 −51 test_project/{UICircularSlider.xcodeproj → ZMCircularSlider.xcodeproj}/project.pbxproj
  7. 0  ...{UICircularSlider.xcodeproj → ZMCircularSlider.xcodeproj}/project.xcworkspace/contents.xcworkspacedata
  8. +12 −12 ...eproj → ZMCircularSlider.xcodeproj}/xcuserdata/zouhair.xcuserdatad/xcschemes/UICircularSlider.xcscheme
  9. +1 −1  ...deproj → ZMCircularSlider.xcodeproj}/xcuserdata/zouhair.xcuserdatad/xcschemes/xcschememanagement.plist
  10. 0  ..._project/{UICircularSlider/UICircularSlider-Info.plist → ZMCircularSlider/ZMCircularSlider-Info.plist}
  11. +1 −1  ..._project/{UICircularSlider/UICircularSlider-Prefix.pch → ZMCircularSlider/ZMCircularSlider-Prefix.pch}
  12. +22 −0 test_project/ZMCircularSlider/ZMCircularSliderAppDelegate.h
  13. +7 −7 ...ject/{UICircularSlider/UICircularSliderAppDelegate.m → ZMCircularSlider/ZMCircularSliderAppDelegate.m}
  14. +4 −4 ...UICircularSlider/UICircularSliderViewController.h → ZMCircularSlider/ZMCircularSliderViewController.h}
  15. +12 −8 ...UICircularSlider/UICircularSliderViewController.m → ZMCircularSlider/ZMCircularSliderViewController.m}
  16. +11 −16 ...rcularSlider/UICircularSliderViewController.xib → ZMCircularSlider/ZMCircularSliderViewController.xib}
  17. 0  test_project/{UICircularSlider → ZMCircularSlider}/circularSliderThumbImage.png
  18. BIN  test_project/ZMCircularSlider/dmc_slider_thumb.png
  19. BIN  test_project/ZMCircularSlider/dmc_slider_thumb@2x.png
  20. +3 −3 test_project/{UICircularSlider → ZMCircularSlider}/main.m
View
2  AppledocSettings.plist
@@ -7,7 +7,7 @@
<string>Frameworks</string>
</array>
<key>--project-name</key>
- <string>UICircularSlider</string>
+ <string>ZMCircularSlider</string>
<key>--project-company</key>
<string>Zedenem</string>
<key>--company-id</key>
View
15 ZMCircularSlider.podspec
@@ -0,0 +1,15 @@
+Pod::Spec.new do |s|
+ s.name = "ZMCircularSlider"
+ s.version = "0.0.1"
+ s.summary = "Circular and Pie Sliders."
+ s.platform = :ios, '5.0'
+ s.source = { :git => "https://github.com/coryalder/ZMCircularSlider.git", :tag => "0.0.1" }
+ s.description = <<-DESC
+ ZMCircularSlider (forked from UICircularSlider by Zedenem). A circular or Pie slider control for iOS
+ DESC
+ s.homepage = "https://github.com/coryalder/ZMCircularSlider.git"
+ s.license = 'MIT'
+ s.author = { "Cory Alder" => "cory@davander.com" }
+ s.source_files = 'ZMCircularSlider/ZMCircularSlider.{h,m}'
+ s.requires_arc = true
+end
View
54 UICircularSlider/UICircularSlider.h → ZMCircularSlider/ZMCircularSlider.h
@@ -1,12 +1,12 @@
//
-/// UICircularSlider.h
-/// UICircularSlider
+/// ZMCircularSlider.h
+/// ZMCircularSlider
//
// Created by Zouhair Mahieddine on 02/03/12.
// Copyright (c) 2012 Zouhair Mahieddine.
// http://www.zedenem.com
//
-// This file is part of the UICircularSlider Library, released under the MIT License.
+// This file is part of the ZMCircularSlider Library, released under the MIT License.
//
#import <UIKit/UIKit.h>
@@ -18,11 +18,11 @@
* You can set and retrieve the current style of progress view through the progressViewStyle property.
*/
typedef enum {
- UICircularSliderStyleCircle,
- UICircularSliderStylePie,
-} UICircularSliderStyle;
+ ZMCircularSliderStyleCircle,
+ ZMCircularSliderStylePie,
+} ZMCircularSliderStyle;
-@interface UICircularSlider : UIControl
+@interface ZMCircularSlider : UIControl
/**
* The current value of the receiver.
@@ -30,7 +30,7 @@ typedef enum {
* Setting this property causes the receiver to redraw itself using the new value.
* If you try to set a value that is below the minimum or above the maximum value, the minimum or maximum value is set instead. The default value of this property is 0.0.
*/
-@property (nonatomic) float value;
+@property (nonatomic, readwrite) float value;
/**
* The minimum value of the receiver.
@@ -38,7 +38,7 @@ typedef enum {
* If you change the value of this property, and the current value of the receiver is below the new minimum, the current value is adjusted to match the new minimum value automatically.
* The default value of this property is 0.0.
*/
-@property (nonatomic) float minimumValue;
+@property (nonatomic, readwrite) float minimumValue;
/**
* The maximum value of the receiver.
@@ -46,22 +46,27 @@ typedef enum {
* If you change the value of this property, and the current value of the receiver is above the new maximum, the current value is adjusted to match the new maximum value automatically.
* The default value of this property is 1.0.
*/
-@property (nonatomic) float maximumValue;
+@property (nonatomic, readwrite) float maximumValue;
/**
* The color shown for the portion of the slider that is filled.
*/
-@property(nonatomic, retain) UIColor *minimumTrackTintColor;
+@property(nonatomic, strong) UIColor *minimumTrackTintColor;
/**
* The color shown for the portion of the slider that is not filled.
*/
-@property(nonatomic, retain) UIColor *maximumTrackTintColor;
+@property(nonatomic, strong) UIColor *maximumTrackTintColor;
/**
* The color used to tint the standard thumb.
*/
-@property(nonatomic, retain) UIColor *thumbTintColor;
+@property(nonatomic, strong) UIColor *thumbTintColor;
+
+/**
+ * The image used for the circular slider's thumb. Takes precendence over thumbTintColor
+ */
+@property(nonatomic, strong) UIImage *thumbImage;
/**
* Contains a Boolean value indicating whether changes in the sliders value generate continuous update events.
@@ -70,7 +75,7 @@ typedef enum {
* If NO, the slider only sends an action event when the user releases the slider’s thumb control to set the final value.
* The default value of this property is YES.
*
- * @warning Not implemented Yet.
+ * @warning Not implemented Yet. Currently always continuous.
*/
@property(nonatomic, getter=isContinuous) BOOL continuous;
@@ -78,10 +83,25 @@ typedef enum {
* The current graphical style of the receiver.
*
* The value of this property is a constant that specifies the style of the slider.
- The default style is UICircularSliderStyleCircle.
- * For more on these constants, see UICircularSliderStyle.
+ The default style is ZMCircularSliderStyleCircle.
+ * For more on these constants, see ZMCircularSliderStyle.
+ */
+@property (nonatomic) ZMCircularSliderStyle sliderStyle;
+
+
+/**
+ * Should touches outside of the thumb be responded to?
+ *
+ * The value of this property is a boolean that specifies the response to touches outside of the thumb. The default is NO.
+ */
+@property (readwrite) BOOL ignoreTouchesExceptOnThumb;
+
+/**
+ * Title UILabel to display with the circular slder.
+ *
+ * If the value of this property's `text` property is nil, no title will be displayed.
*/
-@property (nonatomic) UICircularSliderStyle sliderStyle;
+@property (nonatomic, strong) IBOutlet UILabel *titleLabel;
@end
View
110 UICircularSlider/UICircularSlider.m → ZMCircularSlider/ZMCircularSlider.m
@@ -1,17 +1,17 @@
//
-// UICircularSlider.m
-// UICircularSlider
+// ZMCircularSlider.m
+// ZMCircularSlider
//
// Created by Zouhair Mahieddine on 02/03/12.
// Copyright (c) 2012 Zouhair Mahieddine.
// http://www.zedenem.com
//
-// This file is part of the UICircularSlider Library, released under the MIT License.
+// This file is part of the ZMCircularSlider Library, released under the MIT License.
//
-#import "UICircularSlider.h"
+#import "ZMCircularSlider.h"
-@interface UICircularSlider()
+@interface ZMCircularSlider()
@property (nonatomic) CGPoint thumbCenterPoint;
@@ -30,7 +30,7 @@ - (CGPoint)drawPieTrack:(float)track atPoint:(CGPoint)point withRadius:(CGFloat)
@end
#pragma mark -
-@implementation UICircularSlider
+@implementation ZMCircularSlider
@synthesize value = _value;
- (void)setValue:(float)value {
@@ -83,10 +83,22 @@ - (void)setThumbTintColor:(UIColor *)thumbTintColor {
}
}
+@synthesize thumbImage = _thumbImage;
+- (void)setThumbImage:(UIImage *)thumbImage {
+ if (![thumbImage isEqual:_thumbImage]) {
+ _thumbImage = thumbImage;
+ [self setNeedsDisplay];
+ }
+}
+
@synthesize continuous = _continuous;
+@synthesize ignoreTouchesExceptOnThumb = _ignoreTouchesExceptOnThumb;
+
+@synthesize titleLabel = _titleLabel;
+
@synthesize sliderStyle = _sliderStyle;
-- (void)setSliderStyle:(UICircularSliderStyle)sliderStyle {
+- (void)setSliderStyle:(ZMCircularSliderStyle)sliderStyle {
if (sliderStyle != _sliderStyle) {
_sliderStyle = sliderStyle;
[self setNeedsDisplay];
@@ -112,18 +124,25 @@ - (void)setup {
self.value = 0.0;
self.minimumValue = 0.0;
self.maximumValue = 1.0;
+ self.backgroundColor = [UIColor clearColor];
self.minimumTrackTintColor = [UIColor blueColor];
self.maximumTrackTintColor = [UIColor whiteColor];
self.thumbTintColor = [UIColor darkGrayColor];
self.continuous = YES;
self.thumbCenterPoint = CGPointZero;
-
- UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureHappened:)];
- [self addGestureRecognizer:tapGestureRecognizer];
-
- UIPanGestureRecognizer *panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panGestureHappened:)];
- panGestureRecognizer.maximumNumberOfTouches = panGestureRecognizer.minimumNumberOfTouches;
- [self addGestureRecognizer:panGestureRecognizer];
+
+ self.titleLabel = [[UILabel alloc] init];
+ self.titleLabel.frame = (CGRect){
+ .origin.x = 0,
+ .origin.y = self.bounds.size.height - 51,
+ .size.width = self.bounds.size.width,
+ .size.height = 31
+ };
+ self.titleLabel.textAlignment = UITextAlignmentCenter;
+ self.titleLabel.backgroundColor = [UIColor clearColor];
+ self.titleLabel.font = [UIFont boldSystemFontOfSize:17.0f];
+
+ [self addSubview:self.titleLabel];
}
/** @name Drawing methods */
@@ -131,18 +150,29 @@ - (void)setup {
#define kLineWidth 5.0
#define kThumbRadius 12.0
- (CGFloat)sliderRadius {
- CGFloat radius = MIN(self.bounds.size.width/2, self.bounds.size.height/2);
+ CGFloat radius = MIN(self.bounds.size.width/2, (self.bounds.size.height/2) - (self.titleLabel.text ? 31 : 0)); // - 31 for title UILabel, -20 for padding
radius -= MAX(kLineWidth, kThumbRadius);
return radius;
}
+
- (void)drawThumbAtPoint:(CGPoint)sliderButtonCenterPoint inContext:(CGContextRef)context {
- UIGraphicsPushContext(context);
- CGContextBeginPath(context);
-
- CGContextMoveToPoint(context, sliderButtonCenterPoint.x, sliderButtonCenterPoint.y);
- CGContextAddArc(context, sliderButtonCenterPoint.x, sliderButtonCenterPoint.y, kThumbRadius, 0.0, 2*M_PI, NO);
-
- CGContextFillPath(context);
+ UIGraphicsPushContext(context);
+
+ if (self.thumbImage) {
+
+ [self.thumbImage drawAtPoint:(CGPoint){.x = sliderButtonCenterPoint.x - (self.thumbImage.size.width/2), .y = sliderButtonCenterPoint.y - (self.thumbImage.size.height/2)}];
+
+ } else {
+ [self.thumbTintColor setFill];
+
+ CGContextBeginPath(context);
+
+ CGContextMoveToPoint(context, sliderButtonCenterPoint.x, sliderButtonCenterPoint.y);
+ CGContextAddArc(context, sliderButtonCenterPoint.x, sliderButtonCenterPoint.y, kThumbRadius, 0.0, 2*M_PI, NO);
+
+ CGContextFillPath(context);
+ }
+
UIGraphicsPopContext();
}
@@ -188,13 +218,13 @@ - (void)drawRect:(CGRect)rect {
CGPoint middlePoint;
middlePoint.x = self.bounds.origin.x + self.bounds.size.width/2;
- middlePoint.y = self.bounds.origin.y + self.bounds.size.height/2;
+ middlePoint.y = self.bounds.origin.y + self.bounds.size.height/2 - (self.titleLabel.text ? 31 : 0); // - for title UILabel
CGContextSetLineWidth(context, kLineWidth);
CGFloat radius = [self sliderRadius];
switch (self.sliderStyle) {
- case UICircularSliderStylePie:
+ case ZMCircularSliderStylePie:
[self.maximumTrackTintColor setFill];
[self drawPieTrack:self.maximumValue atPoint:middlePoint withRadius:radius inContext:context];
[self.minimumTrackTintColor setStroke];
@@ -202,7 +232,7 @@ - (void)drawRect:(CGRect)rect {
[self.minimumTrackTintColor setFill];
self.thumbCenterPoint = [self drawPieTrack:self.value atPoint:middlePoint withRadius:radius inContext:context];
break;
- case UICircularSliderStyleCircle:
+ case ZMCircularSliderStyleCircle:
default:
[self.maximumTrackTintColor setStroke];
[self drawCircularTrack:self.maximumValue atPoint:middlePoint withRadius:radius inContext:context];
@@ -210,8 +240,7 @@ - (void)drawRect:(CGRect)rect {
self.thumbCenterPoint = [self drawCircularTrack:self.value atPoint:middlePoint withRadius:radius inContext:context];
break;
}
-
- [self.thumbTintColor setFill];
+
[self drawThumbAtPoint:self.thumbCenterPoint inContext:context];
}
@@ -222,12 +251,17 @@ - (BOOL)isPointInThumb:(CGPoint)point {
return CGRectContainsPoint(thumbTouchRect, point);
}
-/** @name UIGestureRecognizer management methods */
-#pragma mark - UIGestureRecognizer management methods
-- (void)panGestureHappened:(UIPanGestureRecognizer *)panGestureRecognizer {
- CGPoint tapLocation = [panGestureRecognizer locationInView:self];
- switch (panGestureRecognizer.state) {
- case UIGestureRecognizerStateChanged: {
+/** @name Touch management methods */
+#pragma mark - Touch management methods
+
+-(BOOL)beginTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event {
+ return (self.ignoreTouchesExceptOnThumb ? [self isPointInThumb:[touch locationInView:self]] : YES);
+}
+
+- (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event {
+ CGPoint tapLocation = [touch locationInView:self];
+ switch (touch.phase) {
+ case UITouchPhaseMoved: {
CGFloat radius = [self sliderRadius];
CGPoint sliderCenter = CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2);
CGPoint sliderStartPoint = CGPointMake(sliderCenter.x, sliderCenter.y - radius);
@@ -246,15 +280,7 @@ - (void)panGestureHappened:(UIPanGestureRecognizer *)panGestureRecognizer {
default:
break;
}
-}
-- (void)tapGestureHappened:(UITapGestureRecognizer *)tapGestureRecognizer {
- if (tapGestureRecognizer.state == UIGestureRecognizerStateEnded) {
- CGPoint tapLocation = [tapGestureRecognizer locationInView:self];
- if ([self isPointInThumb:tapLocation]) {
- }
- else {
- }
- }
+ return [super beginTrackingWithTouch:touch withEvent:event];
}
@end
View
22 test_project/UICircularSlider/UICircularSliderAppDelegate.h
@@ -1,22 +0,0 @@
-//
-// UICircularSliderAppDelegate.h
-// UICircularSlider
-//
-// Created by Zouhair Mahieddine on 02/03/12.
-// Copyright (c) 2012 Zouhair Mahieddine.
-// http://www.zedenem.com
-//
-// This file is part of the UICircularSlider Library, released under the MIT License.
-//
-
-#import <UIKit/UIKit.h>
-
-@class UICircularSliderViewController;
-
-@interface UICircularSliderAppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@property (strong, nonatomic) UICircularSliderViewController *viewController;
-
-@end
View
106 ...ICircularSlider.xcodeproj/project.pbxproj → ...MCircularSlider.xcodeproj/project.pbxproj
@@ -8,34 +8,36 @@
/* Begin PBXBuildFile section */
5F7A1DA4150E3C4E00284473 /* circularSliderThumbImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 5F7A1DA3150E3C4E00284473 /* circularSliderThumbImage.png */; };
- 5F7A1DA9150E449D00284473 /* AppledocSettings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5F7A1DA8150E449D00284473 /* AppledocSettings.plist */; };
5FF75D1D1500E8B200CFC305 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FF75D1C1500E8B200CFC305 /* UIKit.framework */; };
5FF75D1F1500E8B200CFC305 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FF75D1E1500E8B200CFC305 /* Foundation.framework */; };
5FF75D211500E8B200CFC305 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FF75D201500E8B200CFC305 /* CoreGraphics.framework */; };
5FF75D291500E8B200CFC305 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D281500E8B200CFC305 /* main.m */; };
- 5FF75D2D1500E8B200CFC305 /* UICircularSliderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D2C1500E8B200CFC305 /* UICircularSliderAppDelegate.m */; };
- 5FF75D301500E8B200CFC305 /* UICircularSliderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D2F1500E8B200CFC305 /* UICircularSliderViewController.m */; };
- 5FF75D421500E8F100CFC305 /* UICircularSliderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5FF75D411500E8F100CFC305 /* UICircularSliderViewController.xib */; };
- 5FF75D4B1500E94300CFC305 /* UICircularSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D4A1500E94300CFC305 /* UICircularSlider.m */; };
+ 5FF75D2D1500E8B200CFC305 /* ZMCircularSliderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D2C1500E8B200CFC305 /* ZMCircularSliderAppDelegate.m */; };
+ 5FF75D301500E8B200CFC305 /* ZMCircularSliderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D2F1500E8B200CFC305 /* ZMCircularSliderViewController.m */; };
+ 5FF75D421500E8F100CFC305 /* ZMCircularSliderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5FF75D411500E8F100CFC305 /* ZMCircularSliderViewController.xib */; };
+ 5FF75D4B1500E94300CFC305 /* ZMCircularSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FF75D4A1500E94300CFC305 /* ZMCircularSlider.m */; };
+ 8BB2C21E1539215A00309CC9 /* dmc_slider_thumb.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BB2C21C1539215A00309CC9 /* dmc_slider_thumb.png */; };
+ 8BB2C21F1539215A00309CC9 /* dmc_slider_thumb@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BB2C21D1539215A00309CC9 /* dmc_slider_thumb@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
5F7A1DA3150E3C4E00284473 /* circularSliderThumbImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = circularSliderThumbImage.png; sourceTree = "<group>"; };
- 5F7A1DA8150E449D00284473 /* AppledocSettings.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppledocSettings.plist; path = ../AppledocSettings.plist; sourceTree = "<group>"; };
- 5FF75D181500E8B200CFC305 /* UICircularSlider.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UICircularSlider.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 5FF75D181500E8B200CFC305 /* ZMCircularSlider.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ZMCircularSlider.app; sourceTree = BUILT_PRODUCTS_DIR; };
5FF75D1C1500E8B200CFC305 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
5FF75D1E1500E8B200CFC305 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
5FF75D201500E8B200CFC305 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
- 5FF75D241500E8B200CFC305 /* UICircularSlider-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UICircularSlider-Info.plist"; sourceTree = "<group>"; };
+ 5FF75D241500E8B200CFC305 /* ZMCircularSlider-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ZMCircularSlider-Info.plist"; sourceTree = "<group>"; };
5FF75D281500E8B200CFC305 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 5FF75D2A1500E8B200CFC305 /* UICircularSlider-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UICircularSlider-Prefix.pch"; sourceTree = "<group>"; };
- 5FF75D2B1500E8B200CFC305 /* UICircularSliderAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UICircularSliderAppDelegate.h; sourceTree = "<group>"; };
- 5FF75D2C1500E8B200CFC305 /* UICircularSliderAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UICircularSliderAppDelegate.m; sourceTree = "<group>"; };
- 5FF75D2E1500E8B200CFC305 /* UICircularSliderViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UICircularSliderViewController.h; sourceTree = "<group>"; };
- 5FF75D2F1500E8B200CFC305 /* UICircularSliderViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UICircularSliderViewController.m; sourceTree = "<group>"; };
- 5FF75D411500E8F100CFC305 /* UICircularSliderViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UICircularSliderViewController.xib; sourceTree = "<group>"; };
- 5FF75D491500E94300CFC305 /* UICircularSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICircularSlider.h; sourceTree = "<group>"; };
- 5FF75D4A1500E94300CFC305 /* UICircularSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICircularSlider.m; sourceTree = "<group>"; };
+ 5FF75D2A1500E8B200CFC305 /* ZMCircularSlider-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ZMCircularSlider-Prefix.pch"; sourceTree = "<group>"; };
+ 5FF75D2B1500E8B200CFC305 /* ZMCircularSliderAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMCircularSliderAppDelegate.h; sourceTree = "<group>"; };
+ 5FF75D2C1500E8B200CFC305 /* ZMCircularSliderAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZMCircularSliderAppDelegate.m; sourceTree = "<group>"; };
+ 5FF75D2E1500E8B200CFC305 /* ZMCircularSliderViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMCircularSliderViewController.h; sourceTree = "<group>"; };
+ 5FF75D2F1500E8B200CFC305 /* ZMCircularSliderViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZMCircularSliderViewController.m; sourceTree = "<group>"; };
+ 5FF75D411500E8F100CFC305 /* ZMCircularSliderViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ZMCircularSliderViewController.xib; sourceTree = "<group>"; };
+ 5FF75D491500E94300CFC305 /* ZMCircularSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMCircularSlider.h; sourceTree = "<group>"; };
+ 5FF75D4A1500E94300CFC305 /* ZMCircularSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZMCircularSlider.m; sourceTree = "<group>"; };
+ 8BB2C21C1539215A00309CC9 /* dmc_slider_thumb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dmc_slider_thumb.png; sourceTree = "<group>"; };
+ 8BB2C21D1539215A00309CC9 /* dmc_slider_thumb@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dmc_slider_thumb@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -55,8 +57,7 @@
5FF75D0D1500E8B200CFC305 = {
isa = PBXGroup;
children = (
- 5F7A1DA8150E449D00284473 /* AppledocSettings.plist */,
- 5FF75D471500E92800CFC305 /* UICircularSlider */,
+ 5FF75D471500E92800CFC305 /* ZMCircularSlider */,
5FF75D221500E8B200CFC305 /* test_project */,
5FF75D1B1500E8B200CFC305 /* Frameworks */,
5FF75D191500E8B200CFC305 /* Products */,
@@ -66,7 +67,7 @@
5FF75D191500E8B200CFC305 /* Products */ = {
isa = PBXGroup;
children = (
- 5FF75D181500E8B200CFC305 /* UICircularSlider.app */,
+ 5FF75D181500E8B200CFC305 /* ZMCircularSlider.app */,
);
name = Products;
sourceTree = "<group>";
@@ -85,43 +86,45 @@
isa = PBXGroup;
children = (
5F7A1DA3150E3C4E00284473 /* circularSliderThumbImage.png */,
- 5FF75D2B1500E8B200CFC305 /* UICircularSliderAppDelegate.h */,
- 5FF75D2C1500E8B200CFC305 /* UICircularSliderAppDelegate.m */,
- 5FF75D2E1500E8B200CFC305 /* UICircularSliderViewController.h */,
- 5FF75D2F1500E8B200CFC305 /* UICircularSliderViewController.m */,
- 5FF75D411500E8F100CFC305 /* UICircularSliderViewController.xib */,
+ 5FF75D2B1500E8B200CFC305 /* ZMCircularSliderAppDelegate.h */,
+ 5FF75D2C1500E8B200CFC305 /* ZMCircularSliderAppDelegate.m */,
+ 5FF75D2E1500E8B200CFC305 /* ZMCircularSliderViewController.h */,
+ 5FF75D2F1500E8B200CFC305 /* ZMCircularSliderViewController.m */,
+ 5FF75D411500E8F100CFC305 /* ZMCircularSliderViewController.xib */,
5FF75D231500E8B200CFC305 /* Supporting Files */,
);
name = test_project;
- path = UICircularSlider;
+ path = ZMCircularSlider;
sourceTree = "<group>";
};
5FF75D231500E8B200CFC305 /* Supporting Files */ = {
isa = PBXGroup;
children = (
- 5FF75D241500E8B200CFC305 /* UICircularSlider-Info.plist */,
+ 8BB2C21C1539215A00309CC9 /* dmc_slider_thumb.png */,
+ 8BB2C21D1539215A00309CC9 /* dmc_slider_thumb@2x.png */,
+ 5FF75D241500E8B200CFC305 /* ZMCircularSlider-Info.plist */,
5FF75D281500E8B200CFC305 /* main.m */,
- 5FF75D2A1500E8B200CFC305 /* UICircularSlider-Prefix.pch */,
+ 5FF75D2A1500E8B200CFC305 /* ZMCircularSlider-Prefix.pch */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
- 5FF75D471500E92800CFC305 /* UICircularSlider */ = {
+ 5FF75D471500E92800CFC305 /* ZMCircularSlider */ = {
isa = PBXGroup;
children = (
- 5FF75D491500E94300CFC305 /* UICircularSlider.h */,
- 5FF75D4A1500E94300CFC305 /* UICircularSlider.m */,
+ 5FF75D491500E94300CFC305 /* ZMCircularSlider.h */,
+ 5FF75D4A1500E94300CFC305 /* ZMCircularSlider.m */,
);
- name = UICircularSlider;
- path = ../UICircularSlider;
+ name = ZMCircularSlider;
+ path = ../ZMCircularSlider;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 5FF75D171500E8B200CFC305 /* UICircularSlider */ = {
+ 5FF75D171500E8B200CFC305 /* ZMCircularSlider */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 5FF75D361500E8B200CFC305 /* Build configuration list for PBXNativeTarget "UICircularSlider" */;
+ buildConfigurationList = 5FF75D361500E8B200CFC305 /* Build configuration list for PBXNativeTarget "ZMCircularSlider" */;
buildPhases = (
5FF75D141500E8B200CFC305 /* Sources */,
5FF75D151500E8B200CFC305 /* Frameworks */,
@@ -131,9 +134,9 @@
);
dependencies = (
);
- name = UICircularSlider;
- productName = UICircularSlider;
- productReference = 5FF75D181500E8B200CFC305 /* UICircularSlider.app */;
+ name = ZMCircularSlider;
+ productName = ZMCircularSlider;
+ productReference = 5FF75D181500E8B200CFC305 /* ZMCircularSlider.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -142,11 +145,11 @@
5FF75D0F1500E8B200CFC305 /* Project object */ = {
isa = PBXProject;
attributes = {
- CLASSPREFIX = UICircularSlider;
+ CLASSPREFIX = ZMCircularSlider;
LastUpgradeCheck = 0430;
ORGANIZATIONNAME = "Zouhair Mahieddine";
};
- buildConfigurationList = 5FF75D121500E8B200CFC305 /* Build configuration list for PBXProject "UICircularSlider" */;
+ buildConfigurationList = 5FF75D121500E8B200CFC305 /* Build configuration list for PBXProject "ZMCircularSlider" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@@ -158,7 +161,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
- 5FF75D171500E8B200CFC305 /* UICircularSlider */,
+ 5FF75D171500E8B200CFC305 /* ZMCircularSlider */,
);
};
/* End PBXProject section */
@@ -168,9 +171,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 5FF75D421500E8F100CFC305 /* UICircularSliderViewController.xib in Resources */,
+ 5FF75D421500E8F100CFC305 /* ZMCircularSliderViewController.xib in Resources */,
5F7A1DA4150E3C4E00284473 /* circularSliderThumbImage.png in Resources */,
- 5F7A1DA9150E449D00284473 /* AppledocSettings.plist in Resources */,
+ 8BB2C21E1539215A00309CC9 /* dmc_slider_thumb.png in Resources */,
+ 8BB2C21F1539215A00309CC9 /* dmc_slider_thumb@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -182,9 +186,9 @@
buildActionMask = 2147483647;
files = (
5FF75D291500E8B200CFC305 /* main.m in Sources */,
- 5FF75D2D1500E8B200CFC305 /* UICircularSliderAppDelegate.m in Sources */,
- 5FF75D301500E8B200CFC305 /* UICircularSliderViewController.m in Sources */,
- 5FF75D4B1500E94300CFC305 /* UICircularSlider.m in Sources */,
+ 5FF75D2D1500E8B200CFC305 /* ZMCircularSliderAppDelegate.m in Sources */,
+ 5FF75D301500E8B200CFC305 /* ZMCircularSliderViewController.m in Sources */,
+ 5FF75D4B1500E94300CFC305 /* ZMCircularSlider.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -240,8 +244,8 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "UICircularSlider/UICircularSlider-Prefix.pch";
- INFOPLIST_FILE = "UICircularSlider/UICircularSlider-Info.plist";
+ GCC_PREFIX_HEADER = "ZMCircularSlider/ZMCircularSlider-Prefix.pch";
+ INFOPLIST_FILE = "ZMCircularSlider/ZMCircularSlider-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -251,8 +255,8 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "UICircularSlider/UICircularSlider-Prefix.pch";
- INFOPLIST_FILE = "UICircularSlider/UICircularSlider-Info.plist";
+ GCC_PREFIX_HEADER = "ZMCircularSlider/ZMCircularSlider-Prefix.pch";
+ INFOPLIST_FILE = "ZMCircularSlider/ZMCircularSlider-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -261,7 +265,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 5FF75D121500E8B200CFC305 /* Build configuration list for PBXProject "UICircularSlider" */ = {
+ 5FF75D121500E8B200CFC305 /* Build configuration list for PBXProject "ZMCircularSlider" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5FF75D341500E8B200CFC305 /* Debug */,
@@ -270,7 +274,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 5FF75D361500E8B200CFC305 /* Build configuration list for PBXNativeTarget "UICircularSlider" */ = {
+ 5FF75D361500E8B200CFC305 /* Build configuration list for PBXNativeTarget "ZMCircularSlider" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5FF75D371500E8B200CFC305 /* Debug */,
View
0  ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
File renamed without changes
View
24 ...datad/xcschemes/UICircularSlider.xcscheme → ...datad/xcschemes/UICircularSlider.xcscheme
@@ -14,9 +14,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FF75D171500E8B200CFC305"
- BuildableName = "UICircularSlider.app"
- BlueprintName = "UICircularSlider"
- ReferencedContainer = "container:UICircularSlider.xcodeproj">
+ BuildableName = "ZMCircularSlider.app"
+ BlueprintName = "ZMCircularSlider"
+ ReferencedContainer = "container:ZMCircularSlider.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@@ -32,9 +32,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FF75D171500E8B200CFC305"
- BuildableName = "UICircularSlider.app"
- BlueprintName = "UICircularSlider"
- ReferencedContainer = "container:UICircularSlider.xcodeproj">
+ BuildableName = "ZMCircularSlider.app"
+ BlueprintName = "ZMCircularSlider"
+ ReferencedContainer = "container:ZMCircularSlider.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
@@ -51,9 +51,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FF75D171500E8B200CFC305"
- BuildableName = "UICircularSlider.app"
- BlueprintName = "UICircularSlider"
- ReferencedContainer = "container:UICircularSlider.xcodeproj">
+ BuildableName = "ZMCircularSlider.app"
+ BlueprintName = "ZMCircularSlider"
+ ReferencedContainer = "container:ZMCircularSlider.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
@@ -69,9 +69,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FF75D171500E8B200CFC305"
- BuildableName = "UICircularSlider.app"
- BlueprintName = "UICircularSlider"
- ReferencedContainer = "container:UICircularSlider.xcodeproj">
+ BuildableName = "ZMCircularSlider.app"
+ BlueprintName = "ZMCircularSlider"
+ ReferencedContainer = "container:ZMCircularSlider.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
View
2  ...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
@@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
- <key>UICircularSlider.xcscheme</key>
+ <key>ZMCircularSlider.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
View
0  ...ircularSlider/UICircularSlider-Info.plist → ...ircularSlider/ZMCircularSlider-Info.plist
File renamed without changes
View
2  ...ircularSlider/UICircularSlider-Prefix.pch → ...ircularSlider/ZMCircularSlider-Prefix.pch
@@ -1,5 +1,5 @@
//
-// Prefix header for all source files of the 'UICircularSlider' target in the 'UICircularSlider' project
+// Prefix header for all source files of the 'ZMCircularSlider' target in the 'ZMCircularSlider' project
//
#import <Availability.h>
View
22 test_project/ZMCircularSlider/ZMCircularSliderAppDelegate.h
@@ -0,0 +1,22 @@
+//
+// ZMCircularSliderAppDelegate.h
+// ZMCircularSlider
+//
+// Created by Zouhair Mahieddine on 02/03/12.
+// Copyright (c) 2012 Zouhair Mahieddine.
+// http://www.zedenem.com
+//
+// This file is part of the ZMCircularSlider Library, released under the MIT License.
+//
+
+#import <UIKit/UIKit.h>
+
+@class ZMCircularSliderViewController;
+
+@interface ZMCircularSliderAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@property (strong, nonatomic) ZMCircularSliderViewController *viewController;
+
+@end
View
14 ...cularSlider/UICircularSliderAppDelegate.m → ...cularSlider/ZMCircularSliderAppDelegate.m
@@ -1,19 +1,19 @@
//
-// UICircularSliderAppDelegate.m
-// UICircularSlider
+// ZMCircularSliderAppDelegate.m
+// ZMCircularSlider
//
// Created by Zouhair Mahieddine on 02/03/12.
// Copyright (c) 2012 Zouhair Mahieddine.
// http://www.zedenem.com
//
-// This file is part of the UICircularSlider Library, released under the MIT License.
+// This file is part of the ZMCircularSlider Library, released under the MIT License.
//
-#import "UICircularSliderAppDelegate.h"
+#import "ZMCircularSliderAppDelegate.h"
-#import "UICircularSliderViewController.h"
+#import "ZMCircularSliderViewController.h"
-@implementation UICircularSliderAppDelegate
+@implementation ZMCircularSliderAppDelegate
@synthesize window = _window;
@synthesize viewController = _viewController;
@@ -22,7 +22,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
{
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
// Override point for customization after application launch.
- self.viewController = [[UICircularSliderViewController alloc] initWithNibName:@"UICircularSliderViewController" bundle:nil];
+ self.viewController = [[ZMCircularSliderViewController alloc] initWithNibName:@"ZMCircularSliderViewController" bundle:nil];
self.window.rootViewController = self.viewController;
[self.window makeKeyAndVisible];
return YES;
View
8 ...arSlider/UICircularSliderViewController.h → ...arSlider/ZMCircularSliderViewController.h
@@ -1,16 +1,16 @@
//
-// UICircularSliderViewController.h
-// UICircularSlider
+// ZMCircularSliderViewController.h
+// ZMCircularSlider
//
// Created by Zouhair Mahieddine on 02/03/12.
// Copyright (c) 2012 Zouhair Mahieddine.
// http://www.zedenem.com
//
-// This file is part of the UICircularSlider Library, released under the MIT License.
+// This file is part of the ZMCircularSlider Library, released under the MIT License.
//
#import <UIKit/UIKit.h>
-@interface UICircularSliderViewController : UIViewController
+@interface ZMCircularSliderViewController : UIViewController
@end
View
20 ...arSlider/UICircularSliderViewController.m → ...arSlider/ZMCircularSliderViewController.m
@@ -1,26 +1,26 @@
//
-// UICircularSliderViewController.m
-// UICircularSlider
+// ZMCircularSliderViewController.m
+// ZMCircularSlider
//
// Created by Zouhair Mahieddine on 02/03/12.
// Copyright (c) 2012 Zouhair Mahieddine.
// http://www.zedenem.com
//
-// This file is part of the UICircularSlider Library, released under the MIT License.
+// This file is part of the ZMCircularSlider Library, released under the MIT License.
//
-#import "UICircularSliderViewController.h"
-#import "UICircularSlider.h"
+#import "ZMCircularSliderViewController.h"
+#import "ZMCircularSlider.h"
-@interface UICircularSliderViewController ()
+@interface ZMCircularSliderViewController ()
@property (unsafe_unretained, nonatomic) IBOutlet UISlider *slider;
@property (unsafe_unretained, nonatomic) IBOutlet UIProgressView *progressView;
-@property (unsafe_unretained, nonatomic) IBOutlet UICircularSlider *circularSlider;
+@property (unsafe_unretained, nonatomic) IBOutlet ZMCircularSlider *circularSlider;
@end
-@implementation UICircularSliderViewController
+@implementation ZMCircularSliderViewController
@synthesize slider = _slider;
@synthesize progressView = _progressView;
@synthesize circularSlider = _circularSlider;
@@ -30,6 +30,10 @@ - (void)viewDidLoad {
[self.circularSlider addTarget:self action:@selector(updateProgress:) forControlEvents:UIControlEventValueChanged];
[self.circularSlider setMinimumValue:self.slider.minimumValue];
[self.circularSlider setMaximumValue:self.slider.maximumValue];
+ [self updateProgress:(UISlider *)self.circularSlider];
+// [self.circularSlider setSliderStyle:ZMCircularSliderStylePie];
+ self.circularSlider.ignoreTouchesExceptOnThumb = YES;
+ [self.circularSlider setThumbImage:[UIImage imageNamed:@"dmc_slider_thumb.png"]];
}
- (void)viewDidUnload {
View
27 ...Slider/UICircularSliderViewController.xib → ...Slider/ZMCircularSliderViewController.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">568.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">1179</string>
+ <string key="NS.object.0">1181</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUISlider</string>
@@ -33,7 +33,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="774585933">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUISlider" id="162252003">
@@ -41,7 +41,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 101}, {284, 23}}</string>
<reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="980353563"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
@@ -57,7 +56,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 166}, {280, 9}}</string>
<reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="146384786"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
@@ -69,15 +67,12 @@
<int key="NSvFlags">269</int>
<string key="NSFrame">{{60, 240}, {200, 200}}</string>
<reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="162252003"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@@ -182,11 +177,11 @@
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.CustomClassName">UICircularSliderViewController</string>
+ <string key="-1.CustomClassName">ZMCircularSliderViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="14.CustomClassName">UICircularSlider</string>
+ <string key="14.CustomClassName">ZMCircularSlider</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -201,25 +196,25 @@
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
- <string key="className">UICircularSlider</string>
+ <string key="className">ZMCircularSlider</string>
<string key="superclassName">UIControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/UICircularSlider.h</string>
+ <string key="minorKey">./Classes/ZMCircularSlider.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UICircularSliderViewController</string>
+ <string key="className">ZMCircularSliderViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
- <string key="circularSlider">UICircularSlider</string>
+ <string key="circularSlider">ZMCircularSlider</string>
<string key="progressView">UIProgressView</string>
<string key="slider">UISlider</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="circularSlider">
<string key="name">circularSlider</string>
- <string key="candidateClassName">UICircularSlider</string>
+ <string key="candidateClassName">ZMCircularSlider</string>
</object>
<object class="IBToOneOutletInfo" key="progressView">
<string key="name">progressView</string>
@@ -232,7 +227,7 @@
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/UICircularSliderViewController.h</string>
+ <string key="minorKey">./Classes/ZMCircularSliderViewController.h</string>
</object>
</object>
</array>
@@ -245,6 +240,6 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">1179</string>
+ <string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>
View
0  ...rcularSlider/circularSliderThumbImage.png → ...rcularSlider/circularSliderThumbImage.png
File renamed without changes
View
BIN  test_project/ZMCircularSlider/dmc_slider_thumb.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  test_project/ZMCircularSlider/dmc_slider_thumb@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 test_project/UICircularSlider/main.m → test_project/ZMCircularSlider/main.m
@@ -1,6 +1,6 @@
//
// main.m
-// UICircularSlider
+// ZMCircularSlider
//
// Created by Zouhair Mahieddine on 02/03/12.
// Copyright (c) 2012 Zouhair Mahieddine. All rights reserved.
@@ -8,11 +8,11 @@
#import <UIKit/UIKit.h>
-#import "UICircularSliderAppDelegate.h"
+#import "ZMCircularSliderAppDelegate.h"
int main(int argc, char *argv[])
{
@autoreleasepool {
- return UIApplicationMain(argc, argv, nil, NSStringFromClass([UICircularSliderAppDelegate class]));
+ return UIApplicationMain(argc, argv, nil, NSStringFromClass([ZMCircularSliderAppDelegate class]));
}
}

No commit comments for this range

Something went wrong with that request. Please try again.