mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 03:48:52 +01:00
#1425 - Add support for system dark mode on Android Q
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user