forked from upstream-mirrors/quik
Use QkBindingViewHolder in single-type adapters
Store ViewBinding in the ViewHolder instead of recreating it via .bind() on every onBindViewHolder call. This reduces allocations and simplifies the code. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
+6
-6
@@ -24,8 +24,8 @@ import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.isVisible
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
import dev.octoshrimpy.quik.databinding.BlockedListItemBinding
|
||||
@@ -37,11 +37,11 @@ import javax.inject.Inject
|
||||
class BlockedMessagesAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val dateFormatter: DateFormatter
|
||||
) : QkRealmAdapter<Conversation, QkViewHolder>() {
|
||||
) : QkRealmAdapter<Conversation, QkBindingViewHolder<BlockedListItemBinding>>() {
|
||||
|
||||
val clicks: PublishSubject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<BlockedListItemBinding> {
|
||||
val binding = BlockedListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
|
||||
if (viewType == 0) {
|
||||
@@ -50,7 +50,7 @@ class BlockedMessagesAdapter @Inject constructor(
|
||||
binding.date.setTextColor(binding.root.context.resolveThemeColor(android.R.attr.textColorPrimary))
|
||||
}
|
||||
|
||||
return QkViewHolder(binding.root).apply {
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.root.setOnClickListener {
|
||||
val conversation = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
when (toggleSelection(conversation.id, false)) {
|
||||
@@ -67,9 +67,9 @@ class BlockedMessagesAdapter @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<BlockedListItemBinding>, position: Int) {
|
||||
val conversation = getItem(position) ?: return
|
||||
val binding = BlockedListItemBinding.bind(holder.itemView)
|
||||
val binding = holder.binding
|
||||
|
||||
holder.itemView.isActivated = isSelected(conversation.id)
|
||||
|
||||
|
||||
+6
-6
@@ -24,7 +24,7 @@ import androidx.core.view.isVisible
|
||||
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.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.forwardTouches
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
@@ -44,7 +44,7 @@ import javax.inject.Inject
|
||||
class ComposeItemAdapter @Inject constructor(
|
||||
private val colors: Colors,
|
||||
private val conversationRepo: ConversationRepository
|
||||
) : QkAdapter<ComposeItem, QkViewHolder>() {
|
||||
) : QkAdapter<ComposeItem, QkBindingViewHolder<ContactListItemBinding>>() {
|
||||
|
||||
val clicks: Subject<ComposeItem> = PublishSubject.create()
|
||||
val longClicks: Subject<ComposeItem> = PublishSubject.create()
|
||||
@@ -58,7 +58,7 @@ class ComposeItemAdapter @Inject constructor(
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ContactListItemBinding> {
|
||||
val layoutInflater = LayoutInflater.from(parent.context)
|
||||
val binding = ContactListItemBinding.inflate(layoutInflater, parent, false)
|
||||
|
||||
@@ -68,7 +68,7 @@ class ComposeItemAdapter @Inject constructor(
|
||||
binding.numbers.adapter = PhoneNumberAdapter()
|
||||
binding.numbers.forwardTouches(binding.root)
|
||||
|
||||
return QkViewHolder(binding.root).apply {
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.root.setOnClickListener {
|
||||
val item = getItem(adapterPosition)
|
||||
clicks.onNext(item)
|
||||
@@ -81,8 +81,8 @@ class ComposeItemAdapter @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val binding = ContactListItemBinding.bind(holder.itemView)
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ContactListItemBinding>, position: Int) {
|
||||
val binding = holder.binding
|
||||
val prevItem = if (position > 0) getItem(position - 1) else null
|
||||
when (val item = getItem(position)) {
|
||||
is ComposeItem.New -> bindNew(binding, item.value)
|
||||
|
||||
+6
-6
@@ -23,7 +23,7 @@ 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.common.util.extensions.forwardTouches
|
||||
import dev.octoshrimpy.quik.databinding.PhoneNumberListItemBinding
|
||||
import dev.octoshrimpy.quik.extensions.Optional
|
||||
@@ -34,7 +34,7 @@ import javax.inject.Inject
|
||||
|
||||
class PhoneNumberPickerAdapter @Inject constructor(
|
||||
private val context: Context
|
||||
) : QkAdapter<PhoneNumber, QkViewHolder>() {
|
||||
) : QkAdapter<PhoneNumber, QkBindingViewHolder<PhoneNumberListItemBinding>>() {
|
||||
|
||||
val selectedItemChanges: Subject<Optional<Long>> = BehaviorSubject.create()
|
||||
|
||||
@@ -46,10 +46,10 @@ class PhoneNumberPickerAdapter @Inject constructor(
|
||||
selectedItemChanges.onNext(Optional(value))
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<PhoneNumberListItemBinding> {
|
||||
val inflater = LayoutInflater.from(parent.context)
|
||||
val binding = PhoneNumberListItemBinding.inflate(inflater, parent, false)
|
||||
return QkViewHolder(binding.root).apply {
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.number.radioButton.forwardTouches(itemView)
|
||||
|
||||
binding.root.setOnClickListener {
|
||||
@@ -59,8 +59,8 @@ class PhoneNumberPickerAdapter @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val binding = PhoneNumberListItemBinding.bind(holder.itemView)
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<PhoneNumberListItemBinding>, position: Int) {
|
||||
val binding = holder.binding
|
||||
val phoneNumber = getItem(position)
|
||||
|
||||
binding.number.radioButton.isChecked = phoneNumber.id == selectedItem
|
||||
|
||||
+6
-6
@@ -27,8 +27,8 @@ import androidx.core.view.isVisible
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
|
||||
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
|
||||
import dev.octoshrimpy.quik.common.base.QkViewHolder
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.DateFormatter
|
||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||
@@ -47,7 +47,7 @@ class ConversationsAdapter @Inject constructor(
|
||||
private val scheduledMessageRepo: ScheduledMessageRepository,
|
||||
private val navigator: Navigator,
|
||||
private val phoneNumberUtils: PhoneNumberUtils
|
||||
) : QkRealmAdapter<Conversation, QkViewHolder>() {
|
||||
) : QkRealmAdapter<Conversation, QkBindingViewHolder<ConversationListItemBinding>>() {
|
||||
private val disposables = CompositeDisposable()
|
||||
|
||||
init {
|
||||
@@ -55,7 +55,7 @@ class ConversationsAdapter @Inject constructor(
|
||||
setHasStableIds(true)
|
||||
}
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ConversationListItemBinding> {
|
||||
val layoutInflater = LayoutInflater.from(parent.context)
|
||||
val binding = ConversationListItemBinding.inflate(layoutInflater, parent, false)
|
||||
|
||||
@@ -74,7 +74,7 @@ class ConversationsAdapter @Inject constructor(
|
||||
binding.date.setTextColor(textColorPrimary)
|
||||
}
|
||||
|
||||
return QkViewHolder(binding.root).apply {
|
||||
return QkBindingViewHolder(binding).apply {
|
||||
binding.root.setOnClickListener {
|
||||
val conversation = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
when (toggleSelection(conversation.id, false)) {
|
||||
@@ -91,9 +91,9 @@ class ConversationsAdapter @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ConversationListItemBinding>, position: Int) {
|
||||
val conversation = getItem(position) ?: return
|
||||
val binding = ConversationListItemBinding.bind(holder.itemView)
|
||||
val binding = holder.binding
|
||||
|
||||
// If the last message wasn't incoming, then the colour doesn't really matter anyway
|
||||
val lastMessage = conversation.lastMessage
|
||||
|
||||
@@ -26,7 +26,7 @@ import com.google.android.flexbox.FlexDirection
|
||||
import com.google.android.flexbox.FlexWrap
|
||||
import com.google.android.flexbox.FlexboxLayout
|
||||
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.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.dpToPx
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
@@ -41,7 +41,7 @@ import javax.inject.Inject
|
||||
class ThemeAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val colors: Colors
|
||||
) : QkAdapter<List<Int>, QkViewHolder>() {
|
||||
) : QkAdapter<List<Int>, QkBindingViewHolder<ThemePaletteListItemBinding>>() {
|
||||
|
||||
val colorSelected: Subject<Int> = PublishSubject.create()
|
||||
|
||||
@@ -59,17 +59,17 @@ class ThemeAdapter @Inject constructor(
|
||||
|
||||
private var iconTint = 0
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ThemePaletteListItemBinding> {
|
||||
val binding = ThemePaletteListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
binding.palette.flexWrap = FlexWrap.WRAP
|
||||
binding.palette.flexDirection = FlexDirection.ROW
|
||||
|
||||
return QkViewHolder(binding.root)
|
||||
return QkBindingViewHolder(binding)
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkBindingViewHolder<ThemePaletteListItemBinding>, position: Int) {
|
||||
val palette = getItem(position)
|
||||
val binding = ThemePaletteListItemBinding.bind(holder.itemView)
|
||||
val binding = holder.binding
|
||||
|
||||
val screenWidth = Resources.getSystem().displayMetrics.widthPixels
|
||||
val minPadding = (16 * 6).dpToPx(context)
|
||||
|
||||
Reference in New Issue
Block a user