mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 13:48:52 +01:00
Allow customizable menu items for Compose menu
This commit is contained in:
@@ -24,6 +24,7 @@ import android.graphics.PorterDuff
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
|
import android.support.v7.widget.RecyclerView
|
||||||
import android.view.KeyEvent
|
import android.view.KeyEvent
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
@@ -33,8 +34,10 @@ 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.MenuItemAdapter
|
||||||
import common.base.QkThemedActivity
|
import common.base.QkThemedActivity
|
||||||
import common.util.extensions.autoScrollToStart
|
import common.util.extensions.autoScrollToStart
|
||||||
|
import common.util.extensions.dpToPx
|
||||||
import common.util.extensions.setBackgroundTint
|
import common.util.extensions.setBackgroundTint
|
||||||
import common.util.extensions.setTint
|
import common.util.extensions.setTint
|
||||||
import common.util.extensions.setVisible
|
import common.util.extensions.setVisible
|
||||||
@@ -61,10 +64,9 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
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 callIntent: Subject<Unit> = PublishSubject.create()
|
||||||
override val infoIntent: Subject<Unit> = PublishSubject.create()
|
override val infoIntent: Subject<Unit> = PublishSubject.create()
|
||||||
override val copyTextIntent: Subject<Message> = PublishSubject.create()
|
|
||||||
override val forwardMessageIntent: Subject<Message> = PublishSubject.create()
|
|
||||||
override val deleteMessageIntent: Subject<Message> = 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 menuItemIntent: Subject<Int> by lazy { menuItemAdapter.menuItemClicks }
|
||||||
override val attachmentDeletedIntent: Subject<Uri> by lazy { attachmentAdapter.attachmentDeleted }
|
override val attachmentDeletedIntent: Subject<Uri> 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() }
|
||||||
@@ -73,6 +75,7 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
@Inject lateinit var chipsAdapter: ChipsAdapter
|
@Inject lateinit var chipsAdapter: ChipsAdapter
|
||||||
@Inject lateinit var contactsAdapter: ContactAdapter
|
@Inject lateinit var contactsAdapter: ContactAdapter
|
||||||
@Inject lateinit var messageAdapter: MessagesAdapter
|
@Inject lateinit var messageAdapter: MessagesAdapter
|
||||||
|
@Inject lateinit var menuItemAdapter: MenuItemAdapter
|
||||||
@Inject lateinit var attachmentAdapter: AttachmentAdapter
|
@Inject lateinit var attachmentAdapter: AttachmentAdapter
|
||||||
|
|
||||||
init {
|
init {
|
||||||
@@ -95,17 +98,6 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
|
|
||||||
messageAdapter.autoScrollToStart(messageList)
|
messageAdapter.autoScrollToStart(messageList)
|
||||||
messageAdapter.emptyView = messagesEmpty
|
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.setHasFixedSize(true)
|
||||||
messageList.layoutManager = layoutManager
|
messageList.layoutManager = layoutManager
|
||||||
@@ -212,6 +204,23 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
message.setText(draft)
|
message.setText(draft)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun showMenu(menuItems: List<common.MenuItem>) {
|
||||||
|
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 {
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||||
menuInflater.inflate(R.menu.compose, menu)
|
menuInflater.inflate(R.menu.compose, menu)
|
||||||
return super.onCreateOptionsMenu(menu)
|
return super.onCreateOptionsMenu(menu)
|
||||||
|
|||||||
@@ -20,11 +20,12 @@ package feature.compose
|
|||||||
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.view.KeyEvent
|
import android.view.KeyEvent
|
||||||
|
import common.MenuItem
|
||||||
|
import common.base.QkView
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import model.Contact
|
import model.Contact
|
||||||
import model.Message
|
import model.Message
|
||||||
import common.base.QkView
|
|
||||||
|
|
||||||
interface ComposeView : QkView<ComposeState> {
|
interface ComposeView : QkView<ComposeState> {
|
||||||
|
|
||||||
@@ -37,15 +38,15 @@ interface ComposeView : QkView<ComposeState> {
|
|||||||
val menuReadyIntent: Observable<Unit>
|
val menuReadyIntent: Observable<Unit>
|
||||||
val callIntent: Subject<Unit>
|
val callIntent: Subject<Unit>
|
||||||
val infoIntent: Subject<Unit>
|
val infoIntent: Subject<Unit>
|
||||||
val copyTextIntent: Subject<Message>
|
|
||||||
val forwardMessageIntent: Subject<Message>
|
|
||||||
val deleteMessageIntent: Subject<Message>
|
|
||||||
val messageClickIntent: Subject<Message>
|
val messageClickIntent: Subject<Message>
|
||||||
|
val messageLongClickIntent: Subject<Message>
|
||||||
|
val menuItemIntent: Subject<Int>
|
||||||
val attachmentDeletedIntent: Subject<Uri>
|
val attachmentDeletedIntent: Subject<Uri>
|
||||||
val textChangedIntent: Observable<CharSequence>
|
val textChangedIntent: Observable<CharSequence>
|
||||||
val attachIntent: Observable<Unit>
|
val attachIntent: Observable<Unit>
|
||||||
val sendIntent: Observable<Unit>
|
val sendIntent: Observable<Unit>
|
||||||
|
|
||||||
|
fun showMenu(menuItems: List<MenuItem>)
|
||||||
fun setDraft(draft: String)
|
fun setDraft(draft: String)
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -31,6 +31,7 @@ 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
|
||||||
@@ -88,6 +89,10 @@ 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>>
|
||||||
|
|
||||||
|
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 {
|
init {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
|
|
||||||
@@ -303,6 +308,31 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe()
|
.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
|
// Save draft when the activity goes into the background
|
||||||
view.activityVisibleIntent
|
view.activityVisibleIntent
|
||||||
.filter { visible -> !visible }
|
.filter { visible -> !visible }
|
||||||
@@ -398,27 +428,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
})
|
})
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe()
|
.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) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -42,13 +42,6 @@
|
|||||||
<string name="main_syncing">Optimizing database, this might take a minute…</string>
|
<string name="main_syncing">Optimizing database, this might take a minute…</string>
|
||||||
<string name="main_sender_you">You: %s</string>
|
<string name="main_sender_you">You: %s</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="message_status_sending">Sending…</string>
|
|
||||||
<string name="message_status_delivered">Delivered %s</string>
|
|
||||||
<string name="message_status_failed">Failed to send. Tap to try again</string>
|
|
||||||
|
|
||||||
<string name="drawer_inbox">Inbox</string>
|
<string name="drawer_inbox">Inbox</string>
|
||||||
<string name="drawer_archived">Archived</string>
|
<string name="drawer_archived">Archived</string>
|
||||||
<string name="drawer_scheduled">Scheduled</string>
|
<string name="drawer_scheduled">Scheduled</string>
|
||||||
@@ -69,6 +62,22 @@
|
|||||||
<string name="dialog_delete_title">Delete</string>
|
<string name="dialog_delete_title">Delete</string>
|
||||||
<string name="dialog_delete_message">Are you sure you would like to delete this conversation?</string>
|
<string name="dialog_delete_message">Are you sure you would like to delete this conversation?</string>
|
||||||
|
|
||||||
|
<string-array name="message_options">
|
||||||
|
<item>Copy text</item>
|
||||||
|
<item>Forward</item>
|
||||||
|
<item>Delete</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<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_menu_copy">Copy text</string>
|
||||||
|
<string name="compose_menu_forward">Forward</string>
|
||||||
|
<string name="compose_menu_delete">Delete</string>
|
||||||
|
|
||||||
|
<string name="message_status_sending">Sending…</string>
|
||||||
|
<string name="message_status_delivered">Delivered %s</string>
|
||||||
|
<string name="message_status_failed">Failed to send. Tap to try again</string>
|
||||||
|
|
||||||
<string name="info_title">Details</string>
|
<string name="info_title">Details</string>
|
||||||
<string name="info_notifications">Notifications</string>
|
<string name="info_notifications">Notifications</string>
|
||||||
<string name="info_theme">Theme</string>
|
<string name="info_theme">Theme</string>
|
||||||
@@ -176,12 +185,6 @@
|
|||||||
<string name="notification_message_failed_title">Message not sent</string>
|
<string name="notification_message_failed_title">Message not sent</string>
|
||||||
<string name="notification_message_failed_text">The message to %s failed to send</string>
|
<string name="notification_message_failed_text">The message to %s failed to send</string>
|
||||||
|
|
||||||
<string-array name="message_options">
|
|
||||||
<item>Copy text</item>
|
|
||||||
<item>Forward</item>
|
|
||||||
<item>Delete</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
<string-array name="night_modes">
|
<string-array name="night_modes">
|
||||||
<item>Disabled</item>
|
<item>Disabled</item>
|
||||||
<item>Always on</item>
|
<item>Always on</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user