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

@@ -6,8 +6,9 @@ import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
@@ -31,15 +32,69 @@ class SourcesListAdapter(
     private val items: ArrayList<SelfossModel.SourceDetail>,
 ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(),
     DIAware {
-    override val di: DI by closestDI(app)
+    private val c: Context = app.baseContext
+    private lateinit var binding: SourceListItemBinding
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override val di: DI by closestDI(app)
-        val binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    private val repository: Repository by instance()
-        return ViewHolder(binding)
+    private val appSettingsService: AppSettingsService by instance()
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
+        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding.root)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(
-        holder.bind(items[position], position)
+        holder: ViewHolder,
+        position: Int,
+    ) {
+        val itm = items[position]
+
+        val deleteBtn: Button = holder.mView.findViewById(R.id.deleteBtn)
+
+        deleteBtn.setOnClickListener {
+            val (id, title) = items[position]
+            CoroutineScope(Dispatchers.IO).launch {
+                val successfullyDeletedSource = repository.deleteSource(id, title)
+                if (successfullyDeletedSource) {
+                    items.removeAt(position)
+                    notifyItemRemoved(position)
+                    notifyItemRangeChanged(position, itemCount)
+                } else {
+                    Toast
+                        .makeText(
+                            app,
+                            R.string.can_delete_source,
+                            Toast.LENGTH_SHORT,
+                        ).show()
+                }
+            }
+        }
+
+        holder.mView.setOnClickListener {
+            val source = items[position]
+
+            repository.setSelectedSource(source)
+            app.startActivity(Intent(app, UpsertSourceActivity::class.java))
+        }
+
+        if (itm.getIcon(repository.baseUrl).isEmpty()) {
+            binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded())
+        } else {
+            c.circularDrawable(itm.getIcon(repository.baseUrl), binding.itemImage, appSettingsService)
+        }
+
+        if (!itm.error.isNullOrBlank()) {
+            binding.errorText.visibility = View.VISIBLE
+            binding.errorText.text = itm.error
+        } else {
+            binding.errorText.visibility = View.GONE
+        }
+
+        binding.sourceTitle.text = itm.title.getHtmlDecoded()
     }
 
     override fun getItemId(position: Int) = position.toLong()
@@ -48,62 +103,7 @@ class SourcesListAdapter(
 
     override fun getItemCount(): Int = items.size
 
-
+    inner class ViewHolder(
-    inner class ViewHolder(val binding: SourceListItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        val mView: ConstraintLayout,
-
+    ) : RecyclerView.ViewHolder(mView)
-        private val context: Context = app.applicationContext
-        private val repository: Repository by instance()
-        private val appSettingsService: AppSettingsService by instance()
-
-        fun bind(source: SelfossModel.SourceDetail, position: Int) {
-            binding.apply {
-                sourceTitle.text = source.title.getHtmlDecoded()
-                if (source.getIcon(repository.baseUrl).isEmpty()) {
-                    itemImage.setBackgroundAndText(source.title.getHtmlDecoded())
-                } else {
-                    context.circularDrawable(source.getIcon(repository.baseUrl), itemImage, appSettingsService)
-                }
-
-                errorText.apply {
-                    visibility = if (!source.error.isNullOrBlank()) View.VISIBLE else View.GONE
-                    text = source.error
-                }
-
-                deleteBtn.setOnClickListener { showDeleteConfirmationDialog(source, position) }
-
-                root.setOnClickListener {
-                    repository.setSelectedSource(source)
-                    app.startActivity(Intent(app, UpsertSourceActivity::class.java))
-                }
-            }
-        }
-
-        private fun showDeleteConfirmationDialog(source: SelfossModel.SourceDetail, position: Int) {
-            AlertDialog.Builder(app)
-                .setTitle(app.getString(R.string.confirm_delete_title))
-                .setMessage(app.getString(R.string.confirm_delete_message, source.title))
-                .setPositiveButton(android.R.string.ok) { _, _ -> deleteSource(source, position) }
-                .setNegativeButton(android.R.string.cancel, null)
-                .show()
-        }
-
-        private fun deleteSource(source: SelfossModel.SourceDetail, position: Int) {
-            CoroutineScope(Dispatchers.IO).launch {
-                val successfullyDeletedSource = repository.deleteSource(source.id, source.title)
-                launch(Dispatchers.Main) {
-                    if (successfullyDeletedSource) {
-                        items.removeAt(position)
-                        notifyItemRemoved(position)
-                        notifyItemRangeChanged(position, itemCount)
-                    } else {
-                        Toast.makeText(
-                            app,
-                            R.string.can_delete_source,
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                    }
-                }
-            }
-        }
-    }
 }

androidApp/src/main/res/values/strings.xml

@@ -131,6 +131,4 @@
     <string name="action_about">"About"</string>
     <string name="marked_as_read">"Item read"</string>
     <string name="marked_as_unread">"Item unread"</string>
-    <string name="confirm_delete_title">Confirm Deletion</string>
-    <string name="confirm_delete_message">Are you sure you want to delete the following source?\n%s</string>
 </resources>