diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt index bbaf5fa6..d6668581 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesAdapter.kt @@ -49,11 +49,11 @@ class MessagesAdapter(data: OrderedRealmCollection?) : RealmRecyclerVie when (viewType) { VIEWTYPE_ME -> { layoutRes = R.layout.message_list_item_out - bubbleColor = themeManager.color + bubbleColor = themeManager.bubbleColor } else -> { layoutRes = R.layout.message_list_item_in - bubbleColor = themeManager.bubbleColor + bubbleColor = themeManager.color } } 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 b52d1796..5bb4180f 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 @@ -7,13 +7,17 @@ import android.util.AttributeSet import android.view.View import android.widget.FrameLayout import com.moez.QKSMS.R +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.util.GlideApp -import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.data.model.Contact import kotlinx.android.synthetic.main.avatar_view.view.* +import javax.inject.Inject class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) { + @Inject lateinit var themeManager: ThemeManager + var contact: Contact? = null set(value) { field = value @@ -25,13 +29,14 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr init { View.inflate(context, R.layout.avatar_view, this) + AppComponentManager.appComponent.inject(this) } override fun onFinishInflate() { super.onFinishInflate() setBackgroundResource(R.drawable.circle) clipToOutline = true - backgroundTintList = ColorStateList.valueOf(context.getColorCompat(R.color.bubbleLight)) + backgroundTintList = ColorStateList.valueOf(themeManager.color) if (!isInEditMode) { updateView() diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml index 85947859..1f81e39b 100644 --- a/qksms/src/main/res/layout/avatar_view.xml +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:background="@color/list_separator" tools:parentTag="com.moez.QKSMS.presentation.view.AvatarView"> + android:textColor="@color/textPrimaryLight" + tools:backgroundTint="@color/tools_theme" + tools:text="@tools:sample/lorem/random" /> diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index de3cdd9a..0373613b 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -12,9 +12,12 @@ #F4F4F4 - #f8f8f8 + #F2F2F2 #F1F1F1 #F2F2F2 #F5F5F5 + + + #008389