From 00f163d4ebe048cc98856937b4a29e8f5820826b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 27 Feb 2018 21:49:53 -0500 Subject: [PATCH] If viewing notification prefs for particular conversation, set title to conversation name --- .../presentation/feature/gallery/GalleryViewModel.kt | 2 +- .../notificationprefs/NotificationPrefsActivity.kt | 4 ++++ .../notificationprefs/NotificationPrefsState.kt | 1 + .../notificationprefs/NotificationPrefsViewModel.kt | 11 +++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt index e9d7c174..4507572a 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryViewModel.kt @@ -49,7 +49,7 @@ class GalleryViewModel(intent: Intent) : QkViewModel( disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getMessageForPart(partId) } .mapNotNull { message -> messageRepo.getConversation(message.threadId) } - .subscribe { conversation -> newState { it.copy(title = conversation.getTitle()) } } + .subscribe { conversation -> newState { it.copy(title = conversation.getTitle()) } } } override fun bindView(view: GalleryView) { diff --git a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt index 27e8b60a..2e413676 100644 --- a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt @@ -73,6 +73,10 @@ class NotificationPrefsActivity : QkThemedActivity() } override fun render(state: NotificationPrefsState) { + if (state.conversationTitle.isNotEmpty()) { + title = state.conversationTitle + } + notifications.checkbox.isChecked = state.notificationsEnabled vibration.checkbox.isChecked = state.vibrationEnabled ringtone.summary = state.ringtoneName diff --git a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt index de519d2e..679aa6bd 100644 --- a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt +++ b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt @@ -19,6 +19,7 @@ package presentation.feature.notificationprefs data class NotificationPrefsState( + val conversationTitle: String = "", val notificationsEnabled: Boolean = true, val vibrationEnabled: Boolean = true, val ringtoneName: String = "" diff --git a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt index 1eb9ce42..a706cfd1 100644 --- a/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -29,7 +29,11 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.Preferences +import common.util.extensions.mapNotNull +import data.repository.MessageRepository +import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign +import io.reactivex.schedulers.Schedulers import presentation.common.Navigator import presentation.common.base.QkViewModel import timber.log.Timber @@ -38,6 +42,7 @@ import javax.inject.Inject class NotificationPrefsViewModel(intent: Intent) : QkViewModel(NotificationPrefsState()) { @Inject lateinit var context: Context + @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var navigator: Navigator @Inject lateinit var prefs: Preferences @@ -54,6 +59,12 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel messageRepo.getConversation(threadId) } + .map { conversation -> conversation.getTitle() } + .subscribeOn(Schedulers.io()) + .subscribe { title -> newState { it.copy(conversationTitle = title) } } + disposables += notifications.asObservable() .subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }