mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 12:48:53 +01:00
Refactor code for displaying SIM index in message list
This commit is contained in:
@@ -223,20 +223,15 @@ class MessagesAdapter @Inject constructor(
|
|||||||
|
|
||||||
// Bind the timestamp
|
// Bind the timestamp
|
||||||
val timeSincePrevious = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0))
|
val timeSincePrevious = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0))
|
||||||
val simIndex = subs.takeIf { it.size > 1 }?.indexOfFirst { it.subscriptionId == message.subId } ?: -1
|
val subscription = subs.find { sub -> sub.subscriptionId == message.subId }
|
||||||
|
|
||||||
holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
|
holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
|
||||||
if (simIndex != -1){
|
holder.simIndex.text = subscription?.let { sub -> sub.simSlotIndex + 1 }?.toString()
|
||||||
holder.simIndex.text = "${subs[simIndex].simSlotIndex + 1} - " + subs[simIndex].displayName
|
|
||||||
} else {
|
|
||||||
holder.simIndex.text = "${simIndex + 1}"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD
|
holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD
|
||||||
|| message.subId != previous?.subId && simIndex != -1)
|
|| message.subId != previous?.subId && subscription != null)
|
||||||
holder.sim.setVisible(message.subId != previous?.subId && simIndex != -1)
|
holder.sim.setVisible(message.subId != previous?.subId && subscription != null)
|
||||||
holder.simIndex.setVisible(message.subId != previous?.subId && simIndex != -1)
|
holder.simIndex.setVisible(message.subId != previous?.subId && subscription != null)
|
||||||
|
|
||||||
// Bind the grouping
|
// Bind the grouping
|
||||||
val media = message.parts.filter { !it.isSmil() && !it.isText() }
|
val media = message.parts.filter { !it.isSmil() && !it.isText() }
|
||||||
|
|||||||
Reference in New Issue
Block a user