fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

replace property getters with actual functions in CameraXPreview

Browse Source
This commit is contained in:
darthpaul
2022-06-25 23:25:20 +01:00
parent cc5fa462c4
commit d168040722
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
View File

@ -101,18 +101,6 @@ class CameraXPreview(
} }
} }
private val hasBackCamera: Boolean
get() = cameraProvider?.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA) ?: false
private val hasFrontCamera: Boolean
get() = cameraProvider?.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA) ?: false
private val cameraCount: Int
get() = cameraProvider?.availableCameraInfos?.size ?: 0
private val frontCameraInUse: Boolean
get() = cameraSelector == CameraSelector.DEFAULT_FRONT_CAMERA
private var preview: Preview? = null private var preview: Preview? = null
private var cameraProvider: ProcessCameraProvider? = null private var cameraProvider: ProcessCameraProvider? = null
private var imageCapture: ImageCapture? = null private var imageCapture: ImageCapture? = null
@ -172,13 +160,13 @@ class CameraXPreview(
private fun setupCameraObservers() { private fun setupCameraObservers() {
listener.setFlashAvailable(camera?.cameraInfo?.hasFlashUnit() ?: false) listener.setFlashAvailable(camera?.cameraInfo?.hasFlashUnit() ?: false)
listener.onChangeCamera(frontCameraInUse) listener.onChangeCamera(isFrontCameraInUse())
camera?.cameraInfo?.cameraState?.observe(activity) { cameraState -> camera?.cameraInfo?.cameraState?.observe(activity) { cameraState ->
when (cameraState.type) { when (cameraState.type) {
CameraState.Type.OPEN, CameraState.Type.OPEN,
CameraState.Type.OPENING -> { CameraState.Type.OPENING -> {
listener.setHasFrontAndBackCamera(hasFrontCamera && hasBackCamera) listener.setHasFrontAndBackCamera(hasFrontCamera() && hasBackCamera())
listener.setCameraAvailable(true) listener.setCameraAvailable(true)
} }
CameraState.Type.PENDING_OPEN, CameraState.Type.PENDING_OPEN,
@ -280,6 +268,18 @@ class CameraXPreview(
return AspectRatio.RATIO_16_9 return AspectRatio.RATIO_16_9
} }
private fun hasBackCamera(): Boolean {
return cameraProvider?.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA) ?: false
}
private fun hasFrontCamera(): Boolean {
return cameraProvider?.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA) ?: false
}
private fun isFrontCameraInUse(): Boolean {
return cameraSelector == CameraSelector.DEFAULT_FRONT_CAMERA
}
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
// source: https://stackoverflow.com/a/60095886/10552591 // source: https://stackoverflow.com/a/60095886/10552591
private fun setupZoomAndFocus() { private fun setupZoomAndFocus() {
@ -333,7 +333,7 @@ class CameraXPreview(
} }
override fun toggleFrontBackCamera() { override fun toggleFrontBackCamera() {
val newCameraSelector = if (frontCameraInUse) { val newCameraSelector = if (isFrontCameraInUse()) {
CameraSelector.DEFAULT_BACK_CAMERA CameraSelector.DEFAULT_BACK_CAMERA
} else { } else {
CameraSelector.DEFAULT_FRONT_CAMERA CameraSelector.DEFAULT_FRONT_CAMERA