From 0cb387acb30cb847c411e640129c6b1b0db17239 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 16 Dec 2017 01:42:59 -0500 Subject: [PATCH] Add ability to archive/unarchive from long press menu --- .../moez/QKSMS/presentation/main/MainActivity.kt | 12 ++++++++---- .../com/moez/QKSMS/presentation/main/MainView.kt | 6 ++++-- .../moez/QKSMS/presentation/main/MainViewModel.kt | 13 ++++++++++--- qksms/src/main/res/layout/main_activity.xml | 3 +-- qksms/src/main/res/values/strings.xml | 2 ++ 5 files changed, 25 insertions(+), 11 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 6b81e5fa..6dcbba00 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 @@ -54,14 +54,16 @@ class MainActivity : QkActivity(), MainView { blocked.clicks().map { DrawerItem.BLOCKED }, settings.clicks().map { DrawerItem.SETTINGS })) } + override val archiveConversationIntent: Subject = PublishSubject.create() + override val unarchiveConversationIntent: Subject = PublishSubject.create() override val deleteConversationIntent: Subject = PublishSubject.create() - override val archiveConversationIntent: Observable by lazy { itemTouchCallback.swipes } - override val unarchiveConversationIntent: Subject = PublishSubject.create() + override val swipeConversationIntent: Observable by lazy { itemTouchCallback.swipes } + override val undoSwipeConversationIntent: Subject = PublishSubject.create() private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } private val archiveSnackbar by lazy { Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE).apply { - setAction(R.string.button_undo, { unarchiveConversationIntent.onNext(Unit) }) + setAction(R.string.button_undo, { undoSwipeConversationIntent.onNext(Unit) }) } } @@ -125,7 +127,9 @@ class MainActivity : QkActivity(), MainView { AlertDialog.Builder(this) .setItems(R.array.conversation_options, { _, row -> when (row) { - 0 -> deleteConversationIntent.onNext(threadId) + 0 -> archiveConversationIntent.onNext(threadId) + 1 -> unarchiveConversationIntent.onNext(threadId) + 2 -> deleteConversationIntent.onNext(threadId) } }) .show() 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 eba1b809..feca10a7 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 @@ -10,9 +10,11 @@ interface MainView : QkView { val composeIntent: Observable val drawerOpenIntent: Observable val drawerItemIntent: Observable + val archiveConversationIntent: Subject + val unarchiveConversationIntent: Subject val deleteConversationIntent: Subject - val archiveConversationIntent: Observable - val unarchiveConversationIntent: Subject + val swipeConversationIntent: Observable + val undoSwipeConversationIntent: Subject } 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 6cf8798c..ae3b4a23 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 @@ -34,8 +34,9 @@ class MainViewModel : QkViewModel(MainState()) { appComponent.inject(this) disposables += markAllSeen - disposables += deleteConversation disposables += markArchived + disposables += markUnarchived + disposables += deleteConversation disposables += partialSync newState { it.copy(page = Inbox(messageRepo.getConversations())) } @@ -83,10 +84,16 @@ class MainViewModel : QkViewModel(MainState()) { } .subscribe() + intents += view.archiveConversationIntent + .subscribe { threadId -> markArchived.execute(threadId) } + + intents += view.unarchiveConversationIntent + .subscribe { threadId -> markUnarchived.execute(threadId) } + intents += view.deleteConversationIntent .subscribe { threadId -> deleteConversation.execute(threadId) } - val archivedConversation = view.archiveConversationIntent + val archivedConversation = view.swipeConversationIntent .withLatestFrom(conversations.toObservable(), { position, conversations -> conversations[position] }) .map { pair -> pair.conversation } .map { conversation -> conversation.id } @@ -111,7 +118,7 @@ class MainViewModel : QkViewModel(MainState()) { }) .subscribe() - intents += view.unarchiveConversationIntent + intents += view.undoSwipeConversationIntent .withLatestFrom(archivedConversation, { _, threadId -> threadId }) .subscribe { threadId -> markUnarchived.execute(threadId) } } diff --git a/qksms/src/main/res/layout/main_activity.xml b/qksms/src/main/res/layout/main_activity.xml index f1da594f..abf33040 100644 --- a/qksms/src/main/res/layout/main_activity.xml +++ b/qksms/src/main/res/layout/main_activity.xml @@ -4,8 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:animateLayoutChanges="true"> + android:layout_height="match_parent"> Moved to inbox + Archive + Unarchive Delete