Merge pull request #21223 from wordpress-mobile/task/integrate-gutenb…

…erg-kit-with-api Add GutenbergKit
wordpress-mobile · Oct 17, 2024 · 93c47b1 · 93c47b1
2 parents 3574ac4 + 8e5333d
commit 93c47b1
Show file tree

Hide file tree

Showing 11 changed files with 320 additions and 77 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -93,6 +93,7 @@ repositories {
             includeGroup "org.wordpress.fluxc"
             includeGroup "org.wordpress.wellsql"
             includeGroup "org.wordpress.gutenberg-mobile"
+            includeGroup "org.wordpress.gutenbergkit"
             includeGroupByRegex "org.wordpress.react-native-libraries.*"
             includeGroup "com.automattic"
             includeGroup "com.automattic.tracks"
@@ -218,6 +219,7 @@ android {
         buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
         buildConfigField "boolean", "SYNC_PUBLISHING", "false"
         buildConfigField "boolean", "ENABLE_IN_APP_UPDATES", "false"
+        buildConfigField "boolean", "ENABLE_NEW_GUTENBERG", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
@@ -431,6 +433,8 @@ dependencies {
     }
     implementation("$gradle.ext.aboutAutomatticBinaryPath:${libs.versions.automattic.about.get()}")
 
+    implementation("$gradle.ext.gutenbergKitBinaryPath:${libs.versions.gutenberg.kit.get()}")
+
     implementation(libs.automattic.rest) {
         exclude group: 'com.mcxiaoke.volley'
     }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt
@@ -42,4 +42,5 @@ object EditPostActivityConstants{
     const val STATE_KEY_UNDO = "stateKeyUndo"
     const val STATE_KEY_REDO = "stateKeyRedo"
     const val STATE_KEY_IS_VOICE_CONTENT_SET = "stateKeyIsVoiceContentSet"
+    const val STATE_KEY_IS_NEW_GUTENBERG = "stateKeyIsNewGutenberg"
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/NewGutenbergFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/NewGutenbergFeatureConfig.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.BuildConfig
+import org.wordpress.android.annotation.Feature
+import javax.inject.Inject
+
+private const val NEW_GUTENBERG_FEATURE_REMOTE_FIELD = "experimental_block_editor"
+
+@Feature(NEW_GUTENBERG_FEATURE_REMOTE_FIELD, false)
+class NewGutenbergFeatureConfig @Inject constructor(
+    appConfig: AppConfig
+) : FeatureConfig(
+    appConfig,
+    BuildConfig.ENABLE_NEW_GUTENBERG,
+    NEW_GUTENBERG_FEATURE_REMOTE_FIELD
+)
diff --git a/config/gradle/included_builds.gradle b/config/gradle/included_builds.gradle
@@ -2,6 +2,8 @@ gradle.ext.fluxCBinaryPath = "org.wordpress:fluxc"
 gradle.ext.wputilsBinaryPath = "org.wordpress:utils"
 gradle.ext.gutenbergMobileBinaryPath = "org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge"
 gradle.ext.includedBuildGutenbergMobilePath = null
+gradle.ext.gutenbergKitBinaryPath = "org.wordpress.gutenbergkit:android"
+gradle.ext.includedBuildGutenbergKitPath = null
 gradle.ext.loginFlowBinaryPath = "org.wordpress:login"
 gradle.ext.aztecAndroidAztecPath = "org.wordpress:aztec"
 gradle.ext.aztecAndroidWordPressShortcodesPath = "org.wordpress.aztec:wordpress-shortcodes"
@@ -54,6 +56,16 @@ if (localBuilds.exists()) {
         }
     }
 
+    if (ext.has("localGutenbergKitPath")) {
+        gradle.ext.includedBuildGutenbergKitPath = ext.localGutenbergKitPath
+        includeBuild("$ext.localGutenbergKitPath/Demo-Android") {
+            dependencySubstitution {
+                println "Substituting GutenbergKit with the local build"
+                substitute module("$gradle.ext.gutenbergKitBinaryPath") using project(':Gutenberg')
+            }
+        }
+    }
+
     if (ext.has("localLoginFlowPath")) {
         includeBuild(ext.localLoginFlowPath) {
             dependencySubstitution {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -65,6 +65,7 @@ google-play-services-auth = '20.4.1'
 google-services = '4.4.2'
 gravatar = '1.0.0'
 greenrobot-eventbus = '3.3.1'
+gutenberg-kit = 'trunk-a58a46f3fbb892f311b562e3c122d7ef4ebbfe33'
 gutenberg-mobile = 'v1.121.0'
 indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
 jackson-databind = '2.12.7.1'

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
@@ -12,6 +12,7 @@ repositories {
             includeGroup "org.wordpress"
             includeGroup "org.wordpress.aztec"
             includeGroup "org.wordpress.gutenberg-mobile"
+            includeGroup "org.wordpress.gutenbergkit"
             includeGroupByRegex "org.wordpress.react-native-libraries.*"
             includeGroup "com.automattic"
             includeGroup "com.automattic.tracks"
@@ -93,6 +94,10 @@ dependencies {
         exclude module: 'react-android'
     }
 
+    // This dependency will be substituted if the `local-builds.gradle` file contains
+    // `localGutenbergKitPath`. Details for this can be found in the `settings.gradle` file.
+    implementation("$rootProject.gradle.ext.gutenbergKitBinaryPath:${libs.versions.gutenberg.kit.get()}")
+
     implementation(libs.wordpress.utils)
 
     implementation(libs.androidx.lifecycle.common)

diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java b/libs/editor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
@@ -106,6 +106,7 @@
 import org.wordpress.aztec.toolbar.IAztecToolbarClickListener;
 import org.wordpress.aztec.util.AztecLog;
 import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder;
+import org.wordpress.gutenberg.GutenbergView.ContentChangeListener;
 import org.xml.sax.Attributes;
 
 import java.util.ArrayList;
@@ -706,6 +707,9 @@ public Pair<CharSequence, CharSequence> getTitleAndContent(CharSequence original
         return new Pair<>(getTitle(), getContent(originalContent));
     }
 
+    @Override public void onEditorContentChanged(@Nullable ContentChangeListener listener) {
+    }
+
     @Override
     public void onToolbarCollapseButtonClicked() {
         mEditorFragmentListener.onTrackableEvent(TrackableEvent.ELLIPSIS_COLLAPSE_BUTTON_TAPPED);

diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
@@ -20,6 +20,7 @@
 import org.wordpress.android.editor.gutenberg.DialogVisibilityProvider;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
+import org.wordpress.gutenberg.GutenbergView.ContentChangeListener;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,6 +39,7 @@ public class EditorFragmentNotAddedException extends Exception {
     public abstract void showContentInfo() throws EditorFragmentNotAddedException;
     public abstract Pair<CharSequence, CharSequence> getTitleAndContent(CharSequence originalContent) throws
             EditorFragmentNotAddedException;
+    public abstract void onEditorContentChanged(ContentChangeListener listener);
     public abstract LiveData<Editable> getTitleOrContentChanged();
     public abstract void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader);
     public abstract void appendMediaFiles(Map<String, MediaFile> mediaList);