From d568132cf34fca37e7cdffc2092e7eff7264b824 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 27 Feb 2018 21:44:34 -0500 Subject: [PATCH] Show summary with notification sound name --- .../feature/notificationprefs/NotificationPrefsActivity.kt | 1 + .../feature/notificationprefs/NotificationPrefsState.kt | 3 ++- .../notificationprefs/NotificationPrefsViewModel.kt | 7 +++++++ qksms/src/main/res/values/strings.xml | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt index cef320dd..27e8b60a 100644 --- a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt @@ -75,6 +75,7 @@ class NotificationPrefsActivity : QkThemedActivity() override fun render(state: NotificationPrefsState) { notifications.checkbox.isChecked = state.notificationsEnabled vibration.checkbox.isChecked = state.vibrationEnabled + ringtone.summary = state.ringtoneName } override fun showRingtonePicker(default: Uri) { diff --git a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt index 5505c32f..de519d2e 100644 --- a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt +++ b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt @@ -20,5 +20,6 @@ package presentation.feature.notificationprefs data class NotificationPrefsState( val notificationsEnabled: Boolean = true, - val vibrationEnabled: Boolean = true + val vibrationEnabled: Boolean = true, + val ringtoneName: String = "" ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt index fcfb8ea5..1eb9ce42 100644 --- a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -20,7 +20,9 @@ package presentation.feature.notificationprefs import android.content.Context import android.content.Intent +import android.media.RingtoneManager import android.net.Uri +import androidx.net.toUri import com.f2prateek.rx.preferences2.Preference import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope @@ -57,6 +59,11 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel newState { it.copy(vibrationEnabled = enabled) } } + + disposables += ringtone.asObservable() + .map { uri -> uri.toUri() } + .map { uri -> RingtoneManager.getRingtone(context, uri).getTitle(context) } + .subscribe { title -> newState { it.copy(ringtoneName = title) } } } override fun bindView(view: NotificationPrefsView) { diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 3e6e7ce9..0775daee 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -81,7 +81,7 @@ Convert text like :) to an emoji like 🙂 Message notifications Vibration - Ringtone + Sound Delivery confirmations Confirm that messages were sent successfully Strip accents