MSD - Handle Single Dashboard Card Error in UI

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCardAndItem.kt

@@ -33,7 +33,9 @@ sealed class MySiteCardAndItem(open val type: Type, open val activeQuickStartIte
 
     enum class DashboardCardType {
         ERROR_CARD,
+        TODAYS_STATS_CARD_ERROR,
         TODAYS_STATS_CARD,
+        POST_CARD_ERROR,
         POST_CARD_WITHOUT_POST_ITEMS,
         POST_CARD_WITH_POST_ITEMS
     }
@@ -97,20 +99,35 @@ sealed class MySiteCardAndItem(open val type: Type, open val activeQuickStartIte
                 open val dashboardCardType: DashboardCardType
             ) {
                 data class ErrorCard(
-                    override val dashboardCardType: DashboardCardType = DashboardCardType.ERROR_CARD,
                     val onRetryClick: ListItemInteraction
-                ) : DashboardCard(dashboardCardType)
+                ) : DashboardCard(dashboardCardType = DashboardCardType.ERROR_CARD)
 
-                data class TodaysStatsCard(
-                    val views: UiString,
-                    val visitors: UiString,
-                    val likes: UiString
-                ) : DashboardCard(DashboardCardType.TODAYS_STATS_CARD)
+                interface ErrorWithinCard {
+                    val title: UiString
+                }
+
+                sealed class TodaysStatsCard(
+                    override val dashboardCardType: DashboardCardType
+                ) : DashboardCard(dashboardCardType) {
+                    data class Error(
+                        override val title: UiString
+                    ) : TodaysStatsCard(dashboardCardType = DashboardCardType.TODAYS_STATS_CARD_ERROR), ErrorWithinCard
+
+                    data class TodaysStatsCardWithData(
+                        val views: UiString,
+                        val visitors: UiString,
+                        val likes: UiString
+                    ) : TodaysStatsCard(dashboardCardType = DashboardCardType.TODAYS_STATS_CARD)
+                }
 
                 sealed class PostCard(
                     override val dashboardCardType: DashboardCardType,
-                    open val footerLink: FooterLink
+                    open val footerLink: FooterLink? = null
                 ) : DashboardCard(dashboardCardType) {
+                    data class Error(
+                        override val title: UiString
+                    ) : PostCard(dashboardCardType = DashboardCardType.POST_CARD_ERROR), ErrorWithinCard
+
                     data class PostCardWithoutPostItems(
                         val postCardType: PostCardType,
                         val title: UiString,

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsAdapter.kt

@@ -7,12 +7,14 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 import org.apache.commons.lang3.NotImplementedException
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.ErrorCard
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.ErrorWithinCard
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard.PostCardWithPostItems
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard.PostCardWithoutPostItems
-import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard.TodaysStatsCardWithData
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.DashboardCardType
 import org.wordpress.android.ui.mysite.cards.dashboard.error.ErrorCardViewHolder
+import org.wordpress.android.ui.mysite.cards.dashboard.error.ErrorWithinCardViewHolder
 import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostCardViewHolder
 import org.wordpress.android.ui.mysite.cards.dashboard.todaysstats.TodaysStatsCardViewHolder
 
@@ -27,6 +29,8 @@ class CardsAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardViewHolder<*> {
         return when (viewType) {
             DashboardCardType.ERROR_CARD.ordinal -> ErrorCardViewHolder(parent)
+            DashboardCardType.TODAYS_STATS_CARD_ERROR.ordinal,
+            DashboardCardType.POST_CARD_ERROR.ordinal -> ErrorWithinCardViewHolder(parent, uiHelpers)
             DashboardCardType.TODAYS_STATS_CARD.ordinal -> TodaysStatsCardViewHolder(parent, uiHelpers)
             DashboardCardType.POST_CARD_WITHOUT_POST_ITEMS.ordinal ->
                 PostCardViewHolder.PostCardWithoutPostItemsViewHolder(parent, imageManager, uiHelpers)
@@ -41,7 +45,8 @@ class CardsAdapter(
     override fun onBindViewHolder(holder: CardViewHolder<*>, position: Int) {
         when (holder) {
             is ErrorCardViewHolder -> holder.bind(items[position] as ErrorCard)
-            is TodaysStatsCardViewHolder -> holder.bind(items[position] as TodaysStatsCard)
+            is ErrorWithinCardViewHolder -> holder.bind(items[position] as ErrorWithinCard)
+            is TodaysStatsCardViewHolder -> holder.bind(items[position] as TodaysStatsCardWithData)
             is PostCardViewHolder<*> -> holder.bind(items[position] as PostCard)
         }
     }
@@ -65,7 +70,8 @@ class CardsAdapter(
 
             return oldItem.dashboardCardType == newItem.dashboardCardType && when {
                 oldItem is ErrorCard && newItem is ErrorCard -> true
-                oldItem is TodaysStatsCard && newItem is TodaysStatsCard -> true
+                oldItem is ErrorWithinCard && newItem is ErrorWithinCard -> true
+                oldItem is TodaysStatsCardWithData && newItem is TodaysStatsCardWithData -> true
                 oldItem is PostCardWithPostItems && newItem is PostCardWithPostItems -> true
                 oldItem is PostCardWithoutPostItems && newItem is PostCardWithoutPostItems -> true
                 else -> throw NotImplementedException("Diff not implemented yet")

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsShownTracker.kt

@@ -4,11 +4,12 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.ErrorCard
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard.PostCardWithPostItems
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard.PostCardWithoutPostItems
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard
-import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.Type.ERROR
-import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.Type.TODAYS_STATS
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard.TodaysStatsCardWithData
+import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.Type
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import javax.inject.Inject
 
@@ -31,13 +32,25 @@ class CardsShownTracker @Inject constructor(
         is ErrorCard -> trackCardShown(
                 Pair(
                         card.dashboardCardType.toTypeValue().label,
-                        ERROR.label
+                        Type.ERROR.label
                 )
         )
-        is TodaysStatsCard -> trackCardShown(
+        is TodaysStatsCard.Error -> trackCardShown(
                 Pair(
                         card.dashboardCardType.toTypeValue().label,
-                        TODAYS_STATS.label
+                        Type.TODAYS_STATS.label
+                )
+        )
+        is TodaysStatsCardWithData -> trackCardShown(
+                Pair(
+                        card.dashboardCardType.toTypeValue().label,
+                        Type.TODAYS_STATS.label
+                )
+        )
+        is PostCard.Error -> trackCardShown(
+                Pair(
+                        card.dashboardCardType.toTypeValue().label,
+                        Type.POST.label
                 )
         )
         is PostCardWithoutPostItems -> trackCardShown(

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt

@@ -71,7 +71,9 @@ class CardsTracker @Inject constructor(
 fun DashboardCardType.toTypeValue(): Type {
     return when (this) {
         DashboardCardType.ERROR_CARD -> Type.ERROR
+        DashboardCardType.TODAYS_STATS_CARD_ERROR -> Type.ERROR
         DashboardCardType.TODAYS_STATS_CARD -> Type.TODAYS_STATS
+        DashboardCardType.POST_CARD_ERROR -> Type.ERROR
         DashboardCardType.POST_CARD_WITHOUT_POST_ITEMS -> Type.POST
         DashboardCardType.POST_CARD_WITH_POST_ITEMS -> Type.POST
     }

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/error/ErrorWithinCardViewHolder.kt

@@ -0,0 +1,25 @@
+package org.wordpress.android.ui.mysite.cards.dashboard.error
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.MySiteCardToolbarBinding
+import org.wordpress.android.databinding.MySiteErrorWithinCardBinding
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.ErrorWithinCard
+import org.wordpress.android.ui.mysite.cards.dashboard.CardViewHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.util.viewBinding
+
+class ErrorWithinCardViewHolder(
+    parent: ViewGroup,
+    private val uiHelpers: UiHelpers
+) : CardViewHolder<MySiteErrorWithinCardBinding>(
+        parent.viewBinding(MySiteErrorWithinCardBinding::inflate)
+) {
+    fun bind(card: ErrorWithinCard) = with(binding) {
+        mySiteToolbar.update(card.title)
+    }
+
+    private fun MySiteCardToolbarBinding.update(title: UiString) {
+        uiHelpers.setTextOrHide(mySiteCardToolbarTitle, title)
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostCardBuilder.kt

@@ -3,6 +3,8 @@ package org.wordpress.android.ui.mysite.cards.dashboard.posts
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel
 import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel.PostCardModel
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardErrorType
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard.FooterLink
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.PostCard.PostCardWithPostItems
@@ -22,20 +24,37 @@ import javax.inject.Inject
 class PostCardBuilder @Inject constructor(
     private val localeManagerWrapper: LocaleManagerWrapper
 ) {
-    fun build(params: PostCardBuilderParams): List<PostCard> = mutableListOf<PostCard>().apply {
-        val posts = params.posts
-        posts?.hasPublished?.takeIf { !posts.hasDraftsOrScheduledPosts() }
-                ?.let { hasPublished ->
-                    if (hasPublished) {
-                        add(createNextPostCard(params.onFooterLinkClick))
-                    } else {
-                        add(createFirstPostCard(params.onFooterLinkClick))
-                    }
-                }
-        posts?.draft?.takeIf { it.isNotEmpty() }?.let { add(it.createDraftPostsCard(params)) }
-        posts?.scheduled?.takeIf { it.isNotEmpty() }?.let { add(it.createScheduledPostsCard(params)) }
+    fun build(params: PostCardBuilderParams): List<PostCard> {
+        val error = params.posts?.error
+        return if (error != null) {
+            buildPostCardWithError(error)
+        } else {
+            buildPostCardsWithData(params)
+        }
     }
 
+    private fun buildPostCardWithError(error: PostCardError) =
+            if (shouldShowError(error)) listOf(createPostErrorCard()) else emptyList()
+
+    private fun buildPostCardsWithData(params: PostCardBuilderParams) =
+            mutableListOf<PostCard>().apply {
+                val posts = params.posts
+                posts?.hasPublished?.takeIf { !posts.hasDraftsOrScheduledPosts() }
+                        ?.let { hasPublished ->
+                            if (hasPublished) {
+                                add(createNextPostCard(params.onFooterLinkClick))
+                            } else {
+                                add(createFirstPostCard(params.onFooterLinkClick))
+                            }
+                        }
+                posts?.draft?.takeIf { it.isNotEmpty() }?.let { add(it.createDraftPostsCard(params)) }
+                posts?.scheduled?.takeIf { it.isNotEmpty() }?.let { add(it.createScheduledPostsCard(params)) }
+            }.toList()
+
+    private fun createPostErrorCard() = PostCard.Error(
+            title = UiStringRes(R.string.posts)
+    )
+
     private fun createFirstPostCard(onFooterLinkClick: (postCardType: PostCardType) -> Unit) =
             PostCardWithoutPostItems(
                     postCardType = PostCardType.CREATE_FIRST,
@@ -122,6 +141,8 @@ class PostCardBuilder @Inject constructor(
     private fun constructPostDate(date: Date) =
             SimpleDateFormat(MONTH_DAY_FORMAT, localeManagerWrapper.getLocale()).format(date)
 
+    private fun shouldShowError(error: PostCardError) = error.type == PostCardErrorType.GENERIC_ERROR
+
     companion object {
         private const val MONTH_DAY_FORMAT = "MMM d"
     }

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardBuilder.kt

@@ -1,21 +1,43 @@
 package org.wordpress.android.ui.mysite.cards.dashboard.todaysstats
 
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.dashboard.CardModel.TodaysStatsCardModel
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardErrorType
 import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard.TodaysStatsCardWithData
 import org.wordpress.android.ui.mysite.MySiteCardAndItemBuilderParams.TodaysStatsCardBuilderParams
 import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import javax.inject.Inject
 
 class TodaysStatsCardBuilder @Inject constructor(
     private val statsUtils: StatsUtils
 ) {
     fun build(params: TodaysStatsCardBuilderParams) = params.todaysStatsCard?.let {
-        TodaysStatsCard(
-                views = statToUiString(it.views),
-                visitors = statToUiString(it.visitors),
-                likes = statToUiString(it.likes)
-        )
+        val error = it.error
+        if (error != null) {
+            handleError(error)
+        } else {
+            createTodaysStatsCardWithData(it)
+        }
     }
 
+    private fun handleError(error: TodaysStatsCardError) =
+            if (shouldShowError(error)) createTodaysStatsCardWithError() else null
+
+    private fun createTodaysStatsCardWithError() = TodaysStatsCard.Error(
+            title = UiStringRes(R.string.my_site_todays_stat_card_title)
+    )
+
+    private fun createTodaysStatsCardWithData(model: TodaysStatsCardModel) = TodaysStatsCardWithData(
+            views = statToUiString(model.views),
+            visitors = statToUiString(model.visitors),
+            likes = statToUiString(model.likes)
+    )
+
+    private fun shouldShowError(error: TodaysStatsCardError) = error.type == TodaysStatsCardErrorType.GENERIC_ERROR
+
     private fun statToUiString(stat: Int) = UiStringText(statsUtils.toFormattedString(stat))
 }

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardViewHolder.kt

@@ -2,7 +2,7 @@ package org.wordpress.android.ui.mysite.cards.dashboard.todaysstats
 
 import android.view.ViewGroup
 import org.wordpress.android.databinding.MySiteTodaysStatsCardBinding
-import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard
+import org.wordpress.android.ui.mysite.MySiteCardAndItem.Card.DashboardCards.DashboardCard.TodaysStatsCard.TodaysStatsCardWithData
 import org.wordpress.android.ui.mysite.cards.dashboard.CardViewHolder
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.viewBinding
@@ -13,7 +13,7 @@ class TodaysStatsCardViewHolder(
 ) : CardViewHolder<MySiteTodaysStatsCardBinding>(
         parent.viewBinding(MySiteTodaysStatsCardBinding::inflate)
 ) {
-    fun bind(card: TodaysStatsCard) = with(binding) {
+    fun bind(card: TodaysStatsCardWithData) = with(binding) {
         uiHelpers.setTextOrHide(viewsCount, card.views)
         uiHelpers.setTextOrHide(visitorsCount, card.visitors)
         uiHelpers.setTextOrHide(likesCount, card.likes)

WordPress/src/main/res/layout/my_site_error_within_card.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/WordPress.CardView.Unelevated"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+                <include
+                    android:id="@+id/my_site_toolbar"
+                    layout="@layout/my_site_card_toolbar"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/title"
+                    style="@style/MySiteErrorCardTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:paddingEnd="@dimen/margin_extra_extra_large"
+                    android:paddingStart="@dimen/margin_extra_extra_large"
+                    android:paddingTop="@dimen/margin_extra_medium_large"
+                    android:text="@string/my_site_error_card_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/my_site_toolbar" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/subtitle"
+                    style="@style/MySiteErrorCardSubtitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/margin_extra_extra_large"
+                    android:paddingEnd="@dimen/margin_extra_extra_large"
+                    android:paddingStart="@dimen/margin_extra_extra_large"
+                    android:text="@string/my_site_error_within_card_subtitle"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/title" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>