Skip to content

Moving APIs in PreviewViewModel to Callbacks data classes #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidjiagoogle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Moving APIs in PreviewViewModel to Callbacks data classes #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 32 additions & 27 deletions feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ fun PreviewScreen(

val context = LocalContext.current
LaunchedEffect(Unit) {
debouncedOrientationFlow(context).collect(viewModel::setDisplayRotation)
debouncedOrientationFlow(context).collect(
viewModel.captureCallbacks.setDisplayRotation
)
}
val scope = rememberCoroutineScope()
val zoomState = remember {
Expand All @@ -213,8 +215,8 @@ fun PreviewScreen(
)
?.initialZoomRatio
?: 1f,
onAnimateStateChanged = viewModel::setZoomAnimationState,
onChangeZoomLevel = viewModel::changeZoomRatio,
onAnimateStateChanged = viewModel.captureCallbacks.setZoomAnimationState,
onChangeZoomLevel = viewModel.captureCallbacks.changeZoomRatio,
zoomRange = (currentUiState.zoomUiState as? ZoomUiState.Enabled)
?.primaryZoomRange
?: Range(1f, 1f)
Expand Down Expand Up @@ -251,8 +253,8 @@ fun PreviewScreen(
val oldZoomRatios = it.zoomRatios
val oldAudioEnabled = it.isAudioEnabled
Log.d(TAG, "reset pre recording settings")
viewModel.setAudioEnabled(oldAudioEnabled)
viewModel.setLensFacing(oldPrimaryLensFacing)
viewModel.captureCallbacks.setAudioEnabled(oldAudioEnabled)
viewModel.quickSettingsCallbacks.setLensFacing(oldPrimaryLensFacing)
zoomState.apply {
absoluteZoom(
targetZoomLevel = oldZoomRatios[oldPrimaryLensFacing] ?: 1f,
Expand All @@ -279,11 +281,11 @@ fun PreviewScreen(
screenFlashUiState = screenFlashUiState,
surfaceRequest = surfaceRequest,
onNavigateToSettings = onNavigateToSettings,
onClearUiScreenBrightness = viewModel::setClearUiScreenBrightness,
onSetLensFacing = viewModel::setLensFacing,
onTapToFocus = viewModel::tapToFocus,
onSetTestPattern = viewModel::setTestPattern,
onSetImageWell = viewModel::imageWellToRepository,
onClearUiScreenBrightness = viewModel.screenFlash::setClearUiScreenBrightness,
onSetLensFacing = viewModel.quickSettingsCallbacks.setLensFacing,
onTapToFocus = viewModel.captureCallbacks.tapToFocus,
onSetTestPattern = viewModel.debugCallbacks.setTestPattern,
onSetImageWell = viewModel.captureCallbacks.imageWellToRepository,
onAbsoluteZoom = { zoomRatio: Float, lensToZoom: LensToZoom ->
scope.launch {
zoomState.absoluteZoom(
Expand Down Expand Up @@ -317,26 +319,29 @@ fun PreviewScreen(
}
},

onSetCaptureMode = viewModel::setCaptureMode,
onChangeFlash = viewModel::setFlash,
onChangeAspectRatio = viewModel::setAspectRatio,
onSetStreamConfig = viewModel::setStreamConfig,
onChangeDynamicRange = viewModel::setDynamicRange,
onChangeConcurrentCameraMode = viewModel::setConcurrentCameraMode,
onChangeImageFormat = viewModel::setImageFormat,
onDisabledCaptureMode = viewModel::enqueueDisabledHdrToggleSnackBar,
onToggleQuickSettings = viewModel::toggleQuickSettings,
onSetFocusedSetting = viewModel::setFocusedSetting,
onToggleDebugOverlay = viewModel::toggleDebugOverlay,
onToggleDebugHidingComponents = viewModel::toggleDebugHidingComponents,
onSetPause = viewModel::setPaused,
onSetAudioEnabled = viewModel::setAudioEnabled,
onSetCaptureMode = viewModel.quickSettingsCallbacks.setCaptureMode,
onChangeFlash = viewModel.quickSettingsCallbacks.setFlash,
onChangeAspectRatio = viewModel.quickSettingsCallbacks.setAspectRatio,
onSetStreamConfig = viewModel.quickSettingsCallbacks.setStreamConfig,
onChangeDynamicRange = viewModel.quickSettingsCallbacks.setDynamicRange,
onChangeConcurrentCameraMode =
viewModel.quickSettingsCallbacks.setConcurrentCameraMode,
onChangeImageFormat = viewModel.quickSettingsCallbacks.setImageFormat,
onDisabledCaptureMode =
viewModel.snackBarCallbacks.enqueueDisabledHdrToggleSnackBar,
onToggleQuickSettings = viewModel.quickSettingsCallbacks.toggleQuickSettings,
onSetFocusedSetting = viewModel.quickSettingsCallbacks.setFocusedSetting,
onToggleDebugOverlay = viewModel.debugCallbacks.toggleDebugOverlay,
onToggleDebugHidingComponents =
viewModel.debugCallbacks.toggleDebugHidingComponents,
onSetPause = viewModel.captureCallbacks.setPaused,
onSetAudioEnabled = viewModel.captureCallbacks.setAudioEnabled,
onCaptureImage = viewModel::captureImage,
onStartVideoRecording = viewModel::startVideoRecording,
onStopVideoRecording = viewModel::stopVideoRecording,
onLockVideoRecording = viewModel::setLockedRecording,
onLockVideoRecording = viewModel.captureCallbacks.setLockedRecording,
onRequestWindowColorMode = onRequestWindowColorMode,
onSnackBarResult = viewModel::onSnackBarResult,
onSnackBarResult = viewModel.snackBarCallbacks.onSnackBarResult,
onNavigatePostCapture = onNavigateToPostCapture,
debugUiState = debugUiState,
snackBarUiState = snackBarUiState
Expand All @@ -349,7 +354,7 @@ fun PreviewScreen(
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P ||
readStoragePermission.status.isGranted
) {
viewModel.updateLastCapturedMedia()
viewModel.captureCallbacks.updateLastCapturedMedia()
}
}
}
Expand Down
Loading
Loading