CMM 1222 add stats top authors card #22561

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.

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

Merged

adalpari merged 24 commits into trunk from feat/CMM-1222-Add-stats-top-authors-card

Feb 19, 2026

WordPress/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -122,6 +122,11 @@ @@
                 android:theme="@style/WordPress.NoActionBar"
                 android:exported="false" />
+            <activity
+                android:name=".ui.newstats.authors.AuthorsDetailActivity"
+                android:theme="@style/WordPress.NoActionBar"
+                android:exported="false" />
             <!-- Account activities -->
             <activity
                 android:name=".ui.main.MeActivity"
@@ Expand Down @@

WordPress/src/main/java/org/wordpress/android/ui/newstats/NewStatsActivity.kt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -78,6 +78,9 @@ import org.wordpress.android.ui.newstats.mostviewed.MostViewedDetailActivity
  
    import org.wordpress.android.ui.newstats.mostviewed.MostViewedViewModel

    import org.wordpress.android.ui.newstats.todaysstats.TodaysStatsCard

    import org.wordpress.android.ui.newstats.todaysstats.TodaysStatsViewModel

    import org.wordpress.android.ui.newstats.authors.AuthorsCard

    import org.wordpress.android.ui.newstats.authors.AuthorsDetailActivity

    import org.wordpress.android.ui.newstats.authors.AuthorsViewModel

    import org.wordpress.android.ui.newstats.viewsstats.ViewsStatsCard

    import org.wordpress.android.ui.newstats.viewsstats.ViewsStatsViewModel

    @@ -228,6 +231,7 @@ private fun TrafficTabContent(
  
        todaysStatsViewModel: TodaysStatsViewModel = viewModel(),

        mostViewedViewModel: MostViewedViewModel = viewModel(),

        countriesViewModel: CountriesViewModel = viewModel(),

        authorsViewModel: AuthorsViewModel = viewModel(),

        newStatsViewModel: NewStatsViewModel = viewModel()

    ) {

        val context = LocalContext.current

    @@ -236,13 +240,15 @@ private fun TrafficTabContent(
  
        val postsUiState by mostViewedViewModel.postsUiState.collectAsState()

        val referrersUiState by mostViewedViewModel.referrersUiState.collectAsState()

        val countriesUiState by countriesViewModel.uiState.collectAsState()

        val authorsUiState by authorsViewModel.uiState.collectAsState()

        val selectedPeriod by viewsStatsViewModel.selectedPeriod.collectAsState()

        val isTodaysStatsRefreshing by todaysStatsViewModel.isRefreshing.collectAsState()

        val isViewsStatsRefreshing by viewsStatsViewModel.isRefreshing.collectAsState()

        val isMostViewedRefreshing by mostViewedViewModel.isRefreshing.collectAsState()

        val isCountriesRefreshing by countriesViewModel.isRefreshing.collectAsState()

        val isAuthorsRefreshing by authorsViewModel.isRefreshing.collectAsState()

        val isRefreshing = isTodaysStatsRefreshing || isViewsStatsRefreshing ||

            isMostViewedRefreshing || isCountriesRefreshing

            isMostViewedRefreshing || isCountriesRefreshing || isAuthorsRefreshing

        val pullToRefreshState = rememberPullToRefreshState()

        // Card configuration state

    @@ -252,10 +258,11 @@ private fun TrafficTabContent(
  
        var showAddCardSheet by remember { mutableStateOf(false) }

        val addCardSheetState = rememberModalBottomSheetState()

        // Propagate period changes to the MostViewedViewModel and CountriesViewModel

        // Propagate period changes to the MostViewedViewModel, CountriesViewModel, and AuthorsViewModel

        LaunchedEffect(selectedPeriod) {

            mostViewedViewModel.onPeriodChanged(selectedPeriod)

            countriesViewModel.onPeriodChanged(selectedPeriod)

            authorsViewModel.onPeriodChanged(selectedPeriod)

        }

        if (showAddCardSheet) {

    @@ -282,6 +289,7 @@ private fun TrafficTabContent(
  
                viewsStatsViewModel.loadData()

                mostViewedViewModel.loadData()

                countriesViewModel.loadData()

                authorsViewModel.loadData()

            } else if (!isNetworkAvailable && !showNoConnectionScreen) {

                // Network became unavailable while viewing cards - show no-connection screen

                showNoConnectionScreen = true

    @@ -299,6 +307,7 @@ private fun TrafficTabContent(
  
                        viewsStatsViewModel.loadData()

                        mostViewedViewModel.loadData()

                        countriesViewModel.loadData()

                        authorsViewModel.loadData()

                    }

                }

            )

    @@ -315,6 +324,7 @@ private fun TrafficTabContent(
  
                viewsStatsViewModel.refresh()

                mostViewedViewModel.refresh()

                countriesViewModel.refresh()

                authorsViewModel.refresh()

            },

            indicator = {

                PullToRefreshDefaults.Indicator(

    @@ -446,6 +456,27 @@ private fun TrafficTabContent(
  
                            onMoveDown = { newStatsViewModel.moveCardDown(cardType) },

                            onMoveToBottom = { newStatsViewModel.moveCardToBottom(cardType) }

                        )

                        StatsCardType.AUTHORS -> AuthorsCard(

                            uiState = authorsUiState,

                            onShowAllClick = {

                                val detailData = authorsViewModel.getDetailData()

                                AuthorsDetailActivity.start(

                                    context = context,

                                    authors = detailData.authors,

                                    totalViews = detailData.totalViews,

                                    totalViewsChange = detailData.totalViewsChange,

                                    totalViewsChangePercent = detailData.totalViewsChangePercent,

                                    dateRange = detailData.dateRange

                                )

                            },

                            onRetry = authorsViewModel::onRetry,

                            onRemoveCard = { newStatsViewModel.removeCard(cardType) },

                            cardPosition = cardPosition,

                            onMoveUp = { newStatsViewModel.moveCardUp(cardType) },

                            onMoveToTop = { newStatsViewModel.moveCardToTop(cardType) },

                            onMoveDown = { newStatsViewModel.moveCardDown(cardType) },

                            onMoveToBottom = { newStatsViewModel.moveCardToBottom(cardType) }

                        )

                    }

                }

WordPress/src/main/java/org/wordpress/android/ui/newstats/StatsCardType.kt

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,8 @@ enum class StatsCardType( @@
         VIEWS_STATS(R.string.stats_views, 1),
         MOST_VIEWED_POSTS_AND_PAGES(R.string.stats_most_viewed_posts_and_pages, 2),
         MOST_VIEWED_REFERRERS(R.string.stats_most_viewed_referrers, 3),
-        COUNTRIES(R.string.stats_countries_title, 4);
+        COUNTRIES(R.string.stats_countries_title, 4),
+        AUTHORS(R.string.stats_authors_title, 5);
         companion object {
             /**
@@ Expand All / @@ -26,7 +27,8 @@ enum class StatsCardType( @@
                 VIEWS_STATS,
                 MOST_VIEWED_POSTS_AND_PAGES,
                 MOST_VIEWED_REFERRERS,
-                COUNTRIES
+                COUNTRIES,
+                AUTHORS
             )
         }
     }

WordPress/src/main/java/org/wordpress/android/ui/newstats/authors/AuthorsCard.kt

-Original file line number
+Diff line change
@@ -0,0 +1,258 @@
+    package org.wordpress.android.ui.newstats.authors
+    import androidx.compose.foundation.background
+    import androidx.compose.foundation.layout.Box
+    import androidx.compose.foundation.layout.Column
+    import androidx.compose.foundation.layout.Row
+    import androidx.compose.foundation.layout.Spacer
+    import androidx.compose.foundation.layout.fillMaxWidth
+    import androidx.compose.foundation.layout.height
+    import androidx.compose.foundation.layout.padding
+    import androidx.compose.foundation.layout.size
+    import androidx.compose.foundation.layout.width
+    import androidx.compose.foundation.shape.CircleShape
+    import androidx.compose.material.icons.Icons
+    import androidx.compose.material.icons.filled.Person
+    import androidx.compose.material3.Icon
+    import androidx.compose.material3.MaterialTheme
+    import androidx.compose.runtime.Composable
+    import androidx.compose.ui.Alignment
+    import androidx.compose.ui.Modifier
+    import androidx.compose.ui.draw.clip
+    import androidx.compose.ui.tooling.preview.Preview
+    import androidx.compose.ui.unit.Dp
+    import androidx.compose.ui.unit.dp
+    import coil.compose.AsyncImage
+    import org.wordpress.android.R
+    import org.wordpress.android.ui.compose.theme.AppThemeM3
+    import org.wordpress.android.ui.newstats.components.CardPosition
+    import org.wordpress.android.ui.newstats.components.ShowAllFooter
+    import org.wordpress.android.ui.newstats.components.StatsCardContainer
+    import org.wordpress.android.ui.newstats.components.StatsCardEmptyContent
+    import org.wordpress.android.ui.newstats.components.StatsCardErrorContent
+    import org.wordpress.android.ui.newstats.components.StatsCardHeader
+    import org.wordpress.android.ui.newstats.components.StatsListHeader
+    import org.wordpress.android.ui.newstats.components.StatsListItem
+    import org.wordpress.android.ui.newstats.components.StatsViewChange
+    import org.wordpress.android.ui.newstats.util.ShimmerBox
+    private val CardPadding = 16.dp
+    private const val LOADING_ITEM_COUNT = 4
+    @Composable
+    fun AuthorsCard(
+        uiState: AuthorsCardUiState,
+        onShowAllClick: () -> Unit,
+        onRetry: () -> Unit,
+        onRemoveCard: () -> Unit,
+        modifier: Modifier = Modifier,
+        cardPosition: CardPosition? = null,
+        onMoveUp: (() -> Unit)? = null,
+        onMoveToTop: (() -> Unit)? = null,
+        onMoveDown: (() -> Unit)? = null,
+        onMoveToBottom: (() -> Unit)? = null
+    ) {
+        StatsCardContainer(modifier = modifier) {
+            when (uiState) {
+                is AuthorsCardUiState.Loading -> LoadingContent()
+                is AuthorsCardUiState.Loaded -> LoadedContent(
+                    uiState, onShowAllClick, onRemoveCard,
+                    cardPosition, onMoveUp, onMoveToTop, onMoveDown, onMoveToBottom
+                )
+                is AuthorsCardUiState.Error -> StatsCardErrorContent(
+                    titleResId = R.string.stats_authors_title,
+                    errorMessage = uiState.message,
+                    onRetry = onRetry,
+                    onRemoveCard = onRemoveCard,
+                    cardPosition = cardPosition,
+                    onMoveUp = onMoveUp,
+                    onMoveToTop = onMoveToTop,
+                    onMoveDown = onMoveDown,
+                    onMoveToBottom = onMoveToBottom
+                )
+            }
+        }
+    }
+    @Composable
+    private fun LoadingContent() {
+        Column(modifier = Modifier.padding(CardPadding)) {
+            // Title placeholder
+            ShimmerBox(
+                modifier = Modifier
+                    .width(100.dp)
+                    .height(20.dp)
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            // List items placeholders
+            repeat(LOADING_ITEM_COUNT) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 8.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    ShimmerBox(
+                        modifier = Modifier
+                            .size(40.dp)
+                            .clip(CircleShape)
+                    )
+                    Spacer(modifier = Modifier.width(12.dp))
+                    ShimmerBox(
+                        modifier = Modifier
+                            .weight(1f)
+                            .height(16.dp)
+                    )
+                    Spacer(modifier = Modifier.width(12.dp))
+                    ShimmerBox(
+                        modifier = Modifier
+                            .width(50.dp)
+                            .height(16.dp)
+                    )
+                }
+            }
+        }
+    }
+    @Composable
+    private fun LoadedContent(
+        state: AuthorsCardUiState.Loaded,
+        onShowAllClick: () -> Unit,
+        onRemoveCard: () -> Unit,
+        cardPosition: CardPosition?,
+        onMoveUp: (() -> Unit)?,
+        onMoveToTop: (() -> Unit)?,
+        onMoveDown: (() -> Unit)?,
+        onMoveToBottom: (() -> Unit)?
+    ) {
+        Column(modifier = Modifier.padding(CardPadding)) {
+            StatsCardHeader(
+                titleResId = R.string.stats_authors_title,
+                onRemoveCard = onRemoveCard,
+                cardPosition = cardPosition,
+                onMoveUp = onMoveUp,
+                onMoveToTop = onMoveToTop,
+                onMoveDown = onMoveDown,
+                onMoveToBottom = onMoveToBottom
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            if (state.authors.isEmpty()) {
+                StatsCardEmptyContent()
+            } else {
+                StatsListHeader(leftHeaderResId = R.string.stats_authors_author_header)
+                Spacer(modifier = Modifier.height(8.dp))
+                // Author list (capped at 10 items)
+                state.authors.forEachIndexed { index, author ->
+                    val percentage = if (state.maxViewsForBar > 0) {
+                        author.views.toFloat() / state.maxViewsForBar.toFloat()
+                    } else 0f
+                    AuthorRow(author = author, percentage = percentage)
+                    if (index < state.authors.lastIndex) {
+                        Spacer(modifier = Modifier.height(4.dp))
+                    }
+                }
+                // Show All footer
+                Spacer(modifier = Modifier.height(12.dp))
+                ShowAllFooter(onClick = onShowAllClick)
+            }
+        }
+    }
+    @Composable
+    private fun AuthorRow(
+        author: AuthorUiItem,
+        percentage: Float
+    ) {
+        StatsListItem(
+            percentage = percentage,
+            name = author.name,
+            views = author.views,
+            change = author.change,
+            icon = { AuthorAvatar(avatarUrl = author.avatarUrl, name = author.name) }
+        )
+    }
+    @Composable
+    fun AuthorAvatar(
+        avatarUrl: String?,
+        name: String,
+        modifier: Modifier = Modifier,
+        size: Dp = 40.dp
+    ) {
+        if (avatarUrl != null) {
+            AsyncImage(
+                model = avatarUrl,
+                contentDescription = name,
+                modifier = modifier
+                    .size(size)
+                    .clip(CircleShape)
+            )
+        } else {
+            Box(
+                modifier = modifier
+                    .size(size)
+                    .background(MaterialTheme.colorScheme.surfaceVariant, CircleShape),
+                contentAlignment = Alignment.Center
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Person,
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.size(size * 0.6f)
+                )
+            }
+        }
+    }
+    // Previews
+    @Preview(showBackground = true)
+    @Composable
+    private fun AuthorsCardLoadingPreview() {
+        AppThemeM3 {
+            AuthorsCard(
+                uiState = AuthorsCardUiState.Loading,
+                onShowAllClick = {},
+                onRetry = {},
+                onRemoveCard = {}
+            )
+        }
+    }
+    @Preview(showBackground = true)
+    @Composable
+    private fun AuthorsCardLoadedPreview() {
+        AppThemeM3 {
+            AuthorsCard(
+                uiState = AuthorsCardUiState.Loaded(
+                    authors = listOf(
+                        AuthorUiItem("John Doe", null, 3464, StatsViewChange.Positive(124, 3.7)),
+                        AuthorUiItem("Jane Smith", null, 556, StatsViewChange.Positive(45, 8.8)),
+                        AuthorUiItem("Bob Johnson", null, 522, StatsViewChange.Negative(12, 2.2)),
+                        AuthorUiItem("Alice Brown", null, 485, StatsViewChange.NoChange)
+                    ),
+                    maxViewsForBar = 3464,
+                    hasMoreItems = true
+                ),
+                onShowAllClick = {},
+                onRetry = {},
+                onRemoveCard = {}
+            )
+        }
+    }
+    @Preview(showBackground = true)
+    @Composable
+    private fun AuthorsCardErrorPreview() {
+        AppThemeM3 {
+            AuthorsCard(
+                uiState = AuthorsCardUiState.Error("Failed to load author data"),
+                onShowAllClick = {},
+                onRetry = {},
+                onRemoveCard = {}
+            )
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

CMM 1222 add stats top authors card #22561

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!