From 07d42399e2150aaaec94c9c387b5cc6e79b12630 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 10 Feb 2026 16:47:37 +0200 Subject: [PATCH 1/2] [MS-1339] Adding 'Has number, no card (booklet)' skip reason for MFID --- .../screens/skip/ExternalCredentialSkipFragment.kt | 6 +++++- .../main/res/layout/fragment_external_credential_skip.xml | 7 +++++++ .../remote/models/ApiExternalCredentialSelectionPayload.kt | 2 ++ .../domain/models/ExternalCredentialSelectionEvent.kt | 1 + infra/resources/src/main/res/values/strings.xml | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt index e0e7675cc3..532c37b828 100644 --- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt +++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt @@ -42,6 +42,7 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede private fun initViews(credentialTypes: List) = with(binding) { mapOf( title to IDR.string.mfid_skip_title, + skipReasonHasNumberNoCard to IDR.string.mfid_skip_reason_has_number_no_card, skipReasonDoesNotHaveDocument to IDR.string.mfid_skip_reason_does_not_have, skipReasonDidNotBring to IDR.string.mfid_skip_reason_did_not_bring, skipReasonIncorrect to IDR.string.mfid_skip_reason_incorrect, @@ -67,7 +68,9 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede reasonTextInput.text.toString().isNotEmpty() } - else -> true + else -> { + true + } } buttonSkip.isEnabled = isSkipButtonEnabled } @@ -95,6 +98,7 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede } private fun viewIdToOption(checkedId: Int) = when (checkedId) { + R.id.skipReasonHasNumberNoCard -> ExternalCredentialSelectionEvent.SkipReason.HAS_NUMBER_NO_CARD R.id.skipReasonDoesNotHaveDocument -> ExternalCredentialSelectionEvent.SkipReason.DOES_NOT_HAVE_ID R.id.skipReasonDidNotBring -> ExternalCredentialSelectionEvent.SkipReason.DID_NOT_BRING_ID R.id.skipReasonIncorrect -> ExternalCredentialSelectionEvent.SkipReason.BROUGHT_INCORRECT_ID diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml index 25d8233497..8b278c83e4 100644 --- a/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml +++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml @@ -53,6 +53,13 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> + + ApiExternalCredentialSkipReason.HAS_NUMBER_NO_CARD SkipReason.DOES_NOT_HAVE_ID -> ApiExternalCredentialSkipReason.DOES_NOT_HAVE_ID SkipReason.DID_NOT_BRING_ID -> ApiExternalCredentialSkipReason.DID_NOT_BRING_ID SkipReason.BROUGHT_INCORRECT_ID -> ApiExternalCredentialSkipReason.BROUGHT_INCORRECT_ID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt index 60e0efa838..36e94be9f6 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt @@ -77,6 +77,7 @@ data class ExternalCredentialSelectionEvent( @Keep enum class SkipReason { + HAS_NUMBER_NO_CARD, DOES_NOT_HAVE_ID, DID_NOT_BRING_ID, BROUGHT_INCORRECT_ID, diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml index bdbf1ccd5d..09ed0859af 100644 --- a/infra/resources/src/main/res/values/strings.xml +++ b/infra/resources/src/main/res/values/strings.xml @@ -530,6 +530,7 @@ Add this %1$s? Why did you skip the %1$s scan? + Has number, no %1$s (Booklet) Does not have %1$s Did not bring %1$s Brought incorrect %1$s From 464b148ae9da2414948976b145ce2c1c72ea8ee4 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 16 Feb 2026 18:25:55 +0200 Subject: [PATCH 2/2] [MS-1339] Adding `HAS_NUMBER_NO_ID` credential skip reason --- .../screens/skip/ExternalCredentialSkipFragment.kt | 4 ++-- .../src/main/res/layout/fragment_external_credential_skip.xml | 2 +- .../remote/models/ApiExternalCredentialSelectionPayload.kt | 4 ++-- .../event/domain/models/ExternalCredentialSelectionEvent.kt | 2 +- infra/resources/src/main/res/values/strings.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt index 532c37b828..fe36111d32 100644 --- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt +++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt @@ -42,7 +42,7 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede private fun initViews(credentialTypes: List) = with(binding) { mapOf( title to IDR.string.mfid_skip_title, - skipReasonHasNumberNoCard to IDR.string.mfid_skip_reason_has_number_no_card, + skipReasonHasNumberNoId to IDR.string.mfid_skip_reason_has_number_no_id, skipReasonDoesNotHaveDocument to IDR.string.mfid_skip_reason_does_not_have, skipReasonDidNotBring to IDR.string.mfid_skip_reason_did_not_bring, skipReasonIncorrect to IDR.string.mfid_skip_reason_incorrect, @@ -98,7 +98,7 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede } private fun viewIdToOption(checkedId: Int) = when (checkedId) { - R.id.skipReasonHasNumberNoCard -> ExternalCredentialSelectionEvent.SkipReason.HAS_NUMBER_NO_CARD + R.id.skipReasonHasNumberNoId -> ExternalCredentialSelectionEvent.SkipReason.HAS_NUMBER_NO_ID R.id.skipReasonDoesNotHaveDocument -> ExternalCredentialSelectionEvent.SkipReason.DOES_NOT_HAVE_ID R.id.skipReasonDidNotBring -> ExternalCredentialSelectionEvent.SkipReason.DID_NOT_BRING_ID R.id.skipReasonIncorrect -> ExternalCredentialSelectionEvent.SkipReason.BROUGHT_INCORRECT_ID diff --git a/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml b/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml index 8b278c83e4..38ff3e0a18 100644 --- a/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml +++ b/feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml @@ -54,7 +54,7 @@ app:layout_constraintTop_toTopOf="parent"> ApiExternalCredentialSkipReason.HAS_NUMBER_NO_CARD + SkipReason.HAS_NUMBER_NO_ID -> ApiExternalCredentialSkipReason.HAS_NUMBER_NO_ID SkipReason.DOES_NOT_HAVE_ID -> ApiExternalCredentialSkipReason.DOES_NOT_HAVE_ID SkipReason.DID_NOT_BRING_ID -> ApiExternalCredentialSkipReason.DID_NOT_BRING_ID SkipReason.BROUGHT_INCORRECT_ID -> ApiExternalCredentialSkipReason.BROUGHT_INCORRECT_ID diff --git a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt index 36e94be9f6..a2199e41b9 100644 --- a/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt +++ b/infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt @@ -77,7 +77,7 @@ data class ExternalCredentialSelectionEvent( @Keep enum class SkipReason { - HAS_NUMBER_NO_CARD, + HAS_NUMBER_NO_ID, DOES_NOT_HAVE_ID, DID_NOT_BRING_ID, BROUGHT_INCORRECT_ID, diff --git a/infra/resources/src/main/res/values/strings.xml b/infra/resources/src/main/res/values/strings.xml index 09ed0859af..2e949b63ec 100644 --- a/infra/resources/src/main/res/values/strings.xml +++ b/infra/resources/src/main/res/values/strings.xml @@ -530,7 +530,7 @@ Add this %1$s? Why did you skip the %1$s scan? - Has number, no %1$s (Booklet) + Has number, no %1$s (Booklet) Does not have %1$s Did not bring %1$s Brought incorrect %1$s