#1425 - Add support for system dark mode on Android Q

This commit is contained in:
moezbhatti
2019-08-12 01:21:03 +02:00
parent c80985e59c
commit be20f19c82
15 changed files with 266 additions and 138 deletions
@@ -23,7 +23,6 @@ import android.app.ActivityManager
import android.graphics.BitmapFactory
import android.os.Build
import android.os.Bundle
import android.view.View
import androidx.core.view.iterator
import androidx.lifecycle.Lifecycle
import com.moez.QKSMS.R
@@ -33,10 +32,12 @@ import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.toolbar.*
import java.util.concurrent.TimeUnit
import javax.inject.Inject
/**
@@ -65,29 +66,17 @@ abstract class QkThemedActivity : QkActivity() {
@SuppressLint("InlinedApi")
override fun onCreate(savedInstanceState: Bundle?) {
val night = prefs.night.get()
val black = prefs.black.get()
setTheme(getActivityThemeRes(night, black))
setTheme(getActivityThemeRes(prefs.black.get()))
super.onCreate(savedInstanceState)
// When certain preferences change, we need to recreate the activity
Observable.merge(
listOf(prefs.night, prefs.black, prefs.textSize, prefs.systemFont).map { it.asObservable().skip(1) })
val triggers = listOf(prefs.nightMode, prefs.night, prefs.black, prefs.textSize, prefs.systemFont)
Observable.merge(triggers.map { it.asObservable().skip(1) })
.debounce(400, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.autoDisposable(scope())
.subscribe { recreate() }
// Set the color for the status bar icons
// If night mode, or no dark icons supported, use light icons
// If night mode and only dark status icons supported, use dark status icons
// If night mode and all dark icons supported, use all dark icons
window.decorView.systemUiVisibility = when {
night || Build.VERSION.SDK_INT < Build.VERSION_CODES.M -> 0
Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
else -> View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
}
// Some devices don't let you modify android.R.attr.navigationBarColor
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground)
@@ -127,10 +116,9 @@ abstract class QkThemedActivity : QkActivity() {
/**
* This can be overridden in case an activity does not want to use the default themes
*/
open fun getActivityThemeRes(night: Boolean, black: Boolean) = when {
night && black -> R.style.AppThemeBlack
night && !black -> R.style.AppThemeDark
else -> R.style.AppThemeLight
open fun getActivityThemeRes(black: Boolean) = when {
black -> R.style.AppTheme_Black
else -> R.style.AppTheme
}
}
@@ -24,7 +24,7 @@ import android.util.AttributeSet
import androidx.appcompat.widget.SwitchCompat
import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.extensions.getColorCompat
import com.moez.QKSMS.common.util.extensions.resolveThemeColor
import com.moez.QKSMS.common.util.extensions.withAlpha
import com.moez.QKSMS.injection.appComponent
import com.moez.QKSMS.util.Preferences
@@ -50,26 +50,15 @@ class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet?
intArrayOf(android.R.attr.state_checked),
intArrayOf())
val themeColor = colors.theme().theme
thumbTintList = ColorStateList(states, intArrayOf(
context.resolveThemeColor(R.attr.switchThumbDisabled),
colors.theme().theme,
context.resolveThemeColor(R.attr.switchThumbEnabled)))
val switchThumbEnabled: Int = prefs.night.get()
.let { night -> if (night) R.color.switchThumbEnabledDark else R.color.switchThumbEnabledLight }
.let { res -> context.getColorCompat(res) }
val switchThumbDisabled: Int = prefs.night.get()
.let { night -> if (night) R.color.switchThumbDisabledDark else R.color.switchThumbDisabledLight }
.let { res -> context.getColorCompat(res) }
val switchTrackEnabled: Int = prefs.night.get()
.let { night -> if (night) R.color.switchTrackEnabledDark else R.color.switchTrackEnabledLight }
.let { res -> context.getColorCompat(res) }
val switchTrackDisabled: Int = prefs.night.get()
.let { night -> if (night) R.color.switchTrackDisabledDark else R.color.switchTrackDisabledLight }
.let { res -> context.getColorCompat(res) }
thumbTintList = ColorStateList(states, intArrayOf(switchThumbDisabled, themeColor, switchThumbEnabled))
trackTintList = ColorStateList(states, intArrayOf(switchTrackDisabled, themeColor.withAlpha(0x4D), switchTrackEnabled))
trackTintList = ColorStateList(states, intArrayOf(
context.resolveThemeColor(R.attr.switchTrackDisabled),
colors.theme().theme.withAlpha(0x4D),
context.resolveThemeColor(R.attr.switchTrackEnabled)))
}
}
}
@@ -123,10 +123,9 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
return true
}
override fun getActivityThemeRes(night: Boolean, black: Boolean) = when {
night && black -> R.style.AppThemeBlackDialog
night && !black -> R.style.AppThemeDarkDialog
else -> R.style.AppThemeLightDialog
override fun getActivityThemeRes(black: Boolean) = when {
black -> R.style.AppThemeDialog_Black
else -> R.style.AppThemeDialog
}
}
@@ -21,6 +21,7 @@ package com.moez.QKSMS.feature.settings
import android.animation.ObjectAnimator
import android.app.TimePickerDialog
import android.content.Context
import android.os.Build
import android.text.format.DateFormat
import android.view.View
import androidx.core.view.isVisible
@@ -30,6 +31,7 @@ import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.view.longClicks
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
import com.moez.QKSMS.common.MenuItem
import com.moez.QKSMS.common.QkChangeHandler
import com.moez.QKSMS.common.QkDialog
import com.moez.QKSMS.common.base.QkController
@@ -91,7 +93,12 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
override fun onViewCreated() {
preferences.postDelayed({ preferences?.animateLayoutChanges = true }, 100)
nightModeDialog.adapter.setData(R.array.night_modes)
when (Build.VERSION.SDK_INT >= 29) {
true -> nightModeDialog.adapter.setData(R.array.night_modes)
false -> nightModeDialog.adapter.data = context.resources.getStringArray(R.array.night_modes)
.mapIndexed { index, title -> MenuItem(title, index) }
.drop(1)
}
textSizeDialog.adapter.setData(R.array.text_sizes)
sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
@@ -49,7 +49,9 @@ class SettingsPresenter @Inject constructor(
private val nightModeManager: NightModeManager,
private val prefs: Preferences,
private val syncMessages: SyncMessages
) : QkPresenter<SettingsView, SettingsState>(SettingsState()) {
) : QkPresenter<SettingsView, SettingsState>(SettingsState(
nightModeId = prefs.nightMode.get()
)) {
init {
disposables += colors.themeObservable()