Delete conversation from long-press

This commit is contained in:
Moez Bhatti
2017-12-05 01:25:02 -05:00
parent e9301ced5f
commit d856e141c1
6 changed files with 39 additions and 23 deletions
@@ -24,7 +24,6 @@ interface AppComponent {
fun inject(activity: ComposeActivity)
fun inject(activity: SettingsActivity)
fun inject(adapter: ConversationsAdapter)
fun inject(adapter: MessagesAdapter)
fun inject(receiver: DefaultSmsChangedReceiver)
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.data.model.ConversationMessagePair
@@ -16,23 +15,23 @@ import com.moez.QKSMS.presentation.base.QkAdapter
import com.moez.QKSMS.presentation.base.QkViewHolder
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.conversation_list_item.view.*
import javax.inject.Inject
class ConversationsAdapter : QkAdapter<ConversationMessagePair>() {
class ConversationsAdapter @Inject constructor(
val context: Context,
val navigator: Navigator,
val messageRepo: MessageRepository,
val dateFormatter: DateFormatter,
val colors: Colors
) : QkAdapter<ConversationMessagePair>() {
@Inject lateinit var context: Context
@Inject lateinit var navigator: Navigator
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var colors: Colors
val longClicks: Subject<Long> = PublishSubject.create<Long>()
private val disposables = CompositeDisposable()
init {
appComponent.inject(this)
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
val layoutRes = when (viewType) {
0 -> R.layout.conversation_list_item
@@ -61,6 +60,7 @@ class ConversationsAdapter : QkAdapter<ConversationMessagePair>() {
val view = viewHolder.itemView
RxView.clicks(view).subscribe { navigator.showConversation(message.threadId) }
RxView.longClicks(view).subscribe { longClicks.onNext(conversation.id) }
view.avatars.contacts = conversation.contacts
view.title.text = conversation.getTitle()
@@ -1,6 +1,7 @@
package com.moez.QKSMS.presentation.main
import android.Manifest
import android.app.AlertDialog
import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.drawable.StateListDrawable
@@ -19,7 +20,6 @@ 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.setBackgroundTint
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkActivity
import io.reactivex.rxkotlin.plusAssign
@@ -34,6 +34,7 @@ import javax.inject.Inject
class MainActivity : QkActivity<MainViewModel>(), MainView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var conversationsAdapter: ConversationsAdapter
@Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
override val viewModelClass = MainViewModel::class
@@ -44,7 +45,7 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
override val scheduledIntent by lazy { scheduled.clicks() }
override val blockedIntent by lazy { blocked.clicks() }
override val settingsIntent by lazy { settings.clicks() }
override val deleteConversationIntent: Subject<Conversation> = PublishSubject.create()
override val deleteConversationIntent: Subject<Long> = PublishSubject.create()
override val archiveConversationIntent by lazy { itemTouchCallback.swipes }
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
@@ -90,6 +91,16 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
archived.background = rowBackground()
scheduled.background = rowBackground()
blocked.background = rowBackground()
conversationsAdapter.longClicks.subscribe { threadId ->
AlertDialog.Builder(this)
.setItems(R.array.conversation_options, { _, row ->
when (row) {
0 -> deleteConversationIntent.onNext(threadId)
}
})
.show()
}
}
override fun onNewIntent(intent: Intent?) {
@@ -102,16 +113,14 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
override fun render(state: MainState) {
when (state.page) {
MainPage.INBOX -> {
if (recyclerView.adapter !is ConversationsAdapter) recyclerView.adapter = ConversationsAdapter()
val adapter = recyclerView.adapter as ConversationsAdapter
if (adapter.data != state.conversations) adapter.data = state.conversations
if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter
if (conversationsAdapter.data != state.conversations) conversationsAdapter.data = state.conversations
itemTouchHelper.attachToRecyclerView(recyclerView)
}
MainPage.ARCHIVED -> {
if (recyclerView.adapter !is ConversationsAdapter) recyclerView.adapter = ConversationsAdapter()
val adapter = recyclerView.adapter as ConversationsAdapter
if (adapter.data != state.archivedConversations) adapter.data = state.archivedConversations
if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter
if (conversationsAdapter.data != state.archivedConversations) conversationsAdapter.data = state.archivedConversations
itemTouchHelper.attachToRecyclerView(null)
}
@@ -1,6 +1,5 @@
package com.moez.QKSMS.presentation.main
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.presentation.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
@@ -14,7 +13,7 @@ interface MainView : QkView<MainState> {
val scheduledIntent: Observable<Unit>
val blockedIntent: Observable<Unit>
val settingsIntent: Observable<Unit>
val deleteConversationIntent: Subject<Conversation>
val deleteConversationIntent: Subject<Long>
val archiveConversationIntent: Subject<Int>
}
@@ -4,6 +4,7 @@ import android.content.Context
import android.provider.Telephony
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.domain.interactor.DeleteConversation
import com.moez.QKSMS.domain.interactor.MarkAllSeen
import com.moez.QKSMS.domain.interactor.MarkArchived
import com.moez.QKSMS.domain.interactor.PartialSync
@@ -19,6 +20,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState(page = MainPage
@Inject lateinit var navigator: Navigator
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var markAllSeen: MarkAllSeen
@Inject lateinit var deleteConversation: DeleteConversation
@Inject lateinit var markArchived: MarkArchived
@Inject lateinit var partialSync: PartialSync
@@ -75,10 +77,13 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState(page = MainPage
newState { it.copy(drawerOpen = false) }
}
intents += view.deleteConversationIntent
.subscribe { threadId -> deleteConversation.execute(threadId) }
intents += view.archiveConversationIntent
.withLatestFrom(state, { position, state -> state.conversations[position] })
.map { pair -> pair.conversation.id }
.subscribe { threadId -> markArchived.execute(threadId)}
.subscribe { threadId -> markArchived.execute(threadId) }
}
}
+4
View File
@@ -48,6 +48,10 @@
<string name="toast_archived">Archived</string>
<string name="toast_unarchived">Moved to inbox</string>
<string-array name="conversation_options">
<item>Delete</item>
</string-array>
<string-array name="message_options">
<item>Copy text</item>
<item>Forward</item>