#1064 - Show radio button for appropriate dialogs

This commit is contained in:
Moez Bhatti
2018-04-19 03:05:02 -04:00
parent 13bcf27b51
commit 77bfab19f2
11 changed files with 70 additions and 21 deletions
@@ -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())
@@ -108,6 +108,7 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
themePreview.setBackgroundTint(state.theme)
night.summary = state.nightModeSummary
nightModeDialog.adapter.selectedItem = state.nightModeId
nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
nightStart.summary = state.nightStart
nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
@@ -120,6 +121,7 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
delivery.checkbox.isChecked = state.deliveryEnabled
textSize.summary = state.textSizeSummary
textSizeDialog.adapter.selectedItem = state.textSizeId
systemFont.checkbox.isChecked = state.systemFontEnabled
unicode.checkbox.isChecked = state.stripUnicodeEnabled
@@ -33,6 +33,7 @@ data class SettingsState(
val notificationsEnabled: Boolean = true,
val deliveryEnabled: Boolean = false,
val textSizeSummary: String = "",
val textSizeId: Int = Preferences.TEXT_SIZE_NORMAL,
val systemFontEnabled: Boolean = false,
val splitSmsEnabled: Boolean = false,
val stripUnicodeEnabled: Boolean = false,
@@ -86,7 +86,9 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
val textSizeLabels = context.resources.getStringArray(R.array.text_sizes)
disposables += prefs.textSize.asObservable()
.subscribe { textSize -> newState { it.copy(textSizeSummary = textSizeLabels[textSize]) } }
.subscribe { textSize ->
newState { it.copy(textSizeSummary = textSizeLabels[textSize], textSizeId = textSize) }
}
disposables += prefs.systemFont.asObservable()
.subscribe { enabled -> newState { it.copy(systemFontEnabled = enabled) } }