From 0538304908f0e347dded20179f783cb7c91ede55 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Wed, 23 Dec 2020 11:14:56 +0100 Subject: [PATCH 1/6] Gutenberg - Remove ModalLayoutPickerFeature and Layout picker tooltip --- WordPress/build.gradle | 1 - .../wordpress/android/ui/main/WPMainActivity.java | 4 +--- .../wordpress/android/ui/pages/PagesFragment.kt | 4 +--- .../android/ui/posts/EditPostActivity.java | 14 +------------- .../org/wordpress/android/ui/prefs/AppPrefs.java | 9 --------- .../util/config/ModalLayoutPickerFeatureConfig.kt | 12 ------------ .../android/editor/EditorFragmentAbstract.java | 2 -- .../gutenberg/GutenbergContainerFragment.java | 3 --- .../editor/gutenberg/GutenbergEditorFragment.java | 12 ------------ .../editor/gutenberg/GutenbergPropsBuilder.kt | 2 -- libs/gutenberg-mobile | 2 +- 11 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt diff --git a/WordPress/build.gradle b/WordPress/build.gradle index faf3dabd42e5..6e4855c2ee30 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -70,7 +70,6 @@ android { buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "10" buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "false" buildConfigField "boolean", "GUTENBERG_MENTIONS", "true" - buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "true" buildConfigField "boolean", "HOME_PAGE_PICKER", "true" buildConfigField "boolean", "UNIFIED_LOGIN_AVAILABLE", "true" buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true" diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index af1ca2022637..0929cafd6c45 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -125,7 +125,6 @@ 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.util.config.MySiteImprovementsFeatureConfig; import org.wordpress.android.viewmodel.main.WPMainActivityViewModel; import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel; @@ -208,7 +207,6 @@ public class WPMainActivity extends LocaleAwareActivity implements @Inject UploadUtilsWrapper mUploadUtilsWrapper; @Inject ViewModelProvider.Factory mViewModelFactory; @Inject PrivateAtomicCookie mPrivateAtomicCookie; - @Inject ModalLayoutPickerFeatureConfig mModalLayoutPickerFeatureConfig; @Inject ReaderTracker mReaderTracker; @Inject MediaPickerLauncher mMediaPickerLauncher; @Inject MySiteImprovementsFeatureConfig mMySiteImprovementsFeatureConfig; @@ -441,7 +439,7 @@ private void initViewModel() { handleNewPostAction(PagePostCreationSourcesDetail.POST_FROM_MY_SITE); break; case CREATE_NEW_PAGE: - if (mModalLayoutPickerFeatureConfig.isEnabled() && mMLPViewModel.canShowModalLayoutPicker()) { + if (mMLPViewModel.canShowModalLayoutPicker()) { mMLPViewModel.createPageFlowTriggered(); } else { handleNewPageAction("", "", null, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt index 506ce96981dd..83f6ae14e707 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt @@ -59,7 +59,6 @@ import org.wordpress.android.util.DisplayUtils import org.wordpress.android.util.QuickStartUtils import org.wordpress.android.util.ToastUtils.Duration import org.wordpress.android.util.WPSwipeToRefreshHelper -import org.wordpress.android.util.config.ModalLayoutPickerFeatureConfig import org.wordpress.android.util.helpers.SwipeToRefreshHelper import org.wordpress.android.util.redirectContextClickToLongPressListener import org.wordpress.android.util.setLiftOnScrollTargetViewIdAndRequestLayout @@ -99,7 +98,6 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener { @Inject lateinit var progressDialogHelper: ProgressDialogHelper @Inject lateinit var uploadActionUseCase: UploadActionUseCase @Inject lateinit var uploadUtilsWrapper: UploadUtilsWrapper - @Inject lateinit var modalLayoutPickerFeatureConfig: ModalLayoutPickerFeatureConfig private var quickStartEvent: QuickStartEvent? = null private var progressDialog: ProgressDialog? = null @@ -347,7 +345,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener { }) viewModel.createNewPage.observe(viewLifecycleOwner, Observer { - if (modalLayoutPickerFeatureConfig.isEnabled() && mlpViewModel.canShowModalLayoutPicker()) { + if (mlpViewModel.canShowModalLayoutPicker()) { mlpViewModel.createPageFlowTriggered() } else { createNewPage() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index f7849722d28f..76ce6abb560b 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 @@ -211,7 +211,6 @@ import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource; import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig; 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.config.WPStoriesFeatureConfig; import org.wordpress.android.util.helpers.MediaFile; @@ -400,7 +399,6 @@ enum RestartEditorOptions { @Inject PublishPostImmediatelyUseCase mPublishPostImmediatelyUseCase; @Inject TenorFeatureConfig mTenorFeatureConfig; @Inject GutenbergMentionsFeatureConfig mGutenbergMentionsFeatureConfig; - @Inject ModalLayoutPickerFeatureConfig mModalLayoutPickerFeatureConfig; @Inject ConsolidatedMediaPickerFeatureConfig mConsolidatedMediaPickerFeatureConfig; @Inject CrashLogging mCrashLogging; @Inject MediaPickerLauncher mMediaPickerLauncher; @@ -684,8 +682,7 @@ protected void onCreate(Bundle savedInstanceState) { private void presentNewPageNoticeIfNeeded() { if (mIsPreview || !mIsPage - || !mIsNewPost - || !mModalLayoutPickerFeatureConfig.isEnabled()) { + || !mIsNewPost) { return; } String message = mEditPostRepository.getContent().isEmpty() ? getString(R.string.mlp_notice_blank_page_created) @@ -2330,7 +2327,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { isUnsupportedBlockEditorEnabled, unsupportedBlockEditorSwitch, mIsPreview, - mModalLayoutPickerFeatureConfig.isEnabled(), wpcomLocaleSlug, postType, themeBundle @@ -3272,14 +3268,6 @@ private void logTemplateSelection() { ActivityLauncher.viewSuggestUsersForResult(this, mSite); } - @Override public void onGutenbergEditorSetStarterPageTemplatesTooltipShown(boolean tooltipShown) { - AppPrefs.setGutenbergStarterPageTemplatesTooltipShown(tooltipShown); - } - - @Override public boolean onGutenbergEditorRequestStarterPageTemplatesTooltipShown() { - return AppPrefs.getGutenbergStarterPageTemplatesTooltipShown(); - } - @Override public void onHtmlModeToggledInToolbar() { toggleHtmlModeOnMenu(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java index 62d05f3ce9ef..f63e8154eebd 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java @@ -126,7 +126,6 @@ public enum DeletablePrefKey implements PrefKey { SHOULD_AUTO_ENABLE_GUTENBERG_FOR_THE_NEW_POSTS, SHOULD_AUTO_ENABLE_GUTENBERG_FOR_THE_NEW_POSTS_PHASE_2, GUTENBERG_OPT_IN_DIALOG_SHOWN, - GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, IS_QUICK_START_NOTICE_REQUIRED, LAST_SKIPPED_QUICK_START_TASK, @@ -882,14 +881,6 @@ public static void removeSupportName() { remove(DeletablePrefKey.SUPPORT_NAME); } - public static void setGutenbergStarterPageTemplatesTooltipShown(boolean tooltipShown) { - setBoolean(DeletablePrefKey.GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, tooltipShown); - } - - public static boolean getGutenbergStarterPageTemplatesTooltipShown() { - return getBoolean(DeletablePrefKey.GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, false); - } - /* * returns a list of local IDs of sites recently chosen in the site picker */ diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt deleted file mode 100644 index 43e14bf1cf74..000000000000 --- a/WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.wordpress.android.util.config - -import org.wordpress.android.BuildConfig -import org.wordpress.android.annotation.FeatureInDevelopment -import javax.inject.Inject - -/** - * Configuration of the Modal Layout Picker (MLP) feature - */ -@FeatureInDevelopment -class ModalLayoutPickerFeatureConfig -@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.MODAL_LAYOUT_PICKER) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java index 651e4aba8ced..67fdfa48689d 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java @@ -205,8 +205,6 @@ public interface EditorFragmentListener extends DialogVisibilityProvider { void onGutenbergEditorSessionTemplateApplyTracked(String template); void onGutenbergEditorSessionTemplatePreviewTracked(String template); void getMention(Consumer onResult); - void onGutenbergEditorSetStarterPageTemplatesTooltipShown(boolean tooltipShown); - boolean onGutenbergEditorRequestStarterPageTemplatesTooltipShown(); String getErrorMessageFromMedia(int mediaId); void showJetpackSettings(); void onStoryComposerLoadRequested(ArrayList mediaFiles, String blockId); diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java index d215a8be808e..43a7213aed8d 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java @@ -26,7 +26,6 @@ import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnLogGutenbergUserEventListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener; -import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnStarterPageTemplatesTooltipShownEventListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaFilesCollectionBasedBlockEditorListener; @@ -69,7 +68,6 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener OnGutenbergDidSendButtonPressedActionListener onGutenbergDidSendButtonPressedActionListener, AddMentionUtil addMentionUtil, - OnStarterPageTemplatesTooltipShownEventListener onSPTTooltipShownEventListener, OnMediaFilesCollectionBasedBlockEditorListener onMediaFilesCollectionBasedBlockEditorListener, boolean isDarkMode) { @@ -88,7 +86,6 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener onGutenbergDidRequestUnsupportedBlockFallbackListener, onGutenbergDidSendButtonPressedActionListener, addMentionUtil, - onSPTTooltipShownEventListener, onMediaFilesCollectionBasedBlockEditorListener, isDarkMode); } diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java index e7cec587c6e9..369478dc9069 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java @@ -64,7 +64,6 @@ import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnLogGutenbergUserEventListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener; -import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnStarterPageTemplatesTooltipShownEventListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener; import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaFilesCollectionBasedBlockEditorListener; @@ -361,17 +360,6 @@ public void gutenbergDidSendButtonPressedAction(String buttonType) { } }, mEditorFragmentListener::getMention, - new OnStarterPageTemplatesTooltipShownEventListener() { - @Override - public void onSetStarterPageTemplatesTooltipShown(boolean tooltipShown) { - mEditorFragmentListener.onGutenbergEditorSetStarterPageTemplatesTooltipShown(tooltipShown); - } - - @Override - public boolean onRequestStarterPageTemplatesTooltipShown() { - return mEditorFragmentListener.onGutenbergEditorRequestStarterPageTemplatesTooltipShown(); - } - }, new OnMediaFilesCollectionBasedBlockEditorListener() { @Override public void onRequestMediaFilesEditorLoad(ArrayList mediaFiles, String blockId) { mEditorFragmentListener.onStoryComposerLoadRequested(mediaFiles, blockId); diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt index e1bdd64b90df..2244ed1d143b 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt @@ -13,7 +13,6 @@ data class GutenbergPropsBuilder( private val enableUnsupportedBlockEditor: Boolean, private val unsupportedBlockEditorSwitch: Boolean, private val enablePreviewMode: Boolean, - private val enableModalLayoutPicker: Boolean, private val localeSlug: String, private val postType: String, private val editorTheme: Bundle? @@ -30,6 +29,5 @@ data class GutenbergPropsBuilder( isDarkMode = GutenbergUtils.isDarkMode(activity), htmlModeEnabled = isHtmlModeEnabled, isPreview = enablePreviewMode, - isModalLayoutPickerEnabled = enableModalLayoutPicker ) } diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 1884f06e5ec4..4fc346ea0d67 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 1884f06e5ec42ffea641b2d1a4a3beeaafc8ae07 +Subproject commit 4fc346ea0d67fa82ad98b787ab9230b3a13d44c6 From ddca6900664fe1f18fff66b082e31e3976c8d440 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Wed, 23 Dec 2020 12:32:14 +0100 Subject: [PATCH 2/6] Remove trialing comma --- .../wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt index 2244ed1d143b..87f9c9880bc0 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt @@ -28,6 +28,6 @@ data class GutenbergPropsBuilder( translations = GutenbergUtils.getTranslations(activity), isDarkMode = GutenbergUtils.isDarkMode(activity), htmlModeEnabled = isHtmlModeEnabled, - isPreview = enablePreviewMode, + isPreview = enablePreviewMode ) } From 08abaff9508190052ebe960389664af1c36c68ac Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Mon, 28 Dec 2020 16:12:35 +0100 Subject: [PATCH 3/6] Update Gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 4fc346ea0d67..bdd107b7e37d 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 4fc346ea0d67fa82ad98b787ab9230b3a13d44c6 +Subproject commit bdd107b7e37dc2601d52f72a6a0a3926f1d9b9f0 From 95a8ec1f9984ae64ffc8823dad4134cce28667f8 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Tue, 29 Dec 2020 10:43:20 +0100 Subject: [PATCH 4/6] Update Gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index bdd107b7e37d..18fc6b68e820 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit bdd107b7e37dc2601d52f72a6a0a3926f1d9b9f0 +Subproject commit 18fc6b68e820ee48a46d29567381ee6afa225924 From d7b7e23ae82ba6105167074657d1f56319886a36 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Thu, 7 Jan 2021 17:16:52 +0100 Subject: [PATCH 5/6] Update Gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 18fc6b68e820..7f2d0156a3f5 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 18fc6b68e820ee48a46d29567381ee6afa225924 +Subproject commit 7f2d0156a3f5ad95c875b5cd2be572e8abee21c2 From fa28570d92589b48a31a1b6c062dd31e70e553f7 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Wed, 13 Jan 2021 13:22:00 +0100 Subject: [PATCH 6/6] Update Gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 7f2d0156a3f5..7cdfcadb7300 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 7f2d0156a3f5ad95c875b5cd2be572e8abee21c2 +Subproject commit 7cdfcadb7300ebcc5991a9b88a8bb398c9ed5dd0