fix: Bottom bar loading issues.

## Types of changes

- [ ] I have read the **CONTRIBUTING** document.
- [ ] My code follows the code style of this project.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] This is **NOT** translation related.

This closes issue #XXX

This is implements feature #YYY

This finishes chore #ZZZ

Reviewed-on: #199
Co-authored-by: Amine <amine.bouabdallaoui@pm.me>
Co-committed-by: Amine <amine.bouabdallaoui@pm.me>

.gitea/workflows/on_called_build.yml

@@ -11,7 +11,7 @@ jobs:
           fetch-depth: 0
       - name: "Check android app changes"
         id: check-android-changes
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             androidApp/src/**

.gitea/workflows/on_pr.yml

@@ -31,8 +31,9 @@ jobs:
           fetch-depth: 0
       - name: "Check translations changes"
         id: check-translations-changes
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
+          base_sha: ${{ github.event.pull_request.base.sha }}
           files: |
             androidApp/src/main/res/values/strings.xml
       - name: upload translation sources

.gitea/workflows/on_pr_test.yml

@@ -31,9 +31,6 @@ jobs:
       - name: Change url until I find a better way to do it
         run: |
           sed -i "s/const val DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const val DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
-          echo '-----------'
-          cat ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
-          echo '-----------'
       - name: Tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

CHANGELOG.md

@@ -1,3 +1,30 @@
+**v125040991
+
+- fix: Connectivity toast message was causing issues.
+- Changelog for v125030901
+
+--------------------------------------------------------------------
+
+**v125030901
+
+- Merge pull request 'fix-reload' (#195) from fix-reload into master
+- fix: Infinite scroll needs loading stats.
+- fix: do not reload items on resume.
+- Merge pull request 'tests' (#193) from tests into master
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- chore: better handling of coroutine dispatchers.
+- ci: Instrumentation tests coverage in ci.
+- chore: comment robolectric tests for now.
+- fix: Fixed source deletion test.
+- Merge pull request 'Fix alignment changes resetting reader article position' (#190) from davidoskky/ReaderForSelfoss-multiplatform:alignment into master
+- Refactor star icon handling
+- Don't restart activity changing alignment
+- Changelog for v125030711
+
+--------------------------------------------------------------------
+
 **v125030711
 
 - Merge pull request 'fix: initial status loading issues.' (#192) from connectivity into master

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

@@ -120,6 +120,7 @@ class HomeActivity :
         binding.swipeRefreshLayout.setOnRefreshListener {
             repository.offlineOverride = false
             lastFetchDone = false
+            items.clear()
             getElementsAccordingToTab()
             binding.swipeRefreshLayout.isRefreshing = false
         }
@@ -386,6 +387,7 @@ class HomeActivity :
                     lastFetchDone = false
 
                     elementsShown = ItemType.fromInt(position + 1)
+                    items = ArrayList()
                     getElementsAccordingToTab()
                     binding.recyclerView.scrollToPosition(0)
 
@@ -458,23 +460,28 @@ class HomeActivity :
         appendResults: Boolean,
         itemType: ItemType,
     ) {
-        CountingIdlingResourceSingleton.increment()
-        binding.swipeRefreshLayout.isRefreshing = true
-        CoroutineScope(Dispatchers.IO).launch {
-            repository.displayedItems = itemType
-            items =
-                if (appendResults) {
-                    repository.getOlderItems()
-                } else {
-                    repository.getNewerItems()
-                }
+        @Suppress("detekt:ComplexCondition")
+        if ((appendResults && items.size > 0) || (!appendResults && items.size == 0)) {
             CountingIdlingResourceSingleton.increment()
-            launch(Dispatchers.Main) {
-                binding.swipeRefreshLayout.isRefreshing = false
-                handleListResult()
+            binding.swipeRefreshLayout.isRefreshing = true
+            CoroutineScope(Dispatchers.IO).launch {
+                repository.displayedItems = itemType
+                items =
+                    if (appendResults) {
+                        repository.getOlderItems()
+                    } else {
+                        repository.getNewerItems()
+                    }
+                CountingIdlingResourceSingleton.increment()
+                launch(Dispatchers.Main) {
+                    binding.swipeRefreshLayout.isRefreshing = false
+                    handleListResult()
+                    CountingIdlingResourceSingleton.decrement()
+                }
                 CountingIdlingResourceSingleton.decrement()
             }
-            CountingIdlingResourceSingleton.decrement()
+        } else {
+            handleListResult()
         }
     }
 
@@ -534,7 +541,10 @@ class HomeActivity :
     }
 
     private fun reloadBadges() {
-        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
+        if (appSettingsService.isInfiniteLoadingEnabled() ||
+            appSettingsService.isDisplayUnreadCountEnabled() ||
+            appSettingsService.isDisplayAllCountEnabled()
+        ) {
             CountingIdlingResourceSingleton.increment()
             CoroutineScope(Dispatchers.IO).launch {
                 repository.reloadBadges()

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

@@ -82,13 +82,14 @@ class MyApp :
                         } else {
                             R.string.network_connectivity_lost
                         }
-
-                    Toast
-                        .makeText(
-                            applicationContext,
-                            toastMessage,
-                            Toast.LENGTH_SHORT,
-                        ).show()
+                    launch(Dispatchers.Main) {
+                        Toast
+                            .makeText(
+                                applicationContext,
+                                toastMessage,
+                                Toast.LENGTH_SHORT,
+                            ).show()
+                    }
                 }
             }
         }

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

@@ -30,7 +30,7 @@ import org.kodein.di.instance
 
 class ItemCardAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
     override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
     override lateinit var binding: CardItemBinding

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

@@ -21,7 +21,7 @@ import org.kodein.di.instance
 
 class ItemListAdapter(
     override val app: Activity,
-    override val items: ArrayList<SelfossModel.Item>,
+    override var items: ArrayList<SelfossModel.Item>,
     override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
     override lateinit var binding: ListItemBinding

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

@@ -21,7 +21,7 @@ import org.kodein.di.DIAware
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     RecyclerView.Adapter<VH>(),
     DIAware {
-    abstract val items: ArrayList<SelfossModel.Item>
+    abstract var items: ArrayList<SelfossModel.Item>
     abstract val repository: Repository
     abstract val binding: ViewBinding
     abstract val appSettingsService: AppSettingsService
@@ -31,8 +31,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
     protected val c: Context get() = app.baseContext
 
     fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items.clear()
-        this.items.addAll(items)
+        this.items = items
         updateHomeItems(items)
         notifyDataSetChanged()
     }

fastlane/metadata/android/en-US/changelogs/v125030901.txt

@@ -0,0 +1,17 @@
+**v125030901**
+
+- Merge pull request 'fix-reload' (#195) from fix-reload into master
+- fix: Infinite scroll needs loading stats.
+- fix: do not reload items on resume.
+- Merge pull request 'tests' (#193) from tests into master
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- ci: Instrumentation tests coverage in ci.
+- chore: better handling of coroutine dispatchers.
+- ci: Instrumentation tests coverage in ci.
+- chore: comment robolectric tests for now.
+- fix: Fixed source deletion test.
+- Merge pull request 'Fix alignment changes resetting reader article position' (#190) from davidoskky/ReaderForSelfoss-multiplatform:alignment into master
+- Refactor star icon handling
+- Don't restart activity changing alignment
+- Changelog for v125030711

fastlane/metadata/android/en-US/changelogs/v125040991.txt

@@ -0,0 +1,4 @@
+**v125040991**
+
+- fix: Connectivity toast message was causing issues.
+- Changelog for v125030901