From ce9b6a58468da7011316ca70f6a928e3a1f4ac93 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 9 Jan 2018 11:38:19 -0500 Subject: [PATCH] Tap message to view timestamp --- .../main/java/common/util/DateFormatter.kt | 6 ++- .../feature/compose/MessagesAdapter.kt | 41 +++++++++++++++---- .../main/res/layout/message_list_item_in.xml | 18 +++++--- .../main/res/layout/message_list_item_out.xml | 18 ++++---- qksms/src/main/res/values/strings.xml | 2 +- 5 files changed, 60 insertions(+), 25 deletions(-) diff --git a/qksms/src/main/java/common/util/DateFormatter.kt b/qksms/src/main/java/common/util/DateFormatter.kt index 11b041b3..218198dc 100644 --- a/qksms/src/main/java/common/util/DateFormatter.kt +++ b/qksms/src/main/java/common/util/DateFormatter.kt @@ -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 diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 3ecd39f8..f6e6b91c 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -62,6 +62,7 @@ class MessagesAdapter @Inject constructor( val longClicks: Subject = PublishSubject.create() private val people = ArrayList() + private val selected = ArrayList() 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) { 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 3e70127d..6570a27c 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -77,15 +77,21 @@ android:autoLink="all" android:gravity="start|center_vertical" app:textColor="primaryOnTheme" - tools:text="@tools:sample/lorem/random" /> - - + tools:text="@tools:sample/lorem" /> + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml index f62a5c07..a7ca0b80 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -72,15 +72,19 @@ android:gravity="start|center_vertical" tools:text="Hey! How's it going?" /> - - + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index c5811020..02b8a128 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ Write a message… Sending… - Delivered + Delivered %s Failed to send. Tap to try again Inbox