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] Remove code associated to Story block #20400

Merged
merged 6 commits into from
Mar 5, 2024
Merged

[Gutenberg] Remove code associated to Story block #20400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e094304
Remove remaining editor listeners related to Story block
fluiddot Mar 4, 2024
c461163
Update Gutenberg Mobile reference
fluiddot Mar 4, 2024
3e9a3f7
Update Gutenberg Mobile reference with alpha tag
fluiddot Mar 4, 2024
513e08c
Update release notes
fluiddot Mar 4, 2024
6d55ea1
Move release note entry to version 24.5
fluiddot Mar 4, 2024
2145a7b
Merge branch 'trunk' into gutenberg/remove/story-block
fluiddot Mar 5, 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: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

24.5
-----

* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400]

24.4
-----
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 @@ -22,7 +22,7 @@ ext {
automatticAboutVersion = '1.4.0'
automatticRestVersion = '1.0.8'
automatticTracksVersion = '3.4.0'
gutenbergMobileVersion = 'v1.114.0'
gutenbergMobileVersion = 'v1.115.0-alpha1'
wordPressAztecVersion = 'v2.0'
wordPressFluxCVersion = '2.70.0'
wordPressLoginVersion = '1.14.1'
Expand Down
4 changes: 0 additions & 4 deletions ...itor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidRequestUnsupportedBlockFallbackListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidSendButtonPressedActionListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnImageFullscreenPreviewListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnFocalPointPickerTooltipShownEventListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener;
Expand Down Expand Up @@ -72,7 +71,6 @@ public boolean hasReceivedAnyContent() {

public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener onMediaLibraryButtonListener,
OnReattachMediaUploadQueryListener onReattachQueryListener,
OnReattachMediaSavingQueryListener onStorySavingReattachQueryListener,
OnSetFeaturedImageListener onSetFeaturedImageListener,
OnEditorMountListener onEditorMountListener,
OnEditorAutosaveListener onEditorAutosaveListener,
Expand Down Expand Up @@ -102,7 +100,6 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
viewGroup,
onMediaLibraryButtonListener,
onReattachQueryListener,
onStorySavingReattachQueryListener,
onSetFeaturedImageListener,
onEditorMountListener,
onEditorAutosaveListener,
Expand All @@ -114,7 +111,6 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
onGutenbergDidRequestEmbedFullscreenPreviewListener,
onGutenbergDidSendButtonPressedActionListener,
showSuggestionsUtil,
null,
onFPPTooltipShownEventListener,
onGutenbergDidRequestPreviewListener,
onBlockTypeImpressionsListener,
Expand Down
9 changes: 0 additions & 9 deletions .../editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidRequestUnsupportedBlockFallbackListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidSendButtonPressedActionListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnSetFeaturedImageListener;

Expand Down Expand Up @@ -362,14 +361,6 @@ public void onQueryCurrentProgressForUploadingMedia() {
updateMediaProgress();
}
},
new OnReattachMediaSavingQueryListener() {
@Override public void onQueryCurrentProgressForSavingMedia() {
// TODO: probably go through mFailedMediaIds, and see if any block in the post content
// has these mediaFIleIds. If there's a match, mark such a block in FAILED state.
updateFailedMediaState();
updateMediaProgress();
}
},
new OnSetFeaturedImageListener() {
@Override
public void onSetFeaturedImageButtonClicked(int mediaId) {
Expand Down
Loading