diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 93d3333ef3ab..118e52f1710d 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,6 +2,8 @@ 17.5 ----- +* [***] Block Editor: New Block: Reusable block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3490] +* [***] Block Editor: Add reusable blocks to the block inserter menu. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3054] 17.3.2 ----- diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index d456933640a3..81e01e0095b2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2290,6 +2290,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { boolean unsupportedBlockEditorSwitch = !mIsJetpackSsoEnabled && "gutenberg".equals(mSite.getWebEditor()); boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite); + boolean isWPComSite = mSite.isWPCom() || mSite.isWPComAtomic(); boolean canViewEditorOnboarding = ( mAccountStore.getAccount().getUserId() % 100 >= (100 - EDITOR_ONBOARDING_PHASE_PERCENTAGE) @@ -2303,6 +2304,9 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { isUnsupportedBlockEditorEnabled, unsupportedBlockEditorSwitch, !isFreeWPCom, // Disable audio block until it's usable on free sites via "Insert from URL" capability + // Only enable reusable block in WP.com sites until the issue + // (https://github.com/wordpress-mobile/gutenberg-mobile/issues/3457) in self-hosted sites is fixed + isWPComSite, wpcomLocaleSlug, postType, featuredImageId, diff --git a/build.gradle b/build.gradle index 4c373346d2d4..f11560728082 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'v1.53.1' + ext.gutenbergMobileVersion = 'develop-c55652b5fabf0e4edd08b79da4b78418aa886410' repositories { google() diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt index d010663b79ae..e1040eb7c8ba 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt @@ -15,6 +15,7 @@ data class GutenbergPropsBuilder( private val enableUnsupportedBlockEditor: Boolean, private val unsupportedBlockEditorSwitch: Boolean, private val enableAudioBlock: Boolean, + private val enableReusableBlock: Boolean, private val localeSlug: String, private val postType: String, private val featuredImageId: Int, @@ -29,6 +30,7 @@ data class GutenbergPropsBuilder( enableUnsupportedBlockEditor = enableUnsupportedBlockEditor, canEnableUnsupportedBlockEditor = unsupportedBlockEditorSwitch, enableAudioBlock = enableAudioBlock, + enableReusableBlock = enableReusableBlock, localeSlug = localeSlug, postType = postType, featuredImageId = featuredImageId,