Create shared module.

arriolac · arriolac · commit 525effcb1346 · 2024-03-15T12:10:15.000-07:00
diff --git a/Jetcaster/app/build.gradle.kts b/Jetcaster/app/build.gradle.kts
@@ -117,17 +117,6 @@ dependencies {
 
     implementation(libs.coil.kt.compose)
 
-    implementation(libs.okhttp3)
-    implementation(libs.okhttp.logging)
-
-    implementation(libs.rometools.rome)
-    implementation(libs.rometools.modules)
-
-    // TODO(chris): Remove this dependency from app
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
-
     implementation(project(":core"))
 
     coreLibraryDesugaring(libs.core.jdk.desugaring)
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/JetcasterApplication.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/JetcasterApplication.kt
@@ -19,6 +19,7 @@ package com.example.jetcaster
 import android.app.Application
 import coil.ImageLoader
 import coil.ImageLoaderFactory
+import com.example.jetcaster.core.data.di.Graph
 
 /**
  * Application which sets up our dependency [Graph] with a context.
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt
@@ -26,13 +26,11 @@ import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSiz
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import com.example.jetcaster.ui.theme.JetcasterTheme
 import com.google.accompanist.adaptive.calculateDisplayFeatures
-import java.time.OffsetDateTime
 
 class MainActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        OffsetDateTime.parse("")
 
         enableEdgeToEdge(
             // This app is only ever in dark mode, so hard code detectDarkMode to true.
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt
@@ -75,9 +75,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.example.jetcaster.R
-import com.example.jetcaster.core.data.Category
-import com.example.jetcaster.core.data.EpisodeToPodcast
-import com.example.jetcaster.core.data.PodcastWithExtraInfo
+import com.example.jetcaster.core.data.database.model.Category
+import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
+import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
 import com.example.jetcaster.ui.home.category.PodcastCategoryViewState
 import com.example.jetcaster.ui.home.discover.DiscoverViewState
 import com.example.jetcaster.ui.home.discover.discoverItems
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt
@@ -18,14 +18,14 @@ package com.example.jetcaster.ui.home
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.jetcaster.Graph
-import com.example.jetcaster.core.data.Category
-import com.example.jetcaster.core.data.CategoryStore
-import com.example.jetcaster.core.data.EpisodeStore
-import com.example.jetcaster.core.data.EpisodeToPodcast
-import com.example.jetcaster.core.data.PodcastStore
-import com.example.jetcaster.core.data.PodcastWithExtraInfo
-import com.example.jetcaster.core.data.PodcastsRepository
+import com.example.jetcaster.core.data.di.Graph
+import com.example.jetcaster.core.data.database.model.Category
+import com.example.jetcaster.core.data.repository.CategoryStore
+import com.example.jetcaster.core.data.repository.EpisodeStore
+import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
+import com.example.jetcaster.core.data.repository.PodcastStore
+import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
+import com.example.jetcaster.core.data.repository.PodcastsRepository
 import com.example.jetcaster.ui.home.category.PodcastCategoryViewState
 import com.example.jetcaster.ui.home.discover.DiscoverViewState
 import com.example.jetcaster.util.combine
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt
@@ -16,11 +16,11 @@
 
 package com.example.jetcaster.ui.home
 
-import com.example.jetcaster.core.data.Category
-import com.example.jetcaster.core.data.Episode
-import com.example.jetcaster.core.data.EpisodeToPodcast
-import com.example.jetcaster.core.data.Podcast
-import com.example.jetcaster.core.data.PodcastWithExtraInfo
+import com.example.jetcaster.core.data.database.model.Category
+import com.example.jetcaster.core.data.database.model.Episode
+import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
+import com.example.jetcaster.core.data.database.model.Podcast
+import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
 import kotlinx.collections.immutable.toPersistentList
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt
@@ -68,10 +68,10 @@ import androidx.constraintlayout.compose.Dimension.Companion.preferredWrapConten
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.example.jetcaster.R
-import com.example.jetcaster.core.data.Episode
-import com.example.jetcaster.core.data.EpisodeToPodcast
-import com.example.jetcaster.core.data.Podcast
-import com.example.jetcaster.core.data.PodcastWithExtraInfo
+import com.example.jetcaster.core.data.database.model.Episode
+import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
+import com.example.jetcaster.core.data.database.model.Podcast
+import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
 import com.example.jetcaster.ui.home.PreviewEpisodes
 import com.example.jetcaster.ui.home.PreviewPodcasts
 import com.example.jetcaster.ui.theme.JetcasterTheme
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt
@@ -30,7 +30,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.example.jetcaster.core.data.Category
+import com.example.jetcaster.core.data.database.model.Category
 import com.example.jetcaster.ui.home.category.PodcastCategoryViewState
 import com.example.jetcaster.ui.home.category.podcastCategory
 import com.example.jetcaster.ui.theme.Keyline1
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/library/Library.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/library/Library.kt
@@ -19,7 +19,7 @@ package com.example.jetcaster.ui.home.library
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
 import androidx.compose.ui.Modifier
-import com.example.jetcaster.core.data.EpisodeToPodcast
+import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
 import com.example.jetcaster.ui.home.category.EpisodeListItem
 
 fun LazyListScope.libraryItems(
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt
@@ -26,9 +26,9 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.savedstate.SavedStateRegistryOwner
-import com.example.jetcaster.Graph
-import com.example.jetcaster.core.data.EpisodeStore
-import com.example.jetcaster.core.data.PodcastStore
+import com.example.jetcaster.core.data.di.Graph
+import com.example.jetcaster.core.data.repository.EpisodeStore
+import com.example.jetcaster.core.data.repository.PodcastStore
 import java.time.Duration
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
diff --git a/Jetcaster/core/build.gradle.kts b/Jetcaster/core/build.gradle.kts
@@ -16,30 +16,46 @@ android {
     consumerProguardFiles("consumer-rules.pro")
   }
 
+  buildFeatures {
+    buildConfig = true
+  }
+
   buildTypes {
     release {
       isMinifyEnabled = false
       proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
   }
   compileOptions {
+    isCoreLibraryDesugaringEnabled = true
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
   }
-  kotlinOptions {
-    jvmTarget = "1.8"
-  }
 }
 
 dependencies {
   implementation(libs.androidx.core.ktx)
   implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.compose.runtime)
+
+  implementation(libs.coil.kt.compose)
+
+  val composeBom = platform(libs.androidx.compose.bom)
+  implementation(composeBom)
+
+  implementation(libs.okhttp3)
+  implementation(libs.okhttp.logging)
 
   implementation(libs.androidx.room.runtime)
   implementation(libs.androidx.room.ktx)
   ksp(libs.androidx.room.compiler)
 
+  implementation(libs.rometools.rome)
+  implementation(libs.rometools.modules)
+
   testImplementation(libs.junit)
   androidTestImplementation(libs.androidx.test.ext.junit)
   androidTestImplementation(libs.androidx.test.espresso.core)
+
+  coreLibraryDesugaring(libs.core.jdk.desugaring)
 }
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/DateTimeTypeConverters.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/DateTimeTypeConverters.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database
 
 import androidx.room.TypeConverter
 import java.time.Duration
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/JetcasterDatabase.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/JetcasterDatabase.kt
@@ -14,16 +14,22 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.example.jetcaster.core.data.Category
-import com.example.jetcaster.core.data.Episode
-import com.example.jetcaster.core.data.Podcast
-import com.example.jetcaster.core.data.PodcastCategoryEntry
-import com.example.jetcaster.core.data.PodcastFollowedEntry
+import com.example.jetcaster.core.data.database.model.Category
+import com.example.jetcaster.core.data.database.model.Episode
+import com.example.jetcaster.core.data.database.model.Podcast
+import com.example.jetcaster.core.data.database.model.PodcastCategoryEntry
+import com.example.jetcaster.core.data.database.model.PodcastFollowedEntry
+import com.example.jetcaster.core.data.database.dao.CategoriesDao
+import com.example.jetcaster.core.data.database.dao.EpisodesDao
+import com.example.jetcaster.core.data.database.dao.PodcastCategoryEntryDao
+import com.example.jetcaster.core.data.database.dao.PodcastFollowedEntryDao
+import com.example.jetcaster.core.data.database.dao.PodcastsDao
+import com.example.jetcaster.core.data.database.dao.TransactionRunnerDao
 
 /**
  * The [RoomDatabase] we use in this app.
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/BaseDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/BaseDao.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Delete
 import androidx.room.Insert
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/CategoriesDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/CategoriesDao.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import com.example.jetcaster.core.data.Category
+import com.example.jetcaster.core.data.database.model.Category
 import kotlinx.coroutines.flow.Flow
 
 /**
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/EpisodesDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/EpisodesDao.kt
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.Transaction
-import com.example.jetcaster.core.data.Episode
-import com.example.jetcaster.data.Episode
-import com.example.jetcaster.data.EpisodeToPodcast
+import com.example.jetcaster.core.data.database.model.Episode
+import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
 import kotlinx.coroutines.flow.Flow
 
 /**
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/PodcastCategoryEntryDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/PodcastCategoryEntryDao.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Dao
-import com.example.jetcaster.data.PodcastCategoryEntry
+import com.example.jetcaster.core.data.database.model.PodcastCategoryEntry
 
 /**
  * [Room] DAO for [PodcastCategoryEntry] related operations.
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/PodcastFollowedEntryDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/PodcastFollowedEntryDao.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import com.example.jetcaster.data.PodcastFollowedEntry
+import com.example.jetcaster.core.data.database.model.PodcastFollowedEntry
 
 @Dao
 abstract class PodcastFollowedEntryDao : BaseDao<PodcastFollowedEntry> {
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/PodcastsDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/PodcastsDao.kt
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.Transaction
-import com.example.jetcaster.core.data.Podcast
-import com.example.jetcaster.core.data.PodcastWithExtraInfo
-import com.example.jetcaster.data.Podcast
-import com.example.jetcaster.data.PodcastWithExtraInfo
+import com.example.jetcaster.core.data.database.model.Podcast
+import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
 import kotlinx.coroutines.flow.Flow
 
 /**
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/TransactionRunnerDao.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/dao/TransactionRunnerDao.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data.room
+package com.example.jetcaster.core.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Ignore
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/Category.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/Category.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data
+package com.example.jetcaster.core.data.database.model
 
 import androidx.compose.runtime.Immutable
 import androidx.room.ColumnInfo
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/Episode.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/Episode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data
+package com.example.jetcaster.core.data.database.model
 
 import androidx.compose.runtime.Immutable
 import androidx.room.ColumnInfo
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/EpisodeToPodcast.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/EpisodeToPodcast.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data
+package com.example.jetcaster.core.data.database.model
 
 import androidx.room.Embedded
 import androidx.room.Ignore
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/Podcast.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/Podcast.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data
+package com.example.jetcaster.core.data.database.model
 
 import androidx.compose.runtime.Immutable
 import androidx.room.ColumnInfo
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/PodcastCategoryEntry.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/PodcastCategoryEntry.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data
+package com.example.jetcaster.core.data.database.model
 
 import androidx.compose.runtime.Immutable
 import androidx.room.ColumnInfo
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/PodcastFollowedEntry.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/PodcastFollowedEntry.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.core.data
+package com.example.jetcaster.core.data.database.model
 
 import androidx.compose.runtime.Immutable
 import androidx.room.ColumnInfo
@@ -27,11 +27,11 @@ import androidx.room.PrimaryKey
     tableName = "podcast_followed_entries",
     foreignKeys = [
         ForeignKey(
-            entity = Podcast::class,
-            parentColumns = ["uri"],
-            childColumns = ["podcast_uri"],
-            onUpdate = ForeignKey.CASCADE,
-            onDelete = ForeignKey.CASCADE
+          entity = Podcast::class,
+          parentColumns = ["uri"],
+          childColumns = ["podcast_uri"],
+          onUpdate = ForeignKey.CASCADE,
+          onDelete = ForeignKey.CASCADE
         )
     ],
     indices = [
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/di/Graph.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/di/Graph.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/network/Feeds.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/network/Feeds.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/network/OkHttpExtensions.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/network/OkHttpExtensions.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/network/PodcastFetcher.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/network/PodcastFetcher.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/CategoryStore.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/CategoryStore.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/EpisodeStore.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/EpisodeStore.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/PodcastStore.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/PodcastStore.kt
diff --git a/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/PodcastsRepository.kt b/Jetcaster/core/src/main/java/com/example/jetcaster/core/data/repository/PodcastsRepository.kt
