added select all actionbar item on main (inc archived) and compose activities. item becomes available when first item selected. menu item toggles select all/select none.

added indefinite timeout to archive snackbar on conversations activity when >= 10 conversations are archived at once. in case of accidental mass archive gives user more time to undo.

added 'show status' menu item on compose activity that does the same as short touching on an item (exapnds it to show time, etc) but cn be applied to multiple selected items at once.
This commit is contained in:
gavine99
2025-01-19 14:36:39 +11:00
parent 75c5b1acb6
commit c746c0ae7f
11 changed files with 160 additions and 24 deletions
@@ -73,6 +73,7 @@ import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.*
import kotlinx.android.synthetic.main.main_activity.toolbar
import java.text.SimpleDateFormat
import java.util.*
import javax.inject.Inject
@@ -256,6 +257,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
// Don't set the adapters unless needed
if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter
toolbar.menu.findItem(R.id.select_all)?.isVisible = !state.editingMode && (messageAdapter.itemCount > 1) && state.selectedMessages != 0
toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode
toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0
&& state.query.isEmpty()
@@ -265,6 +267,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
toolbar.menu.findItem(R.id.details)?.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
toolbar.menu.findItem(R.id.show_status)?.isVisible = !state.editingMode && state.selectedMessages > 0
toolbar.menu.findItem(R.id.previous)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
toolbar.menu.findItem(R.id.next)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
toolbar.menu.findItem(R.id.clear)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
@@ -322,6 +325,14 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override fun clearSelection() = messageAdapter.clearSelection()
override fun toggleSelectAll() {
messageAdapter.toggleSelectAll()
}
override fun expandMessages(messageIds: List<Long>, expand: Boolean) {
messageAdapter.expandMessages(messageIds, expand)
}
override fun showDetails(details: String) {
AlertDialog.Builder(this)
.setTitle(R.string.compose_details_title)
@@ -58,6 +58,8 @@ interface ComposeView : QkView<ComposeState> {
val confirmDeleteIntent: Observable<List<Long>>
fun clearSelection()
fun toggleSelectAll()
fun expandMessages(messageIds: List<Long>, expand: Boolean)
fun showDetails(details: String)
fun requestDefaultSms()
fun requestStoragePermission()
@@ -310,6 +310,12 @@ class ComposeViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe { newState { copy() } }
// toggle select all / select none
view.optionsItemIntent
.filter { it == R.id.select_all }
.autoDisposable(view.scope())
.subscribe { view.toggleSelectAll() }
// Open the phone dialer if the call button is clicked
view.optionsItemIntent
.filter { it == R.id.call }
@@ -369,15 +375,25 @@ class ComposeViewModel @Inject constructor(
// 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.getText(), images)
}
.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.getText(), images)
}
.autoDisposable(view.scope())
.subscribe { view.clearSelection() }
}
.autoDisposable(view.scope())
.subscribe { view.clearSelection() }
// expand message to show additional info
view.optionsItemIntent
.filter { it == R.id.show_status }
.withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages }
.autoDisposable(view.scope())
.subscribe { messageIds ->
view.expandMessages(messageIds, true)
view.clearSelection()
}
// Show the previous search result
view.optionsItemIntent
@@ -21,7 +21,6 @@ package dev.octoshrimpy.quik.feature.compose
import android.animation.ObjectAnimator
import android.content.Context
import android.graphics.Typeface
import android.os.Build
import android.text.Layout
import android.text.Spannable
import android.text.SpannableString
@@ -315,6 +314,10 @@ class MessagesAdapter @Inject constructor(
})
}
override fun getItemId(position: Int): Long {
return getItem(position)?.id ?: -1
}
override fun getItemViewType(position: Int): Int {
val message = getItem(position) ?: return -1
return when (message.isMe()) {
@@ -323,6 +326,35 @@ class MessagesAdapter @Inject constructor(
}
}
fun toggleSelectAll() {
var needToSelectAll = false
// if a non-selected item is found, then we need to select all, otherwise deselect all
for (position in 0 until itemCount)
if (!isSelected(getItemId(position))) {
needToSelectAll = true
break
}
// select or deselect item based on if toggling all selected of deselected
for (position in 0 until itemCount) {
val messageId = getItemId(position)
// if deselecting all then toggle selection (we know all items are selected)
if (!needToSelectAll)
toggleSelection(messageId)
// else, selecting all, toggle if not already selected
else if (!isSelected(messageId))
toggleSelection(messageId)
}
notifyDataSetChanged()
}
fun expandMessages(messageIds: List<Long>, expand: Boolean) {
messageIds.forEach { messageId -> expanded[messageId] = expand }
notifyDataSetChanged()
}
/**
* Cache the contacts in a map by the address, because the messages we're binding don't have
* a reference to the contact.
@@ -130,4 +130,28 @@ class ConversationsAdapter @Inject constructor(
override fun getItemViewType(position: Int): Int {
return if (getItem(position)?.unread == false) 0 else 1
}
fun toggleSelectAll() {
var needToSelectAll = false
// if a non-selected item is found, then we need to select all, otherwise deselect all
for (position in 0 until itemCount)
if (!isSelected(getItemId(position))) {
needToSelectAll = true
break
}
// select or deselect item based on if toggling all selected of deselected
for (position in 0 until itemCount) {
val threadId = getItemId(position)
// if deselecting all then toggle selection (we know all items are selected)
if (!needToSelectAll)
toggleSelection(threadId)
// else, selecting all, toggle if not already selected
else if (!isSelected(threadId))
toggleSelection(threadId)
}
notifyDataSetChanged()
}
}
@@ -225,6 +225,7 @@ class MainActivity : QkThemedActivity(), MainView {
toolbarSearch.setVisible(state.page is Inbox && state.page.selected == 0 || state.page is Searching)
toolbarTitle.setVisible(toolbarSearch.visibility != View.VISIBLE)
toolbar.menu.findItem(R.id.select_all)?.isVisible = (conversationsAdapter.itemCount > 1) && selectedConversations != 0
toolbar.menu.findItem(R.id.archive)?.isVisible = state.page is Inbox && selectedConversations != 0
toolbar.menu.findItem(R.id.unarchive)?.isVisible = state.page is Archived && selectedConversations != 0
toolbar.menu.findItem(R.id.delete)?.isVisible = selectedConversations != 0
@@ -380,6 +381,10 @@ class MainActivity : QkThemedActivity(), MainView {
conversationsAdapter.clearSelection()
}
override fun toggleSelectAll() {
conversationsAdapter.toggleSelectAll()
}
override fun themeChanged() {
recyclerView.scrapViews()
}
@@ -402,8 +407,12 @@ class MainActivity : QkThemedActivity(), MainView {
changelogDialog.show(changelog)
}
override fun showArchivedSnackbar() {
Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_LONG).apply {
override fun showArchivedSnackbar(countConversationsArchived: Int) {
Snackbar.make(
drawerLayout,
resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived),
if (countConversationsArchived < 10) Snackbar.LENGTH_LONG else Snackbar.LENGTH_INDEFINITE
).apply {
setAction(R.string.button_undo) { undoArchiveIntent.onNext(Unit) }
setActionTextColor(colors.theme().theme)
show()
@@ -47,11 +47,12 @@ interface MainView : QkView<MainState> {
fun requestPermissions()
fun clearSearch()
fun clearSelection()
fun toggleSelectAll()
fun themeChanged()
fun showBlockingDialog(conversations: List<Long>, block: Boolean)
fun showDeleteDialog(conversations: List<Long>)
fun showChangelog(changelog: ChangelogManager.CumulativeChangelog)
fun showArchivedSnackbar()
fun showArchivedSnackbar(countConversationsArchived: Int)
}
@@ -18,9 +18,6 @@
*/
package dev.octoshrimpy.quik.feature.main
import android.content.Intent
import android.net.Uri
import android.provider.Settings
import androidx.recyclerview.widget.ItemTouchHelper
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.Navigator
@@ -84,6 +81,7 @@ class MainViewModel @Inject constructor(
private val syncContacts: SyncContacts,
private val syncMessages: SyncMessages
) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations(prefs.unreadAtTop.get())))) {
private val lastArchivedThreadIds = ArrayList<Long>()
init {
disposables += deleteConversations
@@ -333,10 +331,18 @@ class MainViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe()
view.optionsItemIntent
.filter { itemId -> itemId == R.id.select_all }
.autoDisposable(view.scope())
.subscribe { view.toggleSelectAll() }
view.optionsItemIntent
.filter { itemId -> itemId == R.id.archive }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markArchived.execute(conversations)
lastArchivedThreadIds.clear()
conversations.forEach { conversation -> lastArchivedThreadIds.add(conversation) }
view.showArchivedSnackbar(conversations.count())
view.clearSelection()
}
.autoDisposable(view.scope())
@@ -346,6 +352,7 @@ class MainViewModel @Inject constructor(
.filter { itemId -> itemId == R.id.unarchive }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markUnarchived.execute(conversations)
view.showArchivedSnackbar(conversations.count())
view.clearSelection()
}
.autoDisposable(view.scope())
@@ -481,7 +488,12 @@ class MainViewModel @Inject constructor(
.subscribe { (threadId, direction) ->
val action = if (direction == ItemTouchHelper.RIGHT) prefs.swipeRight.get() else prefs.swipeLeft.get()
when (action) {
Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) { view.showArchivedSnackbar() }
Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId))
{
lastArchivedThreadIds.clear()
lastArchivedThreadIds.add(threadId)
view.showArchivedSnackbar(1)
}
Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId))
Preferences.SWIPE_ACTION_BLOCK -> view.showBlockingDialog(listOf(threadId), true)
Preferences.SWIPE_ACTION_CALL -> conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address?.let(navigator::makePhoneCall)
@@ -492,9 +504,11 @@ class MainViewModel @Inject constructor(
}
view.undoArchiveIntent
.withLatestFrom(view.swipeConversationIntent) { _, pair -> pair.first }
.autoDisposable(view.scope())
.subscribe { threadId -> markUnarchived.execute(listOf(threadId)) }
.subscribe {
markUnarchived.execute(lastArchivedThreadIds)
lastArchivedThreadIds.clear()
}
view.snackbarButtonIntent
.withLatestFrom(state) { _, state ->