Skip to content

Commit 679caa2

Browse files
dev: refactor videoPage setPageState
1 parent 84e0e5b commit 679caa2

3 files changed

Lines changed: 12 additions & 15 deletions

File tree

android/src/main/kotlin/project/pipepipe/app/platform/AndroidActions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class AndroidActions(
7272
SharedContext.enterPipmode()
7373
SharedContext.platformMediaController?.setPlaybackMode(PlaybackMode.VIDEO_AUDIO)
7474
SharedContext.platformMediaController?.playFromStreamInfo(streamInfo)
75-
SharedContext.sharedVideoDetailViewModel.setPageState(VideoDetailPageState.FULLSCREEN_PLAYER)
75+
SharedContext.sharedVideoDetailViewModel.showAsFullscreenPlayer()
7676
activity.enterPipMode(streamInfo.isPortrait)
7777
}
7878
}

library/src/commonMain/kotlin/project/pipepipe/app/ui/screens/videodetail/VideoDetailScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
191191
when (newOrientation) {
192192
ScreenOrientation.LANDSCAPE if oldOrientation == ScreenOrientation.PORTRAIT &&
193193
uiState.pageState != VideoDetailPageState.FULLSCREEN_PLAYER -> {
194-
viewModel.setPageState(VideoDetailPageState.FULLSCREEN_PLAYER)
194+
viewModel.showAsFullscreenPlayer()
195195
}
196196

197197
ScreenOrientation.PORTRAIT if oldOrientation == ScreenOrientation.LANDSCAPE &&
198198
uiState.pageState == VideoDetailPageState.FULLSCREEN_PLAYER -> {
199-
viewModel.setPageState(VideoDetailPageState.DETAIL_PAGE)
199+
viewModel.showAsDetailPage()
200200
}
201201
else -> {}
202202
}

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,11 @@ class VideoDetailViewModel()
143143
return true
144144
}
145145

146-
fun setPageState(pageState: VideoDetailPageState) {
147-
setState { it.copy(pageState = pageState) }
148-
}
149-
150146
fun toggleFullscreenPlayer() {
151-
setState {
152-
it.copy(
153-
pageState = if (it.pageState == VideoDetailPageState.FULLSCREEN_PLAYER) {
154-
VideoDetailPageState.DETAIL_PAGE
155-
} else {
156-
VideoDetailPageState.FULLSCREEN_PLAYER
157-
}
158-
)
147+
if (uiState.value.pageState == VideoDetailPageState.FULLSCREEN_PLAYER) {
148+
showAsDetailPage()
149+
} else {
150+
showAsFullscreenPlayer()
159151
}
160152
}
161153

@@ -175,6 +167,11 @@ class VideoDetailViewModel()
175167
}
176168
}
177169

170+
fun showAsFullscreenPlayer() {
171+
setState { it.copy(pageState = VideoDetailPageState.FULLSCREEN_PLAYER) }
172+
}
173+
174+
178175
fun showAsDetailPage() {
179176
setState { it.copy(pageState = VideoDetailPageState.DETAIL_PAGE) }
180177
}

0 commit comments

Comments
 (0)