Skip to content
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

[Gutenberg] Disable Story block #20005

Merged
merged 10 commits into from
Jan 26, 2024
Merged

[Gutenberg] Disable Story block #20005

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f4983b0
Disable Story block
fluiddot Jan 23, 2024
651aef7
Update Gutenberg Mobile reference
fluiddot Jan 23, 2024
dc2b0e8
Remove initial prop to control Story block
fluiddot Jan 23, 2024
79018e5
Update Gutenberg Mobile reference
fluiddot Jan 25, 2024
f8d5d41
Merge branch 'trunk' into gutenberg/disable-story-block
fluiddot Jan 25, 2024
6f5e57c
Update Gutenberg Mobile reference
fluiddot Jan 25, 2024
df45fc7
Update Gutenberg Mobile binary path to use new group id
fluiddot Jan 25, 2024
8c233d4
Include new group id in editor `build.gradle`
fluiddot Jan 25, 2024
4bc201c
Update Gutenberg Mobile reference with tag
fluiddot Jan 26, 2024
a127530
Merge branch 'trunk' into gutenberg/disable-story-block
fluiddot Jan 26, 2024
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
2 changes: 0 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
false,
false,
false,
false,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value removed was the one in position 9 corresponding to enableMediaFilesCollectionBlocks.

WordPress-Android/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt

Lines 12 to 21 in c3f4075

data class GutenbergPropsBuilder(
private val enableContactInfoBlock: Boolean,
private val enableLayoutGridBlock: Boolean,
private val enableTiledGalleryBlock: Boolean,
private val enableVideoPressBlock: Boolean,
private val enableFacebookEmbed: Boolean,
private val enableInstagramEmbed: Boolean,
private val enableLoomEmbed: Boolean,
private val enableSmartframeEmbed: Boolean,
private val enableMediaFilesCollectionBlocks: Boolean,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this note. 😅 We should consider refactoring this in the future to avoid so many unnamed parameters.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely 😅. Thanks that Android Studio displays the parameter name.

true,
false,
!isFreeWPCom,
Expand All @@ -2513,7 +2512,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_INSTAGRAM_EMBED_JETPACK_VERSION),
SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_LOOM_EMBED_JETPACK_VERSION),
SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_SMARTFRAME_EMBED_JETPACK_VERSION),
SiteUtils.supportsStoriesFeature(mSite, mJetpackFeatureRemovalPhaseHelper),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value removed was the one in position 9 corresponding to enableMediaFilesCollectionBlocks.

WordPress-Android/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt

Lines 12 to 21 in c3f4075

data class GutenbergPropsBuilder(
private val enableContactInfoBlock: Boolean,
private val enableLayoutGridBlock: Boolean,
private val enableTiledGalleryBlock: Boolean,
private val enableVideoPressBlock: Boolean,
private val enableFacebookEmbed: Boolean,
private val enableInstagramEmbed: Boolean,
private val enableLoomEmbed: Boolean,
private val enableSmartframeEmbed: Boolean,
private val enableMediaFilesCollectionBlocks: Boolean,

mSite.isUsingWpComRestApi(),
enableXPosts,
isUnsupportedBlockEditorEnabled,
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ext {
automatticRestVersion = '1.0.8'
automatticStoriesVersion = '2.4.0'
automatticTracksVersion = '3.3.0'
gutenbergMobileVersion = 'v1.111.1'
gutenbergMobileVersion = '6568-674dc6550184c3b60cbb392091f7e9166ab06cad'
wordPressAztecVersion = 'v1.9.0'
wordPressFluxCVersion = '2.61.0'
wordPressLoginVersion = '1.10.0'
Expand Down
2 changes: 1 addition & 1 deletion config/gradle/included_builds.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gradle.ext.fluxCBinaryPath = "org.wordpress:fluxc"
gradle.ext.wputilsBinaryPath = "org.wordpress:utils"
gradle.ext.gutenbergMobileBinaryPath = "org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge"
gradle.ext.gutenbergMobileBinaryPath = "org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following #20042, this change is needed to retrieve the GBM binaries.

gradle.ext.includedBuildGutenbergMobilePath = null
gradle.ext.loginFlowBinaryPath = "org.wordpress:login"
gradle.ext.storiesAndroidPath = "com.automattic:stories"
Expand Down
1 change: 1 addition & 0 deletions libs/editor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ repositories {
content {
includeGroup "org.wordpress"
includeGroup "org.wordpress.aztec"
includeGroup "org.wordpress.gutenberg-mobile"
includeGroupByRegex "org.wordpress.react-native-libraries.*"
// 'org.wordpress-mobile' group is deprecated. It's kept for now for smoother transition
// but it should be removed soon (within couple weeks)
Expand Down
2 changes: 0 additions & 2 deletions libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ data class GutenbergPropsBuilder(
private val enableInstagramEmbed: Boolean,
private val enableLoomEmbed: Boolean,
private val enableSmartframeEmbed: Boolean,
private val enableMediaFilesCollectionBlocks: Boolean,
private val enableMentions: Boolean,
private val enableXPosts: Boolean,
private val enableUnsupportedBlockEditor: Boolean,
Expand All @@ -43,7 +42,6 @@ data class GutenbergPropsBuilder(
enableInstagramEmbed = enableInstagramEmbed,
enableLoomEmbed = enableLoomEmbed,
enableSmartframeEmbed = enableSmartframeEmbed,
enableMediaFilesCollectionBlocks = enableMediaFilesCollectionBlocks,
enableMentions = enableMentions,
enableXPosts = enableXPosts,
enableUnsupportedBlockEditor = enableUnsupportedBlockEditor,
Expand Down
Loading