Skip to content

Commit 6ed4752

Browse files
arriolacarriolac
committed
pickShared module.
1 parent 4d683f6 commit 6ed4752

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+202
-101
lines changed

‎Jetcaster/app/build.gradle.kts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,7 @@ dependencies {
117117

118118
implementation(libs.coil.kt.compose)
119119

120-
implementation(libs.okhttp3)
121-
implementation(libs.okhttp.logging)
120+
implementation(project(":core"))
122121

123-
implementation(libs.rometools.rome)
124-
implementation(libs.rometools.modules)
125-
126-
implementation(libs.androidx.room.runtime)
127-
implementation(libs.androidx.room.ktx)
128-
129-
ksp(libs.androidx.room.compiler)
130122
coreLibraryDesugaring(libs.core.jdk.desugaring)
131123
}

‎Jetcaster/app/src/main/java/com/example/jetcaster/JetcasterApplication.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.example.jetcaster
1919
import android.app.Application
2020
import coil.ImageLoader
2121
import coil.ImageLoaderFactory
22+
import com.example.jetcaster.core.data.di.Graph
2223

2324
/**
2425
* Application which sets up our dependency [Graph] with a context.

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
7575
import androidx.lifecycle.viewmodel.compose.viewModel
7676
import coil.compose.AsyncImage
7777
import com.example.jetcaster.R
78-
import com.example.jetcaster.data.Category
79-
import com.example.jetcaster.data.EpisodeToPodcast
80-
import com.example.jetcaster.data.PodcastWithExtraInfo
78+
import com.example.jetcaster.core.data.database.model.Category
79+
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
80+
import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
8181
import com.example.jetcaster.ui.home.category.PodcastCategoryViewState
8282
import com.example.jetcaster.ui.home.discover.DiscoverViewState
8383
import com.example.jetcaster.ui.home.discover.discoverItems

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ package com.example.jetcaster.ui.home
1818

1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.viewModelScope
21-
import com.example.jetcaster.Graph
22-
import com.example.jetcaster.data.Category
23-
import com.example.jetcaster.data.CategoryStore
24-
import com.example.jetcaster.data.EpisodeStore
25-
import com.example.jetcaster.data.EpisodeToPodcast
26-
import com.example.jetcaster.data.PodcastStore
27-
import com.example.jetcaster.data.PodcastWithExtraInfo
28-
import com.example.jetcaster.data.PodcastsRepository
21+
import com.example.jetcaster.core.data.di.Graph
22+
import com.example.jetcaster.core.data.database.model.Category
23+
import com.example.jetcaster.core.data.repository.CategoryStore
24+
import com.example.jetcaster.core.data.repository.EpisodeStore
25+
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
26+
import com.example.jetcaster.core.data.repository.PodcastStore
27+
import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
28+
import com.example.jetcaster.core.data.repository.PodcastsRepository
2929
import com.example.jetcaster.ui.home.category.PodcastCategoryViewState
3030
import com.example.jetcaster.ui.home.discover.DiscoverViewState
3131
import com.example.jetcaster.util.combine

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package com.example.jetcaster.ui.home
1818

19-
import com.example.jetcaster.data.Category
20-
import com.example.jetcaster.data.Episode
21-
import com.example.jetcaster.data.EpisodeToPodcast
22-
import com.example.jetcaster.data.Podcast
23-
import com.example.jetcaster.data.PodcastWithExtraInfo
19+
import com.example.jetcaster.core.data.database.model.Category
20+
import com.example.jetcaster.core.data.database.model.Episode
21+
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
22+
import com.example.jetcaster.core.data.database.model.Podcast
23+
import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
24+
import kotlinx.collections.immutable.toPersistentList
2425
import java.time.OffsetDateTime
2526
import java.time.ZoneOffset
26-
import kotlinx.collections.immutable.toPersistentList
2727

2828
val PreviewCategories = listOf(
2929
Category(name = "Crime"),

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ import androidx.constraintlayout.compose.Dimension.Companion.preferredWrapConten
6868
import coil.compose.AsyncImage
6969
import coil.request.ImageRequest
7070
import com.example.jetcaster.R
71-
import com.example.jetcaster.data.Episode
72-
import com.example.jetcaster.data.EpisodeToPodcast
73-
import com.example.jetcaster.data.Podcast
74-
import com.example.jetcaster.data.PodcastWithExtraInfo
71+
import com.example.jetcaster.core.data.database.model.Episode
72+
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
73+
import com.example.jetcaster.core.data.database.model.Podcast
74+
import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
7575
import com.example.jetcaster.ui.home.PreviewEpisodes
7676
import com.example.jetcaster.ui.home.PreviewPodcasts
7777
import com.example.jetcaster.ui.theme.JetcasterTheme
@@ -218,15 +218,16 @@ fun EpisodeListItem(
218218
)
219219

220220
CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
221+
val duration = episode.duration
221222
Text(
222223
text = when {
223-
episode.duration != null -> {
224+
duration != null -> {
224225
// If we have the duration, we combine the date/duration via a
225226
// formatted string
226227
stringResource(
227228
R.string.episode_date_duration,
228229
MediumDateFormatter.format(episode.published),
229-
episode.duration.toMinutes().toInt()
230+
duration.toMinutes().toInt()
230231
)
231232
}
232233
// Otherwise we just use the date

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.compose.material.Text
3030
import androidx.compose.runtime.Composable
3131
import androidx.compose.ui.Modifier
3232
import androidx.compose.ui.unit.dp
33-
import com.example.jetcaster.data.Category
33+
import com.example.jetcaster.core.data.database.model.Category
3434
import com.example.jetcaster.ui.home.category.PodcastCategoryViewState
3535
import com.example.jetcaster.ui.home.category.podcastCategory
3636
import com.example.jetcaster.ui.theme.Keyline1

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/library/Library.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.example.jetcaster.ui.home.library
1919
import androidx.compose.foundation.lazy.LazyListScope
2020
import androidx.compose.foundation.lazy.items
2121
import androidx.compose.ui.Modifier
22-
import com.example.jetcaster.data.EpisodeToPodcast
22+
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
2323
import com.example.jetcaster.ui.home.category.EpisodeListItem
2424

2525
fun LazyListScope.libraryItems(

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import androidx.lifecycle.SavedStateHandle
2626
import androidx.lifecycle.ViewModel
2727
import androidx.lifecycle.viewModelScope
2828
import androidx.savedstate.SavedStateRegistryOwner
29-
import com.example.jetcaster.Graph
30-
import com.example.jetcaster.data.EpisodeStore
31-
import com.example.jetcaster.data.PodcastStore
29+
import com.example.jetcaster.core.data.di.Graph
30+
import com.example.jetcaster.core.data.repository.EpisodeStore
31+
import com.example.jetcaster.core.data.repository.PodcastStore
3232
import java.time.Duration
3333
import kotlinx.coroutines.flow.first
3434
import kotlinx.coroutines.launch

‎Jetcaster/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
*/
1616

1717
plugins {
18+
alias(libs.plugins.android.application) apply false
19+
alias(libs.plugins.android.library) apply false
20+
alias(libs.plugins.kotlin.android) apply false
1821
alias(libs.plugins.gradle.versions)
1922
alias(libs.plugins.version.catalog.update)
2023
}
2124

22-
apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
25+
apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

0 commit comments

Comments
 (0)