From abd176648340be1f048babbd214b566b4706842a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 14 Mar 2018 16:23:12 -0700 Subject: [PATCH] Fix color of conversation theme checkmark --- .../presentation/feature/themepicker/ThemeAdapter.kt | 12 ++++++++++-- .../feature/themepicker/ThemePickerActivity.kt | 1 + .../feature/themepicker/ThemePickerState.kt | 1 + .../feature/themepicker/ThemePickerViewModel.kt | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt index 626bc09c..a23f1efb 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt @@ -47,6 +47,12 @@ class ThemeAdapter @Inject constructor( private val colors: Colors ) : QkAdapter>() { + var threadId: Long = 0 + set(value) { + field = value + threadIdChanged() + } + val colorSelected: Subject = PublishSubject.create() var selectedColor: Int = -1 @@ -113,9 +119,11 @@ class ThemeAdapter @Inject constructor( .forEach { theme -> view.palette.addView(theme) } } - override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { - disposables += colors.textPrimaryOnTheme + private fun threadIdChanged() { + disposables.clear() + disposables += colors.textPrimaryOnThemeForConversation(threadId) .subscribe { color -> iconTint = color } + } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt index bc7e2a58..de797b92 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt @@ -67,6 +67,7 @@ class ThemePickerActivity : QkThemedActivity(), ThemePicke rgbPicker.alpha = state.rgbAlpha rgbPicker.setBackgroundColor(state.selectedColor) + themeAdapter.threadId = state.threadId themeAdapter.selectedColor = state.selectedColor } diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt index 76a41c52..e1a39591 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerState.kt @@ -19,6 +19,7 @@ package presentation.feature.themepicker data class ThemePickerState( + val threadId: Long = 0, val selectedColor: Int = -1, val rgbAlpha: Float = 0f ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt index ed058e7f..ef6873ec 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt @@ -39,6 +39,8 @@ class ThemePickerViewModel(intent: Intent) : QkViewModel