Remove EXTRA_TOPIC_TABS_UI feature flag

oppia · Mar 2, 2025 · ec425d5 · ec425d5
1 parent 8394a3f
commit ec425d5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 63 deletions.
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
@@ -10,11 +10,11 @@ import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION
-import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI
+import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB
+import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB
 import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
 import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi
-import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson
 import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
@@ -24,6 +24,8 @@ import org.oppia.android.util.platformparameter.EnableNpsSurvey
 import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2
 import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection
 import org.oppia.android.util.platformparameter.EnableSpotlightUi
+import org.oppia.android.util.platformparameter.EnableTopicInfoTab
+import org.oppia.android.util.platformparameter.EnableTopicPracticeTab
 import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON
 import org.oppia.android.util.platformparameter.INTERACTION_CONFIG_CHANGE_STATE_RETENTION
 import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS
@@ -45,8 +47,6 @@ class FeatureFlagsLogger @Inject constructor(
   private val analyticsController: AnalyticsController,
   @EnableDownloadsSupport
   private val enableDownloadsSupport: PlatformParameterValue<Boolean>,
-  @EnableExtraTopicTabsUi
-  private val enableExtraTopicTabsUi: PlatformParameterValue<Boolean>,
   @EnableLearnerStudyAnalytics
   private val enableLearnerStudyAnalytics: PlatformParameterValue<Boolean>,
   @EnableFastLanguageSwitchingInLesson
@@ -69,6 +69,10 @@ class FeatureFlagsLogger @Inject constructor(
   private val enableOnboardingFlowV2: PlatformParameterValue<Boolean>,
   @EnableMultipleClassrooms
   private val enableMultipleClassrooms: PlatformParameterValue<Boolean>,
+  @EnableTopicInfoTab
+  private val enableTopicInfoTab: PlatformParameterValue<Boolean>,
+  @EnableTopicPracticeTab
+  private val enableTopicPracticeTab: PlatformParameterValue<Boolean>,
 ) {
   /**
    * A variable containing a list of all the feature flags in the app.
@@ -77,7 +81,6 @@ class FeatureFlagsLogger @Inject constructor(
    */
   private var featureFlagItemMap: Map<String, PlatformParameterValue<Boolean>> = mapOf(
     DOWNLOADS_SUPPORT to enableDownloadsSupport,
-    EXTRA_TOPIC_TABS_UI to enableExtraTopicTabsUi,
     LEARNER_STUDY_ANALYTICS to enableLearnerStudyAnalytics,
     FAST_LANGUAGE_SWITCHING_IN_LESSON to enableFastLanguageSwitchingInLesson,
     LOGGING_LEARNER_STUDY_IDS to enableLoggingLearnerStudyIds,
@@ -89,6 +92,8 @@ class FeatureFlagsLogger @Inject constructor(
     ENABLE_NPS_SURVEY to enableNpsSurvey,
     ENABLE_ONBOARDING_FLOW_V2 to enableOnboardingFlowV2,
     ENABLE_MULTIPLE_CLASSROOMS to enableMultipleClassrooms,
+    ENABLE_TOPIC_INFO_TAB to enableTopicInfoTab,
+    ENABLE_TOPIC_PRACTICE_TAB to enableTopicPracticeTab,
   )
 
   /**

diff --git a/.../src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaModule.kt b/.../src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaModule.kt
@@ -13,7 +13,6 @@ import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI
 import org.oppia.android.util.platformparameter.ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE
@@ -25,13 +24,9 @@ import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLE
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB
 import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB
-import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI
 import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
 import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi
-import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson
 import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
@@ -221,18 +216,6 @@ class PlatformParameterAlphaModule {
       ?: PlatformParameterValue.createDefaultParameter(true) // Enable spotlights for alpha users.
   }
 
-  @Provides
-  @EnableExtraTopicTabsUi
-  fun provideEnableExtraTopicTabsUi(
-    platformParameterSingleton: PlatformParameterSingleton
-  ): PlatformParameterValue<Boolean> {
-    return platformParameterSingleton.getBooleanPlatformParameter(
-      EXTRA_TOPIC_TABS_UI
-    ) ?: PlatformParameterValue.createDefaultParameter(
-      ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE
-    )
-  }
-
   @Provides
   @EnableInteractionConfigChangeStateRetention
   fun provideEnableInteractionConfigChangeStateRetention(

diff --git a/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterModule.kt b/domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterModule.kt
@@ -13,7 +13,6 @@ import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI
 import org.oppia.android.util.platformparameter.ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE
@@ -28,11 +27,9 @@ import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB
 import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB
 import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI
 import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
 import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi
-import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson
 import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
@@ -223,18 +220,6 @@ class PlatformParameterModule {
       ?: PlatformParameterValue.createDefaultParameter(ENABLE_SPOTLIGHT_UI_DEFAULT_VALUE)
   }
 
-  @Provides
-  @EnableExtraTopicTabsUi
-  fun provideEnableExtraTopicTabsUi(
-    platformParameterSingleton: PlatformParameterSingleton
-  ): PlatformParameterValue<Boolean> {
-    return platformParameterSingleton.getBooleanPlatformParameter(
-      EXTRA_TOPIC_TABS_UI
-    ) ?: PlatformParameterValue.createDefaultParameter(
-      ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE
-    )
-  }
-
   @Provides
   @EnableInteractionConfigChangeStateRetention
   fun provideEnableInteractionConfigChangeStateRetention(

diff --git a/...in/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt b/...in/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
@@ -50,7 +50,8 @@ import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION
-import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI
+import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB
+import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB
 import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON
 import org.oppia.android.util.platformparameter.INTERACTION_CONFIG_CHANGE_STATE_RETENTION
 import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS
@@ -166,7 +167,6 @@ class FeatureFlagsLoggerTest {
 
   @Test
   @Iteration("downloads_support", "index=0", "flagName=$DOWNLOADS_SUPPORT")
-  @Iteration("extra_topic_tabs_ui", "index=1", "flagName=$EXTRA_TOPIC_TABS_UI")
   @Iteration("learner_study_analytics", "index=2", "flagName=$LEARNER_STUDY_ANALYTICS")
   @Iteration(
     "fast_language_switching_in_lesson", "index=3",
@@ -187,6 +187,8 @@ class FeatureFlagsLoggerTest {
   @Iteration("enable_nps_survey", "index=10", "flagName=$ENABLE_NPS_SURVEY")
   @Iteration("enable_onboarding_flow_v2", "index=11", "flagName=$ENABLE_ONBOARDING_FLOW_V2")
   @Iteration("enable_multiple_classrooms", "index=12", "flagName=$ENABLE_MULTIPLE_CLASSROOMS")
+  @Iteration("extra_topic_info_tab", "index=1", "flagName=$ENABLE_TOPIC_INFO_TAB")
+  @Iteration("enable_topic_practice_tab", "index=1", "flagName=$ENABLE_TOPIC_PRACTICE_TAB")
   fun testLogFeatureFlags_allFeatureFlagNamesAreLogged() {
     featureFlagsLogger.logAllFeatureFlags(TEST_SESSION_ID)
 

diff --git a/.../src/main/java/org/oppia/android/testing/platformparameter/TestPlatformParameterModule.kt b/.../src/main/java/org/oppia/android/testing/platformparameter/TestPlatformParameterModule.kt
@@ -14,16 +14,16 @@ import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT
 import org.oppia.android.util.platformparameter.ENABLE_APP_AND_OS_DEPRECATION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_EDIT_ACCOUNTS_OPTIONS_UI_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE
+import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB_DEFAULT_VALUE
+import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
 import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi
-import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson
 import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
@@ -33,6 +33,8 @@ import org.oppia.android.util.platformparameter.EnableNpsSurvey
 import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2
 import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection
 import org.oppia.android.util.platformparameter.EnableSpotlightUi
+import org.oppia.android.util.platformparameter.EnableTopicInfoTab
+import org.oppia.android.util.platformparameter.EnableTopicPracticeTab
 import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.FORCED_APP_UPDATE_VERSION_CODE
 import org.oppia.android.util.platformparameter.ForcedAppUpdateVersionCode
@@ -65,10 +67,6 @@ import org.oppia.android.util.platformparameter.SYNC_UP_WORKER_TIME_PERIOD_IN_HO
 import org.oppia.android.util.platformparameter.SplashScreenWelcomeMsg
 import org.oppia.android.util.platformparameter.SyncUpWorkerTimePeriodHours
 import javax.inject.Singleton
-import org.oppia.android.util.platformparameter.ENABLE_TOPIC_INFO_TAB_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.ENABLE_TOPIC_PRACTICE_TAB_DEFAULT_VALUE
-import org.oppia.android.util.platformparameter.EnableTopicInfoTab
-import org.oppia.android.util.platformparameter.EnableTopicPracticeTab
 
 /* Fake Platform Parameter Module that provides individual Platform Parameters for testing. */
 @Module
@@ -227,11 +225,6 @@ class TestPlatformParameterModule {
     )
   }
 
-  @Provides
-  @EnableExtraTopicTabsUi
-  fun provideEnableExtraTopicTabsUi(): PlatformParameterValue<Boolean> =
-    PlatformParameterValue.createDefaultParameter(enableExtraTopicTabsUi)
-
   @Provides
   @EnableInteractionConfigChangeStateRetention
   fun provideEnableInteractionConfigChangeStateRetention(): PlatformParameterValue<Boolean> =
@@ -459,7 +452,6 @@ class TestPlatformParameterModule {
       enableLearnerStudyAnalytics = LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE
       enableFastLanguageSwitchingInLesson = FAST_LANGUAGE_SWITCHING_IN_LESSON_DEFAULT_VALUE
       enableLoggingLearnerStudyIds = LOGGING_LEARNER_STUDY_IDS_DEFAULT_VALUE
-      enableExtraTopicTabsUi = ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE
       enableInteractionConfigChangeStateRetention =
         ENABLE_INTERACTION_CONFIG_CHANGE_STATE_RETENTION_DEFAULT_VALUE
       enablePerformanceMetricsCollection = ENABLE_PERFORMANCE_METRICS_COLLECTION_DEFAULT_VALUE

diff --git a/utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt b/utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt
@@ -24,18 +24,6 @@ const val DOWNLOADS_SUPPORT = "android_enable_downloads_support"
 /** Default value for feature flag corresponding to [EnableDownloadsSupport]. */
 const val ENABLE_DOWNLOADS_SUPPORT_DEFAULT_VALUE = false
 
-/**
- * Qualifier for the feature flag corresponding to enabling the extra topic tabs: practice and info.
- */
-@Qualifier
-annotation class EnableExtraTopicTabsUi
-
-/** Name of the feature flag that controls whether to enable the extra topics tab UI. */
-const val EXTRA_TOPIC_TABS_UI = "android_enable_extra_topic_tabs_ui"
-
-/** Default value for the feature flag corresponding to [EnableExtraTopicTabsUi]. */
-const val ENABLE_EXTRA_TOPIC_TABS_UI_DEFAULT_VALUE = false
-
 /**
  * Qualifier for the feature flag that controls the visibility of [ProfileAndDeviceIdActivity]
  * and working of learner study related analytics logging.