fix: double scan minor fixes

Co-authored-by: Light2288 <davide.aliti@gmail.com> Co-authored-by: Johnny Bueti <29045904+Fehniix@users.noreply.github.com>
ministero-salute · Mar 7, 2022 · 73cf34b · 73cf34b
1 parent 27f8fac
commit 73cf34b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/DGCAVerifier/Pages/Result/VerificationViewController.swift b/DGCAVerifier/Pages/Result/VerificationViewController.swift
@@ -157,7 +157,11 @@ class VerificationViewController: UIViewController {
 
         view.backgroundColor = statusWithValidIdentity.backgroundColor
         resultImageView.image = statusWithValidIdentity.mainImage
-        titleLabel.text = statusWithValidIdentity.title.localizeWith(getTitleArguments(statusWithValidIdentity))
+        if VerificationState.shared.followUpTestScanned {
+            titleLabel.text = statusWithValidIdentity.secondScanTitle.localizeWith(getTitleArguments(statusWithValidIdentity))
+        } else {
+            titleLabel.text = statusWithValidIdentity.title.localizeWith(getTitleArguments(statusWithValidIdentity))
+        }
         descriptionLabel.text = statusWithValidIdentity.description?.localized
         descriptionLabel.sizeToFit()
         lastFetchLabel.isHidden = !statusWithValidIdentity.showLastFetch

diff --git a/DGCAVerifier/SupportingFiles/en.lproj/Localizable.strings b/DGCAVerifier/SupportingFiles/en.lproj/Localizable.strings
@@ -67,6 +67,9 @@
 "result.title.revoked.green.pass" = "Certificazione revocata";
 "result.title.need.verification" = "Certificazione valida richiesto tampone";
 
+"result.second.scan.title.valid" = "Verifica valida";
+"result.second.scan.title.not.valid" = "Verifica non valida";
+
 "result.description.valid" = "Per completare la verifica è necessario confrontare i seguenti dati anagrafici con quelli di un documento di identità valido:";
 "result.description.not.valid" = "La certificazione presenta i seguenti dati anagrafici:";
 "result.description.revoked" = "La certificazione risulta essere revocata";

diff --git a/DGCAVerifier/SupportingFiles/it.lproj/Localizable.strings b/DGCAVerifier/SupportingFiles/it.lproj/Localizable.strings
@@ -67,6 +67,9 @@
 "result.title.revoked.green.pass" = "Certificazione revocata";
 "result.title.need.verification" = "Certificazione valida richiesto tampone";
 
+"result.second.scan.title.valid" = "Verifica valida";
+"result.second.scan.title.not.valid" = "Verifica non valida";
+
 "result.description.valid" = "Per completare la verifica è necessario confrontare i seguenti dati anagrafici con quelli di un documento di identità valido:";
 "result.description.not.valid" = "La certificazione presenta i seguenti dati anagrafici:";
 "result.description.revoked" = "La certificazione risulta essere revocata";

diff --git a/DGCAVerifier/UIComponents/CustomControllers/CustomPicker/CustomPickerController.swift b/DGCAVerifier/UIComponents/CustomControllers/CustomPicker/CustomPickerController.swift
@@ -127,7 +127,10 @@ class CustomPickerController: UIViewController {
     }
 
     @IBAction func didTapConfirm(_ sender: Any) {
-        guard let selectedScanMode = self.selectedScanMode else { return }
+        guard let selectedScanMode = self.selectedScanMode else {
+            self.coordinator?.dismissCustomPicker(completion: nil)
+            return
+        }
 
         Store.set(selectedScanMode.rawValue, for: .scanMode)
         Store.set(true, for: .isScanModeSet)

diff --git a/DGCAVerifier/Utils/ModelExtensions/Status+Configuration.swift b/DGCAVerifier/Utils/ModelExtensions/Status+Configuration.swift
@@ -54,7 +54,7 @@ extension Status {
         switch self {
         case .valid:                return "result.title.valid"
         case .notValid:             return "result.title.not.valid"
-        case .expired:                return "result.title.expired"
+        case .expired:              return "result.title.expired"
         case .notValidYet:          return "result.title.not.valid.yet"
         case .notGreenPass:         return "result.title.not.green.pass"
         case .revokedGreenPass:     return "result.title.revoked.green.pass"
@@ -63,12 +63,20 @@ extension Status {
         }
     }
 
+    var secondScanTitle: String {
+        switch self {
+        case .valid:                return "result.second.scan.title.valid"
+        case .notValid:             return "result.second.scan.title.not.valid"
+        default: 					return "result.title.not.green.pass"
+        }
+    }
+
     var description: String? {
         switch self {
         case .valid:                return "result.description.valid"
         case .notValidYet:          return "result.description.not.valid"
         case .notValid:             return "result.description.not.valid"
-        case .expired:               return "result.description.not.valid"
+        case .expired:              return "result.description.not.valid"
         case .revokedGreenPass:     return "result.description.revoked"
         case .verificationIsNeeded: return "result.description.need.verification"
         default:                    return nil