Jetcaster Material Expressive update

Jetcaster/core/data-testing/src/main/java/com/example/jetcaster/core/data/testing/repository/TestEpisodeStore.kt

@@ -75,6 +75,11 @@ class TestEpisodeStore : EpisodeStore {
             it + episodes
         }
 
+    override suspend fun deleteEpisode(episode: Episode) =
+        episodesFlow.update {
+            it - episode
+        }
+
     override suspend fun isEmpty(): Boolean =
         episodesFlow.first().isEmpty()
 }

Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/Episode.kt

@@ -22,6 +22,8 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import androidx.room.TypeConverter
+import androidx.room.TypeConverters
 import java.time.Duration
 import java.time.OffsetDateTime
 
@@ -41,7 +43,7 @@ import java.time.OffsetDateTime
         )
     ]
 )
-@Immutable
+@TypeConverters(ListOfStringConverter::class)
 data class Episode(
     @PrimaryKey @ColumnInfo(name = "uri") val uri: String,
     @ColumnInfo(name = "podcast_uri") val podcastUri: String,
@@ -50,5 +52,18 @@ data class Episode(
     @ColumnInfo(name = "summary") val summary: String? = null,
     @ColumnInfo(name = "author") val author: String? = null,
     @ColumnInfo(name = "published") val published: OffsetDateTime,
-    @ColumnInfo(name = "duration") val duration: Duration? = null
+    @ColumnInfo(name = "duration") val duration: Duration? = null,
+    @ColumnInfo(name = "media_urls") val mediaUrls: List<String>
 )
+
+class ListOfStringConverter {
+    @TypeConverter
+    fun fromString(value: String): List<String> {
+        return value.split(",")
+    }
+
+    @TypeConverter
+    fun fromList(list: List<String>): String {
+        return list.joinToString(",")
+    }
+}

Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/network/PodcastFetcher.kt

@@ -24,6 +24,7 @@ import com.example.jetcaster.core.data.database.model.Episode
 import com.example.jetcaster.core.data.database.model.Podcast
 import com.rometools.modules.itunes.EntryInformation
 import com.rometools.modules.itunes.FeedInformation
+import com.rometools.rome.feed.synd.SyndEnclosure
 import com.rometools.rome.feed.synd.SyndEntry
 import com.rometools.rome.feed.synd.SyndFeed
 import com.rometools.rome.io.SyndFeedInput
@@ -124,7 +125,7 @@ sealed class PodcastRssResponse {
  */
 private fun SyndFeed.toPodcastResponse(feedUrl: String): PodcastRssResponse {
     val podcastUri = uri ?: feedUrl
-    val episodes = entries.map { it.toEpisode(podcastUri) }
+    val episodes = entries.map { it.toEpisode(podcastUri, it.enclosures) }
 
     val feedInfo = getModule(PodcastModuleDtd) as? FeedInformation
     val podcast = Podcast(
@@ -146,7 +147,10 @@ private fun SyndFeed.toPodcastResponse(feedUrl: String): PodcastRssResponse {
 /**
  * Map a Rome [SyndEntry] instance to our own [Episode] data class.
  */
-private fun SyndEntry.toEpisode(podcastUri: String): Episode {
+private fun SyndEntry.toEpisode(
+    podcastUri: String,
+    enclosures: List<SyndEnclosure>
+): Episode {
     val entryInformation = getModule(PodcastModuleDtd) as? EntryInformation
     return Episode(
         uri = uri,
@@ -156,7 +160,8 @@ private fun SyndEntry.toEpisode(podcastUri: String): Episode {
         summary = entryInformation?.summary ?: description?.value,
         subtitle = entryInformation?.subtitle,
         published = Instant.ofEpochMilli(publishedDate.time).atOffset(ZoneOffset.UTC),
-        duration = entryInformation?.duration?.milliseconds?.let { Duration.ofMillis(it) }
+        duration = entryInformation?.duration?.milliseconds?.let { Duration.ofMillis(it) },
+        mediaUrls = enclosures.map { it.url }
     )
 }
 

Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/repository/EpisodeStore.kt

@@ -57,6 +57,11 @@ interface EpisodeStore {
      */
     suspend fun addEpisodes(episodes: Collection<Episode>)
 
+    /**
+     * Deletes an [Episode] from this store.
+     */
+    suspend fun deleteEpisode(episode: Episode)
+
     suspend fun isEmpty(): Boolean
 }
 
@@ -86,6 +91,7 @@ class LocalEpisodeStore(
     ): Flow<List<EpisodeToPodcast>> {
         return episodesDao.episodesForPodcastUri(podcastUri, limit)
     }
+
     /**
      * Returns a list of episodes for the given podcast URIs ordering by most recently published
      * to least recently published.
@@ -104,5 +110,12 @@ class LocalEpisodeStore(
     override suspend fun addEpisodes(episodes: Collection<Episode>) =
         episodesDao.insertAll(episodes)
 
+    /**
+     * Deletes an [Episode] from this store.
+     */
+    override suspend fun deleteEpisode(episode: Episode) {
+        episodesDao.delete(episode)
+    }
+
     override suspend fun isEmpty(): Boolean = episodesDao.count() == 0
 }

Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt

@@ -43,6 +43,8 @@ fun PodcastImage(
     podcastImageUrl: String,
     contentDescription: String?,
     modifier: Modifier = Modifier,
+    // TODO: Remove the nested component modifier when shared elements are applied to entire app
+    imageModifier: Modifier = Modifier,
     contentScale: ContentScale = ContentScale.Crop,
     placeholderBrush: Brush = thumbnailPlaceholderDefaultBrush(),
 ) {
@@ -80,7 +82,7 @@ fun PodcastImage(
             }
             else -> {
                 Box(
-                    modifier = Modifier
+                    modifier = modifier
                         .background(placeholderBrush)
                         .fillMaxSize()
 
@@ -92,7 +94,7 @@ fun PodcastImage(
             painter = imageLoader,
             contentDescription = contentDescription,
             contentScale = contentScale,
-            modifier = modifier,
+            modifier = modifier.then(imageModifier)
         )
     }
 }