Fix recycleview article positions

The articles were being opened by setting a click listener on the binding. In card view this was being done through a function and as such it used the overall viewbind of the view rather than the binding of the item viewholder. Now the functions are more explicit to avoid future errors. Pulled up a few members from ItemCardAdapter and ItemListAdapter to ItemAdapter.
2024-11-19 01:50:58 +01:00 · 2024-11-19 01:50:58 +01:00 · 0bf9ca9a49
commit 0bf9ca9a49
parent 61e0087894
4 changed files with 47 additions and 64 deletions
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@ -58,7 +58,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
    private lateinit var binding: ActivityHomeBinding

-    private var recyclerAdapter: RecyclerView.Adapter<*>? = null
+    private var recyclerAdapter: ItemsAdapter<out RecyclerView.ViewHolder>? = null

    private var fromTabShortcut: Boolean = false

@ -477,17 +477,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                    ItemCardAdapter(
                        this,
                        items,
-                    ) {
-                        updateItems(it)
-                    }
+                    )
            } else {
                recyclerAdapter =
                    ItemListAdapter(
                        this,
                        items,
-                    ) {
-                        updateItems(it)
-                    }
+                    )

                binding.recyclerView.addItemDecoration(
                    DividerItemDecoration(
@ -498,7 +494,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            }
            binding.recyclerView.adapter = recyclerAdapter
        } else {
-            (recyclerAdapter as ItemsAdapter<*>).updateAllItems(items)
+            recyclerAdapter!!.updateAllItems(items)
        }

        reloadBadges()
@ -660,10 +656,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            else -> repository.badgeUnread.value // if !elementsShown then unread are fetched.
        }

-    private fun updateItems(adapterItems: ArrayList<SelfossModel.Item>) {
-        items = adapterItems
-    }
-
    private fun handleRecurringTask() {
        if (appSettingsService.isPeriodicRefreshEnabled()) {
            val myConstraints =
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.adapters

 import android.app.Activity
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -14,7 +13,6 @@ import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@ -32,11 +30,9 @@ import org.kodein.di.instance

 class ItemCardAdapter(
    override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val items: ArrayList<SelfossModel.Item>,
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
-    private lateinit var binding: CardItemBinding
-    private val c: Context = app.baseContext
+    override lateinit var binding: CardItemBinding
    private val imageMaxHeight: Int =
        c.resources.getDimension(R.dimen.card_image_max_height).toInt()

@ -52,8 +48,8 @@ class ItemCardAdapter(
        return ViewHolder(binding)
    }

-    private fun handleClickListeners(position: Int) {
-        binding.favButton.setOnClickListener {
+    private fun handleClickListeners(holderBinding: CardItemBinding, position: Int) {
+        holderBinding.favButton.setOnClickListener {
            val item = items[position]
            if (item.starred) {
                CoroutineScope(Dispatchers.IO).launch {
@ -78,27 +74,15 @@ class ItemCardAdapter(
        }
    }

-    private fun handleLinkOpening(position: Int) {
-        binding.root.setOnClickListener {
-            repository.setReaderItems(items)
-            c.openItemUrl(
-                position,
-                items[position].getLinkDecoded(),
-                appSettingsService.isArticleViewerEnabled(),
-                app,
-            )
-        }
-    }
-
    override fun onBindViewHolder(
        holder: ViewHolder,
        position: Int,
    ) {
        with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]

-            handleClickListeners(holder.bindingAdapterPosition)
-            handleLinkOpening(holder.bindingAdapterPosition)
+            handleClickListeners(binding, position)
+            openLink(binding, position)

            binding.favButton.isSelected = itm.starred
            if (appSettingsService.getPublicAccess()) {
@ -140,9 +124,5 @@ class ItemCardAdapter(
        }
    }

-    override fun getItemCount(): Int {
-        return items.size
-    }
-
    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.adapters

 import android.app.Activity
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@ -10,7 +9,6 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@ -23,11 +21,9 @@ import org.kodein.di.instance

 class ItemListAdapter(
    override val app: Activity,
-    override var items: ArrayList<SelfossModel.Item>,
-    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit,
+    override val items: ArrayList<SelfossModel.Item>,
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
-    private lateinit var binding: ListItemBinding
-    private val c: Context = app.baseContext
+    override lateinit var binding: ListItemBinding

    override val di: DI by closestDI(app)
    override val repository: Repository by instance()
@ -46,17 +42,9 @@ class ItemListAdapter(
        position: Int,
    ) {
        with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]

-            binding.root.setOnClickListener {
-                repository.setReaderItems(items)
-                c.openItemUrl(
-                    holder.bindingAdapterPosition,
-                    items[holder.bindingAdapterPosition].getLinkDecoded(),
-                    appSettingsService.isArticleViewerEnabled(),
-                    app,
-                )
-            }
+            openLink(binding, position)

            binding.title.text = itm.title.getHtmlDecoded()

@ -83,7 +71,5 @@ class ItemListAdapter(
        }
    }

-    override fun getItemCount(): Int = items.size
-
    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
 }
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
@ -1,10 +1,14 @@
 package bou.amine.apps.readerforselfossv2.android.adapters

 import android.app.Activity
+import android.content.Context
 import android.graphics.Color
+import android.util.Log
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@ -16,16 +20,18 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware

 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
-    abstract var items: ArrayList<SelfossModel.Item>
+    abstract val items: ArrayList<SelfossModel.Item>
    abstract val repository: Repository
+    abstract val binding: ViewBinding
    abstract val appSettingsService: AppSettingsService
    abstract val app: Activity
-    abstract val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
+
+    protected val c: Context get() = app.baseContext

    fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
-        this.items = items
+        this.items.clear()
+        this.items.addAll(items)
        notifyDataSetChanged()
-        updateItems(this.items)
    }

    private fun unmarkSnackbar(
@ -70,6 +76,22 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
        s.show()
    }

+    protected fun openLink(holderBinding: ViewBinding, position: Int) {
+        holderBinding.root.setOnClickListener {
+            Log.d(
+                "RecyclerViewDebug",
+                "Clicked position: $position, Item ID: ${items[position].id}"
+            )
+            repository.setReaderItems(items)
+            c.openItemUrl(
+                position,
+                items[position].getLinkDecoded(),
+                appSettingsService.isArticleViewerEnabled(),
+                app,
+            )
+        }
+    }
+
    fun handleItemAtIndex(position: Int) {
        if (items[position].unread) {
            readItemAtIndex(items[position], position)
@ -90,7 +112,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
            items.remove(item)
            notifyItemRemoved(position)
            notifyItemRangeChanged(position, itemCount)
-            updateItems(items)
        } else {
            notifyItemChanged(position)
        }
@ -119,13 +140,17 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
    ) {
        items.add(position, item)
        notifyItemInserted(position)
-        updateItems(items)
    }

    fun addItemsAtEnd(newItems: List<SelfossModel.Item>) {
        val oldSize = items.size
        items.addAll(newItems)
        notifyItemRangeInserted(oldSize, newItems.size)
-        updateItems(items)
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    override fun getItemId(position: Int): Long {
+        return items[position].id.toLong()
    }
 }