Tweak how image editor overlays are presented.

SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift

@@ -1156,32 +1156,28 @@ extension AttachmentPrepViewController: UIScrollViewDelegate {
 // MARK: -
 
 extension AttachmentPrepViewController: ImageEditorViewDelegate {
-    public func imageEditor(presentFullScreenOverlay viewController: UIViewController,
+    public func imageEditor(presentFullScreenView viewController: UIViewController,
-                            withNavigation: Bool) {
+                            isTransparent: Bool) {
 
-        if withNavigation {
+        let navigationController = OWSNavigationController(rootViewController: viewController)
-            let navigationController = OWSNavigationController(rootViewController: viewController)
+        navigationController.modalPresentationStyle = (isTransparent
-            navigationController.modalPresentationStyle = .overFullScreen
+            ? .overFullScreen
+            : .fullScreen)
 
-            if let navigationBar = navigationController.navigationBar as? OWSNavigationBar {
+        if let navigationBar = navigationController.navigationBar as? OWSNavigationBar {
-                navigationBar.overrideTheme(type: .clear)
+            navigationBar.overrideTheme(type: .clear)
-            } else {
-                owsFailDebug("navigationBar was nil or unexpected class")
-            }
-
-            self.present(navigationController, animated: false) {
-                // Do nothing.
-            }
         } else {
-            self.present(viewController, animated: false) {
+            owsFailDebug("navigationBar was nil or unexpected class")
-                // Do nothing.
+        }
-            }
+
+        self.present(navigationController, animated: false) {
+            // Do nothing.
         }
     }
 
     public func imageEditorPresentCaptionView() {
         let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem)
-        self.imageEditor(presentFullScreenOverlay: view, withNavigation: true)
+        self.imageEditor(presentFullScreenView: view, isTransparent: true)
 
         isShowingCaptionView = true
     }

SignalMessaging/Views/ImageEditor/ImageEditorView.swift

@@ -6,8 +6,8 @@ import UIKit
 
 @objc
 public protocol ImageEditorViewDelegate: class {
-    func imageEditor(presentFullScreenOverlay viewController: UIViewController,
+    func imageEditor(presentFullScreenView viewController: UIViewController,
-                     withNavigation: Bool)
+                     isTransparent: Bool)
     func imageEditorPresentCaptionView()
     func imageEditorUpdateNavigationBar()
     func imageEditorAttachmentCount() -> Int
@@ -134,8 +134,8 @@ public class ImageEditorView: UIView {
         Logger.verbose("")
 
         let brushView = ImageEditorBrushViewController(delegate: self, model: model, currentColor: currentColor)
-        self.delegate?.imageEditor(presentFullScreenOverlay: brushView,
+        self.delegate?.imageEditor(presentFullScreenView: brushView,
-                                   withNavigation: true)
+                                   isTransparent: false)
     }
 
     @objc func didTapCrop(sender: UIButton) {
@@ -434,8 +434,8 @@ public class ImageEditorView: UIView {
                                                        model: model,
                                                        textItem: textItem,
                                                        maxTextWidthPoints: maxTextWidthPoints)
-        self.delegate?.imageEditor(presentFullScreenOverlay: textEditor,
+        self.delegate?.imageEditor(presentFullScreenView: textEditor,
-                                   withNavigation: true)
+                                   isTransparent: false)
     }
 
     // MARK: - Crop Tool
@@ -458,8 +458,8 @@ public class ImageEditorView: UIView {
         }
 
         let cropTool = ImageEditorCropViewController(delegate: self, model: model, srcImage: srcImage, previewImage: previewImage)
-        self.delegate?.imageEditor(presentFullScreenOverlay: cropTool,
+        self.delegate?.imageEditor(presentFullScreenView: cropTool,
-                                   withNavigation: true)
+                                   isTransparent: false)
     }}
 
 // MARK: -