Merge pull request #80 from ruslanskorb/develop

Version 1.4.1
ruslanskorb · Nov 13, 2015 · eaa3b67 · eaa3b67
2 parents 3a56f73 + 093cc30
commit eaa3b67
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 42 deletions.
diff --git a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m
@@ -544,25 +544,36 @@ - (void)resetZoomScale;
             sharedIt();
         };
 
-        it(@"looks right when crop mode is `RSKImageCropModeCircle`", ^{
-            imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCircle];
+        describe(@"crop mode", ^{
+            it(@"looks right when crop mode is `RSKImageCropModeCircle`", ^{
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCircle];
+
+                sharedPortraitIt();
+            });
 
-            sharedPortraitIt();
-        });
-
-        it(@"looks right when crop mode is `RSKImageCropModeSquare`", ^{
-            imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeSquare];
+            it(@"looks right when crop mode is `RSKImageCropModeSquare`", ^{
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeSquare];
+                
+                sharedPortraitIt();
+            });
 
-            sharedPortraitIt();
+            it(@"looks right when crop mode is `RSKImageCropModeCustom`", ^{
+                RSKImageCropViewControllerDataSourceObject1 *dataSourceObject = [[RSKImageCropViewControllerDataSourceObject1 alloc] init];
+
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCustom];
+                imageCropViewController.dataSource = dataSourceObject;
+
+                sharedPortraitIt();
+            });
         });
 
-        it(@"looks right when crop mode is `RSKImageCropModeCustom`", ^{
-            RSKImageCropViewControllerDataSourceObject1 *dataSourceObject = [[RSKImageCropViewControllerDataSourceObject1 alloc] init];
-
-            imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCustom];
-            imageCropViewController.dataSource = dataSourceObject;
-
-            sharedPortraitIt();
+        describe(@"stroke of the mask", ^{
+            it(@"looks right when stroked outline is visible", ^{
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeSquare];
+                imageCropViewController.maskLayerStrokeColor = [UIColor whiteColor];
+                
+                sharedPortraitIt();
+            });
         });
     });
 
@@ -573,25 +584,36 @@ - (void)resetZoomScale;
             sharedIt();
         };
 
-        it(@"looks right when crop mode is `RSKImageCropModeCircle`", ^{
-            imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCircle];
+        describe(@"crop mode", ^{
+            it(@"looks right when crop mode is `RSKImageCropModeCircle`", ^{
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCircle];
+
+                sharedLandscapeIt();
+            });
 
-            sharedLandscapeIt();
-        });
-
-        it(@"looks right when crop mode is `RSKImageCropModeSquare`", ^{
-            imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeSquare];
+            it(@"looks right when crop mode is `RSKImageCropModeSquare`", ^{
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeSquare];
+                
+                sharedLandscapeIt();
+            });
 
-            sharedLandscapeIt();
+            it(@"looks right when crop mode is `RSKImageCropModeCustom`", ^{
+                RSKImageCropViewControllerDataSourceObject1 *dataSourceObject = [[RSKImageCropViewControllerDataSourceObject1 alloc] init];
+
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCustom];
+                imageCropViewController.dataSource = dataSourceObject;
+
+                sharedLandscapeIt();
+            });
         });
 
-        it(@"looks right when crop mode is `RSKImageCropModeCustom`", ^{
-            RSKImageCropViewControllerDataSourceObject1 *dataSourceObject = [[RSKImageCropViewControllerDataSourceObject1 alloc] init];
-
-            imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCustom];
-            imageCropViewController.dataSource = dataSourceObject;
-
-            sharedLandscapeIt();
+        describe(@"stroke of the mask", ^{
+            it(@"looks right when storked outline is visible", ^{
+                imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeSquare];
+                imageCropViewController.maskLayerStrokeColor = [UIColor whiteColor];
+                
+                sharedLandscapeIt();
+            });
         });
     });
 });

