From 1c021befcc6f2468fa9258f35bd8a2a9824945b6 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 17 Jun 2015 16:51:39 +0800 Subject: [PATCH] hide media when in show animation --- Yep/Views/Media/MediaPreviewView.swift | 1 - Yep/Views/Media/MediaView.swift | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Yep/Views/Media/MediaPreviewView.swift b/Yep/Views/Media/MediaPreviewView.swift index 14ca6ae0..9f7f83ff 100644 --- a/Yep/Views/Media/MediaPreviewView.swift +++ b/Yep/Views/Media/MediaPreviewView.swift @@ -239,7 +239,6 @@ class MediaPreviewView: UIView { self.initialframe = initialframe frame = initialframe - layoutIfNeeded() UIView.animateWithDuration(0.25, delay: 0.0, options: .CurveEaseOut, animations: { _ in diff --git a/Yep/Views/Media/MediaView.swift b/Yep/Views/Media/MediaView.swift index 369cebce..043655c3 100644 --- a/Yep/Views/Media/MediaView.swift +++ b/Yep/Views/Media/MediaView.swift @@ -35,8 +35,14 @@ class MediaView: UIView { coverImageView.image = coverImage coverImageView.alpha = 1 bringSubviewToFront(coverImageView) + + scrollView.alpha = 0 + videoPlayerLayer.opacity = 0 } else { + scrollView.alpha = 1 + videoPlayerLayer.opacity = 1 + UIView.animateWithDuration(0.05, delay: 0.0, options: .CurveLinear, animations: { _ in self.coverImageView.alpha = 0 }, completion: { finished in