Better handling of showing OPDS catalogs

readium · Jul 27, 2023 · 1f4c3f1 · 1f4c3f1
1 parent 9408caa
commit 1f4c3f1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/test-app/src/main/java/org/readium/r2/testapp/catalogs/CatalogFragment.kt b/test-app/src/main/java/org/readium/r2/testapp/catalogs/CatalogFragment.kt
@@ -88,23 +88,8 @@ class CatalogFragment : Fragment() {
 
         (activity as MainActivity).supportActionBar?.title = catalog.title
 
-        // FIXME opening a catalog, then opening a different catalog does not transition well
         catalogViewModel.parseCatalog(catalog)
-        catalogViewModel.parseData.observe(viewLifecycleOwner) { result ->
-
-            facets = result.feed?.facets ?: mutableListOf()
-
-            if (facets.size > 0) {
-                showFacetMenu = true
-            }
-            requireActivity().invalidateOptionsMenu()
-
-            navigationAdapter.submitList(result.feed!!.navigation)
-            publicationAdapter.submitList(result.feed!!.publications)
-            groupAdapter.submitList(result.feed!!.groups)
-
-            binding.catalogProgressBar.visibility = View.GONE
-        }
+        binding.catalogProgressBar.visibility = View.VISIBLE
 
         val menuHost: MenuHost = requireActivity()
 
@@ -145,15 +130,28 @@ class CatalogFragment : Fragment() {
     }
 
     private fun handleEvent(event: CatalogViewModel.Event.FeedEvent) {
-        val message =
-            when (event) {
-                is CatalogViewModel.Event.FeedEvent.CatalogParseFailed -> getString(R.string.failed_parsing_catalog)
+        when (event) {
+            is CatalogViewModel.Event.FeedEvent.CatalogParseFailed -> {
+                Snackbar.make(
+                    requireView(),
+                    getString(R.string.failed_parsing_catalog),
+                    Snackbar.LENGTH_LONG
+                ).show()
             }
+
+            is CatalogViewModel.Event.FeedEvent.CatalogParseSuccess -> {
+                facets = event.result.feed?.facets ?: mutableListOf()
+
+                if (facets.size > 0) {
+                    showFacetMenu = true
+                }
+                requireActivity().invalidateOptionsMenu()
+
+                navigationAdapter.submitList(event.result.feed!!.navigation)
+                publicationAdapter.submitList(event.result.feed!!.publications)
+                groupAdapter.submitList(event.result.feed!!.groups)
+            }
+        }
         binding.catalogProgressBar.visibility = View.GONE
-        Snackbar.make(
-            requireView(),
-            message,
-            Snackbar.LENGTH_LONG
-        ).show()
     }
 }
diff --git a/test-app/src/main/java/org/readium/r2/testapp/catalogs/CatalogViewModel.kt b/test-app/src/main/java/org/readium/r2/testapp/catalogs/CatalogViewModel.kt
@@ -37,7 +37,6 @@ class CatalogViewModel(application: Application) : AndroidViewModel(application)
 
     val detailChannel = EventChannel(Channel<Event.DetailEvent>(Channel.BUFFERED), viewModelScope)
     val eventChannel = EventChannel(Channel<Event.FeedEvent>(Channel.BUFFERED), viewModelScope)
-    val parseData = MutableLiveData<ParseData>()
     lateinit var publication: Publication
 
     fun parseCatalog(catalog: Catalog) = viewModelScope.launch {
@@ -55,7 +54,7 @@ class CatalogViewModel(application: Application) : AndroidViewModel(application)
             }
         }
         parseRequest?.onSuccess {
-            parseData.postValue(it)
+            eventChannel.send(Event.FeedEvent.CatalogParseSuccess(it))
         }
         parseRequest?.onFailure {
             Timber.e(it)
@@ -96,6 +95,8 @@ class CatalogViewModel(application: Application) : AndroidViewModel(application)
         sealed class FeedEvent : Event() {
 
             object CatalogParseFailed : FeedEvent()
+
+            class CatalogParseSuccess(val result: ParseData): FeedEvent()
         }
 
         sealed class DetailEvent : Event() {