Fix animations

brung · Feb 25, 2015 · 8ecabcb · 8ecabcb
1 parent 99d54a5
commit 8ecabcb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/unnamed/HomeProfileAnimation.m b/unnamed/HomeProfileAnimation.m
@@ -40,15 +40,13 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
         UIImageView *selectedProfileImage = self.selectedCell.profileImageView;
 
 
-        CGRect profileFrameInCell = [self.selectedCell profileImageviewFrame];
-        NSLog(@"y:%f %f nav:%f x:%f %f", self.selectedCell.frame.origin.y, profileFrameInCell.origin.y, navBarHeight, self.selectedCell.frame.origin.x , profileFrameInCell.origin.x);
-        CGRect profileImageFrame = CGRectMake(self.selectedCell.frame.origin.x + profileFrameInCell.origin.x+2, self.selectedCell.frame.origin.y + profileFrameInCell.origin.y+navBarHeight, profileFrameInCell.size.width, profileFrameInCell.size.height);
-        UIImageView *transImageView = [[ProfileImageView alloc] initWithFrame:profileImageFrame];
+        CGRect frame = [selectedProfileImage convertRect:selectedProfileImage.frame toView:containerView];
+        UIImageView *transImageView = [[ProfileImageView alloc] initWithFrame:frame];
         transImageView.layer.cornerRadius = transImageView.frame.size.width / 2;
         transImageView.image = selectedProfileImage.image;
         transImageView.contentMode = UIViewContentModeScaleAspectFill;
         transImageView.clipsToBounds = YES;
-        transImageView.transform = CGAffineTransformMakeScale(1.1,1.1);
+        transImageView.transform = CGAffineTransformScale(selectedProfileImage.transform, 1.1,1.1);
         [containerView addSubview:transImageView];
 
         selectedProfileImage.hidden = YES;

diff --git a/unnamed/SurveyViewCell.m b/unnamed/SurveyViewCell.m
@@ -59,9 +59,4 @@ - (void)profileImageView:(ProfileImageView *)view tappedUser:(User *)user {
     [self.delegate surveyViewCell:self didClickOnUser:user];
 }
 
-- (CGRect)profileImageviewFrame {
-    float originX = self.contentView.frame.origin.x + self.containerView.frame.origin.x + self.profileImageView.frame.origin.x;
-    float originY = self.contentView.frame.origin.y + self.containerView.frame.origin.y + self.profileImageView.frame.origin.y;
-    return CGRectMake(originX, originY, self.profileImageView.frame.size.width, self.profileImageView.frame.size.height);
-}
 @end