From 608b73b99b26a8525ba46c3cf52b1e364018074b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 25 Dec 2017 21:23:30 -0500 Subject: [PATCH] Use dark android theme in dark mode --- .../java/com/moez/QKSMS/common/util/Colors.kt | 6 ++++++ .../presentation/common/base/QkActivity.kt | 7 ++++++- qksms/src/main/res/values/styles.xml | 21 ++++++++++++++++++- 3 files changed, 32 insertions(+), 2 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 5ea63b72..ac3518c6 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 @@ -25,6 +25,12 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { val theme: Observable = prefs.theme.asObservable() .distinctUntilChanged() + val appThemeResources: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.style.AppThemeDark else R.style.AppThemeLight } + + val popupThemeResource: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.style.PopupThemeDark else R.style.PopupThemeLight } + @SuppressLint("InlinedApi") val statusBarIcons: Observable = prefs.dark.asObservable() .map { dark -> dark || Build.VERSION.SDK_INT < Build.VERSION_CODES.M } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt index e36b468b..615ed404 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt @@ -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> : 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> : 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) } } diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index 6f12762a..0df064df 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -1,10 +1,19 @@ + + + + + +