From 90723d80a7fea47cd241ded4817a9401592fc726 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Fri, 5 Sep 2025 00:56:29 -0400 Subject: [PATCH] QkRealmAdapter binding support --- .../moez/QKSMS/common/base/QkRealmAdapter.kt | 2 +- .../filters/MessageContentFiltersAdapter.kt | 2 +- .../messages/BlockedMessagesAdapter.kt | 2 +- .../blocking/numbers/BlockedNumbersAdapter.kt | 2 +- .../QKSMS/feature/compose/MessagesAdapter.kt | 2 +- .../feature/compose/editing/ChipsAdapter.kt | 24 +++++----- .../compose/editing/PhoneNumberAdapter.kt | 19 ++++---- .../conversations/ConversationsAdapter.kt | 2 +- .../feature/gallery/GalleryPagerAdapter.kt | 2 +- .../scheduled/ScheduledMessageAdapter.kt | 44 +++++++++---------- 10 files changed, 49 insertions(+), 52 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt index c4e016a8..e6da54e2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt @@ -30,7 +30,7 @@ import io.realm.RealmRecyclerViewAdapter import io.realm.RealmResults import timber.log.Timber -abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { +abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { /** * This view can be set, and the adapter will automatically control the visibility of this view diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt index f6b6818d..894e8c66 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt @@ -30,7 +30,7 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.message_content_filter_list_item.* import kotlinx.android.synthetic.main.message_content_filter_list_item.view.* -class MessageContentFiltersAdapter : QkRealmAdapter() { +class MessageContentFiltersAdapter : QkRealmAdapter() { val removeMessageContentFilter: Subject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt index b264fe44..5a2a88de 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt @@ -38,7 +38,7 @@ import javax.inject.Inject class BlockedMessagesAdapter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter -) : QkRealmAdapter() { +) : QkRealmAdapter() { val clicks: PublishSubject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt index 3ef278e9..c18bdb63 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt @@ -29,7 +29,7 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.blocked_number_list_item.* import kotlinx.android.synthetic.main.blocked_number_list_item.view.* -class BlockedNumbersAdapter : QkRealmAdapter() { +class BlockedNumbersAdapter : QkRealmAdapter() { val unblockAddress: Subject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 7aa6ea93..9eef4813 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -97,7 +97,7 @@ class MessagesAdapter @Inject constructor( private val prefs: Preferences, private val textViewStyler: TextViewStyler, private val navigator: Navigator, -) : QkRealmAdapter() { +) : QkRealmAdapter() { class AudioState( var partId: Long = -1, var state: QkMediaPlayer.PlayingState = QkMediaPlayer.PlayingState.Stopped, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 67489994..6a3185d9 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -23,36 +23,34 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.RelativeLayout import androidx.recyclerview.widget.RecyclerView -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.extensions.dpToPx +import dev.octoshrimpy.quik.databinding.ContactChipBinding import dev.octoshrimpy.quik.model.Recipient import io.reactivex.subjects.PublishSubject -import kotlinx.android.synthetic.main.contact_chip.* import javax.inject.Inject -class ChipsAdapter @Inject constructor() : QkAdapter() { +class ChipsAdapter @Inject constructor() : QkAdapter>() { var view: RecyclerView? = null val chipDeleted: PublishSubject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val view = inflater.inflate(R.layout.contact_chip, parent, false) - return QkViewHolder(view).apply { - view.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ContactChipBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val chip = getItem(adapterPosition) - showDetailedChip(view.context, chip) + showDetailedChip(binding.root.context, chip) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val recipient = getItem(position) - holder.avatar.setRecipient(recipient) - holder.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address + holder.binding.avatar.setRecipient(recipient) + holder.binding.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address } /** diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt index 5d2658aa..7260bc84 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt @@ -22,23 +22,22 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ContactNumberListItemBinding import dev.octoshrimpy.quik.model.PhoneNumber -import kotlinx.android.synthetic.main.contact_number_list_item.* -class PhoneNumberAdapter : QkAdapter() { +class PhoneNumberAdapter : QkAdapter>() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val view = inflater.inflate(R.layout.contact_number_list_item, parent, false) - return QkViewHolder(view) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ContactNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding) } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val number = getItem(position) - holder.address.text = number.address - holder.type.text = number.type + holder.binding.address.text = number.address + holder.binding.type.text = number.type } override fun areItemsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index fae962d1..ffad063a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -48,7 +48,7 @@ class ConversationsAdapter @Inject constructor( private val scheduledMessageRepo: ScheduledMessageRepository, private val navigator: Navigator, private val phoneNumberUtils: PhoneNumberUtils -) : QkRealmAdapter() { +) : QkRealmAdapter() { private val disposables = CompositeDisposable() init { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt index c6497932..65882e5b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt @@ -45,7 +45,7 @@ import kotlinx.android.synthetic.main.gallery_video_page.* import java.util.* import javax.inject.Inject -class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter() { +class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter() { companion object { private const val VIEW_TYPE_INVALID = 0 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt index eb522a95..991c1ab0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt @@ -26,7 +26,8 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ScheduledMessageListItemBinding import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.model.Contact import dev.octoshrimpy.quik.model.Recipient @@ -35,8 +36,6 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.scheduled_message_list_item.* -import kotlinx.android.synthetic.main.scheduled_message_list_item.view.* import javax.inject.Inject class ScheduledMessageAdapter @Inject constructor( @@ -44,7 +43,7 @@ class ScheduledMessageAdapter @Inject constructor( private val contactRepo: ContactRepository, private val dateFormatter: DateFormatter, private val phoneNumberUtils: PhoneNumberUtils -) : QkRealmAdapter() { +) : QkRealmAdapter>() { private val contacts by lazy { contactRepo.getContacts() } private val contactCache = ContactCache() @@ -52,47 +51,48 @@ class ScheduledMessageAdapter @Inject constructor( val clicks: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context) - .inflate(R.layout.scheduled_message_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ScheduledMessageListItemBinding.inflate( + LayoutInflater.from(parent.context), parent, false + ) - view.attachments.adapter = ScheduledMessageAttachmentAdapter(context) - view.attachments.setRecycledViewPool(imagesViewPool) + binding.attachments.adapter = ScheduledMessageAttachmentAdapter(context) + binding.attachments.setRecycledViewPool(imagesViewPool) - return QkViewHolder(view).apply { - view.setOnClickListener { + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val message = getItem(adapterPosition) ?: return@setOnClickListener if (toggleSelection(message.id, false)) - view.isActivated = isSelected(message.id) + binding.root.isActivated = isSelected(message.id) } - view.setOnClickListener { + binding.root.setOnClickListener { val message = getItem(adapterPosition) ?: return@setOnClickListener toggleSelection(message.id) - view.isActivated = isSelected(message.id) + binding.root.isActivated = isSelected(message.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val message = getItem(position) ?: return // GroupAvatarView only accepts recipients, so map the phone numbers to recipients - holder.avatars.recipients = + holder.binding.avatars.recipients = message.recipients.map { address -> Recipient(address = address) } - holder.recipients.text = message.recipients.joinToString(",") { address -> + holder.binding.recipients.text = message.recipients.joinToString(",") { address -> contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address } - holder.date.text = dateFormatter.getScheduledTimestamp(message.date) - holder.body.text = message.body + holder.binding.date.text = dateFormatter.getScheduledTimestamp(message.date) + holder.binding.body.text = message.body // update the selected/highlighted state - holder.containerView.isActivated = isSelected(message.id) || highlight == message.id + holder.binding.root.isActivated = isSelected(message.id) || highlight == message.id - val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter + val adapter = holder.binding.attachments.adapter as ScheduledMessageAttachmentAdapter adapter.data = message.attachments.map(Uri::parse) - holder.attachments.isVisible = message.attachments.isNotEmpty() + holder.binding.attachments.isVisible = message.attachments.isNotEmpty() } override fun getItemId(position: Int): Long {