Skip to content

Update CameraXBasic.kt #299

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

Merged
MagicalMeghan merged 4 commits into from
May 21, 2025
Merged

Update CameraXBasic.kt #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56062b2
Update CameraXBasic.kt
MagicalMeghan May 20, 2025
2d63771
Update ViewModel
MagicalMeghan May 20, 2025
4cb2d22
Update CameraXBasic.kt
MagicalMeghan May 20, 2025
206b44a
Update CameraXBasic.kt
MagicalMeghan May 21, 2025
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
33 changes: 17 additions & 16 deletions samples/camera/camerax/src/main/java/com/example/platform/camerax/basic/CameraXBasic.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import androidx.compose.ui.unit.round
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import coil.compose.rememberAsyncImagePainter
import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.PermissionState
Expand All @@ -84,22 +85,21 @@ fun CameraXBasic(modifier: Modifier = Modifier) {
var showCapturedImage by remember { mutableStateOf<Uri?>(null) }
val cameraPermissionState = rememberPermissionState(Manifest.permission.CAMERA)
val imageCaptureCallbackExecutor: ExecutorService = remember { Executors.newSingleThreadExecutor() }
val viewModel = remember { CameraXBasicViewModel() }
val viewModel = viewModel { CameraXBasicViewModel() }

DisposableEffect(Unit) {
onDispose {
imageCaptureCallbackExecutor.shutdown()
}
}

Box(modifier = Modifier.fillMaxSize()) {
Box(modifier = modifier.fillMaxSize()) {
ContentWithPermissionHandling(
cameraPermissionState = cameraPermissionState,
showCapturedImage = showCapturedImage,
onShowCapturedImageChange = { showCapturedImage = it },
viewModel = viewModel,
imageCaptureCallbackExecutor = imageCaptureCallbackExecutor,
modifier = modifier,
imageCaptureCallbackExecutor = imageCaptureCallbackExecutor
)
}
}
Expand Down Expand Up @@ -131,7 +131,7 @@ private fun ContentWithPermissionHandling(
when (cameraPermissionState.status) {
is PermissionStatus.Granted -> {
if (showCapturedImage != null) {
CapturedImageView(uri = showCapturedImage) {
CapturedImageView(uri = showCapturedImage, modifier = modifier) {
onShowCapturedImageChange(null)
}
} else {
Expand All @@ -152,8 +152,9 @@ private fun ContentWithPermissionHandling(
}

is PermissionStatus.Denied -> CameraPermissionDeniedView(
cameraPermissionState.status,
cameraPermissionState,
status = cameraPermissionState.status,
cameraPermissionState = cameraPermissionState,
modifier = modifier
)
}
}
Expand All @@ -171,9 +172,10 @@ private fun ContentWithPermissionHandling(
private fun CameraPermissionDeniedView(
status: PermissionStatus,
cameraPermissionState: PermissionState,
modifier: Modifier = Modifier
) {
Column(
modifier = Modifier
modifier = modifier
.fillMaxSize()
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
Expand Down Expand Up @@ -232,7 +234,7 @@ private fun CameraPreviewContent(

surfaceRequest?.let { request ->
val coordinateTransformer = remember { MutableCoordinateTransformer() }
Box(modifier = Modifier.fillMaxSize()) {
Box(modifier = modifier.fillMaxSize()) {
CameraXViewfinder(
surfaceRequest = request,
coordinateTransformer = coordinateTransformer,
Expand Down Expand Up @@ -263,14 +265,13 @@ private fun CameraPreviewContent(
.size(48.dp),
)
}
Column(

Button(
onClick = onTakePhotoClick,
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Button(onClick = onTakePhotoClick) { Text("Take Photo") }
}
) { Text("Take Photo") }
}
}
}
Expand All @@ -283,9 +284,9 @@ private fun CameraPreviewContent(
* (e.g., clicks the back button).
*/
@Composable
fun CapturedImageView(uri: Uri, onDismiss: () -> Unit) {
fun CapturedImageView(uri: Uri, modifier: Modifier = Modifier, onDismiss: () -> Unit = {}) {
Box(
modifier = Modifier.fillMaxSize(),
modifier = modifier.fillMaxSize(),
) {
Image(
painter = rememberAsyncImagePainter(uri),
Expand Down
3 changes: 2 additions & 1 deletion .../camera/camerax/src/main/java/com/example/platform/camerax/basic/CameraXBasicViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import androidx.camera.lifecycle.awaitInstance
import androidx.compose.ui.geometry.Offset
import androidx.core.content.ContextCompat
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.ViewModel
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
Expand All @@ -52,7 +53,7 @@ import java.util.concurrent.ExecutorService
* functionality using CameraX. It exposes a [StateFlow] for the camera preview [SurfaceRequest]
* to be used in a composable.
*/
class CameraXBasicViewModel {
class CameraXBasicViewModel : ViewModel() {
private val _surfaceRequest = MutableStateFlow<SurfaceRequest?>(null)
val surfaceRequest: StateFlow<SurfaceRequest?> = _surfaceRequest
private var surfaceMeteringPointFactory: SurfaceOrientedMeteringPointFactory? = null
Expand Down
Loading