summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTahsin Masrur <tahsinm@google.com>2024-01-26 08:55:52 +0600
committerGitHub <noreply@github.com>2024-01-26 10:55:52 +0800
commit85aedba531dbf17488a86d1fcbf233417bfef057 (patch)
treeacec12d950999ef4d8e10325eab9ec4b7e801d37
parent28ea0e1eb0fcb5c05e6c6ed604f7a97ec9b79ca4 (diff)
downloadjetpack-camera-app-85aedba531dbf17488a86d1fcbf233417bfef057.tar.gz
Sync CameraX screen flash API renames (#101)
-rw-r--r--domain/camera/src/main/java/com/google/jetpackcamera/domain/camera/CameraXCameraUseCase.kt8
-rw-r--r--settings.gradle.kts2
2 files changed, 6 insertions, 4 deletions
diff --git a/domain/camera/src/main/java/com/google/jetpackcamera/domain/camera/CameraXCameraUseCase.kt b/domain/camera/src/main/java/com/google/jetpackcamera/domain/camera/CameraXCameraUseCase.kt
index 87d3fe8..3187a2b 100644
--- a/domain/camera/src/main/java/com/google/jetpackcamera/domain/camera/CameraXCameraUseCase.kt
+++ b/domain/camera/src/main/java/com/google/jetpackcamera/domain/camera/CameraXCameraUseCase.kt
@@ -31,7 +31,6 @@ import androidx.camera.core.FocusMeteringAction
import androidx.camera.core.ImageCapture
import androidx.camera.core.ImageCapture.OutputFileOptions
import androidx.camera.core.ImageCapture.ScreenFlash
-import androidx.camera.core.ImageCapture.ScreenFlashUiCompleter
import androidx.camera.core.ImageCaptureException
import androidx.camera.core.ImageProxy
import androidx.camera.core.Preview
@@ -325,12 +324,15 @@ constructor(
if (isScreenFlashRequired) {
imageCaptureUseCase.screenFlash = object : ScreenFlash {
- override fun apply(screenFlashUiCompleter: ScreenFlashUiCompleter) {
+ override fun apply(
+ expirationTimeMillis: Long,
+ listener: ImageCapture.ScreenFlashListener
+ ) {
Log.d(TAG, "ImageCapture.ScreenFlash: apply")
coroutineScope.launch {
screenFlashEvents.emit(
CameraUseCase.ScreenFlashEvent(Type.APPLY_UI) {
- screenFlashUiCompleter.complete()
+ listener.onCompleted()
}
)
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dce870c..b611e8d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,7 @@ dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
maven {
- setUrl("https://androidx.dev/snapshots/builds/11253863/artifacts/repository")
+ setUrl("https://androidx.dev/snapshots/builds/11359450/artifacts/repository")
}
google()
mavenCentral()