Skip to content

[PM-34124] refactor: Generalize CameraPreview analyzer parameter #6719

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
SaintPatrck merged 1 commit into from
Apr 6, 2026
Merged

[PM-34124] refactor: Generalize CameraPreview analyzer parameter #6719

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
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ fun QrCodeScanScreen(
cameraErrorReceive = {
viewModel.trySendAction(QrCodeScanAction.CameraSetupErrorReceive)
},
qrCodeAnalyzer = qrCodeAnalyzer,
analyzer = qrCodeAnalyzer,
modifier = Modifier.fillMaxSize(),
)
when (rememberWindowSize()) {
Expand Down
2 changes: 1 addition & 1 deletion ...otlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fun QrCodeScanScreen(
cameraErrorReceive = {
viewModel.trySendAction(QrCodeScanAction.CameraSetupErrorReceive)
},
qrCodeAnalyzer = qrCodeAnalyzer,
analyzer = qrCodeAnalyzer,
modifier = Modifier.fillMaxSize(),
)

Expand Down
13 changes: 6 additions & 7 deletions ui/src/main/kotlin/com/bitwarden/ui/platform/components/camera/CameraPreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.compose.LocalLifecycleOwner
import com.bitwarden.ui.platform.feature.qrcodescan.util.QrCodeAnalyzer
import kotlinx.coroutines.flow.MutableStateFlow
import java.util.concurrent.Executors

/**
* A composable for displaying the camera preview.
*
* @param qrCodeAnalyzer The [QrCodeAnalyzer].
* @param analyzer The [ImageAnalysis.Analyzer] to use for image analysis.
* @param cameraErrorReceive A callback invoked when an error occurs.
* @param modifier The [Modifier] for this composable.
* @param context The local context.
* @param lifecycleOwner The current lifecycle owner.
*/
@Composable
fun CameraPreview(
qrCodeAnalyzer: QrCodeAnalyzer,
analyzer: ImageAnalysis.Analyzer,
cameraErrorReceive: (Exception) -> Unit,
modifier: Modifier = Modifier,
context: Context = LocalContext.current,
Expand All @@ -43,7 +42,7 @@ fun CameraPreview(
if ("robolectric" == Build.FINGERPRINT) return
val surfaceRequests = remember { MutableStateFlow<SurfaceRequest?>(null) }
val preview = rememberPreview { surfaceRequests.value = it }
val imageAnalyzer = rememberImageAnalyzer(qrCodeAnalyzer = qrCodeAnalyzer)
val imageAnalyzer = rememberImageAnalyzer(analyzer = analyzer)
LaunchedEffect(Unit) {
try {
val provider = ProcessCameraProvider.awaitInstance(context = context)
Expand Down Expand Up @@ -72,12 +71,12 @@ fun CameraPreview(

@Composable
private fun rememberImageAnalyzer(
qrCodeAnalyzer: QrCodeAnalyzer,
): ImageAnalysis = remember(qrCodeAnalyzer) {
analyzer: ImageAnalysis.Analyzer,
): ImageAnalysis = remember(analyzer) {
ImageAnalysis.Builder()
.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
.build()
.apply { setAnalyzer(Executors.newSingleThreadExecutor(), qrCodeAnalyzer) }
.apply { setAnalyzer(Executors.newSingleThreadExecutor(), analyzer) }
}

@Composable
Expand Down
Loading