CropView's frame should not be set by Resetting

.travis.yml

@@ -2,4 +2,4 @@ language: objective-c
 xcode_project: PhotoTweaks.xcodeproj
 xcode_scheme: PhotoTweaks
 xcode_sdk:
-  - iphonesimulator8.1
+  - iphonesimulator9.3

PhotoTweaks.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
   spec.name             = 'PhotoTweaks'
-  spec.version          = '1.0.2'
+  spec.version          = '1.0.4'
   spec.license          = 'MIT' 
   spec.homepage         = 'https://github.com/itouch2/PhotoTweaks'
   spec.authors          = {'Tu You' => 'yoututouch@gmail.com'}
   spec.summary          = 'Drag, Rotate, Scale and Crop.'
-  spec.source           = {:git => 'https://github.com/itouch2/PhotoTweaks.git', :tag => '1.0.2'}
+  spec.source           = {:git => 'https://github.com/itouch2/PhotoTweaks.git', :tag => '1.0.4'}
   spec.source_files     = 'PhotoTweaks/PhotoTweaks/*.{h,m}'
   spec.framework        = 'Foundation', 'CoreGraphics', 'UIKit'
   spec.requires_arc     = true

PhotoTweaks/AppDelegate.m

@@ -36,6 +36,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
     PhotoTweaksViewController *photoTweaksViewController = [[PhotoTweaksViewController alloc] initWithImage:image];
     photoTweaksViewController.delegate = self;
     photoTweaksViewController.autoSaveToLibray = YES;
+    photoTweaksViewController.maxRotationAngle = M_PI_4;
     [picker pushViewController:photoTweaksViewController animated:YES];
 }
 

PhotoTweaks/Info.plist

@@ -43,5 +43,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string></string>
 </dict>
 </plist>

PhotoTweaks/PhotoTweaks/PhotoTweakView.h

@@ -8,6 +8,8 @@
 
 #import <UIKit/UIKit.h>
 
+extern const CGFloat kMaxRotationAngle;
+
 @class CropView;
 
 @interface PhotoContentView : UIView
@@ -29,12 +31,22 @@
 
 @interface PhotoTweakView : UIView
 
-@property (assign, nonatomic) CGFloat angle;
-@property (strong, nonatomic) PhotoContentView *photoContentView;
-@property (assign, nonatomic) CGPoint photoContentOffset;
-@property (strong, nonatomic) CropView *cropView;
+@property (nonatomic, assign, readonly) CGFloat angle;
+@property (nonatomic, assign, readonly) CGPoint photoContentOffset;
+
+@property (nonatomic, strong, readonly) CropView *cropView;
+@property (nonatomic, strong, readonly) PhotoContentView *photoContentView;
+@property (nonatomic, strong, readonly) UISlider *slider;
+@property (nonatomic, strong, readonly) UIButton *resetBtn;
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+                        image:(UIImage *)image
+             maxRotationAngle:(CGFloat)maxRotationAngle;
+
+- (instancetype)initWithFrame:(CGRect)frame
+                        image:(UIImage *)image;
 
-- (instancetype)initWithFrame:(CGRect)frame image:(UIImage *)image;
 - (CGPoint)photoTranslation;
 
 @end

PhotoTweaks/PhotoTweaks/PhotoTweakView.m

@@ -10,8 +10,9 @@
 #import "UIColor+Tweak.h"
 #import <math.h>
 
-static const int kCropLines = 2;
-static const int kGridLines = 9;
+const CGFloat kMaxRotationAngle = 0.5;
+static const NSUInteger kCropLines = 2;
+static const NSUInteger kGridLines = 9;
 
 static const CGFloat kCropViewHotArea = 16;
 static const CGFloat kMinimumCropArea = 60;
@@ -55,7 +56,7 @@ - (void)layoutSubviews
 
 @interface PhotoScrollView : UIScrollView
 
-@property (strong, nonatomic) PhotoContentView *photoContentView;
+@property (nonatomic, strong) PhotoContentView *photoContentView;
 
 @end
 
@@ -429,11 +430,13 @@ - (void)showLines:(NSArray *)lines
 @interface PhotoTweakView () <UIScrollViewDelegate, CropViewDelegate>
 
 @property (nonatomic, strong) PhotoScrollView *scrollView;
+@property (nonatomic, strong) CropView *cropView;
 
 @property (nonatomic, strong) UIImage *image;
 @property (nonatomic, strong) UISlider *slider;
 @property (nonatomic, strong) UIButton *resetBtn;
 @property (nonatomic, assign) CGSize originalSize;
+@property (nonatomic, assign) CGFloat angle;
 
 @property (nonatomic, assign) BOOL manualZoomed;
 
@@ -447,22 +450,26 @@ @interface PhotoTweakView () <UIScrollViewDelegate, CropViewDelegate>
 @property (nonatomic, assign) CGSize maximumCanvasSize;
 @property (nonatomic, assign) CGFloat centerY;
 @property (nonatomic, assign) CGPoint originalPoint;
