From bb5c5213871c3f7095f876727f4d5d5916897c79 Mon Sep 17 00:00:00 2001 From: davide Date: Mon, 15 Aug 2022 15:22:32 +0200 Subject: [PATCH] Remove redundant functions to fetch items --- .../android/HomeActivity.kt | 40 +++---------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt index 39bf335..173f3b1 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt @@ -886,10 +886,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar fun doGetAccordingToTab() { when (elementsShown) { // TODO: These three functions are not required, one is enough - UNREAD_SHOWN -> getUnRead(appendResults) - READ_SHOWN -> getRead(appendResults) - FAV_SHOWN -> getStarred(appendResults) - else -> getUnRead(appendResults) + UNREAD_SHOWN -> getItems(appendResults, ItemType.UNREAD) + READ_SHOWN -> getItems(appendResults, ItemType.ALL) + FAV_SHOWN -> getItems(appendResults, ItemType.STARRED) + else -> getItems(appendResults, ItemType.UNREAD) } } @@ -903,38 +903,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar doGetAccordingToTab() } - private fun getUnRead(appendResults: Boolean = false) { + private fun getItems(appendResults: Boolean, itemType: ItemType) { CoroutineScope(Dispatchers.Main).launch { binding.swipeRefreshLayout.isRefreshing = true - repository.displayedItems = ItemType.UNREAD - items = if (appendResults) { - repository.getNewerItems() - } else { - repository.getOlderItems() - } - binding.swipeRefreshLayout.isRefreshing = false - handleListResult() - } - } - - private fun getRead(appendResults: Boolean = false) { - CoroutineScope(Dispatchers.Main).launch { - binding.swipeRefreshLayout.isRefreshing = true - repository.displayedItems = ItemType.ALL - items = if (appendResults) { - repository.getNewerItems() - } else { - repository.getOlderItems() - } - binding.swipeRefreshLayout.isRefreshing = false - handleListResult() - } - } - - private fun getStarred(appendResults: Boolean = false) { - CoroutineScope(Dispatchers.Main).launch { - binding.swipeRefreshLayout.isRefreshing = true - repository.displayedItems = ItemType.STARRED + repository.displayedItems = itemType items = if (appendResults) { repository.getNewerItems() } else {