Dynamically build conversation long press menu

This commit is contained in:
Moez Bhatti
2017-12-16 16:49:06 -05:00
parent 265d3666d5
commit 95e4a365e6
9 changed files with 149 additions and 44 deletions
@@ -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)
@@ -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<MenuItem>() {
val menuItemClicks: Subject<Int> = 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)
}
}
@@ -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<InboxItem>() {
val longClicks: Subject<Long> = PublishSubject.create<Long>()
val clicks: Subject<Long> = PublishSubject.create()
val longClicks: Subject<Long> = 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 }) }
@@ -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<MainViewModel>(), 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<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 swipeConversationIntent: Observable<Int> 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<Unit> = PublishSubject.create()
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
@@ -67,6 +70,15 @@ class MainActivity : QkActivity<MainViewModel>(), 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<MainViewModel>(), 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<MainViewModel>(), 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<MainViewModel>(), 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() {
@@ -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<List<InboxItem>>?, val showArchivedSnackbar: Boolean = false) : MainPage()
data class Inbox(
val data: Flowable<List<InboxItem>>?,
val menu: List<MenuItem> = ArrayList(),
val showArchivedSnackbar: Boolean = false) : MainPage()
data class Archived(val data: Flowable<List<InboxItem>>?) : MainPage()
data class Archived(
val data: Flowable<List<InboxItem>>?,
val menu: List<MenuItem> = 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()
data class Blocked(
val data: Any? = null) : MainPage()
@@ -10,9 +10,9 @@ 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 conversationClickIntent: Observable<Long>
val conversationLongClickIntent: Observable<Long>
val conversationMenuItemIntent: Subject<Int>
val swipeConversationIntent: Observable<Int>
val undoSwipeConversationIntent: Subject<Unit>
@@ -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<MainView, MainState>(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<MainView, MainState>(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<MainView, MainState>(MainState()) {
.subscribe()
intents += view.undoSwipeConversationIntent
.withLatestFrom(archivedConversation, { _, threadId -> threadId })
.withLatestFrom(swipedConversation, { _, threadId -> threadId })
.subscribe { threadId -> markUnarchived.execute(threadId) }
}
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ripple"
android:orientation="vertical">
<com.moez.QKSMS.presentation.common.widget.QkTextView
android:id="@+id/title"
style="@style/TextPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="12dp" />
</LinearLayout>
+2 -8
View File
@@ -10,8 +10,8 @@
<string name="title_compose">Type a name or number</string>
<string name="menu_call">Call</string>
<string name="menu_archive">Archive</string>
<string name="menu_unarchive">Unarchive</string>
<string name="menu_archive">Archive conversation</string>
<string name="menu_unarchive">Remove from archive</string>
<string name="menu_delete">Delete</string>
<string name="compose_hint">Write a message</string>
@@ -54,12 +54,6 @@
<string name="toast_archived">Archived conversation</string>
<string name="toast_unarchived">Moved to inbox</string>
<string-array name="conversation_options">
<item>Archive conversation</item>
<item>Remove from archive</item>
<item>Delete</item>
</string-array>
<string-array name="message_options">
<item>Copy text</item>
<item>Forward</item>