mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-21 21:28:52 +01:00
#42 - Multi selection for messages
This commit is contained in:
@@ -612,14 +612,19 @@ class MessageRepositoryImpl @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun deleteMessage(messageId: Long) {
|
override fun deleteMessages(vararg messageIds: Long) {
|
||||||
Realm.getDefaultInstance().use { realm ->
|
Realm.getDefaultInstance().use { realm ->
|
||||||
realm.refresh()
|
realm.refresh()
|
||||||
realm.where(Message::class.java).equalTo("id", messageId).findFirst()?.let { message ->
|
|
||||||
val uri = message.getUri()
|
val messages = realm.where(Message::class.java)
|
||||||
realm.executeTransaction { message.deleteFromRealm() }
|
.anyOf("id", messageIds)
|
||||||
context.contentResolver.delete(uri, null, null)
|
.findAll()
|
||||||
}
|
|
||||||
|
val uris = messages.map { it.getUri() }
|
||||||
|
|
||||||
|
realm.executeTransaction { messages.deleteAllFromRealm() }
|
||||||
|
|
||||||
|
uris.forEach { uri -> context.contentResolver.delete(uri, null, null) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class CancelDelayedMessage @Inject constructor(private val messageRepo: MessageR
|
|||||||
override fun buildObservable(params: Long): Flowable<*> {
|
override fun buildObservable(params: Long): Flowable<*> {
|
||||||
return Flowable.just(params)
|
return Flowable.just(params)
|
||||||
.doOnNext { id -> messageRepo.cancelDelayedSms(id) }
|
.doOnNext { id -> messageRepo.cancelDelayedSms(id) }
|
||||||
.doOnNext { id -> messageRepo.deleteMessage(id) }
|
.doOnNext { id -> messageRepo.deleteMessages(id) }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+8
-10
@@ -22,19 +22,17 @@ import io.reactivex.Flowable
|
|||||||
import repository.MessageRepository
|
import repository.MessageRepository
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class DeleteMessage @Inject constructor(
|
class DeleteMessages @Inject constructor(
|
||||||
private val messageRepo: MessageRepository,
|
private val messageRepo: MessageRepository,
|
||||||
private val updateBadge: UpdateBadge
|
private val updateBadge: UpdateBadge
|
||||||
) : Interactor<Long>() {
|
) : Interactor<DeleteMessages.Params>() {
|
||||||
|
|
||||||
override fun buildObservable(params: Long): Flowable<*> {
|
data class Params(val messageIds: List<Long>, val threadId: Long? = null)
|
||||||
return Flowable.just(params)
|
|
||||||
.doOnNext { messageId ->
|
override fun buildObservable(params: Params): Flowable<*> {
|
||||||
val threadId = messageRepo.getMessage(messageId)?.threadId
|
return Flowable.just(params.messageIds.toLongArray())
|
||||||
messageRepo.deleteMessage(messageId)
|
.doOnNext { messageIds -> messageRepo.deleteMessages(*messageIds) } // Delete the messages
|
||||||
threadId?.let { messageRepo.updateConversations(it) }
|
.doOnNext { params.threadId?.let { messageRepo.updateConversations(it) } } // Update the conversation
|
||||||
}
|
|
||||||
.doOnNext { messageRepo.updateConversations(params) } // Update the conversation
|
|
||||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ class ReceiveMms @Inject constructor(
|
|||||||
// turns out that it should be blocked, then delete it
|
// turns out that it should be blocked, then delete it
|
||||||
// TODO Don't store blocked messages in the first place
|
// TODO Don't store blocked messages in the first place
|
||||||
!externalBlockingManager.shouldBlock(message.address).blockingGet().also { blocked ->
|
!externalBlockingManager.shouldBlock(message.address).blockingGet().also { blocked ->
|
||||||
if (blocked) messageRepo.deleteMessage(message.id)
|
if (blocked) messageRepo.deleteMessages(message.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation
|
.doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ interface MessageRepository {
|
|||||||
|
|
||||||
fun markDeliveryFailed(id: Long, resultCode: Int)
|
fun markDeliveryFailed(id: Long, resultCode: Int)
|
||||||
|
|
||||||
fun deleteMessage(messageId: Long)
|
fun deleteMessages(vararg messageIds: Long)
|
||||||
|
|
||||||
fun deleteConversations(vararg threadIds: Long)
|
fun deleteConversations(vararg threadIds: Long)
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package common.base
|
|||||||
import android.support.v7.widget.RecyclerView
|
import android.support.v7.widget.RecyclerView
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import common.util.extensions.setVisible
|
import common.util.extensions.setVisible
|
||||||
|
import io.reactivex.subjects.BehaviorSubject
|
||||||
|
import io.reactivex.subjects.Subject
|
||||||
import io.realm.OrderedRealmCollection
|
import io.realm.OrderedRealmCollection
|
||||||
import io.realm.RealmList
|
import io.realm.RealmList
|
||||||
import io.realm.RealmModel
|
import io.realm.RealmModel
|
||||||
@@ -21,6 +23,38 @@ abstract class QkRealmAdapter<T : RealmModel> : RealmRecyclerViewAdapter<T, QkVi
|
|||||||
emptyView?.setVisible(data.isLoaded && data.isEmpty())
|
emptyView?.setVisible(data.isLoaded && data.isEmpty())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val selectionChanges: Subject<List<Long>> = BehaviorSubject.create()
|
||||||
|
|
||||||
|
private val selection = mutableListOf<Long>()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggles the selected state for a particular view
|
||||||
|
*
|
||||||
|
* If we are currently in selection mode (we have an active selection), then the state will
|
||||||
|
* toggle. If we are not in selection mode, then we will only toggle if [force]
|
||||||
|
*/
|
||||||
|
protected fun toggleSelection(id: Long, force: Boolean = true): Boolean {
|
||||||
|
if (!force && selection.isEmpty()) return false
|
||||||
|
|
||||||
|
when (selection.contains(id)) {
|
||||||
|
true -> selection.remove(id)
|
||||||
|
false -> selection.add(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
selectionChanges.onNext(selection)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
protected fun isSelected(id: Long): Boolean {
|
||||||
|
return selection.contains(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun clearSelection() {
|
||||||
|
selection.clear()
|
||||||
|
selectionChanges.onNext(selection)
|
||||||
|
notifyDataSetChanged()
|
||||||
|
}
|
||||||
|
|
||||||
override fun updateData(data: OrderedRealmCollection<T>?) {
|
override fun updateData(data: OrderedRealmCollection<T>?) {
|
||||||
removeListener(getData())
|
removeListener(getData())
|
||||||
addListener(data)
|
addListener(data)
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ import com.jakewharton.rxbinding2.widget.textChanges
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
import com.uber.autodispose.kotlin.autoDisposable
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
import common.QkDialog
|
|
||||||
import common.base.QkThemedActivity
|
import common.base.QkThemedActivity
|
||||||
import common.util.extensions.autoScrollToStart
|
import common.util.extensions.autoScrollToStart
|
||||||
import common.util.extensions.setBackgroundTint
|
import common.util.extensions.setBackgroundTint
|
||||||
@@ -57,12 +56,10 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
override val chipSelectedIntent: Subject<Contact> by lazy { contactsAdapter.contactSelected }
|
override val chipSelectedIntent: Subject<Contact> by lazy { contactsAdapter.contactSelected }
|
||||||
override val chipDeletedIntent: Subject<Contact> by lazy { chipsAdapter.chipDeleted }
|
override val chipDeletedIntent: Subject<Contact> by lazy { chipsAdapter.chipDeleted }
|
||||||
override val menuReadyIntent: Observable<Unit> = menu.map { Unit }
|
override val menuReadyIntent: Observable<Unit> = menu.map { Unit }
|
||||||
override val callIntent: Subject<Unit> = PublishSubject.create()
|
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
|
||||||
override val infoIntent: Subject<Unit> = PublishSubject.create()
|
|
||||||
override val messageClickIntent: Subject<Message> by lazy { messageAdapter.clicks }
|
override val messageClickIntent: Subject<Message> by lazy { messageAdapter.clicks }
|
||||||
override val messageLongClickIntent: Subject<Message> by lazy { messageAdapter.longClicks }
|
override val messagesSelectedIntent by lazy { messageAdapter.selectionChanges }
|
||||||
override val cancelSendingIntent: Subject<Message> by lazy { messageAdapter.cancelSending }
|
override val cancelSendingIntent: Subject<Message> by lazy { messageAdapter.cancelSending }
|
||||||
override val menuItemIntent: Subject<Int> by lazy { dialog.adapter.menuItemClicks }
|
|
||||||
override val attachmentDeletedIntent: Subject<Attachment> by lazy { attachmentAdapter.attachmentDeleted }
|
override val attachmentDeletedIntent: Subject<Attachment> by lazy { attachmentAdapter.attachmentDeleted }
|
||||||
override val textChangedIntent by lazy { message.textChanges() }
|
override val textChangedIntent by lazy { message.textChanges() }
|
||||||
override val attachIntent by lazy { attach.clicks() }
|
override val attachIntent by lazy { attach.clicks() }
|
||||||
@@ -70,10 +67,10 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
override val galleryIntent by lazy { gallery.clicks() }
|
override val galleryIntent by lazy { gallery.clicks() }
|
||||||
override val inputContentIntent by lazy { message.inputContentSelected }
|
override val inputContentIntent by lazy { message.inputContentSelected }
|
||||||
override val sendIntent by lazy { send.clicks() }
|
override val sendIntent by lazy { send.clicks() }
|
||||||
|
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
|
||||||
|
|
||||||
@Inject lateinit var chipsAdapter: ChipsAdapter
|
@Inject lateinit var chipsAdapter: ChipsAdapter
|
||||||
@Inject lateinit var contactsAdapter: ContactAdapter
|
@Inject lateinit var contactsAdapter: ContactAdapter
|
||||||
@Inject lateinit var dialog: QkDialog
|
|
||||||
@Inject lateinit var messageAdapter: MessagesAdapter
|
@Inject lateinit var messageAdapter: MessagesAdapter
|
||||||
@Inject lateinit var attachmentAdapter: AttachmentAdapter
|
@Inject lateinit var attachmentAdapter: AttachmentAdapter
|
||||||
|
|
||||||
@@ -173,6 +170,11 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
|
|
||||||
threadId.onNext(state.selectedConversation)
|
threadId.onNext(state.selectedConversation)
|
||||||
|
|
||||||
|
title = when (state.selectedMessages) {
|
||||||
|
0 -> state.conversationtitle
|
||||||
|
else -> getString(R.string.compose_title_selected, state.selectedMessages)
|
||||||
|
}
|
||||||
|
|
||||||
toolbarTitle.setVisible(!state.editingMode)
|
toolbarTitle.setVisible(!state.editingMode)
|
||||||
chips.setVisible(state.editingMode)
|
chips.setVisible(state.editingMode)
|
||||||
contacts.setVisible(state.contactsVisible)
|
contacts.setVisible(state.contactsVisible)
|
||||||
@@ -182,8 +184,11 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter
|
if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter
|
||||||
if (state.editingMode && contacts.adapter == null) contacts.adapter = contactsAdapter
|
if (state.editingMode && contacts.adapter == null) contacts.adapter = contactsAdapter
|
||||||
|
|
||||||
toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode
|
toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0
|
||||||
toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode
|
toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0
|
||||||
|
toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages == 1
|
||||||
|
toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0
|
||||||
|
toolbar.menu.findItem(R.id.forward)?.isVisible = !state.editingMode && state.selectedMessages == 1
|
||||||
|
|
||||||
if (chipsAdapter.data.isEmpty() && state.selectedContacts.isNotEmpty()) {
|
if (chipsAdapter.data.isEmpty() && state.selectedContacts.isNotEmpty()) {
|
||||||
message.showKeyboard()
|
message.showKeyboard()
|
||||||
@@ -200,21 +205,18 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
camera.setVisible(state.attaching)
|
camera.setVisible(state.attaching)
|
||||||
gallery.setVisible(state.attaching)
|
gallery.setVisible(state.attaching)
|
||||||
|
|
||||||
if (title != state.title) title = state.title
|
|
||||||
|
|
||||||
counter.text = state.remaining
|
counter.text = state.remaining
|
||||||
counter.setVisible(counter.text.isNotBlank())
|
counter.setVisible(counter.text.isNotBlank())
|
||||||
|
|
||||||
send.isEnabled = state.canSend
|
send.isEnabled = state.canSend
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setDraft(draft: String) {
|
override fun clearSelection() {
|
||||||
message.setText(draft)
|
messageAdapter.clearSelection()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun showMenu(menuItems: List<common.MenuItem>) {
|
override fun setDraft(draft: String) {
|
||||||
dialog.adapter.data = menuItems
|
message.setText(draft)
|
||||||
dialog.show(this)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||||
@@ -223,13 +225,12 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
optionsItemIntent.onNext(item.itemId)
|
||||||
R.id.call -> callIntent.onNext(Unit)
|
|
||||||
R.id.info -> infoIntent.onNext(Unit)
|
|
||||||
else -> return super.onOptionsItemSelected(item)
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onBackPressed() {
|
||||||
|
backPressedIntent.onNext(Unit)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -30,8 +30,9 @@ data class ComposeState(
|
|||||||
val contactsVisible: Boolean = false,
|
val contactsVisible: Boolean = false,
|
||||||
val selectedConversation: Long = 0,
|
val selectedConversation: Long = 0,
|
||||||
val selectedContacts: List<Contact> = ArrayList(),
|
val selectedContacts: List<Contact> = ArrayList(),
|
||||||
val title: String = "",
|
val conversationtitle: String = "",
|
||||||
val messages: Pair<Conversation, RealmResults<Message>>? = null,
|
val messages: Pair<Conversation, RealmResults<Message>>? = null,
|
||||||
|
val selectedMessages: Int = 0,
|
||||||
val attachments: List<Attachment> = ArrayList(),
|
val attachments: List<Attachment> = ArrayList(),
|
||||||
val attaching: Boolean = false,
|
val attaching: Boolean = false,
|
||||||
val remaining: String = "",
|
val remaining: String = "",
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
package feature.compose
|
package feature.compose
|
||||||
|
|
||||||
import android.support.v13.view.inputmethod.InputContentInfoCompat
|
import android.support.v13.view.inputmethod.InputContentInfoCompat
|
||||||
import common.MenuItem
|
|
||||||
import common.base.QkView
|
import common.base.QkView
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
@@ -35,12 +34,10 @@ interface ComposeView : QkView<ComposeState> {
|
|||||||
val chipSelectedIntent: Subject<Contact>
|
val chipSelectedIntent: Subject<Contact>
|
||||||
val chipDeletedIntent: Subject<Contact>
|
val chipDeletedIntent: Subject<Contact>
|
||||||
val menuReadyIntent: Observable<Unit>
|
val menuReadyIntent: Observable<Unit>
|
||||||
val callIntent: Subject<Unit>
|
val optionsItemIntent: Observable<Int>
|
||||||
val infoIntent: Subject<Unit>
|
|
||||||
val messageClickIntent: Subject<Message>
|
val messageClickIntent: Subject<Message>
|
||||||
val messageLongClickIntent: Subject<Message>
|
val messagesSelectedIntent: Observable<List<Long>>
|
||||||
val cancelSendingIntent: Subject<Message>
|
val cancelSendingIntent: Subject<Message>
|
||||||
val menuItemIntent: Subject<Int>
|
|
||||||
val attachmentDeletedIntent: Subject<Attachment>
|
val attachmentDeletedIntent: Subject<Attachment>
|
||||||
val textChangedIntent: Observable<CharSequence>
|
val textChangedIntent: Observable<CharSequence>
|
||||||
val attachIntent: Observable<Unit>
|
val attachIntent: Observable<Unit>
|
||||||
@@ -49,7 +46,8 @@ interface ComposeView : QkView<ComposeState> {
|
|||||||
val inputContentIntent: Observable<InputContentInfoCompat>
|
val inputContentIntent: Observable<InputContentInfoCompat>
|
||||||
val sendIntent: Observable<Unit>
|
val sendIntent: Observable<Unit>
|
||||||
|
|
||||||
fun showMenu(menuItems: List<MenuItem>)
|
fun clearSelection()
|
||||||
fun setDraft(draft: String)
|
fun setDraft(draft: String)
|
||||||
|
val backPressedIntent: Observable<Unit>
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,6 @@ import com.mlsdev.rximagepicker.Sources
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
import com.uber.autodispose.kotlin.autoDisposable
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
import common.MenuItem
|
|
||||||
import common.Navigator
|
import common.Navigator
|
||||||
import common.base.QkViewModel
|
import common.base.QkViewModel
|
||||||
import common.util.ClipboardUtils
|
import common.util.ClipboardUtils
|
||||||
@@ -38,7 +37,7 @@ import common.util.filter.ContactFilter
|
|||||||
import injection.appComponent
|
import injection.appComponent
|
||||||
import interactor.CancelDelayedMessage
|
import interactor.CancelDelayedMessage
|
||||||
import interactor.ContactSync
|
import interactor.ContactSync
|
||||||
import interactor.DeleteMessage
|
import interactor.DeleteMessages
|
||||||
import interactor.MarkRead
|
import interactor.MarkRead
|
||||||
import interactor.RetrySending
|
import interactor.RetrySending
|
||||||
import interactor.SendMessage
|
import interactor.SendMessage
|
||||||
@@ -79,7 +78,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
@Inject lateinit var sendMessage: SendMessage
|
@Inject lateinit var sendMessage: SendMessage
|
||||||
@Inject lateinit var retrySending: RetrySending
|
@Inject lateinit var retrySending: RetrySending
|
||||||
@Inject lateinit var markRead: MarkRead
|
@Inject lateinit var markRead: MarkRead
|
||||||
@Inject lateinit var deleteMessage: DeleteMessage
|
@Inject lateinit var deleteMessages: DeleteMessages
|
||||||
|
|
||||||
private var sharedText: String = ""
|
private var sharedText: String = ""
|
||||||
private val attachments: Subject<List<Attachment>> = BehaviorSubject.createDefault(ArrayList())
|
private val attachments: Subject<List<Attachment>> = BehaviorSubject.createDefault(ArrayList())
|
||||||
@@ -89,10 +88,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
private val conversation: Observable<Conversation>
|
private val conversation: Observable<Conversation>
|
||||||
private val messages: Observable<List<Message>>
|
private val messages: Observable<List<Message>>
|
||||||
|
|
||||||
private val menuCopy by lazy { MenuItem(context.getString(R.string.compose_menu_copy), 0) }
|
|
||||||
private val menuForward by lazy { MenuItem(context.getString(R.string.compose_menu_forward), 1) }
|
|
||||||
private val menuDelete by lazy { MenuItem(context.getString(R.string.compose_menu_delete), 2) }
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
|
|
||||||
@@ -178,7 +173,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
disposables += conversation
|
disposables += conversation
|
||||||
.distinctUntilChanged { conversation -> conversation.getTitle() }
|
.distinctUntilChanged { conversation -> conversation.getTitle() }
|
||||||
.subscribe { conversation ->
|
.subscribe { conversation ->
|
||||||
newState { it.copy(title = conversation.getTitle()) }
|
newState { it.copy(conversationtitle = conversation.getTitle()) }
|
||||||
}
|
}
|
||||||
|
|
||||||
disposables += attachments
|
disposables += attachments
|
||||||
@@ -276,7 +271,8 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.subscribe { newState { it.copy() } }
|
.subscribe { newState { it.copy() } }
|
||||||
|
|
||||||
// Open the phone dialer if the call button is clicked
|
// Open the phone dialer if the call button is clicked
|
||||||
view.callIntent
|
view.optionsItemIntent
|
||||||
|
.filter { it == R.id.call }
|
||||||
.withLatestFrom(conversation, { _, conversation -> conversation })
|
.withLatestFrom(conversation, { _, conversation -> conversation })
|
||||||
.map { conversation -> conversation.recipients.first() }
|
.map { conversation -> conversation.recipients.first() }
|
||||||
.map { recipient -> recipient.address }
|
.map { recipient -> recipient.address }
|
||||||
@@ -284,11 +280,45 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.subscribe { address -> navigator.makePhoneCall(address) }
|
.subscribe { address -> navigator.makePhoneCall(address) }
|
||||||
|
|
||||||
// Open the conversation settings if info button is clicked
|
// Open the conversation settings if info button is clicked
|
||||||
view.infoIntent
|
view.optionsItemIntent
|
||||||
|
.filter { it == R.id.info }
|
||||||
.withLatestFrom(conversation, { _, conversation -> conversation })
|
.withLatestFrom(conversation, { _, conversation -> conversation })
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { conversation -> navigator.showConversationInfo(conversation.id) }
|
.subscribe { conversation -> navigator.showConversationInfo(conversation.id) }
|
||||||
|
|
||||||
|
// Copy the message contents
|
||||||
|
view.optionsItemIntent
|
||||||
|
.filter { it == R.id.copy }
|
||||||
|
.withLatestFrom(view.messagesSelectedIntent, { _, messages ->
|
||||||
|
messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message ->
|
||||||
|
ClipboardUtils.copy(context, message.getText())
|
||||||
|
context.makeToast(R.string.toast_copied)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.autoDisposable(view.scope())
|
||||||
|
.subscribe { view.clearSelection() }
|
||||||
|
|
||||||
|
// Delete the messages
|
||||||
|
view.optionsItemIntent
|
||||||
|
.filter { it == R.id.delete }
|
||||||
|
.withLatestFrom(view.messagesSelectedIntent, conversation, { _, messages, conversation ->
|
||||||
|
deleteMessages.execute(DeleteMessages.Params(messages, conversation.id))
|
||||||
|
})
|
||||||
|
.autoDisposable(view.scope())
|
||||||
|
.subscribe { view.clearSelection() }
|
||||||
|
|
||||||
|
// Forward the message
|
||||||
|
view.optionsItemIntent
|
||||||
|
.filter { it == R.id.forward }
|
||||||
|
.withLatestFrom(view.messagesSelectedIntent, { _, messages ->
|
||||||
|
messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message ->
|
||||||
|
val images = message.parts.filter { it.isImage() }.mapNotNull { it.getUri() }
|
||||||
|
navigator.showCompose(message.body, images)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.autoDisposable(view.scope())
|
||||||
|
.subscribe { view.clearSelection() }
|
||||||
|
|
||||||
// Retry sending
|
// Retry sending
|
||||||
view.messageClickIntent
|
view.messageClickIntent
|
||||||
.filter { message -> message.isFailedMessage() }
|
.filter { message -> message.isFailedMessage() }
|
||||||
@@ -296,10 +326,11 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe()
|
.subscribe()
|
||||||
|
|
||||||
// Show menu
|
// Update the State when the message selected count changes
|
||||||
view.messageLongClickIntent
|
view.messagesSelectedIntent
|
||||||
|
.map { selection -> selection.size }
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { view.showMenu(listOf(menuCopy, menuForward, menuDelete)) }
|
.subscribe { messages -> newState { it.copy(selectedMessages = messages, editingMode = false) } }
|
||||||
|
|
||||||
// Cancel sending a message
|
// Cancel sending a message
|
||||||
view.cancelSendingIntent
|
view.cancelSendingIntent
|
||||||
@@ -307,26 +338,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { message -> cancelMessage.execute(message.id) }
|
.subscribe { message -> cancelMessage.execute(message.id) }
|
||||||
|
|
||||||
// Handle long-press menu item click
|
|
||||||
view.menuItemIntent
|
|
||||||
.withLatestFrom(view.messageLongClickIntent, { actionId, message ->
|
|
||||||
when (actionId) {
|
|
||||||
menuCopy.actionId -> {
|
|
||||||
ClipboardUtils.copy(context, message.getText())
|
|
||||||
context.makeToast(R.string.toast_copied)
|
|
||||||
}
|
|
||||||
|
|
||||||
menuForward.actionId -> {
|
|
||||||
val images = message.parts.filter { it.isImage() }.mapNotNull { it.getUri() }
|
|
||||||
navigator.showCompose(message.body, images)
|
|
||||||
}
|
|
||||||
|
|
||||||
menuDelete.actionId -> deleteMessage.execute(message.id)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.autoDisposable(view.scope())
|
|
||||||
.subscribe()
|
|
||||||
|
|
||||||
// Save draft when the activity goes into the background
|
// Save draft when the activity goes into the background
|
||||||
view.activityVisibleIntent
|
view.activityVisibleIntent
|
||||||
.filter { visible -> !visible }
|
.filter { visible -> !visible }
|
||||||
@@ -446,6 +457,21 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
})
|
})
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe()
|
.subscribe()
|
||||||
|
|
||||||
|
// Navigate back
|
||||||
|
view.optionsItemIntent
|
||||||
|
.filter { it == android.R.id.home }
|
||||||
|
.map { Unit }
|
||||||
|
.mergeWith(view.backPressedIntent)
|
||||||
|
.withLatestFrom(state, { _, state ->
|
||||||
|
when {
|
||||||
|
state.selectedMessages > 0 -> view.clearSelection()
|
||||||
|
else -> newState { it.copy(hasError = true) }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.autoDisposable(view.scope())
|
||||||
|
.subscribe()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -32,8 +32,8 @@ import android.view.View
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import android.widget.ProgressBar
|
import android.widget.ProgressBar
|
||||||
import com.jakewharton.rxbinding2.view.RxView
|
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
|
import com.jakewharton.rxbinding2.view.longClicks
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import common.Navigator
|
import common.Navigator
|
||||||
import common.base.QkRealmAdapter
|
import common.base.QkRealmAdapter
|
||||||
@@ -80,7 +80,6 @@ class MessagesAdapter @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val clicks: Subject<Message> = PublishSubject.create<Message>()
|
val clicks: Subject<Message> = PublishSubject.create<Message>()
|
||||||
val longClicks: Subject<Message> = PublishSubject.create<Message>()
|
|
||||||
val cancelSending: Subject<Message> = PublishSubject.create<Message>()
|
val cancelSending: Subject<Message> = PublishSubject.create<Message>()
|
||||||
|
|
||||||
var data: Pair<Conversation, RealmResults<Message>>? = null
|
var data: Pair<Conversation, RealmResults<Message>>? = null
|
||||||
@@ -106,7 +105,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
|
|
||||||
private val layoutInflater = LayoutInflater.from(context)
|
private val layoutInflater = LayoutInflater.from(context)
|
||||||
private val contactCache = ContactCache()
|
private val contactCache = ContactCache()
|
||||||
private val selected = HashMap<Long, Boolean>()
|
private val expanded = HashMap<Long, Boolean>()
|
||||||
private val disposables = CompositeDisposable()
|
private val disposables = CompositeDisposable()
|
||||||
|
|
||||||
private var theme = colors.theme
|
private var theme = colors.theme
|
||||||
@@ -143,6 +142,9 @@ class MessagesAdapter @Inject constructor(
|
|||||||
.subscribe { color -> view.body.setBackgroundTint(color) }
|
.subscribe { color -> view.body.setBackgroundTint(color) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
disposables += colors.ripple
|
||||||
|
.subscribe { res -> view.setBackgroundResource(res) }
|
||||||
|
|
||||||
view.body.forwardTouches(view)
|
view.body.forwardTouches(view)
|
||||||
|
|
||||||
return QkViewHolder(view)
|
return QkViewHolder(view)
|
||||||
@@ -159,12 +161,24 @@ class MessagesAdapter @Inject constructor(
|
|||||||
val next = if (position == itemCount - 1) null else getItem(position + 1)
|
val next = if (position == itemCount - 1) null else getItem(position + 1)
|
||||||
val view = viewHolder.itemView
|
val view = viewHolder.itemView
|
||||||
|
|
||||||
RxView.clicks(view).subscribe {
|
view.clicks().subscribe {
|
||||||
clicks.onNext(message)
|
when (toggleSelection(message.id, false)) {
|
||||||
selected[message.id] = view.status.visibility != View.VISIBLE
|
true -> view.isSelected = isSelected(message.id)
|
||||||
bindStatus(viewHolder, position)
|
false -> {
|
||||||
|
clicks.onNext(message)
|
||||||
|
expanded[message.id] = view.status.visibility != View.VISIBLE
|
||||||
|
bindStatus(viewHolder, message, next)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
RxView.longClicks(view).subscribe { longClicks.onNext(message) }
|
view.longClicks().subscribe {
|
||||||
|
toggleSelection(message.id)
|
||||||
|
view.isSelected = isSelected(message.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Update the selected state
|
||||||
|
view.isSelected = isSelected(message.id)
|
||||||
|
|
||||||
|
|
||||||
// Bind the cancel view
|
// Bind the cancel view
|
||||||
@@ -191,7 +205,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
|
|
||||||
|
|
||||||
// Bind the message status
|
// Bind the message status
|
||||||
bindStatus(viewHolder, position)
|
bindStatus(viewHolder, message, next)
|
||||||
|
|
||||||
|
|
||||||
// Bind the timestamp
|
// Bind the timestamp
|
||||||
@@ -284,9 +298,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun bindStatus(viewHolder: QkViewHolder, position: Int) {
|
private fun bindStatus(viewHolder: QkViewHolder, message: Message, next: Message?) {
|
||||||
val message = getItem(position)!!
|
|
||||||
val next = if (position == itemCount - 1) null else getItem(position + 1)
|
|
||||||
val view = viewHolder.itemView
|
val view = viewHolder.itemView
|
||||||
|
|
||||||
val age = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - message.date)
|
val age = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - message.date)
|
||||||
@@ -301,10 +313,10 @@ class MessagesAdapter @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
view.status.setVisible(when {
|
view.status.setVisible(when {
|
||||||
selected[message.id] == true -> true
|
expanded[message.id] == true -> true
|
||||||
message.isSending() -> true
|
message.isSending() -> true
|
||||||
message.isFailedMessage() -> true
|
message.isFailedMessage() -> true
|
||||||
selected[message.id] == false -> false
|
expanded[message.id] == false -> false
|
||||||
conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
|
conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
|
||||||
message.isDelivered() && next?.isDelivered() != true && age <= TIMESTAMP_THRESHOLD -> true
|
message.isDelivered() && next?.isDelivered() != true && age <= TIMESTAMP_THRESHOLD -> true
|
||||||
else -> false
|
else -> false
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24.0"
|
||||||
|
android:viewportHeight="24.0">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
|
||||||
|
</vector>
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
<!--
|
|
||||||
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||||
~
|
~
|
||||||
~ This file is part of QKSMS.
|
~ This file is part of QKSMS.
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
<!--
|
|
||||||
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||||
~
|
~
|
||||||
~ This file is part of QKSMS.
|
~ This file is part of QKSMS.
|
||||||
@@ -34,4 +33,26 @@
|
|||||||
android:visible="false"
|
android:visible="false"
|
||||||
app:showAsAction="always" />
|
app:showAsAction="always" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/copy"
|
||||||
|
android:icon="@drawable/ic_content_copy_black_24dp"
|
||||||
|
android:title="@string/compose_menu_copy"
|
||||||
|
android:visible="false"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/delete"
|
||||||
|
android:icon="@drawable/ic_delete_black_24dp"
|
||||||
|
android:title="@string/compose_menu_delete"
|
||||||
|
android:visible="false"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/forward"
|
||||||
|
android:icon="@drawable/ic_forward_black_24dp"
|
||||||
|
android:title="@string/compose_menu_forward"
|
||||||
|
android:visible="false"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
@@ -74,6 +74,7 @@
|
|||||||
<item>Delete</item>
|
<item>Delete</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string name="compose_title_selected">%d selected</string>
|
||||||
<string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
|
<string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
|
||||||
<string name="compose_hint">Write a message…</string>
|
<string name="compose_hint">Write a message…</string>
|
||||||
<string name="compose_menu_copy">Copy text</string>
|
<string name="compose_menu_copy">Copy text</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user