Revert "#495 - Workaround to fix play item by index until fix is made…

… in media3 (#494)" This reverts commit f5b3b08.
google · Aug 16, 2022 · 540b17d · 540b17d
1 parent 958ecae
commit 540b17d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/...ple/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt b/...ple/src/main/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreen.kt
@@ -22,32 +22,28 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.wear.compose.material.ScalingLazyListState
 import com.google.android.horologist.compose.layout.StateUtils
 import com.google.android.horologist.media.ui.screens.entity.EntityScreen
+import com.google.android.horologist.media.ui.state.model.DownloadMediaUiModel
 import com.google.android.horologist.media.ui.state.model.PlaylistUiModel
 
 @Composable
 fun UampEntityScreen(
     uampEntityScreenViewModel: UampEntityScreenViewModel,
-    onDownloadItemClick: () -> Unit,
+    onDownloadItemClick: (DownloadMediaUiModel) -> Unit,
     onShuffleClick: (PlaylistUiModel) -> Unit,
     onPlayClick: (PlaylistUiModel) -> Unit,
     focusRequester: FocusRequester,
     scalingLazyListState: ScalingLazyListState
 ) {
     val uiState by StateUtils.rememberStateWithLifecycle(flow = uampEntityScreenViewModel.uiState)
 
-    // https://github.com/google/horologist/issues/496
-    val finishedPlayExecution by StateUtils.rememberStateWithLifecycle(flow = uampEntityScreenViewModel.finishedPlayExecution)
-    if (finishedPlayExecution) {
-        onDownloadItemClick()
-    }
-
     EntityScreen(
         entityScreenState = uiState,
         onDownloadClick = {
             uampEntityScreenViewModel.download()
         },
         onDownloadItemClick = {
             uampEntityScreenViewModel.play(it.mediaUiModel.id)
+            onDownloadItemClick(it)
         },
         onShuffleClick = {
             uampEntityScreenViewModel.shufflePlay()

diff --git a/...ain/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreenViewModel.kt b/...ain/java/com/google/android/horologist/mediasample/ui/entity/UampEntityScreenViewModel.kt
@@ -28,13 +28,10 @@ import com.google.android.horologist.mediasample.domain.model.PlaylistDownload
 import com.google.android.horologist.mediasample.ui.mapper.DownloadMediaUiModelMapper
 import com.google.android.horologist.mediasample.ui.mapper.PlaylistUiModelMapper
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -66,9 +63,6 @@ class UampEntityScreenViewModel @Inject constructor(
         EntityScreenState.Loading(playlistName)
     )
 
-    // https://github.com/google/horologist/issues/496
-    val finishedPlayExecution: MutableStateFlow<Boolean> = MutableStateFlow(false)
-
     fun play(mediaId: String? = null) {
         play(shuffled = false, mediaId = mediaId)
     }
@@ -84,18 +78,11 @@ class UampEntityScreenViewModel @Inject constructor(
                 .coerceAtLeast(0)
 
             playerRepository.setShuffleModeEnabled(shuffled)
-            playerRepository.setMediaList(playlistDownload.playlist.mediaList)
-
-            // https://github.com/google/horologist/issues/496
-            viewModelScope.launch {
-                delay(100)
 
-                playerRepository.seekToDefaultPosition(index)
-                playerRepository.prepare()
-                playerRepository.play()
-
-                finishedPlayExecution.value = true
-            }
+            playerRepository.setMediaList(playlistDownload.playlist.mediaList)
+            playerRepository.seekToDefaultPosition(index)
+            playerRepository.prepare()
+            playerRepository.play()
         }
     }