Skip to content

MS-1493 Fame provider cleanup #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luhmirin-s merged 2 commits into from
Aug 11, 2026
Merged

MS-1493 Fame provider cleanup #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b1aed
MS-1493 Delete now unused camera helpers from ui-base
luhmirin-s Aug 6, 2026
5a32afa
SM-1493 Move camera-related custom views to the infra module
luhmirin-s Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import com.simprints.feature.externalcredential.screens.search.model.ScannedCred
import com.simprints.infra.camera.CameraFrameProvider
import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
import com.simprints.infra.logging.Simber
import com.simprints.infra.uibase.camera.qrscan.CameraFocusManager
import com.simprints.infra.uibase.navigation.navigateSafely
import com.simprints.infra.uibase.view.applySystemBarInsets
import com.simprints.infra.uibase.view.awaitLayout
Expand Down Expand Up @@ -93,9 +92,6 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
@Inject
lateinit var viewModelFactory: ExternalCredentialScanOcrViewModel.Factory

@Inject
lateinit var cameraFocusManagerFactory: CameraFocusManager.Factory

@Inject
@DispatcherBG
lateinit var bgDispatcher: CoroutineDispatcher
Expand Down
8 changes: 4 additions & 4 deletions ...re/external-credential/src/main/res/layout-land/fragment_external_credential_scan_ocr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:scaleType="fitCenter"
tools:background="@tools:sample/backgrounds/scenic" />

<com.simprints.infra.view.imagecapture.CaptureMaskView
<com.simprints.infra.camera.view.CaptureMaskView
android:id="@+id/viewfinderMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -38,7 +38,7 @@
tools:text="Place document code in window"
tools:visibility="visible" />

<com.simprints.infra.view.imagecapture.CaptureTargetView
<com.simprints.infra.camera.view.CaptureTargetView
android:id="@+id/documentScannerArea"
android:layout_width="0dp"
android:layout_height="0dp"
Expand All @@ -55,7 +55,7 @@
app:strokeWidth="4dp"
tools:visibility="visible" />

<com.simprints.infra.view.imagecapture.CaptureProgressView
<com.simprints.infra.camera.view.CaptureProgressView
android:id="@+id/captureProgress"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down Expand Up @@ -119,7 +119,7 @@

</LinearLayout>

<com.simprints.infra.view.PermissionRequestView
<com.simprints.infra.camera.view.PermissionRequestView
android:id="@+id/permissionRequestView"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
6 changes: 3 additions & 3 deletions ...ure/external-credential/src/main/res/layout-land/fragment_external_credential_scan_qr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="match_parent"
tools:visibility="gone" />

<com.simprints.infra.view.imagecapture.CaptureMaskView
<com.simprints.infra.camera.view.CaptureMaskView
android:id="@+id/viewfinderMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -33,7 +33,7 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="Place QR code in window" />

<com.simprints.infra.view.imagecapture.CaptureTargetView
<com.simprints.infra.camera.view.CaptureTargetView
android:id="@+id/qrScannerArea"
android:layout_width="0dp"
android:layout_height="0dp"
Expand Down Expand Up @@ -86,7 +86,7 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="No QR code detected" />

<com.simprints.infra.view.PermissionRequestView
<com.simprints.infra.camera.view.PermissionRequestView
android:id="@+id/permissionRequestView"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
24 changes: 12 additions & 12 deletions ...nal-credential/src/main/res/layout-sw600dp-land/fragment_external_credential_scan_ocr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:scaleType="fitCenter"
tools:background="@tools:sample/backgrounds/scenic" />

<com.simprints.infra.view.imagecapture.CaptureMaskView
<com.simprints.infra.camera.view.CaptureMaskView
android:id="@+id/viewfinderMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -30,14 +30,14 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding_default"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/documentScannerArea"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Place document code in window"
tools:visibility="visible" />

<com.simprints.infra.view.imagecapture.CaptureTargetView
<com.simprints.infra.camera.view.CaptureTargetView
android:id="@+id/documentScannerArea"
android:layout_width="0dp"
android:layout_height="0dp"
Expand All @@ -54,7 +54,7 @@
app:strokeWidth="4dp"
tools:visibility="visible" />

