Skip to content

Commit

Permalink
feat: implement work scan mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicola-95
nicola-95 authored Feb 9, 2022
1 parent c93f2c9 commit ad8e1a8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
22 changes: 15 additions & 7 deletions app/src/main/java/it/ministerodellasalute/verificaC19/ui/FirstActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class FirstActivity : AppCompatActivity(), View.OnClickListener,
}
}

private fun setScanModeButtonText(currentScanMode: String) {
private fun setScanModeButtonText(currentScanMode: ScanMode) {
if (!viewModel.getScanModeFlag()) {
val s = SpannableStringBuilder()
.bold { append(getString(R.string.label_choose_scan_mode)) }
Expand All @@ -252,22 +252,21 @@ class FirstActivity : AppCompatActivity(), View.OnClickListener,
var chosenScanMode =
when (currentScanMode) {
ScanMode.STANDARD -> getString(R.string.scan_mode_3G_header)
ScanMode.STRENGTHENED -> getString(
R.string.scan_mode_2G_header
)
ScanMode.STRENGTHENED -> getString(R.string.scan_mode_2G_header)
ScanMode.BOOSTER -> getString(R.string.scan_mode_booster_header)
ScanMode.SCHOOL -> getString(R.string.scan_mode_school_header)
ScanMode.WORK -> getString(R.string.scan_mode_work_header)

else -> getString(R.string.scan_mode_3G_header)
}
chosenScanMode += "\n"
val chosenModeDescription =
when (currentScanMode) {
ScanMode.STANDARD -> getString(R.string.label_scan_mode_3G)
ScanMode.STRENGTHENED -> getString(
R.string.label_scan_mode_2G
)
ScanMode.STRENGTHENED -> getString(R.string.label_scan_mode_2G)
ScanMode.BOOSTER -> getString(R.string.label_scan_mode_booster)
ScanMode.SCHOOL -> getString(R.string.label_scan_mode_school)
ScanMode.WORK -> getString(R.string.scan_mode_work)
else -> getString(R.string.label_scan_mode_3G)
}
val s = SpannableStringBuilder()
Expand Down Expand Up @@ -461,6 +460,7 @@ class FirstActivity : AppCompatActivity(), View.OnClickListener,
ScanMode.STRENGTHENED -> 1
ScanMode.BOOSTER -> 2
ScanMode.SCHOOL -> 3
ScanMode.WORK -> 4
else -> 0
}
val scanModeChoices = arrayOf(
Expand Down Expand Up @@ -491,6 +491,13 @@ class FirstActivity : AppCompatActivity(), View.OnClickListener,
Locale.ROOT
),
getString(R.string.label_scan_mode_school)
),
getString(
R.string.label_alert_dialog_option,
getString(R.string.scan_mode_work_header).substringAfter(' ').toUpperCase(
Locale.ROOT
),
getString(R.string.scan_mode_work)
)
)

Expand All @@ -502,6 +509,7 @@ class FirstActivity : AppCompatActivity(), View.OnClickListener,
1 -> viewModel.setScanMode(ScanMode.STRENGTHENED)
2 -> viewModel.setScanMode(ScanMode.BOOSTER)
3 -> viewModel.setScanMode(ScanMode.SCHOOL)
4 -> viewModel.setScanMode(ScanMode.WORK)
}
dialog.dismiss()
}
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/it/ministerodellasalute/verificaC19/ui/main/verification/VerificationFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ class VerificationFragment : Fragment(), View.OnClickListener {
.toUpperCase(Locale.ROOT)
ScanMode.SCHOOL -> getString(R.string.scan_mode_school_header).substringAfter(' ')
.toUpperCase(Locale.ROOT)
else -> ""
ScanMode.WORK -> getString(R.string.scan_mode_work_header).substringAfter(' ')
.toUpperCase(Locale.ROOT)
}
val scanModeLabel = getString(R.string.label_scan_mode_ver)
binding.scanModeText.text =
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,21 @@
<string name="scan_mode_2G_header">Verifica Rafforzata</string>
<string name="scan_mode_booster_header">Verifica Visitatori RSA</string>
<string name="scan_mode_school_header">Verifica Studenti</string>
<string name="scan_mode_work_header">Verifica Lavoro</string>

<string name="label_scan_mode_3G">Vaccinazione/Guarigione/Tampone</string>
<string name="label_scan_mode_2G">Vaccinazione/Guarigione</string>
<string name="label_scan_mode_booster">Richiamo/ciclo completo+tampone/guarigione+tampone</string>
<string name="label_scan_mode_school">Richiamo/ciclo completo e guarigione &lt;120gg</string>
<string name="scan_mode_work">Test/Test</string>

<string name="label_choose_scan_mode">Scegli tipologia di verifica</string>
<string name="label_no_scan_mode_chosen">Per procedere alla scansione selezionare una delle tipologie di verifica della Certificazione verde Covid-19: BASE, RAFFORZATA, VISITATORI RSA, STUDENTI. \n
\nTipologia BASE: la app considera valide le certificazioni verdi generate da vaccinazione, da guarigione, da tampone. \n
\nTipologia RAFFORZATA: la app considera valide solo le certificazioni verdi generate da vaccinazione o da guarigione. \n
\nTipologia VISITATORI RSA: da utilizzare per l\'accesso di visitatori alle strutture residenziali, socio-assistenziali, socio-sanitarie e hospice: la app considera valide le certificazioni verdi generate da vaccinazione con dose di richiamo. Considera valide, inoltre, le certificazioni verdi generate da vaccinazione con ciclo primario completato o guarigione insieme alla contestuale presentazione di un documento, cartaceo o digitale, che attesti l’esito negativo di un test al SARS-CoV-2. \n
\nTipologia STUDENTI: da utilizzare nelle classi della scuola secondaria per la didattica in presenza in presenza di due casi positivi: la app considera valide le certificazioni verdi generate da vaccinazione con dose di richiamo e quelle con ciclo primario o guarigione, se emesse da meno di 120 giorni. \n
\nTipologia LAVORO: da utilizzare nei luoghi di lavoro. \n
\nConsulta la tabella sulle attività consentite senza o con green pass ( link https://www.governo.it/sites/governo.it/files/documenti/documenti/Notizie-allegati/tabella_attivita_consentite.pdf )</string>
<string name="label_alert_dialog_option">%1$s (%2$s)</string>
<string name="label_verification_scan_mode">%1$s: %2$s</string>
Expand Down

0 comments on commit ad8e1a8

Please sign in to comment.