diff --git a/OneFingerRotation.xcodeproj/project.pbxproj b/OneFingerRotation.xcodeproj/project.pbxproj index 7dc91b9..6777a6c 100644 --- a/OneFingerRotation.xcodeproj/project.pbxproj +++ b/OneFingerRotation.xcodeproj/project.pbxproj @@ -16,10 +16,10 @@ 2E06CF5217DCFED600E4F3ED /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E06CF5117DCFED600E4F3ED /* Default.png */; }; 2E06CF5417DCFED600E4F3ED /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E06CF5317DCFED600E4F3ED /* Default@2x.png */; }; 2E06CF5617DCFED600E4F3ED /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E06CF5517DCFED600E4F3ED /* Default-568h@2x.png */; }; - 2E06CF6317DCFF5C00E4F3ED /* NGRotationGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E06CF6217DCFF5C00E4F3ED /* NGRotationGestureRecognizer.m */; }; 2E06CF6717DCFFB300E4F3ED /* RotationGestureRecognizerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E06CF6517DCFFB300E4F3ED /* RotationGestureRecognizerViewController.m */; }; 2E06CF6817DCFFB300E4F3ED /* RotationGestureRecognizerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2E06CF6617DCFFB300E4F3ED /* RotationGestureRecognizerViewController.xib */; }; 2E06CF6A17DD010600E4F3ED /* colorwheel.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E06CF6917DD010600E4F3ED /* colorwheel.png */; }; + 2E46B2481885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E46B2471885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -36,12 +36,12 @@ 2E06CF5117DCFED600E4F3ED /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; 2E06CF5317DCFED600E4F3ED /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; 2E06CF5517DCFED600E4F3ED /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - 2E06CF6117DCFF5C00E4F3ED /* NGRotationGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGRotationGestureRecognizer.h; sourceTree = ""; }; - 2E06CF6217DCFF5C00E4F3ED /* NGRotationGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NGRotationGestureRecognizer.m; sourceTree = ""; }; 2E06CF6417DCFFB300E4F3ED /* RotationGestureRecognizerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RotationGestureRecognizerViewController.h; sourceTree = ""; }; 2E06CF6517DCFFB300E4F3ED /* RotationGestureRecognizerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RotationGestureRecognizerViewController.m; sourceTree = ""; }; 2E06CF6617DCFFB300E4F3ED /* RotationGestureRecognizerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RotationGestureRecognizerViewController.xib; sourceTree = ""; }; 2E06CF6917DD010600E4F3ED /* colorwheel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = colorwheel.png; sourceTree = ""; }; + 2E46B2461885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGOneFingerRotationGestureRecognizer.h; sourceTree = ""; }; + 2E46B2471885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NGOneFingerRotationGestureRecognizer.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -88,7 +88,7 @@ 2E06CF4517DCFED600E4F3ED /* OneFingerRotation */ = { isa = PBXGroup; children = ( - 2E06CF6017DCFF5C00E4F3ED /* NGRotationGestureRecognizer */, + 2E46B2451885412200C4FCBF /* NGOneFingerRotationGestureRecognizer */, 2E06CF4E17DCFED600E4F3ED /* AppDelegate.h */, 2E06CF4F17DCFED600E4F3ED /* AppDelegate.m */, 2E06CF6417DCFFB300E4F3ED /* RotationGestureRecognizerViewController.h */, @@ -114,13 +114,13 @@ name = "Supporting Files"; sourceTree = ""; }; - 2E06CF6017DCFF5C00E4F3ED /* NGRotationGestureRecognizer */ = { + 2E46B2451885412200C4FCBF /* NGOneFingerRotationGestureRecognizer */ = { isa = PBXGroup; children = ( - 2E06CF6117DCFF5C00E4F3ED /* NGRotationGestureRecognizer.h */, - 2E06CF6217DCFF5C00E4F3ED /* NGRotationGestureRecognizer.m */, + 2E46B2461885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.h */, + 2E46B2471885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.m */, ); - path = NGRotationGestureRecognizer; + path = NGOneFingerRotationGestureRecognizer; sourceTree = ""; }; /* End PBXGroup section */ @@ -189,9 +189,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 2E46B2481885412200C4FCBF /* NGOneFingerRotationGestureRecognizer.m in Sources */, 2E06CF4C17DCFED600E4F3ED /* main.m in Sources */, 2E06CF5017DCFED600E4F3ED /* AppDelegate.m in Sources */, - 2E06CF6317DCFF5C00E4F3ED /* NGRotationGestureRecognizer.m in Sources */, 2E06CF6717DCFFB300E4F3ED /* RotationGestureRecognizerViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/OneFingerRotation/NGRotationGestureRecognizer/NGRotationGestureRecognizer.h b/OneFingerRotation/NGOneFingerRotationGestureRecognizer/NGOneFingerRotationGestureRecognizer.h similarity index 95% rename from OneFingerRotation/NGRotationGestureRecognizer/NGRotationGestureRecognizer.h rename to OneFingerRotation/NGOneFingerRotationGestureRecognizer/NGOneFingerRotationGestureRecognizer.h index ce124d9..82854d7 100644 --- a/OneFingerRotation/NGRotationGestureRecognizer/NGRotationGestureRecognizer.h +++ b/OneFingerRotation/NGOneFingerRotationGestureRecognizer/NGOneFingerRotationGestureRecognizer.h @@ -25,7 +25,7 @@ /** * Uses one finger to calculate rotation. Center of rotation in center point of the view */ -@interface NGRotationGestureRecognizer : UIGestureRecognizer +@interface NGOneFingerRotationGestureRecognizer : UIGestureRecognizer /** * Changes from 0 to 2PI diff --git a/OneFingerRotation/NGRotationGestureRecognizer/NGRotationGestureRecognizer.m b/OneFingerRotation/NGOneFingerRotationGestureRecognizer/NGOneFingerRotationGestureRecognizer.m similarity index 97% rename from OneFingerRotation/NGRotationGestureRecognizer/NGRotationGestureRecognizer.m rename to OneFingerRotation/NGOneFingerRotationGestureRecognizer/NGOneFingerRotationGestureRecognizer.m index cd844ec..74deffb 100644 --- a/OneFingerRotation/NGRotationGestureRecognizer/NGRotationGestureRecognizer.m +++ b/OneFingerRotation/NGOneFingerRotationGestureRecognizer/NGOneFingerRotationGestureRecognizer.m @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -#import "NGRotationGestureRecognizer.h" +#import "NGOneFingerRotationGestureRecognizer.h" #import @@ -33,7 +33,7 @@ CGPoint CGRectGetMidPoint(CGRect rect) } -@interface NGRotationGestureRecognizer () +@interface NGOneFingerRotationGestureRecognizer () @property (strong, nonatomic) UITouch * trackedTouch; @property (assign, nonatomic) CGPoint initialTouchLocation; @@ -43,7 +43,7 @@ CGPoint CGRectGetMidPoint(CGRect rect) @end -@implementation NGRotationGestureRecognizer +@implementation NGOneFingerRotationGestureRecognizer #pragma mark - Public Properties diff --git a/OneFingerRotation/RotationGestureRecognizerViewController.m b/OneFingerRotation/RotationGestureRecognizerViewController.m index 5943a16..3e4bb08 100644 --- a/OneFingerRotation/RotationGestureRecognizerViewController.m +++ b/OneFingerRotation/RotationGestureRecognizerViewController.m @@ -7,7 +7,7 @@ // #import "RotationGestureRecognizerViewController.h" -#import "NGRotationGestureRecognizer.h" +#import "NGOneFingerRotationGestureRecognizer.h" @interface RotationGestureRecognizerViewController () @@ -20,7 +20,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - NGRotationGestureRecognizer * gestureRecognizer = [[NGRotationGestureRecognizer alloc] initWithTarget:self action:@selector(handleRotationGesture:)]; + NGOneFingerRotationGestureRecognizer * gestureRecognizer = [[NGOneFingerRotationGestureRecognizer alloc] initWithTarget:self action:@selector(handleRotationGesture:)]; [self.twirlImageView addGestureRecognizer:gestureRecognizer]; } @@ -30,11 +30,10 @@ self.twirlImageView.center = CGPointMake(CGRectGetMidX(self.view.bounds), CGRectGetMidY(self.view.bounds)); } -- (void)handleRotationGesture:(NGRotationGestureRecognizer *)gestureRecognizer +- (void)handleRotationGesture:(NGOneFingerRotationGestureRecognizer *)gestureRecognizer { if (gestureRecognizer.state == UIGestureRecognizerStateBegan) { gestureRecognizer.rotation = atan2(self.twirlImageView.transform.b, self.twirlImageView.transform.a); - return; } else if (gestureRecognizer.state == UIGestureRecognizerStateChanged) { self.twirlImageView.transform = CGAffineTransformMakeRotation(gestureRecognizer.rotation);