diff --git a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt index e8241fad..eed9423d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt @@ -24,7 +24,6 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.ArrayRes import androidx.recyclerview.widget.RecyclerView -import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkAdapter import com.moez.QKSMS.common.base.QkViewHolder @@ -74,15 +73,18 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary) view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.setOnClickListener { + val menuItem = getItem(adapterPosition) + menuItemClicks.onNext(menuItem.actionId) + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val menuItem = getItem(position) val view = holder.itemView - view.clicks().subscribe { menuItemClicks.onNext(menuItem.actionId) } - view.title.text = menuItem.title view.check.isSelected = (menuItem.actionId == selectedItem) view.check.setVisible(selectedItem != null) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt index fa9b8f7d..42206ae5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt @@ -33,15 +33,19 @@ class BlockedAdapter @Inject constructor() : QkRealmAdapter() { val unblock: PublishSubject = PublishSubject.create() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.blocked_list_item, parent, false)) + val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_list_item, parent, false) + return QkViewHolder(view).apply { + view.setOnClickListener { + val conversation = getItem(adapterPosition)!! + unblock.onNext(conversation.id) + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val conversation = getItem(position)!! val view = holder.itemView - view.setOnClickListener { unblock.onNext(conversation.id) } - view.avatars.contacts = conversation.recipients view.title.text = conversation.getTitle() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt index c2b73801..f5b27f9b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt @@ -21,14 +21,11 @@ package com.moez.QKSMS.feature.compose import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup -import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkAdapter import com.moez.QKSMS.common.base.QkViewHolder import com.moez.QKSMS.model.Attachment -import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.attachment_list_item.view.* @@ -40,29 +37,23 @@ class AttachmentAdapter @Inject constructor( val attachmentDeleted: Subject = PublishSubject.create() - private val disposables = CompositeDisposable() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val view = LayoutInflater.from(parent.context).inflate(R.layout.attachment_list_item, parent, false) view.thumbnailBounds.clipToOutline = true - return QkViewHolder(view) - } - - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { - super.onDetachedFromRecyclerView(recyclerView) - disposables.clear() + return QkViewHolder(view).apply { + view.setOnClickListener { + val attachment = getItem(adapterPosition) + attachmentDeleted.onNext(attachment) + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val attachment = getItem(position) val view = holder.itemView - view.clicks().subscribe { - attachmentDeleted.onNext(attachment) - } - Glide.with(context).load(attachment.getUri()).into(view.thumbnail) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt index db80d574..c543676b 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt @@ -84,7 +84,13 @@ class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter else -> { val inflater = LayoutInflater.from(parent.context) - QkViewHolder(inflater.inflate(R.layout.contact_chip, parent, false)) + val view = inflater.inflate(R.layout.contact_chip, parent, false) + QkViewHolder(view).apply { + view.setOnClickListener { + val contact = getItem(adapterPosition) + showDetailedChip(view.context, contact) + } + } } } @@ -103,8 +109,6 @@ class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter } else { contact.numbers.firstOrNull { it.address.isNotBlank() }?.address ?: "" } - - view.setOnClickListener { showDetailedChip(view.context, contact) } } } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt index 2a9cb750..7f52bbcc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt @@ -21,7 +21,6 @@ package com.moez.QKSMS.feature.compose import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkAdapter import com.moez.QKSMS.common.base.QkViewHolder @@ -39,15 +38,18 @@ class ContactAdapter @Inject constructor() : QkAdapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layoutInflater = LayoutInflater.from(parent.context) val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false) - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.primary.setOnClickListener { + val contact = getItem(adapterPosition) + contactSelected.onNext(copyContact(contact, 0)) + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val contact = getItem(position) val view = holder.itemView - view.primary.clicks().subscribe { contactSelected.onNext(copyContact(contact, 0)) } - view.avatar.setContact(contact) view.name.text = contact.name view.name.setVisible(view.name.text.isNotEmpty()) @@ -58,7 +60,7 @@ class ContactAdapter @Inject constructor() : QkAdapter() { contact.numbers.forEachIndexed { index, number -> if (index != 0) { val numberView = View.inflate(view.context, R.layout.contact_number_list_item, null) - numberView.clicks().subscribe { contactSelected.onNext(copyContact(contact, index)) } + numberView.setOnClickListener { contactSelected.onNext(copyContact(contact, index)) } numberView.address.text = number.address numberView.type.text = number.type view.addresses.addView(numberView) 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 ef2715d8..4bb573f4 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 @@ -143,7 +143,25 @@ class MessagesAdapter @Inject constructor( view.attachments.setRecycledViewPool(partsViewPool) view.body.forwardTouches(view) - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.setOnClickListener { + val message = getItem(adapterPosition)!! + when (toggleSelection(message.id, false)) { + true -> view.isSelected = isSelected(message.id) + false -> { + clicks.onNext(message) + expanded[message.id] = view.status.visibility != View.VISIBLE + notifyItemChanged(adapterPosition) + } + } + } + view.setOnLongClickListener { + val message = getItem(adapterPosition)!! + toggleSelection(message.id) + view.isSelected = isSelected(message.id) + true + } + } } override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) { @@ -152,22 +170,6 @@ class MessagesAdapter @Inject constructor( val next = if (position == itemCount - 1) null else getItem(position + 1) val view = viewHolder.itemView - view.setOnClickListener { - when (toggleSelection(message.id, false)) { - true -> view.isSelected = isSelected(message.id) - false -> { - clicks.onNext(message) - expanded[message.id] = view.status.visibility != View.VISIBLE - notifyItemChanged(position) - } - } - } - view.setOnLongClickListener { - toggleSelection(message.id) - view.isSelected = isSelected(message.id) - true - } - // Update the selected state view.isSelected = isSelected(message.id) || highlight == message.id diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt index 1f6a4cc3..26a4b958 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt @@ -59,15 +59,15 @@ class PartsAdapter(context: Context, navigator: Navigator, theme: Colors.Theme) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layout = partBinders.getOrNull(viewType)?.partLayout ?: 0 - return QkViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) + val view = LayoutInflater.from(parent.context).inflate(layout, parent, false) + messageView?.let(view::forwardTouches) + return QkViewHolder(view) } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val part = data[position] val view = holder.itemView - messageView?.let(view::forwardTouches) - val canGroupWithPrevious = canGroup(message, previous) || position > 0 val canGroupWithNext = canGroup(message, next) || position < itemCount - 1 || bodyVisible diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt index 07202701..95f9bfa2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt @@ -22,7 +22,6 @@ import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.recyclerview.widget.RecyclerView import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkRealmAdapter @@ -32,7 +31,6 @@ import com.moez.QKSMS.extensions.isImage import com.moez.QKSMS.extensions.isVideo import com.moez.QKSMS.model.MmsPart import com.moez.QKSMS.util.GlideApp -import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.conversation_media_list_item.view.* import javax.inject.Inject @@ -44,11 +42,15 @@ class ConversationMediaAdapter @Inject constructor( val thumbnailClicks: PublishSubject = PublishSubject.create() - private val disposables = CompositeDisposable() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.conversation_media_list_item, parent, false) - return QkViewHolder(view) + val inflater = LayoutInflater.from(parent.context) + val view = inflater.inflate(R.layout.conversation_media_list_item, parent, false) + return QkViewHolder(view).apply { + view.thumbnail.setOnClickListener { + val part = getItem(adapterPosition)!! + if (part.isImage()) thumbnailClicks.onNext(it) else navigator.showMedia(part.id) + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { @@ -62,13 +64,6 @@ class ConversationMediaAdapter @Inject constructor( view.video.setVisible(part.isVideo()) view.thumbnail.transitionName = part.id.toString() - view.thumbnail.setOnClickListener { - if (part.isImage()) thumbnailClicks.onNext(it) else navigator.showMedia(part.id) - } - } - - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { - disposables.clear() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt index 4e522e08..83551544 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt @@ -42,21 +42,22 @@ class ConversationRecipientAdapter @Inject constructor( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layoutInflater = LayoutInflater.from(parent.context) val view = layoutInflater.inflate(R.layout.conversation_recipient_list_item, parent, false) - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.setOnClickListener { + val recipient = getItem(adapterPosition)!! + if (recipient.contact == null) { + navigator.addContact(recipient.address) + } else { + view.avatar.callOnClick() + } + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val recipient = getItem(position)!! val view = holder.itemView - view.setOnClickListener { - if (recipient.contact == null) { - navigator.addContact(recipient.address) - } else { - view.avatar.callOnClick() - } - } - view.avatar.threadId = threadId view.avatar.setContact(recipient) 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 de06fb90..2be25252 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 @@ -60,25 +60,27 @@ class ConversationsAdapter @Inject constructor( view.date.setTextColor(textColorPrimary) } - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.setOnClickListener { + val conversation = getItem(adapterPosition)!! + when (toggleSelection(conversation.id, false)) { + true -> view.isSelected = isSelected(conversation.id) + false -> navigator.showConversation(conversation.id) + } + } + view.setOnLongClickListener { + val conversation = getItem(adapterPosition)!! + toggleSelection(conversation.id) + view.isSelected = isSelected(conversation.id) + true + } + } } override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) { val conversation = getItem(position)!! val view = viewHolder.itemView - view.setOnClickListener { - when (toggleSelection(conversation.id, false)) { - true -> view.isSelected = isSelected(conversation.id) - false -> navigator.showConversation(conversation.id) - } - } - view.setOnLongClickListener { - toggleSelection(conversation.id) - view.isSelected = isSelected(conversation.id) - true - } - view.isSelected = isSelected(conversation.id) view.avatars.contacts = conversation.recipients diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt index 1eb35584..06f4d4b7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt @@ -24,7 +24,6 @@ import android.text.Spanned import android.text.style.BackgroundColorSpan import android.view.LayoutInflater import android.view.ViewGroup -import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkAdapter @@ -48,7 +47,12 @@ class SearchAdapter @Inject constructor( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layoutInflater = LayoutInflater.from(parent.context) val view = layoutInflater.inflate(R.layout.search_list_item, parent, false) - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.setOnClickListener { + val result = getItem(adapterPosition) + navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 }) + } + } } override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) { @@ -56,10 +60,6 @@ class SearchAdapter @Inject constructor( val result = getItem(position) val view = viewHolder.itemView - view.clicks().subscribe { - navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 }) - } - view.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) val query = result.query 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 95bf37ca..6772580d 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 @@ -56,15 +56,18 @@ class ScheduledMessageAdapter @Inject constructor( view.attachments.adapter = ScheduledMessageAttachmentAdapter() view.attachments.setRecycledViewPool(imagesViewPool) - return QkViewHolder(view) + return QkViewHolder(view).apply { + view.setOnClickListener { + val message = getItem(adapterPosition)!! + clicks.onNext(message.id) + } + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val message = getItem(position)!! val view = holder.itemView - view.setOnClickListener { clicks.onNext(message.id) } - message.recipients.forEach { address -> if (!contactMap.containsKey(address)) { contactMap[address] = contacts