Fix issue where processing indicator shows when not supported

- if the device does not support processing indicator then the indicator still appears - this fixes the issue
android · May 24, 2024 · c37d4a8 · c37d4a8
1 parent 7bb54ef
commit c37d4a8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/CameraXExtensions/app/src/main/java/com/example/android/cameraxextensions/MainActivity.kt b/CameraXExtensions/app/src/main/java/com/example/android/cameraxextensions/MainActivity.kt
@@ -206,6 +206,8 @@ class MainActivity : AppCompatActivity() {
                         )
                     }
                     CaptureState.CaptureReady -> {
+                        captureUri = null
+                        progressComplete = false
                         captureScreenViewState.emit(
                             captureScreenViewState.value
                                 .updateCameraScreen {
@@ -225,13 +227,8 @@ class MainActivity : AppCompatActivity() {
                     }
                     is CaptureState.CaptureFinished -> {
                         captureUri = state.outputResults.savedUri
-                        if (!progressComplete) {
-                            captureScreenViewState.emit(
-                                captureScreenViewState.value
-                                    .updateCameraScreen {
-                                        it.showProcessProgressViewState(100)
-                                    }
-                            )
+                        if (!state.isProcessProgressSupported) {
+                            progressComplete = true
                         }
                         showCapture()
                     }

diff --git a/...Extensions/app/src/main/java/com/example/android/cameraxextensions/model/CameraUiState.kt b/...Extensions/app/src/main/java/com/example/android/cameraxextensions/model/CameraUiState.kt
@@ -88,7 +88,10 @@ sealed class CaptureState {
     /**
      * Capture completed successfully.
      */
-    data class CaptureFinished(val outputResults: ImageCapture.OutputFileResults) : CaptureState()
+    data class CaptureFinished(
+        val outputResults: ImageCapture.OutputFileResults,
+        val isProcessProgressSupported: Boolean
+    ) : CaptureState()
 
     /**
      * Capture failed with an error.

diff --git a/...ions/app/src/main/java/com/example/android/cameraxextensions/ui/CameraExtensionsScreen.kt b/...ions/app/src/main/java/com/example/android/cameraxextensions/ui/CameraExtensionsScreen.kt
@@ -242,6 +242,8 @@ class CameraExtensionsScreen(private val root: View) {
 
     private fun showProcessProgressIndicator(progress: Int) {
         processProgressContainer.isVisible = true
+        if (progress == processProgressIndicator.progress) return
+
         ObjectAnimator.ofInt(processProgressIndicator, "progress", progress).apply {
             val currentProgress = processProgressIndicator.progress
             val progressStep = max(0, progress - currentProgress)

diff --git a/...rc/main/java/com/example/android/cameraxextensions/viewmodel/CameraExtensionsViewModel.kt b/...rc/main/java/com/example/android/cameraxextensions/viewmodel/CameraExtensionsViewModel.kt
@@ -261,8 +261,19 @@ class CameraExtensionsViewModel(
                         application,
                         outputFileResults.savedUri ?: photoFile.toUri()
                     )
+                    val isProcessProgressSupported = camera?.cameraInfo?.let {
+                        ImageCapture.getImageCaptureCapabilities(it).isCaptureProcessProgressSupported
+                    } ?: false
                     viewModelScope.launch {
-                        _captureUiState.emit(CaptureState.CaptureFinished(outputFileResults))
+                        if (isProcessProgressSupported) {
+                            _captureUiState.emit(CaptureState.CaptureProcessProgress(100))
+                        }
+                        _captureUiState.emit(
+                            CaptureState.CaptureFinished(
+                                outputFileResults,
+                                isProcessProgressSupported
+                            )
+                        )
                     }
                 }