From 28f52352f41b6ea0ec651300c088b7e3e2d5b1f4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Dec 2017 23:40:50 -0500 Subject: [PATCH] Fix color for status bar icons --- .../QKSMS/presentation/base/QkActivity.kt | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) 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 fa2336b5..33d8a686 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 @@ -1,11 +1,15 @@ 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 @@ -19,6 +23,7 @@ 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 { @@ -28,9 +33,18 @@ abstract class QkActivity> : AppCompatActivity() { protected val menu: Subject = BehaviorSubject.create() protected var disposables = CompositeDisposable() + @SuppressLint("InlinedApi") override fun onCreate(savedInstanceState: Bundle?) { 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 } + .subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility } + + disposables += colors.statusBar + .subscribe { color -> window.statusBarColor = color } } override fun onPostCreate(savedInstanceState: Bundle?) { @@ -53,13 +67,8 @@ abstract class QkActivity> : AppCompatActivity() { .doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } } .subscribe() - disposables += colors.statusBar - .doOnNext { color -> window.statusBarColor = color } - .subscribe() - disposables += colors.toolbarColor - .doOnNext { color -> toolbar?.setBackgroundColor(color) } - .subscribe() + .subscribe { color -> toolbar?.setBackgroundColor(color) } } override fun onDestroy() {