Merge remote-tracking branch 'origin/develop' into release/2.3.1

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 name: build
 
 env:
- XCODE_VERSION: 'Xcode_12.4'
+ XCODE_VERSION: 'Xcode_13.2.1'
 
 on:
  push:

.github/workflows/distribute.yml

@@ -1,7 +1,7 @@
 name: appstore
 
 env:
- XCODE_VERSION: 'Xcode_12.4'
+ XCODE_VERSION: 'Xcode_13.2.1'
 
 on:
  push:

DP3TApp/Screens/Homescreen/EncountersDetail/NSTracingSettingsControl.swift

@@ -77,6 +77,7 @@ class NSTracingSettingsControl: UIView {
  titleLabel.text = "tracing_setting_title".ub_localized
  subtitleLabel.text = "tracing_setting_text_ios".ub_localized_per_version
  switchControl.onTintColor = .ns_blue
+ switchControl.accessibilityLabel = "tracing_setting_text_ios".ub_localized_per_version
 
  setup()
  setupAccessibility()

DP3TApp/Screens/Navigation/NSNavigationController.swift

@@ -41,6 +41,7 @@ class NSNavigationController: UINavigationController {
  // MARK: - Setup
 
  private func setup() {
+ view.backgroundColor = .ns_background
  navigationBar.isTranslucent = false
 
  if useLine {

DP3TApp/Screens/Navigation/NSTabBarController.swift

@@ -47,6 +47,8 @@ class NSTabBarController: UITabBarController {
 
  navigationItem.title = "app_name".ub_localized
 
+ view.backgroundColor = .ns_background
+
  // navigation bar
  let image = UIImage(named: "ic-info-outline")
  navigationItem.rightBarButtonItem = UIBarButtonItem(image: image, landscapeImagePhone: image, style: .plain, target: self, action: #selector(infoButtonPressed))
@@ -95,6 +97,9 @@ class NSTabBarController: UITabBarController {
  setTabBarItemColors(appearance.inlineLayoutAppearance)
  setTabBarItemColors(appearance.compactInlineLayoutAppearance)
  tabBar.standardAppearance = appearance
+ if #available(iOS 15.0, *) {
+ tabBar.scrollEdgeAppearance = appearance
+ }
  } else {
  tabBar.unselectedItemTintColor = .ns_tabbarNormalBlue
  tabBar.tintColor = .ns_tabbarSelectedBlue

DP3TApp/Screens/Onboarding/NSOnboardingBaseViewController.swift

@@ -181,7 +181,7 @@ class NSOnboardingBaseViewController: NSViewController {
  internal func finishAnimation() {
  let vcToHide = stepViewControllers[currentStep]
 
- vcToHide.fadeAnimation(fromFactor: 0, toFactor: -1, delay: 0.0) { _ -> Void in
+ vcToHide.fadeAnimation(fromFactor: 0, toFactor: -1, delay: 0.0) { _ in
  self.completedOnboarding()
  self.dismiss(animated: true, completion: nil)
  }

DP3TApp/Screens/Reports/Exposed/NSReportsDetailExposedCheckInViewController.swift

@@ -156,6 +156,7 @@ class NSReportsDetailExposedCheckInViewController: NSTitleViewScrollViewControll
  view.addSpacerView(2 * NSPadding.small)
 
  let textLabel = NSLabel(.textLight)
+ textLabel.isHtmlContent = true
  textLabel.text = text
  view.addArrangedView(textLabel)
  }

DP3TApp/Screens/Reports/Exposed/NSReportsDetailExposedEncountersViewController.swift

@@ -297,6 +297,7 @@ class NSReportsDetailExposedEncountersViewController: NSTitleViewScrollViewContr
  titleLabel.accessibilityTraits = [.header]
 
  let textLabel = NSLabel(.textLight)
+ textLabel.isHtmlContent = true
  textLabel.text = text
  view.addArrangedView(textLabel)
  }

DP3TApp/SharedUI/Style/NSLabelType.swift

@@ -24,9 +24,7 @@ class NSFontSize {
  return min(max(minimum, bfs), maximum)
  }
 
- public static let fontSizeMultiplicator: CGFloat = {
- max(1.0, bodyFontSize() / normalBodyFontSize)
- }()
+ public static let fontSizeMultiplicator: CGFloat = max(1.0, bodyFontSize() / normalBodyFontSize)
 }
 
 public enum NSLabelType: UBLabelType {

DP3TApp/SharedUI/Views/NSDatePickerBottomSheetViewController.swift

@@ -210,7 +210,7 @@ private class InteractiveModalPresentationController: UIPresentationController {
  return
  }
 
- coordinator.animate(alongsideTransition: { [weak self] _ -> Void in
+ coordinator.animate(alongsideTransition: { [weak self] _ in
  guard let self = self else { return }
  view.sheetView.transform = .init(translationX: 0, y: view.sheetView.frame.height)
  self.dimmingView.alpha = 0

Translations/bs.lproj/Localizable.strings

@@ -624,7 +624,7 @@
 "symptom_faq1_title" = "Koji su simptomi COVID-19?";
 
 /*Symptome: FAQ Text*/
-"symptom_faq1_text" = "Ovi simptomi se često javljaju:\n\n– temperatura, osećaj groznice\n– bolovi u grlu\n– kašalj (najčešće suv)\n– kratak dah\n– bolovi u grudima\n– iznenadni gubitak čula mirisa i/ili ukusa\n\nOsim toga, mogući su sledeći simptomi:\n\n– glavobolja\n– opšta slabost, malaksalost\n– bolovi u mišićima\n– kijavica\n– simptomi gastrointestinalnog trakta (mučnina, povraćanje, proliv, bolovi u stomaku)\n– osipi na koži";
+"symptom_faq1_text" = "Novi virus korone često može pokazati različite simptome bolesti. Najčešći simptomi su:\n\n– bol u grlu\n– kašalj (uglavnom suv)\n– kratak dah\n– bol u grudima\n– temperatura\n– iznenadni gubitak čula mirisa i/ili ukusa\n– glavobolja\n– opšta slabost, malaksalost\n– bolovi u mišićima\n– kijavica\n– simptomi gastrointestinalnog trakta (mučnina, povraćanje, proliv, bolovi u stomaku)\n– osipi na koži\n\nImajte na umu sledeće: Simptomi bolesti su različite jačine i mogu varati u zavisnost od varijante virusa. Mogu biti i blagi. I samo kijavica može značiti da ste zaraženi.";
 
 /*Meldungen: Positiv getestet FAQ Titel*/
 "meldungen_positive_tested_faq1_title" = "Zbog čega je praćenje deaktivirano?";
@@ -1643,9 +1643,9 @@
 "checkin_report_title1" = "Zaštititi kontakte";
 "checkin_report_title2" = "Obratiti pažnju na simptome";
 "checkin_report_title3" = "Vršiti testiranje";
-"checkin_report_subtitle1" = "Mogli biste biti zarazni, a da to ne primetite. Pridržavajte se važećih higijenskih i zaštitnih mera i zaštitite svoju porodicu, prijatelje i okolinu.";
+"checkin_report_subtitle1" = "Mogli ste da se zarazite, a da ne primetite. Obratite pažnju na sledeće mere opreza:\n\n- nositi masku do 7 dana posle kontakta)\n\n- ograničiti kontakte\n\n- držati razmak (najmanje 1,5 metar)\n\n- izbegavati javne zatvorene prostore";
 "checkin_report_subtitle2" = "Proveravajte svoje zdravsveno stanje.";
-"checkin_report_subtitle3" = "Odmah se testirajte ako imate simptome. Čak i ako nema simptoma i niste u potpunosti vakcinisani, test korone je važan i preporučuje se.";
+"checkin_report_subtitle3" = "U slučaju pojave <b>simptoma odmah se testirati</b> – i ako ste vakcinisati (uključ. dopunske vakcine) ili ste preležali koronu. Čak i ako imate samo blage simptome, testiranje je korisno i preporučljivo.<br/><br/><b>Testirajte se</b>, i ako <b>nemate simptome</b>. Možete biti zaraženi i kada nemate simptome. Test u tom slučaju treba uraditi nekoliko dana (4–7) posle rizičnog kontakta. U tom vremenu se najčešće može otkriti zaraza.";
 
 /*Titel von CheckIn Meldungen Screen.*/
 "meldung_detail_checkin_title" = "Prijava";
@@ -1799,7 +1799,7 @@
 "vaccination_booking_info_text" = "Vakcinacija se može održati na primer na sledećim mestima u Vašoj blizini:\n\n- u specifičnim centrima za vakcinaciju\n- u bolnicama\n- kod Vašeg ličnog lekara ili lekarke\n- u vakcinišućim apotekama\n\nMnoga mesta nude i vakcinaciju bez zakazanog termina";
 
 /*vaccination booking info screen info box at bottom*/
-"vaccination_booking_info_info" = "Vakcina za Covid-19 preporučena je osobama starijim od 12 godina. Vakcinacija je besplatna.";
+"vaccination_booking_info_info" = "Vakcina za Covid-19 preporučena je osobama starijim od 5 godina.";
 
 /*url for booking an appointment for vaccination for canton ag*/
 "vaccination_booking_ag_url" = "https://www.ag.ch/coronavirus-impfung";

Translations/de.lproj/Localizable.strings

@@ -637,7 +637,7 @@
 "symptom_faq1_title" = "Was sind COVID-19-Symptome?";
 
 /*Symptome: FAQ Text*/
-"symptom_faq1_text" = "Diese Symptome treten häufig auf:\n\n– Fieber, Fiebergefühl\n– Halsschmerzen\n– Husten (meist trocken)\n– Kurzatmigkeit\n– Brustschmerzen\n– Plötzlicher Verlust des Geruchs- und/oder Geschmackssinns\n\nZudem sind folgende Symptome möglich:\n\n– Kopfschmerzen\n– Allgemeine Schwäche, Unwohlsein\n– Muskelschmerzen\n– Schnupfen\n– Magen-Darm-Symptome (Übelkeit, Erbrechen, Durchfall, Bauchschmerzen)\n– Hautausschläge";
+"symptom_faq1_text" = "Das neue Coronavirus kann sehr unterschiedliche Krankheitssymptome zeigen.\nDie häufigsten Symptome sind:\n\n– Halsschmerzen\n– Husten (meist trocken)\n– Kurzatmigkeit\n– Brustschmerzen\n– Fieber\n– Plötzlicher Verlust des Geruchs- und/oder Geschmackssinns\n– Kopfschmerzen\n– Allgemeine Schwäche, Unwohlsein\n– Muskelschmerzen\n– Schnupfen\n– Magen-Darm-Symptome (Übelkeit, Erbrechen, Durchfall, Bauchschmerzen)\n– Hautausschläge\n\nBeachten Sie: Die Krankheitssymptome sind unterschiedlich stark und können je nach Virusvariante variieren. Sie können auch leicht sein. Bereits ein Schnupfen kann eine Infektion bedeuten.";
 
 /*Meldungen: Positiv getestet FAQ Titel*/
 "meldungen_positive_tested_faq1_title" = "Warum ist das Tracing deaktiviert?";
@@ -1719,9 +1719,9 @@
 "checkin_report_title1" = "Kontakte schützen";
 "checkin_report_title2" = "Auf Symptome achten";
 "checkin_report_title3" = "Testen lassen";
-"checkin_report_subtitle1" = "Sie könnten bereits ansteckend sein, ohne es zu merken. Beachten Sie die geltenden Hygiene- und Schutzmassnahmen und schützen Sie Ihre Familie, Ihre Freunde und Ihr Umfeld.";
+"checkin_report_subtitle1" = "Sie könnten sich angesteckt haben, ohne es zu merken. Beachten Sie folgende Vorsichtsmassnahmen:\n\n- Maske tragen (bis 7 Tagen nach Kontakt)\n\n- Kontakte einschränken\n\n- Abstand halten (mind. 1,5 Meter)\n\n- öffentliche Räume meiden";
 "checkin_report_subtitle2" = "Überwachen Sie Ihren Gesundheitszustand.";
-"checkin_report_subtitle3" = "Lassen Sie sich beim Auftreten von Symptomen sofort testen. Wenn keine Symptome auftreten und Sie noch nicht vollständig geimpft sind, ist ein Corona-Test ebenfalls sinnvoll und empfohlen.";
+"checkin_report_subtitle3" = "Lassen Sie sich beim Auftreten von <b>Symptomen sofort testen</b> – auch wenn Sie geimpft (inkl. Auffrischimpfungen) oder genesen sind. Selbst wenn Sie nur leichte Symptome haben, ist ein Test sinnvoll und empfohlen.<br/><br/>Lassen Sie sich <b>auch testen</b>, wenn Sie <b>keine Symptome</b> haben. Sie könnten sich angesteckt haben, aber symptomlos sein. Ein Test sollte in diesem Fall erst einige Tage (4–7) nach dem Risiko-Kontakt stattfinden. Dann kann eine symptomlose Ansteckung am ehesten entdeckt werden.";
 
 /*Titel von CheckIn Meldungen Screen.*/
 /*Fuzzy*/
@@ -1882,7 +1882,7 @@
 "vaccination_booking_info_text" = "Eine Impfung könnte zum Beispiel an diesen Orten in Ihrer Nähe stattfinden:\n\n- in spezifischen Impfzentren\n- in Spitälern\n- bei Ihrem Hausarzt oder Ihrer Hausärztin\n- in Impfapotheken\n\nViele Orte bieten auch Walk-in-Impfungen ohne Termine an.";
 
 /*vaccination booking info screen info box at bottom*/
-"vaccination_booking_info_info" = "Die Covid-19-Impfung ist für Personen ab 12 Jahren empfohlen. Die Impfung ist gratis.";
+"vaccination_booking_info_info" = "Die Covid-19-Impfung ist für Personen ab 5 Jahren empfohlen.";
 
 /*url for booking an appointment for vaccination for canton ag*/
 "vaccination_booking_ag_url" = "https://www.ag.ch/coronavirus-impfung";

Translations/en.lproj/Localizable.strings

@@ -629,7 +629,7 @@
 "symptom_faq1_title" = "What are the symptoms of COVID-19?";
 
 /*Symptome: FAQ Text*/
-"symptom_faq1_text" = "These are the most common symptoms of COVID-19:\n\n– Fever, feverish feeling \n– Sore throat\n– Cough (mostly dry)\n– Shortness of breath\n– Body aches\n– Sudden loss of the sense of taste and/or smell\n\nOther symptoms may include:\n\n– Headache\n– General weakness, feeling unwell\n– Aching muscles\n– Head cold\n– Gastrointestinal symptoms (nausea, vomiting, diarrhoea, stomach ache)\n– Skin rash";
+"symptom_faq1_text" = "The new coronavirus can show many different symptoms. The most common symptoms are:\n\n– Sore throat\n– Cough (mostly dry)\n– Shortness of breath\n– Chest pain\n– High temperature\n– Sudden loss of sense of smell and/or taste\n– Headache\n– General weakness, feeling unwell\n– Aching muscles\n– Head cold\n– Gastrointestinal symptoms (nausea, vomiting, diarrhoea, stomach ache)\n– Skin rash\n\nNote: The symptoms of the disease vary in severity and can vary depending on the variant. They may also be mild. Even a head cold may mean an infection.";
 
 /*Meldungen: Positiv getestet FAQ Titel*/
 "meldungen_positive_tested_faq1_title" = "Why is tracing deactivated?";
@@ -1671,9 +1671,9 @@
 "checkin_report_title1" = "Protect your contacts";
 "checkin_report_title2" = "Look out for symptoms";
 "checkin_report_title3" = "Get tested";
-"checkin_report_subtitle1" = "You may already be infectious without realising it. Follow the rules on hygiene and social distancing and protect your loved ones and those around you.";
+"checkin_report_subtitle1" = "You might have been infected without noticing. Take these precautions:\n\n- Wear a mask (until 7 days after contact)\n\n- Limit your contacts\n\n- Social distance (min. 1.5 metres)\n\n- Avoid public places";
 "checkin_report_subtitle2" = "Monitor your state of health.";
-"checkin_report_subtitle3" = "If you develop symptoms, get tested immediately. A coronavirus test is also advisable and recommended if you have no symptoms and are not yet fully vaccinated.";
+"checkin_report_subtitle3" = "If <b>symptoms appear, get tested immediately</b> – even if you’ve been vaccinated or have recovered from COVID. A test makes sense and is recommended even if you only have slight symptoms.<br/><br/>Also <b>get tested</b> if you have <b>no symptoms</b>. You could have been infected but be symptom free. In this case you should not get tested until a few (4–7) days after the risky contact. That’s when a symptom-free infection is most likely to be detected.";
 
 /*Titel von CheckIn Meldungen Screen.*/
 "meldung_detail_checkin_title" = "Check-in";
@@ -1827,7 +1827,7 @@
 "vaccination_booking_info_text" = "Vaccination may be performed at the following locations near you:\n\n- at specific vaccination centres\n- in hospitals\n- at your general practitioner's surgery\n- at a vaccination pharmacy\n\nMany places also offer walk-in vaccinations without an appointment.";
 
 /*vaccination booking info screen info box at bottom*/
-"vaccination_booking_info_info" = "The COVID-19 vaccination is recommended for those over 12. It's free of charge.";
+"vaccination_booking_info_info" = "The COVID-19 vaccination is recommended for those over 5.";
 
 /*url for booking an appointment for vaccination for canton ag*/
 "vaccination_booking_ag_url" = "https://www.ag.ch/coronavirus-impfung";

Translations/es.lproj/Localizable.strings

@@ -624,7 +624,7 @@
 "symptom_faq1_title" = "¿Cuáles son los síntomas de COVID-19?";
 
 /*Symptome: FAQ Text*/
-"symptom_faq1_text" = "Los síntomas siguientes aparecen con frecuencia:\n\n– fiebre, sensación febril\n– dolor de garganta\n– tos (casi siempre seca)\n– dificultad respiratoria\n– dolor en el pecho\n– pérdida repentina del sentido del gusto y/o del olfato \nPueden aparecer también los síntomas siguientes:\n\n– dolor de cabeza\n– debilidad general, malestar\n– dolores musculares\n– catarro\n– síntomas gastrointestinales (nauseas, vómitos, diarrea, dolor de estómago)\n– erupciones cutáneas";
+"symptom_faq1_text" = "El nuevo coronavirus puede causar síntomas de enfermedad muy diversos. Los síntomas mas frecuentes son:\n\n– dolor de garganta\n– tos (casi siempre seca)\n– dificultad respiratoria\n– dolor en el pecho\n– fiebre\n– pérdida repentina del sentido del gusto y/o del olfato \n– dolor de cabeza\n– debilidad general, malestar\n– dolores musculares\n– catarro\n– síntomas gastrointestinales (nauseas, vómitos, diarrea, dolor de estómago)\n– erupciones cutáneas\n\nTenga en cuenta: Los síntomas pueden ser más o menos graves y variar en función de la variante del virus. Es posible que sean muy leves. Incluso un catarro puede significar un contagio.";
 
 /*Meldungen: Positiv getestet FAQ Titel*/
 "meldungen_positive_tested_faq1_title" = "¿Por qué está desactivado el rastreo?";
@@ -1643,9 +1643,9 @@
 "checkin_report_title1" = "Proteger a sus contactos";
 "checkin_report_title2" = "Estar atento a los síntomas";
 "checkin_report_title3" = "Hacer el test";
-"checkin_report_subtitle1" = "Es posible que sea usted contagioso sin darse cuenta. Observe las reglas de higiene y comportamiento y proteja a su familia, sus amigos y su entorno.";
+"checkin_report_subtitle1" = "Es posible que se haya contagiado sin darse cuenta. Observe las siguientes medidas de precaución:\n\n- llevar mascarilla (hasta 7 días tras el contacto)\n\n- limitar los contactos\n\n- mantener la distancia ( 1,5 metros como mín.)\n\n- evitar los espacios públicos";
 "checkin_report_subtitle2" = "Vigile su estado de salud.";
-"checkin_report_subtitle3" = "Ante la aparición de síntomas haga el test inmediatamente. Incluso si no tiene síntomas y aún no está vacunado por completo, es conveniente y recomendable hacer el test del coronavirus.";
+"checkin_report_subtitle3" = "Haga inmediatamente el test si aparecen <b>síntomas</b> – también si está vacunado (incl. vacunas de refuerzo) o si se ha recuperado. Hacer el test es apropiado y recomendable incluso si los síntomas son leves.<br/><br/>Haga también <b>el test</b> si no tiene<b>síntomas</b>. Puede usted haberse contagiado pero ser asintomático. En este caso, el test debería realizarse trascurridos algunos días (4-7) tras el contacto de riesgo. A partir de ese momento, la probabilidad de detectar un contagio asintomático es mayor.";
 
 /*Titel von CheckIn Meldungen Screen.*/
 "meldung_detail_checkin_title" = "Check-in";
@@ -1799,7 +1799,7 @@
 "vaccination_booking_info_text" = "Es posible vacunarse, por ejemplo, en los siguientes puntos cerca de usted:\n\n- en centros de vacunación específicos\n- en hospitales\n- en la consulta de su médico de familia\n- en farmacias que ofrecen la vacunación\n\nMuchos centros ofrecen la posibllidad de vacunarse sin cita previa.";
 
 /*vaccination booking info screen info box at bottom*/
-"vaccination_booking_info_info" = "Se recomienda la vacuna contra la Covid-19 a las personas mayores de 12 años. La vacuna es gratuita.";
+"vaccination_booking_info_info" = "Se recomienda la vacuna contra la Covid-19 a las personas mayores de 5 años.";
 
 /*url for booking an appointment for vaccination for canton ag*/
 "vaccination_booking_ag_url" = "https://www.ag.ch/coronavirus-impfung";