From f0349dc8ae84bb56cdd8c812432c66432df21a66 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 9 Jan 2018 15:07:23 -0500 Subject: [PATCH] Create mms preview view --- .../common/widget/MmsPreviewView.kt | 32 +++++++++++++++++++ .../feature/compose/MessagesAdapter.kt | 11 ++----- .../main/res/layout/message_list_item_in.xml | 4 +-- .../main/res/layout/message_list_item_out.xml | 4 +-- .../src/main/res/layout/mms_preview_view.xml | 13 ++++++++ 5 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt create mode 100644 qksms/src/main/res/layout/mms_preview_view.xml diff --git a/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt b/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt new file mode 100644 index 00000000..b9a1f4c7 --- /dev/null +++ b/qksms/src/main/java/presentation/common/widget/MmsPreviewView.kt @@ -0,0 +1,32 @@ +package presentation.common.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import android.widget.LinearLayout +import com.moez.QKSMS.R +import common.util.GlideApp +import common.util.extensions.setVisible +import data.model.MmsPart +import kotlinx.android.synthetic.main.mms_preview_view.view.* + +class MmsPreviewView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) { + + var parts: List = ArrayList() + set(value) { + field = value + + val images = value.mapNotNull { it.image } + setVisible(images.isNotEmpty()) + + images.firstOrNull()?.let { + GlideApp.with(context).load(it).into(image) + } + } + + init { + View.inflate(context, R.layout.mms_preview_view, this) + } + + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 452b0039..77d6432a 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -27,7 +27,6 @@ import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R import common.util.Colors import common.util.DateFormatter -import common.util.GlideApp import common.util.extensions.dpToPx import common.util.extensions.setBackgroundTint import common.util.extensions.setPadding @@ -114,7 +113,7 @@ class MessagesAdapter @Inject constructor( } RxView.longClicks(view).subscribe { longClicks.onNext(message) } - bindImages(view, position) + bindMmsPreview(view, position) bindStatus(view, position) bindGrouping(view, position) @@ -124,7 +123,7 @@ class MessagesAdapter @Inject constructor( view.timestamp.text = dateFormatter.getMessageTimestamp(message.date) } - private fun bindImages(view: View, position: Int) { + private fun bindMmsPreview(view: View, position: Int) { val message = getItem(position)!! // If it's an MMS and the parts haven't been loaded, kick off a load @@ -132,11 +131,7 @@ class MessagesAdapter @Inject constructor( loadMmsParts.execute(message.id) } - view.image.setVisible(false) - message.parts.firstOrNull { it.image != null }?.let { part -> - view.image.setVisible(true) - GlideApp.with(context).load(part.image).into(view.image) - } + view.mmsPreview.parts = message.parts } private fun bindStatus(view: View, position: Int) { diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index c6a0ae70..f23bc630 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -60,8 +60,8 @@ android:orientation="vertical" tools:backgroundTint="@color/tools_theme"> - - + + + + + \ No newline at end of file