From ba4b27651b8754f26253c65f6edcb3770af4dd3f Mon Sep 17 00:00:00 2001 From: davidoskky Date: Fri, 28 Feb 2025 20:13:00 +0100 Subject: [PATCH] Move binding source binding logic to the viewholder. --- .../android/adapters/SourcesListAdapter.kt | 120 ++++++++---------- 1 file changed, 56 insertions(+), 64 deletions(-) diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt index 63b226a..aca1943 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt @@ -6,10 +6,8 @@ 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 @@ -33,47 +31,15 @@ class SourcesListAdapter( private val items: ArrayList, ) : RecyclerView.Adapter(), DIAware { - private val c: Context = app.baseContext - private lateinit var binding: SourceListItemBinding - override val di: DI by closestDI(app) - private val repository: Repository by instance() - 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) + val binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return ViewHolder(binding) } - override fun onBindViewHolder( - holder: ViewHolder, - position: Int, - ) { - val source = items[position] - - val deleteBtn: Button = holder.mView.findViewById(R.id.deleteBtn) - - deleteBtn.setOnClickListener { this.showDeleteConfirmationDialog(source, position) } - - holder.mView.setOnClickListener { - repository.setSelectedSource(source) - app.startActivity(Intent(app, UpsertSourceActivity::class.java)) - } - - if (source.getIcon(repository.baseUrl).isEmpty()) { - binding.itemImage.setBackgroundAndText(source.title.getHtmlDecoded()) - } else { - c.circularDrawable(source.getIcon(repository.baseUrl), binding.itemImage, appSettingsService) - } - - if (!source.error.isNullOrBlank()) { - binding.errorText.visibility = View.VISIBLE - binding.errorText.text = source.error - } else { - binding.errorText.visibility = View.GONE - } - - binding.sourceTitle.text = source.title.getHtmlDecoded() + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + holder.bind(items[position], position) } override fun getItemId(position: Int) = position.toLong() @@ -83,35 +49,61 @@ class SourcesListAdapter( override fun getItemCount(): Int = items.size - 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() - } + inner class ViewHolder(val binding: SourceListItemBinding) : RecyclerView.ViewHolder(binding.root) { - 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) + 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 { - Toast.makeText( - app, - R.string.can_delete_source, - Toast.LENGTH_SHORT, - ).show() + 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() + } } } } } - - inner class ViewHolder( - val mView: ConstraintLayout, - ) : RecyclerView.ViewHolder(mView) }