CMM-1037 Pagelist empty view (#22413)

nbradbury · web-flow · commit f6854d94da3f · 2025-12-11T07:26:25.000-05:00
* Added temp code to remove virtual homepage item

* Removed empty view image and deleted img_illustration_pages_104dp

* Removed empty view image, deleted img_illustration_pages_104dp, and added subtitle resource

* Ensure subtitle appears for empty published view

* Removed image resource from model

* added missing `run`

* Fixed tests

* Fixed detekt errors
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt
@@ -183,10 +183,10 @@ sealed class PageItem(open val type: Type) {
     data class Divider(val title: String = "") : PageItem(DIVIDER)
 
     data class Empty(
-        @StringRes val textResource: Int = R.string.empty_list_default,
+        @StringRes val titleResource: Int = R.string.empty_list_default,
+        @StringRes val subtitleResource: Int? = null,
         val isSearching: Boolean = false,
-        val isButtonVisible: Boolean = true,
-        val isImageVisible: Boolean = true
+        val isButtonVisible: Boolean = true
     ) : PageItem(EMPTY)
 
     object VirtualHomepage : PageItem(VIRTUAL_HOMEPAGE) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt
@@ -342,7 +342,14 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
         @Suppress("DEPRECATION")
         override fun onBind(pageItem: PageItem) {
             (pageItem as Empty).apply {
-                emptyView.title.text = emptyView.resources.getString(pageItem.textResource)
+                emptyView.title.text = emptyView.resources.getString(pageItem.titleResource)
+
+                pageItem.subtitleResource?.let { subtitleResource ->
+                    emptyView.subtitle.text = emptyView.resources.getString(subtitleResource)
+                    emptyView.subtitle.visibility = View.VISIBLE
+                } ?: run {
+                    emptyView.subtitle.visibility = View.GONE
+                }
 
                 if (pageItem.isButtonVisible) {
                     emptyView.button.setOnClickListener {
@@ -353,8 +360,6 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
                     emptyView.button.visibility = View.GONE
                 }
 
-                emptyView.image.visibility = if (pageItem.isImageVisible) View.VISIBLE else View.GONE
-
                 emptyView.updateLayoutForSearch(pageItem.isSearching, 0)
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
@@ -261,15 +261,19 @@ class PageListViewModel @Inject constructor(
                 _pages.postValue(
                     listOf(
                         Empty(
-                            R.string.pages_fetching,
+                            titleResource = R.string.pages_fetching,
                             isButtonVisible = false,
-                            isImageVisible = false
                         )
                     )
                 )
             } else {
                 when (listType) {
-                    PUBLISHED -> _pages.postValue(listOf(Empty(R.string.pages_empty_published)))
+                    PUBLISHED -> _pages.postValue(listOf(
+                        Empty(
+                            titleResource = R.string.pages_empty_published,
+                            subtitleResource = R.string.pages_empty_published_subtitle
+                        )
+                    ))
                     SCHEDULED -> _pages.postValue(listOf(Empty(R.string.pages_empty_scheduled)))
                     DRAFTS -> _pages.postValue(listOf(Empty(R.string.pages_empty_drafts)))
                     TRASHED -> _pages.postValue(listOf(Empty(R.string.pages_empty_trashed)))
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt
@@ -41,7 +41,9 @@ class PageParentSearchViewModel
         if (pageItems != null) {
             loadFoundPages(pageItems)
         } else {
-            _searchResult.value = listOf(Empty(R.string.pages_search_suggestion, true))
+            _searchResult.value = listOf(
+                Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)
+            )
         }
     }
 
@@ -53,7 +55,9 @@ class PageParentSearchViewModel
         if (pageItems.isNotEmpty()) {
             _searchResult.value = pageItems
         } else {
-            _searchResult.value = listOf(Empty(R.string.pages_empty_search_result, true))
+            _searchResult.value = listOf(
+                Empty(titleResource = R.string.pages_empty_search_result, isSearching = true)
+            )
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt
@@ -64,7 +64,9 @@ class SearchListViewModel
 
             pagesViewModel.checkIfNewPageButtonShouldBeVisible()
         } else {
-            _searchResult.value = listOf(Empty(R.string.pages_search_suggestion, true))
+            _searchResult.value = listOf(
+                Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)
+            )
         }
     }
 
@@ -89,7 +91,9 @@ class SearchListViewModel
                 }
             _searchResult.value = pageItems
         } else {
-            _searchResult.value = listOf(Empty(R.string.pages_empty_search_result, true))
+            _searchResult.value = listOf(
+                Empty(titleResource = R.string.pages_empty_search_result, isSearching = true)
+            )
         }
     }
 
