From da26c07646b47c3099a01ca24856279e2356a2e8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 27 Mar 2018 04:28:25 -0400 Subject: [PATCH] Fix color for tabs and material swatch --- .../main/java/common/widget/PagerTitleView.kt | 16 ++++++++++++++-- .../feature/themepicker/ThemePickerActivity.kt | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/common/widget/PagerTitleView.kt b/presentation/src/main/java/common/widget/PagerTitleView.kt index 6b96742f..baca1343 100644 --- a/presentation/src/main/java/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/common/widget/PagerTitleView.kt @@ -28,10 +28,12 @@ import android.widget.TextView import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import injection.appComponent import common.util.Colors import common.util.extensions.forEach +import injection.appComponent import io.reactivex.rxkotlin.Observables +import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.tab_view.view.* import javax.inject.Inject @@ -39,6 +41,8 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut @Inject lateinit var colors: Colors + private val threadId: Subject = BehaviorSubject.create() + var pager: ViewPager? = null set(value) { if (field !== value) { @@ -51,6 +55,10 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut if (!isInEditMode) appComponent.inject(this) } + fun setThreadId(id: Long) { + threadId.onNext(id) + } + private fun recreate() { removeAllViews() @@ -78,8 +86,12 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut intArrayOf(android.R.attr.state_selected), intArrayOf(-android.R.attr.state_selected)) + val theme = threadId + .distinctUntilChanged() + .switchMap { threadId -> colors.themeForConversation(threadId) } + Observables - .combineLatest(colors.theme, colors.textSecondary, { theme, textSecondary -> + .combineLatest(theme, colors.textSecondary, { theme, textSecondary -> ColorStateList(states, intArrayOf(theme, textSecondary)) }) .autoDisposable(scope()) diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt index c3d2711f..a5b7643c 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt @@ -75,6 +75,8 @@ class ThemePickerActivity : QkThemedActivity(), ThemePicke } override fun render(state: ThemePickerState) { + tabs.setThreadId(state.threadId) + themeAdapter.threadId = state.threadId applyGroup.setVisible(state.applyThemeVisible) @@ -84,5 +86,6 @@ class ThemePickerActivity : QkThemedActivity(), ThemePicke override fun setCurrentTheme(color: Int) { picker.setColor(color) + themeAdapter.selectedColor = color } } \ No newline at end of file