Merge pull request #361 from OpenHub-Store/search-ux-impr

rainxchzed · web-flow · commit b0f8d2142cd5 · 2026-03-26T12:16:15.000+05:00
diff --git a/core/data/schemas/zed.rainxch.core.data.local.db.AppDatabase/7.json b/core/data/schemas/zed.rainxch.core.data.local.db.AppDatabase/7.json
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/di/SharedModule.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/di/SharedModule.kt
@@ -15,6 +15,7 @@ import zed.rainxch.core.data.local.db.AppDatabase
 import zed.rainxch.core.data.local.db.dao.CacheDao
 import zed.rainxch.core.data.local.db.dao.FavoriteRepoDao
 import zed.rainxch.core.data.local.db.dao.InstalledAppDao
+import zed.rainxch.core.data.local.db.dao.SearchHistoryDao
 import zed.rainxch.core.data.local.db.dao.SeenRepoDao
 import zed.rainxch.core.data.local.db.dao.StarredRepoDao
 import zed.rainxch.core.data.local.db.dao.UpdateHistoryDao
@@ -27,6 +28,7 @@ import zed.rainxch.core.data.repository.FavouritesRepositoryImpl
 import zed.rainxch.core.data.repository.InstalledAppsRepositoryImpl
 import zed.rainxch.core.data.repository.ProxyRepositoryImpl
 import zed.rainxch.core.data.repository.RateLimitRepositoryImpl
+import zed.rainxch.core.data.repository.SearchHistoryRepositoryImpl
 import zed.rainxch.core.data.repository.SeenReposRepositoryImpl
 import zed.rainxch.core.data.repository.StarredRepositoryImpl
 import zed.rainxch.core.data.repository.TweaksRepositoryImpl
@@ -39,6 +41,7 @@ import zed.rainxch.core.domain.repository.FavouritesRepository
 import zed.rainxch.core.domain.repository.InstalledAppsRepository
 import zed.rainxch.core.domain.repository.ProxyRepository
 import zed.rainxch.core.domain.repository.RateLimitRepository
+import zed.rainxch.core.domain.repository.SearchHistoryRepository
 import zed.rainxch.core.domain.repository.SeenReposRepository
 import zed.rainxch.core.domain.repository.StarredRepository
 import zed.rainxch.core.domain.repository.TweaksRepository
@@ -103,6 +106,12 @@ val coreModule =
             )
         }
 
+        single<SearchHistoryRepository> {
+            SearchHistoryRepositoryImpl(
+                searchHistoryDao = get(),
+            )
+        }
+
         single<ProxyRepository> {
             ProxyRepositoryImpl(
                 preferences = get(),
@@ -216,4 +225,8 @@ val databaseModule =
         single<SeenRepoDao> {
             get<AppDatabase>().seenRepoDao
         }
+
+        single<SearchHistoryDao> {
+            get<AppDatabase>().searchHistoryDao
+        }
     }
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/AppDatabase.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/AppDatabase.kt
@@ -5,12 +5,14 @@ import androidx.room.RoomDatabase
 import zed.rainxch.core.data.local.db.dao.CacheDao
 import zed.rainxch.core.data.local.db.dao.FavoriteRepoDao
 import zed.rainxch.core.data.local.db.dao.InstalledAppDao
+import zed.rainxch.core.data.local.db.dao.SearchHistoryDao
 import zed.rainxch.core.data.local.db.dao.SeenRepoDao
 import zed.rainxch.core.data.local.db.dao.StarredRepoDao
 import zed.rainxch.core.data.local.db.dao.UpdateHistoryDao
 import zed.rainxch.core.data.local.db.entities.CacheEntryEntity
 import zed.rainxch.core.data.local.db.entities.FavoriteRepoEntity
 import zed.rainxch.core.data.local.db.entities.InstalledAppEntity
+import zed.rainxch.core.data.local.db.entities.SearchHistoryEntity
 import zed.rainxch.core.data.local.db.entities.SeenRepoEntity
 import zed.rainxch.core.data.local.db.entities.StarredRepositoryEntity
 import zed.rainxch.core.data.local.db.entities.UpdateHistoryEntity
@@ -23,8 +25,9 @@ import zed.rainxch.core.data.local.db.entities.UpdateHistoryEntity
         StarredRepositoryEntity::class,
         CacheEntryEntity::class,
         SeenRepoEntity::class,
+        SearchHistoryEntity::class,
     ],
