feat: GutenbergKit code editor (#21582)

wordpress-mobile · Jan 16, 2025 · 21f3d59 · 21f3d59
2 parents e69c9d8 + be0696d
commit 21f3d59
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 25.7
 -----
 * [**] Send feedback from within the experimental editor "more" options menu. [#21586]
+* [**] Support accessing the code editor within the experimental editor. [#21582]
 
 25.6
 -----

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
@@ -1428,10 +1428,7 @@ class EditPostActivity : AppCompatActivity(), EditorFragmentActivity, EditorImag
         }
         previewMenuItem?.setVisible(showMenuItems)
         if (viewHtmlModeMenuItem != null) {
-            viewHtmlModeMenuItem.setVisible(
-                (((editorFragment is AztecEditorFragment)
-                        || (editorFragment is GutenbergEditorFragment))) && showMenuItems
-            )
+            viewHtmlModeMenuItem.isVisible = showMenuItems
             viewHtmlModeMenuItem.setTitle(
                 if (htmlModeMenuStateOn) R.string.menu_visual_mode else R.string.menu_html_mode)
         }

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

diff --git a/...itor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergKitEditorFragment.java b/...itor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergKitEditorFragment.java
@@ -306,6 +306,7 @@ private void toggleHtmlMode() {
         mHtmlModeEnabled = !mHtmlModeEnabled;
         mEditorFragmentListener.onTrackableEvent(TrackableEvent.HTML_BUTTON_TAPPED);
         mEditorFragmentListener.onHtmlModeToggledInToolbar();
+        mGutenbergView.setTextEditorEnabled(mHtmlModeEnabled);
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
 .7
     -----
     * [**] Send feedback from within the experimental editor "more" options menu. [#21586]
+    * [**] Support accessing the code editor within the experimental editor. [#21582]
 .6
     -----
@@ Expand Down @@