From 25f4716572f387b745e5fda31e4b57747a24f5b7 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 19 Jul 2025 16:28:44 -0700 Subject: [PATCH] Add Mark Unread action to conversation settings --- .../src/main/java/com/moez/QKSMS/common/Navigator.kt | 6 ++++++ .../conversationinfo/ConversationInfoAdapter.kt | 2 ++ .../conversationinfo/ConversationInfoController.kt | 4 ++-- .../conversationinfo/ConversationInfoPresenter.kt | 10 ++++++++++ .../feature/conversationinfo/ConversationInfoView.kt | 1 + .../src/main/res/layout/conversation_info_settings.xml | 7 +++++++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index d867e794..92167d1b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -36,6 +36,7 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoActivity import dev.octoshrimpy.quik.feature.gallery.GalleryActivity +import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity import dev.octoshrimpy.quik.feature.plus.PlusActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity @@ -92,6 +93,11 @@ class Navigator @Inject constructor( } } + fun showMainActivity() { + val intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + fun showCompose(body: String? = null, attachments: List? = null, mode: String? = null) { val intent = Intent(context, ComposeActivity::class.java) intent.putExtra(Intent.EXTRA_TEXT, body) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt index 35182204..e34663e9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt @@ -31,6 +31,7 @@ class ConversationInfoAdapter @Inject constructor( val themeClicks: Subject = PublishSubject.create() val nameClicks: Subject = PublishSubject.create() val notificationClicks: Subject = PublishSubject.create() + val markUnreadClicks: Subject = PublishSubject.create() val archiveClicks: Subject = PublishSubject.create() val blockClicks: Subject = PublishSubject.create() val deleteClicks: Subject = PublishSubject.create() @@ -60,6 +61,7 @@ class ConversationInfoAdapter @Inject constructor( 1 -> QkViewHolder(inflater.inflate(R.layout.conversation_info_settings, parent, false)).apply { groupName.clicks().subscribe(nameClicks) notifications.clicks().subscribe(notificationClicks) + markUnread.clicks().subscribe(markUnreadClicks) archive.clicks().subscribe(archiveClicks) block.clicks().subscribe(blockClicks) delete.clicks().subscribe(deleteClicks) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index e8a6c66a..e7c64578 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -102,6 +102,7 @@ class ConversationInfoController( override fun nameClicks(): Observable<*> = adapter.nameClicks override fun nameChanges(): Observable = nameChangeSubject override fun notificationClicks(): Observable<*> = adapter.notificationClicks + override fun markUnreadClicks(): Observable<*> = adapter.markUnreadClicks override fun archiveClicks(): Observable<*> = adapter.archiveClicks override fun blockClicks(): Observable<*> = adapter.blockClicks override fun deleteClicks(): Observable<*> = adapter.deleteClicks @@ -132,5 +133,4 @@ class ConversationInfoController( .setNegativeButton(R.string.button_cancel, null) .show() } - -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index f642444f..209c56fe 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -34,6 +34,7 @@ import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoItem.Conver import dev.octoshrimpy.quik.interactor.DeleteConversations import dev.octoshrimpy.quik.interactor.MarkArchived import dev.octoshrimpy.quik.interactor.MarkUnarchived +import dev.octoshrimpy.quik.interactor.MarkUnread import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.model.Conversation import dev.octoshrimpy.quik.repository.ConversationRepository @@ -53,6 +54,7 @@ class ConversationInfoPresenter @Inject constructor( private val context: Context, private val conversationRepo: ConversationRepository, private val deleteConversations: DeleteConversations, + private val markUnread: MarkUnread, private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val navigator: Navigator, @@ -158,6 +160,14 @@ class ConversationInfoPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) } + view.markUnreadClicks() + .withLatestFrom(conversation) { _, conversation -> conversation } + .autoDisposable(view.scope()) + .subscribe {conversation -> + markUnread.execute(listOf(conversation.id)) + navigator.showMainActivity() + } + // Toggle the archived state of the conversation view.archiveClicks() .withLatestFrom(conversation) { _, conversation -> conversation } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt index b0ab0561..cf0124bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt @@ -29,6 +29,7 @@ interface ConversationInfoView : QkViewContract { fun nameClicks(): Observable<*> fun nameChanges(): Observable fun notificationClicks(): Observable<*> + fun markUnreadClicks(): Observable<*> fun archiveClicks(): Observable<*> fun blockClicks(): Observable<*> fun deleteClicks(): Observable<*> diff --git a/presentation/src/main/res/layout/conversation_info_settings.xml b/presentation/src/main/res/layout/conversation_info_settings.xml index 2a52ef13..53715b64 100644 --- a/presentation/src/main/res/layout/conversation_info_settings.xml +++ b/presentation/src/main/res/layout/conversation_info_settings.xml @@ -43,6 +43,13 @@ app:icon="@drawable/ic_notifications_black_24dp" app:title="@string/info_notifications" /> + +