Merge pull request #11175 from wordpress-mobile/issue/integrate_media…

…_editor_button_changes [Gutenberg] Integrates Media Editing button listener
wordpress-mobile · Jan 28, 2020 · 41c618a · 41c618a
2 parents 99f19bd + 09935be
commit 41c618a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java b/...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
@@ -13,6 +13,7 @@
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnImageFullscreenPreviewListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
 
@@ -53,7 +54,8 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
                                   OnEditorAutosaveListener onEditorAutosaveListener,
                                   OnAuthHeaderRequestedListener onAuthHeaderRequestedListener,
                                   RequestExecutor fetchExecutor,
-        OnImageFullscreenPreviewListener onImageFullscreenPreviewListener) {
+                                  OnImageFullscreenPreviewListener onImageFullscreenPreviewListener,
+                                  OnMediaEditorListener onMediaEditorListener) {
             mWPAndroidGlueCode.attachToContainer(
                     viewGroup,
                     onMediaLibraryButtonListener,
@@ -62,7 +64,8 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
                     onEditorAutosaveListener,
                     onAuthHeaderRequestedListener,
                     fetchExecutor,
-                    onImageFullscreenPreviewListener);
+                    onImageFullscreenPreviewListener,
+                    onMediaEditorListener);
     }
 
     @Override

diff --git a/...r/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/...r/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
@@ -49,6 +49,7 @@
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnImageFullscreenPreviewListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
 
@@ -356,6 +357,11 @@ public void run() {
                     @Override public void onImageFullscreenPreviewClicked(String mediaUrl) {
                         mEditorImagePreviewListener.onImagePreviewRequested(mediaUrl);
                     }
+                },
+                new OnMediaEditorListener() {
+                    @Override public void onMediaEditorClicked(String mediaUrl) {
+                        // Show Media Editor
+                    }
                 });
 
         // request dependency injection. Do this after setting min/max dimensions

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
+6 −6		.circleci/config.yml
+1 −1		__device-tests__/gutenberg-editor-paragraph.test.js
+41 −6		__device-tests__/helpers/utils.js
+14 −10		__device-tests__/pages/editor-page.js
+5 −0		android/app/src/main/java/com/gutenberg/MainApplication.java
+1 −1		gutenberg
+5 −5		ios/gutenberg.xcodeproj/project.pbxproj
+12 −16		ios/gutenberg.xcodeproj/xcshareddata/xcschemes/gutenberg.xcscheme
+5 −0		ios/gutenberg/GutenbergViewController.swift
+2 −2		package.json
+10 −0		react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
+51 −0		react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java
+2 −0		react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
+2 −0		...-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
+6 −0		...droid/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
+15 −1		react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+6 −0		react-native-gutenberg-bridge/index.js
+5 −1		react-native-gutenberg-bridge/ios/GutenbergBridgeDelegate.swift
+1 −0		react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.m
+25 −0		react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift