Skip to content

Commit 9a9abce

Browse files
authored
Merge pull request #20392 from wordpress-mobile/feature/make-traffic-tab-default
Make traffic tab default
2 parents 81cc154 + e604bec commit 9a9abce

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/SelectedSectionManager.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
1111
import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
1212
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
1313
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.INSIGHTS
14+
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.TRAFFIC
15+
import org.wordpress.android.util.config.StatsTrafficTabFeatureConfig
1416
import javax.inject.Inject
1517

1618
const val SELECTED_SECTION_KEY = "SELECTED_STATS_SECTION_KEY"
1719

1820
class SelectedSectionManager
19-
@Inject constructor(private val sharedPrefs: SharedPreferences) {
21+
@Inject constructor(
22+
private val sharedPrefs: SharedPreferences,
23+
private val statsTrafficTabFeatureConfig: StatsTrafficTabFeatureConfig
24+
) {
2025
private val _liveSelectedSection = MutableLiveData<StatsSection>()
2126
val liveSelectedSection: LiveData<StatsSection>
2227
get() {
@@ -28,7 +33,8 @@ class SelectedSectionManager
2833
}
2934

3035
fun getSelectedSection(): StatsSection {
31-
val value = sharedPrefs.getString(SELECTED_SECTION_KEY, INSIGHTS.name)
36+
val defaultValue = if (statsTrafficTabFeatureConfig.isEnabled()) TRAFFIC else INSIGHTS
37+
val value = sharedPrefs.getString(SELECTED_SECTION_KEY, defaultValue.name)
3238
return value?.let { StatsSection.valueOf(value) } ?: INSIGHTS
3339
}
3440

WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/SelectedSectionManagerTest.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ import org.mockito.kotlin.whenever
1313
import org.wordpress.android.BaseUnitTest
1414
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
1515
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.MONTHS
16+
import org.wordpress.android.util.config.StatsTrafficTabFeatureConfig
1617

1718
@ExperimentalCoroutinesApi
1819
class SelectedSectionManagerTest : BaseUnitTest() {
20+
@Mock
21+
private lateinit var trafficTabFeatureConfig: StatsTrafficTabFeatureConfig
22+
1923
@Mock
2024
lateinit var sharedPreferences: SharedPreferences
2125

@@ -25,7 +29,7 @@ class SelectedSectionManagerTest : BaseUnitTest() {
2529

2630
@Before
2731
fun setUp() {
28-
selectedSectionManager = SelectedSectionManager(sharedPreferences)
32+
selectedSectionManager = SelectedSectionManager(sharedPreferences, trafficTabFeatureConfig)
2933
whenever(sharedPreferences.edit()).thenReturn(sharedPreferencesEditor)
3034
}
3135

0 commit comments

Comments
 (0)