Improved rendering for group avatars

This commit is contained in:
Moez Bhatti
2017-11-29 17:11:32 -05:00
parent beac970c2f
commit 3ef8eccc0e
4 changed files with 27 additions and 17 deletions
@@ -1,15 +1,16 @@
package com.moez.QKSMS.common.di package com.moez.QKSMS.common.di
import com.moez.QKSMS.common.util.ContactImageLoader import com.moez.QKSMS.common.util.ContactImageLoader
import com.moez.QKSMS.presentation.compose.ComposeActivity
import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.compose.DetailedChipView import com.moez.QKSMS.presentation.compose.DetailedChipView
import com.moez.QKSMS.presentation.compose.MessagesAdapter
import com.moez.QKSMS.presentation.main.ConversationsAdapter import com.moez.QKSMS.presentation.main.ConversationsAdapter
import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.MainActivity
import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.main.MainViewModel
import com.moez.QKSMS.presentation.compose.ComposeActivity
import com.moez.QKSMS.presentation.compose.MessagesAdapter
import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.settings.SettingsViewModel import com.moez.QKSMS.presentation.settings.SettingsViewModel
import com.moez.QKSMS.presentation.view.AvatarView import com.moez.QKSMS.presentation.view.AvatarView
import com.moez.QKSMS.presentation.view.GroupAvatarView
import com.moez.QKSMS.receiver.* import com.moez.QKSMS.receiver.*
import dagger.Component import dagger.Component
import javax.inject.Singleton import javax.inject.Singleton
@@ -30,13 +30,14 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr
init { init {
View.inflate(context, R.layout.avatar_view, this) View.inflate(context, R.layout.avatar_view, this)
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
setBackgroundResource(R.drawable.circle)
clipToOutline = true
backgroundTintList = ColorStateList.valueOf(themeManager.color)
} }
override fun onFinishInflate() { override fun onFinishInflate() {
super.onFinishInflate() super.onFinishInflate()
setBackgroundResource(R.drawable.circle)
clipToOutline = true
backgroundTintList = ColorStateList.valueOf(themeManager.color)
if (!isInEditMode) { if (!isInEditMode) {
updateView() updateView()
@@ -1,12 +1,10 @@
package com.moez.QKSMS.presentation.view package com.moez.QKSMS.presentation.view
import android.content.Context import android.content.Context
import android.content.res.ColorStateList
import android.support.constraint.ConstraintLayout import android.support.constraint.ConstraintLayout
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.extensions.getColorCompat
import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Contact
import io.realm.RealmList import io.realm.RealmList
import kotlinx.android.synthetic.main.group_avatar_view.view.* import kotlinx.android.synthetic.main.group_avatar_view.view.*
@@ -19,18 +17,23 @@ class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int)
updateView() updateView()
} }
private val avatars by lazy { listOf(avatar1, avatar2, avatar3) }
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
constructor(context: Context) : this(context, null, 0) constructor(context: Context) : this(context, null, 0)
init { init {
View.inflate(context, R.layout.group_avatar_view, this) View.inflate(context, R.layout.group_avatar_view, this)
setBackgroundResource(R.drawable.circle)
clipToOutline = true
} }
override fun onFinishInflate() { override fun onFinishInflate() {
super.onFinishInflate() super.onFinishInflate()
setBackgroundResource(R.drawable.circle)
clipToOutline = true avatars.forEach { avatar ->
backgroundTintList = ColorStateList.valueOf(context.getColorCompat(R.color.bubbleLight)) avatar.setBackgroundResource(R.drawable.rectangle)
}
if (!isInEditMode) { if (!isInEditMode) {
updateView() updateView()
@@ -38,12 +41,10 @@ class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int)
} }
private fun updateView() { private fun updateView() {
avatar1.visibility = if (contacts.size > 0) View.VISIBLE else View.GONE avatars.forEachIndexed { index, avatar ->
avatar1.contact = if (contacts.size > 0) contacts[0] else null avatar.visibility = if (contacts.size > index) View.VISIBLE else View.GONE
avatar2.visibility = if (contacts.size > 1) View.VISIBLE else View.GONE avatar.contact = if (contacts.size > index) contacts[index] else null
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
} }
} }
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/white" />
</shape>