diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt index 8dc52fc4..5b987215 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -26,12 +26,15 @@ import android.view.MenuItem import android.view.ViewGroup import android.view.Window import android.view.WindowManager +import com.jakewharton.rxbinding2.view.clicks +import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart import common.util.extensions.setBackgroundTint +import common.util.extensions.setVisible import feature.compose.MessagesAdapter import injection.appComponent import io.reactivex.rxkotlin.Observables @@ -44,6 +47,8 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { override val viewModelClass = QkReplyViewModel::class override val menuItemIntent: Subject = PublishSubject.create() + override val textChangedIntent by lazy { message.textChanges() } + override val sendIntent by lazy { send.clicks() } @Inject lateinit var adapter: MessagesAdapter @@ -108,6 +113,15 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { toolbar.menu.findItem(R.id.collapse)?.isVisible = state.expanded adapter.data = state.data + + counter.text = state.remaining + counter.setVisible(counter.text.isNotBlank()) + + send.isEnabled = state.canSend + } + + override fun setDraft(draft: String) { + message.setText(draft) } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/presentation/src/main/java/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/feature/qkreply/QkReplyState.kt index 8069311a..4b70f663 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyState.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyState.kt @@ -25,5 +25,7 @@ import model.Message data class QkReplyState( val title: String = "", val expanded: Boolean = false, - val data: Pair>? = null + val data: Pair>? = null, + val remaining: String = "", + val canSend: Boolean = false ) \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyView.kt b/presentation/src/main/java/feature/qkreply/QkReplyView.kt index 6b1a20a6..d9f9f3d5 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyView.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyView.kt @@ -18,12 +18,15 @@ */ package feature.qkreply -import android.view.MenuItem import common.base.QkView import io.reactivex.Observable interface QkReplyView : QkView { val menuItemIntent: Observable + val textChangedIntent: Observable + val sendIntent: Observable + + fun setDraft(draft: String) } \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index 1b3ea3f2..50bc9d08 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -19,23 +19,28 @@ package feature.qkreply import android.content.Intent +import android.telephony.SmsMessage import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.base.QkViewModel import injection.appComponent import interactor.MarkRead +import interactor.SendMessage import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import io.reactivex.schedulers.Schedulers import model.Conversation import repository.MessageRepository import util.extensions.asObservable +import java.util.concurrent.TimeUnit import javax.inject.Inject class QkReplyViewModel(intent: Intent) : QkViewModel(QkReplyState()) { @Inject lateinit var markRead: MarkRead @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var sendMessage: SendMessage private val conversation by lazy { messageRepo.getConversationAsync(intent.getLongExtra("threadId", -1)) @@ -49,6 +54,7 @@ class QkReplyViewModel(intent: Intent) : QkViewModel( appComponent.inject(this) disposables += markRead + disposables += sendMessage disposables += conversation .doOnNext { conversation -> newState { it.copy(title = conversation.getTitle()) } } @@ -83,6 +89,55 @@ class QkReplyViewModel(intent: Intent) : QkViewModel( .map { conversation -> Pair(conversation, messageRepo.getUnreadMessages(conversation.id)) } .autoDisposable(view.scope()) .subscribe { data -> newState { it.copy(expanded = false, data = data) } } + + // Enable the send button when there is text input into the new message body or there's + // an attachment, disable otherwise + view.textChangedIntent + .map { text -> text.isNotBlank() } + .autoDisposable(view.scope()) + .subscribe { canSend -> newState { it.copy(canSend = canSend) } } + + // Show the remaining character counter when necessary + view.textChangedIntent + .observeOn(Schedulers.computation()) + .map { draft -> SmsMessage.calculateLength(draft, false) } + .map { array -> + val messages = array[0] + val remaining = array[2] + + when { + messages <= 1 && remaining > 10 -> "" + messages <= 1 && remaining <= 10 -> "$remaining" + else -> "$remaining / $messages" + } + } + .distinctUntilChanged() + .autoDisposable(view.scope()) + .subscribe { remaining -> newState { it.copy(remaining = remaining) } } + + // Update the draft whenever the text is changed + view.textChangedIntent + .debounce(100, TimeUnit.MILLISECONDS) + .map { draft -> draft.toString() } + .observeOn(Schedulers.io()) + .withLatestFrom(conversation.map { it.id }, { draft, threadId -> + messageRepo.saveDraft(threadId, draft) + }) + .autoDisposable(view.scope()) + .subscribe() + + // Send a message when the send button is clicked, and disable editing mode if it's enabled + view.sendIntent + .withLatestFrom(view.textChangedIntent, { _, body -> body }) + .map { body -> body.toString() } + .withLatestFrom(conversation, { body, conversation -> + val threadId = conversation.id + val addresses = conversation.recipients.map { it.address } + sendMessage.execute(SendMessage.Params(threadId, addresses, body, listOf())) + view.setDraft("") + }) + .autoDisposable(view.scope()) + .subscribe() } }