diff --git a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreenViewModel.kt b/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreenViewModel.kt index 1095e4e..044c03f 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreenViewModel.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreenViewModel.kt @@ -36,7 +36,7 @@ class EpisodeScreenViewModel @Inject constructor( fun onSeriesSelected(seriesId: String) { viewModelScope.launch { - navigationManager.navigate(Route.Series(ItemDto(id = UUID.fromString(seriesId), type = BaseItemKind.SERIES))) + navigationManager.navigate(Route.SeriesRoute(ItemDto(id = UUID.fromString(seriesId), type = BaseItemKind.SERIES))) } } diff --git a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt index 11dfc4a..e2fbfb0 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt @@ -32,7 +32,7 @@ class SeriesViewModel @Inject constructor( fun onSelectEpisode(episodeId: String) { viewModelScope.launch { - navigationManager.navigate(Route.Episode(ItemDto(id = UUID.fromString(episodeId), type = BaseItemKind.EPISODE))) + navigationManager.navigate(Route.EpisodeRoute(ItemDto(id = UUID.fromString(episodeId), type = BaseItemKind.EPISODE))) } } diff --git a/app/src/main/java/hu/bbara/purefin/app/home/HomePageViewModel.kt b/app/src/main/java/hu/bbara/purefin/app/home/HomePageViewModel.kt index 5b0a596..712a411 100644 --- a/app/src/main/java/hu/bbara/purefin/app/home/HomePageViewModel.kt +++ b/app/src/main/java/hu/bbara/purefin/app/home/HomePageViewModel.kt @@ -60,23 +60,23 @@ class HomePageViewModel @Inject constructor( fun onLibrarySelected(library : HomeNavItem) { viewModelScope.launch { - navigationManager.navigate(Route.Library(library = LibraryDto(id = library.id, name = library.label))) + navigationManager.navigate(Route.LibraryRoute(library = LibraryDto(id = library.id, name = library.label))) } } fun onMovieSelected(movieId: String) { - navigationManager.navigate(Route.Movie(ItemDto(id = UUID.fromString(movieId), type = BaseItemKind.MOVIE))) + navigationManager.navigate(Route.MovieRoute(ItemDto(id = UUID.fromString(movieId), type = BaseItemKind.MOVIE))) } fun onSeriesSelected(seriesId: String) { viewModelScope.launch { - navigationManager.navigate(Route.Series(ItemDto(id = UUID.fromString(seriesId), type = BaseItemKind.SERIES))) + navigationManager.navigate(Route.SeriesRoute(ItemDto(id = UUID.fromString(seriesId), type = BaseItemKind.SERIES))) } } fun onEpisodeSelected(episodeId: String) { viewModelScope.launch { - navigationManager.navigate(Route.Episode(ItemDto(id = UUID.fromString(episodeId), type = BaseItemKind.EPISODE))) + navigationManager.navigate(Route.EpisodeRoute(ItemDto(id = UUID.fromString(episodeId), type = BaseItemKind.EPISODE))) } } diff --git a/app/src/main/java/hu/bbara/purefin/app/library/LibraryViewModel.kt b/app/src/main/java/hu/bbara/purefin/app/library/LibraryViewModel.kt index 80fa63b..0aa9827 100644 --- a/app/src/main/java/hu/bbara/purefin/app/library/LibraryViewModel.kt +++ b/app/src/main/java/hu/bbara/purefin/app/library/LibraryViewModel.kt @@ -36,12 +36,12 @@ class LibraryViewModel @Inject constructor( val contents = _contents.asStateFlow() fun onMovieSelected(movieId: String) { - navigationManager.navigate(Route.Movie(ItemDto(id = UUID.fromString(movieId), type = BaseItemKind.MOVIE))) + navigationManager.navigate(Route.MovieRoute(ItemDto(id = UUID.fromString(movieId), type = BaseItemKind.MOVIE))) } fun onSeriesSelected(seriesId: String) { viewModelScope.launch { - navigationManager.navigate(Route.Series(ItemDto(id = UUID.fromString(seriesId), type = BaseItemKind.SERIES))) + navigationManager.navigate(Route.SeriesRoute(ItemDto(id = UUID.fromString(seriesId), type = BaseItemKind.SERIES))) } } diff --git a/app/src/main/java/hu/bbara/purefin/navigation/Route.kt b/app/src/main/java/hu/bbara/purefin/navigation/Route.kt index 10a72b9..ec41a49 100644 --- a/app/src/main/java/hu/bbara/purefin/navigation/Route.kt +++ b/app/src/main/java/hu/bbara/purefin/navigation/Route.kt @@ -8,17 +8,17 @@ sealed interface Route : NavKey { data object Home: Route @Serializable - data class Movie(val item : ItemDto) : Route + data class MovieRoute(val item : ItemDto) : Route @Serializable - data class Series(val item : ItemDto) : Route + data class SeriesRoute(val item : ItemDto) : Route @Serializable - data class Episode(val item : ItemDto) : Route + data class EpisodeRoute(val item : ItemDto) : Route @Serializable - data class Library(val library : LibraryDto) : Route + data class LibraryRoute(val library : LibraryDto) : Route @Serializable - data object Login : Route + data object LoginRoute : Route } diff --git a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt index f162a4b..7a3a4bc 100644 --- a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt +++ b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt @@ -12,19 +12,19 @@ fun EntryProviderScope.appRouteEntryBuilder() { entry { HomePage() } - entry { + entry { MovieScreen(movie = it.item) } - entry { + entry { SeriesScreen(series = it.item) } - entry { + entry { EpisodeScreen(episode = it.item) } - entry { + entry { LibraryScreen(library = it.library) } - entry { + entry { LoginScreen() } }