feat: Revamp searchScreen to show message previews in results

PR: #143

Signed-off-by: Saalim Quadri <danascape@gmail.com>

Author: Shubham-344

data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt

@@ -41,6 +41,7 @@ import org.prauga.messages.model.Conversation
 import org.prauga.messages.model.Message
 import org.prauga.messages.model.Recipient
 import org.prauga.messages.model.SearchResult
+import org.prauga.messages.model.SearchItem
 import org.prauga.messages.util.PhoneNumberUtils
 import org.prauga.messages.util.tryOrNull
 import java.util.concurrent.TimeUnit
@@ -207,6 +208,77 @@ class ConversationRepositoryImpl @Inject constructor(
         return conversationMatches + messagesByConversation
     }
 
+    override fun searchConversationsGrouped(query: CharSequence): List<SearchItem> {
+        val realm = Realm.getDefaultInstance()
+
+        val normalizedQuery = query.removeAccents()
+        val conversations = realm.copyFromRealm(
+            realm
+                .where(Conversation::class.java)
+                .notEqualTo("id", 0L)
+                .isNotNull("lastMessage")
+                .equalTo("blocked", false)
+                .isNotEmpty("recipients")
+                .sort("pinned", Sort.DESCENDING, "lastMessage.date", Sort.DESCENDING)
+                .findAll()
+        )
+
+        val conversationsById = conversations.associateBy { it.id }
+
+        // Get all messages matching the query, grouped by conversation
+        val messagesByConversation = realm.copyFromRealm(
+            realm
+                .where(Message::class.java)
+                .beginGroup()
+                .contains("body", normalizedQuery, Case.INSENSITIVE)
+                .or()
+                .contains("parts.text", normalizedQuery, Case.INSENSITIVE)
+                .endGroup()
+                .sort("date", Sort.DESCENDING)
+                .findAll()
+        )
+            .groupBy { message -> message.threadId }
+            .mapNotNull { (threadId, messages) ->
+                conversationsById[threadId]?.let { conversation ->
+                    Pair(conversation, messages)
+                }
+            }
+            .sortedByDescending { (_, messages) -> messages.size }
+
+        realm.close()
+
+        // Build the flattened list with headers and messages
+        val result = mutableListOf<SearchItem>()
+        
+        messagesByConversation.forEach { (conversation, messages) ->
+            // Add conversation header
+            result.add(SearchItem.Header(
+                conversationId = conversation.id,
+                title = conversation.getTitle()
+            ))
+            
+            // Add matching messages
+            messages.forEach { message ->
+                val body = when {
+                    message.body.isNotEmpty() -> message.body
+                    message.parts.isNotEmpty() -> message.parts.firstOrNull()?.text ?: ""
+                    else -> ""
+                }
+                
+                if (body.isNotEmpty()) {
+                    result.add(SearchItem.Message(
+                        messageId = message.id,
+                        conversationId = conversation.id,
+                        body = body,
+                        timestamp = message.date
+                    ))
+                }
+            }
+        }
+
+        return result
+    }
+
     override fun getBlockedConversations(): RealmResults<Conversation> =
         Realm.getDefaultInstance()
             .where(Conversation::class.java)

domain/src/main/java/com/moez/QKSMS/model/SearchItem.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2025 Saalim Quadri <danascape@gmail.com>
+ */
+
+package org.prauga.messages.model
+
+sealed class SearchItem {
+    data class Header(
+        val conversationId: Long,
+        val title: String
+    ) : SearchItem()
+
+    data class Message(
+        val messageId: Long,
+        val conversationId: Long,
+        val body: String,
+        val timestamp: Long
+    ) : SearchItem()
+}

domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt

