Show accessory view once focus animation is done.

bgfriend0 · Mar 5, 2014 · 3ff15c6 · 3ff15c6
1 parent 9967762
commit 3ff15c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/ASMediaFocusManager/ASMediaFocusController.h b/ASMediaFocusManager/ASMediaFocusController.h
@@ -22,5 +22,6 @@
 - (void)installZoomView;
 - (void)uninstallZoomView;
 - (void)pinAccessoryView;
+- (void)showAccessoryView:(BOOL)visible;
 
 @end
diff --git a/ASMediaFocusManager/ASMediaFocusController.m b/ASMediaFocusManager/ASMediaFocusController.m
@@ -35,6 +35,7 @@ - (void)viewDidLoad
     self.titleLabel.layer.shadowOpacity = 1;
     self.titleLabel.layer.shadowOffset = CGSizeZero;
     self.titleLabel.layer.shadowRadius = 1;
+    self.accessoryView.alpha = 0;
 }
 
 - (void)viewDidUnload
@@ -58,16 +59,6 @@ - (void)viewWillDisappear:(BOOL)animated
     [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    self.titleLabel.alpha = 0;
-    [UIView animateWithDuration:0.5
-                     animations:^{
-                         self.titleLabel.alpha = 1;
-                     }];
-}
-
 - (NSUInteger)supportedInterfaceOrientations
 {
     return UIInterfaceOrientationMaskPortrait;
@@ -212,7 +203,7 @@ - (void)pinAccessoryView
     [self pinAccessoryView:self.accessoryView];
 }
 
-- (void)showAccessoryViews:(BOOL)visible
+- (void)showAccessoryView:(BOOL)visible
 {
     if(visible == [self accessoryViewsVisible])
         return;
@@ -273,7 +264,7 @@ - (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
 
 - (void)scrollViewDidZoom:(UIScrollView *)scrollView
 {
-    [self showAccessoryViews:self.scrollView.zoomScale == self.scrollView.minimumZoomScale];
+    [self showAccessoryView:self.scrollView.zoomScale == self.scrollView.minimumZoomScale];
 }
 
 #pragma mark - Notifications

diff --git a/ASMediaFocusManager/ASMediaFocusManager.m b/ASMediaFocusManager/ASMediaFocusManager.m
@@ -222,12 +222,6 @@ - (void)setupAccessoryViewOnFocusViewController:(ASMediaFocusController *)focusV
     doneButton.center = CGPointMake(focusViewController.accessoryView.bounds.size.width - doneButton.bounds.size.width/2 - 10, doneButton.bounds.size.height/2 + 10);
     doneButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin;
     [focusViewController.accessoryView addSubview:doneButton];
-
-    doneButton.alpha = 0;
-    [UIView animateWithDuration:0.5
-                     animations:^{
-                         doneButton.alpha = 1;
-                     }];
 }
 
 #pragma mark - Gestures
@@ -321,6 +315,7 @@ - (void)handleFocusGesture:(UIGestureRecognizer *)gesture
                                                                                     }
                                                                                     completion:^(BOOL finished) {
                                                                                         [self installZoomView];
+                                                                                        [self.focusViewController showAccessoryView:YES];
                                                                                         self.isZooming = NO;
 
                                                                                         if (self.delegate && [self.delegate respondsToSelector:@selector(mediaFocusManagerDidAppear:)])