Use nested RecyclerView for displaying MMS parts

This commit is contained in:
Moez Bhatti
2018-06-20 05:18:47 -04:00
parent ddb8bb025f
commit 74e94d9769
5 changed files with 177 additions and 87 deletions
@@ -0,0 +1,26 @@
package feature.compose
import com.moez.QKSMS.R
import model.Message
import java.util.concurrent.TimeUnit
object BubbleUtils {
const val TIMESTAMP_THRESHOLD = 10
fun canGroup(message: Message, other: Message?): Boolean {
if (other == null) return false
val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date))
return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD
}
fun getBubble(canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int {
return when {
!canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first
canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle
canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last
else -> R.drawable.message_only
}
}
}
@@ -19,9 +19,9 @@
package feature.compose
import android.animation.ObjectAnimator
import android.content.ContentUris
import android.content.Context
import android.graphics.Typeface
import android.support.v7.widget.RecyclerView
import android.telephony.PhoneNumberUtils
import android.text.Spannable
import android.text.SpannableStringBuilder
@@ -39,26 +39,19 @@ import common.base.QkRealmAdapter
import common.base.QkViewHolder
import common.util.Colors
import common.util.DateFormatter
import common.util.GlideApp
import common.util.extensions.dpToPx
import common.util.extensions.forwardTouches
import common.util.extensions.setBackgroundTint
import common.util.extensions.setPadding
import common.util.extensions.setTint
import common.util.extensions.setVisible
import common.widget.BubbleImageView.Style.*
import compat.SubscriptionManagerCompat
import ezvcard.Ezvcard
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import feature.compose.BubbleUtils.canGroup
import feature.compose.BubbleUtils.getBubble
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmResults
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.Conversation
import model.Message
import model.Recipient
@@ -66,7 +59,6 @@ import util.Preferences
import util.extensions.isImage
import util.extensions.isVCard
import util.extensions.isVideo
import util.extensions.mapNotNull
import java.util.concurrent.TimeUnit
import javax.inject.Inject
@@ -82,7 +74,6 @@ class MessagesAdapter @Inject constructor(
companion object {
private const val VIEW_TYPE_MESSAGE_IN = 0
private const val VIEW_TYPE_MESSAGE_OUT = 1
private const val TIMESTAMP_THRESHOLD = 10
}
val clicks: Subject<Message> = PublishSubject.create<Message>()
@@ -120,6 +111,7 @@ class MessagesAdapter @Inject constructor(
private val contactCache = ContactCache()
private val expanded = HashMap<Long, Boolean>()
private val partsViewPool = RecyclerView.RecycledViewPool()
private val subs = subscriptionManager.activeSubscriptionInfoList
var theme: Colors.Theme = colors.theme()
@@ -146,6 +138,8 @@ class MessagesAdapter @Inject constructor(
view.body.setBackgroundTint(theme.theme)
}
view.attachments.adapter = PartsAdapter(context, navigator, theme)
view.attachments.setRecycledViewPool(partsViewPool)
view.body.forwardTouches(view)
return QkViewHolder(view)
@@ -211,7 +205,7 @@ class MessagesAdapter @Inject constructor(
view.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
view.simIndex.text = "${simIndex + 1}"
view.timestamp.setVisible(timeSincePrevious >= TIMESTAMP_THRESHOLD || message.subId != previous?.subId && simIndex != -1)
view.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD || message.subId != previous?.subId && simIndex != -1)
view.sim.setVisible(message.subId != previous?.subId && simIndex != -1)
view.simIndex.setVisible(message.subId != previous?.subId && simIndex != -1)
@@ -257,59 +251,8 @@ class MessagesAdapter @Inject constructor(
// Bind the attachments
view.attachments.setVisible(media.isNotEmpty())
if (view.attachments.childCount > 0) {
view.attachments.removeAllViews()
}
media.forEachIndexed { index, part ->
val canMediaGroupWithPrevious = canGroup(message, previous) || index > 0
val canMediaGroupWithNext = canGroup(message, next) || index < media.size - 1 || view.body.visibility == View.VISIBLE
val inflater = LayoutInflater.from(view.context)
when {
part.isImage() || part.isVideo() -> {
val mediaView = inflater.inflate(R.layout.mms_preview_list_item, view.attachments, false)
mediaView.video.setVisible(part.isVideo())
mediaView.forwardTouches(view)
mediaView.setOnClickListener { navigator.showMedia(part.id) }
mediaView.thumbnail.bubbleStyle = when {
!canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_FIRST else IN_FIRST
canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_MIDDLE else IN_MIDDLE
canMediaGroupWithPrevious && !canMediaGroupWithNext -> if (message.isMe()) OUT_LAST else IN_LAST
else -> ONLY
}
GlideApp.with(context).load(part.getUri()).fitCenter().into(mediaView.thumbnail)
view.attachments.addView(mediaView, index)
}
part.isVCard() -> {
val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id)
val mediaView = inflater.inflate(R.layout.mms_vcard_list_item, view.attachments, false)
mediaView.forwardTouches(view)
mediaView.setOnClickListener { navigator.saveVcard(uri) }
mediaView.vCardBackground.setBackgroundResource(getBubble(canMediaGroupWithPrevious, canMediaGroupWithNext, 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 -> mediaView?.name?.text = vcard.formattedName.value }
if (!message.isMe()) {
mediaView.vCardBackground.setBackgroundTint(theme.theme)
mediaView.vCardAvatar.setTint(theme.textPrimary)
mediaView.name.setTextColor(theme.textPrimary)
mediaView.label.setTextColor(theme.textTertiary)
}
view.attachments.addView(mediaView, index)
}
}
}
val partsAdapter = view.attachments.adapter as PartsAdapter
partsAdapter.setData(message, previous, next, view)
}
private fun bindStatus(viewHolder: QkViewHolder, message: Message, next: Message?) {
@@ -332,26 +275,11 @@ class MessagesAdapter @Inject constructor(
message.isFailedMessage() -> true
expanded[message.id] == false -> false
conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
message.isDelivered() && next?.isDelivered() != true && age <= TIMESTAMP_THRESHOLD -> true
message.isDelivered() && next?.isDelivered() != true && age <= BubbleUtils.TIMESTAMP_THRESHOLD -> true
else -> false
})
}
private fun getBubble(canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int {
return when {
!canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first
canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle
canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last
else -> R.drawable.message_only
}
}
private fun canGroup(message: Message, other: Message?): Boolean {
if (other == null) return false
val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date))
return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD
}
override fun getItemViewType(position: Int): Int {
val message = getItem(position)!!
return when (message.isMe()) {
@@ -0,0 +1,129 @@
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<MmsPart>() {
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
}
}
}
@@ -61,18 +61,22 @@
app:textSize="tertiary"
tools:text="1" />
<LinearLayout
<android.support.v7.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_marginStart="12dp"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/timestamp" />
app:layout_constraintTop_toBottomOf="@id/timestamp"
tools:itemCount="1"
tools:listitem="@layout/mms_preview_list_item" />
<common.widget.AvatarView
android:id="@+id/avatar"
@@ -61,7 +61,7 @@
app:textSize="tertiary"
tools:text="1" />
<LinearLayout
<android.support.v7.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -69,12 +69,15 @@
android:layout_marginEnd="12dp"
android:layout_marginStart="60dp"
android:gravity="end"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/timestamp" />
app:layout_constraintTop_toBottomOf="@id/timestamp"
tools:itemCount="1"
tools:listitem="@layout/mms_preview_list_item" />
<common.widget.TightTextView
android:id="@+id/body"