From e4bb5b31909fce242fec1838621675708bfb0977 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 30 Jun 2018 17:11:39 -0400 Subject: [PATCH] Display attachments that will be sent in scheduled message --- .../feature/scheduled/ScheduledActivity.kt | 1 + .../scheduled/ScheduledMessageAdapter.kt | 15 +++++++- .../ScheduledMessageAttachmentAdapter.kt | 29 +++++++++++++++ .../main/res/layout/scheduled_activity.xml | 5 +-- .../scheduled_message_image_list_item.xml | 36 +++++++++++++++++++ .../layout/scheduled_message_list_item.xml | 21 ++++++++--- presentation/src/main/res/values/strings.xml | 1 + 7 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt create mode 100644 presentation/src/main/res/layout/scheduled_message_image_list_item.xml diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 5035e2c2..0558b19c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -29,6 +29,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { showBackButton(true) viewModel.bindView(this) + dialog.title = getString(R.string.scheduled_options_title) dialog.adapter.setData(R.array.scheduled_options) messageAdapter.emptyView = empty diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt index 202a5ef5..695e4c3d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt @@ -1,8 +1,11 @@ package com.moez.QKSMS.feature.scheduled +import android.net.Uri import android.telephony.PhoneNumberUtils import android.view.LayoutInflater import android.view.ViewGroup +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkRealmAdapter import com.moez.QKSMS.common.base.QkViewHolder @@ -25,11 +28,17 @@ class ScheduledMessageAdapter @Inject constructor( private val contacts by lazy { contactRepo.getContacts() } private val contactMap: HashMap = hashMapOf() + private val imagesViewPool = RecyclerView.RecycledViewPool() val clicks: Subject = PublishSubject.create() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)) + val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false) + + view.attachments.adapter = ScheduledMessageAttachmentAdapter() + view.attachments.setRecycledViewPool(imagesViewPool) + + return QkViewHolder(view) } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { @@ -55,6 +64,10 @@ class ScheduledMessageAdapter @Inject constructor( view.date.text = dateFormatter.getScheduledTimestamp(message.date) view.body.text = message.body + + val adapter = view.attachments.adapter as ScheduledMessageAttachmentAdapter + adapter.data = message.attachments.map(Uri::parse) + view.attachments.isVisible = message.attachments.isNotEmpty() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt new file mode 100644 index 00000000..89d49f2a --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt @@ -0,0 +1,29 @@ +package com.moez.QKSMS.feature.scheduled + +import android.net.Uri +import android.view.LayoutInflater +import android.view.ViewGroup +import com.moez.QKSMS.R +import com.moez.QKSMS.common.base.QkAdapter +import com.moez.QKSMS.common.base.QkViewHolder +import com.moez.QKSMS.common.util.GlideApp +import kotlinx.android.synthetic.main.attachment_list_item.view.* +import javax.inject.Inject + +class ScheduledMessageAttachmentAdapter @Inject constructor() : QkAdapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_image_list_item, parent, false) + view.thumbnail.clipToOutline = true + + return QkViewHolder(view) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val attachment = getItem(position) + val view = holder.itemView + + GlideApp.with(view).load(attachment).into(view.thumbnail) + } + +} \ No newline at end of file diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml index 6805d873..37d1ab91 100644 --- a/presentation/src/main/res/layout/scheduled_activity.xml +++ b/presentation/src/main/res/layout/scheduled_activity.xml @@ -1,4 +1,5 @@ - + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/scheduled_message_list_item.xml b/presentation/src/main/res/layout/scheduled_message_list_item.xml index 3b80be84..13b14246 100644 --- a/presentation/src/main/res/layout/scheduled_message_list_item.xml +++ b/presentation/src/main/res/layout/scheduled_message_list_item.xml @@ -25,10 +25,7 @@ android:background="?attr/selectableItemBackground" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingBottom="12dp" - android:paddingEnd="16dp" - android:paddingStart="16dp" - android:paddingTop="12dp"> + android:padding="16dp"> + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index fe967df8..7315f9a8 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -137,6 +137,7 @@ Scheduled Your scheduled messages will appear here + Scheduled message Send now Delete