From b14cc53d7db3c755f204fa891372d3feb417bc34 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Thu, 29 Aug 2019 22:52:36 +0200 Subject: [PATCH] Add multi-select options for blocked conversations --- .../moez/QKSMS/common/base/QkRealmAdapter.kt | 2 +- .../messages/BlockedMessagesAdapter.kt | 13 +++- .../messages/BlockedMessagesController.kt | 62 ++++++++++++++++++- .../messages/BlockedMessagesPresenter.kt | 47 ++++++++++++++ .../blocking/messages/BlockedMessagesState.kt | 3 +- .../blocking/messages/BlockedMessagesView.kt | 12 ++++ .../src/main/res/menu/blocked_messages.xml | 37 +++++++++++ 7 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 presentation/src/main/res/menu/blocked_messages.xml diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt index 7b1d8997..c6d6dbdd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt @@ -48,7 +48,7 @@ abstract class QkRealmAdapter : RealmRecyclerViewAdapter> = BehaviorSubject.create() + val selectionChanges: Subject> = BehaviorSubject.createDefault(listOf()) private var selection = listOf() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt index 61973f64..2972dbd4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt @@ -37,7 +37,16 @@ class BlockedMessagesAdapter @Inject constructor() : QkRealmAdapter view.isActivated = isSelected(conversation.id) + false -> clicks.onNext(conversation.id) + } + } + view.setOnLongClickListener { + val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true + toggleSelection(conversation.id) + view.isActivated = isSelected(conversation.id) + true } } } @@ -46,6 +55,8 @@ class BlockedMessagesAdapter @Inject constructor() : QkRealmAdapter 1 view.title.text = conversation.getTitle() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt index 11272cd9..92dfcac3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt @@ -18,21 +18,37 @@ */ package com.moez.QKSMS.feature.blocking.messages +import android.app.AlertDialog +import android.content.Context +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem import android.view.View import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkController import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.feature.blocking.BlockingDialog import com.moez.QKSMS.injection.appComponent +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.blocked_messages_controller.* +import kotlinx.android.synthetic.main.container_activity.* import javax.inject.Inject class BlockedMessagesController : QkController(), BlockedMessagesView { + override val menuReadyIntent: Subject = PublishSubject.create() + override val optionsItemIntent: Subject = PublishSubject.create() override val conversationClicks by lazy { blockedMessagesAdapter.clicks } + override val selectionChanges by lazy { blockedMessagesAdapter.selectionChanges } + override val confirmDeleteIntent: Subject> = PublishSubject.create() + override val backClicked: Subject = PublishSubject.create() @Inject lateinit var blockedMessagesAdapter: BlockedMessagesAdapter + @Inject lateinit var blockingDialog: BlockingDialog @Inject lateinit var colors: Colors + @Inject lateinit var context: Context @Inject override lateinit var presenter: BlockedMessagesPresenter init { @@ -43,7 +59,6 @@ class BlockedMessagesController : QkController 0 + themedActivity?.toolbar?.menu?.findItem(R.id.delete)?.isVisible = state.selected > 0 + + setTitle(when (state.selected) { + 0 -> context.getString(R.string.blocked_messages_title) + else -> context.getString(R.string.main_title_selected, state.selected) + }) + } + + override fun clearSelection() = blockedMessagesAdapter.clearSelection() + + override fun showBlockingDialog(conversations: List, block: Boolean) { + blockingDialog.show(activity!!, conversations, block) + } + + override fun showDeleteDialog(conversations: List) { + val count = conversations.size + AlertDialog.Builder(activity) + .setTitle(R.string.dialog_delete_title) + .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count)) + .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) } + .setNegativeButton(R.string.button_cancel, null) + .show() + } + + override fun goBack() { + router.popCurrentController() } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt index c9e43f04..059f50af 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt @@ -18,15 +18,21 @@ */ package com.moez.QKSMS.feature.blocking.messages +import com.moez.QKSMS.R +import com.moez.QKSMS.blocking.BlockingClient import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter +import com.moez.QKSMS.interactor.DeleteConversations import com.moez.QKSMS.repository.ConversationRepository import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable +import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class BlockedMessagesPresenter @Inject constructor( conversationRepo: ConversationRepository, + private val blockingClient: BlockingClient, + private val deleteConversations: DeleteConversations, private val navigator: Navigator ) : QkPresenter(BlockedMessagesState( data = conversationRepo.getBlockedConversations() @@ -35,9 +41,50 @@ class BlockedMessagesPresenter @Inject constructor( override fun bindIntents(view: BlockedMessagesView) { super.bindIntents(view) + view.menuReadyIntent + .autoDisposable(view.scope()) + .subscribe { newState { copy() } } + + view.optionsItemIntent + .withLatestFrom(view.selectionChanges) { itemId, conversations -> + when (itemId) { + R.id.block -> { + view.showBlockingDialog(conversations, false) + view.clearSelection() + } + R.id.delete -> { + view.showDeleteDialog(conversations) + } + } + + } + .autoDisposable(view.scope()) + .subscribe() + + view.confirmDeleteIntent + .autoDisposable(view.scope()) + .subscribe { conversations -> + deleteConversations.execute(conversations) + view.clearSelection() + } + view.conversationClicks .autoDisposable(view.scope()) .subscribe { threadId -> navigator.showConversation(threadId) } + + view.selectionChanges + .autoDisposable(view.scope()) + .subscribe { selection -> newState { copy(selected = selection.size) } } + + view.backClicked + .withLatestFrom(view.selectionChanges) { _, selection -> + when (selection.size) { + 0 -> view.goBack() + else -> view.clearSelection() + } + } + .autoDisposable(view.scope()) + .subscribe() } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt index 6f645b14..2fe3201b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt @@ -22,5 +22,6 @@ import com.moez.QKSMS.model.Conversation import io.realm.RealmResults data class BlockedMessagesState( - val data: RealmResults? = null + val data: RealmResults? = null, + val selected: Int = 0 ) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt index 6ddeeedf..8de0ad34 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt @@ -22,5 +22,17 @@ import com.moez.QKSMS.common.base.QkViewContract import io.reactivex.Observable interface BlockedMessagesView : QkViewContract { + + val menuReadyIntent: Observable + val optionsItemIntent: Observable val conversationClicks: Observable + val selectionChanges: Observable> + val confirmDeleteIntent: Observable> + val backClicked: Observable<*> + + fun clearSelection() + fun showBlockingDialog(conversations: List, block: Boolean) + fun showDeleteDialog(conversations: List) + fun goBack() + } diff --git a/presentation/src/main/res/menu/blocked_messages.xml b/presentation/src/main/res/menu/blocked_messages.xml new file mode 100644 index 00000000..70499d7c --- /dev/null +++ b/presentation/src/main/res/menu/blocked_messages.xml @@ -0,0 +1,37 @@ + + + + + + + + +