Skip to content

Commit d157e2f

Browse files
authored
[Jetcaster] Fix TV imports. (#1334)
Fix incorrect imports. Regression introduced in #1332
2 parents c34f0a5 + efc0031 commit d157e2f

File tree

12 files changed

+15
-14
lines changed

12 files changed

+15
-14
lines changed

Jetcaster/core/src/test/kotlin/com/example/jetcaster/core/data/domain/FilterableCategoriesUseCaseTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.example.jetcaster.core.data.domain
1818

1919
import com.example.jetcaster.core.data.database.model.Category
20+
import com.example.jetcaster.core.data.database.model.asExternalModel
2021
import com.example.jetcaster.core.data.repository.TestCategoryStore
21-
import com.example.jetcaster.model.asExternalModel
2222
import kotlinx.coroutines.flow.first
2323
import kotlinx.coroutines.test.runTest
2424
import org.junit.Assert.assertEquals

Jetcaster/core/src/test/kotlin/com/example/jetcaster/core/data/domain/PodcastCategoryFilterUseCaseTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import com.example.jetcaster.core.data.database.model.Episode
2121
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
2222
import com.example.jetcaster.core.data.database.model.Podcast
2323
import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
24+
import com.example.jetcaster.core.data.database.model.asExternalModel
25+
import com.example.jetcaster.core.data.database.model.asPodcastCategoryEpisode
2426
import com.example.jetcaster.core.data.repository.TestCategoryStore
25-
import com.example.jetcaster.model.asExternalModel
26-
import com.example.jetcaster.model.asPodcastCategoryEpisode
2727
import java.time.OffsetDateTime
2828
import kotlinx.coroutines.flow.first
2929
import kotlinx.coroutines.test.runTest

Jetcaster/tv-app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ dependencies {
7676
implementation(libs.androidx.tv.foundation)
7777
implementation(libs.androidx.tv.material)
7878
implementation(libs.androidx.lifecycle.runtime)
79+
implementation(libs.androidx.lifecycle.runtime.compose)
7980
implementation(libs.androidx.activity.compose)
8081
implementation(libs.androidx.navigation.compose)
8182
implementation(libs.coil.kt.compose)

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/model/EpisodeList.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.example.jetcaster.tv.model
1818

1919
import androidx.compose.runtime.Immutable
20-
import com.example.jetcaster.core.data.model.PlayerEpisode
20+
import com.example.jetcaster.core.model.PlayerEpisode
2121

2222
@Immutable
2323
data class EpisodeList(val member: List<PlayerEpisode>) : List<PlayerEpisode> by member

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/JetcasterAppState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.runtime.Composable
2121
import androidx.compose.runtime.remember
2222
import androidx.navigation.NavHostController
2323
import androidx.navigation.compose.rememberNavController
24-
import com.example.jetcaster.core.data.model.PlayerEpisode
24+
import com.example.jetcaster.core.model.PlayerEpisode
2525

2626
class JetcasterAppState(
2727
val navHostController: NavHostController

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/component/EpisodeCard.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import androidx.tv.material3.Text
3636
import androidx.tv.material3.WideCardLayout
3737
import coil.compose.AsyncImage
3838
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
39-
import com.example.jetcaster.core.data.model.PlayerEpisode
40-
import com.example.jetcaster.core.data.model.toPlayerEpisode
39+
import com.example.jetcaster.core.data.database.model.toPlayerEpisode
40+
import com.example.jetcaster.core.model.PlayerEpisode
4141
import com.example.jetcaster.tv.ui.theme.JetcasterAppDefaults
4242

4343
@Composable

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/component/EpisodeDetails.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.compose.ui.text.TextStyle
2525
import androidx.tv.material3.ExperimentalTvMaterial3Api
2626
import androidx.tv.material3.MaterialTheme
2727
import androidx.tv.material3.Text
28-
import com.example.jetcaster.core.data.model.PlayerEpisode
28+
import com.example.jetcaster.core.model.PlayerEpisode
2929
import com.example.jetcaster.tv.ui.theme.JetcasterAppDefaults
3030

3131
@Composable

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/component/Thumbnail.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.DpSize
2626
import androidx.compose.ui.unit.dp
2727
import coil.compose.AsyncImage
2828
import com.example.jetcaster.core.data.database.model.Podcast
29-
import com.example.jetcaster.core.data.model.PlayerEpisode
29+
import com.example.jetcaster.core.model.PlayerEpisode
3030
import com.example.jetcaster.tv.ui.theme.JetcasterAppDefaults
3131

3232
@Composable

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import androidx.tv.material3.MaterialTheme
3636
import androidx.tv.material3.Text
3737
import com.example.jetcaster.core.data.database.model.Episode
3838
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
39-
import com.example.jetcaster.core.data.model.PlayerEpisode
40-
import com.example.jetcaster.core.data.model.toPlayerEpisode
39+
import com.example.jetcaster.core.data.database.model.toPlayerEpisode
40+
import com.example.jetcaster.core.model.PlayerEpisode
4141
import com.example.jetcaster.tv.ui.component.Background
4242
import com.example.jetcaster.tv.ui.component.EnqueueButton
4343
import com.example.jetcaster.tv.ui.component.EpisodeDataAndDuration

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreenViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import androidx.lifecycle.SavedStateHandle
2020
import androidx.lifecycle.ViewModel
2121
import androidx.lifecycle.viewModelScope
2222
import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
23-
import com.example.jetcaster.core.data.model.PlayerEpisode
2423
import com.example.jetcaster.core.data.repository.EpisodeStore
2524
import com.example.jetcaster.core.data.repository.PodcastsRepository
25+
import com.example.jetcaster.core.model.PlayerEpisode
2626
import com.example.jetcaster.core.player.EpisodePlayer
2727
import com.example.jetcaster.tv.ui.Screen
2828
import dagger.hilt.android.lifecycle.HiltViewModel

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import androidx.tv.material3.Button
6161
import androidx.tv.material3.ExperimentalTvMaterial3Api
6262
import androidx.tv.material3.MaterialTheme
6363
import androidx.tv.material3.Text
64-
import com.example.jetcaster.core.data.model.PlayerEpisode
64+
import com.example.jetcaster.core.model.PlayerEpisode
6565
import com.example.jetcaster.core.player.EpisodePlayerState
6666
import com.example.jetcaster.tv.R
6767
import com.example.jetcaster.tv.model.EpisodeList

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreenViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.example.jetcaster.tv.ui.player
1818

1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.viewModelScope
21-
import com.example.jetcaster.core.data.model.PlayerEpisode
21+
import com.example.jetcaster.core.model.PlayerEpisode
2222
import com.example.jetcaster.core.player.EpisodePlayer
2323
import com.example.jetcaster.core.player.EpisodePlayerState
2424
import dagger.hilt.android.lifecycle.HiltViewModel

0 commit comments

Comments
 (0)