From e561dff574e1ff2732d980e6c3db5176f21e7bc0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Dec 2017 11:19:13 -0500 Subject: [PATCH] Add ability to archive/unarchive from compose activity --- .../data/repository/MessageRepository.kt | 10 ++++++++ .../QKSMS/domain/interactor/MarkUnarchived.kt | 14 +++++++++++ .../presentation/compose/ComposeActivity.kt | 25 +++++++++++++++++-- .../presentation/compose/ComposeState.kt | 2 +- .../QKSMS/presentation/compose/ComposeView.kt | 1 + .../presentation/compose/ComposeViewModel.kt | 23 +++++++++++++---- qksms/src/main/res/menu/compose.xml | 8 ++++++ qksms/src/main/res/values/strings.xml | 4 +++ 8 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index f99eda31..9067490f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -127,7 +127,17 @@ class MessageRepository @Inject constructor( .findFirst() realm.executeTransaction { conversation?.archived = true } + realm.close() + } + fun markUnarchived(threadId: Long) { + val realm = Realm.getDefaultInstance() + val conversation = realm.where(Conversation::class.java) + .equalTo("id", threadId) + .equalTo("archived", true) + .findFirst() + + realm.executeTransaction { conversation?.archived = false } realm.close() } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt new file mode 100644 index 00000000..ffd18ad4 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt @@ -0,0 +1,14 @@ +package com.moez.QKSMS.domain.interactor + +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkUnarchived @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + override fun buildObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markUnarchived(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index f4f84816..de7ebd2e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -34,6 +34,7 @@ class ComposeActivity : QkActivity(), ComposeView { override val chipSelectedIntent: Subject by lazy { contactsAdapter.contactSelected } override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } override val callIntent: Subject = PublishSubject.create() + override val archiveIntent: Subject = PublishSubject.create() override val copyTextIntent: Subject = PublishSubject.create() override val forwardMessageIntent: Subject = PublishSubject.create() override val deleteMessageIntent: Subject = PublishSubject.create() @@ -46,6 +47,8 @@ class ComposeActivity : QkActivity(), ComposeView { private val messageAdapter by lazy { MessagesAdapter() } private var pendingCallVisibility = false + private var pendingArchiveVisibility = false + private var pendingArchiveTitle = "" init { appComponent.inject(this) @@ -91,9 +94,18 @@ class ComposeActivity : QkActivity(), ComposeView { menu?.findItem(R.id.call).let { menuItem -> if (menuItem == null) { - pendingCallVisibility = state.canCall + pendingCallVisibility = !state.editingMode } else { - menuItem.setVisible(state.canCall) + menuItem.isVisible = !state.editingMode + } + } + + menu?.findItem(R.id.archive).let { menuItem -> + if (menuItem == null) { + pendingArchiveVisibility = !state.editingMode + } else { + menuItem.isVisible = !state.editingMode + menuItem.setTitle(if (state.archived) R.string.menu_unarchive else R.string.menu_archive) } } @@ -152,6 +164,10 @@ class ComposeActivity : QkActivity(), ComposeView { override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.compose, menu) menu?.findItem(R.id.call)?.isVisible = pendingCallVisibility + menu?.findItem(R.id.archive)?.run { + isVisible = pendingArchiveVisibility + title = pendingArchiveTitle + } return super.onCreateOptionsMenu(menu) } @@ -162,6 +178,11 @@ class ComposeActivity : QkActivity(), ComposeView { true } + R.id.archive -> { + archiveIntent.onNext(Unit) + true + } + else -> super.onOptionsItemSelected(item) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt index 29635c56..588e4be7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt @@ -10,7 +10,7 @@ data class ComposeState( val contactsVisible: Boolean = false, val selectedContacts: List = ArrayList(), val title: String = "", - val canCall: Boolean = false, + val archived: Boolean = false, val messages: RealmResults? = null, val draft: String = "", val canSend: Boolean = false diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt index 3ac6acd7..3ce093d1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt @@ -12,6 +12,7 @@ interface ComposeView : QkView { val chipSelectedIntent: Subject val chipDeletedIntent: Subject val callIntent: Subject + val archiveIntent: Subject val copyTextIntent: Subject val forwardMessageIntent: Subject val deleteMessageIntent: Subject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index 11e057c8..fe22d3c4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -11,9 +11,7 @@ import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.ContactRepository import com.moez.QKSMS.data.repository.MessageRepository -import com.moez.QKSMS.domain.interactor.DeleteMessage -import com.moez.QKSMS.domain.interactor.MarkRead -import com.moez.QKSMS.domain.interactor.SendMessage +import com.moez.QKSMS.domain.interactor.* import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkViewModel import io.reactivex.Observable @@ -32,6 +30,8 @@ class ComposeViewModel(threadId: Long) : QkViewModel( @Inject lateinit var contactsRepo: ContactRepository @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var navigator: Navigator + @Inject lateinit var markArchived: MarkArchived + @Inject lateinit var markUnarchived: MarkUnarchived @Inject lateinit var sendMessage: SendMessage @Inject lateinit var markRead: MarkRead @Inject lateinit var deleteMessage: DeleteMessage @@ -60,18 +60,21 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .filter { conversation -> conversation.isLoaded } .filter { conversation -> conversation.isValid } .mergeWith(selectedConversation) - .distinctUntilChanged { conversation -> conversation.id } + .distinctUntilChanged() .doOnNext { conversation -> - newState { it.copy(title = conversation.getTitle(), canCall = conversation.contacts.isNotEmpty()) } + newState { it.copy(title = conversation.getTitle(), archived = conversation.archived) } } disposables += sendMessage disposables += markRead + disposables += markArchived + disposables += markUnarchived disposables += conversation.subscribe() // When the conversation changes, update the messages for the adapter // When the message list changes, make sure to mark them read disposables += conversation + .distinctUntilChanged() .map { conversation -> messageRepo.getMessages(conversation.id) } .doOnNext { messages -> newState { it.copy(messages = messages) } } .flatMap { messages -> messages.asObservable() } @@ -125,6 +128,16 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .map { contact -> contact.address } .subscribe { address -> navigator.makePhoneCall(address) } + // Toggle the archived state of the conversation + intents += view.archiveIntent + .withLatestFrom(conversation, { _, conversation -> conversation }) + .subscribe { conversation -> + when (conversation.archived) { + true -> markUnarchived.execute(conversation.id, { context.makeToast(R.string.toast_unarchived) }) + false -> markArchived.execute(conversation.id, { context.makeToast(R.string.toast_archived) }) + } + } + // Enable the send button when there is text input into the new message body, disable otherwise intents += view.textChangedIntent.subscribe { text -> newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) } diff --git a/qksms/src/main/res/menu/compose.xml b/qksms/src/main/res/menu/compose.xml index 355fac60..7bfa33db 100644 --- a/qksms/src/main/res/menu/compose.xml +++ b/qksms/src/main/res/menu/compose.xml @@ -1,10 +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 b5df8e62..69caee32 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -6,6 +6,8 @@ Type a name or number Call + Archive + Unarchive Write a message @@ -42,6 +44,8 @@ Mark read Copied + Archived + Moved to inbox Copy text