From bacd1f77123404b8e919e1b439f78cbd07e0e72d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Dec 2017 18:26:49 -0500 Subject: [PATCH] Remove all constants from Colors, only use observables --- .../java/com/moez/QKSMS/common/util/Colors.kt | 16 ++++++++++++---- .../presentation/compose/ComposeActivity.kt | 7 +++++-- .../moez/QKSMS/presentation/main/MainActivity.kt | 8 +++++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt index 9abcbd64..d985c5a2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt @@ -25,6 +25,18 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight } .map { res -> context.resources.getColor(res) } + val textPrimary: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.textPrimaryLight else R.color.textPrimary } + .map { res -> context.resources.getColor(res) } + + val textSecondary: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.textSecondaryLight else R.color.textSecondary } + .map { res -> context.resources.getColor(res) } + + val textTertiary: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.textTertiaryLight else R.color.textTertiary } + .map { res -> context.resources.getColor(res) } + val bubble: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.bubbleDark else R.color.bubbleLight } .map { res -> context.resources.getColor(res) } @@ -45,8 +57,4 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { .map { dark -> if (dark) R.color.switch_track_disabled_dark else R.color.switch_track_disabled_light } .map { res -> context.resources.getColor(res) } - val textPrimary = 0xFF49555F.toInt() - val textSecondary = 0xFF70808D.toInt() - val textTertiary = 0xFFB7B9C0.toInt() - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index 145d00fd..6f82d99c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -18,6 +18,7 @@ import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.presentation.base.QkActivity import io.reactivex.Observable +import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -76,8 +77,10 @@ class ComposeActivity : QkActivity(), ComposeView { intArrayOf(android.R.attr.state_enabled), intArrayOf(-android.R.attr.state_enabled)) - disposables += colors.theme - .map { color -> ColorStateList(states, intArrayOf(color, colors.textTertiary)) } + disposables += Observables + .combineLatest(colors.theme, colors.textTertiary, { theme, textTertiary -> + ColorStateList(states, intArrayOf(theme, textTertiary)) + }) .subscribe { tintList -> send.imageTintList = tintList } disposables += colors.background diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index d3f961f7..8a3389de 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -22,6 +22,7 @@ import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkActivity +import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -85,7 +86,12 @@ class MainActivity : QkActivity(), MainView { disposables += colors.theme .doOnNext { color -> compose.setBackgroundTint(color) } - .map { color -> ColorStateList(states, intArrayOf(color, colors.textSecondary)) } + .subscribe() + + disposables += Observables + .combineLatest(colors.theme, colors.textSecondary, { theme, textSecondary -> + ColorStateList(states, intArrayOf(theme, textSecondary)) + }) .doOnNext { tintList -> inboxIcon.imageTintList = tintList } .doOnNext { tintList -> archivedIcon.imageTintList = tintList } .doOnNext { tintList -> scheduledIcon.imageTintList = tintList }