Removes playback speed screen (#1405)

Removes playback speed dedicated screen.
android · May 28, 2024 · 2aff968 · 2aff968
2 parents b7adb98 + b107573
commit 2aff968
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 277 deletions.
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt
@@ -33,19 +33,16 @@ import com.example.jetcaster.theme.WearAppTheme
 import com.example.jetcaster.ui.Episode
 import com.example.jetcaster.ui.JetcasterNavController.navigateToEpisode
 import com.example.jetcaster.ui.JetcasterNavController.navigateToLatestEpisode
-import com.example.jetcaster.ui.JetcasterNavController.navigateToPlaybackSpeed
 import com.example.jetcaster.ui.JetcasterNavController.navigateToPodcastDetails
 import com.example.jetcaster.ui.JetcasterNavController.navigateToUpNext
 import com.example.jetcaster.ui.JetcasterNavController.navigateToYourPodcast
 import com.example.jetcaster.ui.LatestEpisodes
-import com.example.jetcaster.ui.PlaybackSpeed
 import com.example.jetcaster.ui.PodcastDetails
 import com.example.jetcaster.ui.UpNext
 import com.example.jetcaster.ui.YourPodcasts
 import com.example.jetcaster.ui.episode.EpisodeScreen
 import com.example.jetcaster.ui.latest_episodes.LatestEpisodesScreen
 import com.example.jetcaster.ui.library.LibraryScreen
-import com.example.jetcaster.ui.player.PlaybackSpeedScreen
 import com.example.jetcaster.ui.player.PlayerScreen
 import com.example.jetcaster.ui.podcast.PodcastDetailsScreen
 import com.example.jetcaster.ui.podcasts.PodcastsScreen
@@ -95,10 +92,7 @@ fun WearApp() {
                                 volumeViewModel = volumeViewModel,
                                 onVolumeClick = {
                                     navController.navigateToVolume()
-                                },
-                                onPlaybackSpeedChangeClick = {
-                                    navController.navigateToPlaybackSpeed()
-                                },
+                                }
                             )
                         },
                         libraryScreen = {
@@ -170,9 +164,6 @@ fun WearApp() {
                         }
                     )
                 }
-                composable(route = PlaybackSpeed.navRoute) {
-                    PlaybackSpeedScreen()
-                }
             }
         }
     }

diff --git a/...aster/wear/src/main/java/com/example/jetcaster/ui/latest_episodes/LatestEpisodesScreen.kt b/...aster/wear/src/main/java/com/example/jetcaster/ui/latest_episodes/LatestEpisodesScreen.kt
@@ -118,45 +118,6 @@ fun LatestEpisodeScreen(
     }
 }
 
-// @Composable
-// fun MediaContent(
-//    episode: PlayerEpisode,
-//    episodeArtworkPlaceholder: Painter?,
-//    onPlayButtonClick: () -> Unit,
-//    onPlayEpisode: (PlayerEpisode) -> Unit,
-//    modifier: Modifier = Modifier
-// ) {
-//    val mediaTitle = episode.title
-//    val duration = episode.duration
-//
-//    val secondaryLabel = when {
-//        duration != null -> {
-//            // If we have the duration, we combine the date/duration via a
-//            // formatted string
-//            stringResource(
-//                R.string.episode_date_duration,
-//                MediumDateFormatter.format(episode.published),
-//                duration.toMinutes().toInt()
-//            )
-//        }
-//        // Otherwise we just use the date
-//        else -> MediumDateFormatter.format(episode.published)
-//    }
-//
-//    Chip(
-//        label = mediaTitle,
-//        onClick = {
-//            onPlayButtonClick()
-//            onPlayEpisode(episode)
-//        },
-//        secondaryLabel = secondaryLabel,
-//        icon = CoilPaintable(episode.podcastImageUrl, episodeArtworkPlaceholder),
-//        largeIcon = true,
-//        colors = ChipDefaults.secondaryChipColors(),
-//        modifier = modifier
-//    )
-// }
-
 @OptIn(ExperimentalHorologistApi::class)
 @Composable
 fun ButtonsContent(

diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedScreen.kt
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedUiState.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedUiState.kt
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedUiStateMapper.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedUiStateMapper.kt
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedViewModel.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlaybackSpeedViewModel.kt
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt
@@ -60,7 +60,6 @@ import com.google.android.horologist.media.ui.screens.player.PlayerScreen
 fun PlayerScreen(
     volumeViewModel: VolumeViewModel,
     onVolumeClick: () -> Unit,
-    onPlaybackSpeedChangeClick: () -> Unit,
     modifier: Modifier = Modifier,
     playerScreenViewModel: PlayerViewModel = hiltViewModel(),
 ) {
@@ -71,7 +70,6 @@ fun PlayerScreen(
         volumeUiState = volumeUiState,
         onVolumeClick = onVolumeClick,
         onUpdateVolume = { newVolume -> volumeViewModel.setVolume(newVolume) },
-        onPlaybackSpeedChangeClick = onPlaybackSpeedChangeClick,
         modifier = modifier
     )
 }
@@ -82,7 +80,6 @@ private fun PlayerScreen(
     playerScreenViewModel: PlayerViewModel,
     volumeUiState: VolumeUiState,
     onVolumeClick: () -> Unit,
-    onPlaybackSpeedChangeClick: () -> Unit,
     onUpdateVolume: (Int) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -115,7 +112,7 @@ private fun PlayerScreen(
                         volumeUiState = volumeUiState,
                         onVolumeClick = onVolumeClick,
                         playerUiState = PlayerUiState(),
-                        onPlaybackSpeedChange = onPlaybackSpeedChangeClick,
+                        onPlaybackSpeedChange = playerScreenViewModel::onPlaybackSpeedChange,
                         enabled = false,
                     )
                 },
@@ -162,7 +159,7 @@ private fun PlayerScreen(
                         volumeUiState = volumeUiState,
                         onVolumeClick = onVolumeClick,
                         playerUiState = state.playerState,
-                        onPlaybackSpeedChange = onPlaybackSpeedChangeClick,
+                        onPlaybackSpeedChange = playerScreenViewModel::onPlaybackSpeedChange,
                         enabled = true,
                     )
                 },

diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt
@@ -88,6 +88,14 @@ class PlayerViewModel @Inject constructor(
     fun onRewindBy() {
         episodePlayer.rewindBy(Duration.ofSeconds(10))
     }
+
+    fun onPlaybackSpeedChange() {
+        if (episodePlayer.playerState.value.playbackSpeed == Duration.ofSeconds(2)) {
+            episodePlayer.decreaseSpeed(speed = Duration.ofMillis(1000))
+        } else {
+            episodePlayer.increaseSpeed()
+        }
+    }
 }
 
 sealed class PlayerScreenUiState {