Copy over changes from @MuscleRumble's corner radius pull request.

jaredsinclair · Sep 29, 2014 · 4461c47 · 4461c47
1 parent abf64ad
commit 4461c47
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/Sample App/JTSImageVC/JTSImageVC/JTSViewController.m b/Sample App/JTSImageVC/JTSImageVC/JTSViewController.m
@@ -23,6 +23,7 @@ - (void)viewDidLoad {
     [tapRecognizer addTarget:self action:@selector(bigButtonTapped:)];
     [self.bigImageButton addGestureRecognizer:tapRecognizer];
     [self.bigImageButton setAccessibilityLabel:@"Photo of a cat wearing a Bane costume."];
+    self.bigImageButton.layer.cornerRadius = 16.0;
 }
 
 - (NSUInteger)supportedInterfaceOrientations {
@@ -36,7 +37,8 @@ - (void)bigButtonTapped:(id)sender {
     imageInfo.image = self.bigImageButton.image;
     imageInfo.referenceRect = self.bigImageButton.frame;
     imageInfo.referenceView = self.bigImageButton.superview;
-    imageInfo.contentMode = self.bigImageButton.contentMode;
+    imageInfo.referenceContentMode = self.bigImageButton.contentMode;
+    imageInfo.referenceCornerRadius = self.bigImageButton.layer.cornerRadius;
 
     // Setup view controller
     JTSImageViewController *imageViewer = [[JTSImageViewController alloc]

diff --git a/Source/JTSImageInfo.h b/Source/JTSImageInfo.h
@@ -18,7 +18,8 @@
 @property (copy, nonatomic) NSString *title;
 @property (assign, nonatomic) CGRect referenceRect;
 @property (strong, nonatomic) UIView *referenceView;
-@property (assign, nonatomic) UIViewContentMode contentMode;
+@property (assign, nonatomic) UIViewContentMode referenceContentMode;
+@property (assign, nonatomic) CGFloat referenceCornerRadius;
 @property (copy, nonatomic) NSMutableDictionary *userInfo;
 
 - (NSString *)displayableTitleAltTextSummary;

diff --git a/Source/JTSImageViewController.m b/Source/JTSImageViewController.m
@@ -53,7 +53,7 @@
     BOOL imageDownloadFailed;
 } JTSImageViewControllerFlags;
 
-#define USE_DEBUG_SLOW_ANIMATIONS 0
+#define USE_DEBUG_SLOW_ANIMATIONS 1
 
 ///--------------------------------------------------------------------------------------------------------------------
 /// Anonymous Category
@@ -373,6 +373,7 @@ - (void)viewDidLoadForImageMode {
     CGRect referenceFrameInMyView = [self.view convertRect:referenceFrameInWindow fromView:nil];
 
     self.imageView = [[UIImageView alloc] initWithFrame:referenceFrameInMyView];
+    self.imageView.layer.cornerRadius = self.imageInfo.referenceCornerRadius;
     self.imageView.contentMode = UIViewContentModeScaleAspectFill;
     self.imageView.userInteractionEnabled = YES;
     self.imageView.isAccessibilityElement = NO;
@@ -521,8 +522,8 @@ - (void)showImageViewerByExpandingFromOriginalPositionFromViewController:(UIView
 
     _startingInfo.startingReferenceFrameForThumbnailInPresentingViewControllersOriginalOrientation = [self.view convertRect:referenceFrameInWindow fromView:nil];
 
-    if (self.imageInfo.contentMode) {
-        self.imageView.contentMode = self.imageInfo.contentMode;
+    if (self.imageInfo.referenceContentMode) {
+        self.imageView.contentMode = self.imageInfo.referenceContentMode;
     }
 
     // This will be moved into the scroll view after
@@ -535,10 +536,10 @@ - (void)showImageViewerByExpandingFromOriginalPositionFromViewController:(UIView
             _startingInfo.presentingViewControllerPresentedFromItsUnsupportedOrientation = YES;
         }
 
-
         CGRect referenceFrameInMyView = [self.view convertRect:referenceFrameInWindow fromView:nil];
         _startingInfo.startingReferenceFrameForThumbnail = referenceFrameInMyView;
         [self.imageView setFrame:referenceFrameInMyView];
+        self.imageView.layer.cornerRadius = self.imageInfo.referenceCornerRadius;
         [self updateScrollViewAndImageViewForCurrentMetrics];
 
         BOOL mustRotateDuringTransition = ([UIApplication sharedApplication].statusBarOrientation != _startingInfo.startingInterfaceOrientation);
@@ -585,6 +586,14 @@ - (void)showImageViewerByExpandingFromOriginalPositionFromViewController:(UIView
         dispatch_async(dispatch_get_main_queue(), ^{
             dispatch_async(dispatch_get_main_queue(), ^{
 
+                CABasicAnimation *cornerRadiusAnimation = [CABasicAnimation animationWithKeyPath:@"cornerRadius"];
+                cornerRadiusAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+                cornerRadiusAnimation.fromValue = @(weakSelf.imageView.layer.cornerRadius);
+                cornerRadiusAnimation.toValue = @(0.0);
+                cornerRadiusAnimation.duration = duration;
+                [weakSelf.imageView.layer addAnimation:cornerRadiusAnimation forKey:@"cornerRadius"];
+                weakSelf.imageView.layer.cornerRadius = 0.0;
+
                 [UIView
                  animateWithDuration:duration
                  delay:0
@@ -912,6 +921,14 @@ - (void)dismissByCollapsingImageBackToOriginalPosition {
                 duration *= 4;
             }
 
+            CABasicAnimation *cornerRadiusAnimation = [CABasicAnimation animationWithKeyPath:@"cornerRadius"];
+            cornerRadiusAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+            cornerRadiusAnimation.fromValue = @(0.0);
+            cornerRadiusAnimation.toValue = @(weakSelf.imageInfo.referenceCornerRadius);
+            cornerRadiusAnimation.duration = duration;
+            [weakSelf.imageView.layer addAnimation:cornerRadiusAnimation forKey:@"cornerRadius"];
+            weakSelf.imageView.layer.cornerRadius = weakSelf.imageInfo.referenceCornerRadius;
+
             [UIView animateWithDuration:duration delay:0 options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseInOut animations:^{
 
                 weakSelf.snapshotView.transform = weakSelf.currentSnapshotRotationTransform;