diff --git a/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@2x.png b/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@2x.png
diff --git a/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@2x.png b/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@2x.png
diff --git a/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@2x.png b/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@2x.png
diff --git a/...landscape_stroke_of_the_mask_looks_right_when_storked_outline_is_visible@2x.png b/...landscape_stroke_of_the_mask_looks_right_when_storked_outline_is_visible@2x.png
diff --git a/...ew_landscape_stroked_outline_looks_right_when_storked_outline_is_visible@2x.png b/...ew_landscape_stroked_outline_looks_right_when_storked_outline_is_visible@2x.png
diff --git a/...scape_stroked_outline_looks_right_when_stroked_color_is_not_equal_to_nil@2x.png b/...scape_stroked_outline_looks_right_when_stroked_color_is_not_equal_to_nil@2x.png
diff --git a/..._stroked_outline_of_the_mask_looks_right_when_storked_outline_is_visible@2x.png b/..._stroked_outline_of_the_mask_looks_right_when_storked_outline_is_visible@2x.png
diff --git a/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@2x.png b/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@2x.png
diff --git a/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@2x.png b/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@2x.png
diff --git a/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@2x.png b/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@2x.png
diff --git a/..._portrait_stroke_of_the_mask_looks_right_when_stroked_outline_is_visible@2x.png b/..._portrait_stroke_of_the_mask_looks_right_when_stroked_outline_is_visible@2x.png
diff --git a/...iew_portrait_stroked_outline_looks_right_when_storked_outline_is_visible@2x.png b/...iew_portrait_stroked_outline_looks_right_when_storked_outline_is_visible@2x.png
diff --git a/...trait_stroked_outline_looks_right_when_stroked_color_is_not_equal_to_nil@2x.png b/...trait_stroked_outline_looks_right_when_stroked_color_is_not_equal_to_nil@2x.png
diff --git a/..._stroked_outline_of_the_mask_looks_right_when_storked_outline_is_visible@2x.png b/..._stroked_outline_of_the_mask_looks_right_when_storked_outline_is_visible@2x.png
diff --git a/Framework/Info.plist b/Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'RSKImageCropper'
-  s.version      = '1.4.0'
+  s.version      = '1.4.1'
   s.summary      = 'An image cropper for iOS like in the Contacts app with support for landscape orientation.'
   s.homepage     = 'https://github.com/ruslanskorb/RSKImageCropper'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/RSKImageCropper.xcodeproj/project.pbxproj b/RSKImageCropper.xcodeproj/project.pbxproj
@@ -226,7 +226,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.4.0;
+				CURRENT_PROJECT_VERSION = 1.4.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -274,7 +274,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.4.0;
+				CURRENT_PROJECT_VERSION = 1.4.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -300,8 +300,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1.4.0;
-				DYLIB_CURRENT_VERSION = 1.4.0;
+				DYLIB_COMPATIBILITY_VERSION = 1.4.1;
+				DYLIB_CURRENT_VERSION = 1.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Framework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -316,8 +316,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1.4.0;
-				DYLIB_CURRENT_VERSION = 1.4.0;
+				DYLIB_COMPATIBILITY_VERSION = 1.4.1;
+				DYLIB_CURRENT_VERSION = 1.4.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Framework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m
@@ -61,8 +61,13 @@ @interface RSKImageCropViewController () <UIGestureRecognizerDelegate>
 @property (strong, nonatomic) RSKImageScrollView *imageScrollView;
 @property (strong, nonatomic) RSKTouchView *overlayView;
 @property (strong, nonatomic) CAShapeLayer *maskLayer;
+
 @property (assign, nonatomic) CGRect maskRect;
 @property (copy, nonatomic) UIBezierPath *maskPath;
+
+@property (readonly, nonatomic) CGRect rectForMaskPath;
+@property (readonly, nonatomic) CGRect rectForClipPath;
+
 @property (strong, nonatomic) UILabel *moveAndScaleLabel;
 @property (strong, nonatomic) UIButton *cancelButton;
 @property (strong, nonatomic) UIButton *chooseButton;
@@ -393,6 +398,26 @@ - (CGRect)cropRect
     return cropRect;
 }
 
+- (CGRect)rectForClipPath
+{
+    if (!self.maskLayerStrokeColor) {
+        return self.overlayView.frame;
+    } else {
+        CGFloat maskLayerLineHalfWidth = self.maskLayerLineWidth / 2.0;
+        return CGRectInset(self.overlayView.frame, -maskLayerLineHalfWidth, -maskLayerLineHalfWidth);
+    }
+}
+
+- (CGRect)rectForMaskPath
+{
+    if (!self.maskLayerStrokeColor) {
+        return self.maskRect;
+    } else {
+        CGFloat maskLayerLineHalfWidth = self.maskLayerLineWidth / 2.0;
+        return CGRectInset(self.maskRect, maskLayerLineHalfWidth, maskLayerLineHalfWidth);
+    }
+}
+
 - (CGFloat)rotationAngle
 {
     CGAffineTransform transform = self.imageScrollView.transform;
@@ -440,7 +465,7 @@ - (void)setMaskPath:(UIBezierPath *)maskPath
     if (![_maskPath isEqual:maskPath]) {
         _maskPath = maskPath;
 
-        UIBezierPath *clipPath = [UIBezierPath bezierPathWithRect:self.overlayView.frame];
+        UIBezierPath *clipPath = [UIBezierPath bezierPathWithRect:self.rectForClipPath];
         [clipPath appendPath:maskPath];
         clipPath.usesEvenOddFillRule = YES;
 
@@ -760,11 +785,11 @@ - (void)updateMaskPath
 {
     switch (self.cropMode) {
         case RSKImageCropModeCircle: {
-            self.maskPath = [UIBezierPath bezierPathWithOvalInRect:self.maskRect];
+            self.maskPath = [UIBezierPath bezierPathWithOvalInRect:self.rectForMaskPath];
             break;
         }
         case RSKImageCropModeSquare: {
-            self.maskPath = [UIBezierPath bezierPathWithRect:self.maskRect];
+            self.maskPath = [UIBezierPath bezierPathWithRect:self.rectForMaskPath];
             break;
         }
         case RSKImageCropModeCustom: {