-    version = 6,
+    version = 7,
     exportSchema = true,
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -34,4 +37,5 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val starredReposDao: StarredRepoDao
     abstract val cacheDao: CacheDao
     abstract val seenRepoDao: SeenRepoDao
+    abstract val searchHistoryDao: SearchHistoryDao
 }
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/dao/SearchHistoryDao.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/dao/SearchHistoryDao.kt
@@ -0,0 +1,23 @@
+package zed.rainxch.core.data.local.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+import zed.rainxch.core.data.local.db.entities.SearchHistoryEntity
+
+@Dao
+interface SearchHistoryDao {
+    @Query("SELECT * FROM search_history ORDER BY searchedAt DESC LIMIT 20")
+    fun getRecentSearches(): Flow<List<SearchHistoryEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(entity: SearchHistoryEntity)
+
+    @Query("DELETE FROM search_history WHERE `query` = :query")
+    suspend fun deleteByQuery(query: String)
+
+    @Query("DELETE FROM search_history")
+    suspend fun clearAll()
+}
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/entities/SearchHistoryEntity.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/entities/SearchHistoryEntity.kt
@@ -0,0 +1,11 @@
+package zed.rainxch.core.data.local.db.entities
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "search_history")
+data class SearchHistoryEntity(
+    @PrimaryKey
+    val query: String,
+    val searchedAt: Long,
+)
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/SearchHistoryRepositoryImpl.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/SearchHistoryRepositoryImpl.kt
@@ -0,0 +1,36 @@
+package zed.rainxch.core.data.repository
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlin.time.Clock
+import zed.rainxch.core.data.local.db.dao.SearchHistoryDao
+import zed.rainxch.core.data.local.db.entities.SearchHistoryEntity
+import zed.rainxch.core.domain.repository.SearchHistoryRepository
+
+class SearchHistoryRepositoryImpl(
+    private val searchHistoryDao: SearchHistoryDao,
+) : SearchHistoryRepository {
+    override fun getRecentSearches(): Flow<List<String>> =
+        searchHistoryDao.getRecentSearches().map { entities ->
+            entities.map { it.query }
+        }
+
+    override suspend fun addSearch(query: String) {
+        val trimmed = query.trim()
+        if (trimmed.isBlank()) return
+        searchHistoryDao.insert(
+            SearchHistoryEntity(
+                query = trimmed,
+                searchedAt = Clock.System.now().toEpochMilliseconds(),
+            ),
+        )
+    }
+
+    override suspend fun removeSearch(query: String) {
+        searchHistoryDao.deleteByQuery(query)
+    }
+
+    override suspend fun clearAll() {
+        searchHistoryDao.clearAll()
+    }
+}
diff --git a/core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/repository/SearchHistoryRepository.kt b/core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/repository/SearchHistoryRepository.kt
@@ -0,0 +1,13 @@
+package zed.rainxch.core.domain.repository
+
+import kotlinx.coroutines.flow.Flow
+
+interface SearchHistoryRepository {
+    fun getRecentSearches(): Flow<List<String>>
+
+    suspend fun addSearch(query: String)
+
+    suspend fun removeSearch(query: String)
+
+    suspend fun clearAll()
+}
diff --git a/core/presentation/src/commonMain/composeResources/values-ar/strings-ar.xml b/core/presentation/src/commonMain/composeResources/values-ar/strings-ar.xml
@@ -614,4 +614,8 @@
     <string name="delete_downloads_confirmation_message">سيؤدي هذا إلى حذف جميع ملفات APK والمثبتات نهائيًا (%1$s). يمكنك إعادة تنزيلها في أي وقت.</string>
     <string name="downloads_cleared">تم حذف جميع الحزم التي تم تنزيلها.</string>
     <string name="unable_to_verify_attestation">تعذر التحقق</string>
