Merge pull request #16989 from wordpress-mobile/Stats-Revamp-v2-Remove-feature-config

Stats revamp v2:  Remove feature config

Author: ravishanker

WordPress/build.gradle

@@ -109,7 +109,6 @@ android {
         buildConfigField "boolean", "SITE_NAME", "false"
         buildConfigField "boolean", "LAND_ON_THE_EDITOR", "false"
         buildConfigField "boolean", "BLOGGING_PROMPTS", "false"
-        buildConfigField "boolean", "STATS_REVAMP_V2", "false"
         buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
         buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"
         buildConfigField "boolean", "BETA_SITE_DESIGNS", "false"

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

@@ -104,7 +104,6 @@
 import org.wordpress.android.ui.stats.StatsTimeframe;
 import org.wordpress.android.ui.stats.StatsViewType;
 import org.wordpress.android.ui.stats.refresh.StatsActivity;
-import org.wordpress.android.ui.stats.refresh.StatsActivity.StatsLaunchedFrom;
 import org.wordpress.android.ui.stats.refresh.StatsViewAllActivity;
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection;
 import org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailActivity;
@@ -563,24 +562,6 @@ public static void viewBlogStats(Context context, SiteModel site) {
         }
     }
 
-    public static void openBlogStats(Context context, SiteModel site) {
-        if (site == null) {
-            AppLog.e(T.STATS, "SiteModel is null when opening the stats.");
-            AnalyticsTracker.track(
-                    STATS_ACCESS_ERROR,
-                    ActivityLauncher.class.getName(),
-                    "NullPointerException",
-                    "Failed to open Stats because of the null SiteModel"
-            );
-            ToastUtils.showToast(context, R.string.stats_cannot_be_started, ToastUtils.Duration.SHORT);
-        } else {
-            Intent intent = new Intent(context, StatsActivity.class);
-            intent.putExtra(StatsActivity.ARG_LAUNCHED_FROM, StatsLaunchedFrom.FEATURE_ANNOUNCEMENT);
-            intent.putExtra(WordPress.SITE, site);
-            context.startActivity(intent);
-        }
-    }
-
     public static void viewBlogStatsForTimeframe(Context context, SiteModel site, StatsTimeframe statsTimeframe) {
         if (site == null) {
             AppLog.e(T.STATS, "SiteModel is null when opening the stats.");

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

@@ -118,7 +118,6 @@
 import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource;
 import org.wordpress.android.ui.stats.StatsTimeframe;
-import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroDialogFragment;
 import org.wordpress.android.ui.stories.intro.StoriesIntroDialogFragment;
 import org.wordpress.android.ui.uploads.UploadActionUseCase;
 import org.wordpress.android.ui.uploads.UploadUtils;
@@ -143,7 +142,6 @@
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.service.InstallationReferrerServiceStarter;
 import org.wordpress.android.util.config.MySiteDashboardTodaysStatsCardFeatureConfig;
-import org.wordpress.android.util.config.StatsRevampV2FeatureConfig;
 import org.wordpress.android.util.extensions.ViewExtensionsKt;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel.FocusPointInfo;
@@ -254,7 +252,6 @@ public class WPMainActivity extends LocaleAwareActivity implements
     @Inject WeeklyRoundupScheduler mWeeklyRoundupScheduler;
     @Inject MySiteDashboardTodaysStatsCardFeatureConfig mTodaysStatsCardFeatureConfig;
     @Inject QuickStartTracker mQuickStartTracker;
-    @Inject StatsRevampV2FeatureConfig mStatsRevampV2FeatureConfig;
 
     @Inject BuildConfigWrapper mBuildConfigWrapper;
 
@@ -449,16 +446,6 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
         if (!mSelectedSiteRepository.hasSelectedSite()) {
             initSelectedSite();
         }
-
-        if (BuildConfig.IS_JETPACK_APP
-            && mStatsRevampV2FeatureConfig.isEnabled()
-            && AppPrefs.shouldDisplayStatsRevampFeatureAnnouncement()
-            && getSelectedSite() != null
-        ) {
-            StatsNewFeaturesIntroDialogFragment.newInstance().show(
-                    getSupportFragmentManager(), StatsNewFeaturesIntroDialogFragment.TAG
-            );
-        }
     }
 
     private void showBloggingPromptsOnboarding() {

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java

@@ -273,8 +273,6 @@ public enum UndeletablePrefKey implements PrefKey {
         // Used to identify the App Settings for initial screen that is updated when the variant is assigned
         wp_pref_initial_screen,
 
-        STATS_REVAMP2_FEATURE_ANNOUNCEMENT_DISPLAYED,
-
         // Indicates if this is the first time the user sees the blogging prompts onboarding dialog
         IS_FIRST_TIME_BLOGGING_PROMPTS_ONBOARDING
     }
@@ -1324,15 +1322,6 @@ public static boolean shouldShowWeeklyRoundupNotification(long remoteSiteId) {
         return DeletablePrefKey.SHOULD_SHOW_WEEKLY_ROUNDUP_NOTIFICATION.name() + siteId;
     }
 
-    public static boolean shouldDisplayStatsRevampFeatureAnnouncement() {
-        return prefs().getBoolean(UndeletablePrefKey.STATS_REVAMP2_FEATURE_ANNOUNCEMENT_DISPLAYED.name(), true);
-    }
-
-    public static void setShouldDisplayStatsRevampFeatureAnnouncement(boolean isDisplayed) {
-        prefs().edit().putBoolean(UndeletablePrefKey.STATS_REVAMP2_FEATURE_ANNOUNCEMENT_DISPLAYED.name(), isDisplayed)
-               .apply();
-    }
-
     /*
      * adds a local site ID to the top of list of recently chosen sites
      */

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt

@@ -226,8 +226,6 @@ class AppPrefsWrapper @Inject constructor() {
 
     fun getSkippedPromptDay(siteId: Int): Date? = AppPrefs.getSkippedPromptDay(siteId)
 
-    fun markStatsRevampFeatureAnnouncementAsDisplayed() = AppPrefs.setShouldDisplayStatsRevampFeatureAnnouncement(false)
-
     fun getIsFirstBloggingPromptsOnboarding(): Boolean = AppPrefs.getIsFirstBloggingPromptsOnboarding()
 
     fun saveFirstBloggingPromptsOnboarding(isFirstTime: Boolean) {

WordPress/src/main/java/org/wordpress/android/ui/stats/intro/StatsNewFeatureIntroViewModel.kt

@@ -97,7 +97,6 @@ class StatsActivity : LocaleAwareActivity() {
 
     enum class StatsLaunchedFrom {
         STATS_WIDGET,
-        NOTIFICATIONS,
-        FEATURE_ANNOUNCEMENT
+        NOTIFICATIONS
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/stats/intro/StatsNewFeaturesIntroAction.kt

@@ -67,7 +67,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.T
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.TotalLikesUseCase.TotalLikesUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.ViewsAndVisitorsUseCase.ViewsAndVisitorsUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
-import org.wordpress.android.util.config.StatsRevampV2FeatureConfig
 import javax.inject.Named
 import javax.inject.Singleton
 
@@ -109,7 +108,6 @@ class StatsModule {
     @Named(BLOCK_INSIGHTS_USE_CASES)
     @Suppress("LongParameterList")
     fun provideBlockInsightsUseCases(
-        statsRevampV2FeatureConfig: StatsRevampV2FeatureConfig,
         viewsAndVisitorsUseCaseFactory: ViewsAndVisitorsUseCaseFactory,
         allTimeStatsUseCase: AllTimeStatsUseCase,
         latestPostSummaryUseCase: LatestPostSummaryUseCase,
@@ -132,7 +130,7 @@ class StatsModule {
         actionCardScheduleUseCase: ActionCardScheduleUseCase
     ): List<@JvmSuppressWildcards BaseStatsUseCase<*, *>> {
         val useCases = mutableListOf<BaseStatsUseCase<*, *>>()
-        if (BuildConfig.IS_JETPACK_APP && statsRevampV2FeatureConfig.isEnabled()) {
+        if (BuildConfig.IS_JETPACK_APP) {
             useCases.add(viewsAndVisitorsUseCaseFactory.build(BLOCK))
             useCases.add(totalLikesUseCaseFactory.build(BLOCK))
             useCases.add(totalCommentsUseCaseFactory.build(BLOCK))