Merge pull request #360 from OpenHub-Store/feat-recently-viewed

Author: rainxchzed

composeApp/build.gradle.kts

@@ -64,6 +64,8 @@ kotlin {
             implementation(projects.feature.starred.data)
             implementation(projects.feature.starred.presentation)
 
+            implementation(projects.feature.recentlyViewed.presentation)
+
             implementation(libs.jetbrains.compose.navigation)
             implementation(libs.bundles.koin.common)
             implementation(libs.liquid)

composeApp/release/baselineProfiles/0/composeApp-release.dm

@@ -9,6 +9,7 @@ import zed.rainxch.devprofile.presentation.DeveloperProfileViewModel
 import zed.rainxch.favourites.presentation.FavouritesViewModel
 import zed.rainxch.home.presentation.HomeViewModel
 import zed.rainxch.profile.presentation.ProfileViewModel
+import zed.rainxch.recentlyviewed.presentation.RecentlyViewedViewModel
 import zed.rainxch.search.presentation.SearchViewModel
 import zed.rainxch.starred.presentation.StarredReposViewModel
 
@@ -20,6 +21,7 @@ val viewModelsModule =
         viewModelOf(::DeveloperProfileViewModel)
         viewModelOf(::FavouritesViewModel)
         viewModelOf(::HomeViewModel)
+        viewModelOf(::RecentlyViewedViewModel)
         viewModelOf(::SearchViewModel)
         viewModelOf(::ProfileViewModel)
         viewModelOf(::StarredReposViewModel)

composeApp/release/baselineProfiles/1/composeApp-release.dm

@@ -37,6 +37,7 @@ import zed.rainxch.devprofile.presentation.DeveloperProfileRoot
 import zed.rainxch.favourites.presentation.FavouritesRoot
 import zed.rainxch.home.presentation.HomeRoot
 import zed.rainxch.profile.presentation.ProfileRoot
+import zed.rainxch.recentlyviewed.presentation.RecentlyViewedRoot
 import zed.rainxch.search.presentation.SearchRoot
 import zed.rainxch.starred.presentation.StarredReposRoot
 
@@ -247,6 +248,9 @@ fun AppNavigation(
                         onNavigateToFavouriteRepos = {
                             navController.navigate(GithubStoreGraph.FavouritesScreen)
                         },
+                        onNavigateToRecentlyViewed = {
+                            navController.navigate(GithubStoreGraph.RecentlyViewedScreen)
+                        },
                         onNavigateToDevProfile = { username ->
                             navController.navigate(GithubStoreGraph.DeveloperProfileScreen(username))
                         },
@@ -256,6 +260,28 @@ fun AppNavigation(
                     )
                 }
 
+                composable<GithubStoreGraph.RecentlyViewedScreen> {
+                    RecentlyViewedRoot(
+                        onNavigateBack = {
+                            navController.navigateUp()
+                        },
+                        onNavigateToDetails = { repoId ->
+                            navController.navigate(
+                                GithubStoreGraph.DetailsScreen(
+                                    repositoryId = repoId,
+                                ),
+                            )
+                        },
+                        onNavigateToDeveloperProfile = { username ->
+                            navController.navigate(
+                                GithubStoreGraph.DeveloperProfileScreen(
+                                    username = username,
+                                ),
+                            )
+                        },
+                    )
+                }
+
                 composable<GithubStoreGraph.SponsorScreen> {
                     zed.rainxch.profile.presentation.SponsorScreen(
                         onNavigateBack = {

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/ViewModelsModule.kt

@@ -35,6 +35,9 @@ sealed interface GithubStoreGraph {
     @Serializable
     data object StarredReposScreen : GithubStoreGraph
 
+    @Serializable
+    data object RecentlyViewedScreen : GithubStoreGraph
+
     @Serializable
     data object AppsScreen : GithubStoreGraph
 

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/AppNavigation.kt

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 6,
-    "identityHash": "ce64b232de8d6ab9d95e3adabf7c7c43",
+    "identityHash": "3d6c862d777da61753a7876aca56a569",
     "entities": [
       {
         "tableName": "installed_apps",
@@ -497,14 +497,48 @@
       },
       {
         "tableName": "seen_repos",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `seenAt` INTEGER NOT NULL, PRIMARY KEY(`repoId`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `repoName` TEXT NOT NULL, `repoOwner` TEXT NOT NULL, `repoOwnerAvatarUrl` TEXT NOT NULL, `repoDescription` TEXT, `primaryLanguage` TEXT, `repoUrl` TEXT NOT NULL, `seenAt` INTEGER NOT NULL, PRIMARY KEY(`repoId`))",
         "fields": [
           {
             "fieldPath": "repoId",
             "columnName": "repoId",
             "affinity": "INTEGER",
             "notNull": true
           },
+          {
+            "fieldPath": "repoName",
+            "columnName": "repoName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repoOwner",
+            "columnName": "repoOwner",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repoOwnerAvatarUrl",
+            "columnName": "repoOwnerAvatarUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repoDescription",
+            "columnName": "repoDescription",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "primaryLanguage",
+            "columnName": "primaryLanguage",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "repoUrl",
+            "columnName": "repoUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
           {
             "fieldPath": "seenAt",
             "columnName": "seenAt",
@@ -522,7 +556,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ce64b232de8d6ab9d95e3adabf7c7c43')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3d6c862d777da61753a7876aca56a569')"
     ]
   }
 }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/GithubStoreGraph.kt

@@ -12,9 +12,15 @@ interface SeenRepoDao {
     @Query("SELECT repoId FROM seen_repos")
     fun getAllSeenRepoIds(): Flow<List<Long>>
 
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Query("SELECT * FROM seen_repos ORDER BY seenAt DESC")
+    fun getAllSeenRepos(): Flow<List<SeenRepoEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(entity: SeenRepoEntity)
 
+    @Query("DELETE FROM seen_repos WHERE repoId = :repoId")
+    suspend fun deleteById(repoId: Long)
+
     @Query("DELETE FROM seen_repos")
     suspend fun clearAll()
 }

core/data/schemas/zed.rainxch.core.data.local.db.AppDatabase/6.json

@@ -7,5 +7,11 @@ import androidx.room.PrimaryKey
 data class SeenRepoEntity(
     @PrimaryKey
     val repoId: Long,
+    val repoName: String,
+    val repoOwner: String,
+    val repoOwnerAvatarUrl: String,
+    val repoDescription: String?,
+    val primaryLanguage: String?,
+    val repoUrl: String,
     val seenAt: Long,
 )

core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/dao/SeenRepoDao.kt

@@ -4,6 +4,8 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import zed.rainxch.core.data.local.db.dao.SeenRepoDao
 import zed.rainxch.core.data.local.db.entities.SeenRepoEntity
+import zed.rainxch.core.domain.model.GithubRepoSummary
+import zed.rainxch.core.domain.model.SeenRepo
 import zed.rainxch.core.domain.repository.SeenReposRepository
 
 class SeenReposRepositoryImpl(
@@ -12,16 +14,43 @@ class SeenReposRepositoryImpl(
     override fun getAllSeenRepoIds(): Flow<Set<Long>> =
         seenRepoDao.getAllSeenRepoIds().map { it.toSet() }
 
-    override suspend fun markAsSeen(repoId: Long) {
+    override fun getAllSeenRepos(): Flow<List<SeenRepo>> =
+        seenRepoDao.getAllSeenRepos().map { entities ->
+            entities.map { it.toDomain() }
+        }
+
+    override suspend fun markAsSeen(repo: GithubRepoSummary) {
         seenRepoDao.insert(
             SeenRepoEntity(
-                repoId = repoId,
+                repoId = repo.id,
+                repoName = repo.name,
+                repoOwner = repo.owner.login,
+                repoOwnerAvatarUrl = repo.owner.avatarUrl,
+                repoDescription = repo.description,
+                primaryLanguage = repo.language,
+                repoUrl = repo.htmlUrl,
                 seenAt = System.currentTimeMillis(),
             ),
         )
     }
 
+    override suspend fun removeFromHistory(repoId: Long) {
+        seenRepoDao.deleteById(repoId)
+    }
+
     override suspend fun clearAll() {
         seenRepoDao.clearAll()
     }
+
+    private fun SeenRepoEntity.toDomain(): SeenRepo =
+        SeenRepo(
+            repoId = repoId,
+            repoName = repoName,
+            repoOwner = repoOwner,
+            repoOwnerAvatarUrl = repoOwnerAvatarUrl,
+            repoDescription = repoDescription,
+            primaryLanguage = primaryLanguage,
+            repoUrl = repoUrl,
+            seenAt = seenAt,
+        )
 }