From c4c48b3f0c47e2461d94182271bbcdfdbcec870f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 25 Sep 2017 17:38:36 -0400 Subject: [PATCH] Set correct padding between messages --- .../com/moez/QKSMS/ui/messages/MessageAdapter.kt | 14 ++++++++++---- .../moez/QKSMS/ui/messages/MessageViewHolder.kt | 3 ++- .../moez/QKSMS/util/extensions/NumberExtensions.kt | 8 ++++++++ .../moez/QKSMS/util/extensions/ViewExtensions.kt | 14 ++++++++++++++ qksms/src/main/res/layout/message_list_item_in.xml | 3 ++- .../src/main/res/layout/message_list_item_out.xml | 3 ++- 6 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/util/extensions/NumberExtensions.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index 88183ae8..e7fbf3c1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -9,6 +9,8 @@ import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.util.DateFormatter +import com.moez.QKSMS.util.extensions.dpToPx +import com.moez.QKSMS.util.extensions.setMargins import io.realm.OrderedRealmCollection import io.realm.RealmRecyclerViewAdapter import timber.log.Timber @@ -66,20 +68,24 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView when { !canGroupWithPrevious && canGroupWithNext -> { + viewHolder.message.setMargins(bottom = 2.dpToPx(context)) viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first) - viewHolder.avatar?.apply { visibility = View.INVISIBLE } + viewHolder.avatar?.visibility = View.INVISIBLE } canGroupWithPrevious && canGroupWithNext -> { + viewHolder.message.setMargins(bottom = 2.dpToPx(context)) viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle) - viewHolder.avatar?.apply { visibility = View.INVISIBLE } + viewHolder.avatar?.visibility = View.INVISIBLE } canGroupWithPrevious && !canGroupWithNext -> { + viewHolder.message.setMargins(bottom = 16.dpToPx(context)) viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last) - viewHolder.avatar?.apply { visibility = View.VISIBLE } + viewHolder.avatar?.visibility = View.VISIBLE } else -> { + viewHolder.message.setMargins(bottom = 16.dpToPx(context)) viewHolder.body.setBackgroundResource(R.drawable.message_only) - viewHolder.avatar?.apply { visibility = View.VISIBLE } + viewHolder.avatar?.visibility = View.VISIBLE } } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt index 903c5c2c..501c581a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt @@ -8,8 +8,9 @@ import com.moez.QKSMS.ui.view.AvatarView class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) { + val timestamp: TextView = view.findViewById(R.id.timestamp) + val message: View = view.findViewById(R.id.message) val avatar: AvatarView? = view.findViewById(R.id.avatar) val body: TextView = view.findViewById(R.id.body) - val timestamp: TextView = view.findViewById(R.id.timestamp) } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/util/extensions/NumberExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/extensions/NumberExtensions.kt new file mode 100644 index 00000000..8497728f --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/NumberExtensions.kt @@ -0,0 +1,8 @@ +package com.moez.QKSMS.util.extensions + +import android.content.Context +import android.util.TypedValue + +fun Int.dpToPx(context: Context): Int { + return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), context.resources.displayMetrics).toInt() +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt index bf0ddb5b..f5ef6b36 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt @@ -1,8 +1,22 @@ package com.moez.QKSMS.util.extensions import android.content.res.ColorStateList +import android.view.View +import android.view.ViewGroup import android.widget.ImageView fun ImageView.setTint(color: Int) { imageTintList = ColorStateList.valueOf(color) +} + +fun View.setMargins(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) { + val lp = layoutParams as? ViewGroup.MarginLayoutParams ?: return + + lp.setMargins( + left ?: lp.leftMargin, + top ?: lp.topMargin, + right ?: lp.rightMargin, + bottom ?: lp.rightMargin) + + layoutParams = lp } \ No newline at end of file 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 cc2d290c..fe057698 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -12,11 +12,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:layout_marginTop="24dp" + android:layout_marginTop="8dp" android:gravity="center" tools:text="Tue at 11:39pm" />