refactor: Rename "NewGutenberg" to "GutenbergKit"

The use of "new" to uniquely describe something is problematic, as it
provides little context and could become incorrect at some future time.

Author: dcalhoun

WordPress/build.gradle

@@ -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"
+        buildConfigField "boolean", "ENABLE_GUTENBERG_KIT_THEME_STYLES", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }

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

@@ -235,8 +235,8 @@ import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource
 import org.wordpress.android.util.config.ContactSupportFeatureConfig
 import org.wordpress.android.util.config.PostConflictResolutionFeatureConfig
-import org.wordpress.android.util.config.NewGutenbergFeatureConfig
-import org.wordpress.android.util.config.NewGutenbergThemeStylesFeatureConfig
+import org.wordpress.android.util.config.GutenbergKitFeatureConfig
+import org.wordpress.android.util.config.GutenbergKitThemeStylesFeatureConfig
 import org.wordpress.android.util.extensions.setLiftOnScrollTargetViewIdAndRequestLayout
 import org.wordpress.android.util.helpers.MediaFile
 import org.wordpress.android.util.helpers.MediaGallery
@@ -315,7 +315,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
     private var isXPostsCapable: Boolean? = null
     private var onGetSuggestionResult: Consumer<String?>? = null
     private var isVoiceContentSet = false
-    private var isNewGutenbergEditor = false
+    private var isGutenbergKitEditor = false
 
     // For opening the context menu after permissions have been granted
     private var menuView: View? = null
@@ -410,8 +410,8 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
 
     @Inject lateinit var postConflictResolutionFeatureConfig: PostConflictResolutionFeatureConfig
 
-    @Inject lateinit var newGutenbergFeatureConfig: NewGutenbergFeatureConfig
-    @Inject lateinit var newGutenbergThemeStylesConfig: NewGutenbergThemeStylesFeatureConfig
+    @Inject lateinit var gutenbergKitFeatureConfig: GutenbergKitFeatureConfig
+    @Inject lateinit var gutenbergKitThemeStylesConfig: GutenbergKitThemeStylesFeatureConfig
 
     @Inject lateinit var storePostViewModel: StorePostViewModel
     @Inject lateinit var storageUtilsViewModel: StorageUtilsViewModel
@@ -517,7 +517,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         }
         onBackPressedDispatcher.addCallback(this, callback)
         dispatcher.register(this)
-        isNewGutenbergEditor = newGutenbergFeatureConfig.isEnabled()
+        isGutenbergKitEditor = gutenbergKitFeatureConfig.isEnabled()
 
         createEditShareMessageActivityResultLauncher()
 
@@ -726,7 +726,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
                 }
 
             isNewPost = state.getBoolean(EditPostActivityConstants.STATE_KEY_IS_NEW_POST, false)
