diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index b729b4c2..8dba5d7d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -1,15 +1,16 @@ package com.moez.QKSMS.common.di 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.MessagesAdapter import com.moez.QKSMS.presentation.main.ConversationsAdapter import com.moez.QKSMS.presentation.main.MainActivity 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.view.AvatarView +import com.moez.QKSMS.presentation.view.GroupAvatarView import com.moez.QKSMS.receiver.* import dagger.Component import javax.inject.Singleton diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt index 95270c4e..a90dd66d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt @@ -30,13 +30,14 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr init { View.inflate(context, R.layout.avatar_view, this) AppComponentManager.appComponent.inject(this) + + setBackgroundResource(R.drawable.circle) + clipToOutline = true + backgroundTintList = ColorStateList.valueOf(themeManager.color) } override fun onFinishInflate() { super.onFinishInflate() - setBackgroundResource(R.drawable.circle) - clipToOutline = true - backgroundTintList = ColorStateList.valueOf(themeManager.color) if (!isInEditMode) { updateView() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt index 13a2c604..2a7acada 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt @@ -1,12 +1,10 @@ package com.moez.QKSMS.presentation.view import android.content.Context -import android.content.res.ColorStateList import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.View import com.moez.QKSMS.R -import com.moez.QKSMS.common.util.extensions.getColorCompat import com.moez.QKSMS.data.model.Contact import io.realm.RealmList import kotlinx.android.synthetic.main.group_avatar_view.view.* @@ -19,18 +17,23 @@ class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) updateView() } + private val avatars by lazy { listOf(avatar1, avatar2, avatar3) } + constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) constructor(context: Context) : this(context, null, 0) init { View.inflate(context, R.layout.group_avatar_view, this) + setBackgroundResource(R.drawable.circle) + clipToOutline = true } override fun onFinishInflate() { super.onFinishInflate() - setBackgroundResource(R.drawable.circle) - clipToOutline = true - backgroundTintList = ColorStateList.valueOf(context.getColorCompat(R.color.bubbleLight)) + + avatars.forEach { avatar -> + avatar.setBackgroundResource(R.drawable.rectangle) + } if (!isInEditMode) { updateView() @@ -38,12 +41,10 @@ class GroupAvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) } 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 + avatars.forEachIndexed { index, avatar -> + avatar.visibility = if (contacts.size > index) View.VISIBLE else View.GONE + avatar.contact = if (contacts.size > index) contacts[index] else null + } } } \ No newline at end of file diff --git a/qksms/src/main/res/drawable/rectangle.xml b/qksms/src/main/res/drawable/rectangle.xml new file mode 100644 index 00000000..8c1345a8 --- /dev/null +++ b/qksms/src/main/res/drawable/rectangle.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file