diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 1bbafb2f..644229e5 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -24,6 +24,7 @@ import android.graphics.PorterDuff import android.net.Uri import android.os.Bundle import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView import android.view.KeyEvent import android.view.Menu import android.view.MenuItem @@ -33,8 +34,10 @@ 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.MenuItemAdapter import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart +import common.util.extensions.dpToPx import common.util.extensions.setBackgroundTint import common.util.extensions.setTint import common.util.extensions.setVisible @@ -61,10 +64,9 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val menuReadyIntent: Observable = menu.map { Unit } override val callIntent: Subject = PublishSubject.create() override val infoIntent: Subject = PublishSubject.create() - override val copyTextIntent: Subject = PublishSubject.create() - override val forwardMessageIntent: Subject = PublishSubject.create() - override val deleteMessageIntent: Subject = PublishSubject.create() override val messageClickIntent: Subject by lazy { messageAdapter.clicks } + override val messageLongClickIntent: Subject by lazy { messageAdapter.longClicks } + override val menuItemIntent: Subject by lazy { menuItemAdapter.menuItemClicks } override val attachmentDeletedIntent: Subject by lazy { attachmentAdapter.attachmentDeleted } override val textChangedIntent by lazy { message.textChanges() } override val attachIntent by lazy { attach.clicks() } @@ -73,6 +75,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { @Inject lateinit var chipsAdapter: ChipsAdapter @Inject lateinit var contactsAdapter: ContactAdapter @Inject lateinit var messageAdapter: MessagesAdapter + @Inject lateinit var menuItemAdapter: MenuItemAdapter @Inject lateinit var attachmentAdapter: AttachmentAdapter init { @@ -95,17 +98,6 @@ class ComposeActivity : QkThemedActivity(), ComposeView { messageAdapter.autoScrollToStart(messageList) messageAdapter.emptyView = messagesEmpty - messageAdapter.longClicks.subscribe { message -> - AlertDialog.Builder(this) - .setItems(R.array.message_options, { _, row -> - when (row) { - 0 -> copyTextIntent.onNext(message) - 1 -> forwardMessageIntent.onNext(message) - 2 -> deleteMessageIntent.onNext(message) - } - }) - .show() - } messageList.setHasFixedSize(true) messageList.layoutManager = layoutManager @@ -212,6 +204,23 @@ class ComposeActivity : QkThemedActivity(), ComposeView { message.setText(draft) } + override fun showMenu(menuItems: List) { + val recyclerView = RecyclerView(this) + recyclerView.layoutManager = LinearLayoutManager(this) + recyclerView.adapter = menuItemAdapter + recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) + + val dialog = AlertDialog.Builder(this) + .setView(recyclerView) + .create() + .apply { show() } + + menuItemAdapter.data = menuItems + menuItemAdapter.menuItemClicks + .autoDisposable(scope()) + .subscribe { dialog.dismiss() } + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.compose, menu) return super.onCreateOptionsMenu(menu) diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 069ede65..5e2f9beb 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -20,11 +20,12 @@ package feature.compose import android.net.Uri import android.view.KeyEvent +import common.MenuItem +import common.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject import model.Contact import model.Message -import common.base.QkView interface ComposeView : QkView { @@ -37,15 +38,15 @@ interface ComposeView : QkView { val menuReadyIntent: Observable val callIntent: Subject val infoIntent: Subject - val copyTextIntent: Subject - val forwardMessageIntent: Subject - val deleteMessageIntent: Subject val messageClickIntent: Subject + val messageLongClickIntent: Subject + val menuItemIntent: Subject val attachmentDeletedIntent: Subject val textChangedIntent: Observable val attachIntent: Observable val sendIntent: Observable + fun showMenu(menuItems: List) fun setDraft(draft: String) } \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 066627d4..8d5dfcdf 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -31,6 +31,7 @@ import com.mlsdev.rximagepicker.Sources import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable +import common.MenuItem import common.Navigator import common.base.QkViewModel import common.util.ClipboardUtils @@ -88,6 +89,10 @@ class ComposeViewModel(intent: Intent) : QkViewModel( private val conversation: Observable private val messages: Observable> + val menuCopy by lazy { MenuItem(context.getString(R.string.compose_menu_copy), 0) } + val menuForward by lazy { MenuItem(context.getString(R.string.compose_menu_forward), 1) } + val menuDelete by lazy { MenuItem(context.getString(R.string.compose_menu_delete), 2) } + init { appComponent.inject(this) @@ -303,6 +308,31 @@ class ComposeViewModel(intent: Intent) : QkViewModel( .autoDisposable(view.scope()) .subscribe() + // Show menu + view.messageLongClickIntent + .autoDisposable(view.scope()) + .subscribe { view.showMenu(listOf(menuCopy, menuForward, menuDelete)) } + + // 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.image?.toUri() } + navigator.showCompose(message.body, images) + } + + menuDelete.actionId -> deleteMessage.execute(message.id) + } + }) + .autoDisposable(view.scope()) + .subscribe() + // Save draft when the activity goes into the background view.activityVisibleIntent .filter { visible -> !visible } @@ -398,27 +428,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel( }) .autoDisposable(view.scope()) .subscribe() - - // Copy the body of the selected message into the clipboard - view.copyTextIntent - .autoDisposable(view.scope()) - .subscribe { message -> - ClipboardUtils.copy(context, message.getText()) - context.makeToast(R.string.toast_copied) - } - - // Forward the message - view.forwardMessageIntent - .autoDisposable(view.scope()) - .subscribe { message -> - val images = message.parts.filter { it.isImage() }.mapNotNull { it.image?.toUri() } - navigator.showCompose(message.body, images) - } - - // Delete the selected message - view.deleteMessageIntent - .autoDisposable(view.scope()) - .subscribe { message -> deleteMessage.execute(message.id) } } } \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 45ca0046..7a798553 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -42,13 +42,6 @@ Optimizing database, this might take a minute… You: %s - This is the start of your conversation. Say something nice! - Write a message… - - Sending… - Delivered %s - Failed to send. Tap to try again - Inbox Archived Scheduled @@ -69,6 +62,22 @@ Delete Are you sure you would like to delete this conversation? + + Copy text + Forward + Delete + + + This is the start of your conversation. Say something nice! + Write a message… + Copy text + Forward + Delete + + Sending… + Delivered %s + Failed to send. Tap to try again + Details Notifications Theme @@ -176,12 +185,6 @@ Message not sent The message to %s failed to send - - Copy text - Forward - Delete - - Disabled Always on