<com.simprints.infra.view.imagecapture.CaptureProgressView
<com.simprints.infra.camera.view.CaptureProgressView
android:id="@+id/captureProgress"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -71,11 +71,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/progressContainer"
android:paddingHorizontal="@dimen/padding_default"
android:paddingVertical="4dp"
app:layout_constraintBottom_toTopOf="@+id/progressContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="Image is too bright"
tools:textColor="@color/simprints_text_white" />

Expand All @@ -86,9 +86,9 @@
android:orientation="vertical"
android:padding="@dimen/padding_default"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
tools:visibility="visible">

<FrameLayout
Expand All @@ -99,11 +99,11 @@
android:id="@+id/iconScanComplete"
android:layout_width="36dp"
android:layout_height="36dp"
android:alpha="0"
tools:alpha="1"
android:layout_gravity="center"
android:alpha="0"
android:importantForAccessibility="no"
android:src="@drawable/ic_checked_green_large"/>
android:src="@drawable/ic_checked_green_large"
tools:alpha="1" />
</FrameLayout>

<TextView
Expand All @@ -117,7 +117,7 @@

</LinearLayout>

<com.simprints.infra.view.PermissionRequestView
<com.simprints.infra.camera.view.PermissionRequestView
android:id="@+id/permissionRequestView"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
6 changes: 3 additions & 3 deletions ...rnal-credential/src/main/res/layout-sw600dp-land/fragment_external_credential_scan_qr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="match_parent"
tools:visibility="gone" />

<com.simprints.infra.view.imagecapture.CaptureMaskView
<com.simprints.infra.camera.view.CaptureMaskView
android:id="@+id/viewfinderMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -33,7 +33,7 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="Place QR code in window" />

<com.simprints.infra.view.imagecapture.CaptureTargetView
<com.simprints.infra.camera.view.CaptureTargetView
android:id="@+id/qrScannerArea"
android:layout_width="0dp"
android:layout_height="0dp"
Expand Down Expand Up @@ -85,7 +85,7 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="No QR code detected" />

<com.simprints.infra.view.PermissionRequestView
<com.simprints.infra.camera.view.PermissionRequestView
android:id="@+id/permissionRequestView"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
20 changes: 10 additions & 10 deletions feature/external-credential/src/main/res/layout/fragment_external_credential_scan_ocr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:scaleType="fitCenter"
tools:background="@tools:sample/backgrounds/scenic" />

<com.simprints.infra.view.imagecapture.CaptureMaskView
<com.simprints.infra.camera.view.CaptureMaskView
android:id="@+id/viewfinderMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -23,7 +23,7 @@
app:targetViewId="@+id/documentScannerArea"
tools:visibility="visible" />

<com.simprints.infra.view.imagecapture.CaptureTargetView
<com.simprints.infra.camera.view.CaptureTargetView
android:id="@+id/documentScannerArea"
android:layout_width="0dp"
android:layout_height="0dp"
Expand All @@ -40,7 +40,7 @@
app:strokeWidth="4dp"
tools:visibility="visible" />

<com.simprints.infra.view.imagecapture.CaptureProgressView
<com.simprints.infra.camera.view.CaptureProgressView
android:id="@+id/captureProgress"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down Expand Up @@ -70,11 +70,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingHorizontal="@dimen/padding_default"
android:paddingVertical="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/documentScannerArea"
android:paddingHorizontal="@dimen/padding_default"
android:paddingVertical="4dp"
tools:text="Image is too bright"
tools:textColor="@color/simprints_text_white" />

Expand All @@ -83,8 +83,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/padding_default"
android:paddingHorizontal="@dimen/padding_default"
android:paddingBottom="@dimen/padding_default"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -99,11 +99,11 @@
android:id="@+id/iconScanComplete"
android:layout_width="36dp"
android:layout_height="36dp"
android:alpha="0"
tools:alpha="1"
android:layout_gravity="center"
android:alpha="0"
android:importantForAccessibility="no"
android:src="@drawable/ic_checked_green_large"/>
android:src="@drawable/ic_checked_green_large"
tools:alpha="1" />
</FrameLayout>

