[Modal Layout Picker] Create Modal window for Modal Layout Picker

WordPress/build.gradle

@@ -72,6 +72,7 @@ android {
         buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "10"
         buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "false"
         buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
+        buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "false"
         buildConfigField "boolean", "UNIFIED_LOGIN_AVAILABLE", "true"
     }
 
@@ -97,6 +98,7 @@ android {
             buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
             buildConfigField "boolean", "GUTENBERG_MENTIONS", "false"
+            buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "true"
         }
 
         zalpha { // alpha version - enable experimental features
@@ -114,6 +116,7 @@ android {
         jalapeno { // Pre-Alpha version, used for PR builds, can be installed along release, alpha, beta, dev versions
             applicationId "org.wordpress.android.prealpha"
             dimension "buildType"
+            buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "true"
         }
     }
 

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -122,6 +122,7 @@
 import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.service.InstallationReferrerServiceStarter;
+import org.wordpress.android.util.config.ModalLayoutPickerFeatureConfig;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel;
 import org.wordpress.android.widgets.AppRatingDialog;
 import org.wordpress.android.widgets.WPDialogSnackbar;
@@ -199,6 +200,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
     @Inject UploadUtilsWrapper mUploadUtilsWrapper;
     @Inject ViewModelProvider.Factory mViewModelFactory;
     @Inject PrivateAtomicCookie mPrivateAtomicCookie;
+    @Inject ModalLayoutPickerFeatureConfig mModalLayoutPickerFeatureConfig;
 
     /*
      * fragments implement this if their contents can be scrolled, called when user
@@ -812,6 +814,14 @@ private void handleNewPageAction(PagePostCreationSourcesDetail source) {
             return;
         }
 
+        if (mModalLayoutPickerFeatureConfig.isEnabled()) {
+            addNewPage(source); // TODO: Open MLP
+        } else {
+            addNewPage(source);
+        }
+    }
+
+    private void addNewPage(PagePostCreationSourcesDetail source) {
         SiteModel site = getSelectedSite();
         if (site != null) {
             // TODO: evaluate to include the QuickStart logic like in the handleNewPostAction

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

@@ -188,6 +188,7 @@
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
 import org.wordpress.android.util.config.GutenbergMentionsFeatureConfig;
+import org.wordpress.android.util.config.ModalLayoutPickerFeatureConfig;
 import org.wordpress.android.util.config.TenorFeatureConfig;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
@@ -369,6 +370,7 @@ enum RestartEditorOptions {
     @Inject PublishPostImmediatelyUseCase mPublishPostImmediatelyUseCase;
     @Inject TenorFeatureConfig mTenorFeatureConfig;
     @Inject GutenbergMentionsFeatureConfig mGutenbergMentionsFeatureConfig;
+    @Inject ModalLayoutPickerFeatureConfig mModalLayoutPickerFeatureConfig;
 
     private StorePostViewModel mViewModel;
 
@@ -2043,7 +2045,8 @@ public Fragment getItem(int position) {
                                 WordPress.getUserAgent(),
                                 mTenorFeatureConfig.isEnabled(),
                                 isUnsupportedBlockEditorEnabled,
-                                mGutenbergMentionsFeatureConfig.isEnabled()
+                                mGutenbergMentionsFeatureConfig.isEnabled(),
+                                mModalLayoutPickerFeatureConfig.isEnabled()
                         );
                     } else {
                         // If gutenberg editor is not selected, default to Aztec.

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

@@ -0,0 +1,7 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.BuildConfig
+import javax.inject.Inject
+
+class ModalLayoutPickerFeatureConfig
+@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.MODAL_LAYOUT_PICKER)

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java

@@ -38,6 +38,7 @@ public class GutenbergContainerFragment extends Fragment {
     private static final String ARG_SITE_IS_UNSUPPORTED_BLOCK_EDITOR_ENABLED =
             "param_site_is_unsupported_block_editor_enabled";
     private static final String ARG_ENABLE_MENTIONS_FLAG = "param_enable_mentions_flag";
+    private static final String ARG_ENABLE_MODAL_LAYOUT_PICKER = "param_enable_modal_layout_picker";
 
     private boolean mHtmlModeEnabled;
     private boolean mHasReceivedAnyContent;
@@ -51,7 +52,8 @@ public static GutenbergContainerFragment newInstance(String postType,
                                                          boolean isSiteUsingWpComRestApi,
                                                          Bundle editorTheme,
                                                          boolean isUnsupportedBlockEditorEnabled,
-                                                         boolean enableMentionsFlag) {
+                                                         boolean enableMentionsFlag,
+                                                         boolean isModalLayoutPickerEnabled) {
         GutenbergContainerFragment fragment = new GutenbergContainerFragment();
         Bundle args = new Bundle();
         args.putString(ARG_POST_TYPE, postType);
@@ -63,6 +65,7 @@ public static GutenbergContainerFragment newInstance(String postType,
         args.putBundle(ARG_EDITOR_THEME, editorTheme);
         args.putBoolean(ARG_SITE_IS_UNSUPPORTED_BLOCK_EDITOR_ENABLED, isUnsupportedBlockEditorEnabled);
         args.putBoolean(ARG_ENABLE_MENTIONS_FLAG, enableMentionsFlag);
+        args.putBoolean(ARG_ENABLE_MODAL_LAYOUT_PICKER, isModalLayoutPickerEnabled);
         fragment.setArguments(args);
         return fragment;
     }
@@ -116,6 +119,7 @@ public void onCreate(Bundle savedInstanceState) {
         boolean isUnsupportedBlockEditorEnabled =
                 getArguments().getBoolean(ARG_SITE_IS_UNSUPPORTED_BLOCK_EDITOR_ENABLED);
         boolean enableMentionsFlag = getArguments().getBoolean(ARG_ENABLE_MENTIONS_FLAG);
+        boolean isModalLayoutPickerEnabled = getArguments().getBoolean(ARG_ENABLE_MODAL_LAYOUT_PICKER);
 
         Consumer<Exception> exceptionLogger = null;
         Consumer<String> breadcrumbLogger = null;
@@ -144,7 +148,8 @@ public void onCreate(Bundle savedInstanceState) {
                 isSiteUsingWpComRestApi,
                 editorTheme,
                 isUnsupportedBlockEditorEnabled,
-                enableMentionsFlag);
+                enableMentionsFlag,
+                isModalLayoutPickerEnabled);
 
         // clear the content initialization flag since a new ReactRootView has been created;
         mHasReceivedAnyContent = false;

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java

@@ -90,6 +90,7 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
     private static final String ARG_ENABLE_MENTIONS_FLAG = "param_enable_mentions_flag";
     private static final String ARG_SITE_IS_UNSUPPORTED_BLOCK_EDITOR_ENABLED =
             "param_site_is_unsupported_block_editor_enabled";
+    private static final String ARG_ENABLE_MODAL_LAYOUT_PICKER = "param_enable_modal_layout_picker";
 
     private static final int CAPTURE_PHOTO_PERMISSION_REQUEST_CODE = 101;
     private static final int CAPTURE_VIDEO_PERMISSION_REQUEST_CODE = 102;
@@ -138,7 +139,8 @@ public static GutenbergEditorFragment newInstance(String title,
                                                       String userAgent,
                                                       boolean tenorEnabled,
                                                       boolean isUnsupportedBlockEditorEnabled,
-                                                      boolean enableMentionsFlag) {
+                                                      boolean enableMentionsFlag,
+                                                      boolean isModalLayoutPickerEnabled) {
         GutenbergEditorFragment fragment = new GutenbergEditorFragment();
         Bundle args = new Bundle();
         args.putString(ARG_PARAM_TITLE, title);
@@ -158,6 +160,7 @@ public static GutenbergEditorFragment newInstance(String title,
         args.putBoolean(ARG_TENOR_ENABLED, tenorEnabled);
         args.putBoolean(ARG_ENABLE_MENTIONS_FLAG, enableMentionsFlag);
         args.putBoolean(ARG_SITE_IS_UNSUPPORTED_BLOCK_EDITOR_ENABLED, isUnsupportedBlockEditorEnabled);
+        args.putBoolean(ARG_ENABLE_MODAL_LAYOUT_PICKER, isModalLayoutPickerEnabled);
         fragment.setArguments(args);
         return fragment;
     }
@@ -261,6 +264,7 @@ public void onCreate(Bundle savedInstanceState) {
             Bundle editorTheme = getArguments().getBundle(ARG_EDITOR_THEME);
             boolean siteJetpackIsConnected = getArguments().getBoolean(ARG_SITE_IS_UNSUPPORTED_BLOCK_EDITOR_ENABLED);
             boolean enableMentionsFlag = getArguments().getBoolean(ARG_ENABLE_MENTIONS_FLAG);
+            boolean isModalLayoutPickerEnabled = getArguments().getBoolean(ARG_ENABLE_MODAL_LAYOUT_PICKER);
 
             FragmentManager fragmentManager = getChildFragmentManager();
             FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
@@ -274,7 +278,8 @@ public void onCreate(Bundle savedInstanceState) {
                             isSiteUsingWpComRestApi,
                             editorTheme,
                             siteJetpackIsConnected,
-                            enableMentionsFlag);
+                            enableMentionsFlag,
+                            isModalLayoutPickerEnabled);
             gutenbergContainerFragment.setRetainInstance(true);
             fragmentTransaction.add(gutenbergContainerFragment, GutenbergContainerFragment.TAG);
             fragmentTransaction.commitNow();