+
+    <string name="recent_searches">عمليات البحث الأخيرة</string>
+    <string name="clear_all_history">مسح الكل</string>
+    <string name="remove_search_history_item">إزالة</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-bn/strings-bn.xml b/core/presentation/src/commonMain/composeResources/values-bn/strings-bn.xml
@@ -613,4 +613,8 @@
     <string name="delete_downloads_confirmation_message">এটি সব APK এবং ইনস্টলার স্থায়ীভাবে মুছে ফেলবে (%1$s)। আপনি যেকোনো সময় আবার ডাউনলোড করতে পারবেন।</string>
     <string name="downloads_cleared">সব ডাউনলোড করা প্যাকেজ মুছে ফেলা হয়েছে।</string>
     <string name="unable_to_verify_attestation">যাচাই করা যায়নি</string>
+
+    <string name="recent_searches">সাম্প্রতিক অনুসন্ধান</string>
+    <string name="clear_all_history">সব মুছুন</string>
+    <string name="remove_search_history_item">সরান</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-es/strings-es.xml b/core/presentation/src/commonMain/composeResources/values-es/strings-es.xml
@@ -574,4 +574,8 @@
     <string name="delete_downloads_confirmation_message">Esto eliminará permanentemente todos los APKs e instaladores (%1$s). Puedes volver a descargarlos en cualquier momento.</string>
     <string name="downloads_cleared">Todos los paquetes descargados han sido eliminados.</string>
     <string name="unable_to_verify_attestation">No se pudo verificar</string>
+
+    <string name="recent_searches">Búsquedas recientes</string>
+    <string name="clear_all_history">Borrar todo</string>
+    <string name="remove_search_history_item">Eliminar</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-fr/strings-fr.xml b/core/presentation/src/commonMain/composeResources/values-fr/strings-fr.xml
@@ -575,4 +575,8 @@
     <string name="delete_downloads_confirmation_message">Cela supprimera définitivement tous les APK et installateurs (%1$s). Vous pouvez les télécharger à nouveau à tout moment.</string>
     <string name="downloads_cleared">Tous les paquets téléchargés ont été supprimés.</string>
     <string name="unable_to_verify_attestation">Impossible de vérifier</string>
+
+    <string name="recent_searches">Recherches récentes</string>
+    <string name="clear_all_history">Tout effacer</string>
+    <string name="remove_search_history_item">Supprimer</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-hi/strings-hi.xml b/core/presentation/src/commonMain/composeResources/values-hi/strings-hi.xml
@@ -612,4 +612,8 @@
     <string name="delete_downloads_confirmation_message">यह सभी APK और इंस्टॉलर को स्थायी रूप से हटा देगा (%1$s)। आप उन्हें कभी भी फिर से डाउनलोड कर सकते हैं।</string>
     <string name="downloads_cleared">सभी डाउनलोड किए गए पैकेज हटा दिए गए हैं।</string>
     <string name="unable_to_verify_attestation">सत्यापित नहीं किया जा सका</string>
+
+    <string name="recent_searches">हाल की खोजें</string>
+    <string name="clear_all_history">सभी साफ करें</string>
+    <string name="remove_search_history_item">हटाएँ</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-it/strings-it.xml b/core/presentation/src/commonMain/composeResources/values-it/strings-it.xml
@@ -613,4 +613,8 @@
     <string name="delete_downloads_confirmation_message">Questo rimuoverà definitivamente tutti gli APK e installer (%1$s). Puoi riscaricarli in qualsiasi momento.</string>
     <string name="downloads_cleared">Tutti i pacchetti scaricati sono stati eliminati.</string>
     <string name="unable_to_verify_attestation">Impossibile verificare</string>
