From 9528a873ff7c6d526111902bf3737bba481ee5e0 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 26 May 2021 16:58:24 +0300 Subject: [PATCH 1/8] Updates Gutenberg and FluxC references --- build.gradle | 4 ++-- libs/stories-android | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2759f8bd998d..a64771b5557a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'v1.56.0-alpha1' + ext.gutenbergMobileVersion = '3459-45bc25d081b72d8efb9e3e94269c5b9bda16b637' repositories { maven { @@ -131,7 +131,7 @@ ext { androidxWorkVersion = "2.4.0" daggerVersion = '2.29.1' - fluxCVersion = '1.19.0' + fluxCVersion = 'f885d7a708be34963c4f0de2f72bf3bf77c9bf6a' appCompatVersion = '1.0.2' coreVersion = '1.3.2' diff --git a/libs/stories-android b/libs/stories-android index 23fa4232075c..98983cbfc67b 160000 --- a/libs/stories-android +++ b/libs/stories-android @@ -1 +1 @@ -Subproject commit 23fa4232075c4355bc6caf58c618ff4bee72d49b +Subproject commit 98983cbfc67bdf48c0b4d95ae54a05a9d1ecf448 From ba0343723ce2273fde691d71f0c791e3eb95beea Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 26 May 2021 23:35:04 +0300 Subject: [PATCH 2/8] Adds feature config for Global Style Support --- WordPress/build.gradle | 1 + .../android/ui/posts/EditPostActivity.java | 5 ++++- .../util/config/GlobalStyleSupportFeatureConfig.kt | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 WordPress/src/main/java/org/wordpress/android/util/config/GlobalStyleSupportFeatureConfig.kt diff --git a/WordPress/build.gradle b/WordPress/build.gradle index abd0d7c73f88..51e437b225b1 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -112,6 +112,7 @@ android { buildConfigField "boolean", "MP4_COMPOSER_VIDEO_OPTIMIZATION", "false" buildConfigField "boolean", "BLOGGING_REMINDERS", "false" buildConfigField "boolean", "MANAGE_CATEGORIES", "false" + buildConfigField "boolean", "GLOBAL_STYLE_SUPPORT", "false" manifestPlaceholders = [magicLinkScheme:"wordpress"] } 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 6c49cac229e3..f9e9f99ab2d9 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,6 +211,7 @@ import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource; import org.wordpress.android.util.config.ContactInfoBlockFeatureConfig; import org.wordpress.android.util.crashlogging.CrashLoggingExtKt; +import org.wordpress.android.util.config.GlobalStyleSupportFeatureConfig; import org.wordpress.android.util.helpers.MediaFile; import org.wordpress.android.util.helpers.MediaGallery; import org.wordpress.android.util.image.ImageManager; @@ -406,6 +407,7 @@ enum RestartEditorOptions { @Inject StoriesEventListener mStoriesEventListener; @Inject ContactInfoBlockFeatureConfig mContactInfoBlockFeatureConfig; @Inject UpdateFeaturedImageUseCase mUpdateFeaturedImageUseCase; + @Inject GlobalStyleSupportFeatureConfig mGlobalStyleSupportFeatureConfig; private StorePostViewModel mViewModel; private StorageUtilsViewModel mStorageUtilsViewModel; @@ -3538,7 +3540,8 @@ public void onEventMainThread(UploadService.UploadMediaRetryEvent event) { } private void refreshEditorTheme() { - FetchEditorThemePayload payload = new FetchEditorThemePayload(mSite); + FetchEditorThemePayload payload = + new FetchEditorThemePayload(mSite, mGlobalStyleSupportFeatureConfig.isEnabled()); mDispatcher.dispatch(EditorThemeActionBuilder.newFetchEditorThemeAction(payload)); } diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/GlobalStyleSupportFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/GlobalStyleSupportFeatureConfig.kt new file mode 100644 index 000000000000..e2b395d5bff9 --- /dev/null +++ b/WordPress/src/main/java/org/wordpress/android/util/config/GlobalStyleSupportFeatureConfig.kt @@ -0,0 +1,13 @@ +package org.wordpress.android.util.config + +import org.wordpress.android.BuildConfig +import org.wordpress.android.BuildConfig.GLOBAL_STYLE_SUPPORT +import org.wordpress.android.annotation.FeatureInDevelopment +import javax.inject.Inject + +/** + * Configuration of the Global Style Support + */ +@FeatureInDevelopment +class GlobalStyleSupportFeatureConfig +@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.GLOBAL_STYLE_SUPPORT) From 032b3d108c3e825c705ab0f57a9e656049866c79 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Thu, 17 Jun 2021 09:35:33 +0300 Subject: [PATCH 3/8] Reverse stories reference change --- libs/stories-android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/stories-android b/libs/stories-android index 98983cbfc67b..23fa4232075c 160000 --- a/libs/stories-android +++ b/libs/stories-android @@ -1 +1 @@ -Subproject commit 98983cbfc67bdf48c0b4d95ae54a05a9d1ecf448 +Subproject commit 23fa4232075c4355bc6caf58c618ff4bee72d49b From 0649c7727969a8d5862dc17c18707f4e95948faa Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Thu, 17 Jun 2021 14:15:43 +0200 Subject: [PATCH 4/8] Update Gutenberg reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a64771b5557a..ddbd2fbddc59 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3459-45bc25d081b72d8efb9e3e94269c5b9bda16b637' + ext.gutenbergMobileVersion = '3459-615685008585908e7b11b9d3082f237e231d36f7' repositories { maven { From ea04fe0e9885f385ea555ad615a1057877b4c349 Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Fri, 18 Jun 2021 19:27:00 +0200 Subject: [PATCH 5/8] Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ddbd2fbddc59..0e7611cff3ae 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3459-615685008585908e7b11b9d3082f237e231d36f7' + ext.gutenbergMobileVersion = '3459-e4734e649528101e23419e3228e9838963f1207c' repositories { maven { From 90824b08b18f6ac589d54fad3217b3b538140cae Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 23 Jun 2021 11:28:28 +0300 Subject: [PATCH 6/8] Updates Fluxc version hash --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e7611cff3ae..2e8147b348a9 100644 --- a/build.gradle +++ b/build.gradle @@ -131,7 +131,7 @@ ext { androidxWorkVersion = "2.4.0" daggerVersion = '2.29.1' - fluxCVersion = 'f885d7a708be34963c4f0de2f72bf3bf77c9bf6a' + fluxCVersion = '03aa39fdc697431524a4e0e8283c6b68bebdc064' appCompatVersion = '1.0.2' coreVersion = '1.3.2' From 0ed281671efe4f6bbb651aca70743672b18be0bd Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 23 Jun 2021 11:29:02 +0300 Subject: [PATCH 7/8] Updates gutenberg-mobile version hash --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2e8147b348a9..cd645236bb10 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3459-e4734e649528101e23419e3228e9838963f1207c' + ext.gutenbergMobileVersion = '3459-7e3d7e5662b2a4447f36774ee7c4e170907671f4' repositories { maven { From 6f5fe745d0f2bcda2543f0d78051e9f1e529e97a Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 29 Jun 2021 15:10:35 +0300 Subject: [PATCH 8/8] Updates gutenberg version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bf6da1301b3b..9b4b107f1302 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext.wordPressUtilsVersion = 'develop-bb54ee34c5fec5fa7375ce90a356adb5adbdcae0' ext.wordPressLoginVersion = '0.0.2' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3459-7e3d7e5662b2a4447f36774ee7c4e170907671f4' + ext.gutenbergMobileVersion = 'develop-a716641e22ae3b64e068bda95a517988e95669f4' repositories { maven {