Skip to content

Commit d94de31

Browse files
alexandr-simprintsmeladRaouf
authored andcommitted
[MS-1339] MFID: add HAS_NUMBER_NO_ID skip reason (#1592)
* [MS-1339] Adding 'Has number, no card (booklet)' skip reason for MFID * [MS-1339] Adding `HAS_NUMBER_NO_ID` credential skip reason (cherry picked from commit cefefb6)
1 parent 112e626 commit d94de31

5 files changed

Lines changed: 16 additions & 1 deletion

File tree

feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede
4242
private fun initViews(credentialTypes: List<ExternalCredentialType>) = with(binding) {
4343
mapOf(
4444
title to IDR.string.mfid_skip_title,
45+
skipReasonHasNumberNoId to IDR.string.mfid_skip_reason_has_number_no_id,
4546
skipReasonDoesNotHaveDocument to IDR.string.mfid_skip_reason_does_not_have,
4647
skipReasonDidNotBring to IDR.string.mfid_skip_reason_did_not_bring,
4748
skipReasonIncorrect to IDR.string.mfid_skip_reason_incorrect,
@@ -67,7 +68,9 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede
6768
reasonTextInput.text.toString().isNotEmpty()
6869
}
6970

70-
else -> true
71+
else -> {
72+
true
73+
}
7174
}
7275
buttonSkip.isEnabled = isSkipButtonEnabled
7376
}
@@ -95,6 +98,7 @@ class ExternalCredentialSkipFragment : Fragment(R.layout.fragment_external_crede
9598
}
9699

97100
private fun viewIdToOption(checkedId: Int) = when (checkedId) {
101+
R.id.skipReasonHasNumberNoId -> ExternalCredentialSelectionEvent.SkipReason.HAS_NUMBER_NO_ID
98102
R.id.skipReasonDoesNotHaveDocument -> ExternalCredentialSelectionEvent.SkipReason.DOES_NOT_HAVE_ID
99103
R.id.skipReasonDidNotBring -> ExternalCredentialSelectionEvent.SkipReason.DID_NOT_BRING_ID
100104
R.id.skipReasonIncorrect -> ExternalCredentialSelectionEvent.SkipReason.BROUGHT_INCORRECT_ID

feature/external-credential/src/main/res/layout/fragment_external_credential_skip.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@
5353
app:layout_constraintStart_toStartOf="parent"
5454
app:layout_constraintTop_toTopOf="parent">
5555

56+
<com.google.android.material.radiobutton.MaterialRadioButton
57+
android:id="@+id/skipReasonHasNumberNoId"
58+
style="@style/Widget.Simprints.RadioButton"
59+
android:layout_width="match_parent"
60+
android:layout_height="wrap_content"
61+
tools:text="Has number, no document (Booklet)" />
62+
5663
<com.google.android.material.radiobutton.MaterialRadioButton
5764
android:id="@+id/skipReasonDoesNotHaveDocument"
5865
style="@style/Widget.Simprints.RadioButton"

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiExternalCredentialSelectionPayload.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ internal data class ApiExternalCredentialSelectionPayload(
3131
@Keep
3232
@Serializable
3333
enum class ApiExternalCredentialSkipReason {
34+
HAS_NUMBER_NO_ID,
3435
DOES_NOT_HAVE_ID,
3536
DID_NOT_BRING_ID,
3637
BROUGHT_INCORRECT_ID,
@@ -44,6 +45,7 @@ internal data class ApiExternalCredentialSelectionPayload(
4445
}
4546

4647
internal fun SkipReason.toApiExternalCredentialSkipReason(): ApiExternalCredentialSkipReason = when (this) {
48+
SkipReason.HAS_NUMBER_NO_ID -> ApiExternalCredentialSkipReason.HAS_NUMBER_NO_ID
4749
SkipReason.DOES_NOT_HAVE_ID -> ApiExternalCredentialSkipReason.DOES_NOT_HAVE_ID
4850
SkipReason.DID_NOT_BRING_ID -> ApiExternalCredentialSkipReason.DID_NOT_BRING_ID
4951
SkipReason.BROUGHT_INCORRECT_ID -> ApiExternalCredentialSkipReason.BROUGHT_INCORRECT_ID

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/ExternalCredentialSelectionEvent.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ data class ExternalCredentialSelectionEvent(
8484
@Keep
8585
@Serializable
8686
enum class SkipReason {
87+
HAS_NUMBER_NO_ID,
8788
DOES_NOT_HAVE_ID,
8889
DID_NOT_BRING_ID,
8990
BROUGHT_INCORRECT_ID,

infra/resources/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@
530530

531531
<string name="mfid_add_document_title">Add this %1$s?</string>
532532
<string name="mfid_skip_title">Why did you skip the %1$s scan?</string>
533+
<string name="mfid_skip_reason_has_number_no_id">Has number, no %1$s (Booklet)</string>
533534
<string name="mfid_skip_reason_does_not_have">Does not have %1$s</string>
534535
<string name="mfid_skip_reason_did_not_bring">Did not bring %1$s</string>
535536
<string name="mfid_skip_reason_incorrect">Brought incorrect %1$s</string>

0 commit comments

Comments
 (0)