Use navigation bar for image editor buttons.

SignalMessaging/Views/ImageEditor/ImageEditorView.swift

@@ -40,6 +40,7 @@ public class ImageEditorView: UIView {
 
             updateButtons()
             updateGestureState()
+            delegate?.imageEditorUpdateNavigationBar()
         }
     }
 
@@ -264,12 +265,19 @@ public class ImageEditorView: UIView {
         let captionButton = navigationBarButton(imageName: "image_editor_caption",
                                              selector: #selector(didTapCaption(sender:)))
 
+        switch editorMode {
+        case .text:
+            return []
+        case .brush:
+            return []
+        case .none:
             if model.canUndo() {
                 return [undoButton, newTextButton, brushButton, cropButton, captionButton]
             } else {
                 return [newTextButton, brushButton, cropButton, captionButton]
             }
         }
+    }
 
     // MARK: - Actions