From 2c868cb50b85ad6c11d6efa1dcbf7b6778cd182d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Dec 2017 19:50:57 -0500 Subject: [PATCH] Improve performance for color observables --- .../java/com/moez/QKSMS/common/util/Colors.kt | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 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 8d8771c4..eff61dbd 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 @@ -3,8 +3,6 @@ package com.moez.QKSMS.common.util import android.content.Context import com.moez.QKSMS.R import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers -import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Singleton @@ -12,68 +10,79 @@ import javax.inject.Singleton class Colors @Inject constructor(context: Context, prefs: Preferences) { val theme: Observable = prefs.theme.asObservable() - .buffer(80, TimeUnit.MILLISECONDS) - .filter { it.isNotEmpty() } - .map { it.last() } - .observeOn(AndroidSchedulers.mainThread()) + .distinctUntilChanged() val background: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.backgroundDark else R.color.white } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val composeBackground: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.backgroundDark else R.color.backgroundLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val separator: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.separatorDark else R.color.separatorLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val textPrimary: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.textPrimaryDark else R.color.textPrimary } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val textSecondary: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.textSecondaryDark else R.color.textSecondary } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val textTertiary: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.textTertiaryDark else R.color.textTertiary } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() // TODO make this result depend on the theme color val textPrimaryOnTheme: Observable = prefs.theme.asObservable() .map { theme -> R.color.textPrimaryDark } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() // TODO make this result depend on the theme color val textSecondaryOnTheme: Observable = prefs.dark.asObservable() .map { theme -> R.color.textSecondaryDark } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() // TODO make this result depend on the theme color val textTertiaryOnTheme: Observable = prefs.dark.asObservable() .map { theme -> R.color.textTertiaryDark } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val bubble: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.bubbleDark else R.color.bubbleLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val switchThumbEnabled: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.switchThumbEnabledDark else R.color.switchThumbEnabledLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val switchThumbDisabled: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.switchThumbDisabledDark else R.color.switchThumbDisabledLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val switchTrackEnabled: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.switchTrackEnabledDark else R.color.switchTrackEnabledLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() val switchTrackDisabled: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.switchTrackDisabledDark else R.color.switchTrackDisabledLight } .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() } \ No newline at end of file