Add ability to archive/unarchive from long press menu

This commit is contained in:
Moez Bhatti
2017-12-16 01:42:59 -05:00
parent 5710f00c95
commit 0cb387acb3
5 changed files with 25 additions and 11 deletions
@@ -54,14 +54,16 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
blocked.clicks().map { DrawerItem.BLOCKED },
settings.clicks().map { DrawerItem.SETTINGS }))
}
override val archiveConversationIntent: Subject<Long> = PublishSubject.create()
override val unarchiveConversationIntent: Subject<Long> = PublishSubject.create()
override val deleteConversationIntent: Subject<Long> = PublishSubject.create()
override val archiveConversationIntent: Observable<Int> by lazy { itemTouchCallback.swipes }
override val unarchiveConversationIntent: Subject<Unit> = PublishSubject.create()
override val swipeConversationIntent: Observable<Int> by lazy { itemTouchCallback.swipes }
override val undoSwipeConversationIntent: Subject<Unit> = 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<MainViewModel>(), 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()
@@ -10,9 +10,11 @@ interface MainView : QkView<MainState> {
val composeIntent: Observable<Unit>
val drawerOpenIntent: Observable<Boolean>
val drawerItemIntent: Observable<DrawerItem>
val archiveConversationIntent: Subject<Long>
val unarchiveConversationIntent: Subject<Long>
val deleteConversationIntent: Subject<Long>
val archiveConversationIntent: Observable<Int>
val unarchiveConversationIntent: Subject<Unit>
val swipeConversationIntent: Observable<Int>
val undoSwipeConversationIntent: Subject<Unit>
}
@@ -34,8 +34,9 @@ class MainViewModel : QkViewModel<MainView, MainState>(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<MainView, MainState>(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<MainView, MainState>(MainState()) {
})
.subscribe()
intents += view.unarchiveConversationIntent
intents += view.undoSwipeConversationIntent
.withLatestFrom(archivedConversation, { _, threadId -> threadId })
.subscribe { threadId -> markUnarchived.execute(threadId) }
}