From 77bfab19f2073acbc4e9a90f6e3f1d62beb9ba40 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 19 Apr 2018 03:05:02 -0400 Subject: [PATCH] #1064 - Show radio button for appropriate dialogs --- .../src/main/java/common/MenuItemAdapter.kt | 17 ++++++++++---- .../NotificationPrefsActivity.kt | 3 ++- .../NotificationPrefsState.kt | 4 +++- .../NotificationPrefsViewModel.kt | 12 ++++++---- .../java/feature/settings/SettingsActivity.kt | 2 ++ .../java/feature/settings/SettingsState.kt | 1 + .../feature/settings/SettingsViewModel.kt | 4 +++- .../ic_radio_button_checked_black_24dp.xml | 9 ++++++++ .../ic_radio_button_unchecked_black_24dp.xml | 9 ++++++++ .../src/main/res/drawable/radio_button.xml | 8 +++++++ .../src/main/res/layout/menu_list_item.xml | 22 ++++++++++--------- 11 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/radio_button.xml diff --git a/presentation/src/main/java/common/MenuItemAdapter.kt b/presentation/src/main/java/common/MenuItemAdapter.kt index 306afc95..800b1bdf 100644 --- a/presentation/src/main/java/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/common/MenuItemAdapter.kt @@ -19,6 +19,7 @@ package common import android.content.Context +import android.content.res.ColorStateList import android.support.annotation.ArrayRes import android.support.v7.widget.RecyclerView import android.view.LayoutInflater @@ -28,9 +29,9 @@ import com.moez.QKSMS.R import common.base.QkAdapter import common.base.QkViewHolder import common.util.Colors -import common.util.extensions.setTint import common.util.extensions.setVisible import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -66,8 +67,15 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val view = LayoutInflater.from(context).inflate(R.layout.menu_list_item, parent, false) - disposables += colors.theme - .subscribe { view.check.setTint(it) } + val states = arrayOf( + intArrayOf(android.R.attr.state_selected), + intArrayOf(-android.R.attr.state_selected)) + + disposables += Observables + .combineLatest(colors.theme, colors.textTertiary, { theme, textSecondary -> + ColorStateList(states, intArrayOf(theme, textSecondary)) + }) + .subscribe { view.check.imageTintList = it } return QkViewHolder(view) } @@ -79,7 +87,8 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private view.clicks().subscribe { menuItemClicks.onNext(menuItem.actionId) } view.title.text = menuItem.title - view.check.setVisible(menuItem.actionId == selectedItem) + view.check.isSelected = (menuItem.actionId == selectedItem) + view.check.setVisible(selectedItem != null) } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index f870fa99..7b4eda8a 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -90,7 +90,8 @@ class NotificationPrefsActivity : QkThemedActivity() } 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 diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt index 0cfdb20f..2a631910 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt @@ -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, diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt index aefae71f..f40a617f 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -48,6 +48,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel + private val previews: Preference private val vibration: Preference private val ringtone: Preference @@ -55,6 +56,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel 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(), 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(), 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 diff --git a/presentation/src/main/java/feature/settings/SettingsState.kt b/presentation/src/main/java/feature/settings/SettingsState.kt index f724ad02..41f49a67 100644 --- a/presentation/src/main/java/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/feature/settings/SettingsState.kt @@ -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, diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index 61455876..f12de105 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -86,7 +86,9 @@ class SettingsViewModel : QkViewModel(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) } } diff --git a/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml b/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml new file mode 100644 index 00000000..a5025aea --- /dev/null +++ b/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml new file mode 100644 index 00000000..f61549b9 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/radio_button.xml b/presentation/src/main/res/drawable/radio_button.xml new file mode 100644 index 00000000..5cb3fd2c --- /dev/null +++ b/presentation/src/main/res/drawable/radio_button.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/menu_list_item.xml b/presentation/src/main/res/layout/menu_list_item.xml index 4111da45..a21c084d 100644 --- a/presentation/src/main/res/layout/menu_list_item.xml +++ b/presentation/src/main/res/layout/menu_list_item.xml @@ -1,5 +1,4 @@ - - + + - - + android:paddingTop="12dp" + tools:text="Testing" /> \ No newline at end of file