From b139e05fdb28ac775e12e4d71fcf3bfc7f60e415 Mon Sep 17 00:00:00 2001 From: Igor Solomennikov Date: Mon, 28 Feb 2022 17:49:05 -0800 Subject: [PATCH] Use simpler cross-fade transition between camera and media library. --- .../Photos/SendMediaNavigationController.swift | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 3477e4ffbd..2568541230 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -313,7 +313,7 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { guard isGranted else { return } BenchEventStart(title: "Show-Media-Library", eventId: "Show-Media-Library") - self.pushViewController(self.mediaLibraryViewController, animated: true) + self.fadeTo(viewControllers: [self.mediaLibraryViewController], duration: 0.3) } } @@ -347,16 +347,11 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate { } func imagePickerDidRequestPresentCamera(_ imagePicker: ImagePickerGridController) { - if let cameraViewController = viewControllers.first as? PhotoCaptureViewController { - popToViewController(cameraViewController, animated: true) - return - } - self.ows_askForCameraPermissions { isGranted in guard isGranted else { return } BenchEventStart(title: "Show-Camera", eventId: "Show-Camera") - self.fadeTo(viewControllers: [self.captureViewController], duration: 0.08) + self.fadeTo(viewControllers: [self.captureViewController], duration: 0.3) } }