Skip to content

refactor: Separate Gutenberg editor implementations #21493

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

Merged
dcalhoun merged 8 commits into from
Nov 26, 2024
Merged

refactor: Separate Gutenberg editor implementations #21493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b6a2d4
refactor: Duplicate Gutenberg editor fragment
dcalhoun Nov 21, 2024
96b0e1e
refactor: Abstract Gutenberg editor fragment detection logic
dcalhoun Nov 21, 2024
b843c3c
refactor: Instantiate GutenbergKitEditorFragment
dcalhoun Nov 21, 2024
b9278c7
Revert "refactor: Abstract Gutenberg editor fragment detection logic"
dcalhoun Nov 21, 2024
4b67a37
refactor: Remove unnecessary "new Gutenberg" branches
dcalhoun Nov 25, 2024
43a17b5
refactor: Remove unnecessary code
dcalhoun Nov 25, 2024
a8a6937
refactor: Rename "NewGutenberg" to "GutenbergKit"
dcalhoun Nov 26, 2024
e862f40
docs: Note no-op reasons
dcalhoun Nov 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
4 changes: 2 additions & 2 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ android {
buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
buildConfigField "boolean", "SYNC_PUBLISHING", "false"
buildConfigField "boolean", "ENABLE_IN_APP_UPDATES", "false"
buildConfigField "boolean", "ENABLE_NEW_GUTENBERG", "false"
buildConfigField "boolean", "ENABLE_NEW_GUTENBERG_THEME_STYLES", "false"
buildConfigField "boolean", "ENABLE_GUTENBERG_KIT", "false"
Copy link
Member Author

@dcalhoun dcalhoun Nov 26, 2024

Choose a reason for hiding this comment

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

The term "new" is problematic, as it provides little context and can become outdated/incorrect in the future. I replaced it with a more meaningful name.

buildConfigField "boolean", "ENABLE_GUTENBERG_KIT_THEME_STYLES", "false"

manifestPlaceholders = [magicLinkScheme:"wordpress"]
}
Expand Down
105 changes: 74 additions & 31 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt
View file
Open in desktop
Copy link
Member Author

@dcalhoun dcalhoun Nov 26, 2024

Choose a reason for hiding this comment

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

Long term, we might also consider how this implementation could be simplified, creating clear and useful separation between Aztec, Gutenberg Mobile, and GutenbergKit.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ object EditPostActivityConstants{
const val STATE_KEY_UNDO = "stateKeyUndo"
const val STATE_KEY_REDO = "stateKeyRedo"
const val STATE_KEY_IS_VOICE_CONTENT_SET = "stateKeyIsVoiceContentSet"
const val STATE_KEY_IS_NEW_GUTENBERG = "stateKeyIsNewGutenberg"
const val STATE_KEY_IS_GUTENBERG_KIT = "stateKeyIsGutenbergKit"
}
1 change: 1 addition & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public class PostEditorAnalyticsSession implements Serializable {

public enum Editor {
GUTENBERG,
GUTENBERG_KIT,
CLASSIC,
HTML,
WP_STORIES_CREATOR
Expand Down
16 changes: 16 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/util/config/GutenbergKitFeatureConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.wordpress.android.util.config

import org.wordpress.android.BuildConfig
import org.wordpress.android.annotation.Feature
import javax.inject.Inject

private const val GUTENBERG_KIT_FEATURE_REMOTE_FIELD = "experimental_block_editor"

@Feature(GUTENBERG_KIT_FEATURE_REMOTE_FIELD, false)
class GutenbergKitFeatureConfig @Inject constructor(
appConfig: AppConfig
) : FeatureConfig(
appConfig,
BuildConfig.ENABLE_GUTENBERG_KIT,
GUTENBERG_KIT_FEATURE_REMOTE_FIELD
)
16 changes: 16 additions & 0 deletions ...s/src/main/java/org/wordpress/android/util/config/GutenbergKitThemeStylesFeatureConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.wordpress.android.util.config

import org.wordpress.android.BuildConfig
import org.wordpress.android.annotation.Feature
import javax.inject.Inject

private const val GUTENBERG_KIT_THEME_STYLES_FEATURE_REMOTE_FIELD = "experimental_block_editor_theme_styles"

@Feature(GUTENBERG_KIT_THEME_STYLES_FEATURE_REMOTE_FIELD, false)
class GutenbergKitThemeStylesFeatureConfig @Inject constructor(
appConfig: AppConfig
) : FeatureConfig(
appConfig,
BuildConfig.ENABLE_GUTENBERG_KIT_THEME_STYLES,
GUTENBERG_KIT_THEME_STYLES_FEATURE_REMOTE_FIELD
)
16 changes: 0 additions & 16 deletions WordPress/src/main/java/org/wordpress/android/util/config/NewGutenbergFeatureConfig.kt
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...s/src/main/java/org/wordpress/android/util/config/NewGutenbergThemeStylesFeatureConfig.kt
View file
Open in desktop

This file was deleted.

Loading