forked from upstream-mirrors/quik
Move all notification related prefs to separate activity for all API versions
This commit is contained in:
@@ -81,19 +81,9 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
disposables += prefs.notifications().asObservable()
|
||||
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
|
||||
|
||||
val notificationPreviewLabels = context.resources.getStringArray(R.array.notification_preview_options)
|
||||
disposables += prefs.notificationPreviews().asObservable()
|
||||
.subscribe { nightMode -> newState { it.copy(notificationPreviewSummary = notificationPreviewLabels[nightMode]) } }
|
||||
|
||||
disposables += prefs.delivery.asObservable()
|
||||
.subscribe { enabled -> newState { it.copy(deliveryEnabled = enabled) } }
|
||||
|
||||
disposables += prefs.qkreply.asObservable()
|
||||
.subscribe { enabled -> newState { it.copy(qkReplyEnabled = enabled) } }
|
||||
|
||||
disposables += prefs.qkreplyTapDismiss.asObservable()
|
||||
.subscribe { enabled -> newState { it.copy(qkReplyTapDismiss = enabled) } }
|
||||
|
||||
val textSizeLabels = context.resources.getStringArray(R.array.text_sizes)
|
||||
disposables += prefs.textSize.asObservable()
|
||||
.subscribe { textSize -> newState { it.copy(textSizeSummary = textSizeLabels[textSize]) } }
|
||||
@@ -146,16 +136,10 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
|
||||
R.id.notifications -> navigator.showNotificationSettings()
|
||||
|
||||
R.id.notificationPreviews -> view.showNotificationPreviewModeDialog()
|
||||
|
||||
R.id.blocked -> navigator.showBlockedConversations()
|
||||
|
||||
R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
|
||||
|
||||
R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
|
||||
|
||||
R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
|
||||
|
||||
R.id.textSize -> view.showTextSizePicker()
|
||||
|
||||
R.id.systemFont -> prefs.systemFont.set(!prefs.systemFont.get())
|
||||
@@ -206,10 +190,6 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.textSize.set(it) }
|
||||
|
||||
view.notificationPreviewModeSelectedIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.notificationPreviews().set(it) }
|
||||
|
||||
view.mmsSizeSelectedIntent
|
||||
.doOnNext { view.dismissMmsSizePicker() }
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
Reference in New Issue
Block a user