+
+    <string name="recent_searches">Ricerche recenti</string>
+    <string name="clear_all_history">Cancella tutto</string>
+    <string name="remove_search_history_item">Rimuovi</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-ja/strings-ja.xml b/core/presentation/src/commonMain/composeResources/values-ja/strings-ja.xml
@@ -576,4 +576,8 @@
     <string name="delete_downloads_confirmation_message">すべてのAPKとインストーラーが完全に削除されます（%1$s）。いつでも再ダウンロードできます。</string>
     <string name="downloads_cleared">すべてのダウンロード済みパッケージが削除されました。</string>
     <string name="unable_to_verify_attestation">確認できませんでした</string>
+
+    <string name="recent_searches">最近の検索</string>
+    <string name="clear_all_history">すべてクリア</string>
+    <string name="remove_search_history_item">削除</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-ko/strings-ko.xml b/core/presentation/src/commonMain/composeResources/values-ko/strings-ko.xml
@@ -611,4 +611,8 @@
     <string name="delete_downloads_confirmation_message">모든 APK 및 설치 파일이 영구적으로 삭제됩니다 (%1$s). 언제든 다시 다운로드할 수 있습니다.</string>
     <string name="downloads_cleared">모든 다운로드된 패키지가 삭제되었습니다.</string>
     <string name="unable_to_verify_attestation">확인할 수 없음</string>
+
+    <string name="recent_searches">최근 검색</string>
+    <string name="clear_all_history">모두 지우기</string>
+    <string name="remove_search_history_item">삭제</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-pl/strings-pl.xml b/core/presentation/src/commonMain/composeResources/values-pl/strings-pl.xml
@@ -577,4 +577,8 @@
     <string name="delete_downloads_confirmation_message">Spowoduje to trwałe usunięcie wszystkich APK i instalatorów (%1$s). Możesz je pobrać ponownie w dowolnym momencie.</string>
     <string name="downloads_cleared">Wszystkie pobrane pakiety zostały usunięte.</string>
     <string name="unable_to_verify_attestation">Nie można zweryfikować</string>
+
+    <string name="recent_searches">Ostatnie wyszukiwania</string>
+    <string name="clear_all_history">Wyczyść wszystko</string>
+    <string name="remove_search_history_item">Usuń</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-ru/strings-ru.xml b/core/presentation/src/commonMain/composeResources/values-ru/strings-ru.xml
@@ -577,4 +577,8 @@
     <string name="delete_downloads_confirmation_message">Это навсегда удалит все APK и установщики (%1$s). Вы сможете скачать их снова в любое время.</string>
     <string name="downloads_cleared">Все загруженные пакеты удалены.</string>
     <string name="unable_to_verify_attestation">Не удалось проверить</string>
+
+    <string name="recent_searches">Недавние поиски</string>
+    <string name="clear_all_history">Очистить всё</string>
+    <string name="remove_search_history_item">Удалить</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-tr/strings-tr.xml b/core/presentation/src/commonMain/composeResources/values-tr/strings-tr.xml
@@ -611,4 +611,8 @@
     <string name="delete_downloads_confirmation_message">Bu işlem tüm APK ve kurulum dosyalarını kalıcı olarak silecek (%1$s). İstediğiniz zaman yeniden indirebilirsiniz.</string>
     <string name="downloads_cleared">Tüm indirilen paketler silindi.</string>
     <string name="unable_to_verify_attestation">Doğrulanamadı</string>
