From 88accdb7a1924447d8148fb4c7c7bae5cf5bed47 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 5 Feb 2020 21:34:35 -0500 Subject: [PATCH] Forward touch events from phone number picker items --- .../compose/editing/PhoneNumberPickerAdapter.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt index 3464241f..084e41a3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt @@ -24,11 +24,13 @@ import android.view.ViewGroup import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkAdapter import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.extensions.forwardTouches import com.moez.QKSMS.extensions.Optional import com.moez.QKSMS.model.PhoneNumber import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.phone_number_list_item.view.* +import kotlinx.android.synthetic.main.phone_number_list_item.* +import kotlinx.android.synthetic.main.radio_preference_view.* import kotlinx.android.synthetic.main.radio_preference_view.view.* import javax.inject.Inject @@ -50,6 +52,8 @@ class PhoneNumberPickerAdapter @Inject constructor( val inflater = LayoutInflater.from(parent.context) val view = inflater.inflate(R.layout.phone_number_list_item, parent, false) return QkViewHolder(view).apply { + radioButton.forwardTouches(itemView) + view.setOnClickListener { val phoneNumber = getItem(adapterPosition) selectedItem = phoneNumber.id @@ -59,11 +63,10 @@ class PhoneNumberPickerAdapter @Inject constructor( override fun onBindViewHolder(holder: QkViewHolder, position: Int) { val phoneNumber = getItem(position) - val view = holder.itemView - view.number.radioButton.isChecked = phoneNumber.id == selectedItem - view.number.titleView.text = phoneNumber.address - view.number.summaryView.text = when (phoneNumber.isDefault) { + holder.number.radioButton.isChecked = phoneNumber.id == selectedItem + holder.number.titleView.text = phoneNumber.address + holder.number.summaryView.text = when (phoneNumber.isDefault) { true -> context.getString(R.string.compose_number_picker_default, phoneNumber.type) false -> phoneNumber.type }