From 59a0b393626ccd9c1d5716d9b6b08b9a2166c5ba Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 18:07:19 -0500 Subject: [PATCH] Tap conversation to show unblock dialog --- .../feature/blocked/BlockedAdapter.kt | 5 +++++ .../presentation/feature/main/MainActivity.kt | 15 +++++++++++++++ .../java/presentation/feature/main/MainView.kt | 10 ++++++---- .../presentation/feature/main/MainViewModel.kt | 12 ++++++++++++ qksms/src/main/res/values/strings.xml | 5 ++++- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt index c8990e6c..1cfcddb1 100644 --- a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -25,6 +25,7 @@ import com.moez.QKSMS.R import data.model.Contact import data.model.Conversation import data.model.PhoneNumber +import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.blocked_list_item.view.* import presentation.common.base.FlowableAdapter import presentation.common.base.QkViewHolder @@ -32,6 +33,8 @@ import javax.inject.Inject class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter() { + val unblock = PublishSubject.create() + override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false)) } @@ -40,6 +43,8 @@ class BlockedAdapter @Inject constructor(private val context: Context) : Flowabl val conversation = getItem(position) val view = holder.itemView + view.setOnClickListener { unblock.onNext(conversation.id) } + view.avatars.contacts = conversation.recipients.map { recipient -> recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) } } diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index ced5ed3b..9e176d6f 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -83,6 +83,8 @@ class MainActivity : QkThemedActivity(), MainView { override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks } override val confirmDeleteIntent: Subject = PublishSubject.create() + override val unblockIntent by lazy { blockedAdapter.unblock } + override val confirmUnblockIntent: Subject = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoSwipeConversationIntent: Subject = PublishSubject.create() @@ -204,6 +206,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = state.page.menu empty.setText(R.string.inbox_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(true) } is Archived -> { @@ -214,6 +217,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = state.page.menu empty.setText(R.string.archived_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(true) } is Scheduled -> { @@ -223,6 +227,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = ArrayList() empty.setText(R.string.scheduled_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(false) } is Blocked -> { @@ -233,6 +238,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = ArrayList() empty.setText(R.string.blocked_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(false) } } @@ -281,6 +287,15 @@ class MainActivity : QkThemedActivity(), MainView { .show() } + override fun showUnblockDialog() { + AlertDialog.Builder(this) + .setTitle(R.string.dialog_unblock_title) + .setMessage(R.string.dialog_unblock_message) + .setPositiveButton(R.string.button_unblock, { _, _ -> confirmUnblockIntent.onNext(Unit) }) + .setNegativeButton(R.string.button_cancel, null) + .show() + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.main, menu) return super.onCreateOptionsMenu(menu) diff --git a/qksms/src/main/java/presentation/feature/main/MainView.kt b/qksms/src/main/java/presentation/feature/main/MainView.kt index e6e2dba5..d52f68dd 100644 --- a/qksms/src/main/java/presentation/feature/main/MainView.kt +++ b/qksms/src/main/java/presentation/feature/main/MainView.kt @@ -19,7 +19,6 @@ package presentation.feature.main import io.reactivex.Observable -import io.reactivex.subjects.Subject import presentation.common.base.QkView interface MainView : QkView { @@ -31,13 +30,16 @@ interface MainView : QkView { val drawerItemIntent: Observable val conversationClickIntent: Observable val conversationLongClickIntent: Observable - val conversationMenuItemIntent: Subject - val confirmDeleteIntent: Subject + val conversationMenuItemIntent: Observable + val confirmDeleteIntent: Observable + val unblockIntent: Observable + val confirmUnblockIntent: Observable val swipeConversationIntent: Observable - val undoSwipeConversationIntent: Subject + val undoSwipeConversationIntent: Observable fun clearSearch() fun showDeleteDialog() + fun showUnblockDialog() } diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index a6dca004..e4e0efe5 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -52,6 +52,7 @@ class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var deleteConversation: DeleteConversation @Inject lateinit var markArchived: MarkArchived @Inject lateinit var markUnarchived: MarkUnarchived + @Inject lateinit var markUnblocked: MarkUnblocked @Inject lateinit var partialSync: PartialSync private val conversations by lazy { @@ -258,6 +259,17 @@ class MainViewModel : QkViewModel(MainState()) { .withLatestFrom(swipedConversation, { _, threadId -> threadId }) .autoDisposable(view.scope()) .subscribe { threadId -> markUnarchived.execute(threadId) } + + // Show confirm unblock conversation dialog + view.unblockIntent + .autoDisposable(view.scope()) + .subscribe { view.showUnblockDialog() } + + // Unblock conversation + view.confirmUnblockIntent + .withLatestFrom(view.unblockIntent, { _, threadId -> threadId }) + .autoDisposable(view.scope()) + .subscribe { threadId -> markUnblocked.execute(threadId)} } } \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index dafee092..194cbc1d 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -62,10 +62,12 @@ Your conversations will appear here Your archived conversations will appear here Your scheduled messages will appear here - Your blocked senders will appear here + Your blocked conversations will appear here Delete Are you sure you would like to delete this conversation? + Unblock + Would you like to unblock this conversation? Details Notifications @@ -135,6 +137,7 @@ Yes Cancel Delete + Unblock Undo More