Disable rotation buttons during animation

Author: TimOliver

Objective-C/TOCropViewController/TOCropViewController.m

@@ -732,12 +732,18 @@ - (void)setAspectRatioPreset:(TOCropViewControllerAspectRatioPreset)aspectRatioP
 
 - (void)rotateCropViewClockwise
 {
-    [self.cropView rotateImageNinetyDegreesAnimated:YES clockwise:YES];
+    self.toolbar.disableRotationButtons = YES;
+    [self.cropView rotateImageNinetyDegreesAnimated:YES clockwise:YES completion:^(BOOL success) {
+        self.toolbar.disableRotationButtons = NO;
+    }];
 }
 
 - (void)rotateCropViewCounterclockwise
 {
-    [self.cropView rotateImageNinetyDegreesAnimated:YES clockwise:NO];
+    self.toolbar.disableRotationButtons = YES;
+    [self.cropView rotateImageNinetyDegreesAnimated:YES clockwise:NO completion:^(BOOL success) {
+        self.toolbar.disableRotationButtons = NO;
+    }];
 }
 
 #pragma mark - Crop View Delegates -

Objective-C/TOCropViewController/Views/TOCropToolbar.h

@@ -62,6 +62,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly)  UIButton *clampButton;
 @property (nullable, nonatomic, strong, readonly) UIButton *rotateClockwiseButton;
 
+/* Set the rotation buttons to be disabled while rotating is in progress */
+@property (nonatomic, assign) BOOL disableRotationButtons;
+
 @property (nonatomic, readonly) UIButton *rotateButton; // Points to `rotateCounterClockwiseButton`
 
 /* Button feedback handler blocks */

Objective-C/TOCropViewController/Views/TOCropToolbar.m

@@ -754,4 +754,14 @@ - (UIView *)visibleCancelButton
     return self.cancelTextButton;
 }
 
+- (void)setDisableRotationButtons:(BOOL)disableRotationButtons
+{
+    if (_disableRotationButtons == disableRotationButtons) {
+        return;
+    }
+    _disableRotationButtons = disableRotationButtons;
+    _rotateClockwiseButton.enabled = !disableRotationButtons;
+    _rotateCounterclockwiseButton.enabled = !disableRotationButtons;
+}
+
 @end

Objective-C/TOCropViewController/Views/TOCropView.h

@@ -265,15 +265,15 @@ The minimum croping aspect ratio. If set, user is prevented from setting croppin
  
  @param animated Whether the transition is animated
  */
-- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated;
+- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated completion:(nullable void(^)(BOOL completed))completionHandler;
 
 /**
  Rotates the entire canvas to a 90-degree angle
  
  @param animated Whether the transition is animated
  @param clockwise Whether the rotation is clockwise. Passing 'NO' means counterclockwise
  */
-- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated clockwise:(BOOL)clockwise;
+- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated clockwise:(BOOL)clockwise completion:(nullable void(^)(BOOL completed))completionHandler;
 
 /**
  Animate the grid overlay graphic to be visible

Objective-C/TOCropViewController/Views/TOCropView.m

@@ -1218,12 +1218,12 @@ - (void)setAngle:(NSInteger)angle
     // on direction
     if (newAngle >= 0) {
         while (labs(self.angle) != labs(newAngle)) {
-            [self rotateImageNinetyDegreesAnimated:NO clockwise:YES];
+            [self rotateImageNinetyDegreesAnimated:NO clockwise:YES completion:nil];
         }
     }
     else {
         while (-labs(self.angle) != -labs(newAngle)) {
-            [self rotateImageNinetyDegreesAnimated:NO clockwise:NO];
+            [self rotateImageNinetyDegreesAnimated:NO clockwise:NO completion:nil];
         }
     }
 }
@@ -1503,12 +1503,12 @@ - (void)setAspectRatio:(CGSize)aspectRatio animated:(BOOL)animated
                      completion:nil];
 }
 
-- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated
+- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated completion:(void(^)(BOOL completed))completionHandler
 {
-    [self rotateImageNinetyDegreesAnimated:animated clockwise:NO];
+    [self rotateImageNinetyDegreesAnimated:animated clockwise:NO completion:completionHandler];
 }
 
-- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated clockwise:(BOOL)clockwise
+- (void)rotateImageNinetyDegreesAnimated:(BOOL)animated clockwise:(BOOL)clockwise completion:(void(^)(BOOL completed))completionHandler
 {
     //Only allow one rotation animation at a time
     if (self.rotateAnimationInProgress)
@@ -1666,7 +1666,7 @@ - (void)rotateImageNinetyDegreesAnimated:(BOOL)animated clockwise:(BOOL)clockwis
             } completion:^(BOOL complete) {
                 self.rotateAnimationInProgress = NO;
                 [snapshotView removeFromSuperview];
-                
+
                 // If the aspect ratio lock is not enabled, allow a swap
                 // If the aspect ratio lock is on, allow a aspect ratio swap
                 // only if the allowDimensionSwap option is specified.
@@ -1677,6 +1677,10 @@ - (void)rotateImageNinetyDegreesAnimated:(BOOL)animated clockwise:(BOOL)clockwis
                     //This will animate the aspect ratio back to the desired locked ratio after the image is rotated.
                     [self setAspectRatio:self.aspectRatio animated:animated];
                 }
+
+                if (completionHandler) {
+                    completionHandler(complete);
+                }
             }];
         }];
     }