diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt index 2a80765a..a3a94cae 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt @@ -13,24 +13,23 @@ import io.realm.RealmRecyclerViewAdapter class ConversationAdapter(context: Context, data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(context, data, true) { - val mContext = context - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ConversationViewHolder { - val layoutInflater = mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater + val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater return ConversationViewHolder(layoutInflater.inflate(R.layout.conversation_list_item, parent, false)) } override fun onBindViewHolder(viewHolder: ConversationViewHolder, position: Int) { - val conversation = getItem(position) + val conversation = getItem(position)!! viewHolder.itemView.setOnClickListener { - val intent = Intent(mContext, MessageListActivity::class.java) - intent.putExtra("thread_id", conversation?.id) + val intent = Intent(context, MessageListActivity::class.java) + intent.putExtra("thread_id", conversation.id) - mContext.startActivity(intent) + context.startActivity(intent) } - viewHolder.title.text = conversation?.getTitle() - viewHolder.snippet.text = conversation?.snippet + viewHolder.avatar.contacts = conversation.contacts + viewHolder.title.text = conversation.getTitle() + viewHolder.snippet.text = conversation.snippet } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt index 5a88c605..e6b01ab6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationViewHolder.kt @@ -4,9 +4,11 @@ import android.support.v7.widget.RecyclerView import android.view.View import android.widget.TextView import com.moez.QKSMS.R +import com.moez.QKSMS.ui.view.GroupAvatarView class ConversationViewHolder(view: View) : RecyclerView.ViewHolder(view) { + val avatar: GroupAvatarView = view.findViewById(R.id.avatars) val title: TextView = view.findViewById(R.id.title) val snippet: TextView = view.findViewById(R.id.snippet) 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 ab121c4c..95c004f8 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 @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R 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 io.realm.OrderedRealmCollection @@ -38,6 +39,7 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : Log.i(TAG, message.toString()) } + viewHolder.avatar.contact = Contact() viewHolder.body.text = message.body viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date) } 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 3418fc5e..27f1c877 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 @@ -4,9 +4,11 @@ import android.support.v7.widget.RecyclerView import android.view.View import android.widget.TextView import com.moez.QKSMS.R +import com.moez.QKSMS.ui.view.AvatarView class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) { + val avatar: AvatarView = view.findViewById(R.id.avatar) val body: TextView = view.findViewById(R.id.body) val timestamp: TextView = view.findViewById(R.id.timestamp) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt index 5834f7bc..af6cfbf6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt @@ -2,11 +2,36 @@ package com.moez.QKSMS.ui.view import android.content.Context import android.util.AttributeSet -import android.widget.ImageView +import android.view.View +import android.widget.FrameLayout +import com.moez.QKSMS.R +import com.moez.QKSMS.data.model.Contact +import kotlinx.android.synthetic.main.avatar_view.view.* -class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : ImageView(context, attrs, defStyleAttr) { +class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) { + + var contact: Contact? = null + set(value) { + field = value + updateView() + } constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) constructor(context: Context) : this(context, null, 0) + init { + if (!isInEditMode) { + View.inflate(context, R.layout.avatar_view, this) + } + } + + override fun onFinishInflate() { + super.onFinishInflate() + updateView() + } + + private fun updateView() { + initial.text = if (contact?.name?.length ?: 0 > 0) contact?.name?.substring(0, 1) else "?" + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt new file mode 100644 index 00000000..2404c8d3 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt @@ -0,0 +1,43 @@ +package com.moez.QKSMS.ui.view + +import android.content.Context +import android.support.constraint.ConstraintLayout +import android.util.AttributeSet +import android.view.View +import com.moez.QKSMS.R +import com.moez.QKSMS.data.model.Contact +import io.realm.RealmList +import kotlinx.android.synthetic.main.group_avatar_view.view.* + +class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : ConstraintLayout(context, attrs, defStyleAttr) { + + var contacts: RealmList = RealmList() + set(value) { + field = value + updateView() + } + + constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) + constructor(context: Context) : this(context, null, 0) + + init { + if (!isInEditMode) { + View.inflate(context, R.layout.group_avatar_view, this) + } + } + + override fun onFinishInflate() { + super.onFinishInflate() + updateView() + } + + private fun updateView() { + avatar1.visibility = if (contacts.size > 0) View.VISIBLE else View.GONE + avatar1.contact = if (contacts.size > 0) contacts[0] else null + avatar2.visibility = if (contacts.size > 1) View.VISIBLE else View.GONE + avatar2.contact = if (contacts.size > 1) contacts[1] else null + avatar3.visibility = if (contacts.size > 2) View.VISIBLE else View.GONE + avatar3.contact = if (contacts.size > 2) contacts[2] else null + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml new file mode 100644 index 00000000..492936fa --- /dev/null +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_item.xml b/qksms/src/main/res/layout/conversation_list_item.xml index d005b38d..c41edd26 100644 --- a/qksms/src/main/res/layout/conversation_list_item.xml +++ b/qksms/src/main/res/layout/conversation_list_item.xml @@ -10,12 +10,11 @@ android:paddingStart="16dp" android:paddingTop="8dp"> - + android:layout_gravity="top" /> + + + + + + + + + \ 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 32173bc7..365d352f 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -3,26 +3,41 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="16dp"> + android:gravity="start|bottom" + android:orientation="horizontal" + android:paddingBottom="16dp" + android:paddingEnd="56dp" + android:paddingStart="16dp" + android:paddingTop="16dp"> - + + + android:orientation="vertical"> - + + + + + \ 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 398d9d7a..6aaff372 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -3,26 +3,41 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="16dp"> + android:gravity="end|bottom" + android:orientation="horizontal" + android:paddingBottom="16dp" + android:paddingEnd="16dp" + android:paddingStart="56dp" + android:paddingTop="16dp"> - + android:orientation="vertical"> - + + + + + + + \ No newline at end of file