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 0a20c507..af180415 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 @@ -2,7 +2,6 @@ package com.moez.QKSMS.ui.messages import android.content.Context import android.util.Log -import android.view.Gravity import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R @@ -14,9 +13,13 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(context, data, true) { val TAG = "MessageAdapter" + val VIEWTYPE_IN = 0 + val VIEWTYPE_OUT = 1 + override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder { val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - return MessageViewHolder(layoutInflater.inflate(R.layout.message_list_item, parent, false)) + val layoutRes = if (viewType == VIEWTYPE_IN) R.layout.message_list_item_in else R.layout.message_list_item_out + return MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false)) } override fun onBindViewHolder(viewHolder: MessageViewHolder, position: Int) { @@ -27,6 +30,10 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : } viewHolder.body.text = message.body - viewHolder.body.gravity = if (message.isMe()) Gravity.RIGHT else Gravity.LEFT + } + + override fun getItemViewType(position: Int): Int { + val message = getItem(position)!! + return if (message.isMe()) VIEWTYPE_OUT else VIEWTYPE_IN } } \ No newline at end of file diff --git a/qksms/src/main/res/layout/message_list_fragment.xml b/qksms/src/main/res/layout/message_list_fragment.xml index 8f920682..b36434eb 100644 --- a/qksms/src/main/res/layout/message_list_fragment.xml +++ b/qksms/src/main/res/layout/message_list_fragment.xml @@ -13,6 +13,6 @@ android:clipToPadding="false" android:paddingBottom="8dp" android:paddingTop="8dp" - tools:listitem="@layout/message_list_item" /> + tools:listitem="@layout/message_list_item_out" /> \ No newline at end of file diff --git a/qksms/src/main/res/layout/message_list_item.xml b/qksms/src/main/res/layout/message_list_item_in.xml similarity index 92% rename from qksms/src/main/res/layout/message_list_item.xml rename to qksms/src/main/res/layout/message_list_item_in.xml index 536867d1..4c9b24a9 100644 --- a/qksms/src/main/res/layout/message_list_item.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -8,6 +8,7 @@ diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml new file mode 100644 index 00000000..dfdef72c --- /dev/null +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file