add animated arg.

0x0c · Jul 17, 2016 · 1b02042 · 1b02042
1 parent b906d8d
commit 1b02042
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/Example/Tests/Tests-Info.plist b/Example/Tests/Tests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Pod/Classes/MediaPlayerView/LMMediaPlayerView.h b/Pod/Classes/MediaPlayerView/LMMediaPlayerView.h
@@ -72,6 +72,7 @@ extern NSString *const LMMediaPlayerViewActionButtonImageKey;
 
 + (instancetype)sharedPlayerView;
 + (instancetype)create;
+- (void)setUserInterfaceHidden:(BOOL)userInterfaceHidden animated:(BOOL)animated;
 - (void)setHeaderViewHidden:(BOOL)hidden;
 - (void)setFooterViewHidden:(BOOL)hidden;
 - (void)setFullscreen:(BOOL)fullscreen animated:(BOOL)animated;

diff --git a/Pod/Classes/MediaPlayerView/LMMediaPlayerView.m b/Pod/Classes/MediaPlayerView/LMMediaPlayerView.m
@@ -208,17 +208,22 @@ - (void)setBluredUserInterface:(BOOL)bluredUserInterface visualEffect:(UIVisualE
 	}
 #endif
 }
-- (void)setProgressBarBorderColor:(UIColor *)borderColor backgroundColor:(UIColor *)backgroundColor fillColor:(UIColor *)fillColor minTrackColor:(UIColor *)minTrackColor thumbTintColor:(UIColor *)thumbTintColor {
+
+- (void)setProgressBarBorderColor:(UIColor *)borderColor backgroundColor:(UIColor *)backgroundColor fillColor:(UIColor *)fillColor minTrackColor:(UIColor *)minTrackColor thumbTintColor:(UIColor *)thumbTintColor
+{
     self.currentProgressView.barBorderColor = borderColor;
     self.currentProgressView.barBackgroundColor = backgroundColor;
     self.currentProgressView.barFillColor = fillColor;
     self.currentProgressView.barMinimumTrackFillColor = minTrackColor;
 
     self.currentTimeSlider.thumbTintColor = thumbTintColor;
 }
-- (void)setProgressBarThumbImage:(UIImage *)image {
+
+- (void)setProgressBarThumbImage:(UIImage *)image
+{
     [self.currentTimeSlider setThumbImage:image forState:UIControlStateNormal];
 }
+
 #pragma mark -
 
 - (void)setup
@@ -656,11 +661,17 @@ - (void)setFooterViewHidden:(BOOL)hidden
 	footerView_.hidden = hidden;
 }
 
-- (void)setUserInterfaceHidden:(BOOL)hidden
+- (void)setUserInterfaceHidden:(BOOL)userInterfaceHidden
+{
+	[self setUserInterfaceHidden:userInterfaceHidden animated:NO];
+}
+
+- (void)setUserInterfaceHidden:(BOOL)userInterfaceHidden animated:(BOOL)animated
 {
-	_userInterfaceHidden = hidden;
-	if (hidden) {
-		[UIView animateWithDuration:0.3 animations:^{
+	NSTimeInterval duration = 0.3 * animated ? 1 : 0;
+	_userInterfaceHidden = userInterfaceHidden;
+	if (userInterfaceHidden) {
+		[UIView animateWithDuration:duration animations:^{
 			headerView_.alpha = 0;
 			footerView_.alpha = 0;
 			_currentTimeSlider.alpha = 0;
@@ -670,7 +681,7 @@ - (void)setUserInterfaceHidden:(BOOL)hidden
 		}];
 	}
 	else {
-		[UIView animateWithDuration:0.3 animations:^{
+		[UIView animateWithDuration:duration animations:^{
 			headerView_.alpha = 1;
 			footerView_.alpha = 1;
 			_currentTimeSlider.alpha = 1;