From 43c9f876c0d94a866b65d03610c80258fc2832de Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Thu, 18 Sep 2025 19:14:08 +0300
Subject: [PATCH 01/14] [MS-1163] Implementation of the External Credential
 selection screen

---
 feature/external-credential/build.gradle.kts  |   2 +
 .../ExternalCredentialControllerFragment.kt   |  27 +++
 .../controller/ExternalCredentialState.kt     |  13 ++
 .../controller/ExternalCredentialViewModel.kt |  37 +++++
 .../ExternalCredentialSelectFragment.kt       | 154 ++++++++++++++++++
 .../ExternalCredentialSelectViewModel.kt      |  29 ++++
 .../view/ExternalCredentialTypeAdapter.kt     |  47 ++++++
 .../src/main/res/drawable/ghana_id_card.webp  | Bin 0 -> 5048 bytes
 .../main/res/drawable/ghana_nhis_card.webp    | Bin 0 -> 6138 bytes
 .../src/main/res/drawable/qr_code.webp        | Bin 0 -> 3818 bytes
 .../main/res/layout-land/item_document.xml    |  41 +++++
 .../res/layout/dialog_skip_scan_confirm.xml   |  65 ++++++++
 .../fragment_external_credential_select.xml   |  52 +++++-
 .../src/main/res/layout/item_document.xml     |  41 +++++
 .../graph_external_credential_internal.xml    |   9 +-
 .../resources/src/main/res/values/strings.xml |  13 ++
 16 files changed, 519 insertions(+), 11 deletions(-)
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
 create mode 100644 feature/external-credential/src/main/res/drawable/ghana_id_card.webp
 create mode 100644 feature/external-credential/src/main/res/drawable/ghana_nhis_card.webp
 create mode 100644 feature/external-credential/src/main/res/drawable/qr_code.webp
 create mode 100644 feature/external-credential/src/main/res/layout-land/item_document.xml
 create mode 100644 feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml
 create mode 100644 feature/external-credential/src/main/res/layout/item_document.xml

diff --git a/feature/external-credential/build.gradle.kts b/feature/external-credential/build.gradle.kts
index 2db2841b64..61fa3b3d79 100644
--- a/feature/external-credential/build.gradle.kts
+++ b/feature/external-credential/build.gradle.kts
@@ -8,5 +8,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":infra:config-store"))
+    implementation(project(":infra:config-sync"))
     implementation(project(":feature:exit-form"))
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
index e95d488dc3..c377a49fc7 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
@@ -2,7 +2,9 @@ package com.simprints.feature.externalcredential.screens.controller
 
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -19,6 +21,7 @@ import kotlin.getValue
 @AndroidEntryPoint
 internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment_external_credential_controller) {
     private val args: ExternalCredentialControllerFragmentArgs by navArgs()
+    private val viewModel: ExternalCredentialViewModel by activityViewModels()
 
     private val hostFragment: Fragment?
         get() = childFragmentManager.findFragmentById(R.id.external_credential_host_fragment)
@@ -48,5 +51,29 @@ internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment
             }
         }
         internalNavController?.setGraph(R.navigation.graph_external_credential_internal)
+
+        initObservers()
+        initListeners()
+    }
+
+    private fun initObservers() {
+        viewModel.stateLiveData.observe(viewLifecycleOwner) {
+        }
+    }
+
+    private fun initListeners() {
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            when (internalNavController?.currentDestination?.id) {
+                R.id.externalCredentialSelectFragment -> {
+                    // Exit form navigation
+                    findNavController().navigateSafely(
+                        this@ExternalCredentialControllerFragment,
+                        R.id.action_global_refusalFragment,
+                    )
+                }
+
+                else -> internalNavController?.popBackStack()
+            }
+        }
     }
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt
new file mode 100644
index 0000000000..609900800f
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt
@@ -0,0 +1,13 @@
+package com.simprints.feature.externalcredential.screens.controller
+
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+
+internal data class ExternalCredentialState(
+    val selectedType: ExternalCredentialType?
+) {
+    companion object {
+        val EMPTY = ExternalCredentialState(
+            selectedType = null
+        )
+    }
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
new file mode 100644
index 0000000000..1cb2f215dd
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
@@ -0,0 +1,37 @@
+package com.simprints.feature.externalcredential.screens.controller
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import com.simprints.infra.resources.R as IDR
+
+@HiltViewModel
+internal class ExternalCredentialViewModel @Inject internal constructor(
+
+) : ViewModel() {
+
+    private var state: ExternalCredentialState = ExternalCredentialState.EMPTY
+        set(value) {
+            field = value
+            _stateLiveData.postValue(value)
+        }
+    private val _stateLiveData = MutableLiveData<ExternalCredentialState>()
+    val stateLiveData: LiveData<ExternalCredentialState> = _stateLiveData
+
+    fun setSelectedExternalCredentialType(selectedType: ExternalCredentialType?) {
+        updateState { it.copy(selectedType = selectedType) }
+    }
+
+    private fun updateState(state: (ExternalCredentialState) -> ExternalCredentialState) {
+        this.state = state(this.state)
+    }
+
+    fun mapTypeToStringResource(type: ExternalCredentialType) = when(type) {
+        ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
+        ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
+        ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
+    }
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
index ffd14f1e37..65235eac9e 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
@@ -1,9 +1,163 @@
 package com.simprints.feature.externalcredential.screens.select
 
+import android.app.Dialog
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.feature.externalcredential.R
+import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialSelectBinding
+import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
+import com.simprints.feature.externalcredential.screens.select.view.ExternalCredentialTypeAdapter
+import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
+import com.simprints.infra.logging.Simber
+import com.simprints.infra.uibase.navigation.navigateSafely
+import com.simprints.infra.uibase.view.applySystemBarInsets
+import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
+import kotlin.getValue
+import com.simprints.infra.resources.R as IDR
 
 @AndroidEntryPoint
 internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_external_credential_select) {
+
+    private val mainViewModel by viewModels<ExternalCredentialViewModel>()
+    private val viewModel by viewModels<ExternalCredentialSelectViewModel>()
+    private val binding by viewBinding(FragmentExternalCredentialSelectBinding::bind)
+
+    private var dialog: Dialog? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        applySystemBarInsets(view)
+        Simber.i("ExternalCredentialSelectFragment started", tag = ORCHESTRATION)
+
+        observeChanges()
+        viewModel.loadExternalCredentials()
+    }
+
+    override fun onDestroy() {
+        dismissDialog()
+        super.onDestroy()
+    }
+
+    private fun dismissDialog() {
+        dialog?.dismiss()
+        dialog = null
+    }
+
+    private fun initListeners(types: List<ExternalCredentialType>) {
+        binding.skipScanning.setOnClickListener {
+            displaySkipScanningConfirmationDialog(
+                credentialTypes = types,
+                onConfirm = {
+                    dismissDialog()
+                    findNavController().navigateSafely(
+                        this,
+                        ExternalCredentialSelectFragmentDirections.actionExternalCredentialSelectFragmentToExternalCredentialSkip(),
+                    )
+                },
+                onCancel = ::dismissDialog
+            )
+        }
+    }
+
+    private fun initViews(types: List<ExternalCredentialType>) {
+        binding.title.text = when (types.size) {
+            1 -> {
+                val documentType = getString(mainViewModel.mapTypeToStringResource(types.first()))
+                getString(IDR.string.mfid_scanner_selection_title_specific).format(documentType)
+            }
+
+            else -> getString(IDR.string.mfid_scanner_selection_title_generic)
+        }
+    }
+
+    private fun observeChanges() {
+        viewModel.externalCredentialTypes.observe(viewLifecycleOwner) { externalCredentialTypes ->
+            updateSelectedCredentialType(null)
+            fillRecyclerView(externalCredentialTypes)
+            initViews(externalCredentialTypes)
+            initListeners(externalCredentialTypes)
+        }
+    }
+
+    private fun fillRecyclerView(types: List<ExternalCredentialType>) {
+        with(binding.documentsRecyclerView) {
+            layoutManager = LinearLayoutManager(requireContext())
+            adapter = ExternalCredentialTypeAdapter(types) { selectedType ->
+                updateSelectedCredentialType(selectedType)
+                navigateToScanner(selectedType)
+            }
+        }
+    }
+
+    private fun updateSelectedCredentialType(type: ExternalCredentialType?) {
+        mainViewModel.setSelectedExternalCredentialType(type)
+    }
+
+    private fun navigateToScanner(type: ExternalCredentialType) {
+        when (type) {
+            ExternalCredentialType.NHISCard -> startOcr()
+            ExternalCredentialType.GhanaIdCard -> startOcr()
+            ExternalCredentialType.QRCode -> startQrScan()
+        }
+    }
+
+    private fun startQrScan() {
+        findNavController().navigateSafely(
+            this,
+            ExternalCredentialSelectFragmentDirections.actionExternalCredentialSelectFragmentToExternalCredentialScanQr(),
+        )
+    }
+
+    private fun displaySkipScanningConfirmationDialog(
+        credentialTypes: List<ExternalCredentialType>,
+        onConfirm: () -> Unit,
+        onCancel: () -> Unit
+    ) {
+        dialog?.dismiss()
+        dialog = BottomSheetDialog(requireContext())
+        val view = layoutInflater.inflate(R.layout.dialog_skip_scan_confirm, null)
+        val bodyText = view.findViewById<TextView>(R.id.skipDialogBodyText)
+        val cancelButton = view.findViewById<Button>(R.id.buttonCancel)
+        val confirmButton = view.findViewById<Button>(R.id.buttonSkip)
+
+        bodyText.text = when (credentialTypes.size) {
+            1 -> {
+                val documentType = getString(mainViewModel.mapTypeToStringResource(credentialTypes.first()))
+                getString(IDR.string.mfid_dialog_skip_scan_body_specific).format(documentType)
+            }
+
+            else -> getString(IDR.string.mfid_dialog_skip_scan_body_generic)
+        }
+
+        confirmButton.setOnClickListener { onConfirm() }
+        cancelButton.setOnClickListener { onCancel() }
+
+        dialog?.setContentView(view)
+        dialog?.setCancelable(true)
+        dialog?.show()
+        (dialog as? BottomSheetDialog)?.apply {
+            behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            behavior.isDraggable = false
+        }
+
+    }
+
+    private fun startOcr() {
+        // TODO [MS-1163] add OCR parameters to navigation once the OCR fragment is implemented
+        findNavController().navigateSafely(
+            this,
+            ExternalCredentialSelectFragmentDirections.actionExternalCredentialSelectFragmentToExternalCredentialScanOcr(),
+        )
+    }
+
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt
new file mode 100644
index 0000000000..49afb2557c
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModel.kt
@@ -0,0 +1,29 @@
+package com.simprints.feature.externalcredential.screens.select
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.infra.config.sync.ConfigManager
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+internal class ExternalCredentialSelectViewModel @Inject internal constructor(
+    private val configManager: ConfigManager,
+) : ViewModel() {
+
+    val externalCredentialTypes: LiveData<List<ExternalCredentialType>>
+        get() = _externalCredentialTypes
+    private val _externalCredentialTypes = MutableLiveData<List<ExternalCredentialType>>()
+
+    fun loadExternalCredentials() {
+        viewModelScope.launch {
+            val config = configManager.getProjectConfiguration()
+            val allowedExternalCredentials = config.multifactorId?.allowedExternalCredentials.orEmpty()
+            _externalCredentialTypes.postValue(allowedExternalCredentials)
+        }
+    }
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
new file mode 100644
index 0000000000..d606640409
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
@@ -0,0 +1,47 @@
+package com.simprints.feature.externalcredential.screens.select.view
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.feature.externalcredential.R
+import com.simprints.feature.externalcredential.databinding.ItemDocumentBinding
+import com.simprints.infra.resources.R as IDR
+
+@ExcludedFromGeneratedTestCoverageReports("UI classes are not unit tested")
+internal class ExternalCredentialTypeAdapter(
+    private val items: List<ExternalCredentialType>,
+    private val onClick: (ExternalCredentialType) -> Unit = {}
+) : RecyclerView.Adapter<ExternalCredentialTypeAdapter.ViewHolder>() {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewHolder = ViewHolder(ItemDocumentBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int
+    ) = holder.bind(items[position])
+
+    override fun getItemCount(): Int = items.size
+
+    inner class ViewHolder(private val binding: ItemDocumentBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(credentialType: ExternalCredentialType) {
+            val c = binding.root.context
+            val text = c.getString(IDR.string.mfid_action_scan_document) + " " + when (credentialType) {
+                ExternalCredentialType.NHISCard -> c.getString(IDR.string.mfid_type_nhis_card)
+                ExternalCredentialType.GhanaIdCard -> c.getString(IDR.string.mfid_type_ghana_id_card)
+                ExternalCredentialType.QRCode -> c.getString(IDR.string.mfid_type_qr_code)
+            }
+            val image = when (credentialType) {
+                ExternalCredentialType.NHISCard -> R.drawable.ghana_nhis_card
+                ExternalCredentialType.GhanaIdCard -> R.drawable.ghana_id_card
+                ExternalCredentialType.QRCode -> R.drawable.qr_code
+            }
+            binding.documentText.text = text
+            binding.documentImage.setImageResource(image)
+            binding.root.setOnClickListener { onClick(credentialType) }
+        }
+    }
+}
diff --git a/feature/external-credential/src/main/res/drawable/ghana_id_card.webp b/feature/external-credential/src/main/res/drawable/ghana_id_card.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8a11e2f71a0a53516a9c4e5291ad634bbb6809ca
GIT binary patch
literal 5048
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
O6l!O_IQvUqi2(p6(39~1

literal 0
HcmV?d00001

diff --git a/feature/external-credential/src/main/res/drawable/ghana_nhis_card.webp b/feature/external-credential/src/main/res/drawable/ghana_nhis_card.webp
new file mode 100644
index 0000000000000000000000000000000000000000..935711129bfb4831739d897b436da9940b3ff15c
GIT binary patch
literal 6138
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
MiZ2$-=Fiia3<dD>zW@LL

literal 0
HcmV?d00001

diff --git a/feature/external-credential/src/main/res/drawable/qr_code.webp b/feature/external-credential/src/main/res/drawable/qr_code.webp
new file mode 100644
index 0000000000000000000000000000000000000000..06c8c08dba5790cbf9387dc74b1fb93799d51c5f
GIT binary patch
literal 3818
zcmWIYbaQ*e$G{No>J$(bU=hK^z`!5?#P)0q&zTt<eF8iZm>C!tC&WZoOL=BV9DAyh
zZGQVy;(>=H@7rctviLD5C(IL&acW<{P#4+u=}T`1r^lc3|4Bl-WB**a_M`RVtH9{T
z`OE8a*L|#heD!n8<NH7Q{}V)7s=kMQ;!*eBo}p49Mr6fFX2t&><#D6?EqbAOXSc2_
zf*O`Do*F)nRbJSS*W!FrzW-mViXB;Ob3(KKJ+`MZk`Dcqq5CBWuc`Yxza=T$(Yf&N
zsKXAX<D>=epZNW!8w>Iq`Sc%8Pmuh7M8-*uL!33M=#S8oAJ6fJZ<uD#(@&5<yT4*f
zrOiJ-#{T2`w+h!ETiLR+LG#~UnfZic2x!H#6|-dQMGcPIPfruT7g?})3{#W0<+oFt
z^NM}?u9uY`w1fAXvC9k3sw-GGyXZsyW<&M)NAGJr*!*Mqwnya`*58~V^o(iQkMBi)
z_<kL$|8pFOLTabrby$90Lf09HQtagBV%ggKJyr9v=ioI5;^6f+<o{p&@vWltaeVLo
znZG{T|Nl%1I-kG{%y|ki+`ya{#yFQz%Yp3$vz?(tkIN#(g#s)L3d}59wioQ)(7S-;
z8{_+Je$MxE=Ctp-X~|!^sYvd3$`jjfCr?zrojl?DZFR*_>Cs>rO%9{kV6=1?Efq&=
dgV9QIv~e)nD567KF@fRV{~x*&fc?h73jhFCmBj!6

literal 0
HcmV?d00001

diff --git a/feature/external-credential/src/main/res/layout-land/item_document.xml b/feature/external-credential/src/main/res/layout-land/item_document.xml
new file mode 100644
index 0000000000..609501feb9
--- /dev/null
+++ b/feature/external-credential/src/main/res/layout-land/item_document.xml
@@ -0,0 +1,41 @@
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/simprints_white"
+    android:elevation="@dimen/cardview_default_elevation"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/documentImage"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:elevation="4dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/ghana_nhis_card"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="H,16:10"
+            app:layout_constraintEnd_toStartOf="@id/documentText"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_percent="0.3" />
+
+        <TextView
+            android:id="@+id/documentText"
+            style="@style/Text.Body2"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/documentImage"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Scan this document" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml b/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml
new file mode 100644
index 0000000000..c33cc9aba9
--- /dev/null
+++ b/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:fillViewport="true"
+    android:padding="@dimen/margin_large">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:id="@+id/titleLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                style="@style/Text.Headline5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/mfid_dialog_skip_scan_title" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginVertical="@dimen/margin_large"
+                android:background="@color/simprints_grey_light" />
+
+            <TextView
+                android:id="@+id/skipDialogBodyText"
+                style="@style/Text.Body1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="@string/mfid_dialog_skip_scan_body_generic" />
+
+
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/buttonSkip"
+            style="@style/Widget.Simprints.Button.White"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/mfid_dialog_skip_scan_confirm"
+            android:textColor="@color/simprints_red" />
+
+        <Button
+            android:id="@+id/buttonCancel"
+            style="@style/Widget.Simprints.Button.Blue"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dashboard_select_modules_confirm_no" />
+    </LinearLayout>
+</ScrollView>
diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml
index fc81eec866..f65a71b38a 100644
--- a/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml
+++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml
@@ -1,13 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/simprints_blue">
 
-    <!--TODO [MS-1127] add content-->
     <TextView
-        android:text="Credential Selection fragment"
+        android:id="@+id/title"
+        style="@style/Text.Headline5.White.Bold"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:padding="@dimen/padding_default"
+        tools:text="@string/mfid_scanner_selection_title_generic"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/skipScanning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/documentsRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:clipToPadding="false"
+            android:paddingHorizontal="14dp"
+            tools:itemCount="3"
+            tools:listitem="@layout/item_document" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/skipScanning"
+        style="@style/Text.Body2.White"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:padding="@dimen/padding_default"
+        android:text="@string/mfid_scanner_selection_skip"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature/external-credential/src/main/res/layout/item_document.xml b/feature/external-credential/src/main/res/layout/item_document.xml
new file mode 100644
index 0000000000..1a4434cc43
--- /dev/null
+++ b/feature/external-credential/src/main/res/layout/item_document.xml
@@ -0,0 +1,41 @@
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/simprints_white"
+    android:elevation="@dimen/cardview_default_elevation"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/documentImage"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:elevation="4dp"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/ghana_nhis_card"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="H,16:10"
+            app:layout_constraintEnd_toStartOf="@id/documentText"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_percent="0.5" />
+
+        <TextView
+            android:id="@+id/documentText"
+            style="@style/Text.Body2"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/documentImage"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Scan this document" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml b/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml
index 0e988e1024..97f6c49545 100644
--- a/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml
+++ b/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml
@@ -13,18 +13,15 @@
         <action
             android:id="@+id/action_externalCredentialSelectFragment_to_externalCredentialScanQr"
             app:destination="@+id/externalCredentialScanQr"
-            app:popUpTo="@+id/graph_external_credential_internal"
-            app:popUpToInclusive="true" />
+            />
         <action
             android:id="@+id/action_externalCredentialSelectFragment_to_externalCredentialScanOcr"
             app:destination="@+id/externalCredentialScanOcr"
-            app:popUpTo="@+id/graph_external_credential_internal"
-            app:popUpToInclusive="true" />
+            />
         <action
             android:id="@+id/action_externalCredentialSelectFragment_to_externalCredentialSkip"
             app:destination="@+id/externalCredentialSkip"
-            app:popUpTo="@+id/graph_external_credential_internal"
-            app:popUpToInclusive="true" />
+            />
     </fragment>
 
     <fragment
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 66b290aedb..97237f1a45 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -481,4 +481,17 @@
         <item quantity="other">%d years</item>
     </plurals>
 
+    <!-- MultiFactor Identification -->
+    <string name="mfid_scanner_selection_title_generic">Scan document</string>
+    <string name="mfid_scanner_selection_title_specific">Scan %1$s</string>
+    <string name="mfid_scanner_selection_skip">Skip document scan</string>
+    <string name="mfid_type_nhis_card">NHIS Card</string>
+    <string name="mfid_type_ghana_id_card">Ghana ID Card</string>
+    <string name="mfid_type_qr_code">QR Code</string>
+    <string name="mfid_action_scan_document">Scan</string>
+    <string name="mfid_dialog_skip_scan_title">Skip scanning?</string>
+    <string name="mfid_dialog_skip_scan_body_generic">Scanning a document is required by this project. Are you sure you want to skip this step?</string>
+    <string name="mfid_dialog_skip_scan_body_specific">Scanning %1$s is required by this project. Are you sure you want to skip this step?</string>
+    <string name="mfid_dialog_skip_scan_confirm">Skip</string>
+
 </resources>

From 60414a259036862dfd6d15ccdedaa0c546203203 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Fri, 19 Sep 2025 10:15:51 +0300
Subject: [PATCH 02/14] [MS-1163] Adding ViewModel tests

---
 .../controller/ExternalCredentialViewModel.kt |  2 +-
 .../ExternalCredentialViewModelTest.kt        | 57 ++++++++++++++++
 .../ExternalCredentialSelectViewModelTest.kt  | 68 +++++++++++++++++++
 3 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
 create mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
index 1cb2f215dd..123c02e88b 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
@@ -18,7 +18,7 @@ internal class ExternalCredentialViewModel @Inject internal constructor(
             field = value
             _stateLiveData.postValue(value)
         }
-    private val _stateLiveData = MutableLiveData<ExternalCredentialState>()
+    private val _stateLiveData = MutableLiveData(ExternalCredentialState.EMPTY)
     val stateLiveData: LiveData<ExternalCredentialState> = _stateLiveData
 
     fun setSelectedExternalCredentialType(selectedType: ExternalCredentialType?) {
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
new file mode 100644
index 0000000000..b62c420593
--- /dev/null
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
@@ -0,0 +1,57 @@
+package com.simprints.feature.externalcredential.screens.controller
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.google.common.truth.Truth.assertThat
+import com.jraska.livedata.test
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.infra.resources.R as IDR
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class ExternalCredentialViewModelTest {
+
+    @get:Rule
+    val rule = InstantTaskExecutorRule()
+
+    private lateinit var viewModel: ExternalCredentialViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = ExternalCredentialViewModel()
+    }
+
+    @Test
+    fun `initial state is EMPTY`() {
+        val observer = viewModel.stateLiveData.test()
+        assertThat(observer.value()).isEqualTo(ExternalCredentialState.EMPTY)
+    }
+
+    @Test
+    fun `setSelectedExternalCredentialType updates state`() {
+        val observer = viewModel.stateLiveData.test()
+
+        viewModel.setSelectedExternalCredentialType(ExternalCredentialType.GhanaIdCard)
+
+        assertThat(observer.value()?.selectedType).isEqualTo(ExternalCredentialType.GhanaIdCard)
+    }
+
+    @Test
+    fun `setSelectedExternalCredentialType null resets state`() {
+        val observer = viewModel.stateLiveData.test()
+
+        viewModel.setSelectedExternalCredentialType(null)
+
+        assertThat(observer.value()?.selectedType).isNull()
+    }
+
+    @Test
+    fun `mapTypeToStringResource returns correct string ids`() {
+        assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.NHISCard))
+            .isEqualTo(IDR.string.mfid_type_nhis_card)
+        assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.GhanaIdCard))
+            .isEqualTo(IDR.string.mfid_type_ghana_id_card)
+        assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.QRCode))
+            .isEqualTo(IDR.string.mfid_type_qr_code)
+    }
+}
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt
new file mode 100644
index 0000000000..50384536b3
--- /dev/null
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectViewModelTest.kt
@@ -0,0 +1,68 @@
+package com.simprints.feature.externalcredential.screens.select
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.google.common.truth.Truth.assertThat
+import com.jraska.livedata.test
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.infra.config.sync.ConfigManager
+import com.simprints.testtools.common.coroutines.TestCoroutineRule
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class ExternalCredentialSelectViewModelTest {
+    @get:Rule
+    val rule = InstantTaskExecutorRule()
+
+    @get:Rule
+    val testCoroutineRule = TestCoroutineRule()
+
+    @MockK
+    private lateinit var configManager: ConfigManager
+
+    private lateinit var viewModel: ExternalCredentialSelectViewModel
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+        viewModel = ExternalCredentialSelectViewModel(configManager)
+    }
+
+    @Test
+    fun `loads allowed external credentials`() = runTest {
+        val expected = listOf(
+            ExternalCredentialType.NHISCard,
+            ExternalCredentialType.GhanaIdCard,
+        )
+        coEvery { configManager.getProjectConfiguration() } returns mockk {
+            every { multifactorId } returns mockk {
+                every { allowedExternalCredentials } returns expected
+            }
+        }
+
+        val observer = viewModel.externalCredentialTypes.test()
+        viewModel.loadExternalCredentials()
+
+        assertThat(observer.value()).isEqualTo(expected)
+    }
+
+    @Test
+    fun `sets empty list if no allowed credentials`() = runTest {
+        coEvery { configManager.getProjectConfiguration() } returns mockk {
+            every { multifactorId } returns mockk {
+                every { allowedExternalCredentials } returns emptyList()
+            }
+        }
+
+        val observer = viewModel.externalCredentialTypes.test()
+        viewModel.loadExternalCredentials()
+
+        assertThat(observer.value()).isEmpty()
+    }
+}

From c2a06693ff0fc2864c22886efddf883e2bce73ee Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Fri, 19 Sep 2025 20:18:18 +0300
Subject: [PATCH 03/14] =?UTF-8?q?[MS-1165]=20MFID:=20QR=20code=20implement?=
 =?UTF-8?q?ation.=20Login=20and=20MFID=20QRCode=20reader=20fragmetns=20now?=
 =?UTF-8?q?=20use=20unified=20Camera=20reader=20and=20Image=20analyzers=20?=
 =?UTF-8?q?from=20'ui-base'=20module=CB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/external-credential/build.gradle.kts  |   2 +
 .../ExternalCredentialControllerFragment.kt   |   9 +-
 .../controller/ExternalCredentialState.kt     |   9 +-
 .../controller/ExternalCredentialViewModel.kt |  24 +-
 .../ExternalCredentialScanQrFragment.kt       | 234 ++++++++++++++++++
 .../ExternalCredentialScanQrViewModel.kt      |  32 +++
 .../screens/scanqr/ScanQrState.kt             |   9 +
 ...xternalCredentialQrCodeValidatorUseCase.kt |  15 ++
 .../ExternalCredentialSelectFragment.kt       |   5 +-
 .../res/drawable/ic_camera_focus_blue.xml     |  23 ++
 .../main/res/layout/dialog_qr_wrong_value.xml |  70 ++++++
 .../fragment_external_credential_scan_qr.xml  |  68 ++++-
 .../navigation/graph_external_credential.xml  |   4 +-
 .../graph_external_credential_internal.xml    |  23 +-
 .../screens/qrscanner/QrScannerFragment.kt    |  22 +-
 .../login/tools/camera/QrCodeAnalyzer.kt      |  43 ----
 .../login/tools/camera/QrCodeAnalyzerTest.kt  |   2 +
 .../feature/orchestrator/steps/Step.kt        |   2 +
 .../infra/logging/LoggingConstants.kt         |   1 +
 .../resources/src/main/res/values/strings.xml |   7 +-
 infra/ui-base/build.gradle.kts                |   7 +
 .../camera/qrscan}/CameraFocusManager.kt      |  19 +-
 .../uibase/camera/qrscan}/CameraHelper.kt     |  21 +-
 .../uibase/camera/qrscan/QrCodeAnalyzer.kt    |  78 ++++++
 .../uibase/camera/qrscan}/QrCodeDetector.kt   |  26 +-
 .../infra/uibase/camera/qrscan}/RawImage.kt   |   4 +-
 .../CropBitmapAreaForDetectionUseCase.kt      |  27 ++
 .../qrscan/usecase/CropBitmapToRectUseCase.kt |  17 ++
 .../usecase/MapCropRectToImageSpaceUseCase.kt |  24 ++
 .../qrscan/usecase/RotateIfNeededUseCase.kt   |  20 ++
 .../infra/view/PermissionRequestView.kt       |  44 ++++
 .../layout/view_camera_permission_request.xml |  50 ++++
 32 files changed, 841 insertions(+), 100 deletions(-)
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt
 create mode 100644 feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml
 create mode 100644 feature/external-credential/src/main/res/layout/dialog_qr_wrong_value.xml
 delete mode 100644 feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzer.kt
 rename {feature/login/src/main/java/com/simprints/feature/login/tools/camera => infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan}/CameraFocusManager.kt (86%)
 rename {feature/login/src/main/java/com/simprints/feature/login/tools/camera => infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan}/CameraHelper.kt (82%)
 create mode 100644 infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt
 rename {feature/login/src/main/java/com/simprints/feature/login/tools/camera => infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan}/QrCodeDetector.kt (63%)
 rename {feature/login/src/main/java/com/simprints/feature/login/tools/camera => infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan}/RawImage.kt (51%)
 create mode 100644 infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
 create mode 100644 infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt
 create mode 100644 infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt
 create mode 100644 infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt
 create mode 100644 infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt
 create mode 100644 infra/ui-base/src/main/res/layout/view_camera_permission_request.xml

