Tap message to view timestamp

This commit is contained in:
Moez Bhatti
2018-01-09 11:38:19 -05:00
parent 9c66f76413
commit ce9b6a5846
5 changed files with 60 additions and 25 deletions
@@ -41,8 +41,11 @@ class DateFormatter @Inject constructor(val context: Context) {
else SimpleDateFormat(pattern, Locale.US)
}
fun getMessageTimestamp(date: Long): String {
fun getTimestamp(date: Long): String {
return getFormatter("h:mm a").format(date)
}
fun getMessageTimestamp(date: Long): String {
val now = Calendar.getInstance()
val then = Calendar.getInstance()
then.timeInMillis = date
@@ -56,7 +59,6 @@ class DateFormatter @Inject constructor(val context: Context) {
}
fun getConversationTimestamp(date: Long): String {
val now = Calendar.getInstance()
val then = Calendar.getInstance()
then.timeInMillis = date
@@ -62,6 +62,7 @@ class MessagesAdapter @Inject constructor(
val longClicks: Subject<Message> = PublishSubject.create<Message>()
private val people = ArrayList<String>()
private val selected = ArrayList<Long>()
private val disposables = CompositeDisposable()
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
@@ -105,9 +106,25 @@ class MessagesAdapter @Inject constructor(
val message = getItem(position)!!
val view = viewHolder.itemView
RxView.clicks(view).subscribe { Timber.v(message.toString()) }
RxView.clicks(view).subscribe {
Timber.v(message.toString())
if (selected.contains(message.id)) selected.remove(message.id)
else selected.add(message.id)
notifyItemChanged(position)
}
RxView.longClicks(view).subscribe { longClicks.onNext(message) }
bindImages(view, position)
bindStatus(view, position)
bindGrouping(view, position)
view.body.text = message.getText()
view.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
}
private fun bindImages(view: View, position: Int) {
val message = getItem(position)!!
// If it's an MMS and the parts haven't been loaded, kick off a load
if (message.isMms() && message.parts.isEmpty()) {
loadMmsParts.execute(message.id)
@@ -118,21 +135,27 @@ class MessagesAdapter @Inject constructor(
view.image.setVisible(true)
GlideApp.with(context).load(part.image).into(view.image)
}
}
bindGrouping(view, position)
private fun bindStatus(view: View, position: Int) {
val message = getItem(position)!!
val age = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - message.date)
val timestamp = dateFormatter.getTimestamp(message.date)
view.status?.text = when {
view.status.text = when {
message.isSending() -> context.getString(R.string.message_status_sending)
message.isDelivered() && age <= TIMESTAMP_THRESHOLD -> context.getString(R.string.message_status_delivered)
message.isDelivered() -> context.getString(R.string.message_status_delivered, timestamp)
message.isFailedMessage() -> context.getString(R.string.message_status_failed)
else -> null
else -> timestamp
}
view.status?.setVisible(!view.status?.text.isNullOrBlank())
view.body.text = message.getText()
view.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
view.status.visibility = when {
selected.contains(message.id) -> View.VISIBLE
message.isSending() -> View.VISIBLE
message.isDelivered() && age <= TIMESTAMP_THRESHOLD -> View.VISIBLE
message.isFailedMessage() -> View.VISIBLE
else -> View.GONE
}
}
private fun bindGrouping(view: View, position: Int) {
@@ -77,15 +77,21 @@
android:autoLink="all"
android:gravity="start|center_vertical"
app:textColor="primaryOnTheme"
tools:text="@tools:sample/lorem/random" />
<TextView
android:id="@+id/status"
android:layout_width="0dp"
android:layout_height="0dp" />
tools:text="@tools:sample/lorem" />
</LinearLayout>
</LinearLayout>
<presentation.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="72dp"
android:layout_marginTop="4dp"
android:textSize="12sp"
app:textColor="secondary"
tools:text="Sending..." />
</LinearLayout>
@@ -72,15 +72,19 @@
android:gravity="start|center_vertical"
tools:text="Hey! How's it going?" />
<presentation.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:textColor="tertiary"
tools:text="Sending..." />
</LinearLayout>
</LinearLayout>
<presentation.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="24dp"
android:layout_marginTop="4dp"
android:textSize="12sp"
app:textColor="secondary"
tools:text="Sending..." />
</LinearLayout>
+1 -1
View File
@@ -44,7 +44,7 @@
<string name="compose_hint">Write a message…</string>
<string name="message_status_sending">Sending…</string>
<string name="message_status_delivered">Delivered</string>
<string name="message_status_delivered">Delivered %s</string>
<string name="message_status_failed">Failed to send. Tap to try again</string>
<string name="drawer_inbox">Inbox</string>