Fix to use icons on groups as well

msasikanth · Jan 30, 2025 · 0381e75 · 0381e75
1 parent 8b94299
commit 0381e75
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 43 deletions.
diff --git a/core/data/src/commonMain/kotlin/dev/sasikanth/rss/reader/data/repository/RssRepository.kt b/core/data/src/commonMain/kotlin/dev/sasikanth/rss/reader/data/repository/RssRepository.kt
@@ -280,7 +280,7 @@ class RssRepository(
             id: String,
             name: String,
             feedIds: List<String>,
-            feedHomepageLinks: String,
+            feedIconLinks: String,
             createdAt: Instant,
             updatedAt: Instant,
             pinnedAt: Instant?,
@@ -289,7 +289,7 @@ class RssRepository(
               id = id,
               name = name,
               feedIds = feedIds.filterNot { it.isBlank() },
-              feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+              feedIconLinks = feedIconLinks.split(",").filterNot { it.isBlank() },
               createdAt = createdAt,
               updatedAt = updatedAt,
               pinnedAt = pinnedAt,
@@ -626,16 +626,16 @@ class RssRepository(
           lastCleanUpAt: Instant?,
           numberOfUnreadPosts: Long,
           feedIds: List<String>?,
-          feedHomepageLinks: String?,
+          feedIconLinks: String?,
           updatedAt: Instant?,
           pinnedPosition: Double ->
           if (type == "group") {
             FeedGroup(
               id = id,
               name = name,
               feedIds = feedIds?.filterNot { it.isBlank() }.orEmpty(),
-              feedHomepageLinks =
-                feedHomepageLinks?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
+              feedIconLinks =
+                feedIconLinks?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
               createdAt = createdAt!!,
               updatedAt = updatedAt!!,
               pinnedAt = pinnedAt,
@@ -690,15 +690,15 @@ class RssRepository(
             lastCleanUpAt: Instant?,
             numberOfUnreadPosts: Long,
             feedIds: List<String>?,
-            feedHomepageLinks: String?,
+            feedIconLinks: String?,
             updatedAt: Instant? ->
             if (type == "group") {
               FeedGroup(
                 id = id,
                 name = name,
                 feedIds = feedIds?.filterNot { it.isBlank() }.orEmpty(),
-                feedHomepageLinks =
-                  feedHomepageLinks?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
+                feedIconLinks =
+                  feedIconLinks?.split(",")?.filterNot { it.isBlank() }.orEmpty(),
                 createdAt = createdAt,
                 updatedAt = updatedAt!!,
                 pinnedAt = pinnedAt,
@@ -737,7 +737,7 @@ class RssRepository(
             id: String,
             name: String,
             feedIds: List<String>,
-            feedHomepageLinks: String,
+            feedIconLinks: String,
             createdAt: Instant,
             updatedAt: Instant,
             pinnedAt: Instant?,
@@ -746,7 +746,7 @@ class RssRepository(
               id = id,
               name = name,
               feedIds = feedIds.filterNot { it.isBlank() },
-              feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+              feedIconLinks = feedIconLinks.split(",").filterNot { it.isBlank() },
               createdAt = createdAt,
               updatedAt = updatedAt,
               pinnedAt = pinnedAt,
@@ -771,15 +771,15 @@ class RssRepository(
             id: String,
             name: String,
             feedIds: List<String>,
-            feedHomepageLinks: String,
+            feedIconLinks: String,
             createdAt: Instant,
             updatedAt: Instant,
             pinnedAt: Instant? ->
             FeedGroup(
               id = id,
               name = name,
               feedIds = feedIds.filterNot { it.isBlank() },
-              feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+              feedIconLinks = feedIconLinks.split(",").filterNot { it.isBlank() },
               createdAt = createdAt,
               updatedAt = updatedAt,
               pinnedAt = pinnedAt,
@@ -798,15 +798,15 @@ class RssRepository(
           id: String,
           name: String,
           feedIds: List<String>,
-          feedHomepageLinks: String,
+          feedIconLinks: String,
           createdAt: Instant,
           updatedAt: Instant,
           pinnedAt: Instant? ->
           FeedGroup(
             id = id,
             name = name,
             feedIds = feedIds.filterNot { it.isBlank() },
-            feedHomepageLinks = feedHomepageLinks.split(",").filterNot { it.isBlank() },
+            feedIconLinks = feedIconLinks.split(",").filterNot { it.isBlank() },
             createdAt = createdAt,
             updatedAt = updatedAt,
             pinnedAt = pinnedAt,

diff --git a/core/data/src/commonMain/sqldelight/dev/sasikanth/rss/reader/data/database/FeedGroup.sq b/core/data/src/commonMain/sqldelight/dev/sasikanth/rss/reader/data/database/FeedGroup.sq
@@ -26,10 +26,10 @@ SELECT
   id,
   name,
   feedIds,
-  COALESCE((SELECT GROUP_CONCAT(feed.homepageLink)
+  COALESCE((SELECT GROUP_CONCAT(feed.icon)
               FROM feed
               WHERE INSTR(feedGroup.feedIds, feed.id)
-              LIMIT 4), '') AS feedHomepageLinks,
+              LIMIT 4), '') AS feedIconLinks,
   createdAt,
   updatedAt,
   pinnedAt,
@@ -42,10 +42,10 @@ SELECT
   id,
   name,
   feedIds,
-  COALESCE((SELECT GROUP_CONCAT(feed.homepageLink)
+  COALESCE((SELECT GROUP_CONCAT(feed.icon)
               FROM feed
               WHERE INSTR(feedGroup.feedIds, feed.id)
-              LIMIT 4), '') AS feedHomepageLinks,
+              LIMIT 4), '') AS feedIconLinks,
   createdAt,
   updatedAt,
   pinnedAt,
@@ -79,10 +79,10 @@ SELECT
   id,
   name,
   feedIds,
-  COALESCE((SELECT GROUP_CONCAT(feed.homepageLink)
+  COALESCE((SELECT GROUP_CONCAT(feed.icon)
               FROM feed
               WHERE INSTR(feedGroup.feedIds, feed.id)
-              LIMIT 4), '') AS feedHomepageLinks,
+              LIMIT 4), '') AS feedIconLinks,
   createdAt,
   updatedAt,
   pinnedAt

diff --git a/core/data/src/commonMain/sqldelight/dev/sasikanth/rss/reader/data/database/Source.sq b/core/data/src/commonMain/sqldelight/dev/sasikanth/rss/reader/data/database/Source.sq
@@ -59,10 +59,10 @@ FROM (
     NULL AS lastCleanUpAt,
     COUNT(CASE WHEN p.read == 0 THEN 1 ELSE NULL END) AS numberOfUnreadPosts,
     fg.feedIds,
-    COALESCE((SELECT GROUP_CONCAT(feed.homepageLink)
+    COALESCE((SELECT GROUP_CONCAT(feed.icon)
                 FROM feed
                 WHERE INSTR(fg.feedIds, feed.id)
-                LIMIT 4), '') AS feedHomepageLinks,
+                LIMIT 4), '') AS feedIconLinks,
     fg.createdAt,
     fg.pinnedAt,
     fg.updatedAt,
@@ -123,10 +123,10 @@ FROM (
     NULL AS lastCleanUpAt,
     COUNT(CASE WHEN p.read == 0 THEN 1 ELSE NULL END) AS numberOfUnreadPosts,
     fg.feedIds,
-    COALESCE((SELECT GROUP_CONCAT(feed.homepageLink)
+    COALESCE((SELECT GROUP_CONCAT(feed.icon)
                 FROM feed
                 WHERE INSTR(fg.feedIds, feed.id)
-                LIMIT 4), '') AS feedHomepageLinks,
+                LIMIT 4), '') AS feedIconLinks,
     fg.createdAt,
     fg.pinnedAt,
     fg.updatedAt

diff --git a/core/model/src/commonMain/kotlin/dev/sasikanth/rss/reader/core/model/local/FeedGroup.kt b/core/model/src/commonMain/kotlin/dev/sasikanth/rss/reader/core/model/local/FeedGroup.kt
@@ -19,14 +19,14 @@ package dev.sasikanth.rss.reader.core.model.local
 import kotlinx.datetime.Instant
 
 data class FeedGroup(
-  override val id: String,
-  val name: String,
-  val feedIds: List<String>,
-  val feedHomepageLinks: List<String>,
-  val numberOfUnreadPosts: Long = 0,
-  val createdAt: Instant,
-  val updatedAt: Instant,
-  override val pinnedAt: Instant?,
-  override val sourceType: SourceType = SourceType.FeedGroup,
-  override val pinnedPosition: Double = 0.0,
+    override val id: String,
+    val name: String,
+    val feedIds: List<String>,
+    val feedIconLinks: List<String>,
+    val numberOfUnreadPosts: Long = 0,
+    val createdAt: Instant,
+    val updatedAt: Instant,
+    override val pinnedAt: Instant?,
+    override val sourceType: SourceType = SourceType.FeedGroup,
+    override val pinnedPosition: Double = 0.0,
 ) : Source
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/FeedGroupBottomBarItem.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/FeedGroupBottomBarItem.kt
@@ -58,21 +58,21 @@ internal fun FeedGroupBottomBarItem(
         contentAlignment = Alignment.Center
       ) {
         val iconSize =
-          if (feedGroup.feedHomepageLinks.size > 2) {
+          if (feedGroup.feedIconLinks.size > 2) {
             18.dp
           } else {
             20.dp
           }
 
         val iconSpacing =
-          if (feedGroup.feedHomepageLinks.size > 2) {
+          if (feedGroup.feedIconLinks.size > 2) {
             4.dp
           } else {
             0.dp
           }
 
         FeedGroupIconGrid(
-          icons = feedGroup.feedHomepageLinks,
+          icons = feedGroup.feedIconLinks,
           iconSize = iconSize,
           iconShape = CircleShape,
           verticalArrangement = Arrangement.spacedBy(iconSpacing),

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/FeedGroupItem.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/FeedGroupItem.kt
@@ -99,22 +99,22 @@ internal fun FeedGroupItem(
   ) {
     Row(verticalAlignment = Alignment.CenterVertically) {
       val iconSize =
-        if (feedGroup.feedHomepageLinks.size > 2) {
+        if (feedGroup.feedIconLinks.size > 2) {
           17.dp
         } else {
           19.dp
         }
 
       val iconSpacing =
-        if (feedGroup.feedHomepageLinks.size > 2) {
+        if (feedGroup.feedIconLinks.size > 2) {
           2.dp
         } else {
           0.dp
         }
 
       FeedGroupIconGrid(
         modifier = Modifier.requiredSize(36.dp),
-        icons = feedGroup.feedHomepageLinks,
+        icons = feedGroup.feedIconLinks,
         iconSize = iconSize,
         iconShape = CircleShape,
         verticalArrangement = Arrangement.spacedBy(iconSpacing),

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeTopAppBar.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeTopAppBar.kt
@@ -192,21 +192,21 @@ private fun SourceIcon(source: Source?, modifier: Modifier = Modifier) {
     when (source) {
       is FeedGroup -> {
         val iconSize =
-          if (source.feedHomepageLinks.size > 2) {
+          if (source.feedIconLinks.size > 2) {
             18.dp
           } else {
             20.dp
           }
 
         val iconSpacing =
-          if (source.feedHomepageLinks.size > 2) {
+          if (source.feedIconLinks.size > 2) {
             4.dp
           } else {
             0.dp
           }
 
         FeedGroupIconGrid(
-          icons = source.feedHomepageLinks,
+          icons = source.feedIconLinks,
           iconSize = iconSize,
           iconShape = RoundedCornerShape(percent = 30),
           horizontalArrangement = Arrangement.spacedBy(iconSpacing),