Skip to content

Layout Grid Availability - featureConfig implementation #14667

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
enejb merged 7 commits into from
Jun 22, 2021
Merged

Layout Grid Availability - featureConfig implementation #14667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5abcb19
Layout Grid Availability - featureConfig implementation
enejb May 15, 2021
6f2e198
Minor fix
enejb May 17, 2021
2ab3600
Fix typo - call the correct function
enejb May 19, 2021
1cdc129
Fix missing &
enejb May 20, 2021
3fc8d2b
Update the build grade to the PR fix.
enejb May 20, 2021
05acd75
Bump gutenberg-mobile to v1.56.0-alpha3, which contains the gutenberg…
enejb Jun 22, 2021
8c63e25
Add new line to fix lint
enejb Jun 22, 2021
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
2 changes: 2 additions & 0 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ android {
buildConfigField "boolean", "MY_SITE_IMPROVEMENTS", "false"
buildConfigField "boolean", "SEEN_UNSEEN_WITH_COUNTER", "false"
buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
buildConfigField "boolean", "LAYOUT_GRID_BLOCK_AVAILABLE", "true"
buildConfigField "boolean", "LIKES_ENHANCEMENTS", "false"
buildConfigField "boolean", "IS_JETPACK_APP", "false"
buildConfigField "String", "TRACKS_EVENT_PREFIX", '"wpandroid_"'
Expand Down Expand Up @@ -158,6 +159,7 @@ android {
buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
buildConfigField "boolean", "LAYOUT_GRID_BLOCK_AVAILABLE", "false"
}

zalpha { // alpha version - enable experimental features
Expand Down
3 changes: 3 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
import org.wordpress.android.util.analytics.AnalyticsUtils;
import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
import org.wordpress.android.util.config.ContactInfoBlockFeatureConfig;
import org.wordpress.android.util.config.LayoutGridBlockFeatureConfig;
import org.wordpress.android.util.crashlogging.CrashLoggingExtKt;
import org.wordpress.android.util.helpers.MediaFile;
import org.wordpress.android.util.helpers.MediaGallery;
Expand Down Expand Up @@ -406,6 +407,7 @@ enum RestartEditorOptions {
@Inject StoriesEventListener mStoriesEventListener;
@Inject ContactInfoBlockFeatureConfig mContactInfoBlockFeatureConfig;
@Inject UpdateFeaturedImageUseCase mUpdateFeaturedImageUseCase;
@Inject LayoutGridBlockFeatureConfig mLayoutGridBlockFeatureConfig;

private StorePostViewModel mViewModel;
private StorageUtilsViewModel mStorageUtilsViewModel;
Expand Down Expand Up @@ -2300,6 +2302,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {

return new GutenbergPropsBuilder(
mContactInfoBlockFeatureConfig.isEnabled() && SiteUtils.supportsContactInfoFeature(mSite),
mLayoutGridBlockFeatureConfig.isEnabled() && SiteUtils.supportsLayoutGridFeature(mSite),
SiteUtils.supportsStoriesFeature(mSite),
mSite.isUsingWpComRestApi(),
enableXPosts,
Expand Down
6 changes: 5 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,11 @@ public static boolean supportsStoriesFeature(SiteModel site) {
}

public static boolean supportsContactInfoFeature(SiteModel site) {
return site != null & (site.isWPCom() || checkMinimalJetpackVersion(site, WP_CONTACT_INFO_JETPACK_VERSION));
return site != null && (site.isWPCom() || checkMinimalJetpackVersion(site, WP_CONTACT_INFO_JETPACK_VERSION));
}

public static boolean supportsLayoutGridFeature(SiteModel site) {
return site != null && (site.isWPCom() || site.isWPComAtomic());
}

public static boolean isNonAtomicBusinessPlanSite(@Nullable SiteModel site) {
Expand Down
9 changes: 9 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/util/config/LayoutGridBlockFeatureConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.wordpress.android.util.config

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

@FeatureInDevelopment
class LayoutGridBlockFeatureConfig
@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.LAYOUT_GRID_BLOCK_AVAILABLE)
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 'v1.56.0-alpha3'

repositories {
maven {
Expand Down
2 changes: 2 additions & 0 deletions ...PressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.wordpress.mobile.WPAndroidGlue.GutenbergProps
@Parcelize
data class GutenbergPropsBuilder(
private val enableContactInfoBlock: Boolean,
private val enableLayoutGridBlock: Boolean,
private val enableMediaFilesCollectionBlocks: Boolean,
private val enableMentions: Boolean,
private val enableXPosts: Boolean,
Expand All @@ -24,6 +25,7 @@ data class GutenbergPropsBuilder(
) : Parcelable {
fun build(activity: Activity, isHtmlModeEnabled: Boolean) = GutenbergProps(
enableContactInfoBlock = enableContactInfoBlock,
enableLayoutGridBlock = enableLayoutGridBlock,
enableMediaFilesCollectionBlocks = enableMediaFilesCollectionBlocks,
enableMentions = enableMentions,
enableXPosts = enableXPosts,
Expand Down