Editor - Move Undo/Redo to the header #18705

geriux · 2023-06-27T15:34:30Z

Related PRs:

This PR adds new undo/redo buttons in the navigation bar when the editor is opened, it also updates the existing menu icon.

Screenshots

Light mode	Dark mode

Landscape Light mode	Landscape Dark mode

RTL Languages

Tablet Portrait Light mode	Tablet Portrait Dark mode

Tablet Landscape Light mode	Tablet Landscape Dark mode

To test

Install the build
Create a new post
Add a few blocks/text
Tap on the new undo/redo buttons in the navigation bar
Expect the content to change accordingly depending on the button you've tapped

Bonus testing: follow these test cases.

Regression Notes

Potential unintended areas of impact
Post publishing
What I did to test those areas of impact (or what existing automated tests I relied on)
Rely on current tests and manual testing
What automated tests I added (or what prevented me from doing so)
Added new tests for testing the new undo/redo buttons in the navigation bar.

PR submission checklist:

I have completed the Regression Notes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

UI Changes testing checklist:

Portrait and landscape orientations.
Light and dark modes.
Fonts: Larger, smaller and bold text.
High contrast.
Talkback.
Languages with large words or with letters/accents not frequently used in English.
Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
Large and small screen sizes. (Tablet and smaller phones)
Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)

