From ea6458505413149f62462d26d3b93c14c0075277 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 3 Apr 2018 00:37:07 -0400 Subject: [PATCH] Fixed icon and letter color for avatar in conversation --- presentation/src/main/java/common/widget/AvatarView.kt | 10 +++++++--- presentation/src/main/res/layout/avatar_view.xml | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/common/widget/AvatarView.kt index e1e0bd5e..dbcd733a 100644 --- a/presentation/src/main/java/common/widget/AvatarView.kt +++ b/presentation/src/main/java/common/widget/AvatarView.kt @@ -73,9 +73,13 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet .autoDisposable(scope()) .subscribe { color -> background.setTint(color) } - colors.textPrimaryOnTheme - .autoDisposable(scope()) - .subscribe { color -> icon.setTint(color) } + colors.textPrimaryOnThemeForConversation(threadId).let { observable -> + initial.textColorObservable = observable + + observable + .autoDisposable(scope()) + .subscribe { color -> icon.setTint(color) } + } clicks() .autoDisposable(scope()) diff --git a/presentation/src/main/res/layout/avatar_view.xml b/presentation/src/main/res/layout/avatar_view.xml index 9adeecd0..961a3743 100644 --- a/presentation/src/main/res/layout/avatar_view.xml +++ b/presentation/src/main/res/layout/avatar_view.xml @@ -34,7 +34,6 @@ android:gravity="center" android:textAllCaps="true" android:textSize="20sp" - app:textColor="primaryOnTheme" tools:text="M" />