Skip to content

Support for the EditorDidMount callback from GB #9230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2019
Merged

Support for the EditorDidMount callback from GB #9230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
561434e
Support for the EditorDidMount callback from GB
hypest Feb 13, 2019
0bc4c05
Minor code styling fix
hypest Feb 15, 2019
fe3ac5d
Update the gutenberg-mobile ref to the merged commit
hypest Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.view.ViewGroup;

import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
Expand Down Expand Up @@ -32,8 +33,10 @@ public boolean hasReceivedAnyContent() {
}

public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener onMediaLibraryButtonListener,
OnReattachQueryListener onReattachQueryListener) {
mWPAndroidGlueCode.attachToContainer(viewGroup, onMediaLibraryButtonListener, onReattachQueryListener);
OnReattachQueryListener onReattachQueryListener,
OnEditorMountListener onEditorMountListener) {
mWPAndroidGlueCode.attachToContainer(viewGroup, onMediaLibraryButtonListener, onReattachQueryListener,
onEditorMountListener);
}

@Override
Expand Down
7 changes: 7 additions & 0 deletions ...r/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.wordpress.android.util.helpers.MediaFile;
import org.wordpress.android.util.helpers.MediaGallery;
import org.wordpress.aztec.IHistoryListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
Expand Down Expand Up @@ -160,6 +161,12 @@ public void onQueryCurrentProgressForUploadingMedia() {
updateFailedMediaState();
updateMediaProgress();
}
},
new OnEditorMountListener() {
@Override
public void onEditorDidMount(boolean hasUnsupportedBlocks) {
// TODO: add Tracks
}
}
);

Expand Down
2 changes: 1 addition & 1 deletion libs/gutenberg-mobile
Open in desktop
Submodule gutenberg-mobile updated 23 files
+1 −0 android/app/build.gradle
+30 −1 android/app/src/main/java/com/gutenberg/MainApplication.java
+2 −0 android/settings.gradle
+140 −136 bundle/android/App.js
+1 −1 bundle/android/App.js.map
+146 −142 bundle/ios/App.js
+1 −1 bundle/ios/App.js.map
+1 −1 gutenberg
+4 −0 ios/gutenberg/GutenbergViewController.swift
+1 −0 jest/setup.js
+1 −1 package.json
+2 −0 ...-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
+4 −0 ...droid/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
+13 −1 react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+4 −0 react-native-gutenberg-bridge/ios/GutenbergBridgeDelegate.swift
+1 −0 react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.m
+7 −0 react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift
+2 −2 react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
+8 −0 src/app/AppContainer.js
+1 −0 src/block-management/block-toolbar.js
+4 −0 src/block-management/block-toolbar.scss
+3 −1 src/index.js
+3 −3 yarn.lock