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 68490578..d9c495fa 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 @@ -12,7 +12,7 @@ import com.moez.QKSMS.util.DateFormatter import com.moez.QKSMS.util.ThemeManager import com.moez.QKSMS.util.extensions.dpToPx import com.moez.QKSMS.util.extensions.setBackgroundTint -import com.moez.QKSMS.util.extensions.setMargins +import com.moez.QKSMS.util.extensions.setPadding import io.realm.OrderedRealmCollection import io.realm.RealmRecyclerViewAdapter import timber.log.Timber @@ -63,10 +63,14 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView bindGrouping(viewHolder, position) + viewHolder.status?.visibility = when { + message.isSending() || message.isFailedMessage() -> View.VISIBLE + else -> View.GONE + } viewHolder.status?.text = when { - message.isSending() -> "..." - message.isFailedMessage() -> "fail" - else -> "sent" + message.isSending() -> "Sending..." + message.isFailedMessage() -> "Failed to send. Tap to try again" + else -> null } viewHolder.avatar?.apply { contact = Contact() } @@ -88,22 +92,22 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView when { !canGroupWithPrevious && canGroupWithNext -> { - viewHolder.message.setMargins(bottom = 2.dpToPx(context)) + viewHolder.itemView.setPadding(bottom = 2.dpToPx(context)) viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_first else R.drawable.message_in_first) viewHolder.avatar?.visibility = View.INVISIBLE } canGroupWithPrevious && canGroupWithNext -> { - viewHolder.message.setMargins(bottom = 2.dpToPx(context)) + viewHolder.itemView.setPadding(bottom = 2.dpToPx(context)) viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_middle else R.drawable.message_in_middle) viewHolder.avatar?.visibility = View.INVISIBLE } canGroupWithPrevious && !canGroupWithNext -> { - viewHolder.message.setMargins(bottom = 16.dpToPx(context)) + viewHolder.itemView.setPadding(bottom = 16.dpToPx(context)) viewHolder.body.setBackgroundResource(if (sent) R.drawable.message_out_last else R.drawable.message_in_last) viewHolder.avatar?.visibility = View.VISIBLE } else -> { - viewHolder.message.setMargins(bottom = 16.dpToPx(context)) + viewHolder.itemView.setPadding(bottom = 16.dpToPx(context)) viewHolder.body.setBackgroundResource(R.drawable.message_only) viewHolder.avatar?.visibility = View.VISIBLE } 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 ba1eff79..48ebdcd0 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 @@ -23,4 +23,8 @@ fun View.setMargins(left: Int? = null, top: Int? = null, right: Int? = null, bot bottom ?: lp.rightMargin) layoutParams = lp +} + +fun View.setPadding(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) { + setPadding(left ?: paddingLeft, top ?: paddingTop, right ?: paddingRight, bottom ?: paddingBottom) } \ 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 fe057698..953a010c 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -4,7 +4,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/selectableItemBackground" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingBottom="16dp"> + android:orientation="vertical" + android:paddingBottom="16dp"> @@ -57,8 +57,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:layout_marginRight="24dp" + android:layout_marginRight="12dp" + android:paddingTop="4dp" android:textColor="@color/textTertiary" - tools:text="Sending" /> + tools:text="Sending..." /> \ No newline at end of file