@@ -44,6 +44,8 @@ interface ConversationRepository {
 
     fun searchConversations(query: CharSequence): List<SearchResult>
 
+    fun searchConversationsGrouped(query: CharSequence): List<org.prauga.messages.model.SearchItem>
+
     fun getBlockedConversations(): RealmResults<Conversation>
 
     fun getBlockedConversationsAsync(): RealmResults<Conversation>

presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt

@@ -150,6 +150,13 @@ class Navigator @Inject constructor(
         startActivity(intent)
     }
 
+    fun showConversation(threadId: Long, messageId: Long) {
+        val intent = Intent(context, ComposeActivity::class.java)
+            .putExtra("threadId", threadId)
+            .putExtra("messageId", messageId)
+        startActivity(intent)
+    }
+
     fun showConversationInfo(threadId: Long) {
         val intent = Intent(context, ConversationInfoActivity::class.java)
         intent.putExtra("threadId", threadId)

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt

@@ -41,6 +41,11 @@ class ComposeActivityModule {
     fun provideThreadId(activity: ComposeActivity): Long =
         activity.intent.extras?.getLong("threadId") ?: 0L
 
+    @Provides
+    @Named("messageId")
+    fun provideMessageId(activity: ComposeActivity): Long =
+        activity.intent.extras?.getLong("messageId") ?: 0L
+
     @Provides
     @Named("addresses")
     fun provideAddresses(activity: ComposeActivity): List<String> =

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt

@@ -92,12 +92,14 @@ import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.UUID
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Named
 
 class ComposeViewModel @Inject constructor(
     @Named("query") private val query: String,
     @Named("threadId") private val threadId: Long,
+    @Named("messageId") private val messageId: Long,
     @Named("addresses") private val addresses: List<String>,
     @Named("text") private val sharedText: String,
     @Named("attachments") val sharedAttachments: List<Attachment>,
@@ -312,6 +314,19 @@ class ComposeViewModel @Inject constructor(
             return
         }
 
+        // Scroll to specific message if messageId was provided
+        if (messageId != 0L) {
+            disposables += messages
+                .filter { it.isNotEmpty() }
+                .take(1)
+                .delay(300, TimeUnit.MILLISECONDS) // Small delay to ensure UI is ready
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDispose(view.scope())
+                .subscribe { 
+                    view.scrollToMessage(messageId)
+                }
+        }
+
         val sharing = (sharedText.isNotEmpty() || sharedAttachments.isNotEmpty())
         if (shouldShowContacts) {
             shouldShowContacts = false

presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt

@@ -210,6 +210,11 @@ class MainActivity : QkThemedActivity<MainActivityBinding>(MainActivityBinding::
         itemTouchCallback.adapter = conversationsAdapter
         conversationsAdapter.autoScrollToStart(binding.recyclerView)
 
+        // Setup search adapter click listener
+        searchAdapter.onMessageClickListener = { conversationId, messageId ->
+            navigator.showConversation(conversationId, messageId)
+        }
+
         binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
@@ -403,6 +408,7 @@ class MainActivity : QkThemedActivity<MainActivityBinding>(MainActivityBinding::
                 if (binding.recyclerView.adapter !== searchAdapter) binding.recyclerView.adapter =
                     searchAdapter
                 searchAdapter.data = state.page.data ?: listOf()
+                searchAdapter.setQuery(binding.toolbarSearch.text.toString())
                 itemTouchHelper.attachToRecyclerView(null)
                 binding.empty.setText(R.string.inbox_search_empty_text)
             }

presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt

@@ -22,6 +22,7 @@ package org.prauga.messages.feature.main
 import io.realm.RealmResults
 import org.prauga.messages.model.Conversation
 import org.prauga.messages.model.SearchResult
+import org.prauga.messages.model.SearchItem
 import org.prauga.messages.repository.SyncRepository
 
 data class MainState(
@@ -51,7 +52,7 @@ data class Inbox(
 
 data class Searching(
     val loading: Boolean = false,
-    val data: List<SearchResult>? = null
+    val data: List<SearchItem>? = null
 ) : MainPage()
 
 data class Archived(

presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt

@@ -52,6 +52,7 @@ import org.prauga.messages.manager.ChangelogManager
 import org.prauga.messages.manager.PermissionManager
 import org.prauga.messages.manager.RatingManager
 import org.prauga.messages.model.EmojiSyncNeeded
+import org.prauga.messages.model.SearchItem
 import org.prauga.messages.model.SearchResult
 import org.prauga.messages.model.SyncLog
 import org.prauga.messages.repository.ConversationRepository
@@ -307,13 +308,13 @@ class MainViewModel @Inject constructor(
                                 }
                             }
                         }
-                        Observable.empty<List<SearchResult>>()
+                        Observable.empty<List<SearchItem>>()
                     } else {
                         newState {
                             val page = (page as? Searching) ?: Searching()
                             copy(page = page.copy(loading = true))
                         }
-                        Observable.fromCallable { conversationRepo.searchConversations(query) }
+                        Observable.fromCallable { conversationRepo.searchConversationsGrouped(query) }
                             .subscribeOn(Schedulers.io())
                     }
                 }