From e416b6d85f44cadb8aa97806b7d97487d39548e8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 20 Jun 2018 05:47:14 -0400 Subject: [PATCH] Make PartsAdapter more extensible --- .../java/feature/compose/MessagesAdapter.kt | 3 + .../main/java/feature/compose/PartsAdapter.kt | 129 ------------------ .../java/feature/compose/part/MediaBinder.kt | 36 +++++ .../java/feature/compose/part/PartBinder.kt | 15 ++ .../java/feature/compose/part/PartsAdapter.kt | 66 +++++++++ .../java/feature/compose/part/VCardBinder.kt | 54 ++++++++ 6 files changed, 174 insertions(+), 129 deletions(-) delete mode 100644 presentation/src/main/java/feature/compose/PartsAdapter.kt create mode 100644 presentation/src/main/java/feature/compose/part/MediaBinder.kt create mode 100644 presentation/src/main/java/feature/compose/part/PartBinder.kt create mode 100644 presentation/src/main/java/feature/compose/part/PartsAdapter.kt create mode 100644 presentation/src/main/java/feature/compose/part/VCardBinder.kt diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index e9c24485..4cd05142 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -48,6 +48,9 @@ import common.util.extensions.setVisible import compat.SubscriptionManagerCompat import feature.compose.BubbleUtils.canGroup import feature.compose.BubbleUtils.getBubble +import feature.compose.part.MediaBinder +import feature.compose.part.PartsAdapter +import feature.compose.part.VCardBinder import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmResults diff --git a/presentation/src/main/java/feature/compose/PartsAdapter.kt b/presentation/src/main/java/feature/compose/PartsAdapter.kt deleted file mode 100644 index 75d35803..00000000 --- a/presentation/src/main/java/feature/compose/PartsAdapter.kt +++ /dev/null @@ -1,129 +0,0 @@ -package feature.compose - -import android.content.ContentUris -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import com.moez.QKSMS.R -import common.Navigator -import common.base.QkAdapter -import common.base.QkViewHolder -import common.util.Colors -import common.util.GlideApp -import common.util.extensions.forwardTouches -import common.util.extensions.setBackgroundTint -import common.util.extensions.setTint -import common.util.extensions.setVisible -import common.widget.BubbleImageView -import ezvcard.Ezvcard -import feature.compose.BubbleUtils.canGroup -import feature.compose.BubbleUtils.getBubble -import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers -import kotlinx.android.synthetic.main.message_list_item_in.view.* -import kotlinx.android.synthetic.main.mms_preview_list_item.view.* -import kotlinx.android.synthetic.main.mms_vcard_list_item.view.* -import mapper.CursorToPartImpl -import model.Message -import model.MmsPart -import util.extensions.isImage -import util.extensions.isVCard -import util.extensions.isVideo -import util.extensions.mapNotNull - -class PartsAdapter( - private val context: Context, - private val navigator: Navigator, - private val theme: Colors.Theme -) : QkAdapter() { - - companion object { - private const val TYPE_THUMBNAIL = 0 - private const val TYPE_VCARD = 1 - } - - private lateinit var message: Message - private var previous: Message? = null - private var next: Message? = null - private var messageView: View? = null - private var bodyVisible: Boolean = true - - fun setData(message: Message, previous: Message?, next: Message?, messageView: View) { - this.message = message - this.previous = previous - this.next = next - this.messageView = messageView - this.bodyVisible = messageView.body.visibility == View.VISIBLE - this.data = message.parts.filter { it.isImage() || it.isVideo() || it.isVCard() } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder(LayoutInflater.from(parent.context).inflate(when (viewType) { - TYPE_THUMBNAIL -> R.layout.mms_preview_list_item - TYPE_VCARD -> R.layout.mms_vcard_list_item - else -> 0 - }, parent, false)) - } - - 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 - - when { - part.isImage() || part.isVideo() -> bindMedia(view, part, canGroupWithPrevious, canGroupWithNext) - part.isVCard() -> bindVCard(view, part, canGroupWithPrevious, canGroupWithNext) - } - } - - private fun bindMedia(view: View, part: MmsPart, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) { - view.video.setVisible(part.isVideo()) - view.setOnClickListener { navigator.showMedia(part.id) } - - view.thumbnail.bubbleStyle = when { - !canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST - canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE - canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST - else -> BubbleImageView.Style.ONLY - } - - GlideApp.with(context).load(part.getUri()).fitCenter().into(view.thumbnail) - } - - private fun bindVCard(view: View, part: MmsPart, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) { - val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) - - view.setOnClickListener { navigator.saveVcard(uri) } - view.vCardBackground.setBackgroundResource(getBubble(canGroupWithPrevious, canGroupWithNext, message.isMe())) - - Observable.just(uri) - .map(context.contentResolver::openInputStream) - .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } } - .subscribeOn(Schedulers.computation()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { vcard -> view.name?.text = vcard.formattedName.value } - - if (!message.isMe()) { - view.vCardBackground.setBackgroundTint(theme.theme) - view.vCardAvatar.setTint(theme.textPrimary) - view.name.setTextColor(theme.textPrimary) - view.label.setTextColor(theme.textTertiary) - } - } - - override fun getItemViewType(position: Int): Int { - val part = data[position] - return when { - part.isImage() || part.isVideo() -> TYPE_THUMBNAIL - part.isVCard() -> TYPE_VCARD - else -> -1 - } - } - -} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/part/MediaBinder.kt b/presentation/src/main/java/feature/compose/part/MediaBinder.kt new file mode 100644 index 00000000..2721a3aa --- /dev/null +++ b/presentation/src/main/java/feature/compose/part/MediaBinder.kt @@ -0,0 +1,36 @@ +package feature.compose.part + +import android.content.Context +import android.view.View +import com.moez.QKSMS.R +import common.Navigator +import common.util.GlideApp +import common.util.extensions.setVisible +import common.widget.BubbleImageView +import kotlinx.android.synthetic.main.mms_preview_list_item.view.* +import model.Message +import model.MmsPart +import util.extensions.isImage +import util.extensions.isVideo + +class MediaBinder(private val context: Context, private val navigator: Navigator) : PartBinder { + + override val partLayout = R.layout.mms_preview_list_item + + override fun canBindPart(part: MmsPart) = part.isImage() || part.isVideo() + + override fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) { + view.video.setVisible(part.isVideo()) + view.setOnClickListener { navigator.showMedia(part.id) } + + view.thumbnail.bubbleStyle = when { + !canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST + canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE + canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST + else -> BubbleImageView.Style.ONLY + } + + GlideApp.with(context).load(part.getUri()).fitCenter().into(view.thumbnail) + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/part/PartBinder.kt b/presentation/src/main/java/feature/compose/part/PartBinder.kt new file mode 100644 index 00000000..bf55604c --- /dev/null +++ b/presentation/src/main/java/feature/compose/part/PartBinder.kt @@ -0,0 +1,15 @@ +package feature.compose.part + +import android.view.View +import model.Message +import model.MmsPart + +interface PartBinder { + + val partLayout: Int + + fun canBindPart(part: MmsPart): Boolean + + fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/feature/compose/part/PartsAdapter.kt new file mode 100644 index 00000000..f344fed6 --- /dev/null +++ b/presentation/src/main/java/feature/compose/part/PartsAdapter.kt @@ -0,0 +1,66 @@ +package feature.compose.part + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import common.Navigator +import common.base.QkAdapter +import common.base.QkViewHolder +import common.util.Colors +import common.util.extensions.forwardTouches +import feature.compose.BubbleUtils.canGroup +import kotlinx.android.synthetic.main.message_list_item_in.view.* +import model.Message +import model.MmsPart +import util.extensions.isImage +import util.extensions.isVCard +import util.extensions.isVideo + +class PartsAdapter(context: Context, navigator: Navigator, theme: Colors.Theme) : QkAdapter() { + + private val partBinders = listOf( + MediaBinder(context, navigator), + VCardBinder(context, navigator, theme) + ) + + private lateinit var message: Message + private var previous: Message? = null + private var next: Message? = null + private var messageView: View? = null + private var bodyVisible: Boolean = true + + fun setData(message: Message, previous: Message?, next: Message?, messageView: View) { + this.message = message + this.previous = previous + this.next = next + this.messageView = messageView + this.bodyVisible = messageView.body.visibility == View.VISIBLE + this.data = message.parts.filter { it.isImage() || it.isVideo() || it.isVCard() } + } + + 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)) + } + + 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 + + partBinders + .firstOrNull { it.canBindPart(part) } + ?.bindPart(view, part, message, canGroupWithPrevious, canGroupWithNext) + } + + override fun getItemViewType(position: Int): Int { + val part = data[position] + return partBinders.indexOfFirst { it.canBindPart(part) } + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/part/VCardBinder.kt b/presentation/src/main/java/feature/compose/part/VCardBinder.kt new file mode 100644 index 00000000..f708bba5 --- /dev/null +++ b/presentation/src/main/java/feature/compose/part/VCardBinder.kt @@ -0,0 +1,54 @@ +package feature.compose.part + +import android.content.ContentUris +import android.content.Context +import android.view.View +import com.moez.QKSMS.R +import common.Navigator +import common.util.Colors +import common.util.extensions.setBackgroundTint +import common.util.extensions.setTint +import ezvcard.Ezvcard +import feature.compose.BubbleUtils +import io.reactivex.Observable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.mms_vcard_list_item.view.* +import mapper.CursorToPartImpl +import model.Message +import model.MmsPart +import util.extensions.isVCard +import util.extensions.mapNotNull + +class VCardBinder( + private val context: Context, + private val navigator: Navigator, + private val theme: Colors.Theme +) : PartBinder { + + override val partLayout = R.layout.mms_vcard_list_item + + override fun canBindPart(part: MmsPart) = part.isVCard() + + override fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) { + val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) + + view.setOnClickListener { navigator.saveVcard(uri) } + view.vCardBackground.setBackgroundResource(BubbleUtils.getBubble(canGroupWithPrevious, canGroupWithNext, message.isMe())) + + Observable.just(uri) + .map(context.contentResolver::openInputStream) + .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } } + .subscribeOn(Schedulers.computation()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { vcard -> view.name?.text = vcard.formattedName.value } + + if (!message.isMe()) { + view.vCardBackground.setBackgroundTint(theme.theme) + view.vCardAvatar.setTint(theme.textPrimary) + view.name.setTextColor(theme.textPrimary) + view.label.setTextColor(theme.textTertiary) + } + } + +} \ No newline at end of file