forked from upstream-mirrors/quik
Show preview of theme in settings
This commit is contained in:
@@ -32,6 +32,7 @@ import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.MenuItemAdapter
|
||||
import common.base.QkThemedActivity
|
||||
import common.util.extensions.dpToPx
|
||||
import common.util.extensions.setBackgroundTint
|
||||
import common.util.extensions.setVisible
|
||||
import common.widget.PreferenceView
|
||||
import injection.appComponent
|
||||
@@ -39,6 +40,7 @@ import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.settings_activity.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
import kotlinx.android.synthetic.main.settings_theme_widget.*
|
||||
import util.Preferences
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -109,6 +111,7 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
|
||||
else -> R.string.settings_default_sms_summary_false
|
||||
})
|
||||
|
||||
themePreview.setBackgroundTint(state.theme)
|
||||
night.summary = state.nightModeSummary
|
||||
nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
|
||||
nightStart.summary = state.nightStart
|
||||
|
||||
@@ -25,6 +25,7 @@ data class SettingsState(
|
||||
val syncing: Boolean = false,
|
||||
|
||||
val isDefaultSmsApp: Boolean = false,
|
||||
val theme: Int = 0,
|
||||
val nightModeSummary: String = "",
|
||||
val nightModeId: Int = Preferences.NIGHT_MODE_OFF,
|
||||
val nightStart: String = "",
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import common.util.BillingManager
|
||||
import common.util.Colors
|
||||
import common.util.DateFormatter
|
||||
import common.util.NightModeManager
|
||||
import injection.appComponent
|
||||
@@ -40,6 +41,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
|
||||
@Inject lateinit var context: Context
|
||||
@Inject lateinit var billingManager: BillingManager
|
||||
@Inject lateinit var colors: Colors
|
||||
@Inject lateinit var dateFormatter: DateFormatter
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var nightModeManager: NightModeManager
|
||||
@@ -55,6 +57,9 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
newState { it.copy(isDefaultSmsApp = isDefaultSmsApp) }
|
||||
}
|
||||
|
||||
disposables += colors.theme
|
||||
.subscribe { color -> newState { it.copy(theme = color) } }
|
||||
|
||||
val nightModeLabels = context.resources.getStringArray(R.array.night_modes)
|
||||
disposables += prefs.nightMode.asObservable()
|
||||
.subscribe { nightMode ->
|
||||
|
||||
Reference in New Issue
Block a user