From 95e4a365e6dfa1d2e61b80a773a946a49c848011 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 16 Dec 2017 16:49:06 -0500 Subject: [PATCH] Dynamically build conversation long press menu --- .../com/moez/QKSMS/data/model/MenuItem.kt | 5 ++ .../presentation/common/MenuItemAdapter.kt | 33 +++++++++++ .../presentation/main/ConversationsAdapter.kt | 10 ++-- .../QKSMS/presentation/main/MainActivity.kt | 39 +++++++------ .../moez/QKSMS/presentation/main/MainState.kt | 16 ++++-- .../moez/QKSMS/presentation/main/MainView.kt | 6 +- .../QKSMS/presentation/main/MainViewModel.kt | 56 ++++++++++++++++--- qksms/src/main/res/layout/menu_list_item.xml | 18 ++++++ qksms/src/main/res/values/strings.xml | 10 +--- 9 files changed, 149 insertions(+), 44 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt create mode 100644 qksms/src/main/res/layout/menu_list_item.xml diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt new file mode 100644 index 00000000..12cfd94a --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt @@ -0,0 +1,5 @@ +package com.moez.QKSMS.data.model + +import android.support.annotation.StringRes + +data class MenuItem(@StringRes val title: Int, val actionId: Int) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt new file mode 100644 index 00000000..b0203b67 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt @@ -0,0 +1,33 @@ +package com.moez.QKSMS.presentation.common + +import android.content.Context +import android.view.View +import android.view.ViewGroup +import com.jakewharton.rxbinding2.view.clicks +import com.moez.QKSMS.R +import com.moez.QKSMS.data.model.MenuItem +import com.moez.QKSMS.presentation.common.base.QkAdapter +import com.moez.QKSMS.presentation.common.base.QkViewHolder +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.menu_list_item.view.* +import javax.inject.Inject + +class MenuItemAdapter @Inject constructor(private val context: Context): QkAdapter() { + + val menuItemClicks: Subject = PublishSubject.create() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { + return QkViewHolder(View.inflate(context, R.layout.menu_list_item, null)) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val menuItem = getItem(position) + val view = holder.itemView + + view.clicks().subscribe { menuItemClicks.onNext(menuItem.actionId) } + + view.title.setText(menuItem.title) + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index 42fd8436..56a226ba 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -4,7 +4,8 @@ import android.content.Context import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import com.jakewharton.rxbinding2.view.RxView +import com.jakewharton.rxbinding2.view.clicks +import com.jakewharton.rxbinding2.view.longClicks import com.moez.QKSMS.R import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter @@ -30,7 +31,8 @@ class ConversationsAdapter @Inject constructor( val colors: Colors ) : FlowableAdapter() { - val longClicks: Subject = PublishSubject.create() + val clicks: Subject = PublishSubject.create() + val longClicks: Subject = PublishSubject.create() private val disposables = CompositeDisposable() @@ -61,8 +63,8 @@ class ConversationsAdapter @Inject constructor( val message = getItem(position).message val view = viewHolder.itemView - RxView.clicks(view).subscribe { navigator.showConversation(message.threadId) } - RxView.longClicks(view).subscribe { longClicks.onNext(conversation.id) } + view.clicks().subscribe { clicks.onNext(conversation.id) } + view.longClicks().subscribe { longClicks.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/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index c2c80f17..25411d5f 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 @@ -23,8 +23,10 @@ import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent +import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.presentation.Navigator +import com.moez.QKSMS.presentation.common.MenuItemAdapter import com.moez.QKSMS.presentation.common.base.QkActivity import io.reactivex.Observable import io.reactivex.rxkotlin.Observables @@ -42,6 +44,7 @@ class MainActivity : QkActivity(), MainView { @Inject lateinit var navigator: Navigator @Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback + @Inject lateinit var menuItemAdapter: MenuItemAdapter override val viewModelClass = MainViewModel::class override val queryChangedIntent by lazy { toolbarSearch.textChanges() } @@ -55,10 +58,10 @@ 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 swipeConversationIntent: Observable by lazy { itemTouchCallback.swipes } + override val conversationClickIntent by lazy { conversationsAdapter.clicks } + override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } + override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks } + override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoSwipeConversationIntent: Subject = PublishSubject.create() private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } @@ -67,6 +70,15 @@ class MainActivity : QkActivity(), MainView { setAction(R.string.button_undo, { undoSwipeConversationIntent.onNext(Unit) }) } } + private val conversationMenuDialog by lazy { + val recyclerView = RecyclerView(this) + recyclerView.layoutManager = LinearLayoutManager(this) + recyclerView.adapter = menuItemAdapter + recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) + AlertDialog.Builder(this).setView(recyclerView).create().apply { + setOnDismissListener { conversationMenuItemIntent.onNext(-1) } + } + } init { appComponent.inject(this) @@ -138,18 +150,6 @@ class MainActivity : QkActivity(), MainView { onItemRangeInserted(positionStart, itemCount) } }) - - conversationsAdapter.longClicks.subscribe { threadId -> - AlertDialog.Builder(this) - .setItems(R.array.conversation_options, { _, row -> - when (row) { - 0 -> archiveConversationIntent.onNext(threadId) - 1 -> unarchiveConversationIntent.onNext(threadId) - 2 -> deleteConversationIntent.onNext(threadId) - } - }) - .show() - } } override fun onNewIntent(intent: Intent?) { @@ -165,22 +165,26 @@ class MainActivity : QkActivity(), MainView { if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(recyclerView) + menuItemAdapter.data = state.page.menu } is Archived -> { if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) + menuItemAdapter.data = state.page.menu } is Scheduled -> { recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) + menuItemAdapter.data = ArrayList() } is Blocked -> { recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) + menuItemAdapter.data = ArrayList() } } @@ -200,6 +204,9 @@ class MainActivity : QkActivity(), MainView { if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) + + if (conversationMenuDialog.isShowing && menuItemAdapter.data.isEmpty()) conversationMenuDialog.dismiss() + else if (!conversationMenuDialog.isShowing && menuItemAdapter.data.isNotEmpty()) conversationMenuDialog.show() } private fun requestPermissions() { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt index 40a1ffd5..11bcd925 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.presentation.main import com.moez.QKSMS.data.model.InboxItem +import com.moez.QKSMS.data.model.MenuItem import io.reactivex.Flowable data class MainState( @@ -10,10 +11,17 @@ data class MainState( sealed class MainPage -data class Inbox(val data: Flowable>?, val showArchivedSnackbar: Boolean = false) : MainPage() +data class Inbox( + val data: Flowable>?, + val menu: List = ArrayList(), + val showArchivedSnackbar: Boolean = false) : MainPage() -data class Archived(val data: Flowable>?) : MainPage() +data class Archived( + val data: Flowable>?, + val menu: List = ArrayList()) : MainPage() -data class Scheduled(val data: Any? = null) : MainPage() +data class Scheduled( + val data: Any? = null) : MainPage() -data class Blocked(val data: Any? = null) : MainPage() \ No newline at end of file +data class Blocked( + val data: Any? = null) : MainPage() \ No newline at end of file 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 feca10a7..26f10161 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,9 @@ interface MainView : QkView { val composeIntent: Observable val drawerOpenIntent: Observable val drawerItemIntent: Observable - val archiveConversationIntent: Subject - val unarchiveConversationIntent: Subject - val deleteConversationIntent: Subject + val conversationClickIntent: Observable + val conversationLongClickIntent: Observable + val conversationMenuItemIntent: 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 ae3b4a23..82511342 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 @@ -2,8 +2,10 @@ package com.moez.QKSMS.presentation.main import android.content.Context import android.provider.Telephony +import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.filter.ConversationFilter +import com.moez.QKSMS.data.model.MenuItem import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.* import com.moez.QKSMS.presentation.Navigator @@ -30,6 +32,10 @@ class MainViewModel : QkViewModel(MainState()) { private val conversations by lazy { messageRepo.getConversations() } + private val menuArchive = MenuItem(R.string.menu_archive, 0) + private val menuUnarchive = MenuItem(R.string.menu_unarchive, 1) + private val menuDelete = MenuItem(R.string.menu_delete, 2) + init { appComponent.inject(this) @@ -84,21 +90,53 @@ class MainViewModel : QkViewModel(MainState()) { } .subscribe() - intents += view.archiveConversationIntent - .subscribe { threadId -> markArchived.execute(threadId) } + intents += view.conversationClickIntent + .subscribe { threadId -> navigator.showConversation(threadId) } - intents += view.unarchiveConversationIntent - .subscribe { threadId -> markUnarchived.execute(threadId) } + intents += view.conversationLongClickIntent + .withLatestFrom(state, { l, mainState -> + when (mainState.page) { + is Inbox -> { + val page = mainState.page.copy(menu = listOf(menuArchive, menuDelete)) + newState { it.copy(page = page) } + } + is Archived -> { + val page = mainState.page.copy(menu = listOf(menuUnarchive, menuDelete)) + newState { it.copy(page = page) } + } + } + }) + .subscribe() - intents += view.deleteConversationIntent - .subscribe { threadId -> deleteConversation.execute(threadId) } + intents += view.conversationMenuItemIntent + .withLatestFrom(state, { actionId, mainState -> + when (mainState.page) { + is Inbox -> { + val page = mainState.page.copy(menu = ArrayList()) + newState { it.copy(page = page) } + } + is Archived -> { + val page = mainState.page.copy(menu = ArrayList()) + newState { it.copy(page = page) } + } + } + actionId + }) + .withLatestFrom(view.conversationLongClickIntent, { actionId, threadId -> + when (actionId) { + menuArchive.actionId -> markArchived.execute(threadId) + menuUnarchive.actionId -> markUnarchived.execute(threadId) + menuDelete.actionId -> deleteConversation.execute(threadId) + } + }) + .subscribe() - val archivedConversation = view.swipeConversationIntent + val swipedConversation = view.swipeConversationIntent .withLatestFrom(conversations.toObservable(), { position, conversations -> conversations[position] }) .map { pair -> pair.conversation } .map { conversation -> conversation.id } - intents += archivedConversation + intents += swipedConversation .withLatestFrom(state, { threadId, state -> markArchived.execute(threadId) { if (state.page is Inbox) { @@ -119,7 +157,7 @@ class MainViewModel : QkViewModel(MainState()) { .subscribe() intents += view.undoSwipeConversationIntent - .withLatestFrom(archivedConversation, { _, threadId -> threadId }) + .withLatestFrom(swipedConversation, { _, threadId -> threadId }) .subscribe { threadId -> markUnarchived.execute(threadId) } } diff --git a/qksms/src/main/res/layout/menu_list_item.xml b/qksms/src/main/res/layout/menu_list_item.xml new file mode 100644 index 00000000..8cc781e2 --- /dev/null +++ b/qksms/src/main/res/layout/menu_list_item.xml @@ -0,0 +1,18 @@ + + + + + + \ 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 ba525e96..955b3bb9 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -10,8 +10,8 @@ Type a name or number Call - Archive - Unarchive + Archive conversation + Remove from archive Delete Write a message @@ -54,12 +54,6 @@ Archived conversation Moved to inbox - - Archive conversation - Remove from archive - Delete - - Copy text Forward