<TextView
Expand All @@ -117,7 +117,7 @@

</LinearLayout>

<com.simprints.infra.view.PermissionRequestView
<com.simprints.infra.camera.view.PermissionRequestView
android:id="@+id/permissionRequestView"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
6 changes: 3 additions & 3 deletions feature/external-credential/src/main/res/layout/fragment_external_credential_scan_qr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="match_parent"
tools:visibility="gone" />

<com.simprints.infra.view.imagecapture.CaptureMaskView
<com.simprints.infra.camera.view.CaptureMaskView
android:id="@+id/viewfinderMask"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

<com.simprints.infra.view.imagecapture.CaptureTargetView
<com.simprints.infra.camera.view.CaptureTargetView
android:id="@+id/qrScannerArea"
android:layout_width="0dp"
android:layout_height="0dp"
Expand Down Expand Up @@ -86,7 +86,7 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="No QR code detected" />

<com.simprints.infra.view.PermissionRequestView
<com.simprints.infra.camera.view.PermissionRequestView
android:id="@+id/permissionRequestView"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
8 changes: 7 additions & 1 deletion infra/camera/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ plugins {

android {
namespace = "com.simprints.infra.camera"

viewBinding.enable = true
}

dependencies {
implementation(libs.support.material)
implementation(libs.androidX.cameraX.core)
implementation(libs.androidX.cameraX.lifecycle)
implementation(libs.androidX.cameraX.view)

// Exported so that dependant modules have access to PreviewView
api(libs.androidX.cameraX.view)

implementation(libs.playServices.barcode)
}
6 changes: 3 additions & 3 deletions ...nfra/view/imagecapture/CaptureMaskView.kt → ...ints/infra/camera/view/CaptureMaskView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.infra.view.imagecapture
package com.simprints.infra.camera.view

import android.content.Context
import android.graphics.Canvas
Expand All @@ -11,8 +11,8 @@ import android.util.AttributeSet
import android.view.View
import androidx.annotation.ColorInt
import androidx.core.content.ContextCompat
import com.simprints.infra.uibase.R
import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
import com.simprints.infra.camera.R
import com.simprints.infra.resources.R as IDR

@ExcludedFromGeneratedTestCoverageReports("UI Code")
Expand Down
6 changes: 3 additions & 3 deletions .../view/imagecapture/CaptureProgressView.kt → .../infra/camera/view/CaptureProgressView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.infra.view.imagecapture
package com.simprints.infra.camera.view

import android.animation.Animator
import android.animation.AnimatorListenerAdapter
Expand All @@ -18,9 +18,9 @@ import android.view.View
import android.view.animation.LinearInterpolator
import androidx.annotation.ColorInt
import androidx.core.os.BundleCompat
import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
import com.simprints.core.tools.extensions.dpToPx
import com.simprints.infra.uibase.R
import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
import com.simprints.infra.camera.R

@ExcludedFromGeneratedTestCoverageReports("UI Code")
class CaptureProgressView @JvmOverloads constructor(
Expand Down
6 changes: 3 additions & 3 deletions ...ra/view/imagecapture/CaptureTargetView.kt → ...ts/infra/camera/view/CaptureTargetView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.infra.view.imagecapture
package com.simprints.infra.camera.view

import android.content.Context
import android.graphics.Canvas
Expand All @@ -12,9 +12,9 @@ import android.util.AttributeSet
import android.view.View
import androidx.annotation.ColorInt
import androidx.core.os.BundleCompat
import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
import com.simprints.core.tools.extensions.dpToPx
import com.simprints.infra.uibase.R
import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
import com.simprints.infra.camera.R

@ExcludedFromGeneratedTestCoverageReports("UI Code")
class CaptureTargetView @JvmOverloads constructor(
Expand Down
Loading
Loading