From 6a12b49db670f9ee4928558278c6c32eeaf2d97a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Dec 2017 00:29:30 -0500 Subject: [PATCH] Let Colors utility class do the work for determining status bar icon color --- qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt | 9 +++++++++ .../java/com/moez/QKSMS/presentation/base/QkActivity.kt | 8 +------- 2 files changed, 10 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 d9d13f2b..c5453415 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 @@ -1,6 +1,9 @@ package com.moez.QKSMS.common.util +import android.annotation.SuppressLint import android.content.Context +import android.os.Build +import android.view.View import com.moez.QKSMS.R import io.reactivex.Observable import javax.inject.Inject @@ -12,6 +15,12 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { val theme: Observable = prefs.theme.asObservable() .distinctUntilChanged() + @SuppressLint("InlinedApi") + val statusBarIcons: Observable = prefs.dark.asObservable() + .map { dark -> dark || Build.VERSION.SDK_INT < Build.VERSION_CODES.M } + .map { lightIcons -> if (lightIcons) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } + .distinctUntilChanged() + val statusBar: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.statusBarDark else R.color.statusBarLight } .map { res -> context.resources.getColor(res) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index 33d8a686..6ee0e493 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -2,14 +2,11 @@ package com.moez.QKSMS.presentation.base import android.annotation.SuppressLint import android.arch.lifecycle.ViewModelProviders -import android.os.Build import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem -import android.view.View import com.moez.QKSMS.common.util.Colors -import com.moez.QKSMS.common.util.Preferences import com.moez.QKSMS.presentation.Navigator import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables @@ -23,7 +20,6 @@ import kotlin.reflect.KClass abstract class QkActivity> : AppCompatActivity() { @Inject lateinit var colors: Colors - @Inject lateinit var prefs: Preferences protected abstract val viewModelClass: KClass protected val viewModel: VM by lazy { @@ -38,9 +34,7 @@ abstract class QkActivity> : AppCompatActivity() { super.onCreate(savedInstanceState) onNewIntent(intent) - disposables += prefs.dark.asObservable() - .map { dark -> dark || Build.VERSION.SDK_INT < Build.VERSION_CODES.M } - .map { lightIcons -> if (lightIcons) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } + disposables += colors.statusBarIcons .subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility } disposables += colors.statusBar