Skip to content

Commit 1461c47

Browse files
behavior: optimize bottom player UI logic
1 parent 3750b39 commit 1461c47

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

android/src/main/kotlin/project/pipepipe/app/ui/screens/videodetail/VideoDetailScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
9393
SharedContext.playingVideoUrlBeforeMinimizing = streamInfo?.url
9494
}
9595
SharedContext.updatePlaybackMode(PlaybackMode.AUDIO_ONLY)
96-
if (mediaController?.mediaItemCount == 0 && streamInfo != null) {
96+
if (streamInfo != null &&
97+
(mediaController?.mediaItemCount == 0 ||
98+
(mediaController?.mediaItemCount == 1 && mediaController?.playbackState == Player.STATE_IDLE))) {
9799
mediaController?.setMediaItem(
98100
streamInfo.toMediaItem(),
99101
runBlocking { DatabaseOperations.getStreamProgress(streamInfo.url) } ?: 0)

library/src/commonMain/kotlin/project/pipepipe/app/viewmodel/VideoDetailViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class VideoDetailViewModel()
165165
}
166166

167167
fun hide() {
168-
setState { it.copy(pageState = VideoDetailPageState.HIDDEN) }
168+
setState { it.copy(pageState = VideoDetailPageState.HIDDEN, streamInfoStack = emptyList())}
169169
}
170170

171171
fun setDanmakuEnabled(enabled: Boolean) {

0 commit comments

Comments
 (0)