+
+    <string name="recent_searches">Son aramalar</string>
+    <string name="clear_all_history">Tümünü temizle</string>
+    <string name="remove_search_history_item">Kaldır</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values-zh-rCN/strings-zh-rCN.xml b/core/presentation/src/commonMain/composeResources/values-zh-rCN/strings-zh-rCN.xml
@@ -577,4 +577,8 @@
     <string name="delete_downloads_confirmation_message">这将永久删除所有 APK 和安装程序（%1$s）。你可以随时重新下载。</string>
     <string name="downloads_cleared">所有已下载的包已被删除。</string>
     <string name="unable_to_verify_attestation">无法验证</string>
+
+    <string name="recent_searches">最近搜索</string>
+    <string name="clear_all_history">清除全部</string>
+    <string name="remove_search_history_item">移除</string>
 </resources>
diff --git a/core/presentation/src/commonMain/composeResources/values/strings.xml b/core/presentation/src/commonMain/composeResources/values/strings.xml
@@ -615,4 +615,9 @@
     <string name="clear_seen_history_description">Reset all seen repositories so they appear again in feeds</string>
     <string name="seen_history_cleared">Seen history cleared</string>
     <string name="seen_badge">Viewed</string>
+
+    <!-- Search history -->
+    <string name="recent_searches">Recent searches</string>
+    <string name="clear_all_history">Clear all</string>
+    <string name="remove_search_history_item">Remove</string>
 </resources>
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchAction.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchAction.kt
@@ -61,4 +61,14 @@ sealed interface SearchAction {
     data object OnFabClick : SearchAction
 
     data object DismissClipboardBanner : SearchAction
+
+    data class OnHistoryItemClick(
+        val query: String,
+    ) : SearchAction
+
+    data class OnRemoveHistoryItem(
+        val query: String,
+    ) : SearchAction
+
+    data object OnClearAllHistory : SearchAction
 }
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchRoot.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchRoot.kt
@@ -92,6 +92,7 @@ import zed.rainxch.core.presentation.theme.GithubStoreTheme
 import zed.rainxch.core.presentation.utils.ObserveAsEvents
 import zed.rainxch.githubstore.core.presentation.res.*
 import zed.rainxch.search.presentation.components.LanguageFilterBottomSheet
+import zed.rainxch.search.presentation.components.SearchHistorySection
 import zed.rainxch.search.presentation.components.SortByBottomSheet
 import zed.rainxch.search.presentation.model.ParsedGithubLink
 import zed.rainxch.search.presentation.model.ProgrammingLanguageUi
@@ -485,6 +486,26 @@ fun SearchScreen(
                 )
             }
 
+            // Show search history when query is empty
+            if (state.query.isBlank() &&
+                state.repositories.isEmpty() &&
+                state.recentSearches.isNotEmpty() &&
+                !state.isLoading
+            ) {
+                SearchHistorySection(
+                    recentSearches = state.recentSearches,
+                    onHistoryItemClick = { query ->
+                        onAction(SearchAction.OnHistoryItemClick(query))
+                    },
+                    onRemoveItem = { query ->
+                        onAction(SearchAction.OnRemoveHistoryItem(query))
+                    },
+                    onClearAll = {
+                        onAction(SearchAction.OnClearAllHistory)
+                    },
+                )
+            }
+
             val visibleRepos by remember(state.repositories, state.isHideSeenEnabled, state.seenRepoIds) {
                 derivedStateOf {
                     if (state.isHideSeenEnabled && state.seenRepoIds.isNotEmpty()) {
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchState.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchState.kt
@@ -30,4 +30,5 @@ data class SearchState(
     val clipboardLinks: ImmutableList<ParsedGithubLink> = persistentListOf(),
     val isClipboardBannerVisible: Boolean = false,
     val autoDetectClipboardEnabled: Boolean = true,
+    val recentSearches: ImmutableList<String> = persistentListOf(),
 )
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchViewModel.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchViewModel.kt
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/components/SearchHistorySection.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/components/SearchHistorySection.kt