diff --git a/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml b/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml
diff --git a/WordPress/src/main/res/layout/page_empty_item.xml b/WordPress/src/main/res/layout/page_empty_item.xml
@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:aevButton="@string/pages_empty_list_button"
-        app:aevImage="@drawable/img_illustration_pages_104dp"
         app:aevTitle="@string/empty_list_default" />
 
 </RelativeLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -3597,7 +3597,8 @@
     <string name="pages_delete_permanently">Delete Permanently</string>
     <string name="pages_empty_search_result">No pages matching your search</string>
     <string name="pages_search_suggestion">Search pages</string>
-    <string name="pages_empty_published">You haven\'t published any pages yet</string>
+    <string name="pages_empty_published">You haven\'t published any pages - yet!</string>
+    <string name="pages_empty_published_subtitle">Why not create one?</string>
     <string name="pages_empty_drafts">You don\'t have any draft pages</string>
     <string name="pages_empty_scheduled">You don\'t have any scheduled pages</string>
     <string name="pages_empty_trashed">You don\'t have any trashed pages</string>
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
@@ -38,14 +38,20 @@ class PageParentSearchViewModelTest : BaseUnitTest() {
     fun `show empty item on start`() {
         searchPages.value = null
 
-        assertThat(viewModel.searchResult.value).containsOnly(Empty(R.string.pages_search_suggestion, true))
+        assertThat(viewModel.searchResult.value).containsOnly(
+            Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)
+        )
     }
 
     @Test
     fun `show no matches on empty search results`() {
-        searchPages.value = mutableListOf(Empty(R.string.pages_empty_search_result, false))
+        searchPages.value = mutableListOf(
+            Empty(titleResource = R.string.pages_empty_search_result, isSearching = false)
+        )
 
-        assertThat(viewModel.searchResult.value).containsOnly(Empty(R.string.pages_empty_search_result, false))
+        assertThat(viewModel.searchResult.value).containsOnly(
+            Empty(titleResource = R.string.pages_empty_search_result, isSearching = false)
+        )
     }
 
     @Test
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt
@@ -98,7 +98,9 @@ class SearchListViewModelTest : BaseUnitTest() {
     fun `show empty item on start`() {
         searchPages.value = null
 
-        assertThat(viewModel.searchResult.value).containsOnly(Empty(R.string.pages_search_suggestion, true))
+        assertThat(viewModel.searchResult.value).containsOnly(
+            Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)
+        )
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ class PageParentSearchViewModel`
`41`	`41`	`if (pageItems != null) {`
`42`	`42`	`loadFoundPages(pageItems)`
`43`	`43`	`} else {`
`44`		`- _searchResult.value = listOf(Empty(R.string.pages_search_suggestion, true))`
	`44`	`+ _searchResult.value = listOf(`
	`45`	`+ Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)`
	`46`	`+ )`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`
`@@ -53,7 +55,9 @@ class PageParentSearchViewModel`
`53`	`55`	`if (pageItems.isNotEmpty()) {`
`54`	`56`	`_searchResult.value = pageItems`
`55`	`57`	`} else {`
`56`		`- _searchResult.value = listOf(Empty(R.string.pages_empty_search_result, true))`
	`58`	`+ _searchResult.value = listOf(`
	`59`	`+ Empty(titleResource = R.string.pages_empty_search_result, isSearching = true)`
	`60`	`+ )`
`57`	`61`	`}`
`58`	`62`	`}`
`59`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ class SearchListViewModel`
`64`	`64`
`65`	`65`	`pagesViewModel.checkIfNewPageButtonShouldBeVisible()`
`66`	`66`	`} else {`
`67`		`- _searchResult.value = listOf(Empty(R.string.pages_search_suggestion, true))`
	`67`	`+ _searchResult.value = listOf(`
	`68`	`+ Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)`
	`69`	`+ )`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`
`@@ -89,7 +91,9 @@ class SearchListViewModel`
`89`	`91`	`}`
`90`	`92`	`_searchResult.value = pageItems`
`91`	`93`	`} else {`
`92`		`- _searchResult.value = listOf(Empty(R.string.pages_empty_search_result, true))`
	`94`	`+ _searchResult.value = listOf(`
	`95`	`+ Empty(titleResource = R.string.pages_empty_search_result, isSearching = true)`
	`96`	`+ )`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ class SearchListViewModelTest : BaseUnitTest() {`
`98`	`98`	fun `show empty item on start`() {
`99`	`99`	`searchPages.value = null`
`100`	`100`
`101`		`- assertThat(viewModel.searchResult.value).containsOnly(Empty(R.string.pages_search_suggestion, true))`
	`101`	`+ assertThat(viewModel.searchResult.value).containsOnly(`
	`102`	`+ Empty(titleResource = R.string.pages_search_suggestion, isSearching = true)`
	`103`	`+ )`
`102`	`104`	`}`
`103`	`105`
`104`	`106`	`@Test`