-            isNewGutenbergEditor = state.getBoolean(EditPostActivityConstants.STATE_KEY_IS_NEW_GUTENBERG, false)
+            isGutenbergKitEditor = state.getBoolean(EditPostActivityConstants.STATE_KEY_IS_GUTENBERG_KIT, false)
             isVoiceContentSet = state.getBoolean(EditPostActivityConstants.STATE_KEY_IS_VOICE_CONTENT_SET, false)
             updatePostLoadingAndDialogState(
                 fromInt(
@@ -783,7 +783,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
     }
 
     private fun setupEditor() {
-        if (isNewGutenbergEditor) {
+        if (isGutenbergKitEditor) {
             GutenbergWebViewPool.getPreloadedWebView(getContext())
         }
         // Check whether to show the visual editor
@@ -1001,7 +1001,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         editorMedia.toastMessage.observe(this) { event: Event<ToastMessageHolder?> ->
             event.getContentIfNotHandled()?.show(this)
         }
-        if (!isNewGutenbergEditor) {
+        if (!isGutenbergKitEditor) {
             storePostViewModel.onSavePostTriggered.observe(this) { unitEvent: Event<Unit> ->
                 unitEvent.applyIfNotHandled {
                     updateAndSavePostAsync()
@@ -1202,7 +1202,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         outState.putInt(EditPostActivityConstants.STATE_KEY_POST_LOADING_STATE, postLoadingState.value)
         outState.putBoolean(EditPostActivityConstants.STATE_KEY_IS_NEW_POST, isNewPost)
         outState.putBoolean(EditPostActivityConstants.STATE_KEY_IS_VOICE_CONTENT_SET, isVoiceContentSet)
-        outState.putBoolean(EditPostActivityConstants.STATE_KEY_IS_NEW_GUTENBERG, isNewGutenbergEditor)
+        outState.putBoolean(EditPostActivityConstants.STATE_KEY_IS_GUTENBERG_KIT, isGutenbergKitEditor)
         outState.putBoolean(
             EditPostActivityConstants.STATE_KEY_IS_PHOTO_PICKER_VISIBLE,
             editorPhotoPicker?.isPhotoPickerShowing() ?: false
@@ -1412,11 +1412,11 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         val helpMenuItem = menu.findItem(R.id.menu_editor_help)
         if (undoItem != null) {
             undoItem.setEnabled(menuHasUndo)
-            undoItem.setVisible(!htmlModeMenuStateOn && !isNewGutenbergEditor)
+            undoItem.setVisible(!htmlModeMenuStateOn && !isGutenbergKitEditor)
         }
         if (redoItem != null) {
             redoItem.setEnabled(menuHasRedo)
-            redoItem.setVisible(!htmlModeMenuStateOn && !isNewGutenbergEditor)
+            redoItem.setVisible(!htmlModeMenuStateOn && !isGutenbergKitEditor)
         }
         if (secondaryAction != null && editPostRepository.hasPost()) {
             secondaryAction.setVisible(showMenuItems && this.secondaryAction.isVisible)
@@ -1463,7 +1463,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         }
         val contentInfo = menu.findItem(R.id.menu_content_info)
         (editorFragment as? GutenbergEditorFragment)?.let { gutenbergEditorFragment ->
-            if (isNewGutenbergEditor) {
+            if (isGutenbergKitEditor) {
                 contentInfo.isVisible = false
             } else {
                 contentInfo.setOnMenuItemClickListener { _: MenuItem? ->
@@ -2171,7 +2171,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         i.putExtra(EditPostActivityConstants.EXTRA_RESTART_EDITOR, restartEditorOption.name)
         i.putExtra(EditPostActivityConstants.STATE_KEY_EDITOR_SESSION_DATA, postEditorAnalyticsSession)
         i.putExtra(EditPostActivityConstants.EXTRA_IS_NEW_POST, isNewPost)
-        i.putExtra(EditPostActivityConstants.STATE_KEY_IS_NEW_GUTENBERG, isNewGutenbergEditor)
+        i.putExtra(EditPostActivityConstants.STATE_KEY_IS_GUTENBERG_KIT, isGutenbergKitEditor)
         setResult(RESULT_OK, i)
     }
 
@@ -2401,7 +2401,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
         override fun getItem(position: Int): Fragment {
             return when (position) {
                 PAGE_CONTENT -> {
-                    if (isNewGutenbergEditor && showGutenbergEditor) {
+                    if (isGutenbergKitEditor && showGutenbergEditor) {
                         createGutenbergKitEditorFragment()
                     } else if (showGutenbergEditor) {
                         createGutenbergEditorFragment()
@@ -2456,7 +2456,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
                 "siteApiRoot" to siteApiRoot,
                 "authHeader" to authHeader,
                 "siteApiNamespace" to siteApiNamespace,
-                "themeStyles" to newGutenbergThemeStylesConfig.isEnabled()
+                "themeStyles" to gutenbergKitThemeStylesConfig.isEnabled()
             )
 
             return GutenbergKitEditorFragment.newInstance(
@@ -2508,7 +2508,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
                 PAGE_CONTENT -> {
                     editorFragment = fragment as EditorFragmentAbstract
                     editorFragment?.setImageLoader(imageLoader)
-                    if (isNewGutenbergEditor) {
+                    if (isGutenbergKitEditor) {
                         editorFragment?.onEditorContentChanged(object : GutenbergView.ContentChangeListener {
                             override fun onContentChanged(title: String, content: String) {
                                 storePostViewModel.savePostWithDelay()
@@ -3635,7 +3635,7 @@ class EditPostActivity : LocaleAwareActivity(), EditorFragmentActivity, EditorIm
     }
 
     private fun updateVoiceContentIfNeeded() {
-        if (isNewGutenbergEditor) {
+        if (isGutenbergKitEditor) {
             return
         }
         // Check if voice content exists and this is a new post for a Gutenberg editor fragment

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt

@@ -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"
 }

WordPress/src/main/java/org/wordpress/android/util/config/GutenbergKitFeatureConfig.kt

@@ -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
+)

WordPress/src/main/java/org/wordpress/android/util/config/GutenbergKitThemeStylesFeatureConfig.kt

@@ -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
+)

WordPress/src/main/java/org/wordpress/android/util/config/NewGutenbergFeatureConfig.kt

@@ -70,7 +70,7 @@ public class GutenbergKitEditorFragment extends EditorFragmentAbstract implement
     private static final String ARG_GUTENBERG_WEB_VIEW_AUTH_DATA = "param_gutenberg_web_view_auth_data";
     public static final String ARG_FEATURED_IMAGE_ID = "featured_image_id";
     public static final String ARG_JETPACK_FEATURES_ENABLED = "jetpack_features_enabled";
-    public static final String ARG_NEW_GUTENBERG_SETTINGS = "new_gutenberg_settings";
+    public static final String ARG_GUTENBERG_KIT_SETTINGS = "gutenberg_kit_settings";
 
     private static final int CAPTURE_PHOTO_PERMISSION_REQUEST_CODE = 101;
     private static final int CAPTURE_VIDEO_PERMISSION_REQUEST_CODE = 102;
@@ -94,7 +94,7 @@ public static GutenbergKitEditorFragment newInstance(Context context,
         Bundle args = new Bundle();
         args.putBoolean(ARG_IS_NEW_POST, isNewPost);
         args.putBoolean(ARG_JETPACK_FEATURES_ENABLED, jetpackFeaturesEnabled);
-        args.putSerializable(ARG_NEW_GUTENBERG_SETTINGS, (Serializable) settings);
+        args.putSerializable(ARG_GUTENBERG_KIT_SETTINGS, (Serializable) settings);
         fragment.setArguments(args);
         SavedInstanceDatabase db = SavedInstanceDatabase.Companion.getDatabase(context);
         mSettings = settings;
@@ -122,7 +122,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if (getArguments() != null) {
-            mSettings = (Map<String, Object>) getArguments().getSerializable(ARG_NEW_GUTENBERG_SETTINGS);
+            mSettings = (Map<String, Object>) getArguments().getSerializable(ARG_GUTENBERG_KIT_SETTINGS);
         }
 
         mGutenbergView = GutenbergWebViewPool.getPreloadedWebView(requireContext());