diff --git a/WordPress/src/main/java/org/wordpress/android/util/experiments/CreateMenuStoryFirstABExperiment.kt b/WordPress/src/main/java/org/wordpress/android/util/experiments/CreateMenuStoryFirstABExperiment.kt deleted file mode 100644 index e879fca85dcf..000000000000 --- a/WordPress/src/main/java/org/wordpress/android/util/experiments/CreateMenuStoryFirstABExperiment.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.wordpress.android.util.experiments - -import javax.inject.Inject - -class CreateMenuStoryFirstABExperiment -@Inject constructor( - exPlat: ExPlat -) : Experiment( - name = "wpandroid_create_menu_story_first", - exPlat -) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt index e568232dfe1d..a8df5bfa7ae4 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt @@ -8,7 +8,6 @@ import kotlinx.coroutines.delay import org.wordpress.android.R import org.wordpress.android.analytics.AnalyticsTracker.Stat import org.wordpress.android.fluxc.model.SiteModel -import org.wordpress.android.fluxc.model.experiments.Variation.Treatment import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.FOLLOW_SITE import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST @@ -29,7 +28,6 @@ import org.wordpress.android.util.SiteUtils import org.wordpress.android.util.SiteUtils.hasFullAccessToContent import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig -import org.wordpress.android.util.experiments.CreateMenuStoryFirstABExperiment import org.wordpress.android.util.map import org.wordpress.android.util.mapNullable import org.wordpress.android.util.merge @@ -49,7 +47,6 @@ class WPMainActivityViewModel @Inject constructor( private val analyticsTracker: AnalyticsTrackerWrapper, private val mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig, private val quickStartRepository: QuickStartRepository, - private val createMenuStoryFirstABExperiment: CreateMenuStoryFirstABExperiment, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher ) : ScopedViewModel(mainDispatcher) { private var isStarted = false @@ -118,17 +115,9 @@ class WPMainActivityViewModel @Inject constructor( updateFeatureAnnouncements() } - private fun loadMainActions(site: SiteModel?, shouldShowStoriesFirst: Boolean = false) { + private fun loadMainActions(site: SiteModel?) { val actionsList = ArrayList() - val shouldShowStories = SiteUtils.supportsStoriesFeature(site) - val createNewStoryAction = CreateAction( - actionType = CREATE_NEW_STORY, - iconRes = R.drawable.ic_story_icon_24dp, - labelRes = R.string.my_site_bottom_sheet_add_story, - onClickAction = ::onCreateActionClicked - ) - actionsList.add( CreateAction( actionType = NO_ACTION, @@ -137,9 +126,6 @@ class WPMainActivityViewModel @Inject constructor( onClickAction = null ) ) - if (shouldShowStories && shouldShowStoriesFirst) { - actionsList.add(createNewStoryAction) - } actionsList.add( CreateAction( actionType = CREATE_NEW_POST, @@ -158,8 +144,15 @@ class WPMainActivityViewModel @Inject constructor( ) ) } - if (shouldShowStories && !shouldShowStoriesFirst) { - actionsList.add(createNewStoryAction) + if (SiteUtils.supportsStoriesFeature(site)) { + actionsList.add( + CreateAction( + actionType = CREATE_NEW_STORY, + iconRes = R.drawable.ic_story_icon_24dp, + labelRes = R.string.my_site_bottom_sheet_add_story, + onClickAction = ::onCreateActionClicked + ) + ) } _mainActions.postValue(actionsList) @@ -206,24 +199,16 @@ class WPMainActivityViewModel @Inject constructor( quickStartRepository.activeTask.value == PUBLISH_POST _showQuickStarInBottomSheet.postValue(shouldShowQuickStartFocusPoint || quickStartFromImprovedMySiteFragment) - val shouldShowStories = SiteUtils.supportsStoriesFeature(site) - val shouldShowStoriesFirst = shouldShowStoriesFirst() - - if (shouldShowStories || hasFullAccessToContent(site)) { + if (SiteUtils.supportsStoriesFeature(site) || hasFullAccessToContent(site)) { // The user has at least two create options available for this site (pages and/or story posts), // so we should show a bottom sheet. // Creation options added in the future should also be weighed here. // Reload main actions, since the first time this is initialized the SiteModel may not contain the // latest info. - loadMainActions(site, shouldShowStoriesFirst) - - val properties = mapOf( - "is_showing_stories" to shouldShowStories, - "is_showing_stories_first" to shouldShowStoriesFirst - ) + loadMainActions(site) - analyticsTracker.track(Stat.MY_SITE_CREATE_SHEET_SHOWN, properties) + analyticsTracker.track(Stat.MY_SITE_CREATE_SHEET_SHOWN) _isBottomSheetShowing.value = Event(true) } else { // User only has one option - creating a post. Skip the bottom sheet and go straight to that action. @@ -318,10 +303,6 @@ class WPMainActivityViewModel @Inject constructor( appPrefsWrapper.featureAnnouncementShownVersion < cachedAnnouncement.announcementVersion } - private fun shouldShowStoriesFirst(): Boolean { - return createMenuStoryFirstABExperiment.getVariation() is Treatment - } - private fun getExternalFocusPointInfo(task: QuickStartTask?): List { // For now, we only do this for the FOLLOW_SITE task. val followSitesTaskFocusPointInfo = FocusPointInfo(FOLLOW_SITE, task == FOLLOW_SITE) diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt index 4cf5e04af43a..37c331bb9bd9 100644 --- a/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt @@ -40,7 +40,6 @@ import org.wordpress.android.util.BuildConfigWrapper import org.wordpress.android.util.NoDelayCoroutineDispatcher import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig -import org.wordpress.android.util.experiments.CreateMenuStoryFirstABExperiment import org.wordpress.android.viewmodel.main.WPMainActivityViewModel.FocusPointInfo @RunWith(MockitoJUnitRunner::class) @@ -58,7 +57,6 @@ class WPMainActivityViewModelTest : BaseUnitTest() { @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper @Mock lateinit var mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig @Mock lateinit var quickStartRepository: QuickStartRepository - @Mock lateinit var createMenuStoryFirstABExperiment: CreateMenuStoryFirstABExperiment private val featureAnnouncement = FeatureAnnouncement( "14.7", @@ -96,7 +94,6 @@ class WPMainActivityViewModelTest : BaseUnitTest() { analyticsTrackerWrapper, mySiteImprovementsFeatureConfig, quickStartRepository, - createMenuStoryFirstABExperiment, NoDelayCoroutineDispatcher() ) viewModel.onFeatureAnnouncementRequested.observeForever(