From 3bf1e710225058335b36342ea0adf04cf84443d8 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 19 Jul 2025 12:02:10 -0700 Subject: [PATCH] Expose both mark read and unread in conversation screen It doesn't clutter the UI too much, and can be useful if people want to mark all the conversations one way or the other. --- .../main/java/com/moez/QKSMS/feature/main/MainActivity.kt | 6 ++++-- .../main/java/com/moez/QKSMS/feature/main/MainViewModel.kt | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 51d6a22e..89980cee 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -255,8 +255,10 @@ class MainActivity : QkThemedActivity(), MainView { findItem(R.id.add)?.isVisible = addContact && selectedConversations != 0 findItem(R.id.pin)?.isVisible = markPinned && selectedConversations != 0 findItem(R.id.unpin)?.isVisible = !markPinned && selectedConversations != 0 - findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0 - findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0 + findItem(R.id.read)?.isVisible = ( markRead && selectedConversations != 0 ) || + selectedConversations > 1 + findItem(R.id.unread)?.isVisible = ( !markRead && selectedConversations != 0 ) || + selectedConversations > 1 findItem(R.id.block)?.isVisible = selectedConversations != 0 findItem(R.id.rename)?.isVisible = selectedConversations == 1 } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 32d0409d..36a4d96a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -467,7 +467,11 @@ class MainViewModel @Inject constructor( ?.recipients?.first() ?.takeIf { recipient -> recipient.contact == null } != null val pin = conversations.sumBy { if (it.pinned) -1 else 1 } >= 0 - val read = conversations.sumBy { if (!it.unread) -1 else 1 } >= 0 + val read = when (conversations.size) { + 0 -> false + 1 -> conversations[0].unread + else -> true + } val selected = selection.size when (state.page) {