Use dark android theme in dark mode

This commit is contained in:
Moez Bhatti
2017-12-25 21:23:30 -05:00
parent 7447ebc85f
commit 608b73b99b
3 changed files with 32 additions and 2 deletions
@@ -25,6 +25,12 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) {
val theme: Observable<Int> = prefs.theme.asObservable()
.distinctUntilChanged()
val appThemeResources: Observable<Int> = prefs.dark.asObservable()
.map { dark -> if (dark) R.style.AppThemeDark else R.style.AppThemeLight }
val popupThemeResource: Observable<Int> = prefs.dark.asObservable()
.map { dark -> if (dark) R.style.PopupThemeDark else R.style.PopupThemeLight }
@SuppressLint("InlinedApi")
val statusBarIcons: Observable<Int> = prefs.dark.asObservable()
.map { dark -> dark || Build.VERSION.SDK_INT < Build.VERSION_CODES.M }
@@ -6,7 +6,6 @@ import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import android.view.MenuItem
import android.widget.TextView
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.presentation.Navigator
import io.reactivex.disposables.CompositeDisposable
@@ -35,6 +34,9 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
super.onCreate(savedInstanceState)
onNewIntent(intent)
disposables += colors.appThemeResources
.subscribe { res -> setTheme(res) }
disposables += colors.statusBarIcons
.subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility }
@@ -62,6 +64,9 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
.doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } }
.subscribe()
disposables += colors.popupThemeResource
.subscribe { res -> toolbar?.popupTheme = res }
disposables += colors.toolbarColor
.subscribe { color -> toolbar?.setBackgroundColor(color) }
}
+20 -1
View File
@@ -1,10 +1,19 @@
<resources>
<style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
<item name="windowActionBar">false</item>
<item name="android:windowBackground">@color/backgroundLight</item>
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/statusBarLight</item>
<item name="windowActionBar">false</item>
</style>
<style name="AppThemeDark" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@color/backgroundDark</item>
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
<item name="colorPrimary">@color/backgroundDark</item>
<item name="colorPrimaryDark">@color/statusBarDark</item>
<item name="windowActionBar">false</item>
</style>
<style name="TextPrimary">
@@ -47,4 +56,14 @@
<item name="android:layout_marginEnd">32dp</item>
</style>
<style name="PopupThemeDark" parent="ThemeOverlay.AppCompat">
<item name="android:colorBackground">@color/backgroundDark</item>
<item name="android:textColor">@color/textPrimaryDark</item>
</style>
<style name="PopupThemeLight" parent="ThemeOverlay.AppCompat.Light">
<item name="android:colorBackground">@color/white</item>
<item name="android:textColor">@color/textPrimary</item>
</style>
</resources>