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 b5a20bbe..eecfd1b0 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 @@ -4,8 +4,6 @@ import android.content.Context import com.moez.QKSMS.R import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.subjects.BehaviorSubject -import io.reactivex.subjects.Subject import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Singleton @@ -13,12 +11,47 @@ import javax.inject.Singleton @Singleton class Colors @Inject constructor(context: Context, prefs: Preferences) { - val theme: Observable + val theme: Observable = prefs.theme.asObservable() + .buffer(80, TimeUnit.MILLISECONDS) + .filter { it.isNotEmpty() } + .map { it.last() } + .observeOn(AndroidSchedulers.mainThread()) - val switchThumbEnabled: Observable - val switchThumbDisabled: Observable - val switchTrackEnabled: Observable - val switchTrackDisabled: Observable + val switchThumbEnabled: Observable = prefs.dark.asObservable() + .map { dark -> + when (dark) { + true -> R.color.switch_thumb_enabled_dark + false -> R.color.switch_thumb_enabled_light + } + } + .map { res -> context.resources.getColor(res) } + + val switchThumbDisabled: Observable = prefs.dark.asObservable() + .map { dark -> + when (dark) { + true -> R.color.switch_thumb_disabled_dark + false -> R.color.switch_thumb_disabled_light + } + } + .map { res -> context.resources.getColor(res) } + + val switchTrackEnabled: Observable = prefs.dark.asObservable() + .map { dark -> + when (dark) { + true -> R.color.switch_track_enabled_dark + false -> R.color.switch_track_enabled_light + } + } + .map { res -> context.resources.getColor(res) } + + val switchTrackDisabled: Observable = prefs.dark.asObservable() + .map { dark -> + when (dark) { + true -> R.color.switch_track_disabled_dark + false -> R.color.switch_track_disabled_light + } + } + .map { res -> context.resources.getColor(res) } val bubbleColor = 0xFFFFFFFF.toInt() @@ -26,54 +59,4 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { val textSecondary = 0xFF70808D.toInt() val textTertiary = 0xFFB7B9C0.toInt() - init { - val colorSubject: Subject = BehaviorSubject.createDefault(0xFF008389.toInt()) - - prefs.theme.asObservable().subscribe { - colorSubject.onNext(it) - } - - theme = colorSubject - .buffer(80, TimeUnit.MILLISECONDS) - .filter { it.isNotEmpty() } - .map { it.last() } - .observeOn(AndroidSchedulers.mainThread()) - - switchThumbEnabled = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_thumb_enabled_dark - false -> R.color.switch_thumb_enabled_light - } - } - .map { res -> context.resources.getColor(res) } - - switchThumbDisabled = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_thumb_disabled_dark - false -> R.color.switch_thumb_disabled_light - } - } - .map { res -> context.resources.getColor(res) } - - switchTrackEnabled = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_track_enabled_dark - false -> R.color.switch_track_enabled_light - } - } - .map { res -> context.resources.getColor(res) } - - switchTrackDisabled = prefs.dark.asObservable() - .map { dark -> - when (dark) { - true -> R.color.switch_track_disabled_dark - false -> R.color.switch_track_disabled_light - } - } - .map { res -> context.resources.getColor(res) } - } - } \ No newline at end of file