Skip to content

Move GetLightingConditionsAssessmentUseCase to infra:camera #1854

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

Draft
meladRaouf wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Move GetLightingConditionsAssessmentUseCase to infra:camera #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import com.simprints.core.tools.extensions.permissionFromResult
import com.simprints.feature.externalcredential.R
import com.simprints.feature.externalcredential.databinding.FragmentExternalCredentialScanOcrBinding
import com.simprints.feature.externalcredential.screens.controller.ExternalCredentialViewModel
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessment
import com.simprints.feature.externalcredential.screens.scanocr.model.OcrConfig
import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetBoundsRelativeToParentUseCase
import com.simprints.feature.externalcredential.screens.search.model.ScannedCredentialResult
import com.simprints.infra.camera.CameraFrameProvider
import com.simprints.infra.camera.lighting.LightingConditionsAssessment
import com.simprints.infra.logging.LoggingConstants.CrashReportTag.MULTI_FACTOR_ID
import com.simprints.infra.logging.Simber
import com.simprints.infra.uibase.navigation.navigateSafely
Expand Down
6 changes: 3 additions & 3 deletions ...imprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import com.simprints.core.livedata.LiveDataEventWithContent
import com.simprints.core.livedata.send
import com.simprints.core.tools.time.TimeHelper
import com.simprints.core.tools.time.Timestamp
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessment
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessmentConfig
import com.simprints.feature.externalcredential.screens.scanocr.model.OcrConfig
import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
import com.simprints.feature.externalcredential.screens.scanocr.model.ScannedMfidDocument
import com.simprints.feature.externalcredential.screens.scanocr.usecase.BuildScannedCredentialResultUseCase
import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetLightingConditionsAssessmentConfigUseCase
import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetLightingConditionsAssessmentUseCase
import com.simprints.feature.externalcredential.screens.scanocr.usecase.ScanMfidDocumentUseCase
import com.simprints.feature.externalcredential.screens.search.model.ScannedCredentialResult
import com.simprints.infra.camera.Frame
import com.simprints.infra.camera.lighting.GetLightingConditionsAssessmentUseCase
import com.simprints.infra.camera.lighting.LightingConditionsAssessment
import com.simprints.infra.camera.lighting.LightingConditionsAssessmentConfig
import com.simprints.infra.camera.postprocess.FrameCropToTargetUseCase
import com.simprints.infra.config.store.ConfigRepository
import com.simprints.infra.config.store.models.experimental
Expand Down
10 changes: 0 additions & 10 deletions ...imprints/feature/externalcredential/screens/scanocr/model/LightingConditionsAssessment.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...xternalcredential/screens/scanocr/usecase/GetLightingConditionsAssessmentConfigUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.simprints.feature.externalcredential.screens.scanocr.usecase

import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessmentConfig
import com.simprints.infra.camera.lighting.LightingConditionsAssessmentConfig
import com.simprints.infra.config.store.ConfigRepository
import com.simprints.infra.config.store.models.ExperimentalProjectConfiguration
import com.simprints.infra.config.store.models.experimental
Expand Down
4 changes: 2 additions & 2 deletions ...ints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import com.google.common.truth.Truth.*
import com.jraska.livedata.test
import com.simprints.core.tools.time.TimeHelper
import com.simprints.core.tools.time.Timestamp
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessment
import com.simprints.feature.externalcredential.screens.scanocr.model.OcrDocumentType
import com.simprints.feature.externalcredential.screens.scanocr.model.ScannedMfidDocument
import com.simprints.feature.externalcredential.screens.scanocr.usecase.BuildScannedCredentialResultUseCase
import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetLightingConditionsAssessmentConfigUseCase
import com.simprints.feature.externalcredential.screens.scanocr.usecase.GetLightingConditionsAssessmentUseCase
import com.simprints.feature.externalcredential.screens.scanocr.usecase.ScanMfidDocumentUseCase
import com.simprints.feature.externalcredential.screens.search.model.ScannedCredentialResult
import com.simprints.infra.camera.Frame
import com.simprints.infra.camera.lighting.GetLightingConditionsAssessmentUseCase
import com.simprints.infra.camera.lighting.LightingConditionsAssessment
import com.simprints.infra.camera.postprocess.FrameCropToTargetUseCase
import com.simprints.infra.config.store.ConfigRepository
import com.simprints.infra.config.store.models.ExperimentalProjectConfiguration.Companion.MFID_LIGHTING_CONDITIONS_ASSESSMENT_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion ...nalcredential/screens/scanocr/usecase/GetLightingConditionsAssessmentConfigUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.simprints.feature.externalcredential.screens.scanocr.usecase

import com.google.common.truth.Truth.assertThat
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessmentConfig
import com.simprints.infra.camera.lighting.LightingConditionsAssessmentConfig
import com.simprints.infra.config.store.ConfigRepository
import com.simprints.infra.config.store.models.ExperimentalProjectConfiguration.Companion.MFID_LIGHTING_CONDITIONS_ASSESSMENT_ENABLED
import com.simprints.infra.config.store.models.ExperimentalProjectConfiguration.Companion.MFID_LIGHTING_CONDITIONS_ASSESSMENT_GLARE_BRIGHTNESS
Expand Down
6 changes: 2 additions & 4 deletions ...GetLightingConditionsAssessmentUseCase.kt → ...GetLightingConditionsAssessmentUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.simprints.feature.externalcredential.screens.scanocr.usecase
package com.simprints.infra.camera.lighting

import android.graphics.Bitmap
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessment
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessmentConfig
import javax.inject.Inject
import kotlin.math.ceil
import kotlin.math.roundToInt

internal class GetLightingConditionsAssessmentUseCase @Inject constructor() {
class GetLightingConditionsAssessmentUseCase @Inject constructor() {
/**
* Detects normal, too dim or too bright lighting in a bitmap of an image of a card that approximately fits the image.
*
Expand Down
10 changes: 10 additions & 0 deletions .../camera/src/main/java/com/simprints/infra/camera/lighting/LightingConditionsAssessment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.simprints.infra.camera.lighting

import com.simprints.core.ExcludedFromGeneratedTestCoverageReports

@ExcludedFromGeneratedTestCoverageReports("Enum")
enum class LightingConditionsAssessment {
NORMAL,
TOO_DIM,
TOO_BRIGHT,
}
4 changes: 2 additions & 2 deletions ...del/LightingConditionsAssessmentConfig.kt → ...ing/LightingConditionsAssessmentConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.simprints.feature.externalcredential.screens.scanocr.model
package com.simprints.infra.camera.lighting

import com.simprints.core.ExcludedFromGeneratedTestCoverageReports

@ExcludedFromGeneratedTestCoverageReports("Data struct")
internal data class LightingConditionsAssessmentConfig(
data class LightingConditionsAssessmentConfig(
val isEnabled: Boolean,
val borderWidthPercent: Int,
val lowContrastThresholdPercent: Int,
Expand Down
4 changes: 1 addition & 3 deletions ...ightingConditionsAssessmentUseCaseTest.kt → ...ightingConditionsAssessmentUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.simprints.feature.externalcredential.screens.scanocr.usecase
package com.simprints.infra.camera.lighting

import android.graphics.Bitmap
import android.graphics.Color
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessment
import com.simprints.feature.externalcredential.screens.scanocr.model.LightingConditionsAssessmentConfig
import io.mockk.every
import io.mockk.mockk
import org.junit.Before
Expand Down
Loading