When necessary, show dialog prompting user to go to external blocking manager

This commit is contained in:
moezbhatti
2019-06-21 02:40:11 -04:00
parent 25132b58d6
commit a3824825f6
21 changed files with 195 additions and 83 deletions
@@ -30,6 +30,7 @@ import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
import com.moez.QKSMS.common.util.extensions.scrapViews
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.common.widget.FieldDialog
import com.moez.QKSMS.feature.blocked.BlockingDialog
import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule
import com.moez.QKSMS.feature.themepicker.ThemePickerController
import com.moez.QKSMS.injection.appComponent
@@ -46,6 +47,7 @@ class ConversationInfoController(
) : QkController<ConversationInfoView, ConversationInfoState, ConversationInfoPresenter>(), ConversationInfoView {
@Inject override lateinit var presenter: ConversationInfoPresenter
@Inject lateinit var blockingDialog: BlockingDialog
@Inject lateinit var navigator: Navigator
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
@Inject lateinit var mediaAdapter: ConversationMediaAdapter
@@ -142,6 +144,10 @@ class ConversationInfoController(
.popChangeHandler(QkChangeHandler()))
}
override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
blockingDialog.show(activity!!, conversations, block)
}
override fun showDeleteDialog() {
AlertDialog.Builder(activity!!)
.setTitle(R.string.dialog_delete_title)
@@ -23,9 +23,7 @@ import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.extensions.asObservable
import com.moez.QKSMS.interactor.DeleteConversations
import com.moez.QKSMS.interactor.MarkArchived
import com.moez.QKSMS.interactor.MarkBlocked
import com.moez.QKSMS.interactor.MarkUnarchived
import com.moez.QKSMS.interactor.MarkUnblocked
import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.model.Conversation
import com.moez.QKSMS.repository.ConversationRepository
@@ -46,8 +44,6 @@ class ConversationInfoPresenter @Inject constructor(
private val deleteConversations: DeleteConversations,
private val markArchived: MarkArchived,
private val markUnarchived: MarkUnarchived,
private val markBlocked: MarkBlocked,
private val markUnblocked: MarkUnblocked,
private val navigator: Navigator,
private val permissionManager: PermissionManager
) : QkPresenter<ConversationInfoView, ConversationInfoState>(
@@ -71,8 +67,6 @@ class ConversationInfoPresenter @Inject constructor(
disposables += markArchived
disposables += markUnarchived
disposables += markBlocked
disposables += markUnblocked
disposables += deleteConversations
// Update the recipients whenever they change
@@ -145,12 +139,7 @@ class ConversationInfoPresenter @Inject constructor(
view.blockClicks()
.withLatestFrom(conversation) { _, conversation -> conversation }
.autoDisposable(view.scope())
.subscribe { conversation ->
when (conversation.blocked) {
true -> markUnblocked.execute(listOf(conversation.id))
false -> markBlocked.execute(listOf(conversation.id))
}
}
.subscribe { conversation -> view.showBlockingDialog(listOf(conversation.id), !conversation.blocked) }
// Show the delete confirmation dialog
view.deleteClicks()
@@ -34,6 +34,7 @@ interface ConversationInfoView : QkViewContract<ConversationInfoState> {
fun showNameDialog(name: String)
fun showThemePicker(threadId: Long)
fun showBlockingDialog(conversations: List<Long>, block: Boolean)
fun showDeleteDialog()
}