+@property (nonatomic, assign) CGFloat maxRotationAngle;
 
 @end
 
 @implementation PhotoTweakView
 
-- (instancetype)initWithFrame:(CGRect)frame image:(UIImage *)image
+- (instancetype)initWithFrame:(CGRect)frame
+                        image:(UIImage *)image
+             maxRotationAngle:(CGFloat)maxRotationAngle
 {
     if (self = [super init]) {
 
         self.frame = frame;
 
         _image = image;
+        _maxRotationAngle = maxRotationAngle;
 
         // scale the image
         _maximumCanvasSize = CGSizeMake(kMaximumCanvasWidthRatio * self.frame.size.width,
-                                            kMaximumCanvasHeightRatio * self.frame.size.height - kCanvasHeaderHeigth);
+                                        kMaximumCanvasHeightRatio * self.frame.size.height - kCanvasHeaderHeigth);
 
         CGFloat scaleX = image.size.width / self.maximumCanvasSize.width;
         CGFloat scaleY = image.size.height / self.maximumCanvasSize.height;
@@ -520,13 +527,12 @@ - (instancetype)initWithFrame:(CGRect)frame image:(UIImage *)image
         [self addSubview:_rightMask];
         [self updateMasks:NO];
 
-        _slider = [[UISlider alloc] initWithFrame:CGRectMake(0, 0, 240, 20)];
+        _slider = [[UISlider alloc] initWithFrame:CGRectMake(0, 0, 260, 20)];
         _slider.center = CGPointMake(CGRectGetWidth(self.bounds) / 2, CGRectGetHeight(self.bounds) - 135);
-        _slider.minimumValue = 0.0f;
-        _slider.maximumValue = 1.0f;
+        _slider.minimumValue = -self.maxRotationAngle;
+        _slider.maximumValue = self.maxRotationAngle;
         [_slider addTarget:self action:@selector(sliderValueChanged:) forControlEvents:UIControlEventValueChanged];
         [_slider addTarget:self action:@selector(sliderTouchEnded:) forControlEvents:UIControlEventTouchUpInside];
-        _slider.value = 0.5;
         [self addSubview:_slider];
 
         _resetBtn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -544,6 +550,11 @@ - (instancetype)initWithFrame:(CGRect)frame image:(UIImage *)image
     return self;
 }
 
+- (instancetype)initWithFrame:(CGRect)frame image:(UIImage *)image
+{
+    return [self initWithFrame:frame image:image maxRotationAngle:kMaxRotationAngle];
+}
+
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
     if (CGRectContainsPoint(self.slider.frame, point)) {
@@ -583,8 +594,8 @@ - (void)cropEnded:(CropView *)cropView
     CGRect newCropBounds = CGRectMake(0, 0, scale * cropView.frame.size.width, scale * cropView.frame.size.height);
 
     // calculate the new bounds of scroll view
-    CGFloat width = cos(fabs(self.angle)) * newCropBounds.size.width + sin(fabs(self.angle)) * newCropBounds.size.height;
-    CGFloat height = sin(fabs(self.angle)) * newCropBounds.size.width + cos(fabs(self.angle)) * newCropBounds.size.height;
+    CGFloat width = fabs(cos(self.angle)) * newCropBounds.size.width + fabs(sin(self.angle)) * newCropBounds.size.height;
+    CGFloat height = fabs(sin(self.angle)) * newCropBounds.size.width + fabs(cos(self.angle)) * newCropBounds.size.height;
 
     // calculate the zoom area of scroll view
     CGRect scaleFrame = cropView.frame;
@@ -674,12 +685,12 @@ - (void)sliderValueChanged:(id)sender
     [self.cropView updateGridLines:NO];
 
     // rotate scroll view
-    self.angle = self.slider.value - 0.5;
+    self.angle = self.slider.value;
     self.scrollView.transform = CGAffineTransformMakeRotation(self.angle);
 
     // position scroll view
-    CGFloat width = cos(fabs(self.angle)) * self.cropView.frame.size.width + sin(fabs(self.angle)) * self.cropView.frame.size.height;
-    CGFloat height = sin(fabs(self.angle)) * self.cropView.frame.size.width + cos(fabs(self.angle)) * self.cropView.frame.size.height;
+    CGFloat width = fabs(cos(self.angle)) * self.cropView.frame.size.width + fabs(sin(self.angle)) * self.cropView.frame.size.height;
+    CGFloat height = fabs(sin(self.angle)) * self.cropView.frame.size.width + fabs(cos(self.angle)) * self.cropView.frame.size.height;
     CGPoint center = self.scrollView.center;
 
     CGPoint contentOffset = self.scrollView.contentOffset;
@@ -717,11 +728,10 @@ - (void)resetBtnTapped:(id)sender
         self.scrollView.minimumZoomScale = 1;
         [self.scrollView setZoomScale:1 animated:NO];
 
-        self.cropView.frame = self.scrollView.frame;
         self.cropView.center = self.scrollView.center;
         [self updateMasks:NO];
 
-        [self.slider setValue:0.5 animated:YES];
+        [self.slider setValue:0 animated:YES];
     }];
 }