From 9ce9758361fbd5260beae030fdb5155e330aeb60 Mon Sep 17 00:00:00 2001 From: nk Date: Mon, 1 Jun 2026 13:19:23 +0300 Subject: [PATCH] feat(player): wire StationsScreen and FavoritesScreen to actual playback --- app/src/main/java/com/radiola/MainActivity.kt | 7 ++++--- .../main/java/com/radiola/ui/favorites/FavoritesScreen.kt | 5 +++-- .../main/java/com/radiola/ui/stations/StationsScreen.kt | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/radiola/MainActivity.kt b/app/src/main/java/com/radiola/MainActivity.kt index 47b7c10..bb24741 100644 --- a/app/src/main/java/com/radiola/MainActivity.kt +++ b/app/src/main/java/com/radiola/MainActivity.kt @@ -62,15 +62,16 @@ class MainActivity : ComponentActivity() { ) { composable(NavDestinations.Stations.route) { StationsScreen( - onStationClick = { stationId -> - // TODO: lookup station and play + onStationClick = { station -> + playerViewModel.play(station) showPlayer = true } ) } composable(NavDestinations.Favorites.route) { FavoritesScreen( - onStationClick = { stationId -> + onStationClick = { station -> + playerViewModel.play(station) showPlayer = true } ) diff --git a/app/src/main/java/com/radiola/ui/favorites/FavoritesScreen.kt b/app/src/main/java/com/radiola/ui/favorites/FavoritesScreen.kt index 1d3e39f..c072add 100644 --- a/app/src/main/java/com/radiola/ui/favorites/FavoritesScreen.kt +++ b/app/src/main/java/com/radiola/ui/favorites/FavoritesScreen.kt @@ -9,13 +9,14 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel +import com.radiola.domain.model.Station import com.radiola.ui.components.EmptyState import com.radiola.ui.components.StationCard @OptIn(ExperimentalMaterial3Api::class) @Composable fun FavoritesScreen( - onStationClick: (Int) -> Unit, + onStationClick: (Station) -> Unit, modifier: Modifier = Modifier, viewModel: FavoritesViewModel = hiltViewModel() ) { @@ -49,7 +50,7 @@ fun FavoritesScreen( items(favorites, key = { it.id }) { station -> StationCard( station = station, - onClick = { onStationClick(station.id) } + onClick = { onStationClick(station) } ) } } diff --git a/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt b/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt index 8720d45..d4fe5aa 100644 --- a/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt +++ b/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt @@ -14,7 +14,7 @@ import com.radiola.ui.components.* @OptIn(ExperimentalMaterial3Api::class) @Composable fun StationsScreen( - onStationClick: (Int) -> Unit, + onStationClick: (Station) -> Unit, modifier: Modifier = Modifier, viewModel: StationsViewModel = hiltViewModel() ) { @@ -67,7 +67,7 @@ fun StationsScreen( items(stations, key = { it.id }) { station -> StationCard( station = station, - onClick = { onStationClick(station.id) } + onClick = { onStationClick(station) } ) } }