diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index bf12e3b8..043f48f6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -13,6 +13,7 @@ import com.moez.QKSMS.presentation.view.PreferenceView 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.* class SettingsActivity : QkActivity(), SettingsView { @@ -70,16 +71,34 @@ class SettingsActivity : QkActivity(), SettingsView { } override fun render(state: SettingsState) { - if (progressDialog.isShowing && !state.syncing) progressDialog.dismiss() - else if (!progressDialog.isShowing && state.syncing) progressDialog.show() - if (themeDialog.isShowing && !state.selectingTheme) themeDialog.dismiss() else if (!themeDialog.isShowing && state.selectingTheme) themeDialog.show() + if (progressDialog.isShowing && !state.syncing) progressDialog.dismiss() + else if (!progressDialog.isShowing && state.syncing) progressDialog.show() + defaultSms.summary = getString(when (state.isDefaultSmsApp) { true -> R.string.settings_default_sms_summary_true else -> R.string.settings_default_sms_summary_false }) + + dark.checkbox.isChecked = state.darkModeEnabled + + autoEmoji.checkbox.isChecked = state.autoEmojiEnabled + + notifications.checkbox.isChecked = state.notificationsEnabled + + vibration.checkbox.isChecked = state.vibrationEnabled + + delivery.checkbox.isChecked = state.deliveryEnabled + + split.checkbox.isChecked = state.splitSmsEnabled + + unicode.checkbox.isChecked = state.stripUnicodeEnabled + + mms.checkbox.isChecked = state.mmsEnabled + + mmsSize.summary = state.maxMmsSize } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt index d30b395a..94de7c45 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt @@ -3,5 +3,15 @@ package com.moez.QKSMS.presentation.settings data class SettingsState( val selectingTheme: Boolean = false, val syncing: Boolean = false, - val isDefaultSmsApp: Boolean = false + + val isDefaultSmsApp: Boolean = false, + val darkModeEnabled: Boolean = false, + val autoEmojiEnabled: Boolean = true, + val notificationsEnabled: Boolean = true, + val vibrationEnabled: Boolean = true, + val deliveryEnabled: Boolean = false, + val splitSmsEnabled: Boolean = false, + val stripUnicodeEnabled: Boolean = false, + val mmsEnabled: Boolean = true, + val maxMmsSize: String = "" ) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index e1696f96..af6910a8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -21,13 +21,52 @@ class SettingsViewModel : QkViewModel(SettingsState init { AppComponentManager.appComponent.inject(this) - disposables += fullSync - disposables += prefs.defaultSms .asObservable() .subscribe { isDefaultSmsApp -> newState { it.copy(isDefaultSmsApp = isDefaultSmsApp) } } + + disposables += prefs.dark.asObservable().subscribe { darkModeEnabled -> + newState { it.copy(darkModeEnabled = darkModeEnabled) } + } + + disposables += prefs.autoEmoji.asObservable().subscribe { autoEmojiEnabled -> + newState { it.copy(autoEmojiEnabled = autoEmojiEnabled) } + } + + disposables += prefs.notifications.asObservable().subscribe { notificationsEnabled -> + newState { it.copy(notificationsEnabled = notificationsEnabled) } + } + + disposables += prefs.vibration.asObservable().subscribe { vibrationEnabled -> + newState { it.copy(vibrationEnabled = vibrationEnabled) } + } + + disposables += prefs.ringtone.asObservable().subscribe { ringtone -> + } + + disposables += prefs.delivery.asObservable().subscribe { deliveryEnabled -> + newState { it.copy(deliveryEnabled = deliveryEnabled) } + } + + disposables += prefs.split.asObservable().subscribe { splitSmsEnabled -> + newState { it.copy(splitSmsEnabled = splitSmsEnabled) } + } + + disposables += prefs.unicode.asObservable().subscribe { stripUnicodeEnabled -> + newState { it.copy(stripUnicodeEnabled = stripUnicodeEnabled) } + } + + disposables += prefs.mms.asObservable().subscribe { mmsEnabled -> + newState { it.copy(mmsEnabled = mmsEnabled) } + } + + disposables += prefs.mmsSize.asObservable().subscribe { maxMmsSize -> + newState { it.copy(maxMmsSize = maxMmsSize.toString()) } + } + + disposables += fullSync } override fun bindView(view: SettingsView) { @@ -45,8 +84,28 @@ class SettingsViewModel : QkViewModel(SettingsState context.startActivity(intent) } - R.id.theme -> { - newState { it.copy(selectingTheme = true) } + R.id.theme -> newState { it.copy(selectingTheme = true) } + + R.id.dark -> prefs.dark.set(!prefs.dark.get()) + + R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get()) + + R.id.notifications -> prefs.notifications.set(!prefs.notifications.get()) + + R.id.vibration -> prefs.vibration.set(!prefs.vibration.get()) + + R.id.ringtone -> { + } + + R.id.delivery -> prefs.delivery.set(!prefs.delivery.get()) + + R.id.split -> prefs.split.set(!prefs.split.get()) + + R.id.unicode -> prefs.unicode.set(!prefs.unicode.get()) + + R.id.mms -> prefs.mms.set(!prefs.mms.get()) + + R.id.mmsSize -> { } R.id.sync -> {