wpmobilebot · 2023-06-27T15:53:21Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr18705-4375c4f
	Commit	`4375c4f`
	Direct Download	`wordpress-prototype-build-pr18705-4375c4f.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2023-06-27T15:54:45Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr18705-4375c4f
	Commit	`4375c4f`
	Direct Download	`jetpack-prototype-build-pr18705-4375c4f.apk`

Note: Google Login is not supported on these builds.

… with the site icon

…ton icon

tiagomar

Hey @geriux, let me start by saying that I only reviewed the UI Tests related changes, so a review from other engineer is still needed.

I've left a couple of comments but the one about avoiding duplication is the only thing I think we should address before merging to trunk.

Thanks for adding the tests! 🙇

WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.kt

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.kt

thomashorta

Hey @geriux, thanks for the changes! 🙇

I found some improvement opportunities in the code to make it achieve better readability, and performance, and be more in line with some guidelines and expectations. Those points were mostly related to resource usage, menu options setup, and toolbar customization.

As we discussed earlier today, I will go ahead and push a few commits adjusting the code instead of adding several comments, as that will probably be more productive.

Feel free to ping me to discuss the changes as well.

Thanks again!

PS: I didn't touch @tiagomar requests so that will probably still be pending.

WordPress/src/main/res/layout/edit_post_header.xml

… to e2eBlockEditorCanUndoRedoChanges

…sal of the dialog

geriux · 2023-07-06T12:43:15Z

As we discussed earlier today, I will go ahead and push a few commits adjusting the code instead of adding several comments, as that will probably be more productive.

Hey @thomashorta ! Thank you so much for that! It is working well! One thing I noticed and I was wondering if you would have any ideas, when switching the device to landscape or for example changing to dark/light mode with the editor opened, the undo/redo buttons go back to their initial state (disabled) I double checked and it happened with the initial changes as well. Do you by any chance know why this is happening? 🤔 I'll keep investigating to see if I find a solution.

thomashorta · 2023-07-06T13:03:34Z

One thing I noticed and I was wondering if you would have any ideas, when switching the device to landscape or for example changing to dark/light mode with the editor opened, the undo/redo buttons go back to their initial state (disabled) I double checked and it happened with the initial changes as well. Do you by any chance know why this is happening? 🤔 I'll keep investigating to see if I find a solution.

I noticed that as well and thought it was a limitation from the editor itself since the undo/redo state is controlled by the editor (onToggleUndo/Redo). I tried a very naive fix by simply restoring the boolean state (using the stateKeyRedo you had previously created inside onRestoreInstanceState) but that didn't seem to work as it seemed like onToggleUndo and onToggleRedo were called with isDisabled = true.

Do you know if the underlying editor is saving the edit stack state in those configuration change scenarios? For instance using onSaveInstanceState and onRestoreInstanceState bundles to save and reload the stack or other non-lifecycle bound storing mechanism.

geriux · 2023-07-06T13:18:08Z

It looks like this works, @thomashorta what do you think about adding this?

index 4bd98d58cc..95a6d44a06 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
@@ -308,6 +308,8 @@ public class EditPostActivity extends LocaleAwareActivity implements
     private static final String STATE_KEY_EDITOR_SESSION_DATA = "stateKeyEditorSessionData";
     private static final String STATE_KEY_GUTENBERG_IS_SHOWN = "stateKeyGutenbergIsShown";
     private static final String STATE_KEY_MEDIA_CAPTURE_PATH = "stateKeyMediaCapturePath";
+    private static final String STATE_KEY_UNDO = "stateKeyUndo";
+    private static final String STATE_KEY_REDO = "stateKeyRedo";
 
     private static final int PAGE_CONTENT = 0;
     private static final int PAGE_SETTINGS = 1;
@@ -1100,6 +1102,8 @@ public class EditPostActivity extends LocaleAwareActivity implements
         outState.putBoolean(STATE_KEY_IS_NEW_POST, mIsNewPost);
         outState.putBoolean(STATE_KEY_IS_PHOTO_PICKER_VISIBLE, mEditorPhotoPicker.isPhotoPickerShowing());
         outState.putBoolean(STATE_KEY_HTML_MODE_ON, mHtmlModeMenuStateOn);
+        outState.putBoolean(STATE_KEY_UNDO, mMenuHasUndo);
+        outState.putBoolean(STATE_KEY_REDO, mMenuHasRedo);
         outState.putSerializable(WordPress.SITE, mSite);
         outState.putParcelable(STATE_KEY_REVISION, mRevision);
 
@@ -1124,6 +1128,8 @@ public class EditPostActivity extends LocaleAwareActivity implements
         super.onRestoreInstanceState(savedInstanceState);
 
         mHtmlModeMenuStateOn = savedInstanceState.getBoolean(STATE_KEY_HTML_MODE_ON);
+        mMenuHasUndo = savedInstanceState.getBoolean(STATE_KEY_UNDO);
+        mMenuHasRedo = savedInstanceState.getBoolean(STATE_KEY_REDO);
         if (savedInstanceState.getBoolean(STATE_KEY_IS_PHOTO_PICKER_VISIBLE, false)) {
             mEditorPhotoPicker.showPhotoPicker(mSite);
         }

tiagomar

Thanks for considering the suggestions! 🙇
The changes look good from a UI Test perspective.

thomashorta · 2023-07-06T14:01:23Z

It looks like this works, @thomashorta what do you think about adding this?

This looks great. I added that before but I just realized I tested a more extreme scenario (system-initiated process death) and not the more common configuration changes 🤦‍♂️ . It makes total sense to me to add what you suggested. Thanks for looking into it! 🙇

About the system-initiate process death, it is a tougher scenario and I think it's not that problematic to lose undo/redo state in that case since it's not very likely that someone will keep the app open in the editor screen in the background for long enough that system kills it (which is usually when that occurs).

geriux · 2023-07-06T14:19:45Z

This looks great. I added that before but I just realized I tested a more extreme scenario (system-initiated process death) and not the more common configuration changes 🤦‍♂️ . It makes total sense to me to add what you suggested. Thanks for looking into it! 🙇

No worries, I'll add that patch then 🚀 thank you!

About the system-initiate process death, it is a tougher scenario and I think it's not that problematic to lose undo/redo state in that case since it's not very likely that someone will keep the app open in the editor screen in the background for long enough that system kills it (which is usually when that occurs).

Good to know! And I agree 👍

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

# Conflicts: # build.gradle

…evron_down

thomashorta

The code here looks good to me and things are working as expected.

Thanks @geriux for the PR and changes!

I am approving it, but I added a comment regarding the dependency version, please make sure this PR points to Gutenberg Mobile's trunk before merging.

build.gradle

wpmobilebot · 2023-07-11T15:25:30Z

Found 1 violations:

The PR caused the following dependency changes:

 \--- project :libs:editor
-     \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.99.0
-          +--- com.facebook.fresco:animated-gif:2.0.0
-          |    +--- com.parse.bolts:bolts-tasks:1.4.0
-          |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.4 (*)
-          |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-          |    \--- com.facebook.fresco:animated-base:2.0.0
-          |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-          |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0 (*)
-          |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
-          |         +--- com.facebook.fresco:animated-drawable:2.0.0
-          |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
-          |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0 (*)
-          |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-          |         \--- com.parse.bolts:bolts-tasks:1.4.0
-          +--- com.google.android.material:material:1.2.1 -> 1.9.0 (*)
-          +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-6
-          |    +--- com.google.android.exoplayer:exoplayer:2.13.3
-          |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
-          |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    |    \--- com.google.guava:guava:27.1-android
-          |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
-          |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-          |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
-          |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
-          |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-          |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-          |    |         \--- androidx.media:media:1.2.1 (*)
-          |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-          |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
-          |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
-          |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-          |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.10.0 (*)
-          |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.10.0 (*)
-          +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-4
-          +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
-          +--- com.github.wordpress-mobile:react-native-reanimated:2.9.1-wp-4
-          +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-4
-          |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.6.1 (*)
-          +--- com.github.wordpress-mobile:react-native-gesture-handler:2.3.2-wp-3
-          |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.9.1-wp-4
-          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
-          |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.8.21 (*)
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-get-random-values:1.4.0
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-safe-area-context:3.2.0
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-screens:2.9.0
-          |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
-          |    +--- androidx.fragment:fragment:1.2.1 -> 1.5.7 (*)
-          |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
-          |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-          |    \--- com.google.android.material:material:1.1.0 -> 1.9.0 (*)
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-svg:9.13.6
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-webview:11.26.1
-          |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.8.21 (*)
-          |    \--- androidx.webkit:webkit:1.4.0
-          |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |         \--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-masked-view:0.2.6
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-clipboard:1.9.0
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-fast-image:8.5.11
-          |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1
-          |    |    +--- com.github.bumptech.glide:gifdecoder:4.15.1
-          |    |    |    \--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-          |    |    +--- com.github.bumptech.glide:disklrucache:4.15.1
-          |    |    +--- com.github.bumptech.glide:annotations:4.15.1
-          |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.5.7 (*)
-          |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-          |    |    +--- androidx.exifinterface:exifinterface:1.3.3 -> 1.3.6 (*)
-          |    |    \--- androidx.tracing:tracing:1.0.0 (*)
-          |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
-          |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1 (*)
-          |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.10.0 (*)
-          |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-          +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.99.0
-          |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-          |    +--- androidx.gridlayout:gridlayout:1.0.0
-          |    |    +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
-          |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
-          |    +--- androidx.cardview:cardview:1.0.0 (*)
-          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
-          |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-          |    +--- org.wordpress:aztec:v1.6.4 (*)
-          |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.6.4 (*)
-          |    +--- org.wordpress.aztec:wordpress-comments:v1.6.4 (*)
-          |    +--- org.wordpress.aztec:glide-loader:v1.6.4
-          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-          |    |    +--- org.wordpress:aztec:v1.6.4 (*)
-          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-          \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+     \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.100.0-alpha1
+          +--- com.facebook.fresco:animated-gif:2.0.0
+          |    +--- com.parse.bolts:bolts-tasks:1.4.0
+          |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.4 (*)
+          |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+          |    \--- com.facebook.fresco:animated-base:2.0.0
+          |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+          |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0 (*)
+          |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
+          |         +--- com.facebook.fresco:animated-drawable:2.0.0
+          |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
+          |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0 (*)
+          |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+          |         \--- com.parse.bolts:bolts-tasks:1.4.0
+          +--- com.google.android.material:material:1.2.1 -> 1.9.0 (*)
+          +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-6
+          |    +--- com.google.android.exoplayer:exoplayer:2.13.3
+          |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
+          |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    |    \--- com.google.guava:guava:27.1-android
+          |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
+          |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+          |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
+          |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
+          |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+          |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          |    |         \--- androidx.media:media:1.2.1 (*)
+          |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+          |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
+          |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
+          |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+          |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.10.0 (*)
+          |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.10.0 (*)
+          +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-4
+          +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
+          +--- com.github.wordpress-mobile:react-native-reanimated:2.9.1-wp-4
+          +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-4
+          |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.6.1 (*)
+          +--- com.github.wordpress-mobile:react-native-gesture-handler:2.3.2-wp-3
+          |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.9.1-wp-4
+          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
+          |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.8.21 (*)
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-get-random-values:1.4.0
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-safe-area-context:3.2.0
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-screens:2.9.0
+          |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
+          |    +--- androidx.fragment:fragment:1.2.1 -> 1.5.7 (*)
+          |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
+          |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
+          |    \--- com.google.android.material:material:1.1.0 -> 1.9.0 (*)
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-svg:9.13.6
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-webview:11.26.1
+          |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.8.21 (*)
+          |    \--- androidx.webkit:webkit:1.4.0
+          |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |         \--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-masked-view:0.2.6
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-clipboard:1.9.0
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-fast-image:8.5.11
+          |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1
+          |    |    +--- com.github.bumptech.glide:gifdecoder:4.15.1
+          |    |    |    \--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+          |    |    +--- com.github.bumptech.glide:disklrucache:4.15.1
+          |    |    +--- com.github.bumptech.glide:annotations:4.15.1
+          |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.5.7 (*)
+          |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+          |    |    +--- androidx.exifinterface:exifinterface:1.3.3 -> 1.3.6 (*)
+          |    |    \--- androidx.tracing:tracing:1.0.0 (*)
+          |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
+          |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1 (*)
+          |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.10.0 (*)
+          |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+          +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.100.0-alpha1
+          |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+          |    +--- androidx.gridlayout:gridlayout:1.0.0
+          |    |    +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
+          |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
+          |    +--- androidx.cardview:cardview:1.0.0 (*)
+          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
+          |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          |    +--- org.wordpress:aztec:v1.6.4 (*)
+          |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.6.4 (*)
+          |    +--- org.wordpress.aztec:wordpress-comments:v1.6.4 (*)
+          |    +--- org.wordpress.aztec:glide-loader:v1.6.4
+          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+          |    |    +--- org.wordpress:aztec:v1.6.4 (*)
+          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+          \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)

Please review and act accordingly

geriux added [Status] In Progress Gutenberg Editing and display of Gutenberg blocks. labels Jun 27, 2023

This was referenced Jun 27, 2023

Move Undo/Redo buttons wordpress-mobile/gutenberg-mobile#5889

Merged

[Mobile] - Move Undo/Redo buttons WordPress/gutenberg#51766

Merged

Editor - Move Undo/Redo to the header wordpress-mobile/WordPress-iOS#20930

Merged

geriux added this to the 22.8 milestone Jun 29, 2023

Gerardo added 6 commits June 29, 2023 18:37

Editor - Add Undo/Redo buttons to the Toolbar and custom close button…

60829f3

… with the site icon

Gutenberg update background color and use tintColor for the close but…

c76ebc3

…ton icon

Update icon color

59e07eb

Add custom styles for the menu undo/redo actions

f3ff82b

Update icon's colors

13a75b6

Update Gutenberg ref

ace80c9

geriux force-pushed the gutenberg/move-undo-redo-buttons branch from a774d94 to ace80c9 Compare June 29, 2023 16:38

Gerardo added 3 commits June 30, 2023 16:14

Fix accessibility issues for the menu and linting warnings

7b5d0ce

Adds E2E tests for the undo and redo functionality in the navigation bar

d90098a

Fix undo/redo positions in RTL

1b4766d

geriux marked this pull request as ready for review July 3, 2023 15:04

geriux requested a review from a team as a code owner July 3, 2023 15:04

geriux removed the [Status] In Progress label Jul 3, 2023

tiagomar requested changes Jul 4, 2023

View reviewed changes

WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.kt Outdated Show resolved Hide resolved

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.kt Outdated Show resolved Hide resolved

Thomas Horta added 3 commits July 5, 2023 14:53

code improvements for topbar and menu

01f52d3

remove undo/redo unused saved state

8c9da23

add content description to undo/redo options

dbdbe98

thomashorta reviewed Jul 5, 2023

View reviewed changes

WordPress/src/main/res/layout/edit_post_header.xml Outdated Show resolved Hide resolved

geriux modified the milestones: 22.8, 22.9 Jul 6, 2023

BlockEditorTests - Unify undo/redo tests into one, it also renames it…

86a3db8

… to e2eBlockEditorCanUndoRedoChanges

BlockEditorPage - Update verifyContentStructure to include the dismis…

2abfcda

…sal of the dialog

geriux requested a review from tiagomar July 6, 2023 10:18

tiagomar reviewed Jul 6, 2023

View reviewed changes

tiagomar approved these changes Jul 6, 2023

View reviewed changes

EditPostActivity - Store undo/redo state

c9a98c8

geriux commented Jul 6, 2023

View reviewed changes

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java Outdated Show resolved Hide resolved

geriux self-assigned this Jul 6, 2023

Gerardo added 4 commits July 7, 2023 18:24

Merge branch 'trunk' into gutenberg/move-undo-redo-buttons

2e6bbb0

# Conflicts: # build.gradle

Custom overflow icon for the editor navigation bar

b5f8c10

Update Gutenberg ref

419b6c4

Update EditPostHeader to use a new icon (chevron_left) and removes ch…

9c1e6af

…evron_down

thomashorta approved these changes Jul 10, 2023

View reviewed changes

build.gradle Outdated Show resolved Hide resolved

Gerardo added 3 commits July 11, 2023 16:51

Merge branch 'trunk' into gutenberg/move-undo-redo-buttons

25bc1ad

Update Release notes

814a70b

Update Gutenberg ref

4375c4f

geriux merged commit 94c0c5e into trunk Jul 11, 2023

geriux deleted the gutenberg/move-undo-redo-buttons branch July 11, 2023 16:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Editor - Move Undo/Redo to the header #18705

Editor - Move Undo/Redo to the header #18705

geriux commented Jun 27, 2023 •

edited

Loading

wpmobilebot commented Jun 27, 2023 •

edited

Loading

wpmobilebot commented Jun 27, 2023 •

edited

Loading

tiagomar left a comment

thomashorta left a comment •

edited

Loading

geriux commented Jul 6, 2023

thomashorta commented Jul 6, 2023

geriux commented Jul 6, 2023

tiagomar left a comment

thomashorta commented Jul 6, 2023

geriux commented Jul 6, 2023

thomashorta left a comment

wpmobilebot commented Jul 11, 2023

Editor - Move Undo/Redo to the header #18705

Editor - Move Undo/Redo to the header #18705

Conversation

geriux commented Jun 27, 2023 • edited Loading

Screenshots

To test

Regression Notes

wpmobilebot commented Jun 27, 2023 • edited Loading

wpmobilebot commented Jun 27, 2023 • edited Loading

tiagomar left a comment

Choose a reason for hiding this comment

thomashorta left a comment • edited Loading

Choose a reason for hiding this comment

geriux commented Jul 6, 2023

thomashorta commented Jul 6, 2023

geriux commented Jul 6, 2023

tiagomar left a comment

Choose a reason for hiding this comment

thomashorta commented Jul 6, 2023

geriux commented Jul 6, 2023

thomashorta left a comment

Choose a reason for hiding this comment

wpmobilebot commented Jul 11, 2023

The PR caused the following dependency changes:

geriux commented Jun 27, 2023 •

edited

Loading

wpmobilebot commented Jun 27, 2023 •

edited

Loading

wpmobilebot commented Jun 27, 2023 •

edited

Loading

thomashorta left a comment •

edited

Loading