forked from upstream-mirrors/quik
#1064 - Show radio button for appropriate dialogs
This commit is contained in:
@@ -90,7 +90,8 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
|
||||
}
|
||||
|
||||
notifications.checkbox.isChecked = state.notificationsEnabled
|
||||
notificationPreviews.summary = state.notificationPreviewSummary
|
||||
notificationPreviews.summary = state.previewSummary
|
||||
previewModeDialog.adapter.selectedItem = state.previewId
|
||||
vibration.checkbox.isChecked = state.vibrationEnabled
|
||||
ringtone.summary = state.ringtoneName
|
||||
qkreply.checkbox.isChecked = state.qkReplyEnabled
|
||||
|
||||
@@ -19,11 +19,13 @@
|
||||
package feature.notificationprefs
|
||||
|
||||
import android.os.Build
|
||||
import util.Preferences
|
||||
|
||||
data class NotificationPrefsState(
|
||||
val conversationTitle: String = "",
|
||||
val notificationsEnabled: Boolean = true,
|
||||
val notificationPreviewSummary: String = "",
|
||||
val previewSummary: String = "",
|
||||
val previewId: Int = Preferences.NOTIFICATION_PREVIEWS_ALL,
|
||||
val vibrationEnabled: Boolean = true,
|
||||
val ringtoneName: String = "",
|
||||
val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
|
||||
|
||||
@@ -48,6 +48,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
|
||||
private val threadId = intent.extras?.getLong("threadId") ?: 0L
|
||||
|
||||
private val notifications: Preference<Boolean>
|
||||
private val previews: Preference<Int>
|
||||
private val vibration: Preference<Boolean>
|
||||
private val ringtone: Preference<String>
|
||||
|
||||
@@ -55,6 +56,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
|
||||
appComponent.inject(this)
|
||||
|
||||
notifications = prefs.notifications(threadId)
|
||||
previews = prefs.notificationPreviews(threadId)
|
||||
vibration = prefs.vibration(threadId)
|
||||
ringtone = prefs.ringtone(threadId)
|
||||
|
||||
@@ -67,9 +69,11 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
|
||||
disposables += 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]) } }
|
||||
val previewLabels = context.resources.getStringArray(R.array.notification_preview_options)
|
||||
disposables += previews.asObservable()
|
||||
.subscribe { previewId ->
|
||||
newState { it.copy(previewSummary = previewLabels[previewId], previewId = previewId) }
|
||||
}
|
||||
|
||||
disposables += vibration.asObservable()
|
||||
.subscribe { enabled -> newState { it.copy(vibrationEnabled = enabled) } }
|
||||
@@ -111,7 +115,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
|
||||
|
||||
view.previewModeSelectedIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.notificationPreviews().set(it) }
|
||||
.subscribe { previews.set(it) }
|
||||
|
||||
view.ringtoneSelectedIntent
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
Reference in New Issue
Block a user