Skip to content

CMM-2133: Stats fixes and improvements #23067

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

Closed
adalpari wants to merge 10 commits into from
Closed

CMM-2133: Stats fixes and improvements #23067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b14c8ce
Add expand/collapse child referrers to new stats
adalpari Jul 3, 2026
20a356c
Refine referrer row chevrons
adalpari Jul 3, 2026
3ad112d
Add top margin above expanded children
adalpari Jul 3, 2026
39eb8b8
Add spacing between expanded children
adalpari Jul 3, 2026
5065846
Show all referrers in the detail screen
adalpari Jul 3, 2026
3658896
Simplify referrer expand/collapse composables
adalpari Jul 3, 2026
423f06f
Preserve referrer expanded state when scrolling detail screen
adalpari Jul 3, 2026
ea52e24
Self-fetch referrers detail and fix detail list key
adalpari Jul 3, 2026
7519912
Self-fetch clicks, search, video, file downloads and authors detail
adalpari Jul 3, 2026
4737d08
Merge branch 'trunk' into feature/cmm-2133-stats-detail-self-fetch
adalpari Jul 8, 2026
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
73 changes: 25 additions & 48 deletions WordPress/src/main/java/org/wordpress/android/ui/newstats/NewStatsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import org.wordpress.android.ui.newstats.locations.LocationsViewModel
import org.wordpress.android.ui.newstats.mostviewed.MostViewedCard
import org.wordpress.android.ui.newstats.mostviewed.MostViewedCardUiState
import org.wordpress.android.ui.newstats.mostviewed.MostViewedDetailActivity
import org.wordpress.android.ui.newstats.mostviewed.MostViewedDetailSource
import org.wordpress.android.ui.newstats.mostviewed.MostViewedViewModel
import org.wordpress.android.ui.newstats.todaysstats.TodaysStatsCard
import org.wordpress.android.ui.newstats.todaysstats.TodaysStatsViewModel
Expand Down Expand Up @@ -692,9 +693,11 @@ private fun TrafficTabContent(
cardType = cardType,
onShowAllClick = {
// The referrers detail screen self-fetches the full (unbounded) list, so
// only the selected period is passed instead of the whole item list.
MostViewedDetailActivity.startReferrers(
// only the source + period are passed instead of the whole item list.
MostViewedDetailActivity.startSelfFetch(
context = context,
cardType = StatsCardType.MOST_VIEWED_REFERRERS,
source = MostViewedDetailSource.REFERRERS,
period = mostViewedViewModel.getCurrentPeriod()
)
},
Expand Down Expand Up @@ -806,14 +809,11 @@ private fun TrafficTabContent(
StatsCardType.AUTHORS -> AuthorsCard(
uiState = authorsUiState,
onShowAllClick = {
val detailData = authorsViewModel.getDetailData()
AuthorsDetailActivity.start(
// The authors detail screen self-fetches the full (unbounded) list, so
// only the selected period is passed instead of the whole item list.
AuthorsDetailActivity.startSelfFetch(
context = context,
authors = detailData.authors,
totalViews = detailData.totalViews,
totalViewsChange = detailData.totalViewsChange,
totalViewsChangePercent = detailData.totalViewsChangePercent,
dateRange = detailData.dateRange
period = authorsViewModel.getCurrentPeriod()
)
},
onRetry = authorsViewModel::onRetry,
Expand All @@ -835,16 +835,11 @@ private fun TrafficTabContent(
uiState = clicksUiState,
cardType = cardType,
onShowAllClick = {
val detailData = clicksViewModel.getDetailData()
MostViewedDetailActivity.start(
MostViewedDetailActivity.startSelfFetch(
context = context,
cardType = detailData.cardType,
items = detailData.items,
totalViews = detailData.totalViews,
totalViewsChange = detailData.totalViewsChange,
totalViewsChangePercent =
detailData.totalViewsChangePercent,
dateRange = detailData.dateRange,
cardType = StatsCardType.CLICKS,
source = MostViewedDetailSource.CLICKS,
period = clicksViewModel.getCurrentPeriod(),
valueHeaderResId = R.string.stats_clicks_label
)
},
Expand Down Expand Up @@ -875,17 +870,11 @@ private fun TrafficTabContent(
uiState = searchTermsUiState,
cardType = cardType,
onShowAllClick = {
val detailData =
searchTermsViewModel.getDetailData()
MostViewedDetailActivity.start(
MostViewedDetailActivity.startSelfFetch(
context = context,
cardType = detailData.cardType,
items = detailData.items,
totalViews = detailData.totalViews,
totalViewsChange = detailData.totalViewsChange,
totalViewsChangePercent =
detailData.totalViewsChangePercent,
dateRange = detailData.dateRange
cardType = StatsCardType.SEARCH_TERMS,
source = MostViewedDetailSource.SEARCH_TERMS,
period = searchTermsViewModel.getCurrentPeriod()
)
},
onRetry = searchTermsViewModel::onRetry,
Expand Down Expand Up @@ -916,17 +905,11 @@ private fun TrafficTabContent(
uiState = videoPlaysUiState,
cardType = cardType,
onShowAllClick = {
val detailData =
videoPlaysViewModel.getDetailData()
MostViewedDetailActivity.start(
MostViewedDetailActivity.startSelfFetch(
context = context,
cardType = detailData.cardType,
items = detailData.items,
totalViews = detailData.totalViews,
totalViewsChange = detailData.totalViewsChange,
totalViewsChangePercent =
detailData.totalViewsChangePercent,
dateRange = detailData.dateRange
cardType = StatsCardType.VIDEO_PLAYS,
source = MostViewedDetailSource.VIDEO_PLAYS,
period = videoPlaysViewModel.getCurrentPeriod()
)
},
onRetry = videoPlaysViewModel::onRetry,
Expand Down Expand Up @@ -957,17 +940,11 @@ private fun TrafficTabContent(
uiState = fileDownloadsUiState,
cardType = cardType,
onShowAllClick = {
val detailData =
fileDownloadsViewModel.getDetailData()
MostViewedDetailActivity.start(
MostViewedDetailActivity.startSelfFetch(
context = context,
cardType = detailData.cardType,
items = detailData.items,
totalViews = detailData.totalViews,
totalViewsChange = detailData.totalViewsChange,
totalViewsChangePercent =
detailData.totalViewsChangePercent,
dateRange = detailData.dateRange,
cardType = StatsCardType.FILE_DOWNLOADS,
source = MostViewedDetailSource.FILE_DOWNLOADS,
period = fileDownloadsViewModel.getCurrentPeriod(),
valueHeaderResId =
R.string.stats_file_downloads_value_label
)
Expand Down
Loading
Loading