androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt

@@ -18,7 +18,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
 import androidx.drawerlayout.widget.DrawerLayout
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.*
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -179,6 +178,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
                         adapter.handleItemAtIndex(position)
 
+                        reloadBadgeContent()
+
                         val tagHashes = i.tags.map { it.longHash() }
                         tagsBadge = tagsBadge.map {
                             if (tagHashes.contains(it.key)) {
@@ -206,16 +207,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
     }
 
-    private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) {
-        if (count > 0) {
-            badge
-                .setText(count.toString())
-                .maybeShow()
-        } else {
-            badge.removeBadge()
-        }
-    }
-
     private fun handleBottomBar() {
 
         tabNewBadge = TextBadgeItem()
@@ -228,28 +219,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             .setText("")
             .setHideOnSelect(false).hide(false)
 
-        if (appSettingsService.isDisplayUnreadCountEnabled()) {
-            lifecycleScope.launch {
-                repository.badgeUnread.collect {
-                    updateBottomBarBadgeCount(tabNewBadge, it)
-                }
-            }
-        }
-
-        if (appSettingsService.isDisplayAllCountEnabled()) {
-            lifecycleScope.launch {
-                repository.badgeAll.collect {
-                    updateBottomBarBadgeCount(tabArchiveBadge, it)
-                }
-            }
-
-            lifecycleScope.launch {
-                repository.badgeStarred.collect {
-                    updateBottomBarBadgeCount(tabStarredBadge, it)
-                }
-            }
-        }
-
         val tabNew =
             BottomNavigationItem(
                 R.drawable.ic_tab_fiber_new_black_24dp,
@@ -745,12 +714,29 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun reloadBadges() {
         if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
-            CoroutineScope(Dispatchers.IO).launch {
+            CoroutineScope(Dispatchers.Main).launch {
                 repository.reloadBadges()
+                reloadBadgeContent()
             }
         }
     }
 
+    private fun reloadBadgeContent() {
+        if (appSettingsService.isDisplayUnreadCountEnabled()) {
+            tabNewBadge
+                .setText(repository.badgeUnread.toString())
+                .maybeShow()
+        }
+        if (appSettingsService.isDisplayAllCountEnabled()) {
+            tabArchiveBadge
+                .setText(repository.badgeAll.toString())
+                .maybeShow()
+            tabStarredBadge
+                .setText(repository.badgeStarred.toString())
+                .maybeShow()
+        }
+    }
+
     private fun reloadTagsBadges() {
         tagsBadge.forEach {
             binding.mainDrawer.updateBadge(it.key, StringHolder(it.value.toString()))
@@ -872,10 +858,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     private fun maxItemNumber(): Int =
         when (elementsShown) {
-            ItemType.UNREAD -> repository.badgeUnread.value
+            ItemType.UNREAD -> repository.badgeUnread
-            ItemType.ALL -> repository.badgeAll.value
+            ItemType.ALL -> repository.badgeAll
-            ItemType.STARRED -> repository.badgeStarred.value
+            ItemType.STARRED -> repository.badgeStarred
-            else -> repository.badgeUnread.value // if !elementsShown then unread are fetched.
+            else -> repository.badgeUnread // if !elementsShown then unread are fetched.
         }
 
     private fun updateItems(adapterItems: ArrayList<SelfossModel.Item>) {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt

@@ -111,11 +111,13 @@ class ItemCardAdapter(
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.unstarr(item)
                     }
+                    item.starred = false
                     binding.favButton.isSelected = false
                 } else {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.starr(item)
                     }
+                    item.starred = true
                     binding.favButton.isSelected = true
                 }
             }

androidApp/src/test/kotlin/RepositoryTest.kt

@@ -299,9 +299,9 @@ class RepositoryTest {
         }
 
         assertSame(true, success)
-        assertEquals(NUMBER_ARTICLES, repository.badgeAll.value)
+        assertSame(NUMBER_ARTICLES, repository.badgeAll)
-        assertEquals(NUMBER_UNREAD, repository.badgeUnread.value)
+        assertSame(NUMBER_UNREAD, repository.badgeUnread)
-        assertEquals(NUMBER_STARRED, repository.badgeStarred.value)
+        assertSame(NUMBER_STARRED, repository.badgeStarred)
         coVerify(atLeast = 1) { api.stats() }
         verify(exactly = 0) { db.itemsQueries.items().executeAsList() }
     }
@@ -318,9 +318,9 @@ class RepositoryTest {
         }
 
         assertSame(false, success)
-        assertSame(0, repository.badgeAll.value)
+        assertSame(0, repository.badgeAll)
-        assertSame(0, repository.badgeUnread.value)
+        assertSame(0, repository.badgeUnread)
-        assertSame(0, repository.badgeStarred.value)
+        assertSame(0, repository.badgeStarred)
         coVerify(atLeast = 1) { api.stats() }
         verify(exactly = 0) { db.itemsQueries.items().executeAsList() }
     }
@@ -338,9 +338,9 @@ class RepositoryTest {
         }
 
         assertTrue(success)
-        assertEquals(1, repository.badgeAll.value)
+        assertSame(1, repository.badgeAll)
-        assertEquals(1, repository.badgeUnread.value)
+        assertSame(1, repository.badgeUnread)
-        assertEquals(1, repository.badgeStarred.value)
+        assertSame(1, repository.badgeStarred)
         coVerify(exactly = 0) { api.stats() }
         verify(atLeast = 1) { db.itemsQueries.items().executeAsList() }
     }
@@ -358,9 +358,9 @@ class RepositoryTest {
         }
 
         assertFalse(success)
-        assertSame(0, repository.badgeAll.value)
+        assertSame(0, repository.badgeAll)
-        assertSame(0, repository.badgeUnread.value)
+        assertSame(0, repository.badgeUnread)
-        assertSame(0, repository.badgeStarred.value)
+        assertSame(0, repository.badgeStarred)
         coVerify(exactly = 0) { api.stats() }
         verify(exactly = 0) { db.itemsQueries.items().executeAsList() }
     }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -10,7 +10,6 @@ import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
 class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
@@ -28,12 +27,12 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
 
     var offlineOverride = false
 
-    private val _badgeUnread = MutableStateFlow(0)
+    var badgeUnread = 0
-    val badgeUnread = _badgeUnread.asStateFlow()
+    set(value) {field = if (value < 0) { 0 } else { value } }
-    private val _badgeAll = MutableStateFlow(0)
+    var badgeAll = 0
-    val badgeAll = _badgeAll.asStateFlow()
+    set(value) {field = if (value < 0) { 0 } else { value } }
-    private val _badgeStarred = MutableStateFlow(0)
+    var badgeStarred = 0
-    val badgeStarred = _badgeStarred.asStateFlow()
+    set(value) {field = if (value < 0) { 0 } else { value } }
 
     private var fetchedSources = false
     private var fetchedTags = false
@@ -126,17 +125,17 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         if (isNetworkAvailable()) {
             val response = api.stats()
             if (response.success && response.data != null) {
-                _badgeUnread.value = response.data.unread
+                badgeUnread = response.data.unread
-                _badgeAll.value = response.data.total
+                badgeAll = response.data.total
-                _badgeStarred.value = response.data.starred
+                badgeStarred = response.data.starred
                 success = true
             }
         } else if (appSettingsService.isItemCachingEnabled()) {
             // TODO: do this differently, because it's not efficient
             val dbItems = getDBItems()
-            _badgeUnread.value = dbItems.filter { item -> item.unread }.size
+            badgeUnread = dbItems.filter { item -> item.unread }.size
-            _badgeStarred.value = dbItems.filter { item -> item.starred }.size
+            badgeStarred = dbItems.filter { item -> item.starred }.size
-            _badgeAll.value = dbItems.size
+            badgeAll = dbItems.size
             success = true
         }
         return success
@@ -284,7 +283,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     private fun markAsReadLocally(item: SelfossModel.Item) {
         if (item.unread) {
             item.unread = false
-            _badgeUnread.value -= 1
+            badgeUnread -= 1
         }
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -295,7 +294,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     private fun unmarkAsReadLocally(item: SelfossModel.Item) {
         if (!item.unread) {
             item.unread = true
-            _badgeUnread.value += 1
+            badgeUnread += 1
         }
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -306,7 +305,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     private fun starrLocally(item: SelfossModel.Item) {
         if (!item.starred) {
             item.starred = true
-            _badgeStarred.value += 1
+            badgeStarred += 1
         }
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -317,7 +316,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     private fun unstarrLocally(item: SelfossModel.Item) {
         if (item.starred) {
             item.starred = false
-            _badgeStarred.value -= 1
+            badgeStarred -= 1
         }
 
         CoroutineScope(Dispatchers.Main).launch {