CMM-1037 Postlist empty view (#22407)

* Removed illustration from empty view, added subtitle

* Added named arguments

* Removed unused image resource

* Wrap empty published message

* Added button to trashed posts empty view, to match pages

* Fixed missing space

* Removed new line

Author: nbradbury

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt

@@ -215,7 +215,7 @@ class PostListFragment : ViewPagerFragment() {
             if (state.emptyViewVisible) {
                 emptyView.visibility = View.VISIBLE
                 uiHelpers.setTextOrHide(emptyView.title, state.title)
-                uiHelpers.setImageOrHide(emptyView.image, state.imgResId)
+                uiHelpers.setTextOrHide(emptyView.subtitle, state.subtitle)
                 setupButtonOrHide(emptyView.button, state.buttonText, state.onButtonClick)
             } else {
                 emptyView.visibility = View.GONE

WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListEmptyUiState.kt

@@ -1,6 +1,5 @@
 package org.wordpress.android.viewmodel.posts
 
-import androidx.annotation.DrawableRes
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.store.ListStore.ListError
 import org.wordpress.android.fluxc.store.ListStore.ListErrorType.PERMISSION_ERROR
@@ -15,19 +14,19 @@ import org.wordpress.android.ui.utils.UiString.UiStringRes
 
 sealed class PostListEmptyUiState(
     val title: UiString? = null,
-    @DrawableRes val imgResId: Int? = null,
+    val subtitle: UiString? = null,
     val buttonText: UiString? = null,
     val onButtonClick: (() -> Unit)? = null,
     val emptyViewVisible: Boolean = true
 ) {
     class EmptyList(
         title: UiString,
+        subtitle: UiString? = null,
         buttonText: UiString? = null,
         onButtonClick: (() -> Unit)? = null,
-        @DrawableRes imageResId: Int = R.drawable.img_illustration_posts_75dp
     ) : PostListEmptyUiState(
         title = title,
-        imgResId = imageResId,
+        subtitle = subtitle,
         buttonText = buttonText,
         onButtonClick = onButtonClick
     )
@@ -36,7 +35,6 @@ sealed class PostListEmptyUiState(
 
     object Loading : PostListEmptyUiState(
         title = UiStringRes(R.string.posts_fetching),
-        imgResId = R.drawable.img_illustration_posts_75dp
     )
 
     class RefreshError(
@@ -45,14 +43,12 @@ sealed class PostListEmptyUiState(
         onButtonClick: (() -> Unit)? = null
     ) : PostListEmptyUiState(
         title = title,
-        imgResId = R.drawable.img_illustration_empty_results_216dp,
         buttonText = buttonText,
         onButtonClick = onButtonClick
     )
 
     object PermissionsError : PostListEmptyUiState(
         title = UiStringRes(R.string.error_refresh_unauthorized_posts),
-        imgResId = R.drawable.img_illustration_posts_75dp
     )
 }
 
@@ -121,19 +117,20 @@ private fun createEmptyListUiState(
 ): PostListEmptyUiState.EmptyList {
     return when (postListType) {
         PUBLISHED -> PostListEmptyUiState.EmptyList(
-            UiStringRes(R.string.posts_published_empty),
-            UiStringRes(R.string.posts_empty_list_button),
-            newPost
+            title = UiStringRes(R.string.posts_published_empty),
+            subtitle = UiStringRes(R.string.posts_published_empty_subtitle),
+            buttonText = UiStringRes(R.string.posts_empty_list_button),
+            onButtonClick = newPost
         )
         DRAFTS -> PostListEmptyUiState.EmptyList(
-            UiStringRes(R.string.posts_draft_empty),
-            UiStringRes(R.string.posts_empty_list_button),
-            newPost
+            title = UiStringRes(R.string.posts_draft_empty),
+            buttonText = UiStringRes(R.string.posts_empty_list_button),
+            onButtonClick = newPost
         )
         SCHEDULED -> PostListEmptyUiState.EmptyList(
-            UiStringRes(R.string.posts_scheduled_empty),
-            UiStringRes(R.string.posts_empty_list_button),
-            newPost
+            title = UiStringRes(R.string.posts_scheduled_empty),
+            buttonText = UiStringRes(R.string.posts_empty_list_button),
+            onButtonClick = newPost
         )
         SEARCH -> {
             val messageResId = if (isSearchPromptRequired) {
@@ -142,8 +139,14 @@ private fun createEmptyListUiState(
                 R.string.post_list_search_nothing_found
             }
 
-            PostListEmptyUiState.EmptyList(title = UiStringRes(messageResId), imageResId = 0)
+            PostListEmptyUiState.EmptyList(title = UiStringRes(messageResId))
+        }
+        TRASHED -> {
+            PostListEmptyUiState.EmptyList(
+                title = UiStringRes(R.string.posts_trashed_empty),
+                buttonText = UiStringRes(R.string.posts_empty_list_button),
+                onButtonClick = newPost
+            )
         }
-        TRASHED -> PostListEmptyUiState.EmptyList(UiStringRes(R.string.posts_trashed_empty))
     }
 }

WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml

@@ -28,7 +28,6 @@
                 android:layout_height="match_parent"
                 android:visibility="gone"
                 app:aevButton="@string/posts_empty_list_button"
-                app:aevImage="@drawable/img_illustration_posts_75dp"
                 app:aevTitle="@string/posts_empty_list"
                 tools:visibility="visible" />
 

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

@@ -288,7 +288,8 @@
     <string name="posts_empty_list">No posts yet. Why not create one?</string>
     <string name="posts_empty_list_button">Create a post</string>
     <string name="empty_list_default">This list is empty</string>
-    <string name="posts_published_empty">You haven\'t published any posts yet</string>
+    <string name="posts_published_empty">You haven\'t published any posts - yet!</string>
+    <string name="posts_published_empty_subtitle">Why not create one?</string>
     <string name="posts_scheduled_empty">You don\'t have any scheduled posts</string>
     <string name="posts_draft_empty">You don\'t have any draft posts</string>
     <string name="posts_trashed_empty">You don\'t have any trashed posts</string>