diff --git a/feature/external-credential/build.gradle.kts b/feature/external-credential/build.gradle.kts
index 61fa3b3d79..b3d0f060fa 100644
--- a/feature/external-credential/build.gradle.kts
+++ b/feature/external-credential/build.gradle.kts
@@ -10,5 +10,7 @@ android {
 dependencies {
     implementation(project(":infra:config-store"))
     implementation(project(":infra:config-sync"))
+    implementation(project(":infra:ui-base"))
     implementation(project(":feature:exit-form"))
+    implementation(libs.androidX.cameraX.view)
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
index c377a49fc7..3cf0cb453f 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialControllerFragment.kt
@@ -7,20 +7,21 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
 import com.simprints.feature.exitform.ExitFormContract
 import com.simprints.feature.exitform.ExitFormResult
 import com.simprints.feature.externalcredential.GraphExternalCredentialInternalDirections
 import com.simprints.feature.externalcredential.R
+import com.simprints.feature.externalcredential.model.ExternalCredentialParams
 import com.simprints.infra.uibase.navigation.finishWithResult
 import com.simprints.infra.uibase.navigation.handleResult
 import com.simprints.infra.uibase.navigation.navigateSafely
+import com.simprints.infra.uibase.navigation.navigationParams
 import dagger.hilt.android.AndroidEntryPoint
 import kotlin.getValue
 
 @AndroidEntryPoint
 internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment_external_credential_controller) {
-    private val args: ExternalCredentialControllerFragmentArgs by navArgs()
+    private val params: ExternalCredentialParams by navigationParams()
     private val viewModel: ExternalCredentialViewModel by activityViewModels()
 
     private val hostFragment: Fragment?
@@ -35,6 +36,8 @@ internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        viewModel.init(params)
+
         findNavController().handleResult<ExitFormResult>(
             this,
             R.id.externalCredentialControllerFragment,
@@ -64,7 +67,7 @@ internal class ExternalCredentialControllerFragment : Fragment(R.layout.fragment
     private fun initListeners() {
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
             when (internalNavController?.currentDestination?.id) {
-                R.id.externalCredentialSelectFragment -> {
+                R.id.externalCredentialSelectFragment, R.id.externalCredentialSearch -> {
                     // Exit form navigation
                     findNavController().navigateSafely(
                         this@ExternalCredentialControllerFragment,
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt
index 609900800f..9ceb7409db 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialState.kt
@@ -1,13 +1,20 @@
 package com.simprints.feature.externalcredential.screens.controller
 
+import com.simprints.core.domain.common.FlowType
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
 
 internal data class ExternalCredentialState(
+    val subjectId: String?,
+    val flowType: FlowType,
+    val credentialValue: String?,
     val selectedType: ExternalCredentialType?
 ) {
     companion object {
         val EMPTY = ExternalCredentialState(
-            selectedType = null
+            subjectId = null,
+            flowType = FlowType.VERIFY,
+            credentialValue = null,
+            selectedType = null,
         )
     }
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
index 123c02e88b..f9f7837ae1 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
@@ -4,15 +4,15 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.feature.externalcredential.model.ExternalCredentialParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import com.simprints.infra.resources.R as IDR
 
 @HiltViewModel
-internal class ExternalCredentialViewModel @Inject internal constructor(
-
-) : ViewModel() {
+internal class ExternalCredentialViewModel @Inject internal constructor() : ViewModel() {
 
+    private var isInitialized = false
     private var state: ExternalCredentialState = ExternalCredentialState.EMPTY
         set(value) {
             field = value
@@ -21,15 +21,27 @@ internal class ExternalCredentialViewModel @Inject internal constructor(
     private val _stateLiveData = MutableLiveData(ExternalCredentialState.EMPTY)
     val stateLiveData: LiveData<ExternalCredentialState> = _stateLiveData
 
+    private fun updateState(state: (ExternalCredentialState) -> ExternalCredentialState) {
+        this.state = state(this.state)
+    }
+
     fun setSelectedExternalCredentialType(selectedType: ExternalCredentialType?) {
         updateState { it.copy(selectedType = selectedType) }
     }
 
-    private fun updateState(state: (ExternalCredentialState) -> ExternalCredentialState) {
-        this.state = state(this.state)
+    fun setExternalCredentialValue(value: String) {
+        updateState { it.copy(credentialValue = value) }
     }
 
-    fun mapTypeToStringResource(type: ExternalCredentialType) = when(type) {
+    fun init(params: ExternalCredentialParams) {
+        if (!isInitialized) {
+            isInitialized = true
+            updateState { ExternalCredentialState.EMPTY.copy(subjectId = params.subjectId, flowType = params.flowType) }
+        }
+    }
+
+
+    fun mapTypeToStringResource(type: ExternalCredentialType) = when (type) {
         ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
         ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
         ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index 93c452cc05..ebbf7619a6 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -1,9 +1,243 @@
 package com.simprints.feature.externalcredential.screens.scanqr
 
+import android.Manifest
+import android.Manifest.permission.CAMERA
+import android.app.Dialog
+import android.content.Intent
+import android.graphics.Rect
+import android.provider.Settings
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.net.toUri
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.simprints.core.domain.permission.PermissionStatus
+import com.simprints.core.tools.extentions.permissionFromResult
 import com.simprints.feature.externalcredential.R
+import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialScanQrBinding
+import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
+import com.simprints.infra.logging.LoggingConstants
+import com.simprints.infra.logging.Simber
+import com.simprints.infra.uibase.camera.qrscan.CameraHelper
+import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
+import com.simprints.infra.uibase.navigation.navigateSafely
+import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.getValue
+import com.simprints.infra.resources.R as IDR
 
 @AndroidEntryPoint
 internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_external_credential_scan_qr) {
+
+    private val binding by viewBinding(FragmentExternalCredentialScanQrBinding::bind)
+    private val crashReportTag = LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
+    private val mainViewModel: ExternalCredentialViewModel by activityViewModels()
+    private val viewModel by viewModels<ExternalCredentialScanQrViewModel>()
+
+    private var dialog: Dialog? = null
+    private var shouldCheckCameraPermission = true
+
+    @Inject
+    lateinit var cameraHelperFactory: CameraHelper.Factory
+    private val cameraHelper: CameraHelper by lazy {
+        cameraHelperFactory.create(crashReportTag)
+    }
+
+    @Inject
+    lateinit var qrCodeAnalyzerFactory: QrCodeAnalyzer.Factory
+    private lateinit var qrCodeAnalyzer: QrCodeAnalyzer
+
+    private val launchPermissionRequest = registerForActivityResult(
+        ActivityResultContracts.RequestPermission(),
+    ) { granted ->
+        val permissionStatus = requireActivity().permissionFromResult(CAMERA, granted)
+        shouldCheckCameraPermission = permissionStatus == PermissionStatus.DeniedNeverAskAgain
+        when (permissionStatus) {
+            PermissionStatus.Granted -> {
+                initObservers()
+                startCamera()
+                startAnalyzer()
+            }
+
+            PermissionStatus.Denied -> renderNoPermission(shouldOpenSettings = false)
+            PermissionStatus.DeniedNeverAskAgain -> renderNoPermission(shouldOpenSettings = true)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (shouldCheckCameraPermission) {
+            // Check permission in onResume() so that if user left the app to go to Settings
+            // and give the permission, it's reflected when they come back to SID
+            launchPermissionRequest.launch(CAMERA)
+        }
+    }
+
+    override fun onDestroy() {
+        dismissDialog()
+        super.onDestroy()
+    }
+
+    private fun dismissDialog() {
+        dialog?.dismiss()
+        dialog = null
+    }
+
+    private fun initObservers() {
+        viewModel.stateLiveData.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                ScanQrState.NothingScanned -> renderInitialState()
+                is ScanQrState.ScanComplete -> renderScanComplete(state)
+            }
+        }
+    }
+
+    private fun renderInitialState() = with(binding) {
+        permissionRequestView.isVisible = false
+        qrPreviewCard.isVisible = false
+        buttonScan.setText(IDR.string.mfid_qr_scan_no_qr_detected)
+        buttonScan.isVisible = true
+        buttonScan.isEnabled = false
+        buttonScan.setOnClickListener {}
+    }
+
+    private fun renderScanComplete(state: ScanQrState.ScanComplete) = with(binding) {
+        val qrCodeValue = state.qrCodeValue
+        qrPreviewCard.isVisible = true
+        qrPreviewText.text = state.qrCodeValue
+        buttonScan.setText(IDR.string.mfid_continue)
+        buttonScan.isEnabled = true
+        buttonScan.setOnClickListener {
+            if (viewModel.isValidQrCodeFormat(qrCodeValue)) {
+                mainViewModel.setExternalCredentialValue(qrCodeValue)
+                findNavController().navigateSafely(
+                    this@ExternalCredentialScanQrFragment,
+                    R.id.action_externalCredentialSelectScanQr_to_externalCredentialSearch
+                )
+            } else {
+                showInvalidQrCodeFormatDialog(
+                    qrCodeValue = qrCodeValue,
+                    onRescan = {
+                        dismissDialog()
+                    }
+                )
+            }
+        }
+    }
+
+    private fun showInvalidQrCodeFormatDialog(
+        qrCodeValue: String,
+        onRescan: () -> Unit,
+    ) {
+        dismissDialog()
+        dialog = BottomSheetDialog(requireContext())
+        val view = layoutInflater.inflate(R.layout.dialog_qr_wrong_value, null)
+        val qrValueTextView = view.findViewById<TextView>(R.id.qrValue)
+        val buttonRescan = view.findViewById<Button>(R.id.buttonRescan)
+
+        qrValueTextView.text = qrCodeValue
+
+        buttonRescan.setOnClickListener { onRescan() }
+
+        dialog?.setContentView(view)
+        dialog?.setCancelable(true)
+        dialog?.show()
+        (dialog as? BottomSheetDialog)?.apply {
+            behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            behavior.isDraggable = false
+        }
+    }
+
+    private fun startAnalyzer() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                qrCodeAnalyzer.scannedCode
+                    .catch { e ->
+                        Simber.e("Camera not available for QR scanning", e, tag = crashReportTag)
+                        // TODO [MS-1165] Handle camera permissions
+                        Toast.makeText(requireActivity(), "No camera", Toast.LENGTH_LONG).show()
+                    }.collectLatest { qrCode ->
+                        viewModel.setQrCodeValue(qrCode)
+                    }
+            }
+        }
+    }
+
+    private fun startCamera() {
+        val cropConfig = getCropConfig()
+        qrCodeAnalyzer = qrCodeAnalyzerFactory.create(cropConfig = cropConfig, crashReportTag = crashReportTag)
+
+        cameraHelper.startCamera(
+            viewLifecycleOwner,
+            binding.qrScannerPreview,
+            qrCodeAnalyzer,
+        ) {
+            // On error
+            // TODO [MS-1165] Handle lack of camera permissions
+            Toast.makeText(requireActivity(), "No Camera available", Toast.LENGTH_LONG).show()
+        }
+    }
+
+    private fun getCropConfig(): QrCodeAnalyzer.CropConfig {
+        val qrScannerArea = Rect(
+            binding.qrScannerAim.left,
+            binding.qrScannerAim.top,
+            binding.qrScannerAim.right,
+            binding.qrScannerAim.bottom
+        )
+        val orientation = resources.configuration.orientation
+        val previewWidth = binding.qrScannerPreview.width
+        val previewHeight = binding.qrScannerPreview.height
+        return QrCodeAnalyzer.CropConfig(
+            rect = qrScannerArea,
+            orientation = orientation,
+            rootViewWidth = previewWidth,
+            rootViewHeight = previewHeight
+        )
+    }
+
+    private fun renderNoPermission(shouldOpenSettings: Boolean) {
+        binding.apply {
+            buttonScan.isVisible = false
+            if (shouldOpenSettings) {
+                permissionRequestView.init(
+                    title = IDR.string.face_capture_permission_denied,
+                    body = IDR.string.login_qr_code_scanning_camera_permission_error,
+                    buttonText = IDR.string.fingerprint_connect_phone_settings_button,
+                    onClickListener = {
+                        requireActivity().startActivity(
+                            Intent(
+                                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                                "package:${requireActivity().packageName}".toUri(),
+                            ),
+                        )
+                    }
+                )
+            } else {
+                permissionRequestView.init(
+                    title = IDR.string.face_capture_permission_denied,
+                    body = IDR.string.login_qr_code_scanning_camera_permission_error,
+                    buttonText = IDR.string.face_capture_permission_action,
+                    onClickListener = {
+                        launchPermissionRequest.launch(Manifest.permission.CAMERA)
+                    }
+                )
+            }
+            permissionRequestView.isVisible = true
+        }
+    }
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
new file mode 100644
index 0000000000..4b54e169bd
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
@@ -0,0 +1,32 @@
+package com.simprints.feature.externalcredential.screens.scanqr
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.simprints.feature.externalcredential.screens.scanqr.usecase.ExternalCredentialQrCodeValidatorUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+internal class ExternalCredentialScanQrViewModel @Inject constructor(
+    private val externalCredentialQrCodeValidator: ExternalCredentialQrCodeValidatorUseCase
+) : ViewModel() {
+
+    private var state: ScanQrState = ScanQrState.NothingScanned
+        set(value) {
+            field = value
+            _stateLiveData.postValue(value)
+        }
+    private val _stateLiveData = MutableLiveData<ScanQrState>(ScanQrState.NothingScanned)
+    val stateLiveData: LiveData<ScanQrState> = _stateLiveData
+
+    private fun updateState(state: (ScanQrState) -> ScanQrState) {
+        this.state = state(this.state)
+    }
+
+    fun setQrCodeValue(qrCode: String) {
+        updateState { ScanQrState.ScanComplete(qrCode) }
+    }
+
+    fun isValidQrCodeFormat(qrCodeValue: String): Boolean = externalCredentialQrCodeValidator(qrCodeValue)
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt
new file mode 100644
index 0000000000..42407415b2
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt
@@ -0,0 +1,9 @@
+package com.simprints.feature.externalcredential.screens.scanqr
+
+sealed class ScanQrState {
+    data object NothingScanned : ScanQrState()
+
+    data class ScanComplete(
+        val qrCodeValue: String
+    ) : ScanQrState()
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt
new file mode 100644
index 0000000000..c112302713
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt
@@ -0,0 +1,15 @@
+package com.simprints.feature.externalcredential.screens.scanqr.usecase
+
+import javax.inject.Inject
+
+internal class ExternalCredentialQrCodeValidatorUseCase @Inject constructor() {
+    private val qrCodeLength = 6
+
+    /**
+     * Checks whether the scanned QR code value is valid to be used in the Multi-Factor ID. Currently, it uses hardcoded values.
+     * In future, the validity criteria should be passed from the project configuration.
+     */
+    operator fun invoke(qrCodeValue: String): Boolean {
+        return qrCodeValue.length == qrCodeLength
+    }
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
index 65235eac9e..c116d2a881 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -28,7 +29,7 @@ import com.simprints.infra.resources.R as IDR
 @AndroidEntryPoint
 internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_external_credential_select) {
 
-    private val mainViewModel by viewModels<ExternalCredentialViewModel>()
+    private val mainViewModel: ExternalCredentialViewModel by activityViewModels()
     private val viewModel by viewModels<ExternalCredentialSelectViewModel>()
     private val binding by viewBinding(FragmentExternalCredentialSelectBinding::bind)
 
@@ -123,7 +124,7 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
         onConfirm: () -> Unit,
         onCancel: () -> Unit
     ) {
-        dialog?.dismiss()
+        dismissDialog()
         dialog = BottomSheetDialog(requireContext())
         val view = layoutInflater.inflate(R.layout.dialog_skip_scan_confirm, null)
         val bodyText = view.findViewById<TextView>(R.id.skipDialogBodyText)
diff --git a/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml b/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml
new file mode 100644
index 0000000000..42f9fce658
--- /dev/null
+++ b/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="200dp" android:viewportHeight="120"
+    android:viewportWidth="120" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M0,0l4,0l0,30l-4,0z" android:strokeWidth="0.16733685"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M0,0l40,0l0,4l-40,0z" android:strokeWidth="0.16733819"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M0,0l4,0l0,40l-4,0z" android:strokeWidth="0.16733685"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M80,0l40,0l0,4l-40,0z" android:strokeWidth="0.16733819"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M116,0l4,0l0,40l-4,0z" android:strokeWidth="0.16733806"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M0,80l4,0l0,40l-4,0z" android:strokeWidth="0.16733685"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M0,116l40,0l0,4l-40,0z" android:strokeWidth="0.16733526"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M80,116l40,0l0,4l-40,0z" android:strokeWidth="0.16733526"/>
+    <path android:fillColor="@color/simprints_blue"
+        android:pathData="M116,80l4,0l0,36l-4,0z" android:strokeWidth="0.18330976"/>
+</vector>
+
diff --git a/feature/external-credential/src/main/res/layout/dialog_qr_wrong_value.xml b/feature/external-credential/src/main/res/layout/dialog_qr_wrong_value.xml
new file mode 100644
index 0000000000..f960d726df
--- /dev/null
+++ b/feature/external-credential/src/main/res/layout/dialog_qr_wrong_value.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:fillViewport="true"
+    android:padding="@dimen/margin_large">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:id="@+id/titleLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                style="@style/Text.Headline5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/mfid_dialog_wrong_qr_title" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginVertical="@dimen/margin_large"
+                android:background="@color/simprints_grey_light" />
+
+            <TextView
+                style="@style/Text.Body1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/mfid_dialog_wrong_qr_body_top" />
+
+            <TextView
+                android:id="@+id/qrValue"
+                style="@style/Text.Subtitle1.Bold"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/padding_default"
+                tools:text="WRONG-QR-VALUE" />
+
+            <TextView
+                style="@style/Text.Body1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/mfid_dialog_wrong_qr_body_bottom" />
+
+
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/buttonRescan"
+            style="@style/Widget.Simprints.Button.Blue"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_large"
+            android:text="@string/mfid_dialog_wrong_qr_rescan" />
+    </LinearLayout>
+</ScrollView>
diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
index 187f72538b..e0b780a69b 100644
--- a/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
+++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
@@ -1,12 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <!--TODO [MS-1127] add content-->
-    <TextView
+
+    <androidx.camera.view.PreviewView
+        android:id="@+id/qrScannerPreview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="QR scanner" />
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/qrScannerAim"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_camera_focus_blue"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/qrPreviewCard"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="16dp"
+        android:visibility="gone"
+        app:cardBackgroundColor="@color/simprints_blue"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/qrScannerAim"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/qrPreviewText"
+            style="@style/Text.Body1.White"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            tools:text="QR_CODE" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <Button
+        android:id="@+id/buttonScan"
+        style="@style/Widget.Simprints.Button.Blue"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginBottom="16dp"
+        android:enabled="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="No QR code detected" />
 
+    <com.simprints.infra.view.PermissionRequestView
+        android:id="@+id/permissionRequestView"
+        android:layout_width="0dp"
+        android:layout_margin="@dimen/margin_large"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature/external-credential/src/main/res/navigation/graph_external_credential.xml b/feature/external-credential/src/main/res/navigation/graph_external_credential.xml
index 1d0865429c..4f18491e1c 100644
--- a/feature/external-credential/src/main/res/navigation/graph_external_credential.xml
+++ b/feature/external-credential/src/main/res/navigation/graph_external_credential.xml
@@ -9,8 +9,8 @@
         android:name="com.simprints.feature.externalcredential.screens.controller.ExternalCredentialControllerFragment"
         android:label="ExternalCredentialController">
         <argument
-            android:name="externalCredentialParams"
-            app:argType="com.simprints.feature.externalcredential.model.ExternalCredentialParams" />
+            android:name="params"
+            app:argType="com.simprints.core.domain.step.StepParams"/>
     </fragment>
 
     <include app:graph="@navigation/graph_exit_form" />
diff --git a/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml b/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml
index 97f6c49545..57d59c1522 100644
--- a/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml
+++ b/feature/external-credential/src/main/res/navigation/graph_external_credential_internal.xml
@@ -12,16 +12,13 @@
         tools:layout="@layout/fragment_external_credential_select">
         <action
             android:id="@+id/action_externalCredentialSelectFragment_to_externalCredentialScanQr"
-            app:destination="@+id/externalCredentialScanQr"
-            />
+            app:destination="@+id/externalCredentialScanQr" />
         <action
             android:id="@+id/action_externalCredentialSelectFragment_to_externalCredentialScanOcr"
-            app:destination="@+id/externalCredentialScanOcr"
-            />
+            app:destination="@+id/externalCredentialScanOcr" />
         <action
             android:id="@+id/action_externalCredentialSelectFragment_to_externalCredentialSkip"
-            app:destination="@+id/externalCredentialSkip"
-            />
+            app:destination="@+id/externalCredentialSkip" />
     </fragment>
 
     <fragment
@@ -29,28 +26,30 @@
         android:name="com.simprints.feature.externalcredential.screens.scanqr.ExternalCredentialScanQrFragment"
         android:label="ExternalCredentialScanQrFragment"
         tools:layout="@layout/fragment_external_credential_scan_qr">
+        <action
+            android:id="@+id/action_externalCredentialSelectScanQr_to_externalCredentialSearch"
+            app:destination="@+id/externalCredentialSearch"
+            app:popUpTo="@+id/graph_external_credential_internal"
+            app:popUpToInclusive="true" />
     </fragment>
 
     <fragment
         android:id="@+id/externalCredentialSearch"
         android:name="com.simprints.feature.externalcredential.screens.search.ExternalCredentialSearchFragment"
         android:label="ExternalCredentialSearchFragment"
-        tools:layout="@layout/fragment_external_credential_search">
-    </fragment>
+        tools:layout="@layout/fragment_external_credential_search"/>
 
     <fragment
         android:id="@+id/externalCredentialScanOcr"
         android:name="com.simprints.feature.externalcredential.screens.scanocr.ExternalCredentialScanOcrFragment"
         android:label="ExternalCredentialScanOcrFragment"
-        tools:layout="@layout/fragment_external_credential_scan_ocr">
-    </fragment>
+        tools:layout="@layout/fragment_external_credential_scan_ocr"/>
 
     <fragment
         android:id="@+id/externalCredentialSkip"
         android:name="com.simprints.feature.externalcredential.screens.skip.ExternalCredentialSkipFragment"
         android:label="ExternalCredentialSkipFragment"
-        tools:layout="@layout/fragment_external_credential_skip">
-    </fragment>
+        tools:layout="@layout/fragment_external_credential_skip"/>
 
     <action
         android:id="@+id/action_global_external_credential_select"
diff --git a/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt b/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt
index e66a14293c..baee8a2187 100644
--- a/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt
+++ b/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt
@@ -10,12 +10,12 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
-import com.google.firebase.analytics.FirebaseAnalytics.Event.LOGIN
 import com.simprints.core.tools.extentions.hasPermission
 import com.simprints.feature.login.R
 import com.simprints.feature.login.databinding.FragmentQrScannerBinding
-import com.simprints.feature.login.tools.camera.CameraHelper
-import com.simprints.feature.login.tools.camera.QrCodeAnalyzer
+import com.simprints.infra.logging.LoggingConstants
+import com.simprints.infra.uibase.camera.qrscan.CameraHelper
+import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.navigation.finishWithResult
@@ -29,12 +29,18 @@ import javax.inject.Inject
 @AndroidEntryPoint
 internal class QrScannerFragment : Fragment(R.layout.fragment_qr_scanner) {
     private val binding by viewBinding(FragmentQrScannerBinding::bind)
-
+    private val crashReportTag = LoggingConstants.CrashReportTag.LOGIN
     @Inject
-    lateinit var cameraHelper: CameraHelper
-
+    lateinit var cameraHelperFactory: CameraHelper.Factory
     @Inject
-    lateinit var qrCodeAnalyzer: QrCodeAnalyzer
+    lateinit var qrCodeAnalyzerFactory: QrCodeAnalyzer.Factory
+
+    private val cameraHelper: CameraHelper by lazy {
+        cameraHelperFactory.create(crashReportTag)
+    }
+    private val qrCodeAnalyzer by lazy {
+        qrCodeAnalyzerFactory.create(cropConfig = null, crashReportTag = crashReportTag)
+    }
 
     private val launchPermissionRequest = registerForActivityResult(
         ActivityResultContracts.RequestPermission(),
@@ -57,7 +63,7 @@ internal class QrScannerFragment : Fragment(R.layout.fragment_qr_scanner) {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 qrCodeAnalyzer.scannedCode
                     .catch { e ->
-                        Simber.e("Camera not available for QR scanning", e, tag = LOGIN)
+                        Simber.e("Camera not available for QR scanning", e, tag = crashReportTag)
                         finishWithError(QrScannerResult.QrScannerError.CameraNotAvailable)
                     }.collectLatest { qrCode ->
                         if (qrCode.isNotEmpty()) {
diff --git a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzer.kt b/feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzer.kt
deleted file mode 100644
index c1d4c1b798..0000000000
--- a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzer.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.simprints.feature.login.tools.camera
-
-import androidx.camera.core.ExperimentalGetImage
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.ImageProxy
-import com.simprints.core.DispatcherBG
-import com.simprints.infra.logging.LoggingConstants.CrashReportTag.LOGIN
-import com.simprints.infra.logging.Simber
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.buffer
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.runBlocking
-import javax.inject.Inject
-
-internal class QrCodeAnalyzer @Inject constructor(
-    private val qrCodeDetector: QrCodeDetector,
-    @DispatcherBG private val bgDispatcher: CoroutineDispatcher,
-) : ImageAnalysis.Analyzer {
-    private val _scannedCode = MutableStateFlow<String?>(null)
-    val scannedCode: Flow<String> = _scannedCode
-        .filterNotNull()
-        .buffer(1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
-
-    @ExperimentalGetImage
-    override fun analyze(imageProxy: ImageProxy) {
-        imageProxy.use {
-            it.image?.let { mediaImage ->
-                runBlocking(bgDispatcher) {
-                    try {
-                        val rotationDegrees = imageProxy.imageInfo.rotationDegrees
-                        val image = RawImage(mediaImage, rotationDegrees)
-                        qrCodeDetector.detectInImage(image)?.let(_scannedCode::tryEmit)
-                    } catch (t: Throwable) {
-                        Simber.e("QR code detection failed", t, tag = LOGIN)
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt b/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt
index bac7e470a6..61acd4b726 100644
--- a/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt
+++ b/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt
@@ -2,6 +2,8 @@ package com.simprints.feature.login.tools.camera
 
 import androidx.camera.core.ImageProxy
 import com.google.common.truth.Truth.assertThat
+import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
+import com.simprints.infra.uibase.camera.qrscan.QrCodeDetector
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.coVerify
diff --git a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
index f24eccd8ba..cc3add88ea 100644
--- a/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
+++ b/feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt
@@ -18,6 +18,7 @@ import com.simprints.feature.enrollast.FaceTemplateCaptureResult
 import com.simprints.feature.enrollast.FingerTemplateCaptureResult
 import com.simprints.feature.enrollast.MatchResult
 import com.simprints.feature.exitform.ExitFormResult
+import com.simprints.feature.externalcredential.model.ExternalCredentialParams
 import com.simprints.feature.fetchsubject.FetchSubjectParams
 import com.simprints.feature.fetchsubject.FetchSubjectResult
 import com.simprints.feature.login.LoginParams
@@ -112,6 +113,7 @@ abstract class StepResultMixin : StepResult
         value = EnrolLastBiometricStepResult.FaceCaptureResult::class,
         name = "EnrolLastBiometricStepResult.FaceCaptureResult",
     ),
+    JsonSubTypes.Type(value = ExternalCredentialParams::class, name = "ExternalCredentialParams"),
     JsonSubTypes.Type(value = MatchResult::class, name = "MatchResult"),
     JsonSubTypes.Type(value = FingerTemplateCaptureResult::class, name = "FingerTemplateCaptureResult"),
     JsonSubTypes.Type(value = FaceTemplateCaptureResult::class, name = "FaceTemplateCaptureResult"),
diff --git a/infra/logging/src/main/java/com/simprints/infra/logging/LoggingConstants.kt b/infra/logging/src/main/java/com/simprints/infra/logging/LoggingConstants.kt
index 9039eb5c8b..852dcaf5ac 100644
--- a/infra/logging/src/main/java/com/simprints/infra/logging/LoggingConstants.kt
+++ b/infra/logging/src/main/java/com/simprints/infra/logging/LoggingConstants.kt
@@ -51,6 +51,7 @@ object LoggingConstants {
         SAMPLE_UPLOAD,
         APPLICATION,
         COMMCARE_SYNC,
+        MULTI_FACTOR_ID,
     }
 
     // Tags eligible for Firebase Analytics logging
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 97237f1a45..1c80e39583 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -493,5 +493,10 @@
     <string name="mfid_dialog_skip_scan_body_generic">Scanning a document is required by this project. Are you sure you want to skip this step?</string>
     <string name="mfid_dialog_skip_scan_body_specific">Scanning %1$s is required by this project. Are you sure you want to skip this step?</string>
     <string name="mfid_dialog_skip_scan_confirm">Skip</string>
-
+    <string name="mfid_qr_scan_no_qr_detected">No QR code detected</string>
+    <string name="mfid_continue">Continue</string>
+    <string name="mfid_dialog_wrong_qr_title">Invalid QR Code type</string>
+    <string name="mfid_dialog_wrong_qr_body_top">Wrong QR code format is scanned</string>
+    <string name="mfid_dialog_wrong_qr_body_bottom">This value cannot be used as a person document. Please make sure that correct QR code is scanned</string>
+    <string name="mfid_dialog_wrong_qr_rescan">Re-scan</string>
 </resources>
diff --git a/infra/ui-base/build.gradle.kts b/infra/ui-base/build.gradle.kts
index 7053015455..a9ccecb631 100644
--- a/infra/ui-base/build.gradle.kts
+++ b/infra/ui-base/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    id("simprints.infra")
     id("simprints.android.library")
 }
 
@@ -34,5 +35,11 @@ dependencies {
 
     api(libs.androidX.navigation.fragment)
 
+    api(libs.androidX.cameraX.core)
+    api(libs.androidX.cameraX.lifecycle)
+    api(libs.androidX.cameraX.view)
+    api(libs.jackson.core)
+    api(libs.playServices.barcode)
+
     testImplementation(project(":infra:test-tools"))
 }
diff --git a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/CameraFocusManager.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/CameraFocusManager.kt
similarity index 86%
rename from feature/login/src/main/java/com/simprints/feature/login/tools/camera/CameraFocusManager.kt
rename to infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/CameraFocusManager.kt
index bc669fe497..302984baaa 100644
--- a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/CameraFocusManager.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/CameraFocusManager.kt
@@ -1,4 +1,4 @@
-package com.simprints.feature.login.tools.camera
+package com.simprints.infra.uibase.camera.qrscan
 
 import android.annotation.SuppressLint
 import android.view.MotionEvent
@@ -14,15 +14,26 @@ import androidx.camera.core.MeteringPointFactory
 import androidx.camera.core.SurfaceOrientedMeteringPointFactory
 import androidx.camera.view.PreviewView
 import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.infra.logging.LoggingConstants
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.LOGIN
 import com.simprints.infra.logging.Simber
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @ExcludedFromGeneratedTestCoverageReports(
     reason = "These are UI utilities for focus controls in the camera preview",
 )
-internal class CameraFocusManager @Inject constructor() {
+class CameraFocusManager @AssistedInject constructor(
+    @Assisted private val crashReportTag: LoggingConstants.CrashReportTag,
+) {
+    @AssistedFactory
+    interface Factory {
+        fun create(crashReportTag: LoggingConstants.CrashReportTag): CameraFocusManager
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     fun setUpFocusOnTap(
         cameraPreview: PreviewView,
@@ -52,7 +63,7 @@ internal class CameraFocusManager @Inject constructor() {
                 try {
                     cameraControl.startFocusAndMetering(focusAction)
                 } catch (e: CameraInfoUnavailableException) {
-                    Simber.e("Cannot access camera", e, tag = LOGIN)
+                    Simber.e("Cannot access camera", e, tag = crashReportTag)
                 }
                 true
             }
@@ -78,7 +89,7 @@ internal class CameraFocusManager @Inject constructor() {
             try {
                 camera.cameraControl.startFocusAndMetering(focusAction)
             } catch (e: CameraInfoUnavailableException) {
-                Simber.e("Cannot access camera", e, tag = LOGIN)
+                Simber.e("Cannot access camera", e, tag = crashReportTag)
             }
         }
     }
diff --git a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/CameraHelper.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/CameraHelper.kt
similarity index 82%
rename from feature/login/src/main/java/com/simprints/feature/login/tools/camera/CameraHelper.kt
rename to infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/CameraHelper.kt
index bdc7f2430f..aeedfb8e94 100644
--- a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/CameraHelper.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/CameraHelper.kt
@@ -1,4 +1,4 @@
-package com.simprints.feature.login.tools.camera
+package com.simprints.infra.uibase.camera.qrscan
 
 import android.content.Context
 import androidx.camera.core.AspectRatio
@@ -10,8 +10,11 @@ import androidx.camera.view.PreviewView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
 import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
-import com.simprints.infra.logging.LoggingConstants.CrashReportTag.LOGIN
+import com.simprints.infra.logging.LoggingConstants
 import com.simprints.infra.logging.Simber
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.concurrent.Executors
 import javax.inject.Inject
@@ -19,10 +22,18 @@ import javax.inject.Inject
 @ExcludedFromGeneratedTestCoverageReports(
     reason = "This is an injectable wrapper around cameraX and ML kit APIs. There is no business logic.",
 )
-internal class CameraHelper @Inject constructor(
+class CameraHelper @AssistedInject constructor(
     @ApplicationContext private val context: Context,
-    private val cameraFocusManager: CameraFocusManager,
+    @Assisted private val crashReportTag: LoggingConstants.CrashReportTag,
+    private val cameraFocusManagerFactory: CameraFocusManager.Factory,
 ) {
+    private val cameraFocusManager by lazy { cameraFocusManagerFactory.create(crashReportTag) }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(crashReportTag: LoggingConstants.CrashReportTag): CameraHelper
+    }
+
     fun startCamera(
         lifecycleOwner: LifecycleOwner,
         cameraPreview: PreviewView,
@@ -56,7 +67,7 @@ internal class CameraHelper @Inject constructor(
                             }
                         }
                 } catch (e: Exception) {
-                    Simber.i("Camera is already in use by another process", e, tag = LOGIN)
+                    Simber.i("Camera is already in use by another process", e, tag = crashReportTag)
                     initializationErrorListener.onCameraError()
                 }
             },
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt
new file mode 100644
index 0000000000..1be85ea563
--- /dev/null
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt
@@ -0,0 +1,78 @@
+package com.simprints.infra.uibase.camera.qrscan
+
+import android.graphics.Rect
+import androidx.camera.core.ExperimentalGetImage
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageProxy
+import com.google.mlkit.vision.common.InputImage
+import com.simprints.core.DispatcherBG
+import com.simprints.infra.logging.LoggingConstants
+import com.simprints.infra.logging.Simber
+import com.simprints.infra.uibase.camera.qrscan.usecase.CropBitmapAreaForDetectionUseCase
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.runBlocking
+
+
+class QrCodeAnalyzer @AssistedInject constructor(
+    private val qrCodeDetectorFactory: QrCodeDetector.Factory,
+    @DispatcherBG private val bgDispatcher: CoroutineDispatcher,
+    @Assisted private val cropConfig: CropConfig?,
+    @Assisted private val crashReportTag: LoggingConstants.CrashReportTag,
+    private val cropBitmapAreaForDetectionUseCase: CropBitmapAreaForDetectionUseCase
+) : ImageAnalysis.Analyzer {
+
+
+    @AssistedFactory
+    interface Factory {
+        fun create(cropConfig: CropConfig?, crashReportTag: LoggingConstants.CrashReportTag): QrCodeAnalyzer
+    }
+
+    data class CropConfig(
+        val rect: Rect,
+        val orientation: Int,
+        val rootViewWidth: Int,
+        val rootViewHeight: Int,
+    )
+
+    private val qrCodeDetector by lazy { qrCodeDetectorFactory.create(crashReportTag) }
+    private val _scannedCode = MutableStateFlow<String?>(null)
+    val scannedCode: Flow<String> = _scannedCode
+        .filterNotNull()
+        .buffer(1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+
+    @ExperimentalGetImage
+    override fun analyze(imageProxy: ImageProxy) {
+        imageProxy.use {
+            it.image?.let { mediaImage ->
+                runBlocking(bgDispatcher) {
+                    try {
+                        val rotationDegrees = imageProxy.imageInfo.rotationDegrees
+                        when (cropConfig) {
+                            null -> {
+                                val image = RawImage(mediaImage, rotationDegrees)
+                                qrCodeDetector.detectInImage(image)?.let(_scannedCode::tryEmit)
+                            }
+
+                            else -> {
+                                val bitmap = cropBitmapAreaForDetectionUseCase(imageProxy.toBitmap(), cropConfig)
+                                val image = InputImage.fromBitmap(bitmap, 0)
+                                qrCodeDetector.detectInImage(image)?.let(_scannedCode::tryEmit)
+                            }
+                        }
+
+                    } catch (t: Throwable) {
+                        Simber.e("QR code detection failed", t, tag = crashReportTag)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeDetector.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeDetector.kt
similarity index 63%
rename from feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeDetector.kt
rename to infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeDetector.kt
index d02a084f6c..1489d2fdad 100644
--- a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/QrCodeDetector.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeDetector.kt
@@ -1,4 +1,4 @@
-package com.simprints.feature.login.tools.camera
+package com.simprints.infra.uibase.camera.qrscan
 
 import com.google.android.gms.tasks.Task
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
@@ -8,15 +8,24 @@ import com.google.mlkit.vision.common.InputImage
 import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
 import com.simprints.core.tools.extentions.resumeSafely
 import com.simprints.core.tools.extentions.resumeWithExceptionSafely
-import com.simprints.infra.logging.LoggingConstants.CrashReportTag.LOGIN
+import com.simprints.infra.logging.LoggingConstants
 import com.simprints.infra.logging.Simber
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.suspendCancellableCoroutine
-import javax.inject.Inject
 
 @ExcludedFromGeneratedTestCoverageReports(
     reason = "This is just an injectable wrapper around MLKit barcode analyzer",
 )
-internal class QrCodeDetector @Inject constructor() {
+class QrCodeDetector @AssistedInject constructor(
+    @Assisted private val crashReportTag: LoggingConstants.CrashReportTag,
+) {
+    @AssistedFactory
+    interface Factory {
+        fun create(crashReportTag: LoggingConstants.CrashReportTag): QrCodeDetector
+    }
+
     private val scanner = BarcodeScanning.getClient(
         BarcodeScannerOptions
             .Builder()
@@ -24,14 +33,17 @@ internal class QrCodeDetector @Inject constructor() {
             .build(),
     )
 
-    suspend fun detectInImage(rawImage: RawImage): String? = try {
+    suspend fun detectInImage(rawImage: RawImage): String? =
+        detectInImage(InputImage.fromMediaImage(rawImage.image, rawImage.rotationDegrees))
+
+    suspend fun detectInImage(image: InputImage): String? = try {
         scanner
-            .process(InputImage.fromMediaImage(rawImage.image, rawImage.rotationDegrees))
+            .process(image)
             .awaitTask()
             ?.firstOrNull { !it.rawValue.isNullOrEmpty() }
             ?.rawValue
     } catch (t: Throwable) {
-        Simber.e("QR code processing failed", t, tag = LOGIN)
+        Simber.e("QR code processing failed", t, tag = crashReportTag)
         null
     }
 
diff --git a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/RawImage.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/RawImage.kt
similarity index 51%
rename from feature/login/src/main/java/com/simprints/feature/login/tools/camera/RawImage.kt
rename to infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/RawImage.kt
index 4e4d3dfb30..a72956ab04 100644
--- a/feature/login/src/main/java/com/simprints/feature/login/tools/camera/RawImage.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/RawImage.kt
@@ -1,8 +1,8 @@
-package com.simprints.feature.login.tools.camera
+package com.simprints.infra.uibase.camera.qrscan
 
 import android.media.Image
 
-internal data class RawImage(
+data class RawImage(
     val image: Image,
     val rotationDegrees: Int,
 )
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
new file mode 100644
index 0000000000..d8a63dc90f
--- /dev/null
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
@@ -0,0 +1,27 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.graphics.Bitmap
+import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
+import javax.inject.Inject
+
+class CropBitmapAreaForDetectionUseCase @Inject constructor(
+    private val rotateIfNeededUseCase: RotateIfNeededUseCase,
+    private val mapCropRectToImageSpaceUseCase: MapCropRectToImageSpaceUseCase,
+    private val cropBitmapToRectUseCase: CropBitmapToRectUseCase
+) {
+    operator fun invoke(bitmap: Bitmap, cropConfig: QrCodeAnalyzer.CropConfig): Bitmap {
+        val rotatedBitmap = rotateIfNeededUseCase(bitmap, cropConfig.orientation)
+        val crop = mapCropRectToImageSpaceUseCase(
+            cropRectInRoot = cropConfig.rect,
+            rootWidth = cropConfig.rootViewWidth,
+            rootHeight = cropConfig.rootViewHeight,
+            imageWidth = rotatedBitmap.width,
+            imageHeight = rotatedBitmap.height
+        )
+        return if (crop.left < 0 || crop.top < 0 || crop.right > rotatedBitmap.width || crop.bottom > rotatedBitmap.height) {
+            bitmap
+        } else {
+            cropBitmapToRectUseCase(rotatedBitmap, crop)
+        }
+    }
+}
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt
new file mode 100644
index 0000000000..9679e7a03c
--- /dev/null
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt
@@ -0,0 +1,17 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import javax.inject.Inject
+
+class CropBitmapToRectUseCase @Inject constructor() {
+
+    operator fun invoke(source: Bitmap, cropRect: Rect): Bitmap {
+        val left = cropRect.left.coerceIn(0, source.width)
+        val top = cropRect.top.coerceIn(0, source.height)
+        val width = cropRect.width().coerceAtMost(source.width - left)
+        val height = cropRect.height().coerceAtMost(source.height - top)
+
+        return Bitmap.createBitmap(source, left, top, width, height)
+    }
+}
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt
new file mode 100644
index 0000000000..4995b00bde
--- /dev/null
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt
@@ -0,0 +1,24 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.graphics.Rect
+import javax.inject.Inject
+
+class MapCropRectToImageSpaceUseCase @Inject constructor() {
+    operator fun invoke(
+        cropRectInRoot: Rect,
+        rootWidth: Int,
+        rootHeight: Int,
+        imageWidth: Int,
+        imageHeight: Int,
+    ): Rect {
+        val scaleX = imageWidth.toFloat() / rootWidth
+        val scaleY = imageHeight.toFloat() / rootHeight
+
+        return Rect(
+            (cropRectInRoot.left * scaleX).toInt(),
+            (cropRectInRoot.top * scaleY).toInt(),
+            (cropRectInRoot.right * scaleX).toInt(),
+            (cropRectInRoot.bottom * scaleY).toInt()
+        )
+    }
+}
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt
new file mode 100644
index 0000000000..a2e6064fbb
--- /dev/null
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt
@@ -0,0 +1,20 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Matrix
+import javax.inject.Inject
+
+class RotateIfNeededUseCase @Inject constructor() {
+    operator fun invoke(bitmap: Bitmap, orientation: Int): Bitmap {
+        val isLandscape = bitmap.width > bitmap.height
+        val isPortraitOrientation = orientation == Configuration.ORIENTATION_PORTRAIT
+
+        return if (isLandscape && isPortraitOrientation) {
+            val matrix = Matrix().apply { postRotate(90f) }
+            Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
+        } else {
+            bitmap
+        }
+    }
+}
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt b/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt
new file mode 100644
index 0000000000..374d92b6b7
--- /dev/null
+++ b/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt
@@ -0,0 +1,44 @@
+package com.simprints.infra.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.annotation.StringRes
+import com.simprints.infra.uibase.R
+
+class PermissionRequestView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0
+) : LinearLayout(context, attrs, defStyle) {
+
+    private val title: TextView
+    private val body: TextView
+    private val actionButton: Button
+
+    init {
+        orientation = VERTICAL
+        LayoutInflater.from(context).inflate(R.layout.view_camera_permission_request, this, true)
+
+        title = findViewById(R.id.permissionTitle)
+        body = findViewById(R.id.permissionBody)
+        actionButton = findViewById(R.id.permissionAction)
+    }
+
+    fun init(title: String, body: String, buttonText: String, onClickListener: OnClickListener) {
+        this.title.text = title
+        this.body.text = body
+        this.actionButton.text = buttonText
+        this.actionButton.setOnClickListener(onClickListener)
+    }
+
+    fun init(@StringRes title: Int, @StringRes body: Int, @StringRes buttonText: Int, onClickListener: OnClickListener) {
+        this.title.setText(title)
+        this.body.setText(body)
+        this.actionButton.setText(buttonText)
+        this.actionButton.setOnClickListener(onClickListener)
+    }
+}
diff --git a/infra/ui-base/src/main/res/layout/view_camera_permission_request.xml b/infra/ui-base/src/main/res/layout/view_camera_permission_request.xml
new file mode 100644
index 0000000000..f0fda4a5e6
--- /dev/null
+++ b/infra/ui-base/src/main/res/layout/view_camera_permission_request.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/permissionCard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/margin_large"
+        app:cardElevation="2dp"
+        app:cardUseCompatPadding="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/padding_large">
+
+            <TextView
+                android:id="@+id/permissionTitle"
+                style="@style/Text.Headline5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="Camera Permission Required" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginVertical="@dimen/margin_large"
+                android:background="@color/simprints_grey_light" />
+
+            <TextView
+                android:id="@+id/permissionBody"
+                style="@style/Text.Body1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="This app requires access to your camera to scan documents." />
+
+            <Button
+                android:id="@+id/permissionAction"
+                style="@style/Widget.Simprints.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_large"
+                tools:text="Grant Permission" />
+
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
+</merge>

From b1d6b5a9b69c54567a8f5e20cd32efc19ac38e3f Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Sat, 20 Sep 2025 13:38:46 +0300
Subject: [PATCH 04/14] [MS-1165] MFID: QR code reader further adjustments

---
 .../ExternalCredentialScanQrFragment.kt       | 142 ++++++++++--------
 .../ExternalCredentialScanQrViewModel.kt      |  22 ++-
 .../screens/scanqr/ScanQrState.kt             |   8 +-
 .../screens/scanqr/view/QrScannerOverlay.kt   |  44 ++++++
 .../res/drawable/ic_camera_focus_blue.xml     |  19 ++-
 .../fragment_external_credential_scan_qr.xml  |  15 +-
 .../screens/qrscanner/QrScannerFragment.kt    |   2 +-
 .../main/res/layout/fragment_qr_scanner.xml   |   2 +-
 .../core/tools/extentions/Activity.ext.kt     |   5 +
 9 files changed, 172 insertions(+), 87 deletions(-)
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/view/QrScannerOverlay.kt

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index ebbf7619a6..67e8c5d347 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -1,11 +1,12 @@
 package com.simprints.feature.externalcredential.screens.scanqr
 
-import android.Manifest
 import android.Manifest.permission.CAMERA
 import android.app.Dialog
 import android.content.Intent
 import android.graphics.Rect
+import android.os.Bundle
 import android.provider.Settings
+import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
@@ -21,16 +22,19 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.simprints.core.domain.permission.PermissionStatus
+import com.simprints.core.tools.extentions.getCurrentPermissionStatus
+import com.simprints.core.tools.extentions.hasPermission
 import com.simprints.core.tools.extentions.permissionFromResult
 import com.simprints.feature.externalcredential.R
 import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialScanQrBinding
 import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
 import com.simprints.infra.logging.LoggingConstants
+import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
 import com.simprints.infra.logging.Simber
 import com.simprints.infra.uibase.camera.qrscan.CameraHelper
 import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
 import com.simprints.infra.uibase.navigation.navigateSafely
+import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.catch
@@ -49,7 +53,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
     private val viewModel by viewModels<ExternalCredentialScanQrViewModel>()
 
     private var dialog: Dialog? = null
-    private var shouldCheckCameraPermission = true
+    private var isCameraInitialized = false
 
     @Inject
     lateinit var cameraHelperFactory: CameraHelper.Factory
@@ -64,27 +68,27 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
     private val launchPermissionRequest = registerForActivityResult(
         ActivityResultContracts.RequestPermission(),
     ) { granted ->
-        val permissionStatus = requireActivity().permissionFromResult(CAMERA, granted)
-        shouldCheckCameraPermission = permissionStatus == PermissionStatus.DeniedNeverAskAgain
-        when (permissionStatus) {
-            PermissionStatus.Granted -> {
-                initObservers()
-                startCamera()
-                startAnalyzer()
-            }
+        val cameraPermissionStatus = requireActivity().permissionFromResult(CAMERA, granted)
+        viewModel.updateCameraPermissionStatus(cameraPermissionStatus)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        applySystemBarInsets(view)
+        Simber.i("ExternalCredentialScanQrFragment started", tag = MULTI_FACTOR_ID)
+
+
+        initObservers()
 
-            PermissionStatus.Denied -> renderNoPermission(shouldOpenSettings = false)
-            PermissionStatus.DeniedNeverAskAgain -> renderNoPermission(shouldOpenSettings = true)
+        if (!requireActivity().hasPermission(CAMERA)) {
+            launchPermissionRequest.launch(CAMERA)
         }
     }
 
     override fun onResume() {
         super.onResume()
-        if (shouldCheckCameraPermission) {
-            // Check permission in onResume() so that if user left the app to go to Settings
-            // and give the permission, it's reflected when they come back to SID
-            launchPermissionRequest.launch(CAMERA)
-        }
+        val cameraPermissionStatus = requireActivity().getCurrentPermissionStatus(CAMERA)
+        viewModel.updateCameraPermissionStatus(cameraPermissionStatus)
     }
 
     override fun onDestroy() {
@@ -100,8 +104,13 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
     private fun initObservers() {
         viewModel.stateLiveData.observe(viewLifecycleOwner) { state ->
             when (state) {
-                ScanQrState.NothingScanned -> renderInitialState()
-                is ScanQrState.ScanComplete -> renderScanComplete(state)
+                ScanQrState.ReadyToScan -> {
+                    renderInitialState()
+                    initCamera()
+                }
+
+                is ScanQrState.QrCodeCaptured -> renderScanComplete(state)
+                is ScanQrState.NoCameraPermission -> renderNoPermission(state.shouldOpenPhoneSettings)
             }
         }
     }
@@ -115,7 +124,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
         buttonScan.setOnClickListener {}
     }
 
-    private fun renderScanComplete(state: ScanQrState.ScanComplete) = with(binding) {
+    private fun renderScanComplete(state: ScanQrState.QrCodeCaptured) = with(binding) {
         val qrCodeValue = state.qrCodeValue
         qrPreviewCard.isVisible = true
         qrPreviewText.text = state.qrCodeValue
@@ -131,8 +140,9 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
             } else {
                 showInvalidQrCodeFormatDialog(
                     qrCodeValue = qrCodeValue,
-                    onRescan = {
+                    onDismiss = {
                         dismissDialog()
+                        viewModel.updateCapturedValue(null)
                     }
                 )
             }
@@ -141,7 +151,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
 
     private fun showInvalidQrCodeFormatDialog(
         qrCodeValue: String,
-        onRescan: () -> Unit,
+        onDismiss: () -> Unit,
     ) {
         dismissDialog()
         dialog = BottomSheetDialog(requireContext())
@@ -151,8 +161,8 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
 
         qrValueTextView.text = qrCodeValue
 
-        buttonRescan.setOnClickListener { onRescan() }
-
+        buttonRescan.setOnClickListener { dismissDialog() }
+        dialog?.setOnDismissListener { onDismiss() }
         dialog?.setContentView(view)
         dialog?.setCancelable(true)
         dialog?.show()
@@ -162,16 +172,24 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
         }
     }
 
+    private fun initCamera() {
+        binding.qrScannerArea.post {
+            if (isCameraInitialized) return@post
+            isCameraInitialized = true
+            startCamera()
+            startAnalyzer()
+        }
+    }
+
     private fun startAnalyzer() {
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 qrCodeAnalyzer.scannedCode
                     .catch { e ->
                         Simber.e("Camera not available for QR scanning", e, tag = crashReportTag)
-                        // TODO [MS-1165] Handle camera permissions
                         Toast.makeText(requireActivity(), "No camera", Toast.LENGTH_LONG).show()
                     }.collectLatest { qrCode ->
-                        viewModel.setQrCodeValue(qrCode)
+                        viewModel.updateCapturedValue(qrCode)
                     }
             }
         }
@@ -186,22 +204,20 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
             binding.qrScannerPreview,
             qrCodeAnalyzer,
         ) {
-            // On error
-            // TODO [MS-1165] Handle lack of camera permissions
             Toast.makeText(requireActivity(), "No Camera available", Toast.LENGTH_LONG).show()
         }
     }
 
-    private fun getCropConfig(): QrCodeAnalyzer.CropConfig {
+    private fun getCropConfig(): QrCodeAnalyzer.CropConfig = with(binding) {
         val qrScannerArea = Rect(
-            binding.qrScannerAim.left,
-            binding.qrScannerAim.top,
-            binding.qrScannerAim.right,
-            binding.qrScannerAim.bottom
+            qrScannerArea.left,
+            qrScannerArea.top,
+            qrScannerArea.right,
+            qrScannerArea.bottom
         )
         val orientation = resources.configuration.orientation
-        val previewWidth = binding.qrScannerPreview.width
-        val previewHeight = binding.qrScannerPreview.height
+        val previewWidth = qrScannerPreview.width
+        val previewHeight = qrScannerPreview.height
         return QrCodeAnalyzer.CropConfig(
             rect = qrScannerArea,
             orientation = orientation,
@@ -210,34 +226,32 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
         )
     }
 
-    private fun renderNoPermission(shouldOpenSettings: Boolean) {
-        binding.apply {
-            buttonScan.isVisible = false
-            if (shouldOpenSettings) {
-                permissionRequestView.init(
-                    title = IDR.string.face_capture_permission_denied,
-                    body = IDR.string.login_qr_code_scanning_camera_permission_error,
-                    buttonText = IDR.string.fingerprint_connect_phone_settings_button,
-                    onClickListener = {
-                        requireActivity().startActivity(
-                            Intent(
-                                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                                "package:${requireActivity().packageName}".toUri(),
-                            ),
-                        )
-                    }
-                )
-            } else {
-                permissionRequestView.init(
-                    title = IDR.string.face_capture_permission_denied,
-                    body = IDR.string.login_qr_code_scanning_camera_permission_error,
-                    buttonText = IDR.string.face_capture_permission_action,
-                    onClickListener = {
-                        launchPermissionRequest.launch(Manifest.permission.CAMERA)
-                    }
-                )
-            }
-            permissionRequestView.isVisible = true
+    private fun renderNoPermission(shouldOpenPhoneSettings: Boolean) = with(binding) {
+        buttonScan.isVisible = false
+        if (shouldOpenPhoneSettings) {
+            permissionRequestView.init(
+                title = IDR.string.face_capture_permission_denied,
+                body = IDR.string.login_qr_code_scanning_camera_permission_error,
+                buttonText = IDR.string.fingerprint_connect_phone_settings_button,
+                onClickListener = {
+                    requireActivity().startActivity(
+                        Intent(
+                            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                            "package:${requireActivity().packageName}".toUri(),
+                        ),
+                    )
+                }
+            )
+        } else {
+            permissionRequestView.init(
+                title = IDR.string.face_capture_permission_denied,
+                body = IDR.string.login_qr_code_scanning_camera_permission_error,
+                buttonText = IDR.string.face_capture_permission_action,
+                onClickListener = {
+                    launchPermissionRequest.launch(CAMERA)
+                }
+            )
         }
+        permissionRequestView.isVisible = true
     }
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
index 4b54e169bd..8cfda721fa 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModel.kt
@@ -3,6 +3,7 @@ package com.simprints.feature.externalcredential.screens.scanqr
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.simprints.core.domain.permission.PermissionStatus
 import com.simprints.feature.externalcredential.screens.scanqr.usecase.ExternalCredentialQrCodeValidatorUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -12,20 +13,33 @@ internal class ExternalCredentialScanQrViewModel @Inject constructor(
     private val externalCredentialQrCodeValidator: ExternalCredentialQrCodeValidatorUseCase
 ) : ViewModel() {
 
-    private var state: ScanQrState = ScanQrState.NothingScanned
+    private var state: ScanQrState = ScanQrState.ReadyToScan
         set(value) {
             field = value
             _stateLiveData.postValue(value)
         }
-    private val _stateLiveData = MutableLiveData<ScanQrState>(ScanQrState.NothingScanned)
+    private val _stateLiveData = MutableLiveData<ScanQrState>(ScanQrState.ReadyToScan)
     val stateLiveData: LiveData<ScanQrState> = _stateLiveData
 
     private fun updateState(state: (ScanQrState) -> ScanQrState) {
         this.state = state(this.state)
     }
 
-    fun setQrCodeValue(qrCode: String) {
-        updateState { ScanQrState.ScanComplete(qrCode) }
+    fun updateCapturedValue(value: String?) {
+        val newState = when (value) {
+            null -> ScanQrState.ReadyToScan
+            else -> ScanQrState.QrCodeCaptured(value)
+        }
+        updateState { newState }
+    }
+
+    fun updateCameraPermissionStatus(permissionStatus: PermissionStatus) {
+        val newState = when (permissionStatus) {
+            PermissionStatus.Granted -> ScanQrState.ReadyToScan
+            PermissionStatus.Denied -> ScanQrState.NoCameraPermission(shouldOpenPhoneSettings = false)
+            PermissionStatus.DeniedNeverAskAgain -> ScanQrState.NoCameraPermission(shouldOpenPhoneSettings = true)
+        }
+        updateState { newState }
     }
 
     fun isValidQrCodeFormat(qrCodeValue: String): Boolean = externalCredentialQrCodeValidator(qrCodeValue)
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt
index 42407415b2..dee0423d5e 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ScanQrState.kt
@@ -1,9 +1,13 @@
 package com.simprints.feature.externalcredential.screens.scanqr
 
 sealed class ScanQrState {
-    data object NothingScanned : ScanQrState()
+    data object ReadyToScan : ScanQrState()
 
-    data class ScanComplete(
+    data class NoCameraPermission(
+        val shouldOpenPhoneSettings: Boolean
+    ) : ScanQrState()
+
+    data class QrCodeCaptured(
         val qrCodeValue: String
     ) : ScanQrState()
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/view/QrScannerOverlay.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/view/QrScannerOverlay.kt
new file mode 100644
index 0000000000..80dfcff514
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/view/QrScannerOverlay.kt
@@ -0,0 +1,44 @@
+package com.simprints.feature.externalcredential.screens.scanqr.view
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import com.simprints.feature.externalcredential.R
+import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
+import com.simprints.infra.resources.R as IDR
+
+@ExcludedFromGeneratedTestCoverageReports("UI Code")
+internal class QrScannerOverlay(context: Context, attrs: AttributeSet? = null) : View(context, attrs) {
+    private val bgPaint = Paint().apply {
+        color = ContextCompat.getColor(context, IDR.color.simprints_black)
+    }
+    private val clearPaint = Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) }
+    private val rect = Rect()
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        (parent as ViewGroup).findViewById<View>(R.id.qrScannerArea)?.let { qrScannerArea ->
+            canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), bgPaint)
+
+            // geting rect in this view’s coordinates
+            rect.setEmpty()
+            qrScannerArea.getGlobalVisibleRect(rect)
+            val offset = IntArray(2)
+            getLocationOnScreen(offset)
+            rect.offset(-offset[0], -offset[1])
+
+            // shrink each side so that QR code area indicators and at the top
+            val inset = (8 * resources.displayMetrics.density).toInt()
+            rect.inset(inset, inset)
+
+            canvas.drawRect(rect, clearPaint)
+        }
+    }
+}
diff --git a/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml b/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml
index 42f9fce658..d58e25d265 100644
--- a/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml
+++ b/feature/external-credential/src/main/res/drawable/ic_camera_focus_blue.xml
@@ -2,22 +2,21 @@
 <vector android:height="200dp" android:viewportHeight="120"
     android:viewportWidth="120" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M0,0l4,0l0,30l-4,0z" android:strokeWidth="0.16733685"/>
+        android:pathData="M0,0l4,0l0,30l-4,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M0,0l40,0l0,4l-40,0z" android:strokeWidth="0.16733819"/>
+        android:pathData="M0,0l40,0l0,4l-40,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M0,0l4,0l0,40l-4,0z" android:strokeWidth="0.16733685"/>
+        android:pathData="M0,0l4,0l0,40l-4,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M80,0l40,0l0,4l-40,0z" android:strokeWidth="0.16733819"/>
+        android:pathData="M80,0l40,0l0,4l-40,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M116,0l4,0l0,40l-4,0z" android:strokeWidth="0.16733806"/>
+        android:pathData="M116,0l4,0l0,40l-4,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M0,80l4,0l0,40l-4,0z" android:strokeWidth="0.16733685"/>
+        android:pathData="M0,80l4,0l0,40l-4,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M0,116l40,0l0,4l-40,0z" android:strokeWidth="0.16733526"/>
+        android:pathData="M0,116l40,0l0,4l-40,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M80,116l40,0l0,4l-40,0z" android:strokeWidth="0.16733526"/>
+        android:pathData="M80,116l40,0l0,4l-40,0z"/>
     <path android:fillColor="@color/simprints_blue"
-        android:pathData="M116,80l4,0l0,36l-4,0z" android:strokeWidth="0.18330976"/>
+        android:pathData="M116,80l4,0l0,36l-4,0z"/>
 </vector>
-
diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
index e0b780a69b..8cf1d73ea7 100644
--- a/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
+++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
@@ -11,8 +11,13 @@
         android:layout_height="match_parent"
         tools:visibility="gone" />
 
+    <com.simprints.feature.externalcredential.screens.scanqr.view.QrScannerOverlay
+        android:alpha="0.5"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <ImageView
-        android:id="@+id/qrScannerAim"
+        android:id="@+id/qrScannerArea"
         android:layout_width="200dp"
         android:layout_height="200dp"
         android:importantForAccessibility="no"
@@ -33,7 +38,7 @@
         app:cardUseCompatPadding="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrScannerAim"
+        app:layout_constraintTop_toBottomOf="@+id/qrScannerArea"
         tools:visibility="visible">
 
         <TextView
@@ -61,12 +66,12 @@
     <com.simprints.infra.view.PermissionRequestView
         android:id="@+id/permissionRequestView"
         android:layout_width="0dp"
-        android:layout_margin="@dimen/margin_large"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_large"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt b/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt
index baee8a2187..c176dccb1e 100644
--- a/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt
+++ b/feature/login/src/main/java/com/simprints/feature/login/screens/qrscanner/QrScannerFragment.kt
@@ -81,7 +81,7 @@ internal class QrScannerFragment : Fragment(R.layout.fragment_qr_scanner) {
     }
 
     private fun startCamera() {
-        binding.qrScannerAim.isVisible = true
+        binding.qrScannerArea.isVisible = true
         cameraHelper.startCamera(
             viewLifecycleOwner,
             binding.qrScannerPreview,
diff --git a/feature/login/src/main/res/layout/fragment_qr_scanner.xml b/feature/login/src/main/res/layout/fragment_qr_scanner.xml
index 3716676035..3fa0e59bb0 100644
--- a/feature/login/src/main/res/layout/fragment_qr_scanner.xml
+++ b/feature/login/src/main/res/layout/fragment_qr_scanner.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent" />
 
     <ImageView
-        android:id="@+id/qrScannerAim"
+        android:id="@+id/qrScannerArea"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_camera_focus"
diff --git a/infra/core/src/main/java/com/simprints/core/tools/extentions/Activity.ext.kt b/infra/core/src/main/java/com/simprints/core/tools/extentions/Activity.ext.kt
index ee540d4c59..f0ec9eca95 100644
--- a/infra/core/src/main/java/com/simprints/core/tools/extentions/Activity.ext.kt
+++ b/infra/core/src/main/java/com/simprints/core/tools/extentions/Activity.ext.kt
@@ -39,3 +39,8 @@ fun Activity.permissionFromResult(
         }
     }
 }
+
+@ExcludedFromGeneratedTestCoverageReports("UI code")
+fun Activity.getCurrentPermissionStatus(
+    permission: String,
+): PermissionStatus = permissionFromResult(permission = permission, grantResult = hasPermission(permission))

From 2d530cd115159930091b3746221c9dd83fc1aa07 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Sat, 20 Sep 2025 13:47:10 +0300
Subject: [PATCH 05/14] [MS-1165] MFID: Adding instructions text to QR code
 reader

---
 .../scanqr/ExternalCredentialScanQrFragment.kt      |  3 +++
 .../layout/fragment_external_credential_scan_qr.xml | 13 ++++++++++++-
 infra/resources/src/main/res/values/strings.xml     |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index 67e8c5d347..1bad5a6b05 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -117,6 +117,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
 
     private fun renderInitialState() = with(binding) {
         permissionRequestView.isVisible = false
+        qrInstructionsText.isVisible = true
         qrPreviewCard.isVisible = false
         buttonScan.setText(IDR.string.mfid_qr_scan_no_qr_detected)
         buttonScan.isVisible = true
@@ -126,6 +127,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
 
     private fun renderScanComplete(state: ScanQrState.QrCodeCaptured) = with(binding) {
         val qrCodeValue = state.qrCodeValue
+        qrInstructionsText.isVisible = false
         qrPreviewCard.isVisible = true
         qrPreviewText.text = state.qrCodeValue
         buttonScan.setText(IDR.string.mfid_continue)
@@ -227,6 +229,7 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
     }
 
     private fun renderNoPermission(shouldOpenPhoneSettings: Boolean) = with(binding) {
+        qrInstructionsText.isVisible = false
         buttonScan.isVisible = false
         if (shouldOpenPhoneSettings) {
             permissionRequestView.init(
diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
index 8cf1d73ea7..0c79986a07 100644
--- a/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
+++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
@@ -16,6 +16,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <TextView
+        android:id="@+id/qrInstructionsText"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/qrScannerArea"
+        android:text="@string/mfid_qr_scan_instructions"
+        style="@style/Text.Headline5.White"
+        android:layout_margin="@dimen/padding_default"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <ImageView
         android:id="@+id/qrScannerArea"
         android:layout_width="200dp"
@@ -73,5 +84,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 1c80e39583..2aede09962 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -494,6 +494,7 @@
     <string name="mfid_dialog_skip_scan_body_specific">Scanning %1$s is required by this project. Are you sure you want to skip this step?</string>
     <string name="mfid_dialog_skip_scan_confirm">Skip</string>
     <string name="mfid_qr_scan_no_qr_detected">No QR code detected</string>
+    <string name="mfid_qr_scan_instructions">Place QR code in window</string>
     <string name="mfid_continue">Continue</string>
     <string name="mfid_dialog_wrong_qr_title">Invalid QR Code type</string>
     <string name="mfid_dialog_wrong_qr_body_top">Wrong QR code format is scanned</string>

From e8c53bb59c66bb1a1db54d85e5e2465a692cab50 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Sat, 20 Sep 2025 15:10:58 +0300
Subject: [PATCH 06/14] =?UTF-8?q?[MS-1165]=20MFID:=20Adding=20test=20cover?=
 =?UTF-8?q?age=CB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExternalCredentialScanQrFragment.kt       |   2 +-
 .../ExternalCredentialViewModelTest.kt        |  31 +++++-
 .../ExternalCredentialScanQrViewModelTest.kt  |  86 +++++++++++++++
 .../login/tools/camera/QrCodeAnalyzerTest.kt  |  63 -----------
 .../CropBitmapAreaForDetectionUseCase.kt      |   7 +-
 .../camera/qrscan/QrCodeAnalyzerTest.kt       | 100 +++++++++++++++++
 .../CropBitmapAreaForDetectionUseCaseTest.kt  | 104 ++++++++++++++++++
 7 files changed, 325 insertions(+), 68 deletions(-)
 create mode 100644 feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModelTest.kt
 delete mode 100644 feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt
 create mode 100644 infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzerTest.kt
 create mode 100644 infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index 1bad5a6b05..193c0996bc 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -48,7 +48,7 @@ import com.simprints.infra.resources.R as IDR
 internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_external_credential_scan_qr) {
 
     private val binding by viewBinding(FragmentExternalCredentialScanQrBinding::bind)
-    private val crashReportTag = LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
+    private val crashReportTag = MULTI_FACTOR_ID
     private val mainViewModel: ExternalCredentialViewModel by activityViewModels()
     private val viewModel by viewModels<ExternalCredentialScanQrViewModel>()
 
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
index b62c420593..21eb7e33d0 100644
--- a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModelTest.kt
@@ -3,13 +3,15 @@ package com.simprints.feature.externalcredential.screens.controller
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.google.common.truth.Truth.assertThat
 import com.jraska.livedata.test
+import com.simprints.core.domain.common.FlowType
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
+import com.simprints.feature.externalcredential.model.ExternalCredentialParams
 import com.simprints.infra.resources.R as IDR
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-class ExternalCredentialViewModelTest {
+internal class ExternalCredentialViewModelTest {
 
     @get:Rule
     val rule = InstantTaskExecutorRule()
@@ -54,4 +56,31 @@ class ExternalCredentialViewModelTest {
         assertThat(viewModel.mapTypeToStringResource(ExternalCredentialType.QRCode))
             .isEqualTo(IDR.string.mfid_type_qr_code)
     }
+
+    @Test
+    fun `setExternalCredentialValue updates state`() {
+        val observer = viewModel.stateLiveData.test()
+        val value = "value"
+        viewModel.setExternalCredentialValue(value)
+        assertThat(observer.value()?.credentialValue).isEqualTo(value)
+    }
+
+    @Test
+    fun `init sets state only once`() {
+        val observer = viewModel.stateLiveData.test()
+        val subjectId = "subjectId"
+        val flowType = FlowType.IDENTIFY
+        val params = ExternalCredentialParams(subjectId = subjectId, flowType = flowType)
+        val paramsSecond = ExternalCredentialParams(subjectId = "other", flowType = FlowType.VERIFY)
+
+        viewModel.init(params)
+        val firstState = observer.value()
+
+        viewModel.init(paramsSecond)
+
+        assertThat(observer.value()).isEqualTo(firstState)
+        assertThat(observer.value()?.subjectId).isEqualTo(subjectId)
+        assertThat(observer.value()?.flowType).isEqualTo(flowType)
+    }
+
 }
diff --git a/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModelTest.kt b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModelTest.kt
new file mode 100644
index 0000000000..84f2242b9f
--- /dev/null
+++ b/feature/external-credential/src/test/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrViewModelTest.kt
@@ -0,0 +1,86 @@
+package com.simprints.feature.externalcredential.screens.scanqr
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.google.common.truth.Truth.assertThat
+import com.jraska.livedata.test
+import com.simprints.core.domain.permission.PermissionStatus
+import com.simprints.feature.externalcredential.screens.scanqr.usecase.ExternalCredentialQrCodeValidatorUseCase
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+internal class ExternalCredentialScanQrViewModelTest {
+
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
+
+    @MockK
+    private lateinit var validator: ExternalCredentialQrCodeValidatorUseCase
+
+    private lateinit var viewModel: ExternalCredentialScanQrViewModel
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+        viewModel = ExternalCredentialScanQrViewModel(validator)
+    }
+
+    @Test
+    fun `initial state is ReadyToScan`() {
+        val observer = viewModel.stateLiveData.test()
+        assertThat(observer.value()).isEqualTo(ScanQrState.ReadyToScan)
+    }
+
+    @Test
+    fun `updateCapturedValue with null sets ReadyToScan`() {
+        val observer = viewModel.stateLiveData.test()
+        viewModel.updateCapturedValue(null)
+        assertThat(observer.value()).isEqualTo(ScanQrState.ReadyToScan)
+    }
+
+    @Test
+    fun `updateCapturedValue with non-null sets QrCodeCaptured`() {
+        val observer = viewModel.stateLiveData.test()
+        viewModel.updateCapturedValue("captured-value")
+        assertThat(observer.value()).isEqualTo(ScanQrState.QrCodeCaptured("captured-value"))
+    }
+
+    @Test
+    fun `updateCameraPermissionStatus with Granted sets ReadyToScan`() {
+        val observer = viewModel.stateLiveData.test()
+        viewModel.updateCameraPermissionStatus(PermissionStatus.Granted)
+        assertThat(observer.value()).isEqualTo(ScanQrState.ReadyToScan)
+    }
+
+    @Test
+    fun `updateCameraPermissionStatus with Denied sets NoCameraPermission false`() {
+        val observer = viewModel.stateLiveData.test()
+        viewModel.updateCameraPermissionStatus(PermissionStatus.Denied)
+        assertThat(observer.value()).isEqualTo(
+            ScanQrState.NoCameraPermission(shouldOpenPhoneSettings = false)
+        )
+    }
+
+    @Test
+    fun `updateCameraPermissionStatus with DeniedNeverAskAgain sets NoCameraPermission true`() {
+        val observer = viewModel.stateLiveData.test()
+        viewModel.updateCameraPermissionStatus(PermissionStatus.DeniedNeverAskAgain)
+        assertThat(observer.value()).isEqualTo(
+            ScanQrState.NoCameraPermission(shouldOpenPhoneSettings = true)
+        )
+    }
+
+    @Test
+    fun `isValidQrCodeFormat uses validator to validate`() {
+        val validValue = "validValue"
+        val invalidValue = "invalidValue"
+        every { validator.invoke(validValue) } returns true
+        every { validator.invoke(invalidValue) } returns false
+
+        assertThat(viewModel.isValidQrCodeFormat(validValue)).isTrue()
+        assertThat(viewModel.isValidQrCodeFormat(invalidValue)).isFalse()
+    }
+}
diff --git a/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt b/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt
deleted file mode 100644
index 61acd4b726..0000000000
--- a/feature/login/src/test/java/com/simprints/feature/login/tools/camera/QrCodeAnalyzerTest.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.simprints.feature.login.tools.camera
-
-import androidx.camera.core.ImageProxy
-import com.google.common.truth.Truth.assertThat
-import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
-import com.simprints.infra.uibase.camera.qrscan.QrCodeDetector
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
-import io.mockk.verify
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-
-internal class QrCodeAnalyzerTest {
-    @MockK
-    lateinit var mockQrCodeDetector: QrCodeDetector
-
-    @MockK
-    lateinit var mockImageProxy: ImageProxy
-
-    private lateinit var qrCodeProducer: QrCodeAnalyzer
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        qrCodeProducer = QrCodeAnalyzer(mockQrCodeDetector, UnconfinedTestDispatcher())
-    }
-
-    @Test
-    fun `should not trigger detector when no images obtained`() {
-        every { mockImageProxy.image } returns null
-        qrCodeProducer.analyze(mockImageProxy)
-
-        coVerify(exactly = 0) { mockQrCodeDetector.detectInImage(any()) }
-    }
-
-    @Test
-    fun `should send RQ code value to flow`() = runTest {
-        every { mockImageProxy.image } returns mockk()
-        coEvery { mockQrCodeDetector.detectInImage(any()) } returns "mock_value"
-
-        qrCodeProducer.analyze(mockImageProxy)
-        val code = qrCodeProducer.scannedCode.first()
-
-        assertThat(code).isEqualTo("mock_value")
-    }
-
-    @Test
-    fun `should close image proxy with unsuccessful scan`() {
-        coEvery { mockQrCodeDetector.detectInImage(any()) } throws Throwable()
-
-        qrCodeProducer.analyze(mockImageProxy)
-
-        verify { mockImageProxy.close() }
-    }
-}
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
index d8a63dc90f..eeec655c2c 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
@@ -1,17 +1,18 @@
 package com.simprints.infra.uibase.camera.qrscan.usecase
 
 import android.graphics.Bitmap
+import android.graphics.Rect
 import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
 import javax.inject.Inject
 
-class CropBitmapAreaForDetectionUseCase @Inject constructor(
+internal class CropBitmapAreaForDetectionUseCase @Inject constructor(
     private val rotateIfNeededUseCase: RotateIfNeededUseCase,
     private val mapCropRectToImageSpaceUseCase: MapCropRectToImageSpaceUseCase,
     private val cropBitmapToRectUseCase: CropBitmapToRectUseCase
 ) {
     operator fun invoke(bitmap: Bitmap, cropConfig: QrCodeAnalyzer.CropConfig): Bitmap {
-        val rotatedBitmap = rotateIfNeededUseCase(bitmap, cropConfig.orientation)
-        val crop = mapCropRectToImageSpaceUseCase(
+        val rotatedBitmap: Bitmap = rotateIfNeededUseCase(bitmap, cropConfig.orientation)
+        val crop: Rect = mapCropRectToImageSpaceUseCase(
             cropRectInRoot = cropConfig.rect,
             rootWidth = cropConfig.rootViewWidth,
             rootHeight = cropConfig.rootViewHeight,
diff --git a/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzerTest.kt b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzerTest.kt
new file mode 100644
index 0000000000..051659bfc9
--- /dev/null
+++ b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzerTest.kt
@@ -0,0 +1,100 @@
+package com.simprints.infra.uibase.camera.qrscan
+
+import android.graphics.Bitmap
+import androidx.camera.core.ImageProxy
+import com.google.common.truth.*
+import com.google.mlkit.vision.common.InputImage
+import com.simprints.infra.logging.LoggingConstants
+import com.simprints.infra.uibase.camera.qrscan.usecase.CropBitmapAreaForDetectionUseCase
+import com.simprints.testtools.common.coroutines.TestCoroutineRule
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+internal class QrCodeAnalyzerTest {
+    @get:Rule
+    val testCoroutineRule = TestCoroutineRule()
+
+    @MockK
+    lateinit var qrCodeDetector: QrCodeDetector
+
+    @MockK
+    lateinit var imageProxy: ImageProxy
+
+    private lateinit var qrCodeProducer: QrCodeAnalyzer
+    private lateinit var cropUseCase: CropBitmapAreaForDetectionUseCase
+    private lateinit var bitmap: Bitmap
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+        bitmap = mockk<Bitmap>()
+        cropUseCase = mockk<CropBitmapAreaForDetectionUseCase>(relaxed = true)
+    }
+
+    private fun initQrCodeProducer(cropConfig: QrCodeAnalyzer.CropConfig?) {
+        qrCodeProducer = QrCodeAnalyzer(
+            qrCodeDetectorFactory = mockk<QrCodeDetector.Factory> {
+                every { create(any()) } returns qrCodeDetector
+            },
+            bgDispatcher = testCoroutineRule.testCoroutineDispatcher,
+            cropConfig = cropConfig,
+            crashReportTag = LoggingConstants.CrashReportTag.LOGIN,
+            cropBitmapAreaForDetectionUseCase = cropUseCase
+        )
+    }
+
+    @Test
+    fun `should not trigger detector when no images obtained`() {
+        initQrCodeProducer(cropConfig = null)
+        every { imageProxy.image } returns null
+        qrCodeProducer.analyze(imageProxy)
+
+        coVerify(exactly = 0) { qrCodeDetector.detectInImage(any<RawImage>()) }
+    }
+
+    @Test
+    fun `should send RQ code value to flow`() = runTest {
+        initQrCodeProducer(cropConfig = null)
+        every { imageProxy.image } returns mockk()
+        coEvery { qrCodeDetector.detectInImage(any<RawImage>()) } returns "mock_value"
+
+        qrCodeProducer.analyze(imageProxy)
+        val code = qrCodeProducer.scannedCode.first()
+
+        Truth.assertThat(code).isEqualTo("mock_value")
+    }
+
+    @Test
+    fun `should close image proxy with unsuccessful scan`() {
+        initQrCodeProducer(cropConfig = null)
+        coEvery { qrCodeDetector.detectInImage(any<RawImage>()) } throws Throwable()
+
+        qrCodeProducer.analyze(imageProxy)
+
+        verify { imageProxy.close() }
+    }
+
+    @Test
+    fun `should emit code when cropConfig is provided`() = runTest {
+        val cropConfig = mockk<QrCodeAnalyzer.CropConfig>()
+        val expectedQrValue = "expectedQrValue"
+        initQrCodeProducer(cropConfig)
+
+        mockkStatic(InputImage::class)
+        every { InputImage.fromBitmap(any(), any()) } returns mockk(relaxed = true)
+        every { imageProxy.image } returns mockk(relaxed = true)
+        every { imageProxy.toBitmap() } returns bitmap
+        every { cropUseCase.invoke(bitmap, cropConfig) } returns bitmap
+        coEvery { qrCodeDetector.detectInImage(any<InputImage>()) } returns expectedQrValue
+
+        qrCodeProducer.analyze(imageProxy)
+        val scannedCode = qrCodeProducer.scannedCode.first()
+        Truth.assertThat(scannedCode).isEqualTo(expectedQrValue)
+    }
+
+}
diff --git a/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt
new file mode 100644
index 0000000000..f085cf5728
--- /dev/null
+++ b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt
@@ -0,0 +1,104 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.*
+import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+internal class CropBitmapAreaForDetectionUseCaseTest {
+
+    @MockK
+    lateinit var rotateIfNeeded: RotateIfNeededUseCase
+
+    @MockK
+    lateinit var mapCropRectToImageSpace: MapCropRectToImageSpaceUseCase
+
+    @MockK
+    lateinit var cropBitmapToRect: CropBitmapToRectUseCase
+
+    @MockK
+    lateinit var originalBitmap: Bitmap
+
+    @MockK
+    lateinit var rotatedBitmap: Bitmap
+
+    @MockK
+    lateinit var croppedBitmap: Bitmap
+
+    private lateinit var useCase: CropBitmapAreaForDetectionUseCase
+
+    private val cropConfig = QrCodeAnalyzer.CropConfig(
+        rect = Rect(0, 0, 10, 10),
+        orientation = 0,
+        rootViewWidth = 100,
+        rootViewHeight = 100
+    )
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+
+        every { rotatedBitmap.width } returns 50
+        every { rotatedBitmap.height } returns 50
+
+        useCase = CropBitmapAreaForDetectionUseCase(
+            rotateIfNeeded,
+            mapCropRectToImageSpace,
+            cropBitmapToRect
+        )
+    }
+
+    @Test
+    fun `returns cropped bitmap when rect is inside bounds`() {
+        val mappedRect = Rect(5, 5, 15, 15)
+
+        every { rotateIfNeeded(originalBitmap, 0) } returns rotatedBitmap
+        every { mapCropRectToImageSpace(any(), any(), any(), any(), any()) } returns mappedRect
+        every { cropBitmapToRect(rotatedBitmap, mappedRect) } returns croppedBitmap
+
+        val result = useCase(originalBitmap, cropConfig)
+
+        assertThat(result).isEqualTo(croppedBitmap)
+        verify { rotateIfNeeded(bitmap = originalBitmap, orientation = 0) }
+        verify {
+            mapCropRectToImageSpace(
+                cropRectInRoot = cropConfig.rect,
+                rootWidth = 100,
+                rootHeight = 100,
+                imageWidth = 50,
+                imageHeight = 50
+            )
+        }
+        verify { cropBitmapToRect(source = rotatedBitmap, cropRect = mappedRect) }
+    }
+
+    @Test
+    fun `returns original bitmap when rect is out of bounds`() {
+        val mappedRect = Rect(-5, 5, 15, 15)
+
+        every { rotateIfNeeded(originalBitmap, 0) } returns rotatedBitmap
+        every { mapCropRectToImageSpace(any(), any(), any(), any(), any()) } returns mappedRect
+
+        val result = useCase(originalBitmap, cropConfig)
+
+        assertThat(result).isEqualTo(originalBitmap)
+        verify { rotateIfNeeded(bitmap = originalBitmap, orientation = 0) }
+        verify {
+            mapCropRectToImageSpace(
+                cropRectInRoot = cropConfig.rect,
+                rootWidth = 100,
+                rootHeight = 100,
+                imageWidth = 50,
+                imageHeight = 50
+            )
+        }
+        verify(exactly = 0) { cropBitmapToRect(any(), any()) }
+    }
+}

From c8dede8be74108815717b7cbc7829a3c0ef13b2b Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Mon, 22 Sep 2025 15:21:01 +0300
Subject: [PATCH 07/14] [MS-1165] MFID: Adding test coverage

---
 .../uibase/camera/qrscan/QrCodeAnalyzer.kt    |  10 ++
 .../CropBitmapAreaForDetectionUseCase.kt      |  17 ++-
 .../qrscan/usecase/CropBitmapToRectUseCase.kt |   8 +-
 .../usecase/MapCropRectToImageSpaceUseCase.kt |  11 ++
 ....kt => RotateToPortraitIfNeededUseCase.kt} |  11 +-
 .../CropBitmapAreaForDetectionUseCaseTest.kt  |   2 +-
 .../usecase/CropBitmapToRectUseCaseTest.kt    | 140 ++++++++++++++++++
 .../RotateToPortraitIfNeededUseCaseTest.kt    | 110 ++++++++++++++
 8 files changed, 302 insertions(+), 7 deletions(-)
 rename infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/{RotateIfNeededUseCase.kt => RotateToPortraitIfNeededUseCase.kt} (52%)
 create mode 100644 infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCaseTest.kt
 create mode 100644 infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCaseTest.kt

diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt
index 1be85ea563..45a20534e2 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/QrCodeAnalyzer.kt
@@ -35,6 +35,16 @@ class QrCodeAnalyzer @AssistedInject constructor(
         fun create(cropConfig: CropConfig?, crashReportTag: LoggingConstants.CrashReportTag): QrCodeAnalyzer
     }
 
+    /**
+     * Specifies what rectangle to crop from the image. This configuration is used in the image analysis - instead of analyzing the entire
+     * image, we are limiting the detection area to [rect]. The coordinates in [rect] are relative to the full image size, whose dimensions
+     * are given by [rootViewWidth] and [rootViewHeight]. Orientation of the image should be provided from the configuration constants.
+     *
+     * @param rect area to crop and analyze relative to the full image
+     * @param orientation orientation of the parent image. Should be provided from the configuration constants
+     * @param rootViewWidth width of the parent image
+     * @param rootViewHeight height of the parent image
+     */
     data class CropConfig(
         val rect: Rect,
         val orientation: Int,
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
index eeec655c2c..bc556b6604 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCase.kt
@@ -5,13 +5,16 @@ import android.graphics.Rect
 import com.simprints.infra.uibase.camera.qrscan.QrCodeAnalyzer
 import javax.inject.Inject
 
-internal class CropBitmapAreaForDetectionUseCase @Inject constructor(
-    private val rotateIfNeededUseCase: RotateIfNeededUseCase,
+class CropBitmapAreaForDetectionUseCase @Inject constructor(
+    private val rotateToPortraitIfNeededUseCase: RotateToPortraitIfNeededUseCase,
     private val mapCropRectToImageSpaceUseCase: MapCropRectToImageSpaceUseCase,
     private val cropBitmapToRectUseCase: CropBitmapToRectUseCase
 ) {
+    /**
+     * Takes a [bitmap] image, and crops it to the area specified in [cropConfig]
+     */
     operator fun invoke(bitmap: Bitmap, cropConfig: QrCodeAnalyzer.CropConfig): Bitmap {
-        val rotatedBitmap: Bitmap = rotateIfNeededUseCase(bitmap, cropConfig.orientation)
+        val rotatedBitmap: Bitmap = rotateToPortraitIfNeededUseCase(bitmap, cropConfig.orientation)
         val crop: Rect = mapCropRectToImageSpaceUseCase(
             cropRectInRoot = cropConfig.rect,
             rootWidth = cropConfig.rootViewWidth,
@@ -19,7 +22,13 @@ internal class CropBitmapAreaForDetectionUseCase @Inject constructor(
             imageWidth = rotatedBitmap.width,
             imageHeight = rotatedBitmap.height
         )
-        return if (crop.left < 0 || crop.top < 0 || crop.right > rotatedBitmap.width || crop.bottom > rotatedBitmap.height) {
+        val isLeftOutOfBounds = crop.left < 0
+        val isTopOutOfBounds = crop.top < 0
+        val isRightOutOfBounds = crop.right > rotatedBitmap.width
+        val isBottomOutOfBounds = crop.bottom > rotatedBitmap.height
+
+        // a safety check to ensure that crop area is fully inside the rotated bitmap bounds
+        return if (isLeftOutOfBounds || isTopOutOfBounds || isRightOutOfBounds || isBottomOutOfBounds) {
             bitmap
         } else {
             cropBitmapToRectUseCase(rotatedBitmap, crop)
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt
index 9679e7a03c..56a51a17a7 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCase.kt
@@ -5,7 +5,13 @@ import android.graphics.Rect
 import javax.inject.Inject
 
 class CropBitmapToRectUseCase @Inject constructor() {
-
+    /**
+     * Crops given [source] bitmap to the specified [cropRect]
+     *
+     * @param source bitmap to crop
+     * @param cropRect target crop rectangle
+     * @return a new [Bitmap] representing the cropped region
+     */
     operator fun invoke(source: Bitmap, cropRect: Rect): Bitmap {
         val left = cropRect.left.coerceIn(0, source.width)
         val top = cropRect.top.coerceIn(0, source.height)
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt
index 4995b00bde..7180118613 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/MapCropRectToImageSpaceUseCase.kt
@@ -4,6 +4,17 @@ import android.graphics.Rect
 import javax.inject.Inject
 
 class MapCropRectToImageSpaceUseCase @Inject constructor() {
+    /**
+     * Maps a crop rectangle defined in the root view's coordinate space into the corresponding rectangle in the image's coordinate space.
+     * This is required when the crop area is selected on a view (UI) with different dimensions than the underlying image being processed.
+     *
+     * @param cropRectInRoot the crop rectangle coordinates in the root view space
+     * @param rootWidth the width of the root view
+     * @param rootHeight the height of the root view
+     * @param imageWidth the width of the image
+     * @param imageHeight the height of the image
+     * @return a [Rect] representing the crop area in the image's coordinate space
+     */
     operator fun invoke(
         cropRectInRoot: Rect,
         rootWidth: Int,
diff --git a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCase.kt
similarity index 52%
rename from infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt
rename to infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCase.kt
index a2e6064fbb..88c5605179 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateIfNeededUseCase.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCase.kt
@@ -5,7 +5,16 @@ import android.graphics.Bitmap
 import android.graphics.Matrix
 import javax.inject.Inject
 
-class RotateIfNeededUseCase @Inject constructor() {
+class RotateToPortraitIfNeededUseCase @Inject constructor() {
+    /**
+     * Rotates given [bitmap] by 90 degrees if it is in landscape mode. Otherwise, returns the original [bitmap] without modification.
+     * Images from video feed are usually in landscape mode, and we want to be sure that the calculation are always happening in the same
+     * space.
+     *
+     * @param bitmap image to potentially rotate
+     * @param orientation the current device orientation from [Configuration] (portrait/landscape)
+     * @return a rotated bitmap if rotation was needed, otherwise the original bitmap
+     */
     operator fun invoke(bitmap: Bitmap, orientation: Int): Bitmap {
         val isLandscape = bitmap.width > bitmap.height
         val isPortraitOrientation = orientation == Configuration.ORIENTATION_PORTRAIT
diff --git a/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt
index f085cf5728..c7e8168bb9 100644
--- a/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt
+++ b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapAreaForDetectionUseCaseTest.kt
@@ -15,7 +15,7 @@ import org.junit.runner.RunWith
 internal class CropBitmapAreaForDetectionUseCaseTest {
 
     @MockK
-    lateinit var rotateIfNeeded: RotateIfNeededUseCase
+    lateinit var rotateIfNeeded: RotateToPortraitIfNeededUseCase
 
     @MockK
     lateinit var mapCropRectToImageSpace: MapCropRectToImageSpaceUseCase
diff --git a/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCaseTest.kt b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCaseTest.kt
new file mode 100644
index 0000000000..b731e61304
--- /dev/null
+++ b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/CropBitmapToRectUseCaseTest.kt
@@ -0,0 +1,140 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.*
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+internal class CropBitmapToRectUseCaseTest {
+
+    @MockK
+    lateinit var sourceBitmap: Bitmap
+
+    @MockK
+    lateinit var croppedBitmap: Bitmap
+
+    private lateinit var useCase: CropBitmapToRectUseCase
+
+    private val w800 = 800
+    private val h600 = 600
+    private val x100 = 100
+    private val y100 = 100
+    private val w200 = 200
+    private val h150 = 150
+    private val x0 = 0
+    private val y0 = 0
+    private val x50 = 50
+    private val y50 = 50
+    private val w100 = 100
+    private val h100 = 100
+    private val x900 = 900
+    private val y700 = 700
+    private val x750 = 750
+    private val y550 = 550
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+
+        every { sourceBitmap.width } returns w800
+        every { sourceBitmap.height } returns h600
+
+        useCase = CropBitmapToRectUseCase()
+    }
+
+    @Test
+    fun `crops bitmap with rect inside bounds`() {
+        val cropRect = Rect(x100, y100, x100 + w200, y100 + h150)
+        runUseCaseTest(cropRect, x100, y100, w200, h150)
+    }
+
+    @Test
+    fun `crops bitmap with rect at origin`() {
+        val cropRect = Rect(x0, y0, w100, h100)
+        runUseCaseTest(cropRect, x0, y0, w100, h100)
+    }
+
+    @Test
+    fun `coerces negative left coordinate to zero`() {
+        val cropRect = Rect(-x50, y100, -x50 + w100, y100 + h100)
+        runUseCaseTest(cropRect, x0, y100, w100, h100)
+    }
+
+    @Test
+    fun `coerces negative top coordinate to zero`() {
+        val cropRect = Rect(x100, -y50, x100 + w100, -y50 + h100)
+        runUseCaseTest(cropRect, x100, x0, w100, h100)
+    }
+
+    @Test
+    fun `coerces left coordinate exceeding bitmap width`() {
+        val cropRect = Rect(x900, y100, x900 + w100, y100 + h100)
+        runUseCaseTest(cropRect, w800, y100, x0, h100)
+    }
+
+    @Test
+    fun `coerces top coordinate exceeding bitmap height`() {
+        val cropRect = Rect(x100, y700, x100 + w100, y700 + h100)
+        runUseCaseTest(cropRect, x100, h600, w100, x0)
+    }
+
+    @Test
+    fun `limits width when crop extends beyond bitmap width`() {
+        val cropRect = Rect(x750, y100, x750 + w200, y100 + h100)
+        val expectedWidth = w800 - x750
+        runUseCaseTest(cropRect, x750, y100, expectedWidth, h100)
+    }
+
+    @Test
+    fun `limits height when crop extends beyond bitmap height`() {
+        val cropRect = Rect(x100, y550, x100 + w100, y550 + h150)
+        val expectedHeight = h600 - y550
+        runUseCaseTest(cropRect, x100, y550, w100, expectedHeight)
+    }
+
+    @Test
+    fun `handles rect completely outside bounds with adjusted coordinates`() {
+        val cropRect = Rect(x900, y700, x900 + w100, y700 + h100)
+        runUseCaseTest(cropRect, w800, h600, x0, x0)
+    }
+
+    private fun runUseCaseTest(
+        cropRect: Rect,
+        expectedLeft: Int,
+        expectedTop: Int,
+        expectedWidth: Int,
+        expectedHeight: Int
+    ) {
+        mockkStatic(Bitmap::class)
+
+        every {
+            Bitmap.createBitmap(
+                sourceBitmap,
+                expectedLeft,
+                expectedTop,
+                expectedWidth,
+                expectedHeight
+            )
+        } returns croppedBitmap
+
+        val result = useCase(sourceBitmap, cropRect)
+
+        assertThat(result).isEqualTo(croppedBitmap)
+        verify {
+            Bitmap.createBitmap(
+                sourceBitmap,
+                expectedLeft,
+                expectedTop,
+                expectedWidth,
+                expectedHeight
+            )
+        }
+        unmockkStatic(Bitmap::class)
+    }
+}
diff --git a/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCaseTest.kt b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCaseTest.kt
new file mode 100644
index 0000000000..8a73f0c77c
--- /dev/null
+++ b/infra/ui-base/src/test/java/com/simprints/infra/uibase/camera/qrscan/usecase/RotateToPortraitIfNeededUseCaseTest.kt
@@ -0,0 +1,110 @@
+package com.simprints.infra.uibase.camera.qrscan.usecase
+
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Matrix
+import androidx.test.ext.junit.runners.*
+import com.google.common.truth.Truth.*
+import io.mockk.*
+import io.mockk.impl.annotations.MockK
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+internal class RotateToPortraitIfNeededUseCaseTest {
+
+    @MockK
+    lateinit var landscapeBitmap: Bitmap
+
+    @MockK
+    lateinit var portraitBitmap: Bitmap
+
+    @MockK
+    lateinit var rotatedBitmap: Bitmap
+
+    private lateinit var useCase: RotateToPortraitIfNeededUseCase
+
+    private val w800 = 800
+    private val h600 = 600
+    private val w600 = 600
+    private val h800 = 800
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this, relaxed = true)
+
+        every { landscapeBitmap.width } returns w800
+        every { landscapeBitmap.height } returns h600
+        every { portraitBitmap.width } returns w600
+        every { portraitBitmap.height } returns h800
+
+        useCase = RotateToPortraitIfNeededUseCase()
+    }
+
+    @Test
+    fun `rotates landscape bitmap when device is in portrait orientation`() {
+        mockkStatic(Bitmap::class)
+        every {
+            Bitmap.createBitmap(
+                landscapeBitmap,
+                0,
+                0,
+                w800,
+                h600,
+                any<Matrix>(),
+                true
+            )
+        } returns rotatedBitmap
+
+        val result = useCase(landscapeBitmap, Configuration.ORIENTATION_PORTRAIT)
+
+        assertThat(result).isEqualTo(rotatedBitmap)
+        verify {
+            Bitmap.createBitmap(
+                landscapeBitmap,
+                0,
+                0,
+                w800,
+                h600,
+                any<Matrix>(),
+                true
+            )
+        }
+        unmockkStatic(Bitmap::class)
+    }
+
+    @Test
+    fun `returns original bitmap when landscape bitmap and device is in landscape orientation`() {
+        runUseCaseTest(source = landscapeBitmap, orientation = Configuration.ORIENTATION_LANDSCAPE, expected = landscapeBitmap)
+    }
+
+    @Test
+    fun `returns original bitmap when portrait bitmap and device is in portrait orientation`() {
+        runUseCaseTest(source = portraitBitmap, orientation = Configuration.ORIENTATION_PORTRAIT, expected = portraitBitmap)
+    }
+
+    @Test
+    fun `returns original bitmap when portrait bitmap and device is in landscape orientation`() {
+        runUseCaseTest(source = portraitBitmap, orientation = Configuration.ORIENTATION_LANDSCAPE, expected = portraitBitmap)
+    }
+
+    @Test
+    fun `returns original bitmap when device orientation is undefined`() {
+        runUseCaseTest(source = landscapeBitmap, orientation = Configuration.ORIENTATION_UNDEFINED, expected = landscapeBitmap)
+    }
+
+    @Test
+    fun `returns original bitmap when bitmap is square and device is in portrait orientation`() {
+        val squareBitmap = mockk<Bitmap>()
+        every { squareBitmap.width } returns w600
+        every { squareBitmap.height } returns w600
+
+        runUseCaseTest(source = squareBitmap, orientation = Configuration.ORIENTATION_PORTRAIT, expected = squareBitmap)
+    }
+
+    private fun runUseCaseTest(source: Bitmap, orientation: Int, expected: Bitmap) {
+        val result = useCase(source, orientation)
+        assertThat(result).isEqualTo(expected)
+    }
+}

From 10fa2b0d176dbe7f4e6bb12f1bb2901984b96783 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Mon, 22 Sep 2025 15:23:30 +0300
Subject: [PATCH 08/14] MFID: Adding external credentials feature to PR checks

---
 .github/workflows/pr-checks.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index c2c32e463e..54e8e0fde3 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -65,6 +65,7 @@ jobs:
                 feature:alert
                 feature:exit-form
                 feature:select-subject-age-group
+                feature:external-credential
             reportsId: feature1
 
     feature-unit-tests2:

From 836f285cbda9ab2a4edb17bc576e2b17b05c71cd Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Mon, 22 Sep 2025 19:29:46 +0300
Subject: [PATCH 09/14] [MS-1165] Excluding PermissionRequestView from test
 coverage

---
 .../main/java/com/simprints/infra/view/PermissionRequestView.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt b/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt
index 374d92b6b7..9e8c8d77e7 100644
--- a/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt
+++ b/infra/ui-base/src/main/java/com/simprints/infra/view/PermissionRequestView.kt
@@ -8,7 +8,9 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.StringRes
 import com.simprints.infra.uibase.R
+import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
 
+@ExcludedFromGeneratedTestCoverageReports("UI Code")
 class PermissionRequestView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,

From c524a789f8639a3c11ae7e7d0fe610dab7fd155e Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 24 Sep 2025 19:49:52 +0300
Subject: [PATCH 10/14] [MS-1165] Moving field into a constant

---
 .../usecase/ExternalCredentialQrCodeValidatorUseCase.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt
index c112302713..b0b6438da4 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/usecase/ExternalCredentialQrCodeValidatorUseCase.kt
@@ -3,13 +3,15 @@ package com.simprints.feature.externalcredential.screens.scanqr.usecase
 import javax.inject.Inject
 
 internal class ExternalCredentialQrCodeValidatorUseCase @Inject constructor() {
-    private val qrCodeLength = 6
-
     /**
      * Checks whether the scanned QR code value is valid to be used in the Multi-Factor ID. Currently, it uses hardcoded values.
      * In future, the validity criteria should be passed from the project configuration.
      */
     operator fun invoke(qrCodeValue: String): Boolean {
-        return qrCodeValue.length == qrCodeLength
+        return qrCodeValue.length == QR_CODE_LENGTH
+    }
+
+    companion object {
+        private const val QR_CODE_LENGTH = 6
     }
 }

From 05a5ee8b72d6f5399a9c92192ae3702f78b0ab81 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 24 Sep 2025 19:57:00 +0300
Subject: [PATCH 11/14] [MS-1165] Refactoring dialog declaration

---
 .../ExternalCredentialScanQrFragment.kt       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index 193c0996bc..45871bcbe5 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -155,23 +155,21 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
         qrCodeValue: String,
         onDismiss: () -> Unit,
     ) {
-        dismissDialog()
-        dialog = BottomSheetDialog(requireContext())
-        val view = layoutInflater.inflate(R.layout.dialog_qr_wrong_value, null)
-        val qrValueTextView = view.findViewById<TextView>(R.id.qrValue)
-        val buttonRescan = view.findViewById<Button>(R.id.buttonRescan)
-
-        qrValueTextView.text = qrCodeValue
-
-        buttonRescan.setOnClickListener { dismissDialog() }
-        dialog?.setOnDismissListener { onDismiss() }
-        dialog?.setContentView(view)
-        dialog?.setCancelable(true)
-        dialog?.show()
-        (dialog as? BottomSheetDialog)?.apply {
-            behavior.state = BottomSheetBehavior.STATE_EXPANDED
-            behavior.isDraggable = false
+        dialog = BottomSheetDialog(requireContext()).also {
+            it.setContentView(
+                layoutInflater.inflate(R.layout.dialog_qr_wrong_value, null).also { view ->
+                    val qrValueTextView = view.findViewById<TextView>(R.id.qrValue)
+                    val buttonRescan = view.findViewById<Button>(R.id.buttonRescan)
+                    qrValueTextView.text = qrCodeValue
+                    buttonRescan.setOnClickListener { dismissDialog() }
+                }
+            )
+            it.setOnDismissListener { onDismiss() }
+            it.setCancelable(true)
+            it.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            it.behavior.isDraggable = false
         }
+        dialog?.show()
     }
 
     private fun initCamera() {

From 0324b6f185289d89baf66dae8e1f004095b82a20 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 24 Sep 2025 20:00:50 +0300
Subject: [PATCH 12/14] [MS-1165] Refactoring dialog declaration

---
 .../ExternalCredentialScanQrFragment.kt       |  7 +--
 .../ExternalCredentialSelectFragment.kt       | 45 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
index 45871bcbe5..f842b52525 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/scanqr/ExternalCredentialScanQrFragment.kt
@@ -155,15 +155,16 @@ internal class ExternalCredentialScanQrFragment : Fragment(R.layout.fragment_ext
         qrCodeValue: String,
         onDismiss: () -> Unit,
     ) {
+        dismissDialog()
         dialog = BottomSheetDialog(requireContext()).also {
-            it.setContentView(
-                layoutInflater.inflate(R.layout.dialog_qr_wrong_value, null).also { view ->
+            val view = layoutInflater.inflate(R.layout.dialog_qr_wrong_value, null)
+                .also { view ->
                     val qrValueTextView = view.findViewById<TextView>(R.id.qrValue)
                     val buttonRescan = view.findViewById<Button>(R.id.buttonRescan)
                     qrValueTextView.text = qrCodeValue
                     buttonRescan.setOnClickListener { dismissDialog() }
                 }
-            )
+            it.setContentView(view)
             it.setOnDismissListener { onDismiss() }
             it.setCancelable(true)
             it.behavior.state = BottomSheetBehavior.STATE_EXPANDED
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
index c116d2a881..f93a102038 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
@@ -125,32 +125,31 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
         onCancel: () -> Unit
     ) {
         dismissDialog()
-        dialog = BottomSheetDialog(requireContext())
-        val view = layoutInflater.inflate(R.layout.dialog_skip_scan_confirm, null)
-        val bodyText = view.findViewById<TextView>(R.id.skipDialogBodyText)
-        val cancelButton = view.findViewById<Button>(R.id.buttonCancel)
-        val confirmButton = view.findViewById<Button>(R.id.buttonSkip)
-
-        bodyText.text = when (credentialTypes.size) {
-            1 -> {
-                val documentType = getString(mainViewModel.mapTypeToStringResource(credentialTypes.first()))
-                getString(IDR.string.mfid_dialog_skip_scan_body_specific).format(documentType)
-            }
-
-            else -> getString(IDR.string.mfid_dialog_skip_scan_body_generic)
+        dialog = BottomSheetDialog(requireContext()).also {
+            val view = layoutInflater.inflate(R.layout.dialog_skip_scan_confirm, null)
+                .also { view ->
+                    val bodyText = view.findViewById<TextView>(R.id.skipDialogBodyText)
+                    val cancelButton = view.findViewById<Button>(R.id.buttonCancel)
+                    val confirmButton = view.findViewById<Button>(R.id.buttonSkip)
+
+                    bodyText.text = when (credentialTypes.size) {
+                        1 -> {
+                            val documentType = getString(mainViewModel.mapTypeToStringResource(credentialTypes.first()))
+                            getString(IDR.string.mfid_dialog_skip_scan_body_specific).format(documentType)
+                        }
+
+                        else -> getString(IDR.string.mfid_dialog_skip_scan_body_generic)
+                    }
+                    confirmButton.setOnClickListener { onConfirm() }
+                    cancelButton.setOnClickListener { onCancel() }
+                }
+            it.setContentView(view)
+            it.setCancelable(true)
+            it.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            it.behavior.isDraggable = false
         }
 
-        confirmButton.setOnClickListener { onConfirm() }
-        cancelButton.setOnClickListener { onCancel() }
-
-        dialog?.setContentView(view)
-        dialog?.setCancelable(true)
         dialog?.show()
-        (dialog as? BottomSheetDialog)?.apply {
-            behavior.state = BottomSheetBehavior.STATE_EXPANDED
-            behavior.isDraggable = false
-        }
-
     }
 
     private fun startOcr() {

From 4c430a579c2af4145c4f5b18cb6aac5618ddd420 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 24 Sep 2025 20:04:51 +0300
Subject: [PATCH 13/14] [MS-1165] Refactoring string usage to be more
 language-specific

---
 .../select/view/ExternalCredentialTypeAdapter.kt      | 11 ++++++-----
 infra/resources/src/main/res/values/strings.xml       |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
index d606640409..516d5d3ba6 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
@@ -29,11 +29,12 @@ internal class ExternalCredentialTypeAdapter(
     inner class ViewHolder(private val binding: ItemDocumentBinding) : RecyclerView.ViewHolder(binding.root) {
         fun bind(credentialType: ExternalCredentialType) {
             val c = binding.root.context
-            val text = c.getString(IDR.string.mfid_action_scan_document) + " " + when (credentialType) {
-                ExternalCredentialType.NHISCard -> c.getString(IDR.string.mfid_type_nhis_card)
-                ExternalCredentialType.GhanaIdCard -> c.getString(IDR.string.mfid_type_ghana_id_card)
-                ExternalCredentialType.QRCode -> c.getString(IDR.string.mfid_type_qr_code)
-            }
+            val credentialTypeText = when (credentialType) {
+                ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
+                ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
+                ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
+            }.apply(c::getString)
+            val text = c.getString(IDR.string.mfid_scanner_selection_title_specific).format(credentialTypeText)
             val image = when (credentialType) {
                 ExternalCredentialType.NHISCard -> R.drawable.ghana_nhis_card
                 ExternalCredentialType.GhanaIdCard -> R.drawable.ghana_id_card
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 2aede09962..172480fbaa 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -488,7 +488,6 @@
     <string name="mfid_type_nhis_card">NHIS Card</string>
     <string name="mfid_type_ghana_id_card">Ghana ID Card</string>
     <string name="mfid_type_qr_code">QR Code</string>
-    <string name="mfid_action_scan_document">Scan</string>
     <string name="mfid_dialog_skip_scan_title">Skip scanning?</string>
     <string name="mfid_dialog_skip_scan_body_generic">Scanning a document is required by this project. Are you sure you want to skip this step?</string>
     <string name="mfid_dialog_skip_scan_body_specific">Scanning %1$s is required by this project. Are you sure you want to skip this step?</string>

From fe7ff4e6ed418f938f635c981114333e8ce4b7f2 Mon Sep 17 00:00:00 2001
From: alex <alexandr@simprints.com>
Date: Wed, 24 Sep 2025 21:10:21 +0300
Subject: [PATCH 14/14] [MS-1165] Refactoring string usage to use plurals

---
 .../externalcredential/ext/ResourceExt.kt     | 25 ++++++++++++++++
 .../controller/ExternalCredentialViewModel.kt |  3 +-
 .../ExternalCredentialSelectFragment.kt       | 29 +++++++++----------
 .../view/ExternalCredentialTypeAdapter.kt     |  4 +--
 .../res/layout/dialog_skip_scan_confirm.xml   |  2 +-
 .../fragment_external_credential_select.xml   |  2 +-
 .../resources/src/main/res/values/strings.xml | 16 +++++++---
 7 files changed, 56 insertions(+), 25 deletions(-)
 create mode 100644 feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt

diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt
new file mode 100644
index 0000000000..acaa6ed77f
--- /dev/null
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/ext/ResourceExt.kt
@@ -0,0 +1,25 @@
+package com.simprints.feature.externalcredential.ext
+
+import android.content.res.Resources
+import androidx.annotation.PluralsRes
+import androidx.annotation.StringRes
+import com.simprints.core.domain.externalcredential.ExternalCredentialType
+
+fun Resources.getQuantityCredentialString(
+    @PluralsRes id: Int,
+    @StringRes specificCredentialRes: Int,
+    @StringRes multipleCredentialsRes: Int,
+    credentialTypes: List<ExternalCredentialType>,
+): String {
+    val credentialsAmount = credentialTypes.size
+    val documentTypeRes = if (credentialsAmount == 1) {
+        specificCredentialRes
+    } else {
+        multipleCredentialsRes
+    }
+    return getQuantityString(
+        id,
+        credentialsAmount,
+        getString(documentTypeRes)
+    )
+}
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
index f9f7837ae1..53dea8553c 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/controller/ExternalCredentialViewModel.kt
@@ -41,9 +41,10 @@ internal class ExternalCredentialViewModel @Inject internal constructor() : View
     }
 
 
-    fun mapTypeToStringResource(type: ExternalCredentialType) = when (type) {
+    fun mapTypeToStringResource(type: ExternalCredentialType?) = when (type) {
         ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
         ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
         ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
+        null -> IDR.string.mfid_type_any_document
     }
 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
index f93a102038..c449cbc0e2 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/ExternalCredentialSelectFragment.kt
@@ -15,6 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.simprints.core.domain.externalcredential.ExternalCredentialType
 import com.simprints.feature.externalcredential.R
 import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialSelectBinding
+import com.simprints.feature.externalcredential.ext.getQuantityCredentialString
 import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
 import com.simprints.feature.externalcredential.screens.select.view.ExternalCredentialTypeAdapter
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag.ORCHESTRATION
@@ -23,7 +24,6 @@ import com.simprints.infra.uibase.navigation.navigateSafely
 import com.simprints.infra.uibase.view.applySystemBarInsets
 import com.simprints.infra.uibase.viewbinding.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
-import kotlin.getValue
 import com.simprints.infra.resources.R as IDR
 
 @AndroidEntryPoint
@@ -71,14 +71,12 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
     }
 
     private fun initViews(types: List<ExternalCredentialType>) {
-        binding.title.text = when (types.size) {
-            1 -> {
-                val documentType = getString(mainViewModel.mapTypeToStringResource(types.first()))
-                getString(IDR.string.mfid_scanner_selection_title_specific).format(documentType)
-            }
-
-            else -> getString(IDR.string.mfid_scanner_selection_title_generic)
-        }
+        binding.title.text = resources.getQuantityCredentialString(
+            id = IDR.plurals.mfid_scan_action,
+            specificCredentialRes = mainViewModel.mapTypeToStringResource(types.firstOrNull()),
+            multipleCredentialsRes = IDR.string.mfid_type_any_document,
+            credentialTypes = types,
+        )
     }
 
     private fun observeChanges() {
@@ -132,14 +130,13 @@ internal class ExternalCredentialSelectFragment : Fragment(R.layout.fragment_ext
                     val cancelButton = view.findViewById<Button>(R.id.buttonCancel)
                     val confirmButton = view.findViewById<Button>(R.id.buttonSkip)
 
-                    bodyText.text = when (credentialTypes.size) {
-                        1 -> {
-                            val documentType = getString(mainViewModel.mapTypeToStringResource(credentialTypes.first()))
-                            getString(IDR.string.mfid_dialog_skip_scan_body_specific).format(documentType)
-                        }
+                    bodyText.text = resources.getQuantityCredentialString(
+                        id = IDR.plurals.mfid_dialog_skip_scan_body,
+                        credentialTypes = credentialTypes,
+                        specificCredentialRes = mainViewModel.mapTypeToStringResource(credentialTypes.firstOrNull()),
+                        multipleCredentialsRes = IDR.string.mfid_type_any_document
+                    )
 
-                        else -> getString(IDR.string.mfid_dialog_skip_scan_body_generic)
-                    }
                     confirmButton.setOnClickListener { onConfirm() }
                     cancelButton.setOnClickListener { onCancel() }
                 }
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
index 516d5d3ba6..439ac80fb8 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/select/view/ExternalCredentialTypeAdapter.kt
@@ -33,8 +33,8 @@ internal class ExternalCredentialTypeAdapter(
                 ExternalCredentialType.NHISCard -> IDR.string.mfid_type_nhis_card
                 ExternalCredentialType.GhanaIdCard -> IDR.string.mfid_type_ghana_id_card
                 ExternalCredentialType.QRCode -> IDR.string.mfid_type_qr_code
-            }.apply(c::getString)
-            val text = c.getString(IDR.string.mfid_scanner_selection_title_specific).format(credentialTypeText)
+            }.run(c::getString)
+            val text = c.resources.getQuantityString(IDR.plurals.mfid_scan_action, 1, credentialTypeText)
             val image = when (credentialType) {
                 ExternalCredentialType.NHISCard -> R.drawable.ghana_nhis_card
                 ExternalCredentialType.GhanaIdCard -> R.drawable.ghana_id_card
diff --git a/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml b/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml
index c33cc9aba9..77ff066c46 100644
--- a/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml
+++ b/feature/external-credential/src/main/res/layout/dialog_skip_scan_confirm.xml
@@ -40,7 +40,7 @@
                 style="@style/Text.Body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:text="@string/mfid_dialog_skip_scan_body_generic" />
+                tools:text="Scanning a document is required by this project. Are you sure you want to skip this step?" />
 
 
         </LinearLayout>
diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml
index f65a71b38a..cc35c6b141 100644
--- a/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml
+++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_select.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="@dimen/padding_default"
-        tools:text="@string/mfid_scanner_selection_title_generic"
+        tools:text="Scan a document"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml
index 172480fbaa..f094958d98 100644
--- a/infra/resources/src/main/res/values/strings.xml
+++ b/infra/resources/src/main/res/values/strings.xml
@@ -482,15 +482,23 @@
     </plurals>
 
     <!-- MultiFactor Identification -->
-    <string name="mfid_scanner_selection_title_generic">Scan document</string>
-    <string name="mfid_scanner_selection_title_specific">Scan %1$s</string>
+    <plurals name="mfid_scan_action">
+        <item quantity="one">Scan %1$s</item>
+        <item quantity="other">Scan %1$s</item>
+    </plurals>
+
     <string name="mfid_scanner_selection_skip">Skip document scan</string>
     <string name="mfid_type_nhis_card">NHIS Card</string>
     <string name="mfid_type_ghana_id_card">Ghana ID Card</string>
     <string name="mfid_type_qr_code">QR Code</string>
+    <string name="mfid_type_any_document">a document</string>
     <string name="mfid_dialog_skip_scan_title">Skip scanning?</string>
-    <string name="mfid_dialog_skip_scan_body_generic">Scanning a document is required by this project. Are you sure you want to skip this step?</string>
-    <string name="mfid_dialog_skip_scan_body_specific">Scanning %1$s is required by this project. Are you sure you want to skip this step?</string>
+
+    <plurals name="mfid_dialog_skip_scan_body">
+        <item quantity="one">Scanning %1$s is required by this project. Are you sure you want to skip this step?</item>
+        <item quantity="other">Scanning %1$s is required by this project. Are you sure you want to skip this step?</item>
+    </plurals>
+
     <string name="mfid_dialog_skip_scan_confirm">Skip</string>
     <string name="mfid_qr_scan_no_qr_detected">No QR code detected</string>
     <string name="mfid_qr_scan_instructions">Place QR code in window</string>