Let Colors utility class do the work for determining status bar icon color

This commit is contained in:
Moez Bhatti
2017-12-07 00:29:30 -05:00
parent 28f52352f4
commit 6a12b49db6
2 changed files with 10 additions and 7 deletions
@@ -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<Int> = prefs.theme.asObservable()
.distinctUntilChanged()
@SuppressLint("InlinedApi")
val statusBarIcons: Observable<Int> = 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<Int> = prefs.dark.asObservable()
.map { dark -> if (dark) R.color.statusBarDark else R.color.statusBarLight }
.map { res -> context.resources.getColor(res) }
@@ -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<VM : QkViewModel<*, *>> : AppCompatActivity() {
@Inject lateinit var colors: Colors
@Inject lateinit var prefs: Preferences
protected abstract val viewModelClass: KClass<VM>
protected val viewModel: VM by lazy {
@@ -38,9 +34,7 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : 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