oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Avoid white flash while dismissing

Browse source 
// FREEBIE
This commit is contained in:
Michael Kirk 2018-03-23 17:39:30 -04:00
parent 8e72ac5ee7
commit c1de22d860
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Signal/src/ViewControllers/MediaGalleryViewController.swift
View file

@ -434,11 +434,11 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
}
}
public func dismissMediaDetailViewController(_ mediaDetailViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?) {
public func dismissMediaDetailViewController(_ mediaPageViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?) {
self.view.isUserInteractionEnabled = false
UIApplication.shared.isStatusBarHidden = false
guard let detailView = mediaDetailViewController.view else {
guard let detailView = mediaPageViewController.view else {
owsFail("\(logTag) in \(#function) detailView was unexpectedly nil")
self.presentingViewController?.dismiss(animated: false, completion: completion)
return
@ -461,10 +461,13 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
delay: 0.0,
options:.curveEaseOut,
animations: {
// Move back over it's original location
self.presentationView.superview?.layoutIfNeeded()
// In case user has hidden bars, which changes background to black.
self.view.backgroundColor = UIColor.white
mediaPageViewController.view.backgroundColor = .white
mediaPageViewController.view.alpha = 0
self.view.backgroundColor = .clear
if changedItems {
self.presentationView.alpha = 0
@ -484,10 +487,9 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
self.presentingViewController?.dismiss(animated: false, completion: completion)
return
}
replacingView.alpha = 1.0
// fade out content and toolbars
self.navigationController?.view.alpha = 0.0
self.view.alpha = 0.0
replacingView.alpha = 1.0
},
completion: { (_: Bool) in
self.presentingViewController?.dismiss(animated: false, completion: completion)