From 949a59d9d4b0ed752c94107fc0ac6024af7b9792 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 15 Dec 2017 18:30:38 -0500 Subject: [PATCH] Simplify intent for drawer item clicks --- .../QKSMS/presentation/main/MainActivity.kt | 13 +++--- .../moez/QKSMS/presentation/main/MainView.kt | 10 ++--- .../QKSMS/presentation/main/MainViewModel.kt | 45 ++++++++----------- qksms/src/main/res/values/strings.xml | 3 ++ 4 files changed, 33 insertions(+), 38 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 82b41d43..0eb1d203 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -45,11 +45,14 @@ class MainActivity : QkActivity(), MainView { override val queryChangedIntent by lazy { toolbarSearch.textChanges() } override val composeIntent by lazy { compose.clicks() } override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } - override val inboxIntent by lazy { inbox.clicks() } - override val archivedIntent by lazy { archived.clicks() } - override val scheduledIntent by lazy { scheduled.clicks() } - override val blockedIntent by lazy { blocked.clicks() } - override val settingsIntent by lazy { settings.clicks() } + override val drawerItemIntent: Observable by lazy { + Observable.merge(listOf( + inbox.clicks().map { DrawerItem.INBOX }, + archived.clicks().map { DrawerItem.ARCHIVED }, + scheduled.clicks().map { DrawerItem.SCHEDULED }, + blocked.clicks().map { DrawerItem.BLOCKED }, + settings.clicks().map { DrawerItem.SETTINGS })) + } override val deleteConversationIntent: Subject = PublishSubject.create() override val archiveConversationIntent: Observable by lazy { itemTouchCallback.swipes diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index dcb429df..700e115f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -9,12 +9,10 @@ interface MainView : QkView { val queryChangedIntent: Observable val composeIntent: Observable val drawerOpenIntent: Observable - val inboxIntent: Observable - val archivedIntent: Observable - val scheduledIntent: Observable - val blockedIntent: Observable - val settingsIntent: Observable + val drawerItemIntent: Observable val deleteConversationIntent: Subject val archiveConversationIntent: Observable -} \ No newline at end of file +} + +enum class DrawerItem { INBOX, ARCHIVED, SCHEDULED, BLOCKED, SETTINGS } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index 792f300b..b8baac19 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -63,35 +63,26 @@ class MainViewModel : QkViewModel(MainState()) { newState { it.copy(page = Inbox(filteredConversations)) } } - intents += view.composeIntent.subscribe { - navigator.showCompose() - newState { it.copy(drawerOpen = false) } - } + intents += view.composeIntent + .subscribe { navigator.showCompose() } - intents += view.drawerOpenIntent.filter { it }.subscribe { - newState { it.copy(drawerOpen = true) } - } + intents += view.drawerOpenIntent + .filter { it } + .subscribe { newState { it.copy(drawerOpen = true) } } - intents += view.inboxIntent.subscribe { - newState { it.copy(page = Inbox(conversations), drawerOpen = false) } - } - - intents += view.archivedIntent.subscribe { - newState { it.copy(page = Archived(messageRepo.getConversations(true)), drawerOpen = false) } - } - - intents += view.scheduledIntent.subscribe { - newState { it.copy(page = Scheduled(), drawerOpen = false) } - } - - intents += view.blockedIntent.subscribe { - newState { it.copy(page = Blocked(), drawerOpen = false) } - } - - intents += view.settingsIntent.subscribe { - navigator.showSettings() - newState { it.copy(drawerOpen = false) } - } + intents += view.drawerItemIntent + .doOnNext { newState { it.copy(drawerOpen = false) } } + .doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() } + .distinctUntilChanged() + .doOnNext { + when (it) { + DrawerItem.INBOX -> newState { it.copy(page = Inbox(conversations)) } + DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(messageRepo.getConversations(true))) } + DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) } + DrawerItem.BLOCKED -> newState { it.copy(page = Blocked()) } + } + } + .subscribe() intents += view.deleteConversationIntent .subscribe { threadId -> deleteConversation.execute(threadId) } diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 3233d1d4..9bd32543 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -2,6 +2,9 @@ QKSMS + Archived + Scheduled + Blocked Settings Search inbox… Type a name or number