From 9f08e7ee5fce5324d182d29bd9cfa40c722cd17b Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 27 Apr 2021 12:12:06 +0200
Subject: [PATCH 001/207] build checks on branch feature/v2

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c47ef47fd..f85ac0b82 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -2,9 +2,9 @@ name: Android Check Build
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop, feature/v2 ]
   pull_request:
-    branches: [ master, develop ]
+    branches: [ master, develop, feature/v2 ]
 
 jobs:
   build:

From 4f88095641840dbab50fe4bb8c55372f8461f916 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 27 Apr 2021 11:54:33 +0200
Subject: [PATCH 002/207] setup checkin main screen

---
 .../dp3t/checkin/CheckinOverviewFragment.java | 32 ++++++
 .../ch/admin/bag/dp3t/home/HomeFragment.java  | 32 +++++-
 app/src/main/res/layout/card_checkin.xml      | 49 ++++++++++
 .../res/layout/fragment_checkin_overview.xml  | 98 +++++++++++++++++++
 app/src/main/res/layout/fragment_home.xml     |  6 ++
 5 files changed, 212 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
 create mode 100644 app/src/main/res/layout/card_checkin.xml
 create mode 100644 app/src/main/res/layout/fragment_checkin_overview.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
new file mode 100644
index 000000000..c4ed451a0
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
@@ -0,0 +1,32 @@
+package ch.admin.bag.dp3t.checkin;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import ch.admin.bag.dp3t.R;
+
+public class CheckinOverviewFragment extends Fragment {
+
+	public static CheckinOverviewFragment newInstance() {
+		return new CheckinOverviewFragment();
+	}
+
+	public CheckinOverviewFragment() { super(R.layout.fragment_checkin_overview); }
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		view.findViewById(R.id.checkin_overview_scan_qr).setOnClickListener(
+				v -> {
+					// TODO
+				});
+
+		view.findViewById(R.id.checkin_overview_history).setOnClickListener(
+				v -> {
+					// TODO
+				});
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index be6cf9748..49ac2848b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -43,6 +43,7 @@
 
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment;
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
 import ch.admin.bag.dp3t.home.model.NotificationState;
 import ch.admin.bag.dp3t.home.model.NotificationStateError;
@@ -77,6 +78,7 @@ public class HomeFragment extends Fragment {
 	private View reportStatusView;
 	private View reportErrorView;
 	private View travelCard;
+	private View checkinCard;
 	private View cardSymptomsFrame;
 	private View cardTestFrame;
 	private View cardSymptoms;
@@ -116,6 +118,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		reportStatusView = reportStatusBubble.findViewById(R.id.report_status);
 		reportErrorView = reportStatusBubble.findViewById(R.id.report_errors);
 		travelCard = view.findViewById(R.id.card_travel);
+		checkinCard = view.findViewById(R.id.card_checkin);
 		headerView = view.findViewById(R.id.home_header_view);
 		scrollView = view.findViewById(R.id.home_scroll_view);
 		cardSymptoms = view.findViewById(R.id.card_what_to_do_symptoms);
@@ -128,6 +131,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		setupInfobox();
 		setupTracingView();
 		setupNotification();
+		setupCheckinCard();
 		setupTravelCard();
 		setupWhatToDo();
 		setupNonProductionHint();
@@ -247,7 +251,7 @@ private void setupTracingView() {
 	}
 
 	private void showContactsFragment() {
-		getActivity().getSupportFragmentManager().beginTransaction()
+		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 				.replace(R.id.main_fragment_container, ContactsFragment.newInstance())
 				.addToBackStack(ContactsFragment.class.getCanonicalName())
@@ -255,7 +259,7 @@ private void showContactsFragment() {
 	}
 
 	private void showReportsFragment() {
-		getActivity().getSupportFragmentManager().beginTransaction()
+		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 				.replace(R.id.main_fragment_container, ReportsFragment.newInstance())
 				.addToBackStack(ReportsFragment.class.getCanonicalName())
@@ -355,9 +359,27 @@ private boolean isNotificationChannelEnabled(Context context, @Nullable String c
 		}
 	}
 
+	private void setupCheckinCard() {
+		checkinCard.setOnClickListener(
+				v -> requireActivity().getSupportFragmentManager().beginTransaction()
+						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+						.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
+						.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
+						.commit()
+		);
+
+		checkinCard.findViewById(R.id.checkin_scan).setOnClickListener(
+				v -> requireActivity().getSupportFragmentManager().beginTransaction()
+						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+						.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
+						.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
+						.commit()
+		);
+	}
+
 	private void setupTravelCard() {
 		travelCard.setOnClickListener(
-				v -> getActivity().getSupportFragmentManager().beginTransaction()
+				v -> requireActivity().getSupportFragmentManager().beginTransaction()
 						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 						.replace(R.id.main_fragment_container, TravelFragment.newInstance())
 						.addToBackStack(TravelFragment.class.getCanonicalName())
@@ -376,13 +398,13 @@ private void setupTravelCard() {
 
 	private void setupWhatToDo() {
 		cardSymptoms.setOnClickListener(
-				v -> getActivity().getSupportFragmentManager().beginTransaction()
+				v -> requireActivity().getSupportFragmentManager().beginTransaction()
 						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 						.replace(R.id.main_fragment_container, WtdSymptomsFragment.newInstance())
 						.addToBackStack(WtdSymptomsFragment.class.getCanonicalName())
 						.commit());
 		cardTest.setOnClickListener(
-				v -> getActivity().getSupportFragmentManager().beginTransaction()
+				v -> requireActivity().getSupportFragmentManager().beginTransaction()
 						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 						.replace(R.id.main_fragment_container, WtdPositiveTestFragment.newInstance())
 						.addToBackStack(WtdPositiveTestFragment.class.getCanonicalName())
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
new file mode 100644
index 000000000..3c568fcf2
--- /dev/null
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/NextStep.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<LinearLayout
+		android:id="@+id/card_checkin"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:foreground="?selectableItemBackground"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/checkin_header"
+			android:layout_width="match_parent"
+			android:layout_marginTop="5dp"
+			android:paddingBottom="5dp"
+			android:layout_height="match_parent"
+			android:gravity="center_vertical"
+			android:orientation="horizontal">
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium"
+				android:layout_weight="1"
+				android:text="[TBT] Checkin" />
+
+			<ImageView
+				android:layout_width="@dimen/chevron_size_title"
+				android:layout_height="@dimen/chevron_size_title"
+				android:layout_marginEnd="@dimen/spacing_small"
+				android:src="@drawable/ic_chevron_right"
+				android:tint="@color/dark_main" />
+
+		</LinearLayout>
+
+		<Button
+			android:id="@+id/checkin_scan"
+			android:text="[TBT] scan qr"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content" />
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
new file mode 100644
index 000000000..dd381d3b6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/grey_light"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/travel_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back"
+		app:title="[TBT] Checkins" />
+
+	<ScrollView
+		android:id="@+id/travel_scroll_view"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="@color/grey_light">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingTop="@dimen/spacing_medium_large">
+
+			<androidx.cardview.widget.CardView
+				android:id="@+id/checkin_overview_scan_qr"
+				style="@style/NextStep.Card"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium_large"
+				android:layout_marginEnd="@dimen/spacing_medium_large"
+				android:layout_marginBottom="@dimen/spacing_medium_large">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<TextView
+						style="@style/NextStep.Text.Title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/spacing_large"
+						android:layout_marginTop="@dimen/spacing_medium_large"
+						android:layout_marginRight="@dimen/spacing_large"
+						android:layout_marginBottom="@dimen/spacing_medium"
+						android:text="[TBT] scan qr" />
+
+				</LinearLayout>
+
+			</androidx.cardview.widget.CardView>
+
+			<androidx.cardview.widget.CardView
+				android:id="@+id/checkin_overview_history"
+				style="@style/NextStep.Card"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium_large"
+				android:layout_marginEnd="@dimen/spacing_medium_large"
+				android:layout_marginBottom="@dimen/spacing_medium_large">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<TextView
+						style="@style/NextStep.Text.Title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/spacing_large"
+						android:layout_marginTop="@dimen/spacing_medium_large"
+						android:layout_marginRight="@dimen/spacing_large"
+						android:layout_marginBottom="@dimen/spacing_medium"
+						android:text="[TBT] history" />
+
+				</LinearLayout>
+
+			</androidx.cardview.widget.CardView>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 6ff944d93..3fd3debde 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -50,6 +50,12 @@
 					android:visibility="gone"
 					tools:visibility="visible" />
 
+				<include
+					layout="@layout/card_checkin"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/spacing_medium_large" />
+
 				<include
 					layout="@layout/card_contacts"
 					android:layout_width="match_parent"

From da50fe3d2470cc12db495b1d1470d710739ec1ce Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 27 Apr 2021 11:59:28 +0200
Subject: [PATCH 003/207] Include CrowdNotifier Logic (without any Views or
 Fragments)

---
 app/build.gradle                              |  33 +++
 app/src/main/AndroidManifest.xml              |  11 +
 .../CrowdNotifierKeyLoadWorker.java           |  81 +++++++
 .../dp3t/networking/TraceKeysRepository.java  |  99 ++++++++
 .../networking/models/TraceKeysService.java   |  15 ++
 .../dp3t/startup/BootCompletedReceiver.java   |  41 ++++
 .../admin/bag/dp3t/storage/DiaryStorage.java  | 124 ++++++++++
 .../admin/bag/dp3t/storage/SecureStorage.java |  20 ++
 .../bag/dp3t/storage/model/DiaryEntry.java    |  52 ++++
 .../util/CrowdNotifierReminderHelper.java     | 128 ++++++++++
 .../bag/dp3t/util/NotificationHelper.java     | 175 ++++++++++++++
 .../util/NotificationQuickActionReceiver.java |  21 ++
 .../ch/admin/bag/dp3t/util/StringUtil.java    |  15 ++
 .../bag/dp3t/util/VenueInfoExtensions.java    |  67 ++++++
 .../viewmodel/CrowdNotifierViewModel.java     | 196 ++++++++++++++++
 .../dp3t/viewmodel/model/CheckInState.java    |  57 +++++
 .../model/CrowdNotifierErrorState.java        |  49 ++++
 .../dp3t/viewmodel/model/ReminderOption.java  |  49 ++++
 app/src/main/proto/Proto.proto                |  50 ++++
 app/src/main/res/drawable/ic_cam_off.xml      |  10 +
 app/src/main/res/drawable/ic_error.xml        |  18 ++
 .../main/res/drawable/ic_illus_caffeteria.xml |  10 +
 .../main/res/drawable/ic_illus_canteen.xml    |  14 ++
 .../res/drawable/ic_illus_checked_in_time.xml | 222 ++++++++++++++++++
 app/src/main/res/drawable/ic_illus_gym.xml    |  14 ++
 .../res/drawable/ic_illus_kitchen_area.xml    |  10 +
 .../res/drawable/ic_illus_lecture_room.xml    |  10 +
 .../main/res/drawable/ic_illus_library.xml    |  10 +
 .../main/res/drawable/ic_illus_meeting.xml    |  10 +
 .../res/drawable/ic_illus_office_space.xml    |  10 +
 app/src/main/res/drawable/ic_illus_other.xml  |  10 +
 .../res/drawable/ic_illus_private_event.xml   |  10 +
 app/src/main/res/drawable/ic_illus_shop.xml   |  10 +
 .../main/res/drawable/ic_notification_off.xml |  10 +
 app/src/main/res/drawable/ic_snooze.xml       |   5 +
 app/src/main/res/values/strings.xml           |  67 ++++++
 build.gradle                                  |   8 +
 37 files changed, 1741 insertions(+)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java
 create mode 100644 app/src/main/proto/Proto.proto
 create mode 100644 app/src/main/res/drawable/ic_cam_off.xml
 create mode 100644 app/src/main/res/drawable/ic_error.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_caffeteria.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_canteen.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_checked_in_time.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_gym.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_kitchen_area.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_lecture_room.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_library.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_meeting.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_office_space.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_other.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_private_event.xml
 create mode 100644 app/src/main/res/drawable/ic_illus_shop.xml
 create mode 100644 app/src/main/res/drawable/ic_notification_off.xml
 create mode 100644 app/src/main/res/drawable/ic_snooze.xml

diff --git a/app/build.gradle b/app/build.gradle
index 310e45ffb..41ce00c72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,8 @@ plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
 	id 'org.sonarqube' version '2.8'
+	id 'com.google.protobuf'
+
 }
 
 apply from: 'backend_certs.gradle'
@@ -68,6 +70,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.dev'
@@ -79,6 +82,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-t.bfs.admin.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.test.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.test'
@@ -90,6 +94,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.abnahme'
@@ -101,6 +106,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 		}
@@ -111,6 +117,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 		}
@@ -142,6 +149,27 @@ android {
 	kotlinOptions {
 		jvmTarget = "1.8"
 	}
+
+	protobuf {
+		protoc {
+			artifact = 'com.google.protobuf:protoc:3.0.0'
+		}
+		plugins {
+			javalite {
+				artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+			}
+		}
+		generateProtoTasks {
+			all().each { task ->
+				task.builtins {
+					remove java
+				}
+				task.plugins {
+					javalite {}
+				}
+			}
+		}
+	}
 }
 
 
@@ -156,6 +184,7 @@ sonarqube {
 
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+	implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
 	def dp3t_sdk_version = '2.1.0-dev-4'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
@@ -164,6 +193,9 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:3.0-dev-56'
+
+
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 	implementation 'androidx.fragment:fragment:1.3.2'
@@ -179,6 +211,7 @@ dependencies {
 
 	implementation 'com.google.android.material:material:1.2.1'
 	implementation 'com.google.android.gms:play-services-base:17.5.0'
+	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
 
 	implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 	implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1a0acd78f..366e0b4d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,8 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+	<uses-permission android:name="android.permission.CAMERA" />
 
 	<application
 		android:name="ch.admin.bag.dp3t.MainApplication"
@@ -72,6 +74,15 @@
 
 		<receiver android:name=".util.ReminderHelper" />
 
+		<receiver android:name=".util.CrowdNotifierReminderHelper" />
+
+		<receiver android:name=".util.NotificationQuickActionReceiver" />
+
+		<receiver android:name=".startup.BootCompletedReceiver">
+			<intent-filter>
+				<action android:name="android.intent.action.BOOT_COMPLETED" />
+			</intent-filter>
+		</receiver>
 	</application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java
new file mode 100644
index 000000000..310975e4b
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java
@@ -0,0 +1,81 @@
+package ch.admin.bag.dp3t.networking;
+
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.work.*;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+import org.crowdnotifier.android.sdk.model.ExposureEvent;
+import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
+
+import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.storage.DiaryStorage;
+import ch.admin.bag.dp3t.storage.SecureStorage;
+import ch.admin.bag.dp3t.util.NotificationHelper;
+
+import static ch.admin.bag.dp3t.util.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
+
+
+public class CrowdNotifierKeyLoadWorker extends Worker {
+
+	public static final String ACTION_NEW_EXPOSURE_NOTIFICATION = BuildConfig.APPLICATION_ID + ".ACTION_NEW_EXPOSURE_NOTIFICATION";
+	private static final String WORK_TAG = "ch.ubique.notifyme.app.network.KeyLoadWorker";
+	private static final int DAYS_TO_KEEP_VENUE_VISITS = 14;
+	private static final int REPEAT_INTERVAL_MINUTES = 120;
+	private static final String LOG_TAG = "KeyLoadWorker";
+
+
+	public static void startKeyLoadWorker(Context context) {
+		Constraints constraints = new Constraints.Builder()
+				.setRequiredNetworkType(NetworkType.CONNECTED)
+				.build();
+
+		PeriodicWorkRequest periodicWorkRequest =
+				new PeriodicWorkRequest.Builder(CrowdNotifierKeyLoadWorker.class, REPEAT_INTERVAL_MINUTES, TimeUnit.MINUTES)
+						.setConstraints(constraints)
+						.build();
+
+		WorkManager workManager = WorkManager.getInstance(context);
+		workManager.enqueueUniquePeriodicWork(WORK_TAG, ExistingPeriodicWorkPolicy.KEEP, periodicWorkRequest);
+	}
+
+
+	public CrowdNotifierKeyLoadWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+		super(context, workerParams);
+	}
+
+	@NonNull
+	@Override
+	public Result doWork() {
+		Log.d(LOG_TAG, "Started KeyLoadWorker");
+		List<ProblematicEventInfo> problematicEventInfos = new TraceKeysRepository(getApplicationContext()).loadTraceKeys();
+		if (problematicEventInfos == null) {
+			Log.d(LOG_TAG, "KeyLoadWorker failure");
+			return Result.retry();
+		}
+		List<ExposureEvent> exposures = CrowdNotifier.checkForMatches(problematicEventInfos, getApplicationContext());
+		if (!exposures.isEmpty()) {
+			for (ExposureEvent exposureEvent : exposures) {
+				NotificationHelper.getInstance(getApplicationContext()).showExposureNotification(exposureEvent.getId());
+			}
+			LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(new Intent(ACTION_NEW_EXPOSURE_NOTIFICATION));
+		}
+		cleanUpOldData(getApplicationContext());
+		autoCheckoutIfNecessary(getApplicationContext(), SecureStorage.getInstance(getApplicationContext()).getCheckInState());
+
+		Log.d(LOG_TAG, "KeyLoadWorker success");
+		return Result.success();
+	}
+
+	public static void cleanUpOldData(Context context) {
+		CrowdNotifier.cleanUpOldData(context, DAYS_TO_KEEP_VENUE_VISITS);
+		DiaryStorage.getInstance(context).removeEntriesBefore(DAYS_TO_KEEP_VENUE_VISITS);
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java
new file mode 100644
index 000000000..1d00e581e
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java
@@ -0,0 +1,99 @@
+package ch.admin.bag.dp3t.networking;
+
+import android.content.Context;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
+import org.dpppt.android.sdk.DP3T;
+import org.dpppt.android.sdk.backend.UserAgentInterceptor;
+
+import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.networking.models.Proto;
+import ch.admin.bag.dp3t.networking.models.TraceKeysService;
+import ch.admin.bag.dp3t.storage.SecureStorage;
+import okhttp3.OkHttpClient;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+
+public class TraceKeysRepository {
+
+	private static final String KEY_BUNDLE_TAG_HEADER = "x-key-bundle-tag";
+
+	private TraceKeysService traceKeysService;
+	private SecureStorage storage;
+
+	public TraceKeysRepository(Context context) {
+
+		storage = SecureStorage.getInstance(context);
+		String baseUrl = BuildConfig.PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL;
+
+		OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder();
+		okHttpBuilder.networkInterceptors().add(new UserAgentInterceptor(DP3T.getUserAgent()));
+
+		Retrofit bucketRetrofit = new Retrofit.Builder()
+				.baseUrl(baseUrl)
+				.client(okHttpBuilder.build())
+				.build();
+
+		traceKeysService = bucketRetrofit.create(TraceKeysService.class);
+	}
+
+	public void loadTraceKeysAsync(Callback callback) {
+		traceKeysService.getTraceKeys(storage.getCrowdNotifierLastKeyBundleTag()).enqueue(new retrofit2.Callback<ResponseBody>() {
+			@Override
+			public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+				if (response.isSuccessful()) {
+					callback.onTraceKeysLoaded(handleSuccessfulResponse(response));
+				} else {
+					callback.onTraceKeysLoaded(null);
+				}
+			}
+
+			@Override
+			public void onFailure(Call<ResponseBody> call, Throwable t) {
+				callback.onTraceKeysLoaded(null);
+			}
+		});
+	}
+
+	public List<ProblematicEventInfo> loadTraceKeys() {
+		try {
+			Response<ResponseBody> response = traceKeysService.getTraceKeys(storage.getCrowdNotifierLastKeyBundleTag()).execute();
+			if (response.isSuccessful()) {
+				return handleSuccessfulResponse(response);
+			}
+		} catch (IOException e) {
+			return null;
+		}
+		return null;
+	}
+
+	private List<ProblematicEventInfo> handleSuccessfulResponse(Response<ResponseBody> response) {
+		try {
+			long keyBundleTag = Long.parseLong(response.headers().get(KEY_BUNDLE_TAG_HEADER));
+			storage.setCrowdNotifierLastKeyBundleTag(keyBundleTag);
+			Proto.ProblematicEventWrapper problematicEventWrapper =
+					Proto.ProblematicEventWrapper.parseFrom(response.body().byteStream());
+			ArrayList<ProblematicEventInfo> problematicEventInfos = new ArrayList<>();
+			for (Proto.ProblematicEvent event : problematicEventWrapper.getEventsList()) {
+				problematicEventInfos.add(new ProblematicEventInfo(event.getIdentity().toByteArray(),
+						event.getSecretKeyForIdentity().toByteArray(), event.getStartTime(), event.getEndTime(),
+						event.getEncryptedAssociatedData().toByteArray(), event.getCipherTextNonce().toByteArray()));
+			}
+			return problematicEventInfos;
+		} catch (IOException e) {
+			return null;
+		}
+	}
+
+	public interface Callback {
+		void onTraceKeysLoaded(List<ProblematicEventInfo> traceKeys);
+
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java
new file mode 100644
index 000000000..b7d2f657d
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java
@@ -0,0 +1,15 @@
+package ch.admin.bag.dp3t.networking.models;
+
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Headers;
+import retrofit2.http.Query;
+
+public interface TraceKeysService {
+
+	@Headers("Accept: application/x-protobuf")
+	@GET("v3/traceKeys")
+	Call<ResponseBody> getTraceKeys(@Query("lastKeyBundleTag") long lastKeyBundleTag);
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java b/app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java
new file mode 100644
index 000000000..312ea98b0
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java
@@ -0,0 +1,41 @@
+package ch.admin.bag.dp3t.startup;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import ch.admin.bag.dp3t.storage.SecureStorage;
+import ch.admin.bag.dp3t.util.CrowdNotifierReminderHelper;
+import ch.admin.bag.dp3t.util.NotificationHelper;
+import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
+
+public class BootCompletedReceiver extends BroadcastReceiver {
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		if (!Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+			return;
+		}
+
+		invalidateCheckIn(context);
+	}
+
+	private void invalidateCheckIn(Context context) {
+		SecureStorage storage = SecureStorage.getInstance(context);
+		CheckInState checkInState = storage.getCheckInState();
+		if (checkInState == null) {
+			return;
+		}
+
+		boolean checkedOut = CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
+
+		if (!checkedOut) {
+			long checkInTime = checkInState.getCheckInTime();
+			NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, checkInState.getVenueInfo());
+			CrowdNotifierReminderHelper.set8HourReminder(checkInTime, context);
+			CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, context);
+			CrowdNotifierReminderHelper.setReminder(checkInTime + checkInState.getSelectedTimerOption().getDelayMillis(), context);
+		}
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java
new file mode 100644
index 000000000..823b98e76
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java
@@ -0,0 +1,124 @@
+package ch.admin.bag.dp3t.storage;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import androidx.security.crypto.EncryptedSharedPreferences;
+import androidx.security.crypto.MasterKeys;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+
+import org.crowdnotifier.android.sdk.model.DayDate;
+
+import ch.admin.bag.dp3t.storage.model.DiaryEntry;
+
+public class DiaryStorage {
+
+	private static final String KEY_DIARY_STORE = "KEY_DIARY_STORE";
+	private static final String KEY_DIARY_ENTRIES_V3 = "KEY_DIARY_ENTRIES_V3";
+	private static final Type EXPOSURE_LIST_V3_TYPE = new TypeToken<ArrayList<DiaryEntry>>() { }.getType();
+
+
+	private static DiaryStorage instance;
+
+	private SharedPreferences sharedPreferences;
+	private final Gson gson = new Gson();
+
+	private DiaryStorage(Context context) {
+		try {
+			String KEY_ALIAS = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC);
+			sharedPreferences = EncryptedSharedPreferences.create(KEY_DIARY_STORE,
+					KEY_ALIAS,
+					context,
+					EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+					EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM);
+		} catch (GeneralSecurityException | IOException ex) {
+			ex.printStackTrace();
+		}
+	}
+
+	public static synchronized DiaryStorage getInstance(Context context) {
+		if (instance == null) {
+			instance = new DiaryStorage(context);
+		}
+		return instance;
+	}
+
+	public boolean addEntry(DiaryEntry diaryEntry) {
+		List<DiaryEntry> diaryEntries = getEntries();
+		if (hasExposureWithId(diaryEntry.getId())) return false;
+		diaryEntries.add(diaryEntry);
+		saveToPrefs(diaryEntries);
+		return true;
+	}
+
+	public boolean updateEntry(DiaryEntry newDiaryEntry) {
+		List<DiaryEntry> diaryEntries = getEntries();
+		DiaryEntry oldDiaryEntry = getDiaryEntryWithId(diaryEntries, newDiaryEntry.getId());
+		if (oldDiaryEntry == null) return false;
+		diaryEntries.remove(oldDiaryEntry);
+		diaryEntries.add(newDiaryEntry);
+		saveToPrefs(diaryEntries);
+		return true;
+	}
+
+	public boolean removeEntry(long id) {
+		List<DiaryEntry> diaryEntries = getEntries();
+		DiaryEntry diaryEntry = getDiaryEntryWithId(diaryEntries, id);
+		if (diaryEntry == null) return false;
+		diaryEntries.remove(diaryEntry);
+		saveToPrefs(diaryEntries);
+		return true;
+	}
+
+	public boolean hasExposureWithId(long id) {
+		return getDiaryEntryWithId(id) != null;
+	}
+
+	public DiaryEntry getDiaryEntryWithId(long id) {
+		return getDiaryEntryWithId(getEntries(), id);
+	}
+
+	private DiaryEntry getDiaryEntryWithId(List<DiaryEntry> diaryEntries, long id) {
+		for (DiaryEntry exposure : diaryEntries) {
+			if (exposure.getId() == id) {
+				return exposure;
+			}
+		}
+		return null;
+	}
+
+	public List<DiaryEntry> getEntries() {
+		return gson.fromJson(sharedPreferences.getString(KEY_DIARY_ENTRIES_V3, "[]"), EXPOSURE_LIST_V3_TYPE);
+	}
+
+
+	public void removeEntriesBefore(int maxDaysToKeep) {
+		List<DiaryEntry> exposureList = getEntries();
+		DayDate lastDateToKeep = new DayDate().subtractDays(maxDaysToKeep);
+		Iterator<DiaryEntry> iterator = exposureList.iterator();
+		while (iterator.hasNext()) {
+			if (new DayDate(iterator.next().getDepartureTime()).isBefore(lastDateToKeep)) {
+				iterator.remove();
+			}
+		}
+		saveToPrefs(exposureList);
+	}
+
+	private void saveToPrefs(List<DiaryEntry> diaryEntries) {
+		sharedPreferences.edit().putString(KEY_DIARY_ENTRIES_V3, gson.toJson(diaryEntries)).apply();
+	}
+
+	public void clear() {
+		saveToPrefs(new ArrayList<>());
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 7eeadcedc..62358b6c7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -35,6 +35,7 @@
 import ch.admin.bag.dp3t.networking.models.TestLocationModel;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsCollection;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsModel;
+import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
 
 public class SecureStorage {
 
@@ -71,6 +72,8 @@ public class SecureStorage {
 	private static final String KEY_APP_VERSION_CODE = "app_version_code";
 	private static final String KEY_SCHEDULED_FAKE_WORKER_NAME = "scheduled_fake_worker_name";
 	private static final String KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY = "positive_report_oldest_shared_key";
+	private static final String KEY_CURRENT_CHECK_IN = "KEY_CURRENT_CHECK_IN";
+	private static final String KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG = "KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG";
 
 	private static SecureStorage instance;
 
@@ -345,6 +348,23 @@ private synchronized SharedPreferences initializeSharedPreferences(@NonNull Cont
 		}
 	}
 
+	public void setCheckInState(CheckInState checkInState) {
+		prefs.edit().putString(KEY_CURRENT_CHECK_IN, gson.toJson(checkInState)).apply();
+	}
+
+	public CheckInState getCheckInState() {
+		return gson.fromJson(prefs.getString(KEY_CURRENT_CHECK_IN, null), CheckInState.class);
+	}
+
+	public void setCrowdNotifierLastKeyBundleTag(long lastSync) {
+		prefs.edit().putLong(KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG, lastSync).apply();
+	}
+
+	public long getCrowdNotifierLastKeyBundleTag() {
+		return prefs.getLong(KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG, 0);
+	}
+
+
 	/**
 	 * Create or obtain an encrypted SharedPreferences instance. Note that this method is synchronized because the AndroidX
 	 * Security
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java b/app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java
new file mode 100644
index 000000000..0b79d4876
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java
@@ -0,0 +1,52 @@
+package ch.admin.bag.dp3t.storage.model;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+public class DiaryEntry {
+	private long id;
+	private long arrivalTime;
+	private long departureTime;
+	private VenueInfo venueInfo;
+	private String comment;
+
+	public DiaryEntry(long id, long arrivalTime, long departureTime, VenueInfo venueInfo, String comment) {
+		this.id = id;
+		this.arrivalTime = arrivalTime;
+		this.departureTime = departureTime;
+		this.venueInfo = venueInfo;
+		this.comment = comment;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public long getArrivalTime() {
+		return arrivalTime;
+	}
+
+	public long getDepartureTime() {
+		return departureTime;
+	}
+
+	public VenueInfo getVenueInfo() {
+		return venueInfo;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setArrivalTime(long arrivalTime) {
+		this.arrivalTime = arrivalTime;
+	}
+
+	public void setDepartureTime(long departureTime) {
+		this.departureTime = departureTime;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java
new file mode 100644
index 000000000..edfbc996d
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java
@@ -0,0 +1,128 @@
+package ch.admin.bag.dp3t.util;
+
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+
+import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.storage.DiaryStorage;
+import ch.admin.bag.dp3t.storage.SecureStorage;
+import ch.admin.bag.dp3t.storage.model.DiaryEntry;
+import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
+
+public class CrowdNotifierReminderHelper extends BroadcastReceiver {
+
+	public static final String ACTION_DID_AUTO_CHECKOUT = BuildConfig.APPLICATION_ID + ".ACTION_DID_AUTO_CHECKOUT";
+	private static final int REMINDER_INTENT_ID = 12;
+	private static final String ACTION_REMINDER = BuildConfig.APPLICATION_ID + ".ACTION_REMINDER";
+	private static final int EIGHT_HOUR_REMINDER_INTENT_ID = 13;
+	private static final String ACTION_EIGHT_HOUR_REMINDER = BuildConfig.APPLICATION_ID + ".ACTION_EIGHT_HOUR_REMINDER";
+	private static final int AUTO_CHECK_OUT_INTENT_ID = 14;
+	private static final String ACTION_AUTO_CHECKOUT = BuildConfig.APPLICATION_ID + ".ACTION_AUTO_CHECKOUT";
+	private static final long EIGHT_HOURS = 1000L * 60 * 60 * 8;
+	public static final long TWELVE_HOURS = 1000L * 60 * 60 * 12;
+
+	public static void removeAllReminders(Context context) {
+		removeReminder(context);
+		remove8HourReminder(context);
+		removeAutoCheckOut(context);
+	}
+
+	public static void removeReminder(Context context) {
+		PendingIntent pendingIntent = getPendingIntent(context, false);
+		removeReminder(pendingIntent, context);
+	}
+
+	public static void setReminder(long alarmTime, Context context) {
+		PendingIntent pendingIntent = getPendingIntent(context, false);
+		setReminder(alarmTime, pendingIntent, context);
+	}
+
+	public static void set8HourReminder(long checkInTime, Context context) {
+		PendingIntent pendingIntent = getPendingIntent(context, true);
+		setReminder(checkInTime + EIGHT_HOURS, pendingIntent, context);
+	}
+
+	public static void remove8HourReminder(Context context) {
+		PendingIntent pendingIntent = getPendingIntent(context, true);
+		removeReminder(pendingIntent, context);
+	}
+
+	public static void setAutoCheckOut(long checkInTime, Context context) {
+		PendingIntent pendingIntent = getAutoCheckOutPendingIntent(context);
+		setReminder(checkInTime + TWELVE_HOURS, pendingIntent, context);
+	}
+
+	public static void removeAutoCheckOut(Context context) {
+		PendingIntent pendingIntent = getAutoCheckOutPendingIntent(context);
+		removeReminder(pendingIntent, context);
+	}
+
+	private static void setReminder(long alarmTime, PendingIntent pendingIntent, Context context) {
+		AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+		if (alarmTime <= System.currentTimeMillis()) {
+			alarmManager.cancel(pendingIntent);
+			return;
+		}
+		alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, alarmTime, pendingIntent);
+	}
+
+	private static void removeReminder(PendingIntent pendingIntent, Context context) {
+		AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+		alarmManager.cancel(pendingIntent);
+	}
+
+	private static PendingIntent getPendingIntent(Context context, boolean eightHours) {
+		Intent intent = new Intent(context, ReminderHelper.class);
+		if (eightHours) {
+			intent.setAction(ACTION_EIGHT_HOUR_REMINDER);
+			return PendingIntent.getBroadcast(context, EIGHT_HOUR_REMINDER_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+		} else {
+			intent.setAction(ACTION_REMINDER);
+			return PendingIntent.getBroadcast(context, REMINDER_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+		}
+	}
+
+	private static PendingIntent getAutoCheckOutPendingIntent(Context context) {
+		Intent intent = new Intent(context, ReminderHelper.class);
+		intent.setAction(ACTION_AUTO_CHECKOUT);
+		return PendingIntent.getBroadcast(context, AUTO_CHECK_OUT_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+	}
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		CheckInState checkInState = SecureStorage.getInstance(context).getCheckInState();
+		if (ACTION_REMINDER.equals(intent.getAction()) ||
+				ACTION_EIGHT_HOUR_REMINDER.equals(intent.getAction()) && checkInState != null) {
+			NotificationHelper.getInstance(context).showReminderNotification();
+		} else if (ACTION_AUTO_CHECKOUT.equals(intent.getAction())) {
+			autoCheckoutIfNecessary(context, checkInState);
+		}
+	}
+
+	public static boolean autoCheckoutIfNecessary(Context context, CheckInState checkInState) {
+		if (checkInState == null || checkInState.getCheckInTime() > System.currentTimeMillis() - TWELVE_HOURS) {
+			return false;
+		}
+
+		NotificationHelper notificationHelper = NotificationHelper.getInstance(context);
+		notificationHelper.stopOngoingNotification();
+		notificationHelper.removeReminderNotification();
+		notificationHelper.showAutoCheckoutNotification();
+		long checkIn = checkInState.getCheckInTime();
+		long checkOut = checkIn + TWELVE_HOURS;
+		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, checkInState.getVenueInfo(), context);
+		DiaryStorage.getInstance(context).addEntry(new DiaryEntry(id, checkIn, checkOut, checkInState.getVenueInfo(), ""));
+		SecureStorage storage = SecureStorage.getInstance(context);
+		storage.setCheckInState(null);
+		LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(ACTION_DID_AUTO_CHECKOUT));
+		return true;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java
new file mode 100644
index 000000000..418539dce
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java
@@ -0,0 +1,175 @@
+package ch.admin.bag.dp3t.util;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.MainActivity;
+import ch.admin.bag.dp3t.R;
+
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW;
+
+public class NotificationHelper {
+
+	public static final String ACTION_EXPOSURE_NOTIFICATION = BuildConfig.APPLICATION_ID + ".EXPOSURE_NOTIFICATION_ACTION";
+	public static final String ACTION_REMINDER_NOTIFICATION = BuildConfig.APPLICATION_ID + ".ACTION_REMINDER_NOTIFICATION";
+	public static final String ACTION_AUTO_CHECKOUT_NOTIFICATION = BuildConfig.APPLICATION_ID +
+			".ACTION_AUTO_CHECKOUT_NOTIFICATION";
+	public static final String ACTION_ONGOING_NOTIFICATION = BuildConfig.APPLICATION_ID + ".ACTION_ONGOING_NOTIFICATION";
+	public static final String ACTION_CHECK_OUT_NOW = BuildConfig.APPLICATION_ID + ".ACTION_CHECK_OUT_NOW";
+	public static final String ACTION_SNOOZE = BuildConfig.APPLICATION_ID + ".ACTION_SNOOZE";
+
+	public static final String EXPOSURE_ID_EXTRA = "EXPOSURE_ID";
+
+	private final String CHANNEL_ID_EXPOSURE_NOTIFICATION = "ExposureNotificaitons";
+	private final String CHANNEL_ID_REMINDER = "Reminders";
+	private final String CHANNEL_ID_ONGOING_CHECK_IN = "Ongoing Check In";
+
+	private final int ONGOING_NOTIFICATION_ID = -1;
+	private final int REMINDER_NOTIFICATION_ID = -2;
+	private final int AUTO_CHECKOUT_NOTIFICATION_ID = -3;
+
+
+	private static NotificationHelper instance;
+
+	private Context context;
+	private NotificationManager notificationManager;
+
+	private NotificationHelper(Context context) {
+		this.context = context;
+		this.notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+	}
+
+	public static synchronized NotificationHelper getInstance(Context context) {
+		if (instance == null) {
+			instance = new NotificationHelper(context);
+		}
+		return instance;
+	}
+
+	private void createNotificationChannel(String channelId, String channelName, boolean silent, int importance) {
+		if (Build.VERSION.SDK_INT >= 26) {
+			NotificationChannel channel = new NotificationChannel(channelId, channelName, importance);
+			if (silent) {
+				channel.setSound(null, null);
+				channel.enableVibration(false);
+			}
+			notificationManager.createNotificationChannel(channel);
+		}
+	}
+
+	private PendingIntent createBasicPendingIntent(String notificationAction) {
+		Intent intent = new Intent(context, MainActivity.class);
+		intent.setAction(notificationAction);
+		return TaskStackBuilder.create(context)
+				.addNextIntentWithParentStack(intent)
+				.getPendingIntent(notificationAction.hashCode(), PendingIntent.FLAG_UPDATE_CURRENT);
+	}
+
+	private PendingIntent createExposurePendingIntent(long exposureId) {
+		Intent intent = new Intent(context, MainActivity.class);
+		intent.setAction(ACTION_EXPOSURE_NOTIFICATION);
+		intent.putExtra(EXPOSURE_ID_EXTRA, exposureId);
+		intent.setAction(Long.toString(exposureId));
+		return TaskStackBuilder.create(context)
+				.addNextIntentWithParentStack(intent)
+				.getPendingIntent(ACTION_EXPOSURE_NOTIFICATION.hashCode(), PendingIntent.FLAG_ONE_SHOT);
+	}
+
+	private NotificationCompat.Builder getNotificationBuilder(String channelId) {
+		return new NotificationCompat.Builder(context, channelId)
+				.setAutoCancel(true)
+				.setSmallIcon(R.drawable.ic_notification)
+				.setPriority(NotificationCompat.PRIORITY_HIGH)
+				.setDefaults(Notification.DEFAULT_ALL);
+	}
+
+	public void showAutoCheckoutNotification() {
+		createNotificationChannel(CHANNEL_ID_REMINDER, context.getString(R.string.android_reminder_channel_name), false,
+				IMPORTANCE_HIGH);
+
+		Notification notification = getNotificationBuilder(CHANNEL_ID_REMINDER)
+				.setContentIntent(createBasicPendingIntent(ACTION_AUTO_CHECKOUT_NOTIFICATION))
+				.setContentTitle(context.getString(R.string.auto_checkout_title))
+				.setContentText(context.getString(R.string.auto_checkout_body))
+				.build();
+
+		notificationManager.notify(AUTO_CHECKOUT_NOTIFICATION_ID, notification);
+	}
+
+	public void showExposureNotification(long exposureId) {
+
+		createNotificationChannel(CHANNEL_ID_EXPOSURE_NOTIFICATION,
+				context.getString(R.string.android_crowdnotifier_notification_channel_name), false, IMPORTANCE_HIGH);
+
+		Notification notification = getNotificationBuilder(CHANNEL_ID_EXPOSURE_NOTIFICATION)
+				.setContentIntent(createExposurePendingIntent(exposureId))
+				.setContentTitle(context.getString(R.string.exposure_notification_title))
+				.setContentText(context.getString(R.string.exposure_notification_body))
+				.build();
+
+		notificationManager.notify((int) exposureId, notification);
+	}
+
+	public void showReminderNotification() {
+
+		createNotificationChannel(CHANNEL_ID_REMINDER, context.getString(R.string.android_reminder_channel_name), false,
+				IMPORTANCE_HIGH);
+
+		Intent snoozeIntent = new Intent(context, NotificationQuickActionReceiver.class);
+		snoozeIntent.setAction(ACTION_SNOOZE);
+		PendingIntent snoozePendingIntent = PendingIntent.getBroadcast(context, 1, snoozeIntent,
+				PendingIntent.FLAG_UPDATE_CURRENT);
+
+		Notification notification = getNotificationBuilder(CHANNEL_ID_REMINDER)
+				.setContentIntent(createBasicPendingIntent(ACTION_REMINDER_NOTIFICATION))
+				.setContentTitle(context.getString(R.string.checkout_reminder_title))
+				.setContentText(context.getString(R.string.checkout_reminder_text))
+				.addAction(R.drawable.ic_close,
+						context.getString(R.string.ongoing_notification_checkout_quick_action),
+						createBasicPendingIntent(ACTION_CHECK_OUT_NOW))
+				.addAction(R.drawable.ic_snooze,
+						context.getString(R.string.reminder_notification_snooze_action),
+						snoozePendingIntent)
+				.build();
+
+		notificationManager.notify(REMINDER_NOTIFICATION_ID, notification);
+	}
+
+	public void removeReminderNotification() {
+		notificationManager.cancel(REMINDER_NOTIFICATION_ID);
+	}
+
+	public void startOngoingNotification(long startTime, VenueInfo venueInfo) {
+		createNotificationChannel(CHANNEL_ID_ONGOING_CHECK_IN,
+				context.getString(R.string.android_ongoing_checkin_notification_channel_name), true, IMPORTANCE_LOW);
+		Notification ongoingNotification = new NotificationCompat.Builder(context, CHANNEL_ID_ONGOING_CHECK_IN)
+				.setSmallIcon(R.drawable.ic_notification)
+				.setContentTitle(context.getString(R.string.ongoing_notification_title)
+						.replace("{TIME}", StringUtil.getHourMinuteTimeString(startTime, ":")))
+				.setContentText(venueInfo.getTitle() + "\n" + VenueInfoExtensions.getSubtitle(venueInfo))
+				.setPriority(NotificationCompat.PRIORITY_LOW)
+				.setOngoing(true)
+				.addAction(R.drawable.ic_close,
+						context.getString(R.string.ongoing_notification_checkout_quick_action),
+						createBasicPendingIntent(ACTION_CHECK_OUT_NOW))
+				.setContentIntent(createBasicPendingIntent(ACTION_ONGOING_NOTIFICATION))
+				.build();
+		notificationManager.notify(ONGOING_NOTIFICATION_ID, ongoingNotification);
+	}
+
+	public void stopOngoingNotification() {
+		notificationManager.cancel(ONGOING_NOTIFICATION_ID);
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java
new file mode 100644
index 000000000..7f4c1d7cd
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java
@@ -0,0 +1,21 @@
+package ch.admin.bag.dp3t.util;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import static ch.admin.bag.dp3t.util.NotificationHelper.ACTION_SNOOZE;
+
+public class NotificationQuickActionReceiver extends BroadcastReceiver {
+
+	private final long SNOOZE_DURATION = 1000L * 60 * 30; // 30 minutes
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		if (ACTION_SNOOZE.equals(intent.getAction())) {
+			NotificationHelper.getInstance(context).removeReminderNotification();
+			CrowdNotifierReminderHelper.setReminder(System.currentTimeMillis() + SNOOZE_DURATION, context);
+		}
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index 2d6491f6d..3a835771e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -18,6 +18,7 @@
 import androidx.annotation.NonNull;
 
 import java.math.BigInteger;
+import java.util.Calendar;
 
 public class StringUtil {
 
@@ -53,4 +54,18 @@ public static String toHex(byte[] array) {
 			return hex;
 	}
 
+	public static String getHourMinuteTimeString(long timeStamp, String delimiter) {
+		Calendar time = Calendar.getInstance();
+		time.setTimeInMillis(timeStamp);
+		return prependZero(time.get(Calendar.HOUR_OF_DAY)) + delimiter + prependZero(time.get(Calendar.MINUTE));
+	}
+
+	private static String prependZero(int timeUnit) {
+		if (timeUnit < 10) {
+			return "0" + timeUnit;
+		} else {
+			return String.valueOf(timeUnit);
+		}
+	}
+
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java b/app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java
new file mode 100644
index 000000000..97c8642a0
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java
@@ -0,0 +1,67 @@
+package ch.admin.bag.dp3t.util;
+
+import androidx.annotation.DrawableRes;
+
+
+import com.google.protobuf.InvalidProtocolBufferException;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.networking.models.Proto;
+
+public class VenueInfoExtensions {
+
+
+	public static Proto.SwissCovidLocationData getNotifyMeLocationData(VenueInfo venueInfo) {
+		if (venueInfo.getCountryData() == null) return Proto.SwissCovidLocationData.newBuilder().build();
+		try {
+			return Proto.SwissCovidLocationData.parseFrom(venueInfo.getCountryData());
+		} catch (InvalidProtocolBufferException e) {
+			return Proto.SwissCovidLocationData.newBuilder().build();
+		}
+	}
+
+	public static String getSubtitle(VenueInfo venueInfo) {
+		Proto.SwissCovidLocationData notifyMeLocationData = getNotifyMeLocationData(venueInfo);
+		if (notifyMeLocationData.getRoom() == null || notifyMeLocationData.getRoom().equals("")) {
+			return venueInfo.getAddress();
+		} else {
+			return venueInfo.getAddress() + ", " + notifyMeLocationData.getRoom();
+		}
+	}
+
+	@DrawableRes
+	public static int getVenueTypeDrawable(VenueInfo venueInfo) {
+		return getDrawableForVenueType(getNotifyMeLocationData(venueInfo).getType());
+	}
+
+	@DrawableRes
+	public static int getDrawableForVenueType(Proto.VenueType venueType) {
+		switch (venueType) {
+			case CAFETERIA:
+				return R.drawable.ic_illus_caffeteria;
+			case MEETING_ROOM:
+				return R.drawable.ic_illus_meeting;
+			case PRIVATE_EVENT:
+				return R.drawable.ic_illus_private_event;
+			case CANTEEN:
+				return R.drawable.ic_illus_canteen;
+			case LIBRARY:
+				return R.drawable.ic_illus_library;
+			case LECTURE_ROOM:
+				return R.drawable.ic_illus_lecture_room;
+			case SHOP:
+				return R.drawable.ic_illus_shop;
+			case GYM:
+				return R.drawable.ic_illus_gym;
+			case KITCHEN_AREA:
+				return R.drawable.ic_illus_kitchen_area;
+			case OFFICE_SPACE:
+				return R.drawable.ic_illus_office_space;
+			default:
+				return R.drawable.ic_illus_other;
+		}
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java
new file mode 100644
index 000000000..645cf7dfd
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java
@@ -0,0 +1,196 @@
+package ch.admin.bag.dp3t.viewmodel;
+
+import android.app.Application;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.os.Looper;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+import org.crowdnotifier.android.sdk.model.ExposureEvent;
+
+import ch.admin.bag.dp3t.networking.TraceKeysRepository;
+import ch.admin.bag.dp3t.storage.SecureStorage;
+import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
+import ch.admin.bag.dp3t.viewmodel.model.CrowdNotifierErrorState;
+import ch.admin.bag.dp3t.viewmodel.model.ReminderOption;
+
+import static ch.admin.bag.dp3t.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_EXPOSURE_NOTIFICATION;
+import static ch.admin.bag.dp3t.util.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
+
+public class CrowdNotifierViewModel extends AndroidViewModel {
+
+
+	private final MutableLiveData<List<ExposureEvent>> exposures = new MutableLiveData<>();
+	private final MutableLiveData<Long> timeSinceCheckIn = new MutableLiveData<>(0L);
+	private final MutableLiveData<LoadingState> traceKeyLoadingState = new MutableLiveData<>(LoadingState.SUCCESS);
+	private final MutableLiveData<CrowdNotifierErrorState> errorState = new MutableLiveData<>(null);
+	private final MutableLiveData<Boolean> isCheckedIn = new MutableLiveData<>(false);
+	private CheckInState checkInState;
+
+	private SecureStorage storage;
+	private final Handler handler = new Handler(Looper.getMainLooper());
+	private Runnable timeUpdateRunnable;
+	private final long CHECK_IN_TIME_UPDATE_INTERVAL = 1000;
+	private TraceKeysRepository traceKeysRepository = new TraceKeysRepository(getApplication());
+
+	private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			if (ACTION_DID_AUTO_CHECKOUT.equals(intent.getAction())) {
+				setCheckInState(null);
+			} else if (ACTION_NEW_EXPOSURE_NOTIFICATION.equals(intent.getAction())) {
+				refreshExposures();
+			}
+		}
+	};
+
+	public CrowdNotifierViewModel(@NonNull Application application) {
+		super(application);
+		storage = SecureStorage.getInstance(getApplication());
+		checkInState = storage.getCheckInState();
+		updateCheckedIn();
+		LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(application);
+		localBroadcastManager.registerReceiver(broadcastReceiver, new IntentFilter(ACTION_DID_AUTO_CHECKOUT));
+		localBroadcastManager.registerReceiver(broadcastReceiver, new IntentFilter(ACTION_NEW_EXPOSURE_NOTIFICATION));
+		traceKeyLoadingState.observeForever(loadingState -> { if (loadingState != LoadingState.LOADING) refreshErrors(); });
+	}
+
+
+	public void startCheckInTimer() {
+		handler.removeCallbacks(timeUpdateRunnable);
+		timeUpdateRunnable = () -> {
+			if (checkInState != null) {
+				timeSinceCheckIn.setValue(System.currentTimeMillis() - checkInState.getCheckInTime());
+			} else {
+				timeSinceCheckIn.setValue(0L);
+			}
+			handler.postDelayed(timeUpdateRunnable, CHECK_IN_TIME_UPDATE_INTERVAL);
+		};
+		handler.postDelayed(timeUpdateRunnable, CHECK_IN_TIME_UPDATE_INTERVAL -
+				(System.currentTimeMillis() - checkInState.getCheckInTime() % CHECK_IN_TIME_UPDATE_INTERVAL));
+		timeSinceCheckIn.setValue(System.currentTimeMillis() - checkInState.getCheckInTime());
+	}
+
+	public void setCheckInState(CheckInState checkInState) {
+		storage.setCheckInState(checkInState);
+		this.checkInState = checkInState;
+		updateCheckedIn();
+	}
+
+	public CheckInState getCheckInState() {
+		return checkInState;
+	}
+
+	public void setCheckedIn(boolean checkedIn) {
+		if (checkInState != null) checkInState.setCheckedIn(checkedIn);
+		setCheckInState(checkInState);
+	}
+
+	public LiveData<List<ExposureEvent>> getExposures() {
+		return exposures;
+	}
+
+	public LiveData<Long> getTimeSinceCheckIn() {
+		return timeSinceCheckIn;
+	}
+
+	public LiveData<LoadingState> getTraceKeyLoadingState() {
+		return traceKeyLoadingState;
+	}
+
+	public LiveData<CrowdNotifierErrorState> getErrorState() {
+		return errorState;
+	}
+
+	public LiveData<Boolean> isCheckedIn() {
+		return isCheckedIn;
+	}
+
+	public void refreshTraceKeys() {
+		traceKeyLoadingState.setValue(LoadingState.LOADING);
+		traceKeysRepository.loadTraceKeysAsync(traceKeys -> {
+			if (traceKeys == null) {
+				traceKeyLoadingState.setValue(LoadingState.FAILURE);
+			} else {
+				CrowdNotifier.checkForMatches(traceKeys, getApplication());
+				refreshExposures();
+				traceKeyLoadingState.setValue(LoadingState.SUCCESS);
+			}
+		});
+	}
+
+	public void refreshErrors() {
+		//TODO: Also check for disabled notification channels
+		boolean notificationsEnabled = NotificationManagerCompat.from(getApplication()).areNotificationsEnabled();
+
+		if (traceKeyLoadingState.getValue() == LoadingState.FAILURE) {
+			errorState.setValue(CrowdNotifierErrorState.NETWORK);
+		} else if (!notificationsEnabled) {
+			errorState.setValue(CrowdNotifierErrorState.NOTIFICATIONS_DISABLED);
+		} else {
+			errorState.setValue(null);
+		}
+	}
+
+	private void updateCheckedIn() {
+		if (checkInState == null) {
+			isCheckedIn.setValue(false);
+		} else {
+			isCheckedIn.setValue(checkInState.isCheckedIn());
+		}
+	}
+
+	public void refreshExposures() {
+		List<ExposureEvent> newExposures = CrowdNotifier.getExposureEvents(getApplication());
+		Collections.sort(newExposures, (e1, e2) -> Long.compare(e2.getStartTime(), e1.getStartTime()));
+		exposures.setValue(newExposures);
+	}
+
+	public void removeExposure(long exposureId) {
+		CrowdNotifier.removeExposure(getApplication(), exposureId);
+		refreshExposures();
+	}
+
+	public ExposureEvent getExposureWithId(long id) {
+		List<ExposureEvent> exposureEvents = exposures.getValue();
+		if (exposureEvents == null) return null;
+		for (ExposureEvent exposureEvent : exposureEvents) {
+			if (exposureEvent.getId() == id) {
+				return exposureEvent;
+			}
+		}
+		return null;
+	}
+
+	public ReminderOption getSelectedReminderOption() {
+		return checkInState.getSelectedTimerOption();
+	}
+
+	public void setSelectedReminderOption(ReminderOption selectedReminderOption) {
+		this.checkInState.setSelectedTimerOption(selectedReminderOption);
+		storage.setCheckInState(checkInState);
+	}
+
+	@Override
+	public void onCleared() {
+		super.onCleared();
+		LocalBroadcastManager.getInstance(getApplication()).unregisterReceiver(broadcastReceiver);
+	}
+
+	public enum LoadingState {
+		LOADING, SUCCESS, FAILURE
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java
new file mode 100644
index 000000000..7ae8886b9
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java
@@ -0,0 +1,57 @@
+package ch.admin.bag.dp3t.viewmodel.model;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+public class CheckInState {
+	private boolean isCheckedIn;
+	private VenueInfo venueInfo;
+	private long checkInTime;
+	private long checkOutTime;
+	ReminderOption selectedTimerOption;
+
+	public CheckInState(boolean isCheckedIn, VenueInfo venueInfo, long checkInTime, long checkOutTime,
+			ReminderOption selectedTimerOption) {
+		this.isCheckedIn = isCheckedIn;
+		this.venueInfo = venueInfo;
+		this.checkInTime = checkInTime;
+		this.checkOutTime = checkOutTime;
+		this.selectedTimerOption = selectedTimerOption;
+	}
+
+	public boolean isCheckedIn() {
+		return isCheckedIn;
+	}
+
+	public VenueInfo getVenueInfo() {
+		return venueInfo;
+	}
+
+	public long getCheckInTime() {
+		return checkInTime;
+	}
+
+	public long getCheckOutTime() {
+		return checkOutTime;
+	}
+
+	public ReminderOption getSelectedTimerOption() {
+		return selectedTimerOption;
+	}
+
+	public void setCheckedIn(boolean checkedIn) {
+		isCheckedIn = checkedIn;
+	}
+
+	public void setCheckInTime(long checkInTime) {
+		this.checkInTime = checkInTime;
+	}
+
+	public void setCheckOutTime(long checkOutTime) {
+		this.checkOutTime = checkOutTime;
+	}
+
+	public void setSelectedTimerOption(ReminderOption selectedTimerOption) {
+		this.selectedTimerOption = selectedTimerOption;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java
new file mode 100644
index 000000000..3d4013f3e
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java
@@ -0,0 +1,49 @@
+package ch.admin.bag.dp3t.viewmodel.model;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
+import ch.admin.bag.dp3t.R;
+
+public enum CrowdNotifierErrorState {
+	NETWORK(R.string.error_network_title, R.string.error_network_text, R.string.error_action_retry, R.drawable.ic_error),
+	NOTIFICATIONS_DISABLED(R.string.error_notification_deactivated_title, R.string.error_notification_deactivated_text,
+			R.string.error_action_change_settings, R.drawable.ic_notification_off),
+	CAMERA_ACCESS_DENIED(R.string.error_camera_permission_title, R.string.error_camera_permission_text,
+			R.string.error_action_change_settings, R.drawable.ic_cam_off),
+	NO_VALID_QR_CODE(R.string.error_title, R.string.qrscanner_error, R.string.android_button_ok, R.drawable.ic_error),
+	QR_CODE_NOT_YET_VALID(R.string.error_title, R.string.qr_scanner_error_code_not_yet_valid, R.string.android_button_ok,
+			R.drawable.ic_error),
+	QR_CODE_NOT_VALID_ANYMORE(R.string.error_title, R.string.qr_scanner_error_code_not_valid_anymore, R.string.android_button_ok,
+			R.drawable.ic_error),
+	ALREADY_CHECKED_IN(R.string.error_title, R.string.error_already_checked_in, R.string.android_button_ok, R.drawable.ic_error);
+
+
+	@StringRes private int titleResId;
+	@StringRes private int textResId;
+	@StringRes private int actionResId;
+	@DrawableRes private int imageResId;
+
+	CrowdNotifierErrorState(@StringRes int titleResId, @StringRes int textResId, @StringRes int actionResId, @DrawableRes int imageResId) {
+		this.titleResId = titleResId;
+		this.textResId = textResId;
+		this.actionResId = actionResId;
+		this.imageResId = imageResId;
+	}
+
+	public int getTitleResId() {
+		return titleResId;
+	}
+
+	public int getTextResId() {
+		return textResId;
+	}
+
+	public int getActionResId() {
+		return actionResId;
+	}
+
+	public int getImageResId() {
+		return imageResId;
+	}
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java
new file mode 100644
index 000000000..24e1df12b
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java
@@ -0,0 +1,49 @@
+package ch.admin.bag.dp3t.viewmodel.model;
+
+import android.content.Context;
+
+import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.R;
+
+
+public enum ReminderOption {
+
+	OFF(0),
+	THIRTY_MINUTES(BuildConfig.FLAVOR.equals("dev") ? 1 : 30),
+	ONE_HOUR(60),
+	TWO_HOURS(120),
+	FOUR_HOURS(240);
+
+	private static final long MINUTE_IN_MILLIS = 60 * 1000L;
+
+	private int delayMinutes;
+	private String name;
+
+	ReminderOption(int delayMinutes) {
+		this.delayMinutes = delayMinutes;
+		this.name = name;
+	}
+
+	public int getDelayMinutes() {
+		return delayMinutes;
+	}
+
+	public long getDelayMillis() {
+		return delayMinutes * MINUTE_IN_MILLIS;
+	}
+
+	public int getDelayHours() {
+		return delayMinutes / 60;
+	}
+
+	public String getName(Context context) {
+		switch (this) {
+			case THIRTY_MINUTES:
+				return context.getString(R.string.reminder_option_minutes).replace("{MINUTES}", String.valueOf(getDelayMinutes()));
+			case OFF:
+				return context.getString(R.string.reminder_option_off);
+			default:
+				return context.getString(R.string.reminder_option_hours).replace("{HOURS}", String.valueOf(getDelayHours()));
+		}
+	}
+}
diff --git a/app/src/main/proto/Proto.proto b/app/src/main/proto/Proto.proto
new file mode 100644
index 000000000..6277753ca
--- /dev/null
+++ b/app/src/main/proto/Proto.proto
@@ -0,0 +1,50 @@
+syntax = "proto3";
+package ch.admin.bag.dp3t.networking.models;
+
+message ProblematicEventWrapper {
+  int32 version = 1;
+  repeated ProblematicEvent events = 2;
+}
+
+message ProblematicEvent {
+  int32 version = 1;
+  bytes identity = 2;
+  bytes secretKeyForIdentity = 3;
+  int64 startTime = 4;
+  int64 endTime = 5;
+  bytes encryptedAssociatedData = 6;
+  bytes cipherTextNonce = 7;
+}
+message AssociatedData {
+  int32 version = 1;
+  string message = 2;
+  bytes countryData = 3;
+}
+message NotifyMeAssociatedData {
+  int32 version = 1;
+  EventCriticality criticality = 2;
+}
+enum EventCriticality {
+  LOW = 0;
+  HIGH = 1;
+}
+
+message SwissCovidLocationData {
+  uint32 version = 1;
+  VenueType type = 2;
+  string room = 3;
+}
+
+enum VenueType {
+  OTHER = 0;
+  MEETING_ROOM = 1;
+  CAFETERIA = 2;
+  PRIVATE_EVENT = 3;
+  CANTEEN = 4;
+  LIBRARY = 5;
+  LECTURE_ROOM = 6;
+  SHOP = 7;
+  GYM = 8;
+  KITCHEN_AREA = 9;
+  OFFICE_SPACE = 10;
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cam_off.xml b/app/src/main/res/drawable/ic_cam_off.xml
new file mode 100644
index 000000000..4fd131ab6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cam_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="26dp"
+    android:viewportWidth="26"
+    android:viewportHeight="26">
+  <path
+      android:pathData="M22.293,7.008l-4.123,4.124L18.17,7.524c0,-0.567 -0.464,-1.03 -1.031,-1.03L10.768,6.494l11.524,11.523L22.292,7.008zM4.017,2.37L2.708,3.68l2.814,2.813h-0.752c-0.567,0 -1.031,0.464 -1.031,1.03v10.309c0,0.566 0.464,1.03 1.03,1.03h12.37c0.216,0 0.402,-0.082 0.556,-0.185l3.289,3.278 1.309,-1.31L4.017,2.37z"
+      android:fillColor="#E20008"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
new file mode 100644
index 000000000..f2f8aacc6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.857,2.43l10.234,17.056c0.284,0.473 0.13,1.087 -0.343,1.371 -0.155,0.094 -0.333,0.143 -0.514,0.143H1.766c-0.552,0 -1,-0.448 -1,-1 0,-0.181 0.05,-0.36 0.143,-0.514L11.143,2.429c0.284,-0.473 0.898,-0.627 1.371,-0.343 0.141,0.085 0.259,0.202 0.343,0.343z"
+      android:fillColor="#E20008"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,17.25m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.25,8H12.75V14H11.25z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_caffeteria.xml b/app/src/main/res/drawable/ic_illus_caffeteria.xml
new file mode 100644
index 000000000..df643ae3e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_caffeteria.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M10.406,12.656c0,-2.942 2.08,-4.743 3.75,-6.19 1.598,-1.384 2.578,-2.301 2.578,-3.654C16.734,1.26 17.994,0 19.547,0c1.553,0 2.812,1.259 2.812,2.813 0,3.99 -2.613,6.253 -4.521,7.906 -0.676,0.585 -1.807,1.565 -1.807,1.937 0,1.554 -1.259,2.813 -2.812,2.813 -1.554,0 -2.813,-1.26 -2.813,-2.813zM28.406,15.469c1.554,0 2.813,-1.26 2.813,-2.813 0,-0.372 1.13,-1.352 1.806,-1.937 1.909,-1.653 4.522,-3.916 4.522,-7.906 0,-1.554 -1.26,-2.813 -2.813,-2.813 -1.553,0 -2.812,1.259 -2.812,2.813 0,1.352 -0.98,2.27 -2.579,3.654 -1.67,1.446 -3.75,3.247 -3.75,6.19 0,1.553 1.26,2.812 2.813,2.812zM43.453,15.469c1.554,0 2.813,-1.26 2.813,-2.813 0,-0.391 1.064,-1.334 1.768,-1.958 1.865,-1.652 4.42,-3.914 4.42,-7.886C52.453,1.26 51.193,0 49.64,0c-1.554,0 -2.813,1.259 -2.813,2.813 0,1.37 -0.958,2.289 -2.523,3.674 -1.632,1.446 -3.664,3.246 -3.664,6.17 0,1.553 1.259,2.812 2.812,2.812zM72,38.589c0,1.553 -1.259,2.812 -2.813,2.812 -1.553,0 -2.812,-1.259 -2.812,-2.812 0,-2.513 -2.045,-4.558 -4.558,-4.558 -1.614,0 -3.269,0.344 -4.363,4.151 -0.078,0.31 -0.157,0.619 -0.24,0.929l-0.024,0.098c-0.023,0.103 -0.053,0.202 -0.087,0.298 -0.373,1.354 -0.798,2.71 -1.278,4.07 -0.806,2.281 -1.763,4.57 -2.862,6.851 2.188,-0.702 4.722,-1.742 7.052,-3.17 1.325,-0.811 3.056,-0.395 3.868,0.93 0.811,1.324 0.395,3.055 -0.93,3.866 -4.604,2.822 -10.214,4.537 -13.6,5.014 -0.186,0.304 -0.373,0.608 -0.563,0.911 -2.12,3.39 -4.234,6.228 -5.988,8.396h7.12c1.553,0 2.812,1.259 2.812,2.813 0,1.553 -1.259,2.812 -2.812,2.812L9.282,72c-1.554,0 -2.813,-1.259 -2.813,-2.813 0,-1.553 1.259,-2.812 2.812,-2.812h6.776c-1.714,-2.047 -3.74,-4.696 -5.77,-7.872 -2.976,-4.654 -5.349,-9.49 -7.054,-14.373C1.088,37.984 0,31.748 0,25.594c0,-1.554 1.259,-2.813 2.813,-2.813L56.25,22.781c1.553,0 2.813,1.26 2.813,2.813 0,1.054 -0.037,2.114 -0.108,3.18 0.887,-0.244 1.841,-0.368 2.862,-0.368C67.432,28.406 72,32.974 72,38.59zM5.709,28.406c0.203,3.396 0.765,6.64 1.57,9.705 4.96,-2.191 9.388,-2.533 11.659,-2.533 6.21,0 9.59,1.54 12.574,2.9 2.712,1.236 5.055,2.303 9.671,2.303 2.693,0 7.286,-1.093 10.52,-2.89 0.828,-3.01 1.42,-6.191 1.64,-9.485L5.709,28.406zM44.099,54.872c1.707,-2.74 3.545,-6.088 5.136,-9.878 -2.953,0.927 -5.919,1.412 -8.052,1.412 -5.837,0 -9.113,-1.492 -12.004,-2.81 -2.818,-1.284 -5.252,-2.393 -10.241,-2.393 -1.9,0 -5.695,0.303 -9.936,2.305 4.512,12.008 12.219,20.417 14.643,22.867h11.72c1.54,-1.653 5.159,-5.765 8.734,-11.503z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_canteen.xml b/app/src/main/res/drawable/ic_illus_canteen.xml
new file mode 100644
index 000000000..6b51511e3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_canteen.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M0.085,24.813l8.106,44.83c0.077,0.268 0.336,1.04 1.107,1.645 0.742,0.581 1.52,0.662 1.801,0.678h58.279c1.416,-0.004 2.56,-1.155 2.556,-2.572 -0.004,-1.41 -1.146,-2.551 -2.556,-2.556h-1.95l3.988,-7.441c0.076,-0.151 0.625,-1.287 0.075,-2.502 -0.439,-0.967 -1.405,-1.615 -2.504,-1.684h-3.996c-0.845,-2.942 -3.098,-5.31 -5.972,-6.312 0.714,-1.342 2.12,-2.24 3.77,-2.24 0.612,0 1.218,0.133 1.776,0.387 1.271,0.623 2.807,0.097 3.429,-1.175 0.622,-1.272 0.096,-2.807 -1.175,-3.43 -0.042,-0.019 -0.083,-0.039 -0.125,-0.056 -1.227,-0.56 -2.56,-0.85 -3.907,-0.85 -4.378,0 -8.09,3.051 -9.114,7.128 -3.245,0.82 -5.836,3.343 -6.754,6.548h-4.012c-0.146,0.01 -1.493,0.126 -2.263,1.328 -0.858,1.34 -0.193,2.773 -0.154,2.854l3.99,7.445h-9.486l7.63,-42.2c0.272,-1.389 -0.634,-2.735 -2.023,-3.007 -0.193,-0.037 -37.882,-0.047 -38.017,-0.047 -0.24,0 -1.04,0.03 -1.714,0.626 -0.704,0.623 -0.998,1.621 -0.785,2.603zM56.377,53.524c1.243,0.118 2.317,0.75 3.012,1.687h-6.868c0.696,-0.938 1.773,-1.571 3.019,-1.687 0.14,-0.013 0.295,-0.02 0.461,-0.019 0.134,0.001 0.26,0.008 0.376,0.02zM46.813,60.338h18.281l-3.483,6.5L50.296,66.838l-3.483,-6.5zM12.893,66.838l-7.25,-40.09h31.39l-7.25,40.09h-16.89z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M19.349,48.983l5.723,-9.912c0.725,-1.216 0.328,-2.79 -0.888,-3.515 -0.392,-0.234 -0.838,-0.359 -1.293,-0.362 -0.937,-0.01 -1.803,0.495 -2.26,1.312l-5.723,9.914c-0.708,1.226 -0.288,2.794 0.939,3.502 1.226,0.708 2.794,0.288 3.502,-0.939zM26.882,43.65c-0.391,-0.233 -0.837,-0.358 -1.292,-0.362 -0.937,-0.008 -1.805,0.496 -2.261,1.314l-5.723,9.912c-0.708,1.227 -0.289,2.794 0.938,3.503 1.227,0.709 2.794,0.289 3.503,-0.938l5.723,-9.913c0.725,-1.217 0.328,-2.79 -0.888,-3.515zM13.473,9.787l0.933,1.898 -0.933,1.899c-0.65,1.258 -0.156,2.804 1.104,3.454 1.258,0.649 2.804,0.155 3.453,-1.104 0.016,-0.03 1.534,-3.12 1.534,-3.12 0.35,-0.713 0.35,-1.548 0,-2.26l-1.49,-3.03 -0.932,-1.897 0.932,-1.899c0.643,-1.26 0.142,-2.805 -1.12,-3.448 -0.329,-0.168 -0.69,-0.263 -1.059,-0.277 -1.028,-0.043 -1.981,0.533 -2.422,1.463l-1.49,3.03c-0.35,0.713 -0.35,1.548 0,2.26l1.49,3.03zM22.78,9.787l0.932,1.898 -0.932,1.899c-0.65,1.258 -0.156,2.804 1.103,3.454 1.258,0.649 2.804,0.155 3.454,-1.104l1.533,-3.12c0.35,-0.713 0.35,-1.548 0,-2.26l-1.489,-3.03 -0.933,-1.897 0.933,-1.899c0.643,-1.26 0.142,-2.805 -1.12,-3.448 -0.33,-0.168 -0.69,-0.263 -1.06,-0.277 -1.027,-0.043 -1.98,0.533 -2.421,1.463l-1.49,3.03c-0.35,0.713 -0.35,1.548 0,2.26l1.49,3.03z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_checked_in_time.xml b/app/src/main/res/drawable/ic_illus_checked_in_time.xml
new file mode 100644
index 000000000..d269922f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_checked_in_time.xml
@@ -0,0 +1,222 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="325dp"
+    android:height="180dp"
+    android:viewportWidth="325"
+    android:viewportHeight="180">
+  <path
+      android:pathData="M14,159a148.5,8 0,1 0,297 0a148.5,8 0,1 0,-297 0z"
+      android:strokeAlpha="0.243"
+      android:fillColor="#CECECE"
+      android:fillType="nonZero"
+      android:fillAlpha="0.243"/>
+  <path
+      android:pathData="M162.293,90.293m-70.293,0a70.293,70.293 0,1 1,140.586 0a70.293,70.293 0,1 1,-140.586 0"
+      android:fillColor="#B3B2D1"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M86.41,148.187s-0.619,3.866 -1.651,4.476c-1.032,0.61 5.366,2.035 5.366,2.035l1.032,-6.104 -4.747,-0.407z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M94.305,102.11l2.361,2.754 -1.073,9.533 -0.858,18.854s1.717,16.311 0,16.735c-1.718,0.424 -9.445,0.212 -9.23,-0.847 0.215,-1.06 0.43,-1.907 0.859,-3.39s-0.43,-6.779 -0.43,-6.779l1.073,-5.931 -3.863,-25.633 11.161,-5.296zM86.606,151.881s-2.316,-0.423 -2.527,0c-0.21,0.424 -4.21,4.872 -4.842,4.872 -0.631,0 -5.263,4.236 -0.42,4.447 4.841,0.212 12.841,-3.6 12.841,-3.6s-1.177,-5.39 -1.115,-5.13c0.062,0.259 -3.937,0.47 -3.937,-0.589z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M84.146,142.106s6.049,6.654 6.265,7.298c0.216,0.643 3.457,0 3.457,0l1.296,-4.293 -1.08,-1.503 -6.05,-4.937 -3.888,3.435z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M92.202,147.63l-3.048,2.866s3.89,5.954 3.89,6.584c0,0.63 0.21,5.88 2.312,5.04 2.102,-0.84 2.312,-9.24 2.312,-9.24s-0.21,-8.61 -1.472,-9.24c-1.26,-0.63 -4.025,-0.431 -4.025,-0.431s1.713,4.21 0.031,4.42zM74.91,82.96s-1.067,3.414 -1.28,4.268c-0.214,0.854 -1.493,3.201 -1.493,6.829 0,3.628 0.426,7.896 0,8.323 -0.427,0.427 -7.253,24.328 -4.266,26.889 2.986,2.56 12.798,11.097 13.438,12.164 0.64,1.067 0.853,3.628 2.133,3.2 1.28,-0.426 6.185,-4.694 6.399,-5.548 0.213,-0.853 -2.773,-2.347 -2.773,-2.347s-5.973,-8.75 -7.466,-8.536c-1.493,0.213 -1.28,-1.067 -1.066,-1.708 0.213,-0.64 0.64,-1.067 0,-1.067s-0.214,-1.707 0,-2.56c0.213,-0.854 5.119,-12.378 5.119,-12.378l13.011,-5.762s-0.64,-15.578 -5.332,-19.846l-1.067,-2.561s-11.945,-0.854 -15.357,0.64z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M80.253,49.523s1.056,7.406 -1.478,7.83c-2.534,0.423 -4.646,0.211 -4.646,0.423 0,0.211 6.336,6.772 6.336,6.772l5.913,-0.424 5.28,-5.713s-4.857,-0.847 -4.857,-3.81c0,-2.962 -0.212,-5.078 -0.212,-5.078h-6.336z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M80.253,49.523s1.056,7.406 -1.478,7.83c-2.534,0.423 -4.646,0.211 -4.646,0.423 0,0.211 6.336,6.772 6.336,6.772l5.913,-0.424 5.28,-5.713s-4.857,-0.847 -4.857,-3.81c0,-2.962 -0.212,-5.078 -0.212,-5.078h-6.336z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M83.394,45.766m-6.761,0a6.761,6.761 0,1 1,13.522 0a6.761,6.761 0,1 1,-13.522 0"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M88.629,51.868c-0.079,0.097 -0.159,0.195 -0.243,0.286 -2.106,1.048 -4.645,1.321 -6.913,0.741 -2.268,-0.58 -4.024,-1.949 -4.781,-3.728l3.814,-1.03 7.619,-0.359c-1.526,1.857 -1.247,2.402 0.504,4.091z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M78.131,56.033s-8.314,1.07 -8.953,3.854C68.538,62.67 73.44,80.012 74.08,81.511c0.64,1.499 0.426,2.57 0.426,2.57 1.952,-1.467 4.439,-2.013 6.822,-1.5 4.05,0.857 9.805,0.429 9.805,0.429s1.919,-7.922 2.345,-8.778c0.427,-0.857 2.132,-5.567 2.132,-6.851 0,-1.285 2.558,-6.637 2.558,-6.637s-1.28,-3.854 -5.969,-3.64c0,0 -2.045,-0.92 -2.621,-0.246 -0.576,0.674 -3.774,3.671 -7.824,2.387 -4.05,-1.285 -3.624,-3.212 -3.624,-3.212z"
+      android:fillColor="#E1C825"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M71.455,60.54L69.296,60.54L68.12,77.353s4.318,1.277 4.906,0.426c0.59,-0.852 -1.57,-17.237 -1.57,-17.237zM93.661,60.54l4.112,1.04s3.03,10.597 3.246,10.805c0.216,0.208 0.433,1.455 0.433,1.455s0,0.208 0.433,0.83c0.432,0.624 0.649,0.816 0.216,1.647 -0.433,0.831 -0.65,-0.192 -0.216,0.64 0.432,0.83 0.216,3.117 0.216,3.117s-1.082,-3.949 -4.977,-2.91l-2.597,-11.22 -0.866,-5.403z"
+      android:fillColor="#E1C825"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M76.21,40.222c-1.332,2.35 -1.632,5.133 -1.815,7.831 -0.079,1.157 -0.138,2.345 0.203,3.452 0.36,1.168 1.162,2.355 0.75,3.506 -0.397,1.113 -1.726,1.559 -2.468,2.477 -0.629,0.778 -0.787,1.844 -0.732,2.844 0.054,1.001 0.296,1.984 0.367,2.983 0.146,2.196 -0.529,4.368 -1.892,6.09 3.18,-0.122 6.581,-1.54 7.922,-4.44 0.401,-0.867 0.596,-1.816 0.958,-2.7 0.41,-1 1.027,-1.906 1.415,-2.915 0.585,-1.522 0.616,-3.194 0.64,-4.826 0.015,-0.976 0.026,-1.98 -0.31,-2.896 -0.741,-2.017 -3.044,-3.32 -3.273,-5.459 -0.04,-0.226 -0.006,-0.459 0.095,-0.665 0.108,-0.15 0.238,-0.282 0.386,-0.392 1.438,-1.275 1.201,-3.975 2.913,-4.845 0.768,-0.39 1.694,-0.252 2.519,-0.005 0.916,0.274 1.83,0.698 2.426,1.45 1.2,1.511 0.726,3.695 0.355,5.593 -0.538,2.752 -0.73,5.562 -0.568,8.362 0.01,0.448 0.076,0.893 0.195,1.324 0.221,0.7 0.691,1.29 1.046,1.931 0.723,1.32 0.958,2.855 0.662,4.333 -0.262,1.285 -0.912,2.654 -0.34,3.834 0.253,0.455 0.604,0.848 1.028,1.148 1.871,1.474 4.247,2.387 5.638,4.324 0.24,-1.582 -0.217,-3.175 -0.555,-4.74 -0.337,-1.563 -0.543,-3.266 0.15,-4.707 0.305,-0.633 0.77,-1.183 1.019,-1.839 0.574,-1.515 -0.11,-3.178 -0.526,-4.745 -0.297,-1.23 -0.512,-2.48 -0.642,-3.739l-0.43,-3.4c-0.354,-2.81 -0.725,-5.677 -1.953,-8.227C89.08,36.36 83.841,34.574 79.152,37.237c-1.23,0.713 -2.245,1.743 -2.943,2.985z"
+      android:fillColor="#776161"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M73.377,69.895L73.377,60.562A0.412,0.412 0,0 1,73.789 60.15L77.67,60.15A0.412,0.412 0,0 1,78.082 60.562L78.082,69.895A0.412,0.412 0,0 1,77.67 70.307L73.789,70.307A0.412,0.412 0,0 1,73.377 69.895z"
+      android:fillColor="#CDD0DB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M73.377,69.895L73.377,60.562A0.412,0.412 0,0 1,73.789 60.15L77.67,60.15A0.412,0.412 0,0 1,78.082 60.562L78.082,69.895A0.412,0.412 0,0 1,77.67 70.307L73.789,70.307A0.412,0.412 0,0 1,73.377 69.895z"
+      android:strokeAlpha="0.05"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M73.377,69.912L73.377,59.955A0.1,0.1 0,0 1,73.477 59.855L77.982,59.855A0.1,0.1 0,0 1,78.082 59.955L78.082,69.912A0.1,0.1 0,0 1,77.982 70.012L73.477,70.012A0.1,0.1 0,0 1,73.377 69.912z"
+      android:fillColor="#413F8D"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M75.646,62.166m0,1a1,1 0,1 1,0 -2a1,1 0,1 1,0 2"
+      android:fillColor="#9DA7C0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M69.667,76.18s-1.37,3.894 0.228,3.894c1.599,0 4.568,-2.38 4.796,-4.328 0.228,-1.947 4.339,-9.303 1.37,-8.654 -2.969,0.65 -4.339,6.058 -4.339,6.058l-2.055,3.03z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M68.263,75.6l-0.62,1.811s-0.412,5.888 2.064,5.661c2.477,-0.226 5.06,-6.755 5.06,-6.755s-1.721,-3.487 -2.625,-4.63c-0.464,-0.589 -1.46,3.097 -2.02,3.25 -1.65,0.453 -1.86,0.662 -1.86,0.662z"
+      android:fillColor="#E1C825"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M91.639,60.04L84.646,82.942 94.182,85.082 101.174,62.823z"
+      android:fillColor="#444053"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M100.807,76.123l1.322,2.246s0.583,4.209 -2.381,4.209c-2.964,0 -7.198,-4.088 -7.198,-4.088s-2.117,-0.86 -3.387,-0.646c-1.27,0.215 -8.257,0 -5.293,-3.657 2.964,-3.658 8.045,0 8.045,0l5.293,2.582 2.752,-1.507 0.847,0.861z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M99.151,73.978l-1.984,3.32s4.564,0.623 4.96,1.66c0.397,1.038 -1.785,-5.395 -1.785,-5.395l-1.19,0.415z"
+      android:fillColor="#E1C825"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M91.915,74.187l-0.626,3.382 0.313,0.501 2.06,2.004 3.505,2.504c0.918,0.594 1.906,0.89 2.964,0.89 1.587,0 1.587,0.792 2.045,-1.391 0.305,-1.456 0.472,-2.458 0.5,-3.005 -0.028,-1.837 -0.195,-2.755 -0.5,-2.755h-5.009l-5.252,-2.13z"
+      android:fillColor="#E1C825"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M160,38L165,38L165,96.235L160,96.235z"
+      android:strokeAlpha="0.493"
+      android:fillColor="#535461"
+      android:fillType="nonZero"
+      android:fillAlpha="0.493"/>
+  <path
+      android:pathData="M162,89L214.644,89L214.644,97L162,97z"
+      android:fillColor="#413F8D"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M130.711,72L163.835,89.346L160.124,96.433L127,79.087z"
+      android:fillColor="#413F8D"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M162,93m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
+      android:fillColor="#413F8D"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M244.711,127.83l1.833,1.827 0.53,1.191c1.074,0.856 0.473,1.082 1.65,0.394l8.766,-7.703s4.382,-2.299 2.381,-5.471c-2,-3.172 -4.677,3.005 -4.677,3.005l-5.298,3.899 -2.844,-0.195 -2.34,3.055z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M289.364,150.266L294.472,149.933 292.769,157.424 286.98,155.094z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M242.849,136.381L254.636,124.782 261.371,130.07 274.672,146.274 273.157,148.662 256.993,137.575 246.048,152.073 235.609,146.786z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M242.849,136.381L254.636,124.782 261.371,130.07 274.672,146.274 273.157,148.662 256.993,137.575 246.048,152.073 235.609,146.786z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M241.495,144.428l1.521,1.224 12.336,-4.371 2.873,-1.224 5.745,1.224s-0,-4.896 -5.407,-4.721l-5.577,1.398 -6.59,0.525 -4.9,5.945z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M230.793,156.161L234.516,158.495 238.916,158.495 259.392,150.994 289.345,156.328 290.191,149.994 262.776,138.16 238.746,145.994z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M244.71,127.829l-0.095,0.32c1.375,0.625 2.241,1.2 2.597,1.728 0.358,0.527 0.405,1.298 0.143,2.312l4.8,-3.847c4.085,-2.9 5.713,-4.406 4.883,-4.517 -1.245,-0.166 -0.881,-1.173 -2.559,-1.443 -1.119,-0.179 -1.391,-0.253 -0.818,-0.222 -1.095,0.097 -1.925,0.466 -2.488,1.108 -0.565,0.642 -1.037,1.172 -1.418,1.59l-5.045,2.97z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M256.729,121.532L260.276,111.232A0.44,0.44 64,0 0,260.003 110.673L256.787,109.566A0.44,0.44 64,0 0,256.228 109.839L252.682,120.138A0.44,0.44 64,0 0,252.954 120.698L256.17,121.805A0.44,0.44 64,0 0,256.729 121.532z"
+      android:fillColor="#272655"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M256.729,121.532L260.276,111.232A0.44,0.44 64,0 0,260.003 110.673L256.787,109.566A0.44,0.44 64,0 0,256.228 109.839L252.682,120.138A0.44,0.44 64,0 0,252.954 120.698L256.17,121.805A0.44,0.44 64,0 0,256.729 121.532z"
+      android:strokeAlpha="0.05"
+      android:fillColor="#1A1938"
+      android:fillType="nonZero"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M256.621,121.847L260.384,110.918A0.107,0.107 64,0 0,260.318 110.782L256.473,109.458A0.107,0.107 64,0 0,256.336 109.524L252.573,120.453A0.107,0.107 64,0 0,252.64 120.589L256.485,121.913A0.107,0.107 64,0 0,256.621 121.847z"
+      android:fillColor="#413F8D"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M257.549,112.475m-0.326,0.946a1,1 71.98,1 0,0.651 -1.891a1,1 71.98,1 0,-0.651 1.891"
+      android:fillColor="#272655"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M238.017,108.461m6.689,0a6.689,6.689 0,1 0,-13.378 0a6.689,6.689 0,1 0,13.378 0"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M241.495,113.665l-3,7.372 -7.167,-3.086s2.334,-5.829 2.334,-6c-0,-0.172 7.833,1.714 7.833,1.714z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M223.034,146.516l0.498,1.523 2.387,10.848 2.556,0.678 1.876,-2.373 3.75,-2.712 2.727,-4.407 2.339,-3.875 0.73,-1.21 5.264,-10.22 6.668,-7.042c1.177,-1.34 1.96,-2.068 2.347,-2.186 0.387,-0.118 1.23,0.145 2.528,0.789l-1.978,-1.852 -5.795,0.305l-0.852,0l-2.383,-0.343 -1.919,-1.338 -4.944,-3.926 -3.028,-0.63 -4.353,-2.324 -1.783,0.29 -6.137,5.085c-1.569,4.216 -2.372,8.676 -2.371,13.172 -0,3.99 0.632,7.954 1.873,11.748z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M293.017,153.299s-1.558,-2.556 -0.9,-2.854c0.658,-0.298 3.451,-1.488 3.451,-1.488l4.097,-1.314S305.577,139.138 305.706,146.534c0.13,7.396 -4.304,9.174 -4.304,9.174s-3.954,8.24 -6.194,6.926c-2.24,-1.314 -4.482,-5.774 -4.482,-5.774s4.04,-2.102 2.29,-3.561z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M223.837,133.059L230.248,137.369 239.819,146.187 240.541,144.956 242.566,134.61 242.059,134.61 236.829,124.782z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M223.837,133.059L230.248,137.369 239.819,146.187 240.541,144.956 242.566,134.61 242.059,134.61 236.829,124.782z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M241.616,134.314L243.481,134.314 244.668,137.659 247.382,138.328 240.284,146.187 229.745,136.99 223.301,132.809 236.359,124.782z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M243.966,103.654l0.732,0.27c0.227,-0.147 0.383,-0.377 0.432,-0.637 0.05,-0.26 -0.013,-0.527 -0.171,-0.743l1.352,-0.06c-1.756,-2.248 -4.43,-3.665 -7.346,-3.89 -2.916,-0.226 -5.792,0.76 -7.9,2.709 -0.062,-0.204 -0.733,0.192 -1.008,0.594 -0.092,-0.331 -0.721,1.272 -0.944,2.405 -0.103,-0.377 -0.499,0.232 -0.152,0.817 -0.22,-0.031 -0.32,0.51 -0.149,0.81 -0.24,-0.108 -0.2,0.538 0.061,0.97 -0.343,-0.03 2.708,4.521 3.944,7.181 0.359,-1.584 0.762,-3.252 1.919,-4.432 0.196,-0.2 0.412,-0.383 0.627,-0.566l1.162,-0.986c1.352,-1.147 2.582,-2.562 4.384,-2.991 1.237,-0.295 2.02,-0.361 1.345,-1.702 0.61,0.245 1.18,0.608 1.794,0.835 -0.008,-0.187 -0.094,-0.397 -0.082,-0.584z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M227.155,92.339c1.537,-0.355 3.071,0.607 3.427,2.147 0.112,0.483 0.094,0.967 -0.031,1.413 0.613,0.074 2.114,0.249 4.539,0.476 3.276,0.307 4.204,2.321 4.204,2.321 -3.972,1.124 -9.813,9.217 -9.813,9.217 -2.093,-2.522 -2.1,-6.871 -2.1,-6.871l0.241,-3.055c-1.229,-0.078 -2.313,-0.952 -2.605,-2.216 -0.356,-1.54 0.601,-3.077 2.139,-3.432z"
+      android:fillColor="#F34E70"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M235.342,109.532m1.338,0a1.338,1.338 0,1 0,-2.676 0a1.338,1.338 0,1 0,2.676 0"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M240.425,146.187l18.576,-6.521c-0.25,-0.418 -0.405,-0.83 -0.466,-1.238 -0.061,-0.408 -0.061,-1.032 -0,-1.873l-11.883,1.605c-1.799,2.154 -3.16,3.747 -4.086,4.78 -0.926,1.032 -1.64,2.114 -2.14,3.247z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M236.577,115.083c0.083,0.074 0.166,0.148 0.25,0.215 1.841,0.51 3.832,0.191 5.422,-0.867 1.59,-1.06 2.61,-2.746 2.778,-4.592l-3.134,-0.107 -5.871,1.387c0.097,0.085 0.188,0.168 0.272,0.248l0.162,0.157c0.843,0.847 0.966,1.422 0.618,2.41l-0.069,0.184 -0.038,0.095 -0.083,0.2 -0.143,0.32 -0.164,0.35z"
+      android:fillColor="#00A690"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_gym.xml b/app/src/main/res/drawable/ic_illus_gym.xml
new file mode 100644
index 000000000..71082ede2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_gym.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M62.108,21.9l0.016,0.015c-0.006,-0.008 -0.053,-0.058 -0.016,-0.015zM16.147,33.448l-0.011,-0.012c-1.522,-1.522 -3.546,-2.36 -5.699,-2.36s-4.176,0.838 -5.698,2.36c-3.042,3.041 -3.14,7.928 -0.294,11.088 -0.792,0.4 -1.522,0.933 -2.16,1.59 -3.077,3.165 -3.041,8.28 0.075,11.396l4.05,4.074 -2.785,2.782c-1.099,1.098 -1.1,2.879 -0.002,3.978 0.549,0.55 1.27,0.825 1.99,0.825 0.719,0 1.438,-0.274 1.987,-0.823l2.776,-2.773L14.4,69.62c1.294,1.294 3.007,2.12 4.823,2.327 0.313,0.035 0.625,0.053 0.936,0.053 2.184,0 4.26,-0.871 5.807,-2.462 0.552,-0.568 1.002,-1.199 1.354,-1.87 1.55,1.469 3.543,2.205 5.538,2.205 2.064,0 4.128,-0.785 5.699,-2.357 3.14,-3.14 3.142,-8.247 0.006,-11.39L16.147,33.448zM21.931,65.618c-0.543,0.558 -1.3,0.827 -2.074,0.74 -0.394,-0.045 -0.97,-0.206 -1.474,-0.71l-12.04,-12.11c-0.959,-0.958 -0.97,-2.53 -0.024,-3.503 0.47,-0.483 1.098,-0.751 1.772,-0.756h0.018c0.588,0 1.145,0.202 1.588,0.57l12.557,12.706c0.594,0.951 0.49,2.227 -0.323,3.062zM34.578,63.538c-0.948,0.948 -2.488,0.95 -3.437,0.005L8.716,40.855c-0.949,-0.949 -0.949,-2.493 0,-3.442 0.46,-0.46 1.07,-0.712 1.72,-0.712 0.649,0 1.258,0.251 1.717,0.708l22.413,22.676 0.012,0.012c0.949,0.949 0.949,2.493 0,3.442z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M39.258,8.144c0.65,0 1.26,0.253 1.73,0.721l17.148,17.019c1.576,1.575 3.659,2.365 5.743,2.365 2.045,0 4.092,-0.76 5.66,-2.285 1.816,-1.766 2.694,-4.224 2.408,-6.743 -0.206,-1.815 -1.032,-3.528 -2.332,-4.827l-4.041,-4.018L68.347,7.6c1.097,-1.099 1.096,-2.88 -0.003,-3.978 -1.1,-1.097 -2.88,-1.096 -3.978,0.003L61.585,6.41l-4.068,-4.045c-3.122,-3.121 -8.237,-3.157 -11.403,-0.08 -0.663,0.644 -1.2,1.382 -1.602,2.184 -1.461,-1.26 -3.304,-1.95 -5.254,-1.95 -2.153,0 -4.176,0.838 -5.699,2.36 -1.522,1.522 -2.36,3.546 -2.36,5.698 0,2.153 0.838,4.177 2.354,5.693l9.058,9.115 -13.524,13.56c-1.097,1.1 -1.095,2.88 0.005,3.978 0.549,0.547 1.267,0.82 1.986,0.82 0.721,0 1.442,-0.275 1.992,-0.826l13.506,-13.542 9.258,9.316c1.522,1.522 3.546,2.36 5.698,2.36 2.153,0 4.177,-0.838 5.699,-2.36 1.098,-1.099 1.098,-2.88 0,-3.978 -1.098,-1.098 -2.88,-1.098 -3.978,0 -0.46,0.46 -1.07,0.713 -1.72,0.713 -0.65,0 -1.262,-0.253 -1.715,-0.706L37.537,12.298c-0.46,-0.46 -0.713,-1.07 -0.713,-1.72 0,-0.65 0.253,-1.262 0.713,-1.722 0.46,-0.46 1.07,-0.712 1.72,-0.712zM50.035,6.319c0.481,-0.468 1.109,-0.702 1.737,-0.702 0.642,0 1.285,0.244 1.773,0.732l12.098,12.028c0.51,0.51 0.67,1.086 0.715,1.479 0.088,0.776 -0.182,1.532 -0.74,2.075 -0.968,0.94 -2.528,0.934 -3.494,-0.016l-0.016,-0.015L50.01,9.872c-0.476,-0.476 -0.735,-1.109 -0.73,-1.782 0.004,-0.673 0.272,-1.302 0.755,-1.771z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_kitchen_area.xml b/app/src/main/res/drawable/ic_illus_kitchen_area.xml
new file mode 100644
index 000000000..e69f5c9aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_kitchen_area.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M16.547,18.703c0,-1.553 1.259,-2.812 2.812,-2.812L53.25,15.891c1.553,0 2.813,1.259 2.813,2.812 0,1.554 -1.26,2.813 -2.813,2.813L19.36,21.516c-1.554,0 -2.813,-1.26 -2.813,-2.813zM19.641,13.641c1.553,0 2.812,-1.26 2.812,-2.813 0,-1.553 -1.259,-2.812 -2.812,-2.812 -1.554,0 -2.813,1.259 -2.813,2.812 0,1.554 1.26,2.813 2.813,2.813zM29.625,13.641c1.553,0 2.813,-1.26 2.813,-2.813 0,-1.553 -1.26,-2.812 -2.813,-2.812 -1.553,0 -2.813,1.259 -2.813,2.812 0,1.554 1.26,2.813 2.813,2.813zM42.281,45.703c0,5.196 4.248,9.422 9.47,9.422h12.187c1.553,0 2.812,1.259 2.812,2.813v2.812C66.75,66.953 61.703,72 55.5,72L17.25,72C11.047,72 6,66.953 6,60.75v-49.5C6,5.047 11.047,0 17.25,0L55.5,0c6.203,0 11.25,5.047 11.25,11.25v34.453c0,1.554 -1.259,2.813 -2.813,2.813 -1.553,0 -2.812,-1.26 -2.812,-2.813 0,-5.18 -4.222,-9.396 -9.422,-9.422 -5.2,0.026 -9.422,4.243 -9.422,9.422zM11.625,11.25v22.745c2.552,-2.054 5.785,-3.3 9.303,-3.338h0.236c2.66,0.028 5.216,0.74 7.48,2.072 2.198,-1.29 4.75,-2.043 7.472,-2.072h0.236c2.716,0.029 5.323,0.77 7.622,2.155 2.228,-1.34 4.83,-2.125 7.611,-2.155h0.237c3.518,0.038 6.752,1.284 9.303,3.338L61.125,11.25c0,-3.101 -2.523,-5.625 -5.625,-5.625L17.25,5.625c-3.101,0 -5.625,2.524 -5.625,5.625zM36.235,55.125c1.139,-0.005 2.25,-0.212 3.293,-0.603 -1.805,-2.48 -2.872,-5.527 -2.872,-8.819 0,-3.292 1.067,-6.34 2.873,-8.82 -1.043,-0.39 -2.154,-0.596 -3.295,-0.602 -5.2,0.026 -9.422,4.243 -9.422,9.422 0,5.18 4.223,9.397 9.422,9.422zM21.188,45.703c0,-3.327 1.089,-6.405 2.93,-8.899 -0.978,-0.339 -2.01,-0.517 -3.071,-0.523 -5.2,0.026 -9.422,4.243 -9.422,9.422 0,5.18 4.222,9.397 9.422,9.422 1.057,-0.005 2.092,-0.183 3.071,-0.523 -1.841,-2.494 -2.93,-5.572 -2.93,-8.899zM61.124,60.75h-49.5c0,3.101 2.524,5.625 5.625,5.625L55.5,66.375c3.101,0 5.625,-2.524 5.625,-5.625z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_lecture_room.xml b/app/src/main/res/drawable/ic_illus_lecture_room.xml
new file mode 100644
index 000000000..ea50362ee
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_lecture_room.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M71.76,66.307c-0.315,-1.517 -1.801,-2.492 -3.319,-2.177 -1.13,0.236 -1.96,1.12 -2.18,2.185L50.553,66.315c1.155,-3.15 4.192,-5.334 7.618,-5.334h0.147c0.026,0 0.05,-0.003 0.075,-0.004 4.575,-0.08 8.273,-3.823 8.273,-8.417 0,-4.643 -3.777,-8.42 -8.421,-8.42 -4.643,0 -8.42,3.777 -8.42,8.42 0,1.737 0.528,3.353 1.433,4.695 -1.627,0.955 -3.051,2.236 -4.17,3.763 -1.12,-1.527 -2.544,-2.808 -4.17,-3.763 0.904,-1.342 1.433,-2.958 1.433,-4.695 0,-4.643 -3.778,-8.42 -8.421,-8.42 -4.644,0 -8.421,3.777 -8.421,8.42 0,1.737 0.529,3.353 1.433,4.695 -1.627,0.955 -3.05,2.236 -4.17,3.763 -1.12,-1.527 -2.543,-2.808 -4.17,-3.763 0.905,-1.342 1.433,-2.958 1.433,-4.695 0,-4.643 -3.777,-8.42 -8.421,-8.42 -4.643,0 -8.421,3.777 -8.421,8.42 0,1.737 0.529,3.353 1.434,4.695C3.357,59.173 0.908,62.41 0.099,66.307c-0.288,1.386 0.058,2.81 0.95,3.904 0.888,1.091 2.203,1.717 3.609,1.717h62.544c1.405,0 2.721,-0.626 3.609,-1.717 0.891,-1.095 1.237,-2.518 0.95,-3.904zM35.856,60.981h0.147c3.427,0 6.464,2.184 7.62,5.334L28.236,66.315c1.155,-3.15 4.193,-5.334 7.62,-5.334zM58.245,49.753c1.548,0 2.807,1.26 2.807,2.807 0,1.548 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.26,-2.807 2.807,-2.807zM35.93,49.753c1.547,0 2.807,1.26 2.807,2.807 0,1.548 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.259,-2.807 2.807,-2.807zM13.614,49.753c1.548,0 2.807,1.26 2.807,2.807 0,1.548 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.26,-2.807 2.807,-2.807zM5.92,66.315c1.155,-3.15 4.194,-5.334 7.62,-5.334h0.147c3.428,0 6.466,2.184 7.622,5.334L5.919,66.315zM12.948,37.153c0.483,0.93 1.443,1.512 2.49,1.512h6.597v2.667c0,1.55 1.257,2.807 2.807,2.807s2.807,-1.256 2.807,-2.807v-5.474c0,-1.55 -1.257,-2.807 -2.807,-2.807h-7.698l-2.698,-5.192h42.967l-2.698,5.192h-7.558c-1.55,0 -2.807,1.258 -2.807,2.807v5.474c0,1.55 1.257,2.807 2.807,2.807s2.807,-1.256 2.807,-2.807v-2.667h6.456c1.048,0 2.009,-0.583 2.492,-1.512l5.613,-10.807c0.256,-0.492 0.355,-1.04 0.302,-1.574 0.01,-0.092 0.014,-0.187 0.014,-0.281v-8.842c0,-0.902 -0.433,-1.748 -1.163,-2.276l-4.312,-3.114 0.002,-0.084c0,-2.713 -2.2,-4.912 -4.913,-4.912 -2.712,0 -4.912,2.2 -4.912,4.912 0,2.713 2.2,4.912 4.912,4.912 0.57,0 1.117,-0.097 1.625,-0.276l3.147,2.273v5.161h-9.78l-0.002,-0.007c-0.81,-3.896 -3.26,-7.134 -6.528,-9.052 0.905,-1.342 1.433,-2.958 1.433,-4.695 0,-4.643 -3.777,-8.42 -8.42,-8.42 -4.644,0 -8.421,3.777 -8.421,8.42 0,1.737 0.528,3.353 1.433,4.695 -3.269,1.918 -5.718,5.156 -6.528,9.052v0.007L9.823,22.245c-0.98,0 -1.89,0.512 -2.399,1.35 -0.508,0.838 -0.543,1.88 -0.091,2.751l5.614,10.807zM35.93,5.683c1.547,0 2.807,1.26 2.807,2.808 0,1.547 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.259,-2.807 2.807,-2.807zM35.856,16.912h0.147c3.427,0 6.466,2.183 7.621,5.333L28.235,22.245c1.156,-3.15 4.194,-5.333 7.621,-5.333z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_library.xml b/app/src/main/res/drawable/ic_illus_library.xml
new file mode 100644
index 000000000..f1d26f625
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_library.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M42.328,60.75h26.86c1.553,0 2.812,-1.26 2.812,-2.813L72,25.313c0,-1.554 -1.26,-2.813 -2.813,-2.813L54.984,22.5v-8.438c0,-1.553 -1.259,-2.812 -2.812,-2.812L38.109,11.25L38.109,2.812C38.11,1.26 36.85,0 35.297,0L8.437,0C3.785,0 0,3.785 0,8.438v32.624C0,45.715 3.785,49.5 8.438,49.5h8.437v2.813c0,4.652 3.785,8.437 8.438,8.437h8.578v2.813c0,4.652 3.785,8.437 8.437,8.437h26.86C70.74,72 72,70.74 72,69.187c0,-1.553 -1.26,-2.812 -2.813,-2.812L42.328,66.375c-1.55,0 -2.812,-1.262 -2.812,-2.813 0,-1.55 1.261,-2.812 2.812,-2.812zM66.375,55.125L50.906,55.125L50.906,36.562c0,-1.553 -1.259,-2.812 -2.812,-2.812 -1.554,0 -2.813,1.26 -2.813,2.813v18.562h-2.953c-0.986,0 -1.932,0.17 -2.812,0.482v-24.67c0,-1.55 1.261,-2.812 2.812,-2.812h24.047v27zM49.359,22.5h-7.03c-4.653,0 -8.438,3.785 -8.438,8.438v12.937h-8.578c-0.986,0 -1.933,0.172 -2.813,0.484L22.5,19.687c0,-1.55 1.262,-2.812 2.813,-2.812h24.046L49.359,22.5zM8.437,5.625h24.047v5.625h-7.172c-4.652,0 -8.437,3.785 -8.437,8.438v12.937L8.437,32.625c-0.985,0 -1.932,0.172 -2.812,0.484L5.625,8.437c0,-1.55 1.262,-2.812 2.813,-2.812zM8.437,43.875c-1.55,0 -2.812,-1.262 -2.812,-2.813 0,-1.55 1.262,-2.812 2.813,-2.812h8.437v5.625L8.437,43.875zM25.313,55.125c-1.551,0 -2.813,-1.262 -2.813,-2.813 0,-1.55 1.262,-2.812 2.813,-2.812h8.578v5.625h-8.578z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_meeting.xml b/app/src/main/res/drawable/ic_illus_meeting.xml
new file mode 100644
index 000000000..facb30b6c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_meeting.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M72,8.517L72,24.68c0,4.696 -3.82,8.517 -8.517,8.517 -0.65,0 -1.18,0.53 -1.18,1.18v3.43c0,1.606 -0.958,3.04 -2.44,3.654 -0.493,0.204 -1.008,0.303 -1.518,0.303 -1.027,0 -2.034,-0.401 -2.792,-1.16l-0.035,-0.036 -5.419,-5.616c-0.704,-0.702 -1.136,-1.009 -1.768,-1.257 -1.446,-0.568 -2.157,-2.2 -1.59,-3.646 0.568,-1.446 2.2,-2.158 3.647,-1.59 1.7,0.668 2.785,1.612 3.706,2.532 0.011,0.013 0.024,0.024 0.035,0.036l2.582,2.677c0.34,-3.438 3.247,-6.133 6.772,-6.133 1.595,0 2.892,-1.297 2.892,-2.89L66.375,8.516c0,-1.595 -1.297,-2.892 -2.892,-2.892L50.906,5.624c-1.553,0 -2.812,-1.259 -2.812,-2.813C48.094,1.26 49.353,0 50.906,0h12.577C68.18,0 72,3.82 72,8.517zM21.375,19.828c1.553,0 2.813,-1.259 2.813,-2.812 0,-1.554 -1.26,-2.813 -2.813,-2.813 -1.553,0 -2.813,1.26 -2.813,2.813 0,1.553 1.26,2.812 2.813,2.812zM31.219,19.828c1.553,0 2.812,-1.259 2.812,-2.812 0,-1.554 -1.259,-2.813 -2.812,-2.813 -1.554,0 -2.813,1.26 -2.813,2.813 0,1.553 1.26,2.812 2.813,2.812zM11.672,19.828c1.553,0 2.812,-1.259 2.812,-2.812 0,-1.554 -1.259,-2.813 -2.812,-2.813 -1.554,0 -2.813,1.26 -2.813,2.813 0,1.553 1.26,2.812 2.813,2.812zM72,67.954v1.234C72,70.74 70.741,72 69.187,72c-1.553,0 -2.812,-1.259 -2.812,-2.813v-1.233c0,-0.565 -0.233,-1.097 -0.641,-1.46 -1.427,-1.274 -3.902,-2.79 -7.586,-2.79 -3.683,0 -6.158,1.516 -7.585,2.79 -0.408,0.363 -0.641,0.895 -0.641,1.46v1.234c0,1.553 -1.26,2.812 -2.813,2.812 -1.553,0 -2.812,-1.259 -2.812,-2.813v-1.233c0,-0.562 -0.235,-1.092 -0.644,-1.455 -1.44,-1.275 -3.936,-2.796 -7.653,-2.796 -3.717,0 -6.213,1.52 -7.652,2.796 -0.41,0.363 -0.645,0.893 -0.645,1.455v1.234c0,1.553 -1.259,2.812 -2.812,2.812 -1.554,0 -2.813,-1.259 -2.813,-2.813v-1.233c0,-0.565 -0.233,-1.097 -0.64,-1.46 -1.428,-1.274 -3.903,-2.79 -7.586,-2.79 -3.684,0 -6.159,1.516 -7.586,2.79 -0.408,0.363 -0.641,0.895 -0.641,1.46v1.234C5.625,70.74 4.366,72 2.812,72 1.26,72 0,70.741 0,69.187v-1.233c0,-2.167 0.919,-4.23 2.522,-5.659 1.048,-0.934 2.464,-1.955 4.268,-2.758 -0.74,-1.255 -1.165,-2.714 -1.165,-4.271 0,-4.653 3.785,-8.438 8.438,-8.438 4.652,0 8.437,3.785 8.437,8.438 0,1.62 -0.46,3.136 -1.256,4.422 1.493,0.705 2.707,1.554 3.652,2.36 0.992,-0.84 2.275,-1.728 3.867,-2.45 -0.762,-1.267 -1.2,-2.75 -1.2,-4.332 0,-4.653 3.784,-8.438 8.437,-8.438s8.438,3.785 8.438,8.438c0,1.583 -0.44,3.065 -1.2,4.332 1.59,0.722 2.874,1.61 3.866,2.45 0.991,-0.845 2.277,-1.737 3.87,-2.461 -0.756,-1.266 -1.193,-2.743 -1.193,-4.321 0,-4.653 3.785,-8.438 8.438,-8.438 4.652,0 8.437,3.785 8.437,8.438 0,1.599 -0.447,3.096 -1.223,4.371 1.698,0.787 3.04,1.762 4.045,2.658C71.081,63.725 72,65.787 72,67.954zM11.25,55.266c0,1.55 1.262,2.812 2.813,2.812 1.55,0 2.812,-1.262 2.812,-2.812 0,-1.551 -1.262,-2.813 -2.813,-2.813 -1.55,0 -2.812,1.262 -2.812,2.813zM36,58.078c1.55,0 2.813,-1.262 2.813,-2.812 0,-1.551 -1.262,-2.813 -2.813,-2.813 -1.55,0 -2.813,1.262 -2.813,2.813 0,1.55 1.262,2.812 2.813,2.812zM55.406,55.266c0,1.55 1.262,2.812 2.813,2.812 1.55,0 2.812,-1.262 2.812,-2.812 0,-1.551 -1.262,-2.813 -2.812,-2.813 -1.551,0 -2.813,1.262 -2.813,2.813zM0,24.68L0,8.517C0,3.82 3.82,0 8.517,0h25.857c4.696,0 8.517,3.82 8.517,8.517L42.891,24.68c0,4.696 -3.82,8.517 -8.517,8.517h-8.212c-1.608,0 -3.12,0.623 -4.262,1.756l-5.418,5.615 -0.035,0.036c-0.759,0.759 -1.765,1.16 -2.792,1.16 -0.51,0 -1.025,-0.099 -1.517,-0.303 -1.483,-0.614 -2.441,-2.047 -2.441,-3.653v-3.43c0,-0.652 -0.53,-1.181 -1.18,-1.181C3.82,33.198 0,29.377 0,24.68zM5.625,24.68c0,1.594 1.297,2.892 2.892,2.892 3.525,0 6.433,2.694 6.772,6.132l2.582,-2.677 0.036,-0.036c2.205,-2.205 5.136,-3.42 8.255,-3.42h8.212c1.595,0 2.892,-1.297 2.892,-2.89L37.266,8.516c0,-1.595 -1.297,-2.892 -2.892,-2.892L8.517,5.624c-1.595,0 -2.892,1.297 -2.892,2.892L5.625,24.68z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_office_space.xml b/app/src/main/res/drawable/ic_illus_office_space.xml
new file mode 100644
index 000000000..973dafea0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_office_space.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M71.93,44.771v24.281c0,1.55 -1.258,2.808 -2.808,2.808 -1.55,0 -2.807,-1.257 -2.807,-2.808v-24.28c0,-1.548 -1.26,-2.808 -2.807,-2.808h-1.946l-0.042,0.217c-1.429,7.435 -7.503,13.014 -14.854,13.957v7.695c6.027,0.516 10.41,2.588 10.619,2.688 1.397,0.671 1.986,2.348 1.315,3.746 -0.483,1.005 -1.487,1.593 -2.533,1.593 -0.405,0 -0.816,-0.089 -1.206,-0.274 -0.067,-0.032 -4.84,-2.254 -10.862,-2.254 -6.097,0 -10.808,2.228 -10.855,2.25 -1.397,0.67 -3.074,0.082 -3.745,-1.315 -0.67,-1.398 -0.082,-3.075 1.315,-3.746 0.206,-0.098 4.456,-2.108 10.338,-2.662v-7.746c-7.273,-0.69 -13.44,-3.301 -13.737,-3.428 -1.425,-0.611 -2.085,-2.261 -1.475,-3.686 0.61,-1.424 2.26,-2.084 3.684,-1.475 0.102,0.043 7.473,3.142 14.928,3.142 5.632,0 10.492,-4.014 11.555,-9.545l4.727,-24.577c0.069,-0.52 0.34,-2.11 1.227,-3.722 1.511,-2.747 4.054,-4.26 7.16,-4.26 1.551,0 2.808,1.256 2.808,2.806s-1.257,2.807 -2.807,2.807c-1.015,0 -1.668,0.374 -2.184,1.25 -0.486,0.826 -0.623,1.735 -0.639,1.85 -0.007,0.093 -0.017,0.142 -0.035,0.237L62.642,36.35h0.866c4.643,0 8.421,3.778 8.421,8.421zM47.789,41.964L8.49,41.964c-1.547,0 -2.807,1.26 -2.807,2.807v24.281c0,1.55 -1.256,2.807 -2.807,2.807 -1.55,0 -2.807,-1.256 -2.807,-2.807v-24.28c0,-4.644 3.778,-8.422 8.421,-8.422h3.507c-0.261,-0.63 -0.456,-1.3 -0.573,-2l-1.492,-8.904c-0.136,-0.814 0.093,-1.647 0.626,-2.277 0.533,-0.63 1.317,-0.994 2.143,-0.994h3.897c-0.158,-0.439 -0.372,-0.913 -0.663,-1.395 -1.48,-2.453 -4.232,-4.026 -8.182,-4.677 -1.53,-0.252 -2.565,-1.696 -2.313,-3.226 0.251,-1.53 1.697,-2.566 3.226,-2.313 3.265,0.537 5.753,1.57 7.65,2.8 -0.832,-2.96 -2.167,-6.078 -4.297,-8.845 -0.945,-1.229 -0.715,-2.992 0.514,-3.937 1.23,-0.945 2.991,-0.715 3.936,0.513 3.063,3.982 4.765,8.499 5.698,12.56 1.786,-3.52 4.683,-6.99 9.384,-8.948 1.43,-0.596 3.074,0.08 3.67,1.512 0.597,1.43 -0.08,3.074 -1.511,3.67 -3.438,1.432 -5.95,4.275 -7.466,8.448 -0.51,1.4 -0.823,2.736 -1.019,3.838h2.914c0.825,0 1.609,0.363 2.142,0.994 0.534,0.63 0.763,1.463 0.626,2.277l-1.492,8.905c-0.117,0.7 -0.311,1.369 -0.572,2h18.945c1.55,0 2.807,1.256 2.807,2.806s-1.257,2.807 -2.807,2.807zM20.42,36.35c1.72,0 3.174,-1.23 3.459,-2.927l0.943,-5.634h-2.678l-0.04,0.002 -0.04,-0.002h-6.047l0.944,5.634c0.284,1.697 1.739,2.927 3.46,2.927z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_other.xml b/app/src/main/res/drawable/ic_illus_other.xml
new file mode 100644
index 000000000..148291144
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_other.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M67.827,63.6c-0.09,-0.108 -0.186,-0.213 -0.284,-0.314 -0.046,-0.078 -0.095,-0.155 -0.148,-0.229 -5.88,-8.127 -13.13,-12.495 -20.991,-12.662 -0.488,-3.839 -1.274,-7.567 -2.349,-11.149 4.134,-0.532 7.338,-4.072 7.338,-8.349 0,-4.642 -3.777,-8.42 -8.42,-8.42 -1.42,0 -2.759,0.355 -3.933,0.978 -0.362,-1.127 -0.955,-2.151 -1.724,-3.017 8.207,-3.005 17.606,-4.166 24.897,4.733 -0.517,0.044 -1.038,0.078 -1.562,0.1 -1.55,0.066 -2.751,1.375 -2.685,2.924 0.063,1.508 1.306,2.688 2.802,2.688l0.121,-0.003c2.324,-0.1 4.61,-0.39 6.794,-0.867 0.882,-0.192 1.617,-0.797 1.977,-1.624 0.36,-0.828 0.299,-1.778 -0.163,-2.554 -2.746,-4.615 -6.124,-8.073 -10.042,-10.28 -1.49,-0.838 -3.062,-1.497 -4.706,-1.977 3.229,-2.373 5.785,-4.88 7.734,-7.577 0.533,-0.738 0.676,-1.69 0.381,-2.552 -0.294,-0.862 -0.988,-1.527 -1.862,-1.785C57.353,0.59 54.26,0.045 51.55,0.004c-6.42,-0.1 -11.984,2.055 -16.097,6.233 -0.611,0.621 -1.187,1.286 -1.723,1.985 -0.569,-1.288 -1.417,-2.587 -2.678,-3.712 -2.577,-2.298 -6.155,-2.798 -8.704,-2.813 -2.02,-0.017 -3.54,0.3 -3.707,0.337 -0.778,0.165 -1.449,0.654 -1.846,1.343 -0.398,0.688 -0.484,1.514 -0.238,2.27 0.117,0.359 0.405,1.197 0.858,2.224 -2.812,0.018 -5.696,0.629 -8.57,1.835 -2.628,1.103 -5.236,2.67 -7.754,4.66 -0.704,0.556 -1.1,1.416 -1.065,2.312 0.036,0.897 0.497,1.723 1.243,2.223 2.756,1.845 5.858,3.316 9.042,4.32 -2.098,1.67 -3.814,3.714 -5.118,6.109 -2.05,3.766 -3.089,8.43 -3.089,13.864 0,0.824 0.363,1.607 0.99,2.14 0.512,0.434 1.157,0.667 1.817,0.667 0.152,0 0.305,-0.012 0.457,-0.037 5.026,-0.83 10.128,-3.196 14.755,-6.847 1.217,-0.96 1.425,-2.725 0.465,-3.942s-2.725,-1.425 -3.943,-0.465c-2.077,1.64 -5.1,3.625 -8.73,4.846C9.227,28.106 16.79,24.9 22.874,23.89c-0.178,0.68 -0.274,1.395 -0.274,2.131 0,4.643 3.778,8.42 8.42,8.42 1.42,0 2.76,-0.354 3.934,-0.977 0.478,1.49 1.362,2.8 2.52,3.803 1.564,4.206 2.669,8.68 3.296,13.345 -6.84,0.988 -13.13,5.24 -18.343,12.445 -0.053,0.075 -0.102,0.151 -0.148,0.23 -0.098,0.1 -0.193,0.205 -0.284,0.314 -1.479,1.77 -2.948,2.786 -4.03,2.786 -1.082,0 -2.55,-1.016 -4.03,-2.786 -1.202,-1.44 -3.008,-2.267 -4.952,-2.267s-3.75,0.826 -4.952,2.267C2.55,65.371 1.082,66.387 0,66.387L0,72c2.872,0 5.678,-1.615 8.338,-4.8 0.132,-0.158 0.373,-0.252 0.644,-0.252 0.272,0 0.512,0.094 0.644,0.252 2.661,3.185 5.466,4.8 8.338,4.8 2.872,0 5.677,-1.615 8.338,-4.8 0.132,-0.158 0.373,-0.252 0.644,-0.252 0.272,0 0.513,0.094 0.645,0.252 2.66,3.185 5.465,4.8 8.338,4.8 2.871,0 5.677,-1.615 8.338,-4.8 0.131,-0.158 0.372,-0.252 0.643,-0.252 0.272,0 0.513,0.094 0.645,0.252 2.66,3.185 5.466,4.8 8.338,4.8 2.872,0 5.677,-1.615 8.338,-4.8 0.131,-0.158 0.372,-0.252 0.644,-0.252 0.271,0 0.512,0.094 0.644,0.252 2.66,3.185 5.466,4.8 8.338,4.8v-5.613c-1.083,-0.001 -2.55,-1.016 -4.03,-2.787zM42.973,28.09c1.547,0 2.806,1.26 2.806,2.807 0,1.548 -1.259,2.807 -2.806,2.807 -1.548,0 -2.807,-1.259 -2.807,-2.807 0,-1.547 1.259,-2.806 2.807,-2.806zM51.463,5.616c1.096,0.017 2.293,0.142 3.609,0.38 -2.41,2.341 -5.523,4.558 -9.415,6.711l-0.031,0.02c-3.52,0.288 -6.768,1.186 -9.377,2.103 2.085,-4.544 6.673,-9.347 15.214,-9.214zM27.316,8.7c0.93,0.829 1.415,1.915 1.666,2.901 -1.115,-0.798 -2.303,-1.485 -3.54,-2.039 -0.161,-0.145 -0.34,-0.274 -0.54,-0.381 -0.411,-0.221 -0.94,-0.92 -1.458,-1.817 1.691,0.15 3.069,0.62 3.872,1.336zM11.02,14.883c7.585,-3.185 13.318,-0.395 16.627,2.909 -2.187,0.114 -5.516,0.309 -9.091,1.321 -0.047,-0.004 -0.093,-0.012 -0.14,-0.015 -3.34,-0.202 -6.982,-1.195 -10.296,-2.76 0.965,-0.564 1.933,-1.05 2.9,-1.455zM31.02,28.828c-1.547,0 -2.806,-1.26 -2.806,-2.807 0,-1.548 1.259,-2.807 2.807,-2.807s2.807,1.26 2.807,2.807c0,1.548 -1.26,2.807 -2.807,2.807zM57.923,63.6c-1.479,1.77 -2.947,2.786 -4.03,2.786 -1.082,0 -2.55,-1.015 -4.029,-2.786 -1.203,-1.44 -3.009,-2.266 -4.953,-2.266 -1.944,0 -3.749,0.826 -4.952,2.266 -1.478,1.77 -2.947,2.786 -4.03,2.786 -1.082,0 -2.55,-1.015 -4.03,-2.786 -0.435,-0.52 -0.95,-0.96 -1.521,-1.31 4.109,-4.176 8.635,-6.288 13.505,-6.29l0.002,0.001h2.05c4.872,0 9.4,2.112 13.51,6.288 -0.571,0.35 -1.086,0.79 -1.522,1.311z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_private_event.xml b/app/src/main/res/drawable/ic_illus_private_event.xml
new file mode 100644
index 000000000..ec124b779
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_private_event.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M71.93,41.548c0,0.632 -0.06,1.273 -0.176,1.905 -0.28,1.525 -1.74,2.534 -3.267,2.255 -1.524,-0.28 -2.534,-1.743 -2.255,-3.267 0.055,-0.299 0.083,-0.6 0.083,-0.893 0,-3.32 -1.91,-7.734 -3.212,-10.25L49.32,31.298c-0.742,1.439 -1.684,3.498 -2.355,5.614L58.89,36.912c1.55,0 2.807,1.257 2.807,2.807s-1.257,2.807 -2.807,2.807L46.212,42.526c0.806,3.82 6.001,8.296 9.998,8.296 1.05,0 2.42,-0.369 3.665,-0.986 1.39,-0.69 3.073,-0.122 3.762,1.268 0.689,1.388 0.121,3.073 -1.267,3.761 -1.098,0.544 -2.235,0.955 -3.353,1.22v8.616c3.992,0.439 7.379,1.649 7.552,1.711 1.457,0.528 2.212,2.137 1.684,3.595 -0.413,1.142 -1.49,1.853 -2.64,1.853 -0.317,0 -0.64,-0.055 -0.955,-0.169 -0.039,-0.014 -4.316,-1.533 -8.362,-1.533 -4.034,0 -8.196,1.512 -8.237,1.527 -1.454,0.534 -3.068,-0.21 -3.603,-1.662 -0.537,-1.453 0.204,-3.065 1.656,-3.603 0.167,-0.062 3.393,-1.243 7.291,-1.698v-8.644c-2.637,-0.647 -5.367,-2.145 -7.69,-4.273 -3.318,-3.043 -5.222,-6.782 -5.222,-10.257 0,-6.424 4.561,-14.166 4.756,-14.492 0.505,-0.851 1.422,-1.372 2.412,-1.372h17.102c0.99,0 1.906,0.521 2.412,1.372 0.194,0.326 4.756,8.068 4.756,14.492zM33.24,35.891c2.204,5.037 3.32,10.38 3.32,15.878v17.283c0,1.55 -1.256,2.807 -2.806,2.807L2.877,71.859c-1.55,0 -2.807,-1.256 -2.807,-2.807L0.07,51.77c0,-5.498 1.118,-10.84 3.321,-15.878l5.886,-13.454c0.41,-0.936 0.617,-1.928 0.617,-2.95L9.894,5.522C8.684,5.21 7.79,4.115 7.79,2.807 7.789,1.257 9.046,0 10.596,0h15.439c1.55,0 2.807,1.257 2.807,2.807 0,1.308 -0.896,2.403 -2.106,2.715v13.965c0,1.022 0.208,2.014 0.618,2.95l5.886,13.454zM30.947,51.769c0,-4.72 -0.96,-9.304 -2.85,-13.628L22.21,24.687c-0.722,-1.65 -1.088,-3.4 -1.088,-5.2L21.122,5.614L15.51,5.614v13.873c0,1.801 -0.366,3.55 -1.088,5.2L9.072,36.913L20.14,36.913c1.55,0 2.807,1.257 2.807,2.807s-1.257,2.807 -2.807,2.807L6.963,42.527c-0.848,2.996 -1.279,6.09 -1.279,9.243v14.476h25.263L30.947,51.77z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_shop.xml b/app/src/main/res/drawable/ic_illus_shop.xml
new file mode 100644
index 000000000..b29bc4209
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illus_shop.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M69.188,39.516h-9.422L59.766,38.39c0,-6.048 -4.92,-10.97 -10.97,-10.97 -6.048,0 -10.968,4.922 -10.968,10.97v1.125L27.562,39.515c-1.553,0 -2.812,1.259 -2.812,2.812v18.844c0,1.868 0.46,3.642 1.324,5.203L11.25,66.374c-3.207,0 -5.625,-2.237 -5.625,-5.203L5.625,19.125h13.078v2.813c0,1.553 1.26,2.812 2.813,2.812 1.553,0 2.812,-1.259 2.812,-2.813v-2.812h10.688v2.813c0,1.553 1.259,2.812 2.812,2.812 1.554,0 2.813,-1.259 2.813,-2.813v-2.812h13.5v2.813c0,1.553 1.259,2.812 2.812,2.812 1.554,0 2.813,-1.259 2.813,-2.813v-5.625c0,-1.553 -1.26,-2.812 -2.813,-2.812L40.641,13.5v-2.531C40.64,4.92 35.72,0 29.67,0c-6.048,0 -10.968,4.92 -10.968,10.969L18.702,13.5L2.813,13.5C1.258,13.5 0,14.759 0,16.313v44.859c0,3.017 1.196,5.792 3.367,7.813C5.455,70.93 8.255,72 11.25,72h49.5C66.953,72 72,66.953 72,60.75L72,42.328c0,-1.553 -1.259,-2.812 -2.813,-2.812zM24.328,10.969c0,-2.947 2.397,-5.344 5.344,-5.344 2.946,0 5.344,2.397 5.344,5.344L35.016,13.5L24.328,13.5v-2.531zM43.453,38.39c0,-2.947 2.397,-5.344 5.344,-5.344 2.946,0 5.344,2.397 5.344,5.344v1.125L43.453,39.515L43.453,38.39zM66.375,60.75c0,3.101 -2.524,5.625 -5.625,5.625L36,66.375c-3.207,0 -5.625,-2.237 -5.625,-5.203L30.375,45.14h7.453v2.953c0,1.553 1.26,2.812 2.813,2.812 1.553,0 2.812,-1.259 2.812,-2.812L43.453,45.14h10.688v2.953c0,1.553 1.259,2.812 2.812,2.812 1.554,0 2.813,-1.259 2.813,-2.812L59.766,45.14h6.609L66.375,60.75z"
+      android:fillColor="#000"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notification_off.xml b/app/src/main/res/drawable/ic_notification_off.xml
new file mode 100644
index 000000000..f043d43f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,18.69L7.84,6.14 5.27,3.49 4,4.76l2.8,2.8v0.01c-0.52,0.99 -0.8,2.16 -0.8,3.42v5l-2,2v1h13.73l2,2L21,19.72l-1,-1.03zM12,22c1.11,0 2,-0.89 2,-2h-4c0,1.11 0.89,2 2,2zM18,14.68L18,11c0,-3.08 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.15,0.03 -0.29,0.08 -0.42,0.12 -0.1,0.03 -0.2,0.07 -0.3,0.11h-0.01c-0.01,0 -0.01,0 -0.02,0.01 -0.23,0.09 -0.46,0.2 -0.68,0.31 0,0 -0.01,0 -0.01,0.01L18,14.68z"
+      android:fillColor="#E20008"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_snooze.xml b/app/src/main/res/drawable/ic_snooze.xml
new file mode 100644
index 000000000..a86579ee0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_snooze.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#413F8D"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7zM9,11h3.63L9,15.2L9,17h6v-2h-3.63L15,10.8L15,9L9,9v2z"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccf0b1c4f..4f42fccc9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1436,4 +1436,71 @@ Contact the Covidcode Infoline:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow"></string>
+
+    <!-- Reminder: Option Off -->
+    <string name="reminder_option_off">"off"</string>
+
+    <!-- Reminder Option with an amount of hours -->
+    <string name="reminder_option_hours">"{HOURS} h"</string>
+
+    <!-- Reminder Option with an amount of minutes -->
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+
+    <string name="error_network_title">"Connection error"</string>
+    <string name="error_network_text">"Check your internet connection"</string>
+    <string name="error_notification_deactivated_title">"Deactivate notifications"</string>
+    <string name="error_notification_deactivated_text">"Edit the app settings to receive report-notifications."</string>
+    <string name="error_background_refresh_title">"Background updates are off"</string>
+    <string name="error_background_refresh_text">"Edit the app settings to be informed at all times."</string>
+    <string name="error_camera_permission_title">"No camera access"</string>
+    <string name="error_camera_permission_text">"The app needs camera access to scan the QR code."</string>
+    <string name="error_action_change_settings">"Edit settings"</string>
+    <string name="error_action_retry">"Try again"</string>
+
+    <!-- Titel einer generischen Fehleranzeige -->
+    <string name="error_title">"Error"</string>
+
+    <!-- Fehlermeldung, wenn man bereits eingecheckt ist -->
+    <string name="error_already_checked_in">"You are already checked in."</string>
+
+    <string name="qr_scanner_error_code_not_yet_valid">"Code is not valid yet"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Code is not valid anymore"</string>
+
+    <!-- QR Code Scanner: no valid code text -->
+    <!-- Fuzzy -->
+    <string name="qrscanner_error">"No valid code!"</string>
+
+    <!-- Titel der Notification, welche erscheint, wenn der Benutzer automatisch ausgecheckt wurde nach 12 Stunden. -->
+    <string name="auto_checkout_title">"Automated checkout"</string>
+
+    <!-- Nachrichttext der Notification, welche erscheint, wenn der Benutzer automatisch ausgecheckt wurde nach 12 Stunden. -->
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
+
+    <!-- Title for an exposure notification. -->
+    <string name="exposure_notification_title">"New message"</string>
+
+    <!-- Body text for an exposure notification. -->
+    <string name="exposure_notification_body">"Open the app to read the message"</string>
+
+    <!-- Notification Channel name on Android Devices (Only visible in System Settings) -->
+    <string name="android_crowdnotifier_notification_channel_name">"Reports"</string>
+
+    <!-- Reminder Notification Title -->
+    <string name="checkout_reminder_title">"Check-Out Reminder"</string>
+
+    <!-- Reminder Checkout Text -->
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+
+    <!-- Notification Channel name for Ongoing Checkin Notifications on Android Devices (Only visible in System Settings) -->
+    <string name="android_ongoing_checkin_notification_channel_name">"Ongoing Check-in Notification"</string>
+
+    <!-- Titel der Ongoing Notification, welche während des ganzen Check Ins angezeigt wird im Notificaiton Center. -->
+    <string name="ongoing_notification_title">"You are checked in since {TIME}."</string>
+
+    <!-- Quick Action der Ongoing Notification, welche während des ganzen Check Ins angezeigt wird im Notificaiton Center. -->
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+
+    <!-- Quick Action bei einer Reminder Notification, welche einen neuen Reminder setzt in 30 Minuten. -->
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5d08bb591..d730aeb42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,13 +21,21 @@ buildscript {
 	dependencies {
 		classpath 'com.android.tools.build:gradle:4.1.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
 	}
 }
 
 allprojects {
 	repositories {
 		google()
+		jcenter()
 		mavenCentral()
+		maven {
+			url  "https://dl.bintray.com/terl/lazysodium-maven"
+		}
+		maven {
+			url "https://dl.bintray.com/crowdnotifier/crowdnotifier-sdk-android"
+		}
 	}
 }
 

From 5035cdb095e64df76df6afed50c99b8b847e81e8 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 28 Apr 2021 08:41:26 +0200
Subject: [PATCH 004/207] Reorder package structure

---
 app/src/main/AndroidManifest.xml                   |  6 +++---
 .../CrowdNotifierViewModel.java                    | 14 +++++++-------
 .../model => checkin/models}/CheckInState.java     |  2 +-
 .../models}/CrowdNotifierErrorState.java           |  2 +-
 .../model => checkin/models}/DiaryEntry.java       |  2 +-
 .../model => checkin/models}/ReminderOption.java   |  2 +-
 .../networking/CrowdNotifierKeyLoadWorker.java     |  8 ++++----
 .../networking/TraceKeysRepository.java            |  5 ++---
 .../networking}/TraceKeysService.java              |  2 +-
 .../startup/BootCompletedReceiver.java             |  8 ++++----
 .../dp3t/{ => checkin}/storage/DiaryStorage.java   |  9 ++++-----
 .../utils}/CrowdNotifierReminderHelper.java        |  9 +++++----
 .../utils}/NotificationHelper.java                 |  3 ++-
 .../utils}/NotificationQuickActionReceiver.java    |  4 ++--
 .../utils}/VenueInfoExtensions.java                |  4 ++--
 .../ch/admin/bag/dp3t/storage/SecureStorage.java   |  2 +-
 app/src/main/proto/Proto.proto                     |  2 +-
 17 files changed, 42 insertions(+), 42 deletions(-)
 rename app/src/main/java/ch/admin/bag/dp3t/{viewmodel => checkin}/CrowdNotifierViewModel.java (92%)
 rename app/src/main/java/ch/admin/bag/dp3t/{viewmodel/model => checkin/models}/CheckInState.java (96%)
 rename app/src/main/java/ch/admin/bag/dp3t/{viewmodel/model => checkin/models}/CrowdNotifierErrorState.java (97%)
 rename app/src/main/java/ch/admin/bag/dp3t/{storage/model => checkin/models}/DiaryEntry.java (95%)
 rename app/src/main/java/ch/admin/bag/dp3t/{viewmodel/model => checkin/models}/ReminderOption.java (96%)
 rename app/src/main/java/ch/admin/bag/dp3t/{ => checkin}/networking/CrowdNotifierKeyLoadWorker.java (91%)
 rename app/src/main/java/ch/admin/bag/dp3t/{ => checkin}/networking/TraceKeysRepository.java (95%)
 rename app/src/main/java/ch/admin/bag/dp3t/{networking/models => checkin/networking}/TraceKeysService.java (87%)
 rename app/src/main/java/ch/admin/bag/dp3t/{ => checkin}/startup/BootCompletedReceiver.java (84%)
 rename app/src/main/java/ch/admin/bag/dp3t/{ => checkin}/storage/DiaryStorage.java (94%)
 rename app/src/main/java/ch/admin/bag/dp3t/{util => checkin/utils}/CrowdNotifierReminderHelper.java (95%)
 rename app/src/main/java/ch/admin/bag/dp3t/{util => checkin/utils}/NotificationHelper.java (98%)
 rename app/src/main/java/ch/admin/bag/dp3t/{util => checkin/utils}/NotificationQuickActionReceiver.java (82%)
 rename app/src/main/java/ch/admin/bag/dp3t/{util => checkin/utils}/VenueInfoExtensions.java (95%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 366e0b4d5..2324fbe37 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,11 +74,11 @@
 
 		<receiver android:name=".util.ReminderHelper" />
 
-		<receiver android:name=".util.CrowdNotifierReminderHelper" />
+		<receiver android:name=".checkin.utils.CrowdNotifierReminderHelper" />
 
-		<receiver android:name=".util.NotificationQuickActionReceiver" />
+		<receiver android:name=".checkin.utils.NotificationQuickActionReceiver" />
 
-		<receiver android:name=".startup.BootCompletedReceiver">
+		<receiver android:name=".checkin.startup.BootCompletedReceiver">
 			<intent-filter>
 				<action android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter>
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
similarity index 92%
rename from app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 645cf7dfd..ccc6431df 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.viewmodel;
+package ch.admin.bag.dp3t.checkin;
 
 import android.app.Application;
 import android.content.BroadcastReceiver;
@@ -20,14 +20,14 @@
 import org.crowdnotifier.android.sdk.CrowdNotifier;
 import org.crowdnotifier.android.sdk.model.ExposureEvent;
 
-import ch.admin.bag.dp3t.networking.TraceKeysRepository;
+import ch.admin.bag.dp3t.checkin.networking.TraceKeysRepository;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
-import ch.admin.bag.dp3t.viewmodel.model.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.viewmodel.model.ReminderOption;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
+import ch.admin.bag.dp3t.checkin.models.ReminderOption;
 
-import static ch.admin.bag.dp3t.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_EXPOSURE_NOTIFICATION;
-import static ch.admin.bag.dp3t.util.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
+import static ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_EXPOSURE_NOTIFICATION;
+import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
 
 public class CrowdNotifierViewModel extends AndroidViewModel {
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
similarity index 96%
rename from app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
index 7ae8886b9..1aef35468 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CheckInState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.viewmodel.model;
+package ch.admin.bag.dp3t.checkin.models;
 
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
similarity index 97%
rename from app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
index 3d4013f3e..0f01d4cac 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/CrowdNotifierErrorState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.viewmodel.model;
+package ch.admin.bag.dp3t.checkin.models;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
similarity index 95%
rename from app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
index 0b79d4876..b5567bd27 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/model/DiaryEntry.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.storage.model;
+package ch.admin.bag.dp3t.checkin.models;
 
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
similarity index 96%
rename from app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
index 24e1df12b..0acb9c774 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/viewmodel/model/ReminderOption.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.viewmodel.model;
+package ch.admin.bag.dp3t.checkin.models;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
similarity index 91%
rename from app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
index 310975e4b..a5f13f7a1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/CrowdNotifierKeyLoadWorker.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.networking;
+package ch.admin.bag.dp3t.checkin.networking;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,11 +15,11 @@
 import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
 
 import ch.admin.bag.dp3t.BuildConfig;
-import ch.admin.bag.dp3t.storage.DiaryStorage;
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.util.NotificationHelper;
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
 
-import static ch.admin.bag.dp3t.util.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
+import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
 
 
 public class CrowdNotifierKeyLoadWorker extends Worker {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
similarity index 95%
rename from app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index 1d00e581e..a318dff64 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.networking;
+package ch.admin.bag.dp3t.checkin.networking;
 
 import android.content.Context;
 
@@ -11,8 +11,7 @@
 import org.dpppt.android.sdk.backend.UserAgentInterceptor;
 
 import ch.admin.bag.dp3t.BuildConfig;
-import ch.admin.bag.dp3t.networking.models.Proto;
-import ch.admin.bag.dp3t.networking.models.TraceKeysService;
+import ch.admin.bag.dp3t.checkin.models.Proto;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysService.java
similarity index 87%
rename from app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysService.java
index b7d2f657d..d6fc1db61 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/TraceKeysService.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysService.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.networking.models;
+package ch.admin.bag.dp3t.checkin.networking;
 
 import okhttp3.ResponseBody;
 import retrofit2.Call;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java
similarity index 84%
rename from app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java
index 312ea98b0..ff612451d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/startup/BootCompletedReceiver.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java
@@ -1,13 +1,13 @@
-package ch.admin.bag.dp3t.startup;
+package ch.admin.bag.dp3t.checkin.startup;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.util.CrowdNotifierReminderHelper;
-import ch.admin.bag.dp3t.util.NotificationHelper;
-import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
 
 public class BootCompletedReceiver extends BroadcastReceiver {
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java
similarity index 94%
rename from app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java
index 823b98e76..78bc28a04 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/DiaryStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.storage;
+package ch.admin.bag.dp3t.checkin.storage;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -15,10 +15,9 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-
 import org.crowdnotifier.android.sdk.model.DayDate;
 
-import ch.admin.bag.dp3t.storage.model.DiaryEntry;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
 
 public class DiaryStorage {
 
@@ -40,8 +39,8 @@ private DiaryStorage(Context context) {
 					context,
 					EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
 					EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM);
-		} catch (GeneralSecurityException | IOException ex) {
-			ex.printStackTrace();
+		} catch (GeneralSecurityException | IOException e) {
+			throw new RuntimeException(e);
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
similarity index 95%
rename from app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
index edfbc996d..f45ec3915 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/CrowdNotifierReminderHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.util;
+package ch.admin.bag.dp3t.checkin.utils;
 
 
 import android.app.AlarmManager;
@@ -11,10 +11,11 @@
 import org.crowdnotifier.android.sdk.CrowdNotifier;
 
 import ch.admin.bag.dp3t.BuildConfig;
-import ch.admin.bag.dp3t.storage.DiaryStorage;
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.storage.model.DiaryEntry;
-import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
+import ch.admin.bag.dp3t.util.ReminderHelper;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
 
 public class CrowdNotifierReminderHelper extends BroadcastReceiver {
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
similarity index 98%
rename from app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 418539dce..1ac8da2df 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.util;
+package ch.admin.bag.dp3t.checkin.utils;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -15,6 +15,7 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.MainActivity;
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.util.StringUtil;
 
 import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
 import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationQuickActionReceiver.java
similarity index 82%
rename from app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationQuickActionReceiver.java
index 7f4c1d7cd..0dd2285b2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationQuickActionReceiver.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationQuickActionReceiver.java
@@ -1,10 +1,10 @@
-package ch.admin.bag.dp3t.util;
+package ch.admin.bag.dp3t.checkin.utils;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import static ch.admin.bag.dp3t.util.NotificationHelper.ACTION_SNOOZE;
+import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_SNOOZE;
 
 public class NotificationQuickActionReceiver extends BroadcastReceiver {
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
similarity index 95%
rename from app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
index 97c8642a0..dba7b0003 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/VenueInfoExtensions.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.util;
+package ch.admin.bag.dp3t.checkin.utils;
 
 import androidx.annotation.DrawableRes;
 
@@ -8,7 +8,7 @@
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
 import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.networking.models.Proto;
+import ch.admin.bag.dp3t.checkin.models.Proto;
 
 public class VenueInfoExtensions {
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 62358b6c7..81e7af219 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -35,7 +35,7 @@
 import ch.admin.bag.dp3t.networking.models.TestLocationModel;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsCollection;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsModel;
-import ch.admin.bag.dp3t.viewmodel.model.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
 
 public class SecureStorage {
 
diff --git a/app/src/main/proto/Proto.proto b/app/src/main/proto/Proto.proto
index 6277753ca..cd5a72cda 100644
--- a/app/src/main/proto/Proto.proto
+++ b/app/src/main/proto/Proto.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package ch.admin.bag.dp3t.networking.models;
+package ch.admin.bag.dp3t.checkin.models;
 
 message ProblematicEventWrapper {
   int32 version = 1;

From 9a191258e5b2b8701e7ed2c93a6ccb6a4d3299fc Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 29 Apr 2021 11:14:29 +0200
Subject: [PATCH 005/207] Fix Liechtenstein-flag not shown on Turkish devices

---
 app/src/main/java/ch/admin/bag/dp3t/travel/TravelFragment.java | 3 ++-
 app/src/main/java/ch/admin/bag/dp3t/travel/TravelUtils.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/travel/TravelFragment.java b/app/src/main/java/ch/admin/bag/dp3t/travel/TravelFragment.java
index d6e5f5fc5..3680a0a9d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/travel/TravelFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/travel/TravelFragment.java
@@ -21,6 +21,7 @@
 import androidx.fragment.app.Fragment;
 
 import java.util.List;
+import java.util.Locale;
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.storage.SecureStorage;
@@ -74,7 +75,7 @@ private void setupCountryList() {
 
 			ImageView flagImageView = countryItemView.findViewById(R.id.flag_icon);
 			TextView flagTextView = countryItemView.findViewById(R.id.flag_cc);
-			String idName = "flag_" + countryCode.toLowerCase();
+			String idName = "flag_" + countryCode.toLowerCase(Locale.GERMAN);
 			int drawableRes = UiUtils.getDrawableResourceByName(requireContext(), idName);
 			if (drawableRes != 0) {
 				flagImageView.setImageResource(drawableRes);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/travel/TravelUtils.java b/app/src/main/java/ch/admin/bag/dp3t/travel/TravelUtils.java
index c38888e96..dec3e5780 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/travel/TravelUtils.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/travel/TravelUtils.java
@@ -42,7 +42,7 @@ public static void inflateFlagFlow(Flow flowConstraint, List<String> countries)
 			ImageView flagImageView = flagView.findViewById(R.id.flag_icon);
 			TextView flagTextView = flagView.findViewById(R.id.flag_cc);
 
-			String idName = "flag_" + country.toLowerCase();
+			String idName = "flag_" + country.toLowerCase(Locale.GERMAN);
 			int drawableRes = UiUtils.getDrawableResourceByName(context, idName);
 			if (drawableRes != 0) {
 				flagImageView.setImageResource(drawableRes);

From fbb2a879fc409acf87c8b1424e56819bb117eaab Mon Sep 17 00:00:00 2001
From: Clea Benz <benz@ubique.ch>
Date: Thu, 29 Apr 2021 11:30:37 +0200
Subject: [PATCH 006/207] add view binding

---
 app/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 41ce00c72..9aa2f7ab7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -150,6 +150,10 @@ android {
 		jvmTarget = "1.8"
 	}
 
+	buildFeatures {
+		viewBinding true
+	}
+
 	protobuf {
 		protoc {
 			artifact = 'com.google.protobuf:protoc:3.0.0'

From 7fb8c7565a2246f6f0e15c5abfc4bf7f6a966d20 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 28 Apr 2021 14:41:50 +0200
Subject: [PATCH 007/207] Implemented Check In Flow

---
 app/build.gradle                              |  28 +-
 .../dp3t/checkin/CheckinOverviewFragment.java |  15 +-
 .../CameraPermissionExplanationDialog.java    |  43 +++
 .../checkin/checkinflow/CheckInFragment.java  | 105 +++++++
 .../checkin/checkinflow/QrCodeAnalyzer.java   |  93 ++++++
 .../checkinflow/QrCodeScannerFragment.java    | 290 ++++++++++++++++++
 .../models/CrowdNotifierErrorState.java       |   4 +-
 .../dp3t/checkin/models/ReminderOption.java   |  33 +-
 .../bag/dp3t/checkin/utils/ErrorDialog.java   |  36 +++
 .../bag/dp3t/checkin/utils/ErrorHelper.java   |  80 +++++
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |   5 +-
 .../bg_button_default_crowdnotifier.xml       |  17 +
 .../res/drawable/bg_camera_flash_button.xml   |  17 +
 .../main/res/drawable/dialog_background.xml   |   9 +
 app/src/main/res/drawable/ic_flash_off.xml    |  10 +
 app/src/main/res/drawable/ic_flash_on.xml     |  10 +
 app/src/main/res/drawable/ic_tea.xml          |  10 +
 .../res/drawable/qr_scanner_bottom_left.xml   |  18 ++
 .../res/drawable/qr_scanner_bottom_right.xml  |  18 ++
 .../main/res/drawable/qr_scanner_top_left.xml |  18 ++
 .../res/drawable/qr_scanner_top_right.xml     |  18 ++
 app/src/main/res/drawable/ripple_rounded.xml  |  10 +
 .../dialog_camera_permission_explanation.xml  |  52 ++++
 app/src/main/res/layout/dialog_error.xml      |  51 +++
 app/src/main/res/layout/fragment_check_in.xml | 142 +++++++++
 .../res/layout/fragment_checkin_overview.xml  |   2 +-
 .../res/layout/fragment_qr_code_scanner.xml   | 196 ++++++++++++
 app/src/main/res/layout/item_error_status.xml |   2 +-
 app/src/main/res/values/colors.xml            |  16 +
 .../main/res/values/crowdnotifier_styles.xml  |  86 ++++++
 app/src/main/res/values/dimens.xml            |  11 +
 app/src/main/res/values/strings.xml           |  29 ++
 app/src/main/res/values/styles.xml            |   1 +
 33 files changed, 1457 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CameraPermissionExplanationDialog.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeAnalyzer.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
 create mode 100644 app/src/main/res/drawable/bg_button_default_crowdnotifier.xml
 create mode 100644 app/src/main/res/drawable/bg_camera_flash_button.xml
 create mode 100644 app/src/main/res/drawable/dialog_background.xml
 create mode 100644 app/src/main/res/drawable/ic_flash_off.xml
 create mode 100644 app/src/main/res/drawable/ic_flash_on.xml
 create mode 100644 app/src/main/res/drawable/ic_tea.xml
 create mode 100644 app/src/main/res/drawable/qr_scanner_bottom_left.xml
 create mode 100644 app/src/main/res/drawable/qr_scanner_bottom_right.xml
 create mode 100644 app/src/main/res/drawable/qr_scanner_top_left.xml
 create mode 100644 app/src/main/res/drawable/qr_scanner_top_right.xml
 create mode 100644 app/src/main/res/drawable/ripple_rounded.xml
 create mode 100644 app/src/main/res/layout/dialog_camera_permission_explanation.xml
 create mode 100644 app/src/main/res/layout/dialog_error.xml
 create mode 100644 app/src/main/res/layout/fragment_check_in.xml
 create mode 100644 app/src/main/res/layout/fragment_qr_code_scanner.xml
 create mode 100644 app/src/main/res/values/crowdnotifier_styles.xml

diff --git a/app/build.gradle b/app/build.gradle
index d9ca37956..3ec6ae45d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,7 +70,9 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.dev'
@@ -82,7 +84,9 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-t.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.test.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.test'
@@ -94,7 +98,9 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.abnahme'
@@ -106,7 +112,9 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 		}
@@ -117,7 +125,9 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"TODO"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 		}
@@ -220,6 +230,14 @@ dependencies {
 	implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 	implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
+	// QR code scanning
+	def camerax_version = "1.0.0-rc04"
+	implementation "androidx.camera:camera-camera2:${camerax_version}"
+	implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+	implementation "androidx.camera:camera-view:1.0.0-alpha23"
+	//DO NOT UPDATE ZXING TO 3.4.0! (3.4.0 is not compatible with API Level 23 or lower)
+	implementation "com.google.zxing:core:3.3.0"
+
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	androidTestImplementation 'androidx.test:runner:1.3.0'
 	androidTestImplementation 'androidx.test:core:1.3.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
index c4ed451a0..ef7f4d4ed 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
@@ -4,9 +4,11 @@
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
 
 public class CheckinOverviewFragment extends Fragment {
 
@@ -20,13 +22,24 @@ public static CheckinOverviewFragment newInstance() {
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 		view.findViewById(R.id.checkin_overview_scan_qr).setOnClickListener(
 				v -> {
-					// TODO
+					showQRCodeScanner();
 				});
 
 		view.findViewById(R.id.checkin_overview_history).setOnClickListener(
 				v -> {
 					// TODO
 				});
+
+		((Toolbar) view.findViewById(R.id.checkin_overview_toolbar))
+				.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
+	}
+
+	private void showQRCodeScanner() {
+		requireActivity().getSupportFragmentManager().beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
+				.addToBackStack(QrCodeScannerFragment.class.getCanonicalName())
+				.commit();
 	}
 
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CameraPermissionExplanationDialog.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CameraPermissionExplanationDialog.java
new file mode 100644
index 000000000..87f754696
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CameraPermissionExplanationDialog.java
@@ -0,0 +1,43 @@
+package ch.admin.bag.dp3t.checkin.checkinflow;
+
+import android.content.Context;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+import ch.admin.bag.dp3t.R;
+
+public class CameraPermissionExplanationDialog extends AlertDialog {
+
+	private View.OnClickListener grantCameraAccessClickListener;
+
+	public CameraPermissionExplanationDialog(@NonNull Context context) {
+		super(context);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.dialog_camera_permission_explanation);
+		getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		getWindow().setBackgroundDrawableResource(R.drawable.dialog_background);
+
+		TextView grantCameraAccessButton = findViewById(R.id.camera_permission_dialog_ok_button);
+		grantCameraAccessButton.setPaintFlags(grantCameraAccessButton.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+
+		grantCameraAccessButton.setOnClickListener(v -> {
+			dismiss();
+			if (grantCameraAccessClickListener != null) grantCameraAccessClickListener.onClick(v);
+		});
+		findViewById(R.id.camera_permission_dialog_close_button).setOnClickListener(v -> cancel());
+	}
+
+	public void setGrantCameraAccessClickListener(View.OnClickListener listener) {
+		this.grantCameraAccessClickListener = listener;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
new file mode 100644
index 000000000..e3dadf48f
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
@@ -0,0 +1,105 @@
+package ch.admin.bag.dp3t.checkin.checkinflow;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.button.MaterialButtonToggleGroup;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
+import ch.admin.bag.dp3t.checkin.models.ReminderOption;
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
+import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensions;
+
+public class CheckInFragment extends Fragment {
+
+	public static final String TAG = CheckInFragment.class.getCanonicalName();
+
+	private CrowdNotifierViewModel viewModel;
+	private VenueInfo venueInfo;
+
+	public CheckInFragment() { super(R.layout.fragment_check_in); }
+
+	public static CheckInFragment newInstance() {
+		return new CheckInFragment();
+	}
+
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		viewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
+		if (viewModel.getCheckInState() != null) {
+			venueInfo = viewModel.getCheckInState().getVenueInfo();
+		}
+		checkIfAutoCheckoutHappened();
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		checkIfAutoCheckoutHappened();
+	}
+
+	private void checkIfAutoCheckoutHappened() {
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		TextView titleTextView = view.findViewById(R.id.check_in_fragment_title);
+		TextView subtitleTextView = view.findViewById(R.id.check_in_fragment_subtitle);
+		ImageView venueTypeIcon = view.findViewById(R.id.check_in_fragment_venue_type_icon);
+		View checkInButton = view.findViewById(R.id.check_in_fragment_check_in_button);
+		Toolbar toolbar = view.findViewById(R.id.check_in_fragment_toolbar);
+		MaterialButtonToggleGroup toggleGroup = view.findViewById(R.id.check_in_fragment_toggle_group);
+
+		titleTextView.setText(venueInfo.getTitle());
+		subtitleTextView.setText(VenueInfoExtensions.getSubtitle(venueInfo));
+		venueTypeIcon.setImageResource(VenueInfoExtensions.getVenueTypeDrawable(venueInfo));
+
+		checkInButton.setOnClickListener(v -> {
+			long checkInTime = System.currentTimeMillis();
+			viewModel.startCheckInTimer();
+			viewModel.setCheckedIn(true);
+			viewModel.getCheckInState().setCheckInTime(checkInTime);
+			NotificationHelper.getInstance(getContext()).startOngoingNotification(checkInTime, venueInfo);
+			CrowdNotifierReminderHelper.set8HourReminder(checkInTime, getContext());
+			CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, getContext());
+			CrowdNotifierReminderHelper
+					.setReminder(checkInTime + viewModel.getSelectedReminderOption().getDelayMillis(), getContext());
+			popBackToHomeFragment();
+		});
+
+		for (ReminderOption option : ReminderOption.values()) {
+			((MaterialButton) view.findViewById(option.getToggleButtonId())).setText(option.getName(getContext()));
+		}
+		toggleGroup.check(viewModel.getSelectedReminderOption().getToggleButtonId());
+		toggleGroup.addOnButtonCheckedListener((group, checkedId, isChecked) -> {
+			if (isChecked) {
+				ReminderOption selectedReminderOption = ReminderOption.getReminderOptionForToggleButtonId(checkedId);
+				viewModel.setSelectedReminderOption(selectedReminderOption);
+			}
+		});
+
+		toolbar.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
+
+		super.onViewCreated(view, savedInstanceState);
+	}
+
+	private void popBackToHomeFragment() {
+		requireActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeAnalyzer.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeAnalyzer.java
new file mode 100644
index 000000000..99ff3ead3
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeAnalyzer.java
@@ -0,0 +1,93 @@
+package ch.admin.bag.dp3t.checkin.checkinflow;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageProxy;
+
+import java.nio.ByteBuffer;
+
+import com.google.zxing.*;
+import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.qrcode.QRCodeMultiReader;
+
+public class QrCodeAnalyzer implements ImageAnalysis.Analyzer {
+
+	private final static String TAG = QrCodeAnalyzer.class.getCanonicalName();
+
+	private Listener listener;
+
+	public QrCodeAnalyzer(Listener listener) {
+		this.listener = listener;
+	}
+
+	@Override
+	public void analyze(@NonNull ImageProxy image) {
+
+		int width = image.getWidth();
+		int height = image.getHeight();
+		int ySize = width * height;
+
+		byte[] imageData = new byte[ySize];
+
+		ByteBuffer yBuffer = image.getPlanes()[0].getBuffer();
+
+		int rowStride = image.getPlanes()[0].getRowStride();
+		int pos = 0;
+
+		if (rowStride == width) { // likely
+			yBuffer.get(imageData, 0, ySize);
+			pos += ySize;
+		} else {
+			int yBufferPos = -rowStride; // not an actual position
+			for (; pos < ySize; pos += width) {
+				yBufferPos += rowStride;
+				yBuffer.position(yBufferPos);
+				yBuffer.get(imageData, pos, width);
+			}
+		}
+
+		PlanarYUVLuminanceSource source = new PlanarYUVLuminanceSource(
+				imageData,
+				image.getWidth(), image.getHeight(),
+				0, 0,
+				image.getWidth(), image.getHeight(),
+				false
+		);
+
+		BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+		try {
+			Result result = new QRCodeMultiReader().decode(binaryBitmap);
+			checkQrCode(result);
+		}
+		// Catch all kinds of dubious exceptions that zxing throws
+		catch (FormatException e) {
+			Log.w(TAG, "Caught FormatException");
+		} catch (ChecksumException e) {
+			Log.w(TAG, "Caught ChecksumException");
+		} catch (NotFoundException e) {
+			// Do nothing
+			listener.noQRCodeFound();
+		} finally {
+			// Must be called else new images won't be received or camera may stall (depending on back pressure setting)
+			image.close();
+		}
+	}
+
+	private void checkQrCode(Result qrCode) {
+		if (qrCode != null) {
+			listener.onQRCodeFound(qrCode.getText());
+		} else {
+			listener.noQRCodeFound();
+		}
+	}
+
+	public interface Listener {
+		void onQRCodeFound(String qrCodeData);
+
+		void noQRCodeFound();
+
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
new file mode 100644
index 000000000..4a3909f63
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -0,0 +1,290 @@
+package ch.admin.bag.dp3t.checkin.checkinflow;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.LayerDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.camera.core.Camera;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.Preview;
+import androidx.camera.core.TorchState;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+import org.crowdnotifier.android.sdk.utils.QrUtils;
+
+import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
+import ch.admin.bag.dp3t.checkin.models.ReminderOption;
+import ch.admin.bag.dp3t.checkin.utils.ErrorDialog;
+import ch.admin.bag.dp3t.checkin.utils.ErrorHelper;
+
+public class QrCodeScannerFragment extends Fragment implements QrCodeAnalyzer.Listener {
+
+	public final static String TAG = QrCodeScannerFragment.class.getCanonicalName();
+	private static final int PERMISSION_REQUEST_CAMERA = 13;
+	private static final long MIN_ERROR_VISIBILITY = 1000L;
+
+	private CrowdNotifierViewModel viewModel;
+	private PreviewView previewView;
+	private ListenableFuture<ProcessCameraProvider> cameraProviderFuture;
+	private ExecutorService cameraExecutor;
+	private ImageButton flashButton;
+	private TextView invalidCodeText;
+	private View topLeftIndicator;
+	private View topRightIndicator;
+	private View bottomRightIndicator;
+	private View bottomLeftIndicator;
+	private View errorView;
+	private View mainView;
+	private boolean goToHome = false;
+	private boolean isQRScanningEnabled = true;
+	private long lastUIErrorUpdate = 0L;
+
+	public QrCodeScannerFragment() { super(R.layout.fragment_qr_code_scanner); }
+
+	public static QrCodeScannerFragment newInstance() {
+		return new QrCodeScannerFragment();
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		viewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
+		cameraExecutor = Executors.newSingleThreadExecutor();
+		super.onCreate(savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		if (goToHome) {
+			getActivity().getSupportFragmentManager().popBackStack();
+			goToHome = false;
+		} else {
+			isQRScanningEnabled = true;
+		}
+		super.onResume();
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.CAMERA) !=
+				PackageManager.PERMISSION_GRANTED) {
+			CameraPermissionExplanationDialog dialog = new CameraPermissionExplanationDialog(requireContext());
+			dialog.setOnCancelListener(v -> refreshView(false));
+			dialog.setGrantCameraAccessClickListener(
+					v -> requestPermissions(new String[] { Manifest.permission.CAMERA }, PERMISSION_REQUEST_CAMERA));
+			dialog.show();
+		} else {
+			startCameraAndQrAnalyzer();
+		}
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		previewView = view.findViewById(R.id.camera_preview);
+		flashButton = view.findViewById(R.id.fragment_qr_scanner_flash_button);
+		invalidCodeText = view.findViewById(R.id.qr_code_scanner_invalid_code_text);
+		topLeftIndicator = view.findViewById(R.id.qr_code_scanner_top_left_indicator);
+		topRightIndicator = view.findViewById(R.id.qr_code_scanner_top_right_indicator);
+		bottomLeftIndicator = view.findViewById(R.id.qr_code_scanner_bottom_left_indicator);
+		bottomRightIndicator = view.findViewById(R.id.qr_code_scanner_bottom_right_indicator);
+		errorView = view.findViewById(R.id.fragment_qr_scanner_error_view);
+		mainView = view.findViewById(R.id.fragment_qr_scanner_main_view);
+		Toolbar toolbar = view.findViewById(R.id.fragment_qr_scanner_toolbar);
+
+		toolbar.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
+	}
+
+
+	private void setupFlashButton(Camera camera) {
+
+		if (!camera.getCameraInfo().hasFlashUnit()) {
+			flashButton.setVisibility(View.GONE);
+		} else {
+			flashButton.setVisibility(View.VISIBLE);
+		}
+
+		camera.getCameraInfo().getTorchState().observe(getViewLifecycleOwner(), v -> {
+			if (v == TorchState.ON) {
+				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_flash_off));
+			} else {
+				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_flash_on));
+			}
+		});
+
+		flashButton.setOnClickListener(v -> {
+			camera.getCameraControl().enableTorch(camera.getCameraInfo().getTorchState().getValue() == TorchState.OFF);
+		});
+	}
+
+	private void startCameraAndQrAnalyzer() {
+		cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext());
+		cameraProviderFuture.addListener(() -> {
+			try {
+				ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
+				Preview preview = new Preview.Builder().build();
+				preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+				ImageAnalysis imageAnalyzer = new ImageAnalysis.Builder().build();
+				imageAnalyzer.setAnalyzer(cameraExecutor, new QrCodeAnalyzer(this));
+
+				CameraSelector cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
+
+				cameraProvider.unbindAll();
+				Camera camera = cameraProvider.bindToLifecycle(getViewLifecycleOwner(), cameraSelector, preview, imageAnalyzer);
+				setupFlashButton(camera);
+			} catch (ExecutionException | InterruptedException e) {
+				Log.d(TAG, "Error starting camera " + e.getMessage());
+				e.printStackTrace();
+			}
+		}, ContextCompat.getMainExecutor(requireContext()));
+	}
+
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		cameraExecutor.shutdown();
+	}
+
+	@Override
+	public void noQRCodeFound() {
+		if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NO_CODE_FOUND));
+	}
+
+	@Override
+	public synchronized void onQRCodeFound(String qrCodeData) {
+		if (!isQRScanningEnabled) return;
+		try {
+			VenueInfo venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX);
+			isQRScanningEnabled = false;
+			if (getActivity() != null) getActivity().runOnUiThread(() -> viewModel.setCheckInState(
+					new CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(),
+							ReminderOption.OFF)));
+			showCheckInFragment();
+			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.VALID));
+		} catch (QrUtils.QRException e) {
+			handleInvalidQRCodeExceptions(qrCodeData, e);
+		}
+	}
+
+	private void handleInvalidQRCodeExceptions(String qrCodeData, QrUtils.QRException e) {
+		if (e instanceof QrUtils.InvalidQRCodeVersionException) {
+			if (getActivity() != null) getActivity().runOnUiThread(() -> {
+				isQRScanningEnabled = false;
+				ErrorDialog errorDialog = new ErrorDialog(requireContext(), CrowdNotifierErrorState.UPDATE_REQUIRED);
+				errorDialog.setOnDismissListener(v -> isQRScanningEnabled = true);
+				errorDialog.setOnCancelListener(v -> isQRScanningEnabled = true);
+				errorDialog.show();
+			});
+		} else if (e instanceof QrUtils.NotYetValidException) {
+			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NOT_YET_VALID));
+		} else if (e instanceof QrUtils.NotValidAnymoreException) {
+			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NOT_VALID_ANYMORE));
+		} else {
+			if (qrCodeData.startsWith(BuildConfig.TRACE_QR_CODE_PREFIX)) {
+				isQRScanningEnabled = false;
+				Intent openBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeData));
+				startActivity(openBrowserIntent);
+				goToHome = true;
+			} else {
+				if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.INVALID_FORMAT));
+			}
+		}
+	}
+
+	private void indicateInvalidQrCode(QRScannerState qrScannerState) {
+		long currentTime = System.currentTimeMillis();
+		if (lastUIErrorUpdate > currentTime - MIN_ERROR_VISIBILITY && qrScannerState == QRScannerState.NO_CODE_FOUND) {
+			return;
+		}
+		lastUIErrorUpdate = currentTime;
+		int color = R.color.primary;
+		if (qrScannerState == QRScannerState.VALID || qrScannerState == QRScannerState.NO_CODE_FOUND) {
+			invalidCodeText.setVisibility(View.INVISIBLE);
+		} else {
+			invalidCodeText.setVisibility(View.VISIBLE);
+			color = R.color.tertiary;
+		}
+
+		if (qrScannerState == QRScannerState.INVALID_FORMAT) {
+			invalidCodeText.setText(R.string.qrscanner_error);
+		} else if (qrScannerState == QRScannerState.NOT_VALID_ANYMORE) {
+			invalidCodeText.setText(R.string.qr_scanner_error_code_not_valid_anymore);
+		} else if (qrScannerState == QRScannerState.NOT_YET_VALID) {
+			invalidCodeText.setText(R.string.qr_scanner_error_code_not_yet_valid);
+		}
+		setIndicatorColor(topLeftIndicator, color);
+		setIndicatorColor(topRightIndicator, color);
+		setIndicatorColor(bottomLeftIndicator, color);
+		setIndicatorColor(bottomRightIndicator, color);
+	}
+
+	private void setIndicatorColor(View indicator, @ColorRes int color) {
+		LayerDrawable drawable = (LayerDrawable) indicator.getBackground();
+		GradientDrawable stroke = (GradientDrawable) drawable.findDrawableByLayerId(R.id.indicator);
+		if (getContext() == null) return;
+		stroke.setStroke(getResources().getDimensionPixelSize(R.dimen.qr_scanner_indicator_stroke_width),
+				getResources().getColor(color, null));
+	}
+
+	private void showCheckInFragment() {
+		requireActivity().getSupportFragmentManager().beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, CheckInFragment.newInstance())
+				.addToBackStack(CheckInFragment.class.getCanonicalName())
+				.commitAllowingStateLoss();
+	}
+
+	private void refreshView(boolean cameraPermissionGranted) {
+		if (cameraPermissionGranted) {
+			mainView.setVisibility(View.VISIBLE);
+			errorView.setVisibility(View.GONE);
+			startCameraAndQrAnalyzer();
+		} else {
+			errorView.setVisibility(View.VISIBLE);
+			ErrorHelper.updateErrorView(errorView, CrowdNotifierErrorState.CAMERA_ACCESS_DENIED, null, getContext());
+			mainView.setVisibility(View.GONE);
+		}
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+		if (requestCode == PERMISSION_REQUEST_CAMERA) {
+			refreshView(grantResults.length >= 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
+		}
+	}
+
+	enum QRScannerState {
+		NO_CODE_FOUND, VALID, INVALID_FORMAT, NOT_YET_VALID, NOT_VALID_ANYMORE
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
index 0f01d4cac..b4611505f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
@@ -16,7 +16,9 @@ public enum CrowdNotifierErrorState {
 			R.drawable.ic_error),
 	QR_CODE_NOT_VALID_ANYMORE(R.string.error_title, R.string.qr_scanner_error_code_not_valid_anymore, R.string.android_button_ok,
 			R.drawable.ic_error),
-	ALREADY_CHECKED_IN(R.string.error_title, R.string.error_already_checked_in, R.string.android_button_ok, R.drawable.ic_error);
+	ALREADY_CHECKED_IN(R.string.error_title, R.string.error_already_checked_in, R.string.android_button_ok, R.drawable.ic_error),
+	UPDATE_REQUIRED(R.string.error_force_update_title, R.string.error_update_text, R.string.error_action_update,
+			R.drawable.ic_error);
 
 
 	@StringRes private int titleResId;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
index 0acb9c774..d42decc86 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
@@ -1,29 +1,35 @@
 package ch.admin.bag.dp3t.checkin.models;
 
 import android.content.Context;
+import androidx.annotation.IdRes;
 
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.R;
 
-
 public enum ReminderOption {
 
-	OFF(0),
-	THIRTY_MINUTES(BuildConfig.FLAVOR.equals("dev") ? 1 : 30),
-	ONE_HOUR(60),
-	TWO_HOURS(120),
-	FOUR_HOURS(240);
+	OFF(0, R.id.check_in_fragment_toggle_button_1),
+	THIRTY_MINUTES(BuildConfig.FLAVOR.equals("dev") ? 1 : 30, R.id.check_in_fragment_toggle_button_2),
+	ONE_HOUR(60, R.id.check_in_fragment_toggle_button_3),
+	TWO_HOURS(120, R.id.check_in_fragment_toggle_button_4),
+	FOUR_HOURS(240, R.id.check_in_fragment_toggle_button_5);
 
 	private static final long MINUTE_IN_MILLIS = 60 * 1000L;
 
 	private int delayMinutes;
+	@IdRes private int toggleButtonId;
 	private String name;
 
-	ReminderOption(int delayMinutes) {
+	ReminderOption(int delayMinutes, @IdRes int toggleButtonId) {
 		this.delayMinutes = delayMinutes;
+		this.toggleButtonId = toggleButtonId;
 		this.name = name;
 	}
 
+	public int getToggleButtonId() {
+		return toggleButtonId;
+	}
+
 	public int getDelayMinutes() {
 		return delayMinutes;
 	}
@@ -46,4 +52,17 @@ public String getName(Context context) {
 				return context.getString(R.string.reminder_option_hours).replace("{HOURS}", String.valueOf(getDelayHours()));
 		}
 	}
+
+	public static ReminderOption getReminderOptionForToggleButtonId(@IdRes int toggleButtonId) {
+		switch (toggleButtonId) {
+			case R.id.check_in_fragment_toggle_button_2:
+				return THIRTY_MINUTES;
+			case R.id.check_in_fragment_toggle_button_3:
+				return ONE_HOUR;
+			case R.id.check_in_fragment_toggle_button_4:
+				return TWO_HOURS;
+			default:
+				return OFF;
+		}
+	}
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java
new file mode 100644
index 000000000..1be5a623f
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java
@@ -0,0 +1,36 @@
+package ch.admin.bag.dp3t.checkin.utils;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
+
+public class ErrorDialog extends AlertDialog {
+
+	CrowdNotifierErrorState errorState;
+
+	public ErrorDialog(@NonNull Context context, CrowdNotifierErrorState errorState) {
+		super(context);
+		this.errorState = errorState;
+	}
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.dialog_error);
+		View closeButton = findViewById(R.id.dialog_error_close_button);
+
+		closeButton.setOnClickListener(v -> dismiss());
+		ErrorHelper.updateErrorView(findViewById(R.id.dialog_error_container), errorState, this::dismiss, getContext());
+
+		getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		getWindow().setBackgroundDrawableResource(R.drawable.dialog_background);
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
new file mode 100644
index 000000000..8fd2df547
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
@@ -0,0 +1,80 @@
+package ch.admin.bag.dp3t.checkin.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Paint;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
+import ch.admin.bag.dp3t.util.UrlUtil;
+
+public class ErrorHelper {
+
+	public static void updateErrorView(View errorView, CrowdNotifierErrorState errorState, Runnable customButtonClickAction, Context context) {
+		updateErrorView(errorView, errorState, customButtonClickAction, context, true);
+	}
+
+	public static void updateErrorView(View errorView, CrowdNotifierErrorState errorState, Runnable customButtonClickAction, Context context,
+			boolean showButton) {
+		((TextView) errorView.findViewById(R.id.error_status_title)).setText(errorState.getTitleResId());
+		((TextView) errorView.findViewById(R.id.error_status_text)).setText(errorState.getTextResId());
+		((ImageView) errorView.findViewById(R.id.error_status_image))
+				.setImageDrawable(ContextCompat.getDrawable(errorView.getContext(), errorState.getImageResId()));
+
+		TextView buttonView = errorView.findViewById(R.id.error_status_button);
+		if (showButton) {
+			buttonView.setVisibility(View.VISIBLE);
+			buttonView.setText(errorState.getActionResId());
+			buttonView.setPaintFlags(buttonView.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+			buttonView.setOnClickListener(v -> executeErrorAction(errorState, customButtonClickAction, context));
+		} else {
+			buttonView.setVisibility(View.GONE);
+		}
+	}
+
+	private static void executeErrorAction(CrowdNotifierErrorState errorState, Runnable customButtonClickAction, Context context) {
+		if (customButtonClickAction != null) customButtonClickAction.run();
+		switch (errorState) {
+			case NOTIFICATIONS_DISABLED:
+				openNotificationSettings(context);
+				break;
+			case CAMERA_ACCESS_DENIED:
+				openApplicationSettings(context);
+				break;
+			case UPDATE_REQUIRED:
+				updateApp(context);
+				break;
+		}
+	}
+
+	private static void updateApp(Context context) {
+		UrlUtil.openUrl(context, "market://details?id=" + context.getPackageName());
+	}
+
+	private static void openApplicationSettings(Context context) {
+		Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		Uri uri = Uri.fromParts("package", context.getPackageName(), null);
+		intent.setData(uri);
+		context.startActivity(intent);
+	}
+
+	private static void openNotificationSettings(Context context) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+			intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
+			context.startActivity(intent);
+		} else {
+			Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+			intent.setData(Uri.parse("package:" + context.getPackageName()));
+			context.startActivity(intent);
+		}
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 2a25b5cab..af746f2e1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -44,6 +44,7 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment;
+import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
 import ch.admin.bag.dp3t.home.model.NotificationState;
 import ch.admin.bag.dp3t.home.model.NotificationStateError;
@@ -376,8 +377,8 @@ private void setupCheckinCard() {
 		checkinCard.findViewById(R.id.checkin_scan).setOnClickListener(
 				v -> requireActivity().getSupportFragmentManager().beginTransaction()
 						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-						.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
-						.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
+						.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
+						.addToBackStack(QrCodeScannerFragment.class.getCanonicalName())
 						.commit()
 		);
 	}
diff --git a/app/src/main/res/drawable/bg_button_default_crowdnotifier.xml b/app/src/main/res/drawable/bg_button_default_crowdnotifier.xml
new file mode 100644
index 000000000..58e1811b8
--- /dev/null
+++ b/app/src/main/res/drawable/bg_button_default_crowdnotifier.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/primary_dark">
+	<item android:id="@android:id/mask">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/primary_dark" />
+			<corners android:radius="@dimen/button_radius" />
+		</shape>
+	</item>
+
+	<item android:id="@android:id/background">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/primary" />
+			<corners android:radius="@dimen/button_radius" />
+		</shape>
+	</item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_camera_flash_button.xml b/app/src/main/res/drawable/bg_camera_flash_button.xml
new file mode 100644
index 000000000..a11ee9229
--- /dev/null
+++ b/app/src/main/res/drawable/bg_camera_flash_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/primary_light">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/primary_light" />
+			<corners android:radius="@dimen/button_radius" />
+		</shape>
+	</item>
+
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/white" />
+			<corners android:radius="@dimen/button_radius" />
+		</shape>
+	</item>
+</ripple>
diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml
new file mode 100644
index 000000000..00231c6ac
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<solid android:color="@android:color/transparent" />
+	<corners android:radius="@dimen/button_radius" />
+	<padding
+		android:left="@dimen/spacing_large"
+		android:right="@dimen/spacing_large" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_flash_off.xml b/app/src/main/res/drawable/ic_flash_off.xml
new file mode 100644
index 000000000..060da882b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#413F8D"
+		android:fillType="evenOdd"
+		android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_flash_on.xml b/app/src/main/res/drawable/ic_flash_on.xml
new file mode 100644
index 000000000..1660f9a29
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_on.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,2L7,13 10,13 10,22 17,10 13,10 17,2z"
+      android:fillColor="#413F8D"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tea.xml b/app/src/main/res/drawable/ic_tea.xml
new file mode 100644
index 000000000..df643ae3e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tea.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M10.406,12.656c0,-2.942 2.08,-4.743 3.75,-6.19 1.598,-1.384 2.578,-2.301 2.578,-3.654C16.734,1.26 17.994,0 19.547,0c1.553,0 2.812,1.259 2.812,2.813 0,3.99 -2.613,6.253 -4.521,7.906 -0.676,0.585 -1.807,1.565 -1.807,1.937 0,1.554 -1.259,2.813 -2.812,2.813 -1.554,0 -2.813,-1.26 -2.813,-2.813zM28.406,15.469c1.554,0 2.813,-1.26 2.813,-2.813 0,-0.372 1.13,-1.352 1.806,-1.937 1.909,-1.653 4.522,-3.916 4.522,-7.906 0,-1.554 -1.26,-2.813 -2.813,-2.813 -1.553,0 -2.812,1.259 -2.812,2.813 0,1.352 -0.98,2.27 -2.579,3.654 -1.67,1.446 -3.75,3.247 -3.75,6.19 0,1.553 1.26,2.812 2.813,2.812zM43.453,15.469c1.554,0 2.813,-1.26 2.813,-2.813 0,-0.391 1.064,-1.334 1.768,-1.958 1.865,-1.652 4.42,-3.914 4.42,-7.886C52.453,1.26 51.193,0 49.64,0c-1.554,0 -2.813,1.259 -2.813,2.813 0,1.37 -0.958,2.289 -2.523,3.674 -1.632,1.446 -3.664,3.246 -3.664,6.17 0,1.553 1.259,2.812 2.812,2.812zM72,38.589c0,1.553 -1.259,2.812 -2.813,2.812 -1.553,0 -2.812,-1.259 -2.812,-2.812 0,-2.513 -2.045,-4.558 -4.558,-4.558 -1.614,0 -3.269,0.344 -4.363,4.151 -0.078,0.31 -0.157,0.619 -0.24,0.929l-0.024,0.098c-0.023,0.103 -0.053,0.202 -0.087,0.298 -0.373,1.354 -0.798,2.71 -1.278,4.07 -0.806,2.281 -1.763,4.57 -2.862,6.851 2.188,-0.702 4.722,-1.742 7.052,-3.17 1.325,-0.811 3.056,-0.395 3.868,0.93 0.811,1.324 0.395,3.055 -0.93,3.866 -4.604,2.822 -10.214,4.537 -13.6,5.014 -0.186,0.304 -0.373,0.608 -0.563,0.911 -2.12,3.39 -4.234,6.228 -5.988,8.396h7.12c1.553,0 2.812,1.259 2.812,2.813 0,1.553 -1.259,2.812 -2.812,2.812L9.282,72c-1.554,0 -2.813,-1.259 -2.813,-2.813 0,-1.553 1.259,-2.812 2.812,-2.812h6.776c-1.714,-2.047 -3.74,-4.696 -5.77,-7.872 -2.976,-4.654 -5.349,-9.49 -7.054,-14.373C1.088,37.984 0,31.748 0,25.594c0,-1.554 1.259,-2.813 2.813,-2.813L56.25,22.781c1.553,0 2.813,1.26 2.813,2.813 0,1.054 -0.037,2.114 -0.108,3.18 0.887,-0.244 1.841,-0.368 2.862,-0.368C67.432,28.406 72,32.974 72,38.59zM5.709,28.406c0.203,3.396 0.765,6.64 1.57,9.705 4.96,-2.191 9.388,-2.533 11.659,-2.533 6.21,0 9.59,1.54 12.574,2.9 2.712,1.236 5.055,2.303 9.671,2.303 2.693,0 7.286,-1.093 10.52,-2.89 0.828,-3.01 1.42,-6.191 1.64,-9.485L5.709,28.406zM44.099,54.872c1.707,-2.74 3.545,-6.088 5.136,-9.878 -2.953,0.927 -5.919,1.412 -8.052,1.412 -5.837,0 -9.113,-1.492 -12.004,-2.81 -2.818,-1.284 -5.252,-2.393 -10.241,-2.393 -1.9,0 -5.695,0.303 -9.936,2.305 4.512,12.008 12.219,20.417 14.643,22.867h11.72c1.54,-1.653 5.159,-5.765 8.734,-11.503z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/qr_scanner_bottom_left.xml b/app/src/main/res/drawable/qr_scanner_bottom_left.xml
new file mode 100644
index 000000000..26e8ab204
--- /dev/null
+++ b/app/src/main/res/drawable/qr_scanner_bottom_left.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/indicator"
+		android:end="@dimen/qr_scanner_indicator_stroke_width_inverse"
+		android:top="@dimen/qr_scanner_indicator_stroke_width_inverse">
+
+		<shape android:shape="rectangle">
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="@dimen/qr_scanner_indicator_stroke_width"
+				android:color="@color/primary" />
+		</shape>
+
+	</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/qr_scanner_bottom_right.xml b/app/src/main/res/drawable/qr_scanner_bottom_right.xml
new file mode 100644
index 000000000..628e53eaa
--- /dev/null
+++ b/app/src/main/res/drawable/qr_scanner_bottom_right.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/indicator"
+		android:top="@dimen/qr_scanner_indicator_stroke_width_inverse"
+		android:start="@dimen/qr_scanner_indicator_stroke_width_inverse">
+
+		<shape android:shape="rectangle">
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="@dimen/qr_scanner_indicator_stroke_width"
+				android:color="@color/primary" />
+		</shape>
+
+	</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/qr_scanner_top_left.xml b/app/src/main/res/drawable/qr_scanner_top_left.xml
new file mode 100644
index 000000000..710fb8a69
--- /dev/null
+++ b/app/src/main/res/drawable/qr_scanner_top_left.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/indicator"
+		android:bottom="@dimen/qr_scanner_indicator_stroke_width_inverse"
+		android:end="@dimen/qr_scanner_indicator_stroke_width_inverse">
+
+		<shape android:shape="rectangle">
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="@dimen/qr_scanner_indicator_stroke_width"
+				android:color="@color/primary" />
+		</shape>
+
+	</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/qr_scanner_top_right.xml b/app/src/main/res/drawable/qr_scanner_top_right.xml
new file mode 100644
index 000000000..e07149dcc
--- /dev/null
+++ b/app/src/main/res/drawable/qr_scanner_top_right.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/indicator"
+		android:bottom="@dimen/qr_scanner_indicator_stroke_width_inverse"
+		android:start="@dimen/qr_scanner_indicator_stroke_width_inverse">
+
+		<shape android:shape="rectangle">
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="@dimen/qr_scanner_indicator_stroke_width"
+				android:color="@color/primary" />
+		</shape>
+
+	</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple_rounded.xml b/app/src/main/res/drawable/ripple_rounded.xml
new file mode 100644
index 000000000..7c2cbd288
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_rounded.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="?attr/colorControlHighlight">
+
+	<item android:id="@android:id/mask">
+		<shape android:shape="oval">
+			<solid android:color="@android:color/white" />
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_camera_permission_explanation.xml b/app/src/main/res/layout/dialog_camera_permission_explanation.xml
new file mode 100644
index 000000000..6a85f4136
--- /dev/null
+++ b/app/src/main/res/layout/dialog_camera_permission_explanation.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/CrowdNotifier.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_margin="@dimen/spacing_medium"
+	android:clickable="false"
+	android:focusable="false">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<ImageButton
+			android:id="@+id/camera_permission_dialog_close_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:layout_marginTop="@dimen/spacing_small"
+			android:layout_marginEnd="@dimen/spacing_small"
+			android:background="@drawable/ripple_rounded"
+			android:clickable="true"
+			android:focusable="true"
+			android:padding="@dimen/spacing_medium_large"
+			android:src="@drawable/ic_close" />
+
+		<TextView
+			android:id="@+id/camera_permission_dialog_text"
+			style="@style/CrowdNotifier.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_large"
+			android:layout_marginBottom="@dimen/spacing_medium"
+			android:gravity="center"
+			android:text="@string/camera_permission_dialog_text" />
+
+		<TextView
+			android:id="@+id/camera_permission_dialog_ok_button"
+			style="@style/CrowdNotifier.Text.Subtitle"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:layout_marginBottom="@dimen/spacing_medium"
+			android:background="?selectableItemBackground"
+			android:gravity="center"
+			android:padding="@dimen/spacing_small"
+			android:text="@string/camera_permission_dialog_action" />
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
new file mode 100644
index 000000000..047853805
--- /dev/null
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	style="@style/CrowdNotifier.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_margin="@dimen/spacing_medium"
+	android:clickable="false"
+	android:focusable="false">
+
+	<androidx.cardview.widget.CardView
+		style="@style/CrowdNotifier.Card.Grey"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/spacing_very_small"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<ImageButton
+				android:id="@+id/dialog_error_close_button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="end"
+				android:layout_marginTop="@dimen/spacing_small"
+				android:layout_marginEnd="@dimen/spacing_small"
+				android:background="@drawable/ripple_rounded"
+				android:clickable="true"
+				android:focusable="true"
+				android:padding="@dimen/spacing_medium_large"
+				android:src="@drawable/ic_close"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toTopOf="parent" />
+
+			<include
+				android:id="@+id/dialog_error_container"
+				layout="@layout/item_error_status"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_very_small"
+				android:layout_marginBottom="@dimen/spacing_very_small"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/dialog_error_close_button" />
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
+	</androidx.cardview.widget.CardView>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
new file mode 100644
index 000000000..be53aa6ad
--- /dev/null
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/check_in_fragment_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back"
+		app:title="@string/check_in_screen_title" />
+
+	<ScrollView
+		android:id="@+id/check_in_fragment_venue_info_scrollview"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:fillViewport="true"
+		android:scrollbars="none">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="2" />
+
+			<ImageView
+				android:id="@+id/check_in_fragment_venue_type_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginTop="@dimen/spacing_large"
+				tools:src="@drawable/ic_tea" />
+
+			<TextView
+				android:id="@+id/check_in_fragment_title"
+				style="@style/CrowdNotifier.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:gravity="center"
+				tools:text="Cyber Cafe SV" />
+
+			<TextView
+				android:id="@+id/check_in_fragment_subtitle"
+				style="@style/CrowdNotifier.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:gravity="center"
+				tools:text="Lausanne" />
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1" />
+
+			<LinearLayout
+				android:id="@+id/check_in_fragment_reminder_container"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/button_radius">
+
+				<TextView
+					style="@style/CrowdNotifier.Text.Status.Primary.Small"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:text="@string/checkin_set_reminder" />
+
+				<com.google.android.material.button.MaterialButtonToggleGroup
+					android:id="@+id/check_in_fragment_toggle_group"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:layout_marginTop="@dimen/spacing_medium"
+					android:layout_marginBottom="@dimen/spacing_large"
+					app:selectionRequired="true"
+					app:singleSelection="true">
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/check_in_fragment_toggle_button_1"
+						style="@style/CrowdNotifier.ToggleButton"
+						android:textColorHighlight="@color/blue_main"
+						android:text="Off"
+						android:textAllCaps="true" />
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/check_in_fragment_toggle_button_2"
+						style="@style/CrowdNotifier.ToggleButton"
+						android:text="30'" />
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/check_in_fragment_toggle_button_3"
+						style="@style/CrowdNotifier.ToggleButton"
+						android:text="1h" />
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/check_in_fragment_toggle_button_4"
+						style="@style/CrowdNotifier.ToggleButton"
+						android:text="2h" />
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/check_in_fragment_toggle_button_5"
+						style="@style/CrowdNotifier.ToggleButton"
+						android:text="4h" />
+
+				</com.google.android.material.button.MaterialButtonToggleGroup>
+
+			</LinearLayout>
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="2" />
+
+		</LinearLayout>
+	</ScrollView>
+
+	<Button
+		android:id="@+id/check_in_fragment_check_in_button"
+		style="@style/CrowdNotifier.Button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:layout_marginVertical="@dimen/spacing_larger"
+		android:elevation="@dimen/card_elevation"
+		android:text="@string/check_in_now_button_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index dd381d3b6..25f552b23 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -16,7 +16,7 @@
 	android:orientation="vertical">
 
 	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/travel_toolbar"
+		android:id="@+id/checkin_overview_toolbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
diff --git a/app/src/main/res/layout/fragment_qr_code_scanner.xml b/app/src/main/res/layout/fragment_qr_code_scanner.xml
new file mode 100644
index 000000000..01fe78e4f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/light_grey">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/fragment_qr_scanner_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:layout_constraintTop_toTopOf="parent"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back"
+		app:title="@string/checkin_title" />
+
+	<LinearLayout
+		android:id="@+id/fragment_qr_scanner_error_view"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:orientation="vertical"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/fragment_qr_scanner_toolbar">
+
+		<include
+			layout="@layout/item_error_status"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_huge" />
+
+	</LinearLayout>
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:id="@+id/fragment_qr_scanner_main_view"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/fragment_qr_scanner_toolbar">
+
+		<androidx.camera.view.PreviewView
+			android:id="@+id/camera_preview"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent" />
+
+		<View
+			android:id="@+id/qr_code_scanner_milk_top"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:background="@color/transparent_milk"
+			app:layout_constraintBottom_toTopOf="@id/qr_code_scanner_camera_hole"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<View
+			android:id="@+id/qr_code_scanner_milk_bottom"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:background="@color/transparent_milk"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/qr_code_scanner_camera_hole" />
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:background="@color/transparent_milk"
+			app:layout_constraintBottom_toTopOf="@id/qr_code_scanner_milk_bottom"
+			app:layout_constraintEnd_toStartOf="@id/qr_code_scanner_camera_hole"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/qr_code_scanner_milk_top" />
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:background="@color/transparent_milk"
+			app:layout_constraintBottom_toTopOf="@id/qr_code_scanner_milk_bottom"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/qr_code_scanner_camera_hole"
+			app:layout_constraintTop_toBottomOf="@id/qr_code_scanner_milk_top" />
+
+		<Space
+			android:id="@+id/space1"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			app:layout_constraintBottom_toTopOf="@id/qr_code_scanner_explanation"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_weight="3" />
+
+		<TextView
+			android:id="@+id/qr_code_scanner_explanation"
+			style="@style/CrowdNotifier.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:text="@string/qrscanner_scan_qr_text"
+			app:layout_constraintBottom_toTopOf="@id/space2"
+			app:layout_constraintTop_toBottomOf="@id/space1" />
+
+		<Space
+			android:id="@+id/space2"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			app:layout_constraintBottom_toTopOf="@id/camera_preview_container"
+			app:layout_constraintTop_toBottomOf="@id/qr_code_scanner_explanation"
+			app:layout_constraintVertical_weight="2" />
+
+		<View
+			android:id="@+id/qr_code_scanner_camera_hole"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_margin="@dimen/spacing_small"
+			app:layout_constraintBottom_toBottomOf="@id/camera_preview_container"
+			app:layout_constraintEnd_toEndOf="@id/camera_preview_container"
+			app:layout_constraintStart_toStartOf="@id/camera_preview_container"
+			app:layout_constraintTop_toTopOf="@id/camera_preview_container" />
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:id="@+id/camera_preview_container"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_marginHorizontal="@dimen/spacing_very_large"
+			app:layout_constraintBottom_toTopOf="@+id/qr_code_scanner_invalid_code_text"
+			app:layout_constraintDimensionRatio="1:1"
+			app:layout_constraintTop_toBottomOf="@id/space2">
+
+			<View
+				android:id="@+id/qr_code_scanner_top_right_indicator"
+				android:layout_width="@dimen/qr_scanner_indicator_size"
+				android:layout_height="@dimen/qr_scanner_indicator_size"
+				android:background="@drawable/qr_scanner_top_right"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toTopOf="parent" />
+
+			<View
+				android:id="@+id/qr_code_scanner_top_left_indicator"
+				android:layout_width="@dimen/qr_scanner_indicator_size"
+				android:layout_height="@dimen/qr_scanner_indicator_size"
+				android:background="@drawable/qr_scanner_top_left"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent" />
+
+			<View
+				android:id="@+id/qr_code_scanner_bottom_left_indicator"
+				android:layout_width="@dimen/qr_scanner_indicator_size"
+				android:layout_height="@dimen/qr_scanner_indicator_size"
+				android:background="@drawable/qr_scanner_bottom_left"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintStart_toStartOf="parent" />
+
+			<View
+				android:id="@+id/qr_code_scanner_bottom_right_indicator"
+				android:layout_width="@dimen/qr_scanner_indicator_size"
+				android:layout_height="@dimen/qr_scanner_indicator_size"
+				android:background="@drawable/qr_scanner_bottom_right"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent" />
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
+
+		<TextView
+			android:id="@+id/qr_code_scanner_invalid_code_text"
+			style="@style/CrowdNotifier.Text.Status.Tertiary.Small"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_small"
+			android:gravity="center"
+			android:text="@string/qrscanner_error"
+			android:visibility="invisible"
+			app:layout_constraintBottom_toTopOf="@id/space3"
+			app:layout_constraintTop_toBottomOf="@id/camera_preview_container" />
+
+		<Space
+			android:id="@+id/space3"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			app:layout_constraintBottom_toTopOf="@id/fragment_qr_scanner_flash_button"
+			app:layout_constraintTop_toBottomOf="@id/qr_code_scanner_invalid_code_text"
+			app:layout_constraintVertical_weight="5" />
+
+		<ImageButton
+			android:id="@+id/fragment_qr_scanner_flash_button"
+			android:layout_width="@dimen/button_height"
+			android:layout_height="@dimen/button_height"
+			android:layout_margin="@dimen/spacing_large"
+			android:background="@drawable/bg_camera_flash_button"
+			android:elevation="@dimen/card_elevation"
+			android:paddingHorizontal="@dimen/spacing_huge"
+			android:paddingVertical="@dimen/spacing_small"
+			android:src="@drawable/ic_flash_on"
+			android:tint="@color/primary"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_error_status.xml b/app/src/main/res/layout/item_error_status.xml
index b09550816..188177d80 100644
--- a/app/src/main/res/layout/item_error_status.xml
+++ b/app/src/main/res/layout/item_error_status.xml
@@ -14,7 +14,7 @@
 	android:layout_height="wrap_content"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_margin="@dimen/marging_status_error"
-	android:background="@color/grey_light"
+	android:background="@color/light_grey"
 	android:gravity="center_horizontal"
 	android:orientation="vertical"
 	android:padding="@dimen/spacing_large">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index add82595d..f4c8b4795 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -71,4 +71,20 @@
 	<color name="dark_main_transparent">#754A4969</color>
 	<color name="transparent">#0000</color>
 	<color name="divider">@color/grey_medium</color>
+
+
+	<!-- CrowdNotifier Colors -->
+
+	<color name="main">#000000</color>
+	<color name="primary">#413f8d</color>
+	<color name="primary_light">#dddcea</color>
+	<color name="primary_dark">#292859</color>
+	<color name="secondary">#00a690</color>
+	<color name="tertiary">#f34e70</color>
+
+	<color name="light_grey">#f2f2f2</color>
+	<color name="transparent_milk">#c0f2f2f2</color>
+
+
+
 </resources>
diff --git a/app/src/main/res/values/crowdnotifier_styles.xml b/app/src/main/res/values/crowdnotifier_styles.xml
new file mode 100644
index 000000000..67fd24f11
--- /dev/null
+++ b/app/src/main/res/values/crowdnotifier_styles.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="CrowdNotifier.Card" parent="Widget.MaterialComponents.CardView">
+		<item name="android:focusable">true</item>
+		<item name="android:clickable">true</item>
+		<item name="android:foreground">?android:attr/selectableItemBackground</item>
+		<item name="cardElevation">@dimen/card_elevation</item>
+		<item name="android:minHeight">@dimen/button_height</item>
+		<item name="cardCornerRadius">@dimen/button_radius</item>
+	</style>
+
+	<style name="CrowdNotifier.Card.Grey">
+		<item name="android:minHeight">0dp</item>
+		<item name="android:focusable">false</item>
+		<item name="android:clickable">false</item>
+		<item name="cardElevation">0dp</item>
+		<item name="cardBackgroundColor">@color/light_grey</item>
+	</style>
+
+	<style name="CrowdNotifier.Text" parent="TextAppearance.AppCompat">
+		<item name="android:textSize">@dimen/text_size_normal</item>
+		<item name="android:textColor">@color/main</item>
+		<item name="android:lineSpacingMultiplier">1.1</item>
+		<item name="android:fontFamily">@font/inter_light</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Title">
+		<item name="android:textSize">@dimen/text_size_splash_title</item>
+		<item name="android:fontFamily">@font/inter_bold</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Subtitle">
+		<item name="android:fontFamily">@font/inter_bold</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Status">
+		<item name="android:letterSpacing">0.075</item>
+		<item name="android:fontFamily">@font/inter_bold</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textAllCaps">true</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Status.Small">
+		<item name="android:textSize">@dimen/text_size_small</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Status.Primary">
+		<item name="android:textColor">@color/primary</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Status.Primary.Small">
+		<item name="android:textSize">@dimen/text_size_small</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Status.Tertiary">
+		<item name="android:textColor">@color/tertiary</item>
+	</style>
+
+	<style name="CrowdNotifier.Text.Status.Tertiary.Small">
+		<item name="android:textSize">@dimen/text_size_small</item>
+	</style>
+
+	<style name="CrowdNotifier.ToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:textAllCaps">false</item>
+		<item name="android:layout_height">wrap_content</item>
+	</style>
+
+	<style name="CrowdNotifier.Button" parent="Widget.MaterialComponents.Button">
+		<item name="backgroundTint">@null</item>
+		<item name="android:textColor">@color/white</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:fontFamily">@font/inter_bold</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textSize">@dimen/text_size_normal</item>
+		<item name="android:background">@drawable/bg_button_default_crowdnotifier</item>
+		<item name="android:stateListAnimator">@null</item>
+		<item name="android:height">@dimen/button_height</item>
+		<item name="android:paddingStart">@dimen/spacing_huge</item>
+		<item name="android:paddingEnd">@dimen/spacing_huge</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e0192b51d..bd9c85962 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -96,4 +96,15 @@
 
 	<dimen name="flag_width">26dp</dimen>
 	<dimen name="flag_height">20dp</dimen>
+
+
+	<!-- CrowdNotifier Dimens -->
+
+	<dimen name="button_radius">36dp</dimen>
+	<dimen name="qr_scanner_indicator_size">50dp</dimen>
+	<dimen name="qr_scanner_indicator_stroke_width">5dp</dimen>
+	<dimen name="qr_scanner_indicator_stroke_width_inverse">-6dp</dimen>
+
+	<dimen name="button_height">72dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b876070f..1bb28b1bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1503,4 +1503,33 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Quick Action bei einer Reminder Notification, welche einen neuen Reminder setzt in 30 Minuten. -->
     <string name="reminder_notification_snooze_action">"Snooze"</string>
 
+    <string name="error_force_update_title">"Update required"</string>
+    <!-- Warnungs Text, welcher angezeigt wird, wenn ein inkompatibler QR Code (mit einem neueren QR Code Format) gescannt wurde. -->
+    <string name="error_update_text">"This QR code is not compatible with the current version of the app. Please update the app to scan it the code."</string>
+
+    <!-- Titel für den Update Button, wenn ein App Update notwending ist. -->
+    <string name="error_action_update">"Update now"</string>
+
+    <!-- Text, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären. -->
+    <!-- Fuzzy -->
+    <string name="camera_permission_dialog_text">"NotifyMe requires access to your camera. The camera will only be used for scanning QR codes."</string>
+
+    <!-- Button titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären. -->
+    <string name="camera_permission_dialog_action">"Grant camera access"</string>
+
+    <!-- Title of Checkin Screen -->
+    <string name="checkin_title">"Check-in"</string>
+
+    <!-- QR-Scanner: request for scan text -->
+    <string name="qrscanner_scan_qr_text">"Scan QR code to check in"</string>
+
+    <!-- Titel des Check-In Screens -->
+    <string name="check_in_screen_title">"Checking in"</string>
+
+    <!-- Check In: Set Reminder title -->
+    <string name="checkin_set_reminder">"Set reminder"</string>
+
+    <!-- Check In Confirm: Button title -->
+    <string name="check_in_now_button_title">"Check In Now"</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 949c0d49c..0e283530a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -329,4 +329,5 @@ a
 		<item name="fontFamily">@font/inter_light</item>
 	</style>
 
+
 </resources>

From be6c70103c2d215f629ad92fdfe1de97df3067af Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 29 Apr 2021 09:34:16 +0200
Subject: [PATCH 008/207] Implement Checked-In State on Homescreen

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  63 +++++--
 .../ch/admin/bag/dp3t/util/StringUtil.java    |  40 ++++-
 app/src/main/res/drawable/ic_qr.xml           |  10 ++
 app/src/main/res/layout/card_checkin.xml      |  77 ++++++++-
 app/src/main/res/values-bs/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-de/strings.xml        | 155 ++++++++++++++++++
 app/src/main/res/values-es/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-fr/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-hr/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-it/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-pt/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-rm/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-sq/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-sr/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-ti/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values-tr/strings.xml        | 153 +++++++++++++++++
 app/src/main/res/values/strings.xml           |   3 +
 app/src/main/res/values/styles.xml            |   8 +-
 18 files changed, 2011 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_qr.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index af746f2e1..0a0ef0796 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -44,6 +44,7 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
 import ch.admin.bag.dp3t.home.model.NotificationState;
@@ -69,6 +70,7 @@ public class HomeFragment extends Fragment {
 
 	private static final String TAG = "HomeFragment";
 	private TracingViewModel tracingViewModel;
+	private CrowdNotifierViewModel crowdNotifierViewModel;
 	private HeaderView headerView;
 	private ScrollView scrollView;
 
@@ -103,6 +105,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		secureStorage = SecureStorage.getInstance(getContext());
 
 		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
+		crowdNotifierViewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
 
 		getChildFragmentManager()
 				.beginTransaction()
@@ -366,21 +369,53 @@ private boolean isNotificationChannelEnabled(Context context, @Nullable String c
 	}
 
 	private void setupCheckinCard() {
-		checkinCard.setOnClickListener(
-				v -> requireActivity().getSupportFragmentManager().beginTransaction()
-						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-						.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
-						.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
-						.commit()
-		);
 
-		checkinCard.findViewById(R.id.checkin_scan).setOnClickListener(
-				v -> requireActivity().getSupportFragmentManager().beginTransaction()
-						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-						.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
-						.addToBackStack(QrCodeScannerFragment.class.getCanonicalName())
-						.commit()
-		);
+		checkinCard.setOnClickListener(v -> showCheckinOverviewFragment());
+
+		View checkinView = checkinCard.findViewById(R.id.checkin_view);
+		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
+
+		crowdNotifierViewModel.isCheckedIn().observe(getViewLifecycleOwner(), isCheckedIn -> {
+			if (isCheckedIn) {
+				checkoutView.setVisibility(View.VISIBLE);
+				checkinView.setVisibility(View.GONE);
+				crowdNotifierViewModel.startCheckInTimer();
+			} else {
+				checkoutView.setVisibility(View.GONE);
+				checkinView.setVisibility(View.VISIBLE);
+			}
+		});
+
+		checkinCard.findViewById(R.id.checkin_button).setOnClickListener(v -> showQrCodeScannerFragment());
+		checkinCard.findViewById(R.id.checkout_button).setOnClickListener(v -> showCheckOutFragment());
+
+		TextView checkinTime = checkinCard.findViewById(R.id.checkin_time);
+		crowdNotifierViewModel.getTimeSinceCheckIn().observe(getViewLifecycleOwner(),
+				duration -> checkinTime.setText(StringUtil.getShortDurationString(duration)));
+	}
+
+	private void showCheckOutFragment() {
+		//TODO
+	}
+
+	private void showCheckedInFragment() {
+		//TODO
+	}
+
+	private void showQrCodeScannerFragment() {
+		requireActivity().getSupportFragmentManager().beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
+				.addToBackStack(QrCodeScannerFragment.class.getCanonicalName())
+				.commit();
+	}
+
+	private void showCheckinOverviewFragment() {
+		requireActivity().getSupportFragmentManager().beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
+				.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
+				.commit();
 	}
 
 	private void setupTravelCard() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index 3a835771e..a47b0eac1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -7,7 +7,6 @@
  *
  * SPDX-License-Identifier: MPL-2.0
  */
-
 package ch.admin.bag.dp3t.util;
 
 import android.graphics.Typeface;
@@ -19,13 +18,16 @@
 
 import java.math.BigInteger;
 import java.util.Calendar;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 public class StringUtil {
 
+	private static final long ONE_HOUR = TimeUnit.HOURS.toMillis(1);
+
 	/**
 	 * Creates a spannable where the {@code boldString} is set to bold within the {@code fullString}.
 	 * Be aware that this only applies to the first occurence.
-	 *
 	 * @param fullString The entire string
 	 * @param boldString The partial string to be made bold
 	 * @return A partially bold spannable
@@ -48,7 +50,7 @@ public static String toHex(byte[] array) {
 		BigInteger bi = new BigInteger(1, array);
 		String hex = bi.toString(16);
 		int paddingLength = (array.length * 2) - hex.length();
-		if(paddingLength > 0)
+		if (paddingLength > 0)
 			return String.format("%0" + paddingLength + "d", 0) + hex;
 		else
 			return hex;
@@ -68,4 +70,36 @@ private static String prependZero(int timeUnit) {
 		}
 	}
 
+	/**
+	 * Formats a duration in milliseconds to a String of hours, minutes and seconds, or to only hours and minutes if the
+	 * duration is more than 10 hours
+	 * @param duration in milliseconds
+	 * @return a formatted duration String
+	 */
+	public static String getShortDurationString(long duration) {
+		if (duration >= TimeUnit.HOURS.toMillis(10)) {
+			return String.format(Locale.GERMAN, "%d:%02d",
+					TimeUnit.MILLISECONDS.toHours(duration),
+					TimeUnit.MILLISECONDS.toMinutes(duration - TimeUnit.HOURS.toMillis(TimeUnit.MILLISECONDS.toHours(duration)))
+			);
+		} else {
+			return getDurationString(duration);
+		}
+	}
+
+	public static String getDurationString(long duration) {
+		if (duration >= ONE_HOUR) {
+			return String.format(Locale.GERMAN, "%d:%02d:%02d",
+					TimeUnit.MILLISECONDS.toHours(duration),
+					TimeUnit.MILLISECONDS.toMinutes(duration - TimeUnit.HOURS.toMillis(TimeUnit.MILLISECONDS.toHours(duration))),
+					TimeUnit.MILLISECONDS.toSeconds(duration - TimeUnit.MINUTES.toMillis(TimeUnit.MILLISECONDS.toMinutes(duration)))
+			);
+		} else {
+			return String.format(Locale.GERMAN, "%02d:%02d",
+					TimeUnit.MILLISECONDS.toMinutes(duration),
+					TimeUnit.MILLISECONDS.toSeconds(duration - TimeUnit.MINUTES.toMillis(TimeUnit.MILLISECONDS.toMinutes(duration)))
+			);
+		}
+	}
+
 }
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
new file mode 100644
index 000000000..e5dc53b1c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.09,12.91v10h-10v-10h10zM15.636,19.273v1.817h7.273v1.82h-9.09v-3.637h1.817zM9.272,14.727L2.909,14.727v6.363h6.363v-6.363zM15.636,12.909v2.727h1.818v-2.727h5.455v6.364h-1.818l-0.001,-4.546h-1.818v2.728h-5.454v-4.546h1.818zM7.455,16.545v2.728L4.727,19.273v-2.728h2.728zM11.09,1.091v10h-10v-10h10zM22.908,1.091v10h-10v-10h10zM9.272,2.909L2.909,2.909v6.363h6.363L9.272,2.909zM21.09,2.909h-6.363v6.363h6.363L21.09,2.909zM7.455,4.727v2.728L4.727,7.455L4.727,4.727h2.728zM19.273,4.727v2.728h-2.728L16.545,4.727h2.728z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
index 3c568fcf2..47337fd07 100644
--- a/app/src/main/res/layout/card_checkin.xml
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
@@ -15,11 +16,11 @@
 		<LinearLayout
 			android:id="@+id/checkin_header"
 			android:layout_width="match_parent"
-			android:layout_marginTop="5dp"
-			android:paddingBottom="5dp"
 			android:layout_height="match_parent"
+			android:layout_marginTop="5dp"
 			android:gravity="center_vertical"
-			android:orientation="horizontal">
+			android:orientation="horizontal"
+			android:paddingBottom="5dp">
 
 			<TextView
 				style="@style/NextStep.Text.Title"
@@ -27,22 +28,80 @@
 				android:layout_height="wrap_content"
 				android:layout_marginStart="@dimen/spacing_medium"
 				android:layout_weight="1"
-				android:text="[TBT] Checkin" />
+				android:text="[TBT] My Check-Ins" />
 
 			<ImageView
 				android:layout_width="@dimen/chevron_size_title"
 				android:layout_height="@dimen/chevron_size_title"
 				android:layout_marginEnd="@dimen/spacing_small"
 				android:src="@drawable/ic_chevron_right"
-				android:tint="@color/dark_main" />
+				app:tint="@color/dark_main" />
 
 		</LinearLayout>
 
-		<Button
-			android:id="@+id/checkin_scan"
-			android:text="[TBT] scan qr"
+		<LinearLayout
+			android:id="@+id/checkin_view"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_small"
+			android:orientation="vertical"
+			android:visibility="gone">
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_small"
+				android:text="[TBT] Hier wird eine Beschreibung sein." />
+
+			<Button
+				android:id="@+id/checkin_button"
+				style="@style/NextStep.Button.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginVertical="@dimen/spacing_medium_large"
+				android:drawableStart="@drawable/ic_qr"
+				android:text="[TBT] Scan QR Code" />
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/checkout_view"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_small"
+			android:orientation="vertical"
+			android:visibility="visible">
+
+			<TextView
+				android:id="@+id/checkin_time"
+				style="@style/NextStep.Text.SplashTitle.Dark"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_small"
+				android:gravity="center_horizontal"
+				tools:text="20:32" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_tiny_small"
+				android:gravity="center_horizontal"
+				android:text="[TBT] Sie sind eingecheckt." />
+
+			<Button
+				android:id="@+id/checkout_button"
+				style="@style/NextStep.Button.Outlined"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginVertical="@dimen/spacing_medium_large"
+				android:drawableStart="@drawable/ic_qr"
+				android:drawableTint="@color/blue_main"
+				android:text="@string/checkout_button_title"
+				android:textAllCaps="false" />
+
+		</LinearLayout>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index b18d230bb..2a81b1727 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1413,4 +1413,157 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d54060630..681bd8214 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1473,4 +1473,159 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"In 1 Tag"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title">"Check-out Erinnerung"</string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text">"Möchten Sie auschecken?"</string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title">"Automatischer Checkout"</string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body">"Sie wurden automatisch ausgecheckt."</string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text">"QR-Code scannen und einchecken"</string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error">"Kein gültiger QR-Code!"</string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from">"Von"</string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to">"Bis"</string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment">"Notiz hinzufügen"</string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder">"zb. Mit wem waren Sie da?"</string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button">"Fertig"</string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder">"Check-out Erinnerung"</string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off">"Aus"</string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary">"Authentifizieren Sie sich für den Zugriff auf das Tagebuch"</string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours">"{HOURS} h"</string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission">"Die App benötigt Zugriff auf die Kamera, um den QR-Code scannen zu können."</string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title">"Tagebuch"</string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title">"Check-in"</string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription">"Die Kamera wird benötigt, um den QR-Code zu scannen."</string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription">"Erlauben Sie Face-ID, um sicher auf Ihr Tagebuch zuzugreifen."</string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text">"Authentifizieren Sie sich für den Zugriff auf das Tagebuch"</string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title">"Check-out"</string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title">"Check-Ins"</string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title">"Check-In"</string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code">"QR-Code erstellen"</string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title">"Veranstaltungen"</string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title">"Jetzt einchecken"</string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title">"Die Erinnerung konnte nicht gesetzt werden"</string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message">"Damit Sie Check-out Erinnerungen erhalten, müssen Sie \\"Mitteilungen\\" in den App-Einstellungen erlauben."</string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings">"Anpassen"</string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title">"Bearbeiten"</string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title">"Noch keine Tagebucheinträge vorhanden"</string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text">"Die Veranstaltungen, die besucht wurden, erscheinen im Tagebuch nach dem Check-out."</string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text">"SwissCovid benötigt Zugriff auf die Kamera Ihres Gerätes. Die Kamera wird nur verwendet, um QR Codes zu scannen."</string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action">"Kamera-Zugriff erlauben"</string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <!-- Fuzzy -->
+    <string name="web_generator_title_placeholder">"z.B. Raum- oder Eventname"</string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <!-- Fuzzy -->
+    <string name="web_generator_category_label">"Kategorie"</string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other">"Andere"</string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room">"Sitzungsraum"</string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria">"Kafeteria"</string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event">"Privater Event"</string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label">"Titel"</string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button">"Druck-PDF anzeigen"</string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen">"Kantine"</string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library">"Bibliothek"</string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room">"Vorlesungssaal"</string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop">"Laden"</string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym">"Fitnesscenter"</string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area">"Küchenbereich"</string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space">"Büroräume"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d0e36d6e7..5bfabafa9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1404,4 +1404,157 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"En 1 día"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f2189baa3..83bb2218b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1439,4 +1439,157 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Dans 1 jour"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index ea609639f..669e72272 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1409,4 +1409,157 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 370af1dac..78c1ef1a8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1447,4 +1447,157 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Fra 1 giorno"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c353b1946..0285d87a5 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1414,4 +1414,157 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Em 1 dia"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 45ccf05c3..5b2ce53d2 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1409,4 +1409,157 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"En 1 di"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 3c0b15669..aaaa931b0 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1414,4 +1414,157 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Në 1 ditë"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 60b20ea8a..d94d37ae4 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1409,4 +1409,157 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 647461c17..30ab827d7 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1389,4 +1389,157 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"ኣብ 1 መዓልቲ"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3868750d6..4d6c22508 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1391,4 +1391,157 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"1 gün sonra"</string>
+
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
+
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
+
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
+
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
+
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
+
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
+
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
+
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
+
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
+
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
+
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
+
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
+
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
+
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
+
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
+
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
+
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
+
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
+
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
+
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
+
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
+
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
+
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
+
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
+
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
+
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
+
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
+
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1bb28b1bf..663d2f27c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1532,4 +1532,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Check In Confirm: Button title -->
     <string name="check_in_now_button_title">"Check In Now"</string>
 
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title">"Check-out"</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0e283530a..0ef106e8e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,7 +63,8 @@
 	<style name="NextStep.Text.Small.Light">
 		<item name="android:textColor">@color/anthracite_lighter</item>
 	</style>
-a
+	a
+
 	<style name="NextStep.Text.Small.Anthracite">
 		<item name="android:textColor">@color/anthracite</item>
 	</style>
@@ -159,6 +160,10 @@ a
 		<item name="android:textColor">@color/white</item>
 	</style>
 
+	<style name="NextStep.Text.SplashTitle.Dark">
+		<item name="android:textColor">@color/main</item>
+	</style>
+
 	<style name="NextStep.Text.Status">
 		<item name="android:fontFamily">@font/inter_bold</item>
 		<item name="android:textStyle">bold</item>
@@ -329,5 +334,4 @@ a
 		<item name="fontFamily">@font/inter_light</item>
 	</style>
 
-
 </resources>

From 612d2bb97694a7819918f66a8278ec6030a0ac50 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 29 Apr 2021 15:15:33 +0200
Subject: [PATCH 009/207] Implement Checked-In State on CheckinOverviewFragment

---
 .../dp3t/checkin/CheckinOverviewFragment.java |  43 +++-
 .../checkinflow/QrCodeScannerFragment.java    |   7 +-
 .../models/CrowdNotifierErrorState.java       |   2 +-
 .../checkin/utils/NotificationHelper.java     |   4 +-
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |   4 -
 app/src/main/res/layout/fragment_check_in.xml |   2 +-
 .../res/layout/fragment_checkin_overview.xml  |  88 +++++++-
 app/src/main/res/values-bs/strings.xml        |  21 ++
 app/src/main/res/values-de/strings.xml        |  21 ++
 app/src/main/res/values-es/strings.xml        |  21 ++
 app/src/main/res/values-fr/strings.xml        |  21 ++
 app/src/main/res/values-hr/strings.xml        |  21 ++
 app/src/main/res/values-it/strings.xml        |  21 ++
 app/src/main/res/values-pt/strings.xml        |  21 ++
 app/src/main/res/values-rm/strings.xml        |  21 ++
 app/src/main/res/values-sq/strings.xml        |  21 ++
 app/src/main/res/values-sr/strings.xml        |  21 ++
 app/src/main/res/values-ti/strings.xml        |  21 ++
 app/src/main/res/values-tr/strings.xml        |  21 ++
 app/src/main/res/values/strings.xml           | 213 ++++++++++++------
 app/src/main/res/values/styles.xml            |   1 -
 21 files changed, 523 insertions(+), 93 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
index ef7f4d4ed..b211636e4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
@@ -2,28 +2,35 @@
 
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
+import ch.admin.bag.dp3t.util.StringUtil;
 
 public class CheckinOverviewFragment extends Fragment {
 
+	private CrowdNotifierViewModel crowdNotifierViewModel;
+
 	public static CheckinOverviewFragment newInstance() {
 		return new CheckinOverviewFragment();
 	}
 
 	public CheckinOverviewFragment() { super(R.layout.fragment_checkin_overview); }
 
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		crowdNotifierViewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
+	}
+
 	@Override
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		view.findViewById(R.id.checkin_overview_scan_qr).setOnClickListener(
-				v -> {
-					showQRCodeScanner();
-				});
 
 		view.findViewById(R.id.checkin_overview_history).setOnClickListener(
 				v -> {
@@ -32,9 +39,35 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 		((Toolbar) view.findViewById(R.id.checkin_overview_toolbar))
 				.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
+
+		View checkinCard = view.findViewById(R.id.checkin_overview_scan_qr);
+		View checkinView = checkinCard.findViewById(R.id.checkin_view);
+		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
+
+		crowdNotifierViewModel.isCheckedIn().observe(getViewLifecycleOwner(), isCheckedIn -> {
+			if (isCheckedIn) {
+				checkoutView.setVisibility(View.VISIBLE);
+				checkinView.setVisibility(View.GONE);
+				crowdNotifierViewModel.startCheckInTimer();
+			} else {
+				checkoutView.setVisibility(View.GONE);
+				checkinView.setVisibility(View.VISIBLE);
+			}
+		});
+
+		checkinCard.findViewById(R.id.checkin_button).setOnClickListener(v -> showQrCodeScannerFragment());
+		checkinCard.findViewById(R.id.checkout_button).setOnClickListener(v -> showCheckOutFragment());
+
+		TextView checkinTime = checkinCard.findViewById(R.id.checkin_time);
+		crowdNotifierViewModel.getTimeSinceCheckIn().observe(getViewLifecycleOwner(),
+				duration -> checkinTime.setText(StringUtil.getShortDurationString(duration)));
+	}
+
+	private void showCheckOutFragment() {
+		//TODO
 	}
 
-	private void showQRCodeScanner() {
+	private void showQrCodeScannerFragment() {
 		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 				.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 4a3909f63..029b8890f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -161,9 +161,12 @@ private void startCameraAndQrAnalyzer() {
 				cameraProvider.unbindAll();
 				Camera camera = cameraProvider.bindToLifecycle(getViewLifecycleOwner(), cameraSelector, preview, imageAnalyzer);
 				setupFlashButton(camera);
-			} catch (ExecutionException | InterruptedException e) {
+			} catch (ExecutionException e) {
 				Log.d(TAG, "Error starting camera " + e.getMessage());
-				e.printStackTrace();
+				throw new RuntimeException(e);
+			} catch (InterruptedException e) {
+				Log.w("QR Analysis Interrupted", e.getMessage());
+				Thread.currentThread().interrupt();
 			}
 		}, ContextCompat.getMainExecutor(requireContext()));
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
index b4611505f..d5913b1ca 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
@@ -17,7 +17,7 @@ public enum CrowdNotifierErrorState {
 	QR_CODE_NOT_VALID_ANYMORE(R.string.error_title, R.string.qr_scanner_error_code_not_valid_anymore, R.string.android_button_ok,
 			R.drawable.ic_error),
 	ALREADY_CHECKED_IN(R.string.error_title, R.string.error_already_checked_in, R.string.android_button_ok, R.drawable.ic_error),
-	UPDATE_REQUIRED(R.string.error_force_update_title, R.string.error_update_text, R.string.error_action_update,
+	UPDATE_REQUIRED(R.string.error_update_title, R.string.error_update_text, R.string.error_action_update,
 			R.drawable.ic_error);
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 1ac8da2df..28beb363b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -115,8 +115,8 @@ public void showExposureNotification(long exposureId) {
 
 		Notification notification = getNotificationBuilder(CHANNEL_ID_EXPOSURE_NOTIFICATION)
 				.setContentIntent(createExposurePendingIntent(exposureId))
-				.setContentTitle(context.getString(R.string.exposure_notification_title))
-				.setContentText(context.getString(R.string.exposure_notification_body))
+				.setContentTitle(context.getString(R.string.push_exposed_title))
+				.setContentText(context.getString(R.string.push_exposed_text))
 				.build();
 
 		notificationManager.notify((int) exposureId, notification);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 0a0ef0796..6711fd032 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -398,10 +398,6 @@ private void showCheckOutFragment() {
 		//TODO
 	}
 
-	private void showCheckedInFragment() {
-		//TODO
-	}
-
 	private void showQrCodeScannerFragment() {
 		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index be53aa6ad..677f684dc 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -13,7 +13,7 @@
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
 		app:navigationIcon="@drawable/ic_arrow_back"
-		app:title="@string/check_in_screen_title" />
+		app:title="@string/checkin_title" />
 
 	<ScrollView
 		android:id="@+id/check_in_fragment_venue_info_scrollview"
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 25f552b23..6708095bf 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -10,6 +10,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="@color/grey_light"
@@ -45,22 +46,93 @@
 				android:layout_marginBottom="@dimen/spacing_medium_large">
 
 				<LinearLayout
+					android:id="@+id/card_checkin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:foreground="?selectableItemBackground"
 					android:orientation="vertical">
 
-					<TextView
-						style="@style/NextStep.Text.Title"
+					<LinearLayout
+						android:id="@+id/checkin_view"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/spacing_large"
-						android:layout_marginTop="@dimen/spacing_medium_large"
-						android:layout_marginRight="@dimen/spacing_large"
-						android:layout_marginBottom="@dimen/spacing_medium"
-						android:text="[TBT] scan qr" />
+						android:layout_marginHorizontal="@dimen/spacing_small"
+						android:orientation="vertical"
+						android:visibility="gone">
+
+						<TextView
+							style="@style/NextStep.Text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="@dimen/spacing_small"
+							android:text="[TBT] Hier wird eine Beschreibung sein." />
+
+						<Button
+							android:id="@+id/checkin_button"
+							style="@style/NextStep.Button.Blue"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginVertical="@dimen/spacing_medium_large"
+							android:drawableStart="@drawable/ic_qr"
+							android:text="[TBT] Scan QR Code" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/checkout_view"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginHorizontal="@dimen/spacing_small"
+						android:orientation="vertical"
+						android:visibility="visible">
+
+						<TextView
+							style="@style/NextStep.Text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="@dimen/spacing_tiny_small"
+							android:gravity="center_horizontal"
+							android:text="[TBT] Sie sind eingecheckt." />
+
+						<TextView
+							android:id="@+id/checkin_time"
+							style="@style/NextStep.Text.SplashTitle.Dark"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="@dimen/spacing_small"
+							android:gravity="center_horizontal"
+							tools:text="20:32" />
+
+						<TextView
+							style="@style/NextStep.Text.Bold"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="@dimen/spacing_tiny_small"
+							android:gravity="center_horizontal"
+							tools:text="Reuss, Ubique" />
+
+						<TextView
+							style="@style/NextStep.Text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="@dimen/spacing_tiny_small"
+							android:gravity="center_horizontal"
+							tools:text="Büroräumlichkeiten" />
+
+						<Button
+							android:id="@+id/checkout_button"
+							style="@style/NextStep.Button.Outlined"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginVertical="@dimen/spacing_medium_large"
+							android:drawableStart="@drawable/ic_qr"
+							android:drawableTint="@color/blue_main"
+							android:text="@string/checkout_button_title"
+							android:textAllCaps="false" />
+
+					</LinearLayout>
 
 				</LinearLayout>
-
 			</androidx.cardview.widget.CardView>
 
 			<androidx.cardview.widget.CardView
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 2a81b1727..d6493f956 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1566,4 +1566,25 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 681bd8214..46c2af979 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1628,4 +1628,25 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space">"Büroräume"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Netzwerk Fehler"</string>
+    <string name="error_network_text">"Überprüfen Sie Ihre Internet Verbindung."</string>
+    <string name="error_action_retry">"Erneut versuchen"</string>
+    <string name="error_notification_deactivated_title">"Mitteilungen deaktiviert"</string>
+    <string name="error_notification_deactivated_text">"Ändern Sie die Einstellungen, um bei einer Meldung direkt informiert zu werden."</string>
+    <string name="error_action_change_settings">"Einstellungen ändern"</string>
+    <string name="error_camera_permission_title">"Kein Zugriff auf Kamera"</string>
+    <string name="error_camera_permission_text">"Die App benötigt Zugriff auf die Kamera, um den QR-Code scannen zu können."</string>
+    <string name="error_title">"Fehler"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR-Code noch nicht gültig"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR-Code nicht mehr gültig"</string>
+    <string name="error_already_checked_in">"Sie sind bereits eingecheckt."</string>
+    <string name="error_update_text">"Dieser QR Code ist nicht kompatibel mit der installierten App Version. Führen Sie ein Update der App durch, um den QR Code zu scannen."</string>
+    <string name="error_update_title">"Update benötigt"</string>
+    <string name="error_action_update">"Jetzt updaten"</string>
+    <string name="android_crowdnotifier_notification_channel_name">"CrowdNotifier Meldungen"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanente Checkin Meldung"</string>
+    <string name="ongoing_notification_title">"Sie sind eingecheckt seit {TIME} Uhr."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5bfabafa9..30a2397cf 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1557,4 +1557,25 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 83bb2218b..0ab861dd7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1592,4 +1592,25 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 669e72272..c415a9466 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1562,4 +1562,25 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 78c1ef1a8..7f49a5039 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1600,4 +1600,25 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0285d87a5..1fb7fd495 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1567,4 +1567,25 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 5b2ce53d2..ad2190ecf 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1562,4 +1562,25 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index aaaa931b0..7085faf72 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1567,4 +1567,25 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index d94d37ae4..dc8616037 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1562,4 +1562,25 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 30ab827d7..df2175989 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1542,4 +1542,25 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 4d6c22508..b196d97c7 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1544,4 +1544,25 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Check-Ins: Kategorie Büroräume -->
     <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 663d2f27c..569940d85 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1437,102 +1437,177 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
     <string name="meldungen_detail_free_test_tomorrow">"In 1 day"</string>
 
-    <!-- Reminder: Option Off -->
-    <string name="reminder_option_off">"off"</string>
+    <!-- Check-Ins: Titel vom Reminder Push -->
+    <string name="checkout_reminder_title"></string>
 
-    <!-- Reminder Option with an amount of hours -->
-    <string name="reminder_option_hours">"{HOURS} h"</string>
+    <!-- Check-Ins: Check-out Reminder Push Text -->
+    <string name="checkout_reminder_text"></string>
 
-    <!-- Reminder Option with an amount of minutes -->
-    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+    <!-- Check-Ins: Auto-Checkout Push Titel -->
+    <string name="auto_checkout_title"></string>
 
-    <string name="error_network_title">"Connection error"</string>
-    <string name="error_network_text">"Check your internet connection"</string>
-    <string name="error_notification_deactivated_title">"Deactivate notifications"</string>
-    <string name="error_notification_deactivated_text">"Edit the app settings to receive report-notifications."</string>
-    <string name="error_background_refresh_title">"Background updates are off"</string>
-    <string name="error_background_refresh_text">"Edit the app settings to be informed at all times."</string>
-    <string name="error_camera_permission_title">"No camera access"</string>
-    <string name="error_camera_permission_text">"The app needs camera access to scan the QR code."</string>
-    <string name="error_action_change_settings">"Edit settings"</string>
-    <string name="error_action_retry">"Try again"</string>
+    <!-- Check-Ins: Auto-checkout Push Text -->
+    <string name="auto_checkout_body"></string>
 
-    <!-- Titel einer generischen Fehleranzeige -->
-    <string name="error_title">"Error"</string>
+    <!-- Check-Ins: Qr-Scanner Text -->
+    <string name="qrscanner_scan_qr_text"></string>
 
-    <!-- Fehlermeldung, wenn man bereits eingecheckt ist -->
-    <string name="error_already_checked_in">"You are already checked in."</string>
+    <!-- Check-Ins: Fehler beim QR-Code scannen -->
+    <string name="qrscanner_error"></string>
 
-    <string name="qr_scanner_error_code_not_yet_valid">"Code is not valid yet"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"Code is not valid anymore"</string>
+    <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
+    <string name="datepicker_from"></string>
 
-    <!-- QR Code Scanner: no valid code text -->
-    <!-- Fuzzy -->
-    <string name="qrscanner_error">"No valid code!"</string>
+    <!-- Check-Ins: Datumsauswahl bis -->
+    <string name="datepicker_to"></string>
 
-    <!-- Titel der Notification, welche erscheint, wenn der Benutzer automatisch ausgecheckt wurde nach 12 Stunden. -->
-    <string name="auto_checkout_title">"Automated checkout"</string>
+    <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
+    <string name="edit_mode_addcomment"></string>
 
-    <!-- Nachrichttext der Notification, welche erscheint, wenn der Benutzer automatisch ausgecheckt wurde nach 12 Stunden. -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
+    <string name="edit_mode_comment_placeholder"></string>
 
-    <!-- Title for an exposure notification. -->
-    <string name="exposure_notification_title">"New message"</string>
+    <!-- Fertig Button Text -->
+    <string name="done_button"></string>
 
-    <!-- Body text for an exposure notification. -->
-    <string name="exposure_notification_body">"Open the app to read the message"</string>
+    <!-- Check-Ins: Titel für Erinnerung -->
+    <string name="checkin_set_reminder"></string>
 
-    <!-- Notification Channel name on Android Devices (Only visible in System Settings) -->
-    <string name="android_crowdnotifier_notification_channel_name">"Reports"</string>
+    <!-- Check-Ins: Erinnerung Option Aus -->
+    <string name="reminder_option_off"></string>
 
-    <!-- Reminder Notification Title -->
-    <string name="checkout_reminder_title">"Check-Out Reminder"</string>
+    <!-- Check-Ins: Tagebuch Zugriff Text -->
+    <string name="authenticate_for_diary"></string>
 
-    <!-- Reminder Checkout Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <!-- Check-Ins: Errinnerungsoption Stunden -->
+    <string name="reminder_option_hours"></string>
 
-    <!-- Notification Channel name for Ongoing Checkin Notifications on Android Devices (Only visible in System Settings) -->
-    <string name="android_ongoing_checkin_notification_channel_name">"Ongoing Check-in Notification"</string>
+    <!-- Check-Ins: Errinnerungsoption Minuten -->
+    <string name="reminder_option_minutes"></string>
 
-    <!-- Titel der Ongoing Notification, welche während des ganzen Check Ins angezeigt wird im Notificaiton Center. -->
-    <string name="ongoing_notification_title">"You are checked in since {TIME}."</string>
+    <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
+    <string name="qr_scanner_no_camera_permission"></string>
 
-    <!-- Quick Action der Ongoing Notification, welche während des ganzen Check Ins angezeigt wird im Notificaiton Center. -->
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <!-- Check-Ins: Tagebuch Titel -->
+    <string name="diary_title"></string>
 
-    <!-- Quick Action bei einer Reminder Notification, welche einen neuen Reminder setzt in 30 Minuten. -->
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <!-- Check-Ins: Button Titel zum Einchecken -->
+    <string name="checkin_button_title"></string>
 
-    <string name="error_force_update_title">"Update required"</string>
-    <!-- Warnungs Text, welcher angezeigt wird, wenn ein inkompatibler QR Code (mit einem neueren QR Code Format) gescannt wurde. -->
-    <string name="error_update_text">"This QR code is not compatible with the current version of the app. Please update the app to scan it the code."</string>
+    <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
+    <string name="NSCameraUsageDescription"></string>
 
-    <!-- Titel für den Update Button, wenn ein App Update notwending ist. -->
-    <string name="error_action_update">"Update now"</string>
+    <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
+    <string name="NSFaceIDUsageDescription"></string>
 
-    <!-- Text, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären. -->
-    <!-- Fuzzy -->
-    <string name="camera_permission_dialog_text">"NotifyMe requires access to your camera. The camera will only be used for scanning QR codes."</string>
+    <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
+    <string name="face_id_reason_text"></string>
 
-    <!-- Button titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären. -->
-    <string name="camera_permission_dialog_action">"Grant camera access"</string>
+    <!-- Check-Ins: Check-Out Button Title -->
+    <string name="checkout_button_title"></string>
 
-    <!-- Title of Checkin Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <!-- Check-Ins: Titel Modul auf Homescreen -->
+    <string name="module_checkins_title"></string>
 
-    <!-- QR-Scanner: request for scan text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code to check in"</string>
+    <!-- Check-Ins: Titel vom Check-In Screen -->
+    <string name="checkin_title"></string>
 
-    <!-- Titel des Check-In Screens -->
-    <string name="check_in_screen_title">"Checking in"</string>
+    <!-- Check-Ins: QR-Code erstellen Titel -->
+    <string name="checkins_create_qr_code"></string>
 
-    <!-- Check In: Set Reminder title -->
-    <string name="checkin_set_reminder">"Set reminder"</string>
+    <!-- Check-Ins: Veranstaltungen Titel -->
+    <string name="events_title"></string>
 
-    <!-- Check In Confirm: Button title -->
-    <string name="check_in_now_button_title">"Check In Now"</string>
+    <!-- Check-Ins: Jetzt einchecken Button Titel -->
+    <string name="check_in_now_button_title"></string>
 
-    <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <!-- Check-Ins: Reminder Fehlermeldung Titel -->
+    <string name="checkin_reminder_settings_alert_title"></string>
+
+    <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
+    <string name="checkin_reminder_settings_alert_message"></string>
+
+    <!-- Check-Ins: Reminder Popup Anpassen -->
+    <string name="checkin_reminder_option_open_settings"></string>
+
+    <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
+    <string name="edit_controller_title"></string>
+
+    <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
+    <string name="empty_diary_title"></string>
+
+    <!-- Check-Ins: Tagebuch leer, Text -->
+    <string name="empty_diary_text"></string>
+
+    <!-- Check-Ins: Kamera Erlaubnis Text -->
+    <string name="camera_permission_dialog_text"></string>
+
+    <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
+    <string name="camera_permission_dialog_action"></string>
+
+    <!-- Check-Ins: Veranstaltung Titel Placeholder -->
+    <string name="web_generator_title_placeholder"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
+    <string name="web_generator_category_label"></string>
+
+    <!-- Check-Ins: Kategorie Andere -->
+    <string name="web_generator_category_other"></string>
+
+    <!-- Check-Ins: Kategorie Sitzungsraum -->
+    <string name="web_generator_category_meeting_room"></string>
+
+    <!-- Check-Ins: Kategorie Kafeteria -->
+    <string name="web_generator_category_cafeteria"></string>
+
+    <!-- Check-Ins: Kategorie Privater Event -->
+    <string name="web_generator_category_private_event"></string>
+
+    <!-- Check-Ins: Veranstaltungen Titel Titel -->
+    <string name="web_generator_title_label"></string>
+
+    <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
+    <string name="show_pdf_button"></string>
+
+    <!-- Check-Ins: Kategorie Kantine -->
+    <string name="web_generator_category_canteen"></string>
+
+    <!-- Check-Ins: Kategorie Bibliothek -->
+    <string name="web_generator_category_library"></string>
+
+    <!-- Check-Ins: Kategorie Vorlesungssaal -->
+    <string name="web_generator_category_lecture_room"></string>
+
+    <!-- Check-Ins: Kategorie Laden -->
+    <string name="web_generator_category_shop"></string>
+
+    <!-- Check-Ins: Kategorie Fitnesscenter -->
+    <string name="web_generator_category_gym"></string>
+
+    <!-- Check-Ins: Kategorie Küchenbereich -->
+    <string name="web_generator_category_kitchen_area"></string>
 
+    <!-- Check-Ins: Kategorie Büroräume -->
+    <string name="web_generator_category_office_space"></string>
+    <string name="bottom_nav_tab_info"></string>
+    <string name="error_network_title"></string>
+    <string name="error_network_text"></string>
+    <string name="error_action_retry"></string>
+    <string name="error_notification_deactivated_title"></string>
+    <string name="error_notification_deactivated_text"></string>
+    <string name="error_action_change_settings"></string>
+    <string name="error_camera_permission_title"></string>
+    <string name="error_camera_permission_text"></string>
+    <string name="error_title"></string>
+    <string name="qr_scanner_error_code_not_yet_valid"></string>
+    <string name="qr_scanner_error_code_not_valid_anymore"></string>
+    <string name="error_already_checked_in"></string>
+    <string name="error_update_text"></string>
+    <string name="error_update_title"></string>
+    <string name="error_action_update"></string>
+    <string name="android_crowdnotifier_notification_channel_name"></string>
+    <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
+    <string name="android_ongoing_checkin_notification_channel_name"></string>
+    <string name="ongoing_notification_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0ef106e8e..478fc104c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,7 +63,6 @@
 	<style name="NextStep.Text.Small.Light">
 		<item name="android:textColor">@color/anthracite_lighter</item>
 	</style>
-	a
 
 	<style name="NextStep.Text.Small.Anthracite">
 		<item name="android:textColor">@color/anthracite</item>

From 4e4f647fd7a7107a651fcd5f2ca15376f3d6ccd4 Mon Sep 17 00:00:00 2001
From: Clea Benz <benz@ubique.ch>
Date: Fri, 30 Apr 2021 09:42:04 +0200
Subject: [PATCH 010/207] Change CheckinOverviewFragement to kotlin class

---
 app/build.gradle                              |  8 +-
 .../dp3t/checkin/CheckinOverviewFragment.java | 78 -------------------
 .../dp3t/checkin/CheckinOverviewFragment.kt   | 70 +++++++++++++++++
 3 files changed, 74 insertions(+), 82 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt

diff --git a/app/build.gradle b/app/build.gradle
index 3ec6ae45d..6a283e962 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -212,10 +212,10 @@ dependencies {
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-	implementation 'androidx.fragment:fragment:1.3.2'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0'
-	implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
+	implementation 'androidx.fragment:fragment-ktx:1.3.3'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
 	implementation 'androidx.viewpager2:viewpager2:1.0.0'
 	implementation 'androidx.security:security-crypto:1.0.0-rc03'
 	implementation 'androidx.work:work-runtime-ktx:2.5.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
deleted file mode 100644
index b211636e4..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package ch.admin.bag.dp3t.checkin;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
-import ch.admin.bag.dp3t.util.StringUtil;
-
-public class CheckinOverviewFragment extends Fragment {
-
-	private CrowdNotifierViewModel crowdNotifierViewModel;
-
-	public static CheckinOverviewFragment newInstance() {
-		return new CheckinOverviewFragment();
-	}
-
-	public CheckinOverviewFragment() { super(R.layout.fragment_checkin_overview); }
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		crowdNotifierViewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-
-		view.findViewById(R.id.checkin_overview_history).setOnClickListener(
-				v -> {
-					// TODO
-				});
-
-		((Toolbar) view.findViewById(R.id.checkin_overview_toolbar))
-				.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
-
-		View checkinCard = view.findViewById(R.id.checkin_overview_scan_qr);
-		View checkinView = checkinCard.findViewById(R.id.checkin_view);
-		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
-
-		crowdNotifierViewModel.isCheckedIn().observe(getViewLifecycleOwner(), isCheckedIn -> {
-			if (isCheckedIn) {
-				checkoutView.setVisibility(View.VISIBLE);
-				checkinView.setVisibility(View.GONE);
-				crowdNotifierViewModel.startCheckInTimer();
-			} else {
-				checkoutView.setVisibility(View.GONE);
-				checkinView.setVisibility(View.VISIBLE);
-			}
-		});
-
-		checkinCard.findViewById(R.id.checkin_button).setOnClickListener(v -> showQrCodeScannerFragment());
-		checkinCard.findViewById(R.id.checkout_button).setOnClickListener(v -> showCheckOutFragment());
-
-		TextView checkinTime = checkinCard.findViewById(R.id.checkin_time);
-		crowdNotifierViewModel.getTimeSinceCheckIn().observe(getViewLifecycleOwner(),
-				duration -> checkinTime.setText(StringUtil.getShortDurationString(duration)));
-	}
-
-	private void showCheckOutFragment() {
-		//TODO
-	}
-
-	private void showQrCodeScannerFragment() {
-		requireActivity().getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
-				.addToBackStack(QrCodeScannerFragment.class.getCanonicalName())
-				.commit();
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
new file mode 100644
index 000000000..bec678937
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -0,0 +1,70 @@
+package ch.admin.bag.dp3t.checkin
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
+import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
+import ch.admin.bag.dp3t.util.StringUtil
+
+class CheckinOverviewFragment : Fragment() {
+
+	companion object {
+		@JvmStatic
+		fun newInstance(): CheckinOverviewFragment {
+			return CheckinOverviewFragment()
+		}
+	}
+
+	private lateinit var binding: FragmentCheckinOverviewBinding
+
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		super.onCreateView(inflater, container, savedInstanceState)
+		binding = FragmentCheckinOverviewBinding.inflate(layoutInflater)
+		return binding.root
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		binding.checkinOverviewToolbar.setNavigationOnClickListener { v ->
+			requireActivity().supportFragmentManager.popBackStack()
+		}
+
+		binding.checkinOverviewHistory.setOnClickListener { v: View? -> }
+
+
+		crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner, { isCheckedIn ->
+			binding.checkoutView.isVisible = isCheckedIn
+			binding.checkinView.isVisible = !isCheckedIn
+			if (isCheckedIn) {
+				crowdNotifierViewModel.startCheckInTimer()
+			}
+		})
+
+		binding.checkinButton.setOnClickListener { v -> showQrCodeScannerFragment() }
+		binding.checkoutButton.setOnClickListener { v -> showCheckOutFragment() }
+
+
+		crowdNotifierViewModel.timeSinceCheckIn.observe(
+			viewLifecycleOwner,
+			{ duration -> binding.checkinTime.text = StringUtil.getShortDurationString(duration) })
+	}
+
+	private fun showCheckOutFragment() {
+		//TODO
+	}
+
+	private fun showQrCodeScannerFragment() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
+			.addToBackStack(QrCodeScannerFragment::class.java.canonicalName)
+			.commit()
+	}
+}
\ No newline at end of file

From c696e16f32a8ed9bf968c4e7ee607c9f84a06f4a Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 29 Apr 2021 17:48:07 +0200
Subject: [PATCH 011/207] Implement Check Out Fragment

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |   7 +-
 .../checkin/checkinflow/CheckInFragment.java  |   3 +
 .../checkin/checkinflow/CheckOutFragment.java | 162 ++++++++++++++++
 .../checkinflow/QrCodeScannerFragment.java    |   2 +-
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |   7 +-
 .../ch/admin/bag/dp3t/util/StringUtil.java    |  18 ++
 app/src/main/res/drawable/bg_edit_text.xml    |   9 +
 .../main/res/layout/fragment_check_out.xml    | 173 ++++++++++++++++++
 app/src/main/res/values-bs/strings.xml        |  22 +++
 app/src/main/res/values-de/strings.xml        |  24 +++
 app/src/main/res/values-es/strings.xml        |  22 +++
 app/src/main/res/values-fr/strings.xml        |  22 +++
 app/src/main/res/values-hr/strings.xml        |  22 +++
 app/src/main/res/values-it/strings.xml        |  22 +++
 app/src/main/res/values-pt/strings.xml        |  22 +++
 app/src/main/res/values-rm/strings.xml        |  22 +++
 app/src/main/res/values-sq/strings.xml        |  22 +++
 app/src/main/res/values-sr/strings.xml        |  22 +++
 app/src/main/res/values-ti/strings.xml        |  22 +++
 app/src/main/res/values-tr/strings.xml        |  22 +++
 .../main/res/values/crowdnotifier_styles.xml  |  13 ++
 app/src/main/res/values/dimens.xml            |   3 +
 app/src/main/res/values/strings.xml           |  22 +++
 23 files changed, 682 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
 create mode 100644 app/src/main/res/drawable/bg_edit_text.xml
 create mode 100644 app/src/main/res/layout/fragment_check_out.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index bec678937..c5e6031d7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -8,6 +8,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
@@ -57,7 +58,11 @@ class CheckinOverviewFragment : Fragment() {
 	}
 
 	private fun showCheckOutFragment() {
-		//TODO
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
+			.addToBackStack(CheckOutFragment::class.java.canonicalName)
+			.commit()
 	}
 
 	private fun showQrCodeScannerFragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
index e3dadf48f..e7b57f6fe 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
@@ -54,6 +54,9 @@ public void onStart() {
 	}
 
 	private void checkIfAutoCheckoutHappened() {
+		if (viewModel.getCheckInState() == null) {
+			popBackToHomeFragment();
+		}
 	}
 
 	@Override
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
new file mode 100644
index 000000000..1b1640e03
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -0,0 +1,162 @@
+package ch.admin.bag.dp3t.checkin.checkinflow;
+
+import android.app.TimePickerDialog;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProvider;
+
+import java.util.Calendar;
+
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
+import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensions;
+import ch.admin.bag.dp3t.util.StringUtil;
+
+public class CheckOutFragment extends Fragment {
+
+	public final static String TAG = CheckOutFragment.class.getCanonicalName();
+
+	private final static long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000;
+
+	private CrowdNotifierViewModel viewModel;
+	private VenueInfo venueInfo;
+	private CheckInState checkInState;
+
+	private TextView titleTextView;
+	private TextView subtitleTextView;
+	private View doneButton;
+	private View cancelButton;
+	private EditText commentEditText;
+	private TextView fromTime;
+	private TextView toTime;
+	private TextView dateTextView;
+	private ImageView venueTypeIcon;
+
+	public CheckOutFragment() { super(R.layout.fragment_check_out); }
+
+	public static CheckOutFragment newInstance() {
+		return new CheckOutFragment();
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		viewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
+		checkInState = viewModel.getCheckInState();
+		if (checkInState != null) {
+			venueInfo = checkInState.getVenueInfo();
+		}
+		checkIfAutoCheckoutHappened();
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		checkIfAutoCheckoutHappened();
+	}
+
+	private void checkIfAutoCheckoutHappened() {
+		if (viewModel.getCheckInState() == null) {
+			popBackToHomeFragment();
+		}
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		titleTextView = view.findViewById(R.id.check_out_fragment_title);
+		subtitleTextView = view.findViewById(R.id.check_out_fragment_subtitle);
+		doneButton = view.findViewById(R.id.check_out_fragment_done_button);
+		cancelButton = view.findViewById(R.id.check_out_fragment_cancel_button);
+		commentEditText = view.findViewById(R.id.check_out_fragment_comment_edit_text);
+		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
+		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
+		dateTextView = view.findViewById(R.id.check_out_fragment_date);
+		venueTypeIcon = view.findViewById(R.id.check_out_fragment_venue_type_icon);
+
+		titleTextView.setText(venueInfo.getTitle());
+		subtitleTextView.setText(VenueInfoExtensions.getSubtitle(venueInfo));
+		venueTypeIcon.setImageResource(VenueInfoExtensions.getVenueTypeDrawable(venueInfo));
+
+		checkInState.setCheckOutTime(System.currentTimeMillis());
+		refreshTimeTextViews();
+
+		fromTime.setOnClickListener(v -> showTimePicker(true));
+		toTime.setOnClickListener(v -> showTimePicker(false));
+
+		doneButton.setOnClickListener(v -> {
+			CrowdNotifierReminderHelper.removeAllReminders(getContext());
+			saveEntry();
+			NotificationHelper notificationHelper = NotificationHelper.getInstance(getContext());
+			notificationHelper.stopOngoingNotification();
+			notificationHelper.removeReminderNotification();
+			popBackToHomeFragment();
+		});
+		cancelButton.setOnClickListener(v -> requireActivity().getSupportFragmentManager().popBackStack());
+	}
+
+	private void refreshTimeTextViews() {
+		fromTime.setText(StringUtil.getHourMinuteTimeString(checkInState.getCheckInTime(), "  :  "));
+		toTime.setText(StringUtil.getHourMinuteTimeString(checkInState.getCheckOutTime(), "  :  "));
+		dateTextView.setText(StringUtil.getCheckOutDateString(getContext(), checkInState.getCheckInTime(),
+				checkInState.getCheckOutTime()));
+	}
+
+	private void showTimePicker(boolean isFromTime) {
+
+		Calendar time = Calendar.getInstance();
+		if (isFromTime) {
+			time.setTimeInMillis(checkInState.getCheckInTime());
+		} else {
+			time.setTimeInMillis(checkInState.getCheckOutTime());
+		}
+		int hour = time.get(Calendar.HOUR_OF_DAY);
+		int minute = time.get(Calendar.MINUTE);
+		TimePickerDialog timePicker;
+		timePicker = new TimePickerDialog(getContext(), (picker, selectedHour, selectedMinute) -> {
+			time.set(Calendar.HOUR_OF_DAY, selectedHour);
+			time.set(Calendar.MINUTE, selectedMinute);
+			if (isFromTime) {
+				checkInState.setCheckInTime(time.getTimeInMillis());
+			} else {
+				checkInState.setCheckOutTime(time.getTimeInMillis());
+			}
+			if (checkInState.getCheckOutTime() < checkInState.getCheckInTime()) {
+				checkInState.setCheckOutTime(checkInState.getCheckOutTime() + ONE_DAY_IN_MILLIS);
+			} else if (checkInState.getCheckInTime() + ONE_DAY_IN_MILLIS < checkInState.getCheckOutTime()) {
+				checkInState.setCheckOutTime(checkInState.getCheckOutTime() - ONE_DAY_IN_MILLIS);
+			}
+			refreshTimeTextViews();
+		}, hour, minute, true);
+
+		timePicker.show();
+	}
+
+	private void saveEntry() {
+		long checkIn = checkInState.getCheckInTime();
+		long checkOut = checkInState.getCheckOutTime();
+		String comment = commentEditText.getText().toString();
+		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, venueInfo, getContext());
+		DiaryStorage.getInstance(getContext()).addEntry(new DiaryEntry(id, checkIn, checkOut, venueInfo, comment));
+		viewModel.setCheckInState(null);
+	}
+
+	private void popBackToHomeFragment() {
+		requireActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 029b8890f..6b2a768ef 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -84,7 +84,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 	@Override
 	public void onResume() {
 		if (goToHome) {
-			getActivity().getSupportFragmentManager().popBackStack();
+			requireActivity().getSupportFragmentManager().popBackStack();
 			goToHome = false;
 		} else {
 			isQRScanningEnabled = true;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 6711fd032..e74043f37 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -45,6 +45,7 @@
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment;
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment;
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
 import ch.admin.bag.dp3t.home.model.NotificationState;
@@ -395,7 +396,11 @@ private void setupCheckinCard() {
 	}
 
 	private void showCheckOutFragment() {
-		//TODO
+		requireActivity().getSupportFragmentManager().beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
+				.addToBackStack(CheckOutFragment.class.getCanonicalName())
+				.commit();
 	}
 
 	private void showQrCodeScannerFragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index a47b0eac1..85fe8b9ff 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -9,6 +9,7 @@
  */
 package ch.admin.bag.dp3t.util;
 
+import android.content.Context;
 import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -17,10 +18,15 @@
 import androidx.annotation.NonNull;
 
 import java.math.BigInteger;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
+import ch.admin.bag.dp3t.R;
+
 public class StringUtil {
 
 	private static final long ONE_HOUR = TimeUnit.HOURS.toMillis(1);
@@ -102,4 +108,16 @@ public static String getDurationString(long duration) {
 		}
 	}
 
+	public static String getCheckOutDateString(Context context, long checkInTime, long checkOutTime) {
+		DateFormat dateFormat = new SimpleDateFormat("EEEE, dd. MMMM");
+		String checkInDate = dateFormat.format(new Date(checkInTime));
+		String checkOutDate = dateFormat.format(new Date(checkOutTime));
+		if (checkInDate.equals(checkOutDate)) {
+			return checkInDate;
+		} else {
+			return context.getResources().getString(R.string.checkout_from_to_date).replace("{DATE1}", checkInDate)
+					.replace("{DATE2}", "\n" + checkOutDate);
+		}
+	}
+
 }
diff --git a/app/src/main/res/drawable/bg_edit_text.xml b/app/src/main/res/drawable/bg_edit_text.xml
new file mode 100644
index 000000000..899df8f9e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_edit_text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<stroke
+		android:width="@dimen/edit_text_stroke_width"
+		android:color="@color/primary" />
+	<solid android:color="@color/light_grey" />
+	<corners android:radius="@dimen/edit_text_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_check_out.xml b/app/src/main/res/layout/fragment_check_out.xml
new file mode 100644
index 000000000..72460f1bf
--- /dev/null
+++ b/app/src/main/res/layout/fragment_check_out.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:elevation="@dimen/modal_elevation"
+	android:orientation="vertical">
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/light_grey">
+
+		<TextView
+			android:id="@+id/check_out_fragment_cancel_button"
+			style="@style/CrowdNotifier.Text.Status.Primary.Small.Thin"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:background="?selectableItemBackground"
+			android:padding="@dimen/spacing_large"
+			android:text="@string/cancel"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<TextView
+			style="@style/CrowdNotifier.Text.Status.Small"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/checkout_button_title"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<TextView
+			android:id="@+id/check_out_fragment_done_button"
+			style="@style/CrowdNotifier.Text.Status.Primary.Small"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:background="?selectableItemBackground"
+			android:padding="@dimen/spacing_large"
+			android:text="@string/done_button"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingHorizontal="@dimen/spacing_very_large"
+			android:paddingBottom="@dimen/spacing_large">
+
+			<ImageView
+				android:id="@+id/check_out_fragment_venue_type_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:src="@drawable/ic_tea" />
+
+			<TextView
+				android:id="@+id/check_out_fragment_title"
+				style="@style/CrowdNotifier.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:gravity="center"
+				tools:text="Cyber Cafe SV" />
+
+			<TextView
+				android:id="@+id/check_out_fragment_subtitle"
+				style="@style/CrowdNotifier.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:gravity="center"
+				tools:text="Lausanne" />
+
+			<TextView
+				android:id="@+id/check_out_fragment_date"
+				style="@style/CrowdNotifier.Text.Subtitle"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:gravity="center"
+				tools:text="Thursday, October 22" />
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:orientation="horizontal">
+
+				<TextView
+					style="@style/CrowdNotifier.Text.Status.Small"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:text="@string/datepicker_from" />
+
+				<TextView
+					style="@style/CrowdNotifier.Text.Status.Small"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:text="@string/datepicker_to" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_small"
+				android:orientation="horizontal">
+
+				<TextView
+					android:id="@+id/check_out_fragment_from_text_view"
+					style="@style/CrowdNotifier.Text.Status.Primary"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginEnd="@dimen/spacing_tiny_small"
+					android:layout_weight="1"
+					android:background="@color/light_grey"
+					android:foreground="?android:selectableItemBackground"
+					android:gravity="center"
+					android:paddingVertical="@dimen/spacing_medium"
+					tools:text="07  :  56" />
+
+				<TextView
+					android:id="@+id/check_out_fragment_to_text_view"
+					style="@style/CrowdNotifier.Text.Status.Primary"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="@dimen/spacing_tiny_small"
+					android:layout_weight="1"
+					android:background="@color/light_grey"
+					android:foreground="?android:selectableItemBackground"
+					android:gravity="center"
+					android:paddingVertical="@dimen/spacing_medium"
+					tools:text="08  :  13" />
+
+			</LinearLayout>
+
+			<TextView
+				style="@style/CrowdNotifier.Text.Status.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:text="@string/edit_mode_addcomment" />
+
+			<EditText
+				android:id="@+id/check_out_fragment_comment_edit_text"
+				style="@style/CrowdNotifier.EditText"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_small"
+				android:hint="@string/edit_mode_comment_placeholder" />
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index d6493f956..534303b5c 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1587,4 +1587,26 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 46c2af979..1c6e963df 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1649,4 +1649,28 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
     <string name="android_ongoing_checkin_notification_channel_name">"Permanente Checkin Meldung"</string>
     <string name="ongoing_notification_title">"Sie sind eingecheckt seit {TIME} Uhr."</string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title">"Sichern"</string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <!-- Fuzzy -->
+    <string name="scan_qr_code_button_title">"QR-Code scannen"</string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title">"Check-Ins deaktiviert"</string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text">"Neue Check-Ins sind nicht möglich."</string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text">"Schützen Sie sich und andere, indem Sie sich bei Events einchecken. Hier kommt wahrscheinlich noch mehr Text, der im Moment noch unklar ist."</string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text">"Im Tagebuch werden all Ihre Check-Ins gespeichert. Sie können diese freiwillig teilen, falls Sie positiv getestet werden."</string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <!-- Fuzzy -->
+    <string name="checkin_checked_in">"Sie sind eingecheckt"</string>
+    <string name="checkout_from_to_date">"{DATE1} bis {DATE2}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 30a2397cf..b18df561d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1578,4 +1578,26 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0ab861dd7..8a6f2ccda 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1613,4 +1613,26 @@ Contactez l'infoline coronavirus :"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c415a9466..154a54dc4 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1583,4 +1583,26 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7f49a5039..d2040e8ec 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1621,4 +1621,26 @@ Contatta la Infoline coronavirus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1fb7fd495..c073997cd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1588,4 +1588,26 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index ad2190ecf..bdddffe8a 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1583,4 +1583,26 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 7085faf72..6b668efc1 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1588,4 +1588,26 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index dc8616037..0b1406016 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1583,4 +1583,26 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index df2175989..1881bc6e5 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1563,4 +1563,26 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b196d97c7..6976c1b7d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1565,4 +1565,26 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/crowdnotifier_styles.xml b/app/src/main/res/values/crowdnotifier_styles.xml
index 67fd24f11..22e442c39 100644
--- a/app/src/main/res/values/crowdnotifier_styles.xml
+++ b/app/src/main/res/values/crowdnotifier_styles.xml
@@ -55,6 +55,11 @@
 		<item name="android:textSize">@dimen/text_size_small</item>
 	</style>
 
+	<style name="CrowdNotifier.Text.Status.Primary.Small.Thin">
+		<item name="android:fontFamily">@font/inter_regular</item>
+		<item name="android:textStyle">normal</item>
+	</style>
+
 	<style name="CrowdNotifier.Text.Status.Tertiary">
 		<item name="android:textColor">@color/tertiary</item>
 	</style>
@@ -83,4 +88,12 @@
 		<item name="android:paddingStart">@dimen/spacing_huge</item>
 		<item name="android:paddingEnd">@dimen/spacing_huge</item>
 	</style>
+
+	<style name="CrowdNotifier.EditText" parent="Widget.AppCompat.EditText">
+		<item name="android:background">@drawable/bg_edit_text</item>
+		<item name="android:textSize">@dimen/text_size_normal</item>
+		<item name="android:textColor">@color/main</item>
+		<item name="android:padding">@dimen/spacing_medium</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bd9c85962..6e4427309 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -106,5 +106,8 @@
 	<dimen name="qr_scanner_indicator_stroke_width_inverse">-6dp</dimen>
 
 	<dimen name="button_height">72dp</dimen>
+	<dimen name="modal_elevation">11dp</dimen>
+	<dimen name="edit_text_stroke_width">2dp</dimen>
+	<dimen name="edit_text_radius">3dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 569940d85..304d08d62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1610,4 +1610,26 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
+
+    <!-- Check-Ins: Sichern Button bei Check-out -->
+    <string name="checkout_save_button_title"></string>
+
+    <!-- Check-Ins: QR-Code scannen Button -->
+    <string name="scan_qr_code_button_title"></string>
+
+    <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_title"></string>
+
+    <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text"></string>
+
+    <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_text"></string>
+
+    <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
+    <string name="checkin_detail_diary_text"></string>
+
+    <!-- Label im Checkin-Modul im eingecheckten Zustand -->
+    <string name="checkin_checked_in"></string>
+    <string name="checkout_from_to_date"></string>
 </resources>
\ No newline at end of file

From 231364bf3187cc5a95e5e1d155ec9769a5b0a395 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 29 Apr 2021 20:01:46 +0200
Subject: [PATCH 012/207] Implement Notification Intent Handling

---
 .../java/ch/admin/bag/dp3t/MainActivity.java  | 171 ++++++++++++++----
 .../dp3t/checkin/CrowdNotifierViewModel.java  |   1 +
 .../checkin/checkinflow/CheckOutFragment.java |   2 +-
 .../utils/CrowdNotifierReminderHelper.java    |   5 +-
 .../checkin/utils/NotificationHelper.java     |  16 +-
 app/src/main/res/anim/modal_pop_enter.xml     |  11 ++
 app/src/main/res/anim/modal_pop_exit.xml      |  10 +
 app/src/main/res/anim/modal_slide_enter.xml   |   8 +
 app/src/main/res/anim/modal_slide_exit.xml    |  17 ++
 9 files changed, 192 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/res/anim/modal_pop_enter.xml
 create mode 100644 app/src/main/res/anim/modal_pop_exit.xml
 create mode 100644 app/src/main/res/anim/modal_slide_enter.xml
 create mode 100644 app/src/main/res/anim/modal_slide_exit.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 8ef66e42a..9046f14bf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -9,8 +9,11 @@
  */
 package ch.admin.bag.dp3t;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.activity.result.ActivityResultLauncher;
@@ -20,9 +23,22 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+import org.crowdnotifier.android.sdk.utils.QrUtils;
 import org.dpppt.android.sdk.DP3T;
 
+import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment;
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
+import ch.admin.bag.dp3t.checkin.models.ReminderOption;
+import ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker;
+import ch.admin.bag.dp3t.checkin.utils.ErrorDialog;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
 import ch.admin.bag.dp3t.inform.InformActivity;
 import ch.admin.bag.dp3t.networking.ConfigWorker;
@@ -34,6 +50,12 @@
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
 import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment;
 
+import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
+import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
+import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CHECK_OUT_NOW;
+import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION;
+import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION;
+import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_ONGOING_NOTIFICATION;
 import static ch.admin.bag.dp3t.inform.InformActivity.EXTRA_COVIDCODE;
 import static ch.admin.bag.dp3t.updateboarding.UpdateBoardingActivity.UPDATE_BOARDING_VERSION;
 import static ch.admin.bag.dp3t.util.NotificationUtil.ACTION_ACTIVATE_TRACING;
@@ -43,16 +65,16 @@ public class MainActivity extends FragmentActivity {
 	public static final String ACTION_EXPOSED_GOTO_REPORTS = "ACTION_EXPOSED_GOTO_REPORTS";
 	public static final String ACTION_INFORMED_GOTO_REPORTS = "ACTION_INFORMED_GOTO_REPORTS";
 
-	private static final String STATE_CONSUMED_EXPOSED_INTENT = "STATE_CONSUMED_EXPOSED_INTENT";
-	private static final String STATE_CONSUMED_COVIDCODE_INTENT = "STATE_CONSUMED_COVIDCODE_INTENT";
-	private boolean consumedExposedIntent;
-	private boolean consumedCovidcodeIntent;
+	private static final String KEY_IS_INTENT_CONSUMED = "KEY_IS_INTENT_CONSUMED";
+	private boolean isIntentConsumed = false;
 
 	private SecureStorage secureStorage;
 	private TracingViewModel tracingViewModel;
+	private CrowdNotifierViewModel crowdNotifierViewModel;
 
 	private AlertDialog forceUpdateDialog;
 
+
 	private final ActivityResultLauncher<Intent> onAndUpdateBoardingLauncher =
 			registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
 				if (activityResult.getResultCode() == RESULT_OK) {
@@ -64,6 +86,14 @@ public class MainActivity extends FragmentActivity {
 				}
 			});
 
+	private BroadcastReceiver autoCheckoutBroadcastReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			showHomeFragment();
+		}
+	};
+
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -94,6 +124,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		});
 
 		ConfigWorker.scheduleConfigWorkerIfOutdated(this);
+		CrowdNotifierKeyLoadWorker.startKeyLoadWorker(this);
+		CrowdNotifierKeyLoadWorker.cleanUpOldData(this);
 
 		if (savedInstanceState == null) {
 			boolean onboardingCompleted = secureStorage.getOnboardingCompleted();
@@ -106,81 +138,116 @@ protected void onCreate(Bundle savedInstanceState) {
 				showHomeFragment();
 			}
 		} else {
-			consumedExposedIntent = savedInstanceState.getBoolean(STATE_CONSUMED_EXPOSED_INTENT);
-			consumedCovidcodeIntent = savedInstanceState.getBoolean(STATE_CONSUMED_COVIDCODE_INTENT);
+			isIntentConsumed = savedInstanceState.getBoolean(KEY_IS_INTENT_CONSUMED);
 		}
 
 		tracingViewModel = new ViewModelProvider(this).get(TracingViewModel.class);
+		crowdNotifierViewModel = new ViewModelProvider(this).get(CrowdNotifierViewModel.class);
 		tracingViewModel.sync();
 
-		checkRedirectionIntents();
-	}
-
-	public void checkRedirectionIntents() {
-		checkIntentForActions();
-
-		if (!consumedExposedIntent) {
-			boolean isOpenLeitfadenPending = secureStorage.isOpenLeitfadenPending();
-			boolean isExposed = tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed();
-			if (isOpenLeitfadenPending && isExposed) {
-				gotoReportsFragment();
-			}
-		}
 	}
 
 	@Override
 	public void onSaveInstanceState(@NonNull Bundle outState) {
 		super.onSaveInstanceState(outState);
-		outState.putBoolean(STATE_CONSUMED_EXPOSED_INTENT, consumedExposedIntent);
-		outState.putBoolean(STATE_CONSUMED_COVIDCODE_INTENT, consumedCovidcodeIntent);
+		outState.putBoolean(KEY_IS_INTENT_CONSUMED, isIntentConsumed);
 	}
 
 	@Override
 	protected void onNewIntent(Intent intent) {
 		super.onNewIntent(intent);
 		setIntent(intent);
-		consumedCovidcodeIntent = false;
+		isIntentConsumed = false;
 	}
 
 	@Override
 	protected void onStart() {
 		super.onStart();
 		secureStorage.setAppOpenAfterNotificationPending(false);
+		crowdNotifierViewModel.refreshTraceKeys();
+		crowdNotifierViewModel.refreshErrors();
+		autoCheckoutIfNecessary(this, crowdNotifierViewModel.getCheckInState());
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
-		if (secureStorage.getOnboardingCompleted()) checkValidCovidcodeIntent();
+		if (secureStorage.getOnboardingCompleted()) checkIntentForActions();
+		LocalBroadcastManager.getInstance(this)
+				.registerReceiver(autoCheckoutBroadcastReceiver, new IntentFilter(ACTION_DID_AUTO_CHECKOUT));
 	}
 
 	private void checkIntentForActions() {
 		Intent intent = getIntent();
-		String intentAction = intent.getAction();
 		boolean launchedFromHistory = (intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0;
-		if (ACTION_INFORMED_GOTO_REPORTS.equals(intentAction) && !launchedFromHistory) {
+		if (!launchedFromHistory && !isIntentConsumed) {
+			isIntentConsumed = true;
+			handleCustomIntents();
+		}
+	}
+
+	private void handleCustomIntents() {
+		String intentAction = getIntent().getAction();
+		if (ACTION_INFORMED_GOTO_REPORTS.equals(intentAction)) {
 			secureStorage.setLeitfadenOpenPending(false);
 			secureStorage.setReportsHeaderAnimationPending(false);
-			gotoReportsFragment();
-			intent.setAction(null);
-			setIntent(intent);
-		} else if (ACTION_EXPOSED_GOTO_REPORTS.equals(intentAction) && !launchedFromHistory && !consumedExposedIntent) {
-			consumedExposedIntent = true;
-			intent.setAction(null);
-			setIntent(intent);
+			showReportsFragment();
+		} else if (ACTION_EXPOSED_GOTO_REPORTS.equals(intentAction)) {
 			if (tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed()) {
-				gotoReportsFragment();
+				showReportsFragment();
 			}
 		} else if (ACTION_ACTIVATE_TRACING.equals(intentAction)) {
 			tracingViewModel.enableTracing(this, () -> {}, e -> {}, () -> {});
+		} else if ((ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION.equals(intentAction) ||
+				ACTION_ONGOING_NOTIFICATION.equals(intentAction)) && crowdNotifierViewModel.isCheckedIn().getValue()) {
+			showCheckinOverviewFragment();
+		} else if (ACTION_CHECK_OUT_NOW.equals(intentAction) && crowdNotifierViewModel.isCheckedIn().getValue()) {
+			showCheckOutFragment();
+		} else if (ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION.equals(intentAction)) {
+			showReportsFragment();
+		} else if (getIntent().getData() != null) {
+			checkValidCovidcodeIntent();
+			checkValidCheckInIntent();
+		}
+	}
+
+	private void checkValidCheckInIntent() {
+		String qrCodeData = getIntent().getDataString();
+		try {
+			VenueInfo venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX);
+			if (crowdNotifierViewModel.isCheckedIn().getValue()) {
+				new ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show();
+			} else {
+				crowdNotifierViewModel.setCheckInState(new CheckInState(false, venueInfo, System.currentTimeMillis(),
+						System.currentTimeMillis(), ReminderOption.OFF));
+				showCheckInScreen();
+			}
+		} catch (QrUtils.QRException e) {
+			handleInvalidQRCodeExceptions(qrCodeData, e);
+		}
+	}
+
+	private void handleInvalidQRCodeExceptions(String qrCodeData, QrUtils.QRException e) {
+		if (e instanceof QrUtils.InvalidQRCodeVersionException) {
+			new ErrorDialog(this, CrowdNotifierErrorState.UPDATE_REQUIRED).show();
+		} else if (e instanceof QrUtils.NotYetValidException) {
+			new ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_YET_VALID).show();
+		} else if (e instanceof QrUtils.NotValidAnymoreException) {
+			new ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_VALID_ANYMORE).show();
+		} else {
+			if (qrCodeData.startsWith(BuildConfig.TRACE_QR_CODE_PREFIX)) {
+				Intent openBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeData));
+				startActivity(openBrowserIntent);
+			} else {
+				new ErrorDialog(this, CrowdNotifierErrorState.NO_VALID_QR_CODE).show();
+			}
 		}
 	}
 
+
 	private void checkValidCovidcodeIntent() {
-		boolean launchedFromHistory = (getIntent().getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0;
 		TracingStatusInterface tracingStatus = tracingViewModel.getAppStatusLiveData().getValue();
-		if (getIntent().getData() == null || launchedFromHistory || tracingStatus == null || tracingStatus.isReportedAsInfected() ||
-				consumedCovidcodeIntent) {
+		if (tracingStatus == null || tracingStatus.isReportedAsInfected()) {
 			return;
 		}
 		Uri uri = Uri.parse(getIntent().getData().toString());
@@ -189,7 +256,6 @@ private void checkValidCovidcodeIntent() {
 		String covidCode = uri.getFragment();
 		if (covidCode == null || covidCode.length() != 12) return;
 		startInformFlow(covidCode);
-		consumedCovidcodeIntent = true;
 	}
 
 	private void startInformFlow(String covidCode) {
@@ -210,7 +276,7 @@ private void showHomeFragment() {
 				.commit();
 	}
 
-	private void gotoReportsFragment() {
+	private void showReportsFragment() {
 		getSupportFragmentManager()
 				.beginTransaction()
 				.replace(R.id.main_fragment_container, ReportsFragment.newInstance())
@@ -218,10 +284,39 @@ private void gotoReportsFragment() {
 				.commit();
 	}
 
+	private void showCheckinOverviewFragment() {
+		getSupportFragmentManager().beginTransaction()
+				.replace(R.id.container, CheckinOverviewFragment.newInstance())
+				.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
+				.commit();
+	}
+
+	private void showCheckOutFragment() {
+		getSupportFragmentManager().beginTransaction()
+				.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter,
+						R.anim.modal_pop_exit)
+				.replace(R.id.container, CheckOutFragment.newInstance())
+				.addToBackStack(CheckOutFragment.class.getCanonicalName())
+				.commit();
+	}
+
+	private void showCheckInScreen() {
+		getSupportFragmentManager().beginTransaction()
+				.replace(R.id.container, CheckInFragment.newInstance())
+				.addToBackStack(CheckInFragment.class.getCanonicalName())
+				.commit();
+	}
+
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		DP3T.onActivityResult(this, requestCode, resultCode, data);
 	}
 
+	@Override
+	protected void onPause() {
+		LocalBroadcastManager.getInstance(this).unregisterReceiver(autoCheckoutBroadcastReceiver);
+		super.onPause();
+	}
+
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index ccc6431df..4139bd8d5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -58,6 +58,7 @@ public void onReceive(Context context, Intent intent) {
 
 	public CrowdNotifierViewModel(@NonNull Application application) {
 		super(application);
+		refreshExposures();
 		storage = SecureStorage.getInstance(getApplication());
 		checkInState = storage.getCheckInState();
 		updateCheckedIn();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index 1b1640e03..23aa464ab 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -31,7 +31,7 @@ public class CheckOutFragment extends Fragment {
 
 	public final static String TAG = CheckOutFragment.class.getCanonicalName();
 
-	private final static long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000;
+	private final static long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
 
 	private CrowdNotifierViewModel viewModel;
 	private VenueInfo venueInfo;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
index f45ec3915..7eeb5d70e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
@@ -14,7 +14,6 @@
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
-import ch.admin.bag.dp3t.util.ReminderHelper;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
 
 public class CrowdNotifierReminderHelper extends BroadcastReceiver {
@@ -80,7 +79,7 @@ private static void removeReminder(PendingIntent pendingIntent, Context context)
 	}
 
 	private static PendingIntent getPendingIntent(Context context, boolean eightHours) {
-		Intent intent = new Intent(context, ReminderHelper.class);
+		Intent intent = new Intent(context, CrowdNotifierReminderHelper.class);
 		if (eightHours) {
 			intent.setAction(ACTION_EIGHT_HOUR_REMINDER);
 			return PendingIntent.getBroadcast(context, EIGHT_HOUR_REMINDER_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -91,7 +90,7 @@ private static PendingIntent getPendingIntent(Context context, boolean eightHour
 	}
 
 	private static PendingIntent getAutoCheckOutPendingIntent(Context context) {
-		Intent intent = new Intent(context, ReminderHelper.class);
+		Intent intent = new Intent(context, CrowdNotifierReminderHelper.class);
 		intent.setAction(ACTION_AUTO_CHECKOUT);
 		return PendingIntent.getBroadcast(context, AUTO_CHECK_OUT_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 28beb363b..a1fef797b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -22,15 +22,17 @@
 
 public class NotificationHelper {
 
-	public static final String ACTION_EXPOSURE_NOTIFICATION = BuildConfig.APPLICATION_ID + ".EXPOSURE_NOTIFICATION_ACTION";
-	public static final String ACTION_REMINDER_NOTIFICATION = BuildConfig.APPLICATION_ID + ".ACTION_REMINDER_NOTIFICATION";
+	public static final String ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION = BuildConfig.APPLICATION_ID +
+			".ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION";
+	public static final String ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION = BuildConfig.APPLICATION_ID +
+			".ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION";
 	public static final String ACTION_AUTO_CHECKOUT_NOTIFICATION = BuildConfig.APPLICATION_ID +
 			".ACTION_AUTO_CHECKOUT_NOTIFICATION";
 	public static final String ACTION_ONGOING_NOTIFICATION = BuildConfig.APPLICATION_ID + ".ACTION_ONGOING_NOTIFICATION";
 	public static final String ACTION_CHECK_OUT_NOW = BuildConfig.APPLICATION_ID + ".ACTION_CHECK_OUT_NOW";
 	public static final String ACTION_SNOOZE = BuildConfig.APPLICATION_ID + ".ACTION_SNOOZE";
 
-	public static final String EXPOSURE_ID_EXTRA = "EXPOSURE_ID";
+	public static final String CROWDNOTIFIER_EXPOSURE_ID_EXTRA = "CROWDNOTIFIER_EXPOSURE_ID";
 
 	private final String CHANNEL_ID_EXPOSURE_NOTIFICATION = "ExposureNotificaitons";
 	private final String CHANNEL_ID_REMINDER = "Reminders";
@@ -79,12 +81,12 @@ private PendingIntent createBasicPendingIntent(String notificationAction) {
 
 	private PendingIntent createExposurePendingIntent(long exposureId) {
 		Intent intent = new Intent(context, MainActivity.class);
-		intent.setAction(ACTION_EXPOSURE_NOTIFICATION);
-		intent.putExtra(EXPOSURE_ID_EXTRA, exposureId);
+		intent.setAction(ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION);
+		intent.putExtra(CROWDNOTIFIER_EXPOSURE_ID_EXTRA, exposureId);
 		intent.setAction(Long.toString(exposureId));
 		return TaskStackBuilder.create(context)
 				.addNextIntentWithParentStack(intent)
-				.getPendingIntent(ACTION_EXPOSURE_NOTIFICATION.hashCode(), PendingIntent.FLAG_ONE_SHOT);
+				.getPendingIntent(ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION.hashCode(), PendingIntent.FLAG_ONE_SHOT);
 	}
 
 	private NotificationCompat.Builder getNotificationBuilder(String channelId) {
@@ -133,7 +135,7 @@ public void showReminderNotification() {
 				PendingIntent.FLAG_UPDATE_CURRENT);
 
 		Notification notification = getNotificationBuilder(CHANNEL_ID_REMINDER)
-				.setContentIntent(createBasicPendingIntent(ACTION_REMINDER_NOTIFICATION))
+				.setContentIntent(createBasicPendingIntent(ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION))
 				.setContentTitle(context.getString(R.string.checkout_reminder_title))
 				.setContentText(context.getString(R.string.checkout_reminder_text))
 				.addAction(R.drawable.ic_close,
diff --git a/app/src/main/res/anim/modal_pop_enter.xml b/app/src/main/res/anim/modal_pop_enter.xml
new file mode 100644
index 000000000..e6d7ff503
--- /dev/null
+++ b/app/src/main/res/anim/modal_pop_enter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<objectAnimator
+		android:duration="200"
+		android:propertyName="alpha"
+		android:valueFrom="0"
+		android:valueTo="1"
+		android:valueType="floatType" />
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/modal_pop_exit.xml b/app/src/main/res/anim/modal_pop_exit.xml
new file mode 100644
index 000000000..53a435703
--- /dev/null
+++ b/app/src/main/res/anim/modal_pop_exit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<translate
+		android:duration="200"
+		android:fillAfter="true"
+		android:fromYDelta="0%p"
+		android:toYDelta="100%p" />
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/modal_slide_enter.xml b/app/src/main/res/anim/modal_slide_enter.xml
new file mode 100644
index 000000000..900ed44de
--- /dev/null
+++ b/app/src/main/res/anim/modal_slide_enter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+	<translate
+		android:duration="200"
+		android:fillAfter="true"
+		android:fromYDelta="100%p"
+		android:toYDelta="0%p" />
+</set>
diff --git a/app/src/main/res/anim/modal_slide_exit.xml b/app/src/main/res/anim/modal_slide_exit.xml
new file mode 100644
index 000000000..e97f753a3
--- /dev/null
+++ b/app/src/main/res/anim/modal_slide_exit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<objectAnimator
+		android:duration="200"
+		android:propertyName="alpha"
+		android:valueFrom="1"
+		android:valueTo="0"
+		android:valueType="floatType" />
+	<objectAnimator
+		android:duration="1000"
+		android:propertyName="elevation"
+		android:valueFrom="1"
+		android:valueTo="0"
+		android:valueType="floatType" />
+
+</set>

From c54f70daac6615f7c2843c08f57d4abf496b2db4 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 30 Apr 2021 10:14:51 +0200
Subject: [PATCH 013/207] Fix TraceKey load bug and add illu

---
 .../networking/TraceKeysRepository.java       |   7 +-
 .../main/res/drawable/ic_illu_checked_in.xml  | 229 ++++++++++++++++++
 .../res/layout/fragment_checkin_overview.xml  |   8 +
 3 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_illu_checked_in.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index a318dff64..d2e795ca7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -74,8 +74,11 @@ public List<ProblematicEventInfo> loadTraceKeys() {
 
 	private List<ProblematicEventInfo> handleSuccessfulResponse(Response<ResponseBody> response) {
 		try {
-			long keyBundleTag = Long.parseLong(response.headers().get(KEY_BUNDLE_TAG_HEADER));
-			storage.setCrowdNotifierLastKeyBundleTag(keyBundleTag);
+			String keyBundleTag = response.headers().get(KEY_BUNDLE_TAG_HEADER);
+			if (keyBundleTag != null) {
+				long keyBundleTagValue = Long.parseLong(keyBundleTag);
+				storage.setCrowdNotifierLastKeyBundleTag(keyBundleTagValue);
+			}
 			Proto.ProblematicEventWrapper problematicEventWrapper =
 					Proto.ProblematicEventWrapper.parseFrom(response.body().byteStream());
 			ArrayList<ProblematicEventInfo> problematicEventInfos = new ArrayList<>();
diff --git a/app/src/main/res/drawable/ic_illu_checked_in.xml b/app/src/main/res/drawable/ic_illu_checked_in.xml
new file mode 100644
index 000000000..83ad70ca7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illu_checked_in.xml
@@ -0,0 +1,229 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="289dp"
+    android:height="131dp"
+    android:viewportWidth="289"
+    android:viewportHeight="131">
+  <group>
+    <clip-path
+        android:pathData="M0,0H289V131H0z"/>
+    <path
+        android:pathData="M144.924,58.685m-52.5,0a52.5,52.5 0,1 1,105 0a52.5,52.5 0,1 1,-105 0"
+        android:fillColor="#5094BF"
+        android:fillAlpha="0.299"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M143.212,19.629L146.946,19.629L146.946,63.123L143.212,63.123z"
+        android:strokeAlpha="0.28"
+        android:fillColor="#535461"
+        android:fillType="nonZero"
+        android:fillAlpha="0.28"/>
+    <path
+        android:pathData="M144.705,58.694L184.024,58.694L184.024,63.694L144.705,63.694z"
+        android:fillColor="#5C5B78"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M120.884,45.887L145.624,58.842 143.305,63.272 118.565,50.316z"
+        android:fillColor="#5C5B78"
+        android:fillType="nonZero"/>
+    <path
+        android:pathData="M145.427,61.429m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+        android:fillColor="#5C5B78"
+        android:fillType="nonZero"/>
+  </group>
+  <path
+      android:pathData="M57.759,125.994H252.759V126.994H57.759z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#C9C8D2"
+      android:fillType="nonZero"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M207.332,99.75l1.583,1.582 0.458,1.029c0.927,0.741 0.41,0.937 1.425,0.341l7.568,-6.668s3.782,-1.99 2.055,-4.735c-1.726,-2.746 -4.038,2.601 -4.038,2.601l-4.574,3.374 -2.456,-0.169 -2.02,2.644z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M245.887,119.171L250.297,118.883 248.827,125.368 243.829,123.35z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M205.726,107.152L215.902,97.112 221.717,101.689 233.203,115.715 231.894,117.783 217.938,108.185 208.488,120.736 199.475,116.158z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M205.726,107.152L215.902,97.112 221.717,101.689 233.203,115.715 231.894,117.783 217.938,108.185 208.488,120.736 199.475,116.158z"
+      android:fillColor="#A8A8AB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M204.557,114.118l1.313,1.06 10.651,-3.785 2.48,-1.06 4.961,1.06s-0,-4.238 -4.669,-4.087l-4.815,1.211 -5.69,0.454 -4.231,5.147z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M195.316,124.274L198.531,126.294 202.33,126.294 220.009,119.802 245.871,124.419 246.601,118.936 222.931,108.692 202.184,115.473z"
+      android:fillColor="#A8A8AB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M207.332,99.749l-0.081,0.277c1.186,0.54 1.933,1.038 2.242,1.495 0.309,0.456 0.35,1.124 0.123,2.002l4.146,-3.331c3.526,-2.511 4.932,-3.815 4.214,-3.909 -1.074,-0.143 -0.76,-1.016 -2.209,-1.249 -0.966,-0.156 -1.201,-0.219 -0.706,-0.191 -0.945,0.083 -1.661,0.404 -2.149,0.959 -0.486,0.556 -0.895,1.015 -1.223,1.376l-4.357,2.571z"
+      android:fillColor="#7C7C7C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M217.715,94.286L220.777,85.395A0.381,0.381 64,0 0,220.54 84.911L217.757,83.952A0.381,0.381 64,0 0,217.273 84.188L214.211,93.079A0.381,0.381 64,0 0,214.447 93.563L217.231,94.522A0.381,0.381 64,0 0,217.715 94.286z"
+      android:fillColor="#272655"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M217.715,94.286L220.777,85.395A0.381,0.381 64,0 0,220.54 84.911L217.757,83.952A0.381,0.381 64,0 0,217.273 84.188L214.211,93.079A0.381,0.381 64,0 0,214.447 93.563L217.231,94.522A0.381,0.381 64,0 0,217.715 94.286z"
+      android:strokeAlpha="0.05"
+      android:fillColor="#1A1938"
+      android:fillType="nonZero"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M217.621,94.559L220.871,85.122A0.092,0.092 64,0 0,220.814 85.005L217.484,83.858A0.092,0.092 64,0 0,217.367 83.915L214.117,93.352A0.092,0.092 64,0 0,214.174 93.469L217.504,94.616A0.092,0.092 64,0 0,217.621 94.559z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M218.418,86.465m-0.326,0.946a1,1 63.233,1 0,0.651 -1.891a1,1 63.233,1 0,-0.651 1.891"
+      android:fillColor="#272655"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M207.329,82.984a5.79,5.775 90.001,1 1,-11.55 0a5.79,5.775 90.001,1 1,11.55 0z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M204.557,87.488l-2.59,6.381 -6.188,-2.671s2.014,-5.046 2.014,-5.194c-0,-0.148 6.764,1.484 6.764,1.484z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M188.618,115.926l0.43,1.317 2.06,9.39 2.207,0.588 1.62,-2.055 3.237,-2.347 2.355,-3.815 2.02,-3.354 0.63,-1.048 4.545,-8.847 5.757,-6.096c1.016,-1.159 1.692,-1.79 2.026,-1.891 0.335,-0.102 1.062,0.125 2.183,0.682l-1.707,-1.603 -5.004,0.265l-0.736,0l-2.057,-0.298 -1.657,-1.158 -4.269,-3.398 -2.614,-0.546 -3.759,-2.012 -1.54,0.251 -5.298,4.402C187.693,98.003 187,101.863 187,105.756c-0,3.454 0.546,6.886 1.618,10.17zM249.041,121.796s-1.345,-2.212 -0.777,-2.47 2.98,-1.288 2.98,-1.288l3.538,-1.137s5.104,-7.363 5.216,-0.96c0.112,6.402 -3.717,7.941 -3.717,7.941s-3.414,7.132 -5.348,5.995c-1.934,-1.137 -3.87,-4.998 -3.87,-4.998s3.488,-1.82 1.978,-3.083z"
+      android:fillColor="#7C7C7C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M189.31,104.276L194.846,108.007 203.109,115.64 203.733,114.575 205.481,105.619 205.044,105.619 200.528,97.112z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M189.31,104.276L194.846,108.007 203.109,115.64 203.733,114.575 205.481,105.619 205.044,105.619 200.528,97.112z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M204.661,105.363L206.272,105.363 207.297,108.258 209.639,108.837 203.511,115.64 194.412,107.679 188.848,104.06 200.122,97.112z"
+      android:fillColor="#7C7C7C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M206.69,78.822l0.632,0.234c0.196,-0.128 0.33,-0.327 0.373,-0.551 0.043,-0.225 -0.01,-0.457 -0.148,-0.643l1.168,-0.053c-1.516,-1.946 -3.826,-3.172 -6.343,-3.367 -2.517,-0.196 -5,0.658 -6.821,2.345 -0.053,-0.177 -0.633,0.166 -0.87,0.515 -0.08,-0.288 -0.623,1.1 -0.815,2.081 -0.089,-0.326 -0.43,0.2 -0.131,0.707 -0.19,-0.027 -0.276,0.441 -0.129,0.702 -0.208,-0.094 -0.173,0.465 0.053,0.838 -0.297,-0.025 2.338,3.915 3.405,6.217 0.31,-1.37 0.658,-2.815 1.657,-3.836 0.17,-0.174 0.355,-0.332 0.541,-0.49l1.004,-0.854c1.167,-0.993 2.23,-2.218 3.784,-2.589 1.07,-0.255 1.745,-0.313 1.162,-1.473 0.527,0.212 1.018,0.526 1.549,0.723 -0.007,-0.162 -0.081,-0.344 -0.071,-0.506z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M192.171,69.026c1.327,-0.306 2.652,0.527 2.96,1.861 0.097,0.418 0.082,0.836 -0.026,1.222 0.531,0.065 1.827,0.217 3.921,0.415 2.658,0.252 3.526,1.805 3.621,1.993l0.009,0.018c-3.429,0.971 -8.469,7.972 -8.469,7.972 -1.808,-2.183 -1.817,-5.948 -1.817,-5.948l0.205,-2.644c-1.061,-0.068 -1.997,-0.826 -2.249,-1.919 -0.308,-1.335 0.517,-2.664 1.844,-2.97z"
+      android:fillColor="#9FCBC5"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M200.399,83.91a1.158,1.155 90,1 1,-2.31 0a1.158,1.155 90,1 1,2.31 0z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M203.633,115.64L219.672,109.996c-0.216,-0.361 -0.35,-0.719 -0.403,-1.071 -0.053,-0.353 -0.053,-0.893 -0,-1.622l-10.26,1.39c-1.553,1.864 -2.729,3.243 -3.528,4.137 -0.8,0.894 -1.415,1.83 -1.848,2.811z"
+      android:fillColor="#7C7C7C"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M200.31,88.716c0.072,0.064 0.144,0.127 0.217,0.185 1.589,0.442 3.308,0.166 4.681,-0.75 1.373,-0.917 2.254,-2.377 2.398,-3.975l-2.706,-0.092 -5.069,1.2c0.084,0.074 0.162,0.146 0.235,0.215l0.14,0.136c0.728,0.733 0.834,1.23 0.533,2.085l-0.059,0.16 -0.033,0.083 -0.072,0.172 -0.123,0.278 -0.141,0.303z"
+      android:fillColor="#9FCBC5"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M80.277,116.111s-0.523,3.278 -1.393,3.795c-0.87,0.517 4.527,1.725 4.527,1.725l0.87,-5.175 -4.004,-0.345z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M86.938,77.048l1.992,2.334 -0.906,8.082 -0.724,15.984s1.448,13.829 0,14.188c-1.449,0.36 -7.968,0.18 -7.787,-0.718 0.181,-0.898 0.362,-1.617 0.724,-2.874 0.363,-1.257 -0.362,-5.747 -0.362,-5.747l0.906,-5.029 -3.26,-21.73 9.417,-4.49z"
+      android:fillColor="#808096"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M80.442,119.243s-1.954,-0.36 -2.132,0c-0.177,0.36 -3.552,4.13 -4.085,4.13 -0.533,0 -4.44,3.591 -0.355,3.77 4.085,0.18 10.834,-3.052 10.834,-3.052s-0.993,-4.57 -0.94,-4.35c0.052,0.22 -3.322,0.4 -3.322,-0.498z"
+      android:fillColor="#5C5C5F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M78.366,110.955s5.104,5.641 5.286,6.187c0.182,0.546 2.916,0 2.916,0l1.094,-3.64 -0.911,-1.273 -5.104,-4.185 -3.28,2.911z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M85.163,115.638l-2.571,2.43s3.28,5.048 3.28,5.582c0,0.534 0.178,4.985 1.952,4.273 1.773,-0.712 1.95,-7.834 1.95,-7.834s-0.177,-7.3 -1.24,-7.833c-1.065,-0.534 -3.397,-0.366 -3.397,-0.366s1.445,3.57 0.026,3.748z"
+      android:fillColor="#5C5C5F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M70.574,60.812s-0.9,2.895 -1.08,3.619c-0.18,0.723 -1.26,2.713 -1.26,5.79 0,3.075 0.36,6.693 0,7.055 -0.36,0.362 -6.118,20.625 -3.598,22.796 2.519,2.171 10.797,9.408 11.337,10.313 0.54,0.904 0.72,3.075 1.8,2.714 1.08,-0.362 5.218,-3.98 5.398,-4.704 0.18,-0.724 -2.34,-1.99 -2.34,-1.99s-5.038,-7.418 -6.298,-7.237c-1.26,0.18 -1.08,-0.905 -0.9,-1.448 0.18,-0.543 0.54,-0.904 0,-0.904s-0.18,-1.448 0,-2.171c0.18,-0.724 4.32,-10.494 4.32,-10.494l10.977,-4.885s-0.54,-13.207 -4.5,-16.826l-0.9,-2.17s-10.077,-0.724 -12.956,0.542z"
+      android:fillColor="#808096"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M75.083,32.464s0.89,6.28 -1.248,6.638c-2.138,0.36 -3.92,0.18 -3.92,0.36 0,0.179 5.346,5.74 5.346,5.74l4.989,-0.358 4.454,-4.845s-4.098,-0.717 -4.098,-3.229 -0.178,-4.306 -0.178,-4.306h-5.345z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M75.083,32.464s0.89,6.28 -1.248,6.638c-2.138,0.36 -3.92,0.18 -3.92,0.36 0,0.179 5.346,5.74 5.346,5.74l4.989,-0.358 4.454,-4.845s-4.098,-0.717 -4.098,-3.229 -0.178,-4.306 -0.178,-4.306h-5.345z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M72.028,29.28a5.704,5.732 0,1 0,11.408 0a5.704,5.732 0,1 0,-11.408 0z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M82.149,34.453c-0.067,0.082 -0.134,0.165 -0.205,0.243 -1.777,0.888 -3.919,1.119 -5.832,0.627 -1.914,-0.49 -3.395,-1.653 -4.034,-3.161l3.218,-0.874 6.429,-0.305c-1.288,1.575 -1.053,2.036 0.426,3.469z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M73.292,37.984s-7.014,0.908 -7.553,3.267c-0.54,2.36 3.596,17.062 4.136,18.333 0.54,1.27 0.36,2.178 0.36,2.178 1.646,-1.243 3.744,-1.706 5.755,-1.27 3.417,0.725 8.272,0.362 8.272,0.362s1.619,-6.716 1.979,-7.442c0.36,-0.726 1.798,-4.719 1.798,-5.808 0,-1.089 2.158,-5.627 2.158,-5.627s-1.079,-3.267 -5.035,-3.085c0,0 -1.726,-0.78 -2.212,-0.209 -0.486,0.572 -3.184,3.113 -6.6,2.024 -3.418,-1.09 -3.058,-2.723 -3.058,-2.723z"
+      android:fillColor="#73A9CC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M67.66,41.806L65.839,41.806L64.845,56.058s3.643,1.082 4.14,0.36c0.496,-0.721 -1.325,-14.612 -1.325,-14.612zM86.394,41.806l3.47,0.88s2.555,8.985 2.738,9.161c0.182,0.176 0.365,1.233 0.365,1.233s0,0.176 0.365,0.705c0.365,0.528 0.548,0.69 0.182,1.396 -0.365,0.704 -0.547,-0.163 -0.182,0.542 0.365,0.704 0.182,2.642 0.182,2.642s-0.912,-3.347 -4.199,-2.466l-2.19,-9.513 -0.73,-4.58z"
+      android:fillColor="#73A9CC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M71.67,24.58C70.549,26.571 70.296,28.93 70.14,31.218c-0.067,0.98 -0.117,1.987 0.172,2.926 0.303,0.99 0.98,1.997 0.633,2.972 -0.336,0.944 -1.457,1.322 -2.083,2.1 -0.53,0.66 -0.664,1.563 -0.618,2.412 0.046,0.848 0.25,1.681 0.31,2.529 0.123,1.861 -0.446,3.703 -1.596,5.163 2.683,-0.104 5.552,-1.306 6.683,-3.765 0.339,-0.735 0.503,-1.54 0.809,-2.289 0.345,-0.848 0.866,-1.616 1.193,-2.471 0.494,-1.29 0.52,-2.708 0.54,-4.091 0.013,-0.828 0.022,-1.678 -0.262,-2.456 -0.625,-1.71 -2.568,-2.815 -2.76,-4.628 -0.034,-0.191 -0.006,-0.389 0.08,-0.563 0.09,-0.128 0.2,-0.24 0.325,-0.333 1.214,-1.081 1.014,-3.37 2.458,-4.107 0.648,-0.33 1.429,-0.215 2.125,-0.005 0.773,0.232 1.544,0.592 2.046,1.229 1.013,1.282 0.613,3.133 0.3,4.742 -0.454,2.333 -0.615,4.715 -0.48,7.09 0.01,0.38 0.065,0.756 0.166,1.122 0.186,0.594 0.582,1.093 0.882,1.637 0.61,1.12 0.808,2.42 0.559,3.673 -0.221,1.09 -0.77,2.25 -0.287,3.25 0.213,0.387 0.509,0.72 0.867,0.974 1.579,1.25 3.583,2.024 4.757,3.666 0.202,-1.342 -0.184,-2.692 -0.469,-4.018 -0.284,-1.326 -0.458,-2.77 0.127,-3.991 0.257,-0.536 0.65,-1.003 0.86,-1.559 0.484,-1.285 -0.094,-2.694 -0.444,-4.022 -0.251,-1.044 -0.432,-2.103 -0.542,-3.17l-0.362,-2.882c-0.3,-2.383 -0.612,-4.814 -1.648,-6.976 -1.953,-4.074 -6.372,-5.587 -10.328,-3.33 -1.037,0.605 -1.894,1.479 -2.482,2.531z"
+      android:fillColor="#776161"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M69.272,49.715L69.272,41.844A0.349,0.349 0,0 1,69.621 41.495L72.912,41.495A0.349,0.349 0,0 1,73.261 41.844L73.261,49.715A0.349,0.349 0,0 1,72.912 50.064L69.621,50.064A0.349,0.349 0,0 1,69.272 49.715z"
+      android:fillColor="#CDD0DB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M69.272,49.715L69.272,41.844A0.349,0.349 0,0 1,69.621 41.495L72.912,41.495A0.349,0.349 0,0 1,73.261 41.844L73.261,49.715A0.349,0.349 0,0 1,72.912 50.064L69.621,50.064A0.349,0.349 0,0 1,69.272 49.715z"
+      android:strokeAlpha="0.05"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M69.272,49.731L69.272,41.332A0.085,0.085 0,0 1,69.357 41.247L73.176,41.247A0.085,0.085 0,0 1,73.261 41.332L73.261,49.731A0.085,0.085 0,0 1,73.176 49.816L69.357,49.816A0.085,0.085 0,0 1,69.272 49.731z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M71.195,43.196m0,1a1,1 0,1 1,0 -2a1,1 0,1 1,0 2"
+      android:fillColor="#9DA7C0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M66.151,55.063s-1.156,3.302 0.193,3.302 3.853,-2.018 4.046,-3.668c0.192,-1.651 3.66,-7.888 1.156,-7.337 -2.505,0.55 -3.66,5.136 -3.66,5.136L66.15,55.063z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M64.967,54.572l-0.523,1.536s-0.348,4.991 1.741,4.8c2.09,-0.193 4.268,-5.727 4.268,-5.727s-1.451,-2.957 -2.213,-3.927c-0.392,-0.498 -1.232,2.626 -1.705,2.757 -1.393,0.384 -1.568,0.561 -1.568,0.561z"
+      android:fillColor="#73A9CC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M84.688,41.381L78.789,60.797 86.833,62.611 92.732,43.74z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M92.422,55.016l1.116,1.904s0.492,3.568 -2.009,3.568c-2.5,0 -6.072,-3.466 -6.072,-3.466s-1.786,-0.73 -2.858,-0.547c-1.072,0.183 -6.966,0 -4.465,-3.1 2.5,-3.102 6.787,0 6.787,0l4.465,2.188 2.322,-1.277 0.714,0.73z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M91.026,53.197l-1.674,2.815s3.85,0.528 4.185,1.408c0.335,0.88 -1.507,-4.575 -1.507,-4.575l-1.004,0.352z"
+      android:fillColor="#73A9CC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M84.92,53.374l-0.527,2.868 0.264,0.425 1.737,1.698 2.958,2.123c0.775,0.504 1.608,0.756 2.5,0.756 1.34,0 1.34,0.67 1.725,-1.18 0.258,-1.235 0.399,-2.084 0.423,-2.548 -0.024,-1.557 -0.165,-2.335 -0.423,-2.335h-4.225l-4.431,-1.807z"
+      android:fillColor="#73A9CC"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 6708095bf..516ec643f 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -52,6 +52,13 @@
 					android:foreground="?selectableItemBackground"
 					android:orientation="vertical">
 
+					<ImageView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal"
+						android:layout_marginVertical="@dimen/spacing_large"
+						android:src="@drawable/ic_illu_checked_in" />
+
 					<LinearLayout
 						android:id="@+id/checkin_view"
 						android:layout_width="match_parent"
@@ -65,6 +72,7 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:layout_marginTop="@dimen/spacing_small"
+							android:gravity="center_horizontal"
 							android:text="[TBT] Hier wird eine Beschreibung sein." />
 
 						<Button

From 43c7b7ccc1e622735159479fe6329c8fa26175de Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 3 May 2021 11:44:25 +0200
Subject: [PATCH 014/207] UI-Improvements for Check-In and Check-Out Flow

---
 app/build.gradle                              |   2 +-
 .../java/ch/admin/bag/dp3t/MainActivity.java  |   7 +-
 .../checkin/checkinflow/CheckInFragment.java  |   2 -
 .../checkin/checkinflow/CheckOutFragment.java |   3 -
 .../checkin/utils/VenueInfoExtensions.java    |  36 ---
 app/src/main/proto/Proto.proto                |   5 +-
 .../main/res/drawable/ic_illu_check_in.xml    |  96 ++++++++
 .../main/res/drawable/ic_illus_caffeteria.xml |  10 -
 .../main/res/drawable/ic_illus_canteen.xml    |  14 --
 .../res/drawable/ic_illus_checked_in_time.xml | 222 ------------------
 app/src/main/res/drawable/ic_illus_gym.xml    |  14 --
 .../res/drawable/ic_illus_kitchen_area.xml    |  10 -
 .../res/drawable/ic_illus_lecture_room.xml    |  10 -
 .../main/res/drawable/ic_illus_library.xml    |  10 -
 .../main/res/drawable/ic_illus_meeting.xml    |  10 -
 .../res/drawable/ic_illus_office_space.xml    |  10 -
 app/src/main/res/drawable/ic_illus_other.xml  |  10 -
 .../res/drawable/ic_illus_private_event.xml   |  10 -
 app/src/main/res/drawable/ic_illus_shop.xml   |  10 -
 .../reminder_toggle_background_color.xml      |   5 +
 .../drawable/reminder_toggle_text_color.xml   |   5 +
 app/src/main/res/layout/card_checkin.xml      |   6 +-
 app/src/main/res/layout/fragment_check_in.xml |  15 +-
 .../main/res/layout/fragment_check_out.xml    |  11 +-
 .../res/layout/fragment_checkin_overview.xml  |   5 +-
 app/src/main/res/values-bs/strings.xml        |  16 ++
 app/src/main/res/values-de/strings.xml        |  19 +-
 app/src/main/res/values-es/strings.xml        |  16 ++
 app/src/main/res/values-fr/strings.xml        |  16 ++
 app/src/main/res/values-hr/strings.xml        |  16 ++
 app/src/main/res/values-it/strings.xml        |  16 ++
 app/src/main/res/values-pt/strings.xml        |  16 ++
 app/src/main/res/values-rm/strings.xml        |  16 ++
 app/src/main/res/values-sq/strings.xml        |  16 ++
 app/src/main/res/values-sr/strings.xml        |  16 ++
 app/src/main/res/values-ti/strings.xml        |  16 ++
 app/src/main/res/values-tr/strings.xml        |  16 ++
 .../main/res/values/crowdnotifier_styles.xml  |   3 +
 app/src/main/res/values/strings.xml           |  16 ++
 app/src/main/res/values/styles.xml            |  14 ++
 40 files changed, 357 insertions(+), 409 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_illu_check_in.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_caffeteria.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_canteen.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_checked_in_time.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_gym.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_kitchen_area.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_lecture_room.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_library.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_meeting.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_office_space.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_other.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_private_event.xml
 delete mode 100644 app/src/main/res/drawable/ic_illus_shop.xml
 create mode 100644 app/src/main/res/drawable/reminder_toggle_background_color.xml
 create mode 100644 app/src/main/res/drawable/reminder_toggle_text_color.xml

diff --git a/app/build.gradle b/app/build.gradle
index 6a283e962..6e56b4dd2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,7 +207,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:3.0-dev-56'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:3.0'
 
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 9046f14bf..a7f54f5c0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -144,7 +144,6 @@ protected void onCreate(Bundle savedInstanceState) {
 		tracingViewModel = new ViewModelProvider(this).get(TracingViewModel.class);
 		crowdNotifierViewModel = new ViewModelProvider(this).get(CrowdNotifierViewModel.class);
 		tracingViewModel.sync();
-
 	}
 
 	@Override
@@ -286,7 +285,7 @@ private void showReportsFragment() {
 
 	private void showCheckinOverviewFragment() {
 		getSupportFragmentManager().beginTransaction()
-				.replace(R.id.container, CheckinOverviewFragment.newInstance())
+				.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
 				.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
 				.commit();
 	}
@@ -295,14 +294,14 @@ private void showCheckOutFragment() {
 		getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter,
 						R.anim.modal_pop_exit)
-				.replace(R.id.container, CheckOutFragment.newInstance())
+				.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
 				.addToBackStack(CheckOutFragment.class.getCanonicalName())
 				.commit();
 	}
 
 	private void showCheckInScreen() {
 		getSupportFragmentManager().beginTransaction()
-				.replace(R.id.container, CheckInFragment.newInstance())
+				.replace(R.id.main_fragment_container, CheckInFragment.newInstance())
 				.addToBackStack(CheckInFragment.class.getCanonicalName())
 				.commit();
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
index e7b57f6fe..7dbc616d7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
@@ -63,14 +63,12 @@ private void checkIfAutoCheckoutHappened() {
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 		TextView titleTextView = view.findViewById(R.id.check_in_fragment_title);
 		TextView subtitleTextView = view.findViewById(R.id.check_in_fragment_subtitle);
-		ImageView venueTypeIcon = view.findViewById(R.id.check_in_fragment_venue_type_icon);
 		View checkInButton = view.findViewById(R.id.check_in_fragment_check_in_button);
 		Toolbar toolbar = view.findViewById(R.id.check_in_fragment_toolbar);
 		MaterialButtonToggleGroup toggleGroup = view.findViewById(R.id.check_in_fragment_toggle_group);
 
 		titleTextView.setText(venueInfo.getTitle());
 		subtitleTextView.setText(VenueInfoExtensions.getSubtitle(venueInfo));
-		venueTypeIcon.setImageResource(VenueInfoExtensions.getVenueTypeDrawable(venueInfo));
 
 		checkInButton.setOnClickListener(v -> {
 			long checkInTime = System.currentTimeMillis();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index 23aa464ab..b16d3ff5c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -45,7 +45,6 @@ public class CheckOutFragment extends Fragment {
 	private TextView fromTime;
 	private TextView toTime;
 	private TextView dateTextView;
-	private ImageView venueTypeIcon;
 
 	public CheckOutFragment() { super(R.layout.fragment_check_out); }
 
@@ -86,11 +85,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
 		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
-		venueTypeIcon = view.findViewById(R.id.check_out_fragment_venue_type_icon);
 
 		titleTextView.setText(venueInfo.getTitle());
 		subtitleTextView.setText(VenueInfoExtensions.getSubtitle(venueInfo));
-		venueTypeIcon.setImageResource(VenueInfoExtensions.getVenueTypeDrawable(venueInfo));
 
 		checkInState.setCheckOutTime(System.currentTimeMillis());
 		refreshTimeTextViews();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
index dba7b0003..e25e736d2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
@@ -1,13 +1,10 @@
 package ch.admin.bag.dp3t.checkin.utils;
 
-import androidx.annotation.DrawableRes;
-
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
-import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.models.Proto;
 
 public class VenueInfoExtensions {
@@ -31,37 +28,4 @@ public static String getSubtitle(VenueInfo venueInfo) {
 		}
 	}
 
-	@DrawableRes
-	public static int getVenueTypeDrawable(VenueInfo venueInfo) {
-		return getDrawableForVenueType(getNotifyMeLocationData(venueInfo).getType());
-	}
-
-	@DrawableRes
-	public static int getDrawableForVenueType(Proto.VenueType venueType) {
-		switch (venueType) {
-			case CAFETERIA:
-				return R.drawable.ic_illus_caffeteria;
-			case MEETING_ROOM:
-				return R.drawable.ic_illus_meeting;
-			case PRIVATE_EVENT:
-				return R.drawable.ic_illus_private_event;
-			case CANTEEN:
-				return R.drawable.ic_illus_canteen;
-			case LIBRARY:
-				return R.drawable.ic_illus_library;
-			case LECTURE_ROOM:
-				return R.drawable.ic_illus_lecture_room;
-			case SHOP:
-				return R.drawable.ic_illus_shop;
-			case GYM:
-				return R.drawable.ic_illus_gym;
-			case KITCHEN_AREA:
-				return R.drawable.ic_illus_kitchen_area;
-			case OFFICE_SPACE:
-				return R.drawable.ic_illus_office_space;
-			default:
-				return R.drawable.ic_illus_other;
-		}
-	}
-
 }
diff --git a/app/src/main/proto/Proto.proto b/app/src/main/proto/Proto.proto
index cd5a72cda..4cc1ccc85 100644
--- a/app/src/main/proto/Proto.proto
+++ b/app/src/main/proto/Proto.proto
@@ -33,6 +33,9 @@ message SwissCovidLocationData {
   uint32 version = 1;
   VenueType type = 2;
   string room = 3;
+  int64 checkoutWarningDelayMs = 4;
+  int64 automaticCheckoutDelaylMs = 5;
+  repeated int64 reminderDelayOptionsMs = 6;
 }
 
 enum VenueType {
@@ -47,4 +50,4 @@ enum VenueType {
   GYM = 8;
   KITCHEN_AREA = 9;
   OFFICE_SPACE = 10;
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/drawable/ic_illu_check_in.xml b/app/src/main/res/drawable/ic_illu_check_in.xml
new file mode 100644
index 000000000..3d7124a7e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illu_check_in.xml
@@ -0,0 +1,96 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="335dp"
+    android:height="152dp"
+    android:viewportWidth="335"
+    android:viewportHeight="152">
+  <path
+      android:pathData="M168.079,1.862L115.076,34.548s0,67.415 53.003,104.187c53.004,-36.772 53.004,-104.187 53.004,-104.187L168.079,1.862z"
+      android:fillColor="#CAEBE7"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M168.986,1.862l-0.907,0.559v135.676c0.301,0.214 0.602,0.427 0.907,0.638 53.027,-36.772 53.027,-104.187 53.027,-104.187L168.986,1.862z"
+      android:strokeAlpha="0.04"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"
+      android:fillAlpha="0.04"/>
+  <path
+      android:pathData="M165.592,79.044L177.053,64.232 181.098,67.557 165.592,87.51 154.711,74.94 158.596,71.599z"
+      android:strokeAlpha="0.12"
+      android:fillColor="#48465C"
+      android:fillType="nonZero"
+      android:fillAlpha="0.12"/>
+  <path
+      android:pathData="M165.592,74.403L177.053,59.591 181.098,62.916 165.592,82.869 154.711,70.299 158.596,66.958z"
+      android:fillColor="#5C5B78"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M199.495,47.177L203.865,47.007 204.083,52.621 199.712,52.791z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M184.662,66.706s-6.456,-3.133 -6.353,-0.428c0.104,2.706 6.508,4.486 6.508,4.486l-0.155,-4.058z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M204.57,143.048s-0.201,3.258 -0.807,4.582c-0.606,1.323 -0.53,3.27 1.113,3.208 1.643,-0.063 5.888,-0.876 5.888,-0.876s0.252,-1.96 -0.089,-2.272c-0.341,-0.312 -1.795,-3.832 -1.177,-4.83 0.62,-1 -4.928,0.188 -4.928,0.188z"
+      android:fillColor="#9A9A9A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M187.546,88.072s-2.861,6.985 -3.919,12.026c-1.057,5.04 -2.667,11.978 -0.596,16.898 2.071,4.92 7.96,19.38 8.02,20.94 0.061,1.56 -0.504,3.145 0.748,3.096 1.251,-0.048 8.061,-2.187 8.338,-3.135 0.276,-0.948 -2.324,-3.348 -2.324,-3.348l-6.42,-20.064 6.698,-13.071 4.832,19.5 0.946,24.339s4.644,-1.43 5.319,-0.206c0,0 2.08,-2.893 2.345,-4.153 0.264,-1.26 -0.983,-25.275 -0.983,-25.275s4.263,-27.352 0.822,-27.22c-3.442,0.134 -16.921,-8.095 -23.826,-0.328z"
+      android:fillColor="#A8A8AB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M191.644,139.039s-3.245,7.048 -3.552,7.375c-0.308,0.326 -2.422,3.554 -0.823,3.494 1.599,-0.061 5.375,-1.78 8.154,-4.403 2.78,-2.624 6.443,-7.17 6.111,-7.473 -0.332,-0.302 -2.608,-1.16 -2.608,-1.16l-7.282,2.167z"
+      android:fillColor="#9A9A9A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M206.95,41.9s3.28,5.216 4.559,6.424c1.279,1.207 -2.319,3.865 -2.319,3.865l-6.438,0.884s0.081,-5.979 -0.25,-6.594c-0.332,-0.616 4.448,-4.58 4.448,-4.58z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M201.012,48.905s1.336,2.432 2.577,2.384c1.24,-0.048 7.656,-2.78 7.93,-3.723 0.274,-0.942 2.125,6.749 2.125,6.749L197.945,81.937 194.116,79.292l1.855,-16.218 1.524,-8.753 3.517,-5.415z"
+      android:fillColor="#F3F0F5"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M211.798,73.759c-0.631,1.316 -1.025,2.688 -0.97,4.093 0.002,0.062 0.005,0.124 0.01,0.187 0.15,2.882 1.214,6.216 1.596,8.64 0.278,1.74 0.199,3.01 -0.822,3.308 -2.474,0.72 0.361,1.234 -9.21,4.411 -9.573,3.178 -11.243,0.435 -11.267,-0.188 -0.025,-0.623 1.355,-5.355 1.03,-5.654 -0.324,-0.3 -4.538,3.918 -5.812,3.344 -1.273,-0.575 -0.145,-3.738 -0.145,-3.738s2.869,-6.661 2.808,-8.219c-0.06,-1.557 4.345,-8.902 4.345,-8.902l2.997,-19.456s1.152,-2.54 2.702,-2.912c1.549,-0.372 2.834,0.514 2.834,0.514l-2.592,5.715 -2.736,10.088 0.458,3.726s3.18,-6.674 5.27,-9.25c2.09,-2.577 6.543,-8.676 6.543,-8.676s1.04,-3.5 0.255,-4.545c-0.785,-1.049 3.275,-1.206 5.006,3.094 0.917,2.28 2.407,5.678 3.34,8.842 0.831,2.804 1.224,5.424 0.4,6.922 -1.259,2.289 -4.426,5.297 -6.04,8.656z"
+      android:fillColor="#808096"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M217.856,64.686c-1.207,2.345 -4.246,5.428 -5.796,8.871 -0.404,-1.553 -0.898,-3.16 -0.898,-3.16s-1.893,-10.792 3.707,-13.581c0.928,-0.096 1.856,0.18 2.603,0.775 0.798,2.873 1.175,5.56 0.385,7.095z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M194.562,64.246l-4.952,1.424 -6.875,0.263 -0.707,5.89 11.298,0.803s2.823,-7.823 1.236,-8.38z"
+      android:fillColor="#808096"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M203.056,83.8s-6.48,1.035 -5,2.914c1.478,1.878 7.219,-0.097 7.219,-0.097l-2.219,-2.817z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M211.142,77.282c0.147,2.976 1.196,6.419 1.572,8.922 -2.076,2.056 -4.05,3.868 -4.795,3.899 -1.537,0.062 -4.009,-0.16 -4.92,0.2 -0.91,0.358 -1.444,-5.74 -1.444,-5.74s0.544,-1.954 2.968,-3.019c1.636,-0.72 4.772,-2.673 6.619,-4.262z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M215.152,54.956s5.275,-0.834 4.99,7.98c-0.285,8.813 0.556,14.44 -1.566,16.094 -2.12,1.655 -9.011,9.155 -10.57,9.216 -1.558,0.06 -4.064,-0.156 -4.987,0.194s-1.464,-5.601 -1.464,-5.601 0.551,-1.908 3.008,-2.947c2.457,-1.04 8.246,-4.724 8.198,-5.98 -0.049,-1.255 -1.464,-5.601 -1.464,-5.601s-1.97,-10.612 3.855,-13.355z"
+      android:fillColor="#808096"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M195.046,42.365a6.974,6.983 0,1 0,13.948 0a6.974,6.983 0,1 0,-13.948 0z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M197.7,32.148c-0.162,0.146 -0.357,0.248 -0.566,0.297 -0.219,0.04 -0.428,-0.11 -0.468,-0.34 -0.154,0.335 -0.328,0.69 -0.643,0.862 -0.314,0.172 -0.8,0.028 -0.846,-0.34 -0.046,0.28 -0.164,0.54 -0.342,0.754 -0.195,0.195 -0.549,0.244 -0.719,0.025 0.138,0.787 0.053,1.596 0.096,2.395 0.043,0.799 0.247,1.646 0.824,2.17 0.842,0.767 2.108,0.578 3.215,0.432 0.168,-0.036 0.342,-0.026 0.504,0.03 0.415,0.184 0.396,0.787 0.402,1.258 0.07,1.707 1.308,3.112 2.93,3.323 0.44,0.07 0.888,-0.044 1.247,-0.318 0.314,-0.279 0.475,-0.733 0.835,-0.942 0.586,-0.34 1.297,0.156 1.725,0.695 0.429,0.539 0.851,1.202 1.515,1.3 0.878,0.131 1.546,-0.804 1.874,-1.665 0.915,-2.439 0.848,-5.16 -0.184,-7.546 -1.833,-4.177 -8.095,-4.838 -11.399,-2.39z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M119.625,150.832H252.929V151.992H119.625z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#C9C8D2"
+      android:fillType="nonZero"
+      android:fillAlpha="0.7"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illus_caffeteria.xml b/app/src/main/res/drawable/ic_illus_caffeteria.xml
deleted file mode 100644
index df643ae3e..000000000
--- a/app/src/main/res/drawable/ic_illus_caffeteria.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M10.406,12.656c0,-2.942 2.08,-4.743 3.75,-6.19 1.598,-1.384 2.578,-2.301 2.578,-3.654C16.734,1.26 17.994,0 19.547,0c1.553,0 2.812,1.259 2.812,2.813 0,3.99 -2.613,6.253 -4.521,7.906 -0.676,0.585 -1.807,1.565 -1.807,1.937 0,1.554 -1.259,2.813 -2.812,2.813 -1.554,0 -2.813,-1.26 -2.813,-2.813zM28.406,15.469c1.554,0 2.813,-1.26 2.813,-2.813 0,-0.372 1.13,-1.352 1.806,-1.937 1.909,-1.653 4.522,-3.916 4.522,-7.906 0,-1.554 -1.26,-2.813 -2.813,-2.813 -1.553,0 -2.812,1.259 -2.812,2.813 0,1.352 -0.98,2.27 -2.579,3.654 -1.67,1.446 -3.75,3.247 -3.75,6.19 0,1.553 1.26,2.812 2.813,2.812zM43.453,15.469c1.554,0 2.813,-1.26 2.813,-2.813 0,-0.391 1.064,-1.334 1.768,-1.958 1.865,-1.652 4.42,-3.914 4.42,-7.886C52.453,1.26 51.193,0 49.64,0c-1.554,0 -2.813,1.259 -2.813,2.813 0,1.37 -0.958,2.289 -2.523,3.674 -1.632,1.446 -3.664,3.246 -3.664,6.17 0,1.553 1.259,2.812 2.812,2.812zM72,38.589c0,1.553 -1.259,2.812 -2.813,2.812 -1.553,0 -2.812,-1.259 -2.812,-2.812 0,-2.513 -2.045,-4.558 -4.558,-4.558 -1.614,0 -3.269,0.344 -4.363,4.151 -0.078,0.31 -0.157,0.619 -0.24,0.929l-0.024,0.098c-0.023,0.103 -0.053,0.202 -0.087,0.298 -0.373,1.354 -0.798,2.71 -1.278,4.07 -0.806,2.281 -1.763,4.57 -2.862,6.851 2.188,-0.702 4.722,-1.742 7.052,-3.17 1.325,-0.811 3.056,-0.395 3.868,0.93 0.811,1.324 0.395,3.055 -0.93,3.866 -4.604,2.822 -10.214,4.537 -13.6,5.014 -0.186,0.304 -0.373,0.608 -0.563,0.911 -2.12,3.39 -4.234,6.228 -5.988,8.396h7.12c1.553,0 2.812,1.259 2.812,2.813 0,1.553 -1.259,2.812 -2.812,2.812L9.282,72c-1.554,0 -2.813,-1.259 -2.813,-2.813 0,-1.553 1.259,-2.812 2.812,-2.812h6.776c-1.714,-2.047 -3.74,-4.696 -5.77,-7.872 -2.976,-4.654 -5.349,-9.49 -7.054,-14.373C1.088,37.984 0,31.748 0,25.594c0,-1.554 1.259,-2.813 2.813,-2.813L56.25,22.781c1.553,0 2.813,1.26 2.813,2.813 0,1.054 -0.037,2.114 -0.108,3.18 0.887,-0.244 1.841,-0.368 2.862,-0.368C67.432,28.406 72,32.974 72,38.59zM5.709,28.406c0.203,3.396 0.765,6.64 1.57,9.705 4.96,-2.191 9.388,-2.533 11.659,-2.533 6.21,0 9.59,1.54 12.574,2.9 2.712,1.236 5.055,2.303 9.671,2.303 2.693,0 7.286,-1.093 10.52,-2.89 0.828,-3.01 1.42,-6.191 1.64,-9.485L5.709,28.406zM44.099,54.872c1.707,-2.74 3.545,-6.088 5.136,-9.878 -2.953,0.927 -5.919,1.412 -8.052,1.412 -5.837,0 -9.113,-1.492 -12.004,-2.81 -2.818,-1.284 -5.252,-2.393 -10.241,-2.393 -1.9,0 -5.695,0.303 -9.936,2.305 4.512,12.008 12.219,20.417 14.643,22.867h11.72c1.54,-1.653 5.159,-5.765 8.734,-11.503z"
-      android:fillColor="#000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_canteen.xml b/app/src/main/res/drawable/ic_illus_canteen.xml
deleted file mode 100644
index 6b51511e3..000000000
--- a/app/src/main/res/drawable/ic_illus_canteen.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M0.085,24.813l8.106,44.83c0.077,0.268 0.336,1.04 1.107,1.645 0.742,0.581 1.52,0.662 1.801,0.678h58.279c1.416,-0.004 2.56,-1.155 2.556,-2.572 -0.004,-1.41 -1.146,-2.551 -2.556,-2.556h-1.95l3.988,-7.441c0.076,-0.151 0.625,-1.287 0.075,-2.502 -0.439,-0.967 -1.405,-1.615 -2.504,-1.684h-3.996c-0.845,-2.942 -3.098,-5.31 -5.972,-6.312 0.714,-1.342 2.12,-2.24 3.77,-2.24 0.612,0 1.218,0.133 1.776,0.387 1.271,0.623 2.807,0.097 3.429,-1.175 0.622,-1.272 0.096,-2.807 -1.175,-3.43 -0.042,-0.019 -0.083,-0.039 -0.125,-0.056 -1.227,-0.56 -2.56,-0.85 -3.907,-0.85 -4.378,0 -8.09,3.051 -9.114,7.128 -3.245,0.82 -5.836,3.343 -6.754,6.548h-4.012c-0.146,0.01 -1.493,0.126 -2.263,1.328 -0.858,1.34 -0.193,2.773 -0.154,2.854l3.99,7.445h-9.486l7.63,-42.2c0.272,-1.389 -0.634,-2.735 -2.023,-3.007 -0.193,-0.037 -37.882,-0.047 -38.017,-0.047 -0.24,0 -1.04,0.03 -1.714,0.626 -0.704,0.623 -0.998,1.621 -0.785,2.603zM56.377,53.524c1.243,0.118 2.317,0.75 3.012,1.687h-6.868c0.696,-0.938 1.773,-1.571 3.019,-1.687 0.14,-0.013 0.295,-0.02 0.461,-0.019 0.134,0.001 0.26,0.008 0.376,0.02zM46.813,60.338h18.281l-3.483,6.5L50.296,66.838l-3.483,-6.5zM12.893,66.838l-7.25,-40.09h31.39l-7.25,40.09h-16.89z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M19.349,48.983l5.723,-9.912c0.725,-1.216 0.328,-2.79 -0.888,-3.515 -0.392,-0.234 -0.838,-0.359 -1.293,-0.362 -0.937,-0.01 -1.803,0.495 -2.26,1.312l-5.723,9.914c-0.708,1.226 -0.288,2.794 0.939,3.502 1.226,0.708 2.794,0.288 3.502,-0.939zM26.882,43.65c-0.391,-0.233 -0.837,-0.358 -1.292,-0.362 -0.937,-0.008 -1.805,0.496 -2.261,1.314l-5.723,9.912c-0.708,1.227 -0.289,2.794 0.938,3.503 1.227,0.709 2.794,0.289 3.503,-0.938l5.723,-9.913c0.725,-1.217 0.328,-2.79 -0.888,-3.515zM13.473,9.787l0.933,1.898 -0.933,1.899c-0.65,1.258 -0.156,2.804 1.104,3.454 1.258,0.649 2.804,0.155 3.453,-1.104 0.016,-0.03 1.534,-3.12 1.534,-3.12 0.35,-0.713 0.35,-1.548 0,-2.26l-1.49,-3.03 -0.932,-1.897 0.932,-1.899c0.643,-1.26 0.142,-2.805 -1.12,-3.448 -0.329,-0.168 -0.69,-0.263 -1.059,-0.277 -1.028,-0.043 -1.981,0.533 -2.422,1.463l-1.49,3.03c-0.35,0.713 -0.35,1.548 0,2.26l1.49,3.03zM22.78,9.787l0.932,1.898 -0.932,1.899c-0.65,1.258 -0.156,2.804 1.103,3.454 1.258,0.649 2.804,0.155 3.454,-1.104l1.533,-3.12c0.35,-0.713 0.35,-1.548 0,-2.26l-1.489,-3.03 -0.933,-1.897 0.933,-1.899c0.643,-1.26 0.142,-2.805 -1.12,-3.448 -0.33,-0.168 -0.69,-0.263 -1.06,-0.277 -1.027,-0.043 -1.98,0.533 -2.421,1.463l-1.49,3.03c-0.35,0.713 -0.35,1.548 0,2.26l1.49,3.03z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_checked_in_time.xml b/app/src/main/res/drawable/ic_illus_checked_in_time.xml
deleted file mode 100644
index d269922f6..000000000
--- a/app/src/main/res/drawable/ic_illus_checked_in_time.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="325dp"
-    android:height="180dp"
-    android:viewportWidth="325"
-    android:viewportHeight="180">
-  <path
-      android:pathData="M14,159a148.5,8 0,1 0,297 0a148.5,8 0,1 0,-297 0z"
-      android:strokeAlpha="0.243"
-      android:fillColor="#CECECE"
-      android:fillType="nonZero"
-      android:fillAlpha="0.243"/>
-  <path
-      android:pathData="M162.293,90.293m-70.293,0a70.293,70.293 0,1 1,140.586 0a70.293,70.293 0,1 1,-140.586 0"
-      android:fillColor="#B3B2D1"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M86.41,148.187s-0.619,3.866 -1.651,4.476c-1.032,0.61 5.366,2.035 5.366,2.035l1.032,-6.104 -4.747,-0.407z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M94.305,102.11l2.361,2.754 -1.073,9.533 -0.858,18.854s1.717,16.311 0,16.735c-1.718,0.424 -9.445,0.212 -9.23,-0.847 0.215,-1.06 0.43,-1.907 0.859,-3.39s-0.43,-6.779 -0.43,-6.779l1.073,-5.931 -3.863,-25.633 11.161,-5.296zM86.606,151.881s-2.316,-0.423 -2.527,0c-0.21,0.424 -4.21,4.872 -4.842,4.872 -0.631,0 -5.263,4.236 -0.42,4.447 4.841,0.212 12.841,-3.6 12.841,-3.6s-1.177,-5.39 -1.115,-5.13c0.062,0.259 -3.937,0.47 -3.937,-0.589z"
-      android:fillColor="#2F2E41"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M84.146,142.106s6.049,6.654 6.265,7.298c0.216,0.643 3.457,0 3.457,0l1.296,-4.293 -1.08,-1.503 -6.05,-4.937 -3.888,3.435z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M92.202,147.63l-3.048,2.866s3.89,5.954 3.89,6.584c0,0.63 0.21,5.88 2.312,5.04 2.102,-0.84 2.312,-9.24 2.312,-9.24s-0.21,-8.61 -1.472,-9.24c-1.26,-0.63 -4.025,-0.431 -4.025,-0.431s1.713,4.21 0.031,4.42zM74.91,82.96s-1.067,3.414 -1.28,4.268c-0.214,0.854 -1.493,3.201 -1.493,6.829 0,3.628 0.426,7.896 0,8.323 -0.427,0.427 -7.253,24.328 -4.266,26.889 2.986,2.56 12.798,11.097 13.438,12.164 0.64,1.067 0.853,3.628 2.133,3.2 1.28,-0.426 6.185,-4.694 6.399,-5.548 0.213,-0.853 -2.773,-2.347 -2.773,-2.347s-5.973,-8.75 -7.466,-8.536c-1.493,0.213 -1.28,-1.067 -1.066,-1.708 0.213,-0.64 0.64,-1.067 0,-1.067s-0.214,-1.707 0,-2.56c0.213,-0.854 5.119,-12.378 5.119,-12.378l13.011,-5.762s-0.64,-15.578 -5.332,-19.846l-1.067,-2.561s-11.945,-0.854 -15.357,0.64z"
-      android:fillColor="#2F2E41"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M80.253,49.523s1.056,7.406 -1.478,7.83c-2.534,0.423 -4.646,0.211 -4.646,0.423 0,0.211 6.336,6.772 6.336,6.772l5.913,-0.424 5.28,-5.713s-4.857,-0.847 -4.857,-3.81c0,-2.962 -0.212,-5.078 -0.212,-5.078h-6.336z"
-      android:fillColor="#E9C3C3"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M80.253,49.523s1.056,7.406 -1.478,7.83c-2.534,0.423 -4.646,0.211 -4.646,0.423 0,0.211 6.336,6.772 6.336,6.772l5.913,-0.424 5.28,-5.713s-4.857,-0.847 -4.857,-3.81c0,-2.962 -0.212,-5.078 -0.212,-5.078h-6.336z"
-      android:strokeAlpha="0.1"
-      android:fillColor="#000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M83.394,45.766m-6.761,0a6.761,6.761 0,1 1,13.522 0a6.761,6.761 0,1 1,-13.522 0"
-      android:fillColor="#E9C3C3"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M88.629,51.868c-0.079,0.097 -0.159,0.195 -0.243,0.286 -2.106,1.048 -4.645,1.321 -6.913,0.741 -2.268,-0.58 -4.024,-1.949 -4.781,-3.728l3.814,-1.03 7.619,-0.359c-1.526,1.857 -1.247,2.402 0.504,4.091z"
-      android:fillColor="#FFF"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M78.131,56.033s-8.314,1.07 -8.953,3.854C68.538,62.67 73.44,80.012 74.08,81.511c0.64,1.499 0.426,2.57 0.426,2.57 1.952,-1.467 4.439,-2.013 6.822,-1.5 4.05,0.857 9.805,0.429 9.805,0.429s1.919,-7.922 2.345,-8.778c0.427,-0.857 2.132,-5.567 2.132,-6.851 0,-1.285 2.558,-6.637 2.558,-6.637s-1.28,-3.854 -5.969,-3.64c0,0 -2.045,-0.92 -2.621,-0.246 -0.576,0.674 -3.774,3.671 -7.824,2.387 -4.05,-1.285 -3.624,-3.212 -3.624,-3.212z"
-      android:fillColor="#E1C825"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M71.455,60.54L69.296,60.54L68.12,77.353s4.318,1.277 4.906,0.426c0.59,-0.852 -1.57,-17.237 -1.57,-17.237zM93.661,60.54l4.112,1.04s3.03,10.597 3.246,10.805c0.216,0.208 0.433,1.455 0.433,1.455s0,0.208 0.433,0.83c0.432,0.624 0.649,0.816 0.216,1.647 -0.433,0.831 -0.65,-0.192 -0.216,0.64 0.432,0.83 0.216,3.117 0.216,3.117s-1.082,-3.949 -4.977,-2.91l-2.597,-11.22 -0.866,-5.403z"
-      android:fillColor="#E1C825"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M76.21,40.222c-1.332,2.35 -1.632,5.133 -1.815,7.831 -0.079,1.157 -0.138,2.345 0.203,3.452 0.36,1.168 1.162,2.355 0.75,3.506 -0.397,1.113 -1.726,1.559 -2.468,2.477 -0.629,0.778 -0.787,1.844 -0.732,2.844 0.054,1.001 0.296,1.984 0.367,2.983 0.146,2.196 -0.529,4.368 -1.892,6.09 3.18,-0.122 6.581,-1.54 7.922,-4.44 0.401,-0.867 0.596,-1.816 0.958,-2.7 0.41,-1 1.027,-1.906 1.415,-2.915 0.585,-1.522 0.616,-3.194 0.64,-4.826 0.015,-0.976 0.026,-1.98 -0.31,-2.896 -0.741,-2.017 -3.044,-3.32 -3.273,-5.459 -0.04,-0.226 -0.006,-0.459 0.095,-0.665 0.108,-0.15 0.238,-0.282 0.386,-0.392 1.438,-1.275 1.201,-3.975 2.913,-4.845 0.768,-0.39 1.694,-0.252 2.519,-0.005 0.916,0.274 1.83,0.698 2.426,1.45 1.2,1.511 0.726,3.695 0.355,5.593 -0.538,2.752 -0.73,5.562 -0.568,8.362 0.01,0.448 0.076,0.893 0.195,1.324 0.221,0.7 0.691,1.29 1.046,1.931 0.723,1.32 0.958,2.855 0.662,4.333 -0.262,1.285 -0.912,2.654 -0.34,3.834 0.253,0.455 0.604,0.848 1.028,1.148 1.871,1.474 4.247,2.387 5.638,4.324 0.24,-1.582 -0.217,-3.175 -0.555,-4.74 -0.337,-1.563 -0.543,-3.266 0.15,-4.707 0.305,-0.633 0.77,-1.183 1.019,-1.839 0.574,-1.515 -0.11,-3.178 -0.526,-4.745 -0.297,-1.23 -0.512,-2.48 -0.642,-3.739l-0.43,-3.4c-0.354,-2.81 -0.725,-5.677 -1.953,-8.227C89.08,36.36 83.841,34.574 79.152,37.237c-1.23,0.713 -2.245,1.743 -2.943,2.985z"
-      android:fillColor="#776161"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M73.377,69.895L73.377,60.562A0.412,0.412 0,0 1,73.789 60.15L77.67,60.15A0.412,0.412 0,0 1,78.082 60.562L78.082,69.895A0.412,0.412 0,0 1,77.67 70.307L73.789,70.307A0.412,0.412 0,0 1,73.377 69.895z"
-      android:fillColor="#CDD0DB"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M73.377,69.895L73.377,60.562A0.412,0.412 0,0 1,73.789 60.15L77.67,60.15A0.412,0.412 0,0 1,78.082 60.562L78.082,69.895A0.412,0.412 0,0 1,77.67 70.307L73.789,70.307A0.412,0.412 0,0 1,73.377 69.895z"
-      android:strokeAlpha="0.05"
-      android:fillColor="#000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.05"/>
-  <path
-      android:pathData="M73.377,69.912L73.377,59.955A0.1,0.1 0,0 1,73.477 59.855L77.982,59.855A0.1,0.1 0,0 1,78.082 59.955L78.082,69.912A0.1,0.1 0,0 1,77.982 70.012L73.477,70.012A0.1,0.1 0,0 1,73.377 69.912z"
-      android:fillColor="#413F8D"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M75.646,62.166m0,1a1,1 0,1 1,0 -2a1,1 0,1 1,0 2"
-      android:fillColor="#9DA7C0"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M69.667,76.18s-1.37,3.894 0.228,3.894c1.599,0 4.568,-2.38 4.796,-4.328 0.228,-1.947 4.339,-9.303 1.37,-8.654 -2.969,0.65 -4.339,6.058 -4.339,6.058l-2.055,3.03z"
-      android:fillColor="#E9C3C3"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M68.263,75.6l-0.62,1.811s-0.412,5.888 2.064,5.661c2.477,-0.226 5.06,-6.755 5.06,-6.755s-1.721,-3.487 -2.625,-4.63c-0.464,-0.589 -1.46,3.097 -2.02,3.25 -1.65,0.453 -1.86,0.662 -1.86,0.662z"
-      android:fillColor="#E1C825"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M91.639,60.04L84.646,82.942 94.182,85.082 101.174,62.823z"
-      android:fillColor="#444053"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M100.807,76.123l1.322,2.246s0.583,4.209 -2.381,4.209c-2.964,0 -7.198,-4.088 -7.198,-4.088s-2.117,-0.86 -3.387,-0.646c-1.27,0.215 -8.257,0 -5.293,-3.657 2.964,-3.658 8.045,0 8.045,0l5.293,2.582 2.752,-1.507 0.847,0.861z"
-      android:fillColor="#E9C3C3"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M99.151,73.978l-1.984,3.32s4.564,0.623 4.96,1.66c0.397,1.038 -1.785,-5.395 -1.785,-5.395l-1.19,0.415z"
-      android:fillColor="#E1C825"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M91.915,74.187l-0.626,3.382 0.313,0.501 2.06,2.004 3.505,2.504c0.918,0.594 1.906,0.89 2.964,0.89 1.587,0 1.587,0.792 2.045,-1.391 0.305,-1.456 0.472,-2.458 0.5,-3.005 -0.028,-1.837 -0.195,-2.755 -0.5,-2.755h-5.009l-5.252,-2.13z"
-      android:fillColor="#E1C825"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M160,38L165,38L165,96.235L160,96.235z"
-      android:strokeAlpha="0.493"
-      android:fillColor="#535461"
-      android:fillType="nonZero"
-      android:fillAlpha="0.493"/>
-  <path
-      android:pathData="M162,89L214.644,89L214.644,97L162,97z"
-      android:fillColor="#413F8D"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M130.711,72L163.835,89.346L160.124,96.433L127,79.087z"
-      android:fillColor="#413F8D"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M162,93m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
-      android:fillColor="#413F8D"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M244.711,127.83l1.833,1.827 0.53,1.191c1.074,0.856 0.473,1.082 1.65,0.394l8.766,-7.703s4.382,-2.299 2.381,-5.471c-2,-3.172 -4.677,3.005 -4.677,3.005l-5.298,3.899 -2.844,-0.195 -2.34,3.055z"
-      android:fillColor="#B2858C"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M289.364,150.266L294.472,149.933 292.769,157.424 286.98,155.094z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M242.849,136.381L254.636,124.782 261.371,130.07 274.672,146.274 273.157,148.662 256.993,137.575 246.048,152.073 235.609,146.786z"
-      android:fillColor="#2F2E41"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M242.849,136.381L254.636,124.782 261.371,130.07 274.672,146.274 273.157,148.662 256.993,137.575 246.048,152.073 235.609,146.786z"
-      android:strokeAlpha="0.1"
-      android:fillColor="#000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M241.495,144.428l1.521,1.224 12.336,-4.371 2.873,-1.224 5.745,1.224s-0,-4.896 -5.407,-4.721l-5.577,1.398 -6.59,0.525 -4.9,5.945z"
-      android:fillColor="#B2858C"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M230.793,156.161L234.516,158.495 238.916,158.495 259.392,150.994 289.345,156.328 290.191,149.994 262.776,138.16 238.746,145.994z"
-      android:fillColor="#2F2E41"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M244.71,127.829l-0.095,0.32c1.375,0.625 2.241,1.2 2.597,1.728 0.358,0.527 0.405,1.298 0.143,2.312l4.8,-3.847c4.085,-2.9 5.713,-4.406 4.883,-4.517 -1.245,-0.166 -0.881,-1.173 -2.559,-1.443 -1.119,-0.179 -1.391,-0.253 -0.818,-0.222 -1.095,0.097 -1.925,0.466 -2.488,1.108 -0.565,0.642 -1.037,1.172 -1.418,1.59l-5.045,2.97z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M256.729,121.532L260.276,111.232A0.44,0.44 64,0 0,260.003 110.673L256.787,109.566A0.44,0.44 64,0 0,256.228 109.839L252.682,120.138A0.44,0.44 64,0 0,252.954 120.698L256.17,121.805A0.44,0.44 64,0 0,256.729 121.532z"
-      android:fillColor="#272655"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M256.729,121.532L260.276,111.232A0.44,0.44 64,0 0,260.003 110.673L256.787,109.566A0.44,0.44 64,0 0,256.228 109.839L252.682,120.138A0.44,0.44 64,0 0,252.954 120.698L256.17,121.805A0.44,0.44 64,0 0,256.729 121.532z"
-      android:strokeAlpha="0.05"
-      android:fillColor="#1A1938"
-      android:fillType="nonZero"
-      android:fillAlpha="0.05"/>
-  <path
-      android:pathData="M256.621,121.847L260.384,110.918A0.107,0.107 64,0 0,260.318 110.782L256.473,109.458A0.107,0.107 64,0 0,256.336 109.524L252.573,120.453A0.107,0.107 64,0 0,252.64 120.589L256.485,121.913A0.107,0.107 64,0 0,256.621 121.847z"
-      android:fillColor="#413F8D"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M257.549,112.475m-0.326,0.946a1,1 71.98,1 0,0.651 -1.891a1,1 71.98,1 0,-0.651 1.891"
-      android:fillColor="#272655"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M238.017,108.461m6.689,0a6.689,6.689 0,1 0,-13.378 0a6.689,6.689 0,1 0,13.378 0"
-      android:fillColor="#B2858C"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M241.495,113.665l-3,7.372 -7.167,-3.086s2.334,-5.829 2.334,-6c-0,-0.172 7.833,1.714 7.833,1.714z"
-      android:fillColor="#B2858C"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M223.034,146.516l0.498,1.523 2.387,10.848 2.556,0.678 1.876,-2.373 3.75,-2.712 2.727,-4.407 2.339,-3.875 0.73,-1.21 5.264,-10.22 6.668,-7.042c1.177,-1.34 1.96,-2.068 2.347,-2.186 0.387,-0.118 1.23,0.145 2.528,0.789l-1.978,-1.852 -5.795,0.305l-0.852,0l-2.383,-0.343 -1.919,-1.338 -4.944,-3.926 -3.028,-0.63 -4.353,-2.324 -1.783,0.29 -6.137,5.085c-1.569,4.216 -2.372,8.676 -2.371,13.172 -0,3.99 0.632,7.954 1.873,11.748z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M293.017,153.299s-1.558,-2.556 -0.9,-2.854c0.658,-0.298 3.451,-1.488 3.451,-1.488l4.097,-1.314S305.577,139.138 305.706,146.534c0.13,7.396 -4.304,9.174 -4.304,9.174s-3.954,8.24 -6.194,6.926c-2.24,-1.314 -4.482,-5.774 -4.482,-5.774s4.04,-2.102 2.29,-3.561z"
-      android:fillColor="#2F2E41"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M223.837,133.059L230.248,137.369 239.819,146.187 240.541,144.956 242.566,134.61 242.059,134.61 236.829,124.782z"
-      android:strokeAlpha="0.1"
-      android:fillColor="#000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M223.837,133.059L230.248,137.369 239.819,146.187 240.541,144.956 242.566,134.61 242.059,134.61 236.829,124.782z"
-      android:strokeAlpha="0.1"
-      android:fillColor="#000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M241.616,134.314L243.481,134.314 244.668,137.659 247.382,138.328 240.284,146.187 229.745,136.99 223.301,132.809 236.359,124.782z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M243.966,103.654l0.732,0.27c0.227,-0.147 0.383,-0.377 0.432,-0.637 0.05,-0.26 -0.013,-0.527 -0.171,-0.743l1.352,-0.06c-1.756,-2.248 -4.43,-3.665 -7.346,-3.89 -2.916,-0.226 -5.792,0.76 -7.9,2.709 -0.062,-0.204 -0.733,0.192 -1.008,0.594 -0.092,-0.331 -0.721,1.272 -0.944,2.405 -0.103,-0.377 -0.499,0.232 -0.152,0.817 -0.22,-0.031 -0.32,0.51 -0.149,0.81 -0.24,-0.108 -0.2,0.538 0.061,0.97 -0.343,-0.03 2.708,4.521 3.944,7.181 0.359,-1.584 0.762,-3.252 1.919,-4.432 0.196,-0.2 0.412,-0.383 0.627,-0.566l1.162,-0.986c1.352,-1.147 2.582,-2.562 4.384,-2.991 1.237,-0.295 2.02,-0.361 1.345,-1.702 0.61,0.245 1.18,0.608 1.794,0.835 -0.008,-0.187 -0.094,-0.397 -0.082,-0.584z"
-      android:fillColor="#2F2E41"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M227.155,92.339c1.537,-0.355 3.071,0.607 3.427,2.147 0.112,0.483 0.094,0.967 -0.031,1.413 0.613,0.074 2.114,0.249 4.539,0.476 3.276,0.307 4.204,2.321 4.204,2.321 -3.972,1.124 -9.813,9.217 -9.813,9.217 -2.093,-2.522 -2.1,-6.871 -2.1,-6.871l0.241,-3.055c-1.229,-0.078 -2.313,-0.952 -2.605,-2.216 -0.356,-1.54 0.601,-3.077 2.139,-3.432z"
-      android:fillColor="#F34E70"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M235.342,109.532m1.338,0a1.338,1.338 0,1 0,-2.676 0a1.338,1.338 0,1 0,2.676 0"
-      android:fillColor="#B2858C"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M240.425,146.187l18.576,-6.521c-0.25,-0.418 -0.405,-0.83 -0.466,-1.238 -0.061,-0.408 -0.061,-1.032 -0,-1.873l-11.883,1.605c-1.799,2.154 -3.16,3.747 -4.086,4.78 -0.926,1.032 -1.64,2.114 -2.14,3.247z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M236.577,115.083c0.083,0.074 0.166,0.148 0.25,0.215 1.841,0.51 3.832,0.191 5.422,-0.867 1.59,-1.06 2.61,-2.746 2.778,-4.592l-3.134,-0.107 -5.871,1.387c0.097,0.085 0.188,0.168 0.272,0.248l0.162,0.157c0.843,0.847 0.966,1.422 0.618,2.41l-0.069,0.184 -0.038,0.095 -0.083,0.2 -0.143,0.32 -0.164,0.35z"
-      android:fillColor="#00A690"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_gym.xml b/app/src/main/res/drawable/ic_illus_gym.xml
deleted file mode 100644
index 71082ede2..000000000
--- a/app/src/main/res/drawable/ic_illus_gym.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M62.108,21.9l0.016,0.015c-0.006,-0.008 -0.053,-0.058 -0.016,-0.015zM16.147,33.448l-0.011,-0.012c-1.522,-1.522 -3.546,-2.36 -5.699,-2.36s-4.176,0.838 -5.698,2.36c-3.042,3.041 -3.14,7.928 -0.294,11.088 -0.792,0.4 -1.522,0.933 -2.16,1.59 -3.077,3.165 -3.041,8.28 0.075,11.396l4.05,4.074 -2.785,2.782c-1.099,1.098 -1.1,2.879 -0.002,3.978 0.549,0.55 1.27,0.825 1.99,0.825 0.719,0 1.438,-0.274 1.987,-0.823l2.776,-2.773L14.4,69.62c1.294,1.294 3.007,2.12 4.823,2.327 0.313,0.035 0.625,0.053 0.936,0.053 2.184,0 4.26,-0.871 5.807,-2.462 0.552,-0.568 1.002,-1.199 1.354,-1.87 1.55,1.469 3.543,2.205 5.538,2.205 2.064,0 4.128,-0.785 5.699,-2.357 3.14,-3.14 3.142,-8.247 0.006,-11.39L16.147,33.448zM21.931,65.618c-0.543,0.558 -1.3,0.827 -2.074,0.74 -0.394,-0.045 -0.97,-0.206 -1.474,-0.71l-12.04,-12.11c-0.959,-0.958 -0.97,-2.53 -0.024,-3.503 0.47,-0.483 1.098,-0.751 1.772,-0.756h0.018c0.588,0 1.145,0.202 1.588,0.57l12.557,12.706c0.594,0.951 0.49,2.227 -0.323,3.062zM34.578,63.538c-0.948,0.948 -2.488,0.95 -3.437,0.005L8.716,40.855c-0.949,-0.949 -0.949,-2.493 0,-3.442 0.46,-0.46 1.07,-0.712 1.72,-0.712 0.649,0 1.258,0.251 1.717,0.708l22.413,22.676 0.012,0.012c0.949,0.949 0.949,2.493 0,3.442z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M39.258,8.144c0.65,0 1.26,0.253 1.73,0.721l17.148,17.019c1.576,1.575 3.659,2.365 5.743,2.365 2.045,0 4.092,-0.76 5.66,-2.285 1.816,-1.766 2.694,-4.224 2.408,-6.743 -0.206,-1.815 -1.032,-3.528 -2.332,-4.827l-4.041,-4.018L68.347,7.6c1.097,-1.099 1.096,-2.88 -0.003,-3.978 -1.1,-1.097 -2.88,-1.096 -3.978,0.003L61.585,6.41l-4.068,-4.045c-3.122,-3.121 -8.237,-3.157 -11.403,-0.08 -0.663,0.644 -1.2,1.382 -1.602,2.184 -1.461,-1.26 -3.304,-1.95 -5.254,-1.95 -2.153,0 -4.176,0.838 -5.699,2.36 -1.522,1.522 -2.36,3.546 -2.36,5.698 0,2.153 0.838,4.177 2.354,5.693l9.058,9.115 -13.524,13.56c-1.097,1.1 -1.095,2.88 0.005,3.978 0.549,0.547 1.267,0.82 1.986,0.82 0.721,0 1.442,-0.275 1.992,-0.826l13.506,-13.542 9.258,9.316c1.522,1.522 3.546,2.36 5.698,2.36 2.153,0 4.177,-0.838 5.699,-2.36 1.098,-1.099 1.098,-2.88 0,-3.978 -1.098,-1.098 -2.88,-1.098 -3.978,0 -0.46,0.46 -1.07,0.713 -1.72,0.713 -0.65,0 -1.262,-0.253 -1.715,-0.706L37.537,12.298c-0.46,-0.46 -0.713,-1.07 -0.713,-1.72 0,-0.65 0.253,-1.262 0.713,-1.722 0.46,-0.46 1.07,-0.712 1.72,-0.712zM50.035,6.319c0.481,-0.468 1.109,-0.702 1.737,-0.702 0.642,0 1.285,0.244 1.773,0.732l12.098,12.028c0.51,0.51 0.67,1.086 0.715,1.479 0.088,0.776 -0.182,1.532 -0.74,2.075 -0.968,0.94 -2.528,0.934 -3.494,-0.016l-0.016,-0.015L50.01,9.872c-0.476,-0.476 -0.735,-1.109 -0.73,-1.782 0.004,-0.673 0.272,-1.302 0.755,-1.771z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_kitchen_area.xml b/app/src/main/res/drawable/ic_illus_kitchen_area.xml
deleted file mode 100644
index e69f5c9aa..000000000
--- a/app/src/main/res/drawable/ic_illus_kitchen_area.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M16.547,18.703c0,-1.553 1.259,-2.812 2.812,-2.812L53.25,15.891c1.553,0 2.813,1.259 2.813,2.812 0,1.554 -1.26,2.813 -2.813,2.813L19.36,21.516c-1.554,0 -2.813,-1.26 -2.813,-2.813zM19.641,13.641c1.553,0 2.812,-1.26 2.812,-2.813 0,-1.553 -1.259,-2.812 -2.812,-2.812 -1.554,0 -2.813,1.259 -2.813,2.812 0,1.554 1.26,2.813 2.813,2.813zM29.625,13.641c1.553,0 2.813,-1.26 2.813,-2.813 0,-1.553 -1.26,-2.812 -2.813,-2.812 -1.553,0 -2.813,1.259 -2.813,2.812 0,1.554 1.26,2.813 2.813,2.813zM42.281,45.703c0,5.196 4.248,9.422 9.47,9.422h12.187c1.553,0 2.812,1.259 2.812,2.813v2.812C66.75,66.953 61.703,72 55.5,72L17.25,72C11.047,72 6,66.953 6,60.75v-49.5C6,5.047 11.047,0 17.25,0L55.5,0c6.203,0 11.25,5.047 11.25,11.25v34.453c0,1.554 -1.259,2.813 -2.813,2.813 -1.553,0 -2.812,-1.26 -2.812,-2.813 0,-5.18 -4.222,-9.396 -9.422,-9.422 -5.2,0.026 -9.422,4.243 -9.422,9.422zM11.625,11.25v22.745c2.552,-2.054 5.785,-3.3 9.303,-3.338h0.236c2.66,0.028 5.216,0.74 7.48,2.072 2.198,-1.29 4.75,-2.043 7.472,-2.072h0.236c2.716,0.029 5.323,0.77 7.622,2.155 2.228,-1.34 4.83,-2.125 7.611,-2.155h0.237c3.518,0.038 6.752,1.284 9.303,3.338L61.125,11.25c0,-3.101 -2.523,-5.625 -5.625,-5.625L17.25,5.625c-3.101,0 -5.625,2.524 -5.625,5.625zM36.235,55.125c1.139,-0.005 2.25,-0.212 3.293,-0.603 -1.805,-2.48 -2.872,-5.527 -2.872,-8.819 0,-3.292 1.067,-6.34 2.873,-8.82 -1.043,-0.39 -2.154,-0.596 -3.295,-0.602 -5.2,0.026 -9.422,4.243 -9.422,9.422 0,5.18 4.223,9.397 9.422,9.422zM21.188,45.703c0,-3.327 1.089,-6.405 2.93,-8.899 -0.978,-0.339 -2.01,-0.517 -3.071,-0.523 -5.2,0.026 -9.422,4.243 -9.422,9.422 0,5.18 4.222,9.397 9.422,9.422 1.057,-0.005 2.092,-0.183 3.071,-0.523 -1.841,-2.494 -2.93,-5.572 -2.93,-8.899zM61.124,60.75h-49.5c0,3.101 2.524,5.625 5.625,5.625L55.5,66.375c3.101,0 5.625,-2.524 5.625,-5.625z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_lecture_room.xml b/app/src/main/res/drawable/ic_illus_lecture_room.xml
deleted file mode 100644
index ea50362ee..000000000
--- a/app/src/main/res/drawable/ic_illus_lecture_room.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M71.76,66.307c-0.315,-1.517 -1.801,-2.492 -3.319,-2.177 -1.13,0.236 -1.96,1.12 -2.18,2.185L50.553,66.315c1.155,-3.15 4.192,-5.334 7.618,-5.334h0.147c0.026,0 0.05,-0.003 0.075,-0.004 4.575,-0.08 8.273,-3.823 8.273,-8.417 0,-4.643 -3.777,-8.42 -8.421,-8.42 -4.643,0 -8.42,3.777 -8.42,8.42 0,1.737 0.528,3.353 1.433,4.695 -1.627,0.955 -3.051,2.236 -4.17,3.763 -1.12,-1.527 -2.544,-2.808 -4.17,-3.763 0.904,-1.342 1.433,-2.958 1.433,-4.695 0,-4.643 -3.778,-8.42 -8.421,-8.42 -4.644,0 -8.421,3.777 -8.421,8.42 0,1.737 0.529,3.353 1.433,4.695 -1.627,0.955 -3.05,2.236 -4.17,3.763 -1.12,-1.527 -2.543,-2.808 -4.17,-3.763 0.905,-1.342 1.433,-2.958 1.433,-4.695 0,-4.643 -3.777,-8.42 -8.421,-8.42 -4.643,0 -8.421,3.777 -8.421,8.42 0,1.737 0.529,3.353 1.434,4.695C3.357,59.173 0.908,62.41 0.099,66.307c-0.288,1.386 0.058,2.81 0.95,3.904 0.888,1.091 2.203,1.717 3.609,1.717h62.544c1.405,0 2.721,-0.626 3.609,-1.717 0.891,-1.095 1.237,-2.518 0.95,-3.904zM35.856,60.981h0.147c3.427,0 6.464,2.184 7.62,5.334L28.236,66.315c1.155,-3.15 4.193,-5.334 7.62,-5.334zM58.245,49.753c1.548,0 2.807,1.26 2.807,2.807 0,1.548 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.26,-2.807 2.807,-2.807zM35.93,49.753c1.547,0 2.807,1.26 2.807,2.807 0,1.548 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.259,-2.807 2.807,-2.807zM13.614,49.753c1.548,0 2.807,1.26 2.807,2.807 0,1.548 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.26,-2.807 2.807,-2.807zM5.92,66.315c1.155,-3.15 4.194,-5.334 7.62,-5.334h0.147c3.428,0 6.466,2.184 7.622,5.334L5.919,66.315zM12.948,37.153c0.483,0.93 1.443,1.512 2.49,1.512h6.597v2.667c0,1.55 1.257,2.807 2.807,2.807s2.807,-1.256 2.807,-2.807v-5.474c0,-1.55 -1.257,-2.807 -2.807,-2.807h-7.698l-2.698,-5.192h42.967l-2.698,5.192h-7.558c-1.55,0 -2.807,1.258 -2.807,2.807v5.474c0,1.55 1.257,2.807 2.807,2.807s2.807,-1.256 2.807,-2.807v-2.667h6.456c1.048,0 2.009,-0.583 2.492,-1.512l5.613,-10.807c0.256,-0.492 0.355,-1.04 0.302,-1.574 0.01,-0.092 0.014,-0.187 0.014,-0.281v-8.842c0,-0.902 -0.433,-1.748 -1.163,-2.276l-4.312,-3.114 0.002,-0.084c0,-2.713 -2.2,-4.912 -4.913,-4.912 -2.712,0 -4.912,2.2 -4.912,4.912 0,2.713 2.2,4.912 4.912,4.912 0.57,0 1.117,-0.097 1.625,-0.276l3.147,2.273v5.161h-9.78l-0.002,-0.007c-0.81,-3.896 -3.26,-7.134 -6.528,-9.052 0.905,-1.342 1.433,-2.958 1.433,-4.695 0,-4.643 -3.777,-8.42 -8.42,-8.42 -4.644,0 -8.421,3.777 -8.421,8.42 0,1.737 0.528,3.353 1.433,4.695 -3.269,1.918 -5.718,5.156 -6.528,9.052v0.007L9.823,22.245c-0.98,0 -1.89,0.512 -2.399,1.35 -0.508,0.838 -0.543,1.88 -0.091,2.751l5.614,10.807zM35.93,5.683c1.547,0 2.807,1.26 2.807,2.808 0,1.547 -1.26,2.807 -2.807,2.807 -1.548,0 -2.807,-1.26 -2.807,-2.807 0,-1.548 1.259,-2.807 2.807,-2.807zM35.856,16.912h0.147c3.427,0 6.466,2.183 7.621,5.333L28.235,22.245c1.156,-3.15 4.194,-5.333 7.621,-5.333z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_library.xml b/app/src/main/res/drawable/ic_illus_library.xml
deleted file mode 100644
index f1d26f625..000000000
--- a/app/src/main/res/drawable/ic_illus_library.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M42.328,60.75h26.86c1.553,0 2.812,-1.26 2.812,-2.813L72,25.313c0,-1.554 -1.26,-2.813 -2.813,-2.813L54.984,22.5v-8.438c0,-1.553 -1.259,-2.812 -2.812,-2.812L38.109,11.25L38.109,2.812C38.11,1.26 36.85,0 35.297,0L8.437,0C3.785,0 0,3.785 0,8.438v32.624C0,45.715 3.785,49.5 8.438,49.5h8.437v2.813c0,4.652 3.785,8.437 8.438,8.437h8.578v2.813c0,4.652 3.785,8.437 8.437,8.437h26.86C70.74,72 72,70.74 72,69.187c0,-1.553 -1.26,-2.812 -2.813,-2.812L42.328,66.375c-1.55,0 -2.812,-1.262 -2.812,-2.813 0,-1.55 1.261,-2.812 2.812,-2.812zM66.375,55.125L50.906,55.125L50.906,36.562c0,-1.553 -1.259,-2.812 -2.812,-2.812 -1.554,0 -2.813,1.26 -2.813,2.813v18.562h-2.953c-0.986,0 -1.932,0.17 -2.812,0.482v-24.67c0,-1.55 1.261,-2.812 2.812,-2.812h24.047v27zM49.359,22.5h-7.03c-4.653,0 -8.438,3.785 -8.438,8.438v12.937h-8.578c-0.986,0 -1.933,0.172 -2.813,0.484L22.5,19.687c0,-1.55 1.262,-2.812 2.813,-2.812h24.046L49.359,22.5zM8.437,5.625h24.047v5.625h-7.172c-4.652,0 -8.437,3.785 -8.437,8.438v12.937L8.437,32.625c-0.985,0 -1.932,0.172 -2.812,0.484L5.625,8.437c0,-1.55 1.262,-2.812 2.813,-2.812zM8.437,43.875c-1.55,0 -2.812,-1.262 -2.812,-2.813 0,-1.55 1.262,-2.812 2.813,-2.812h8.437v5.625L8.437,43.875zM25.313,55.125c-1.551,0 -2.813,-1.262 -2.813,-2.813 0,-1.55 1.262,-2.812 2.813,-2.812h8.578v5.625h-8.578z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_meeting.xml b/app/src/main/res/drawable/ic_illus_meeting.xml
deleted file mode 100644
index facb30b6c..000000000
--- a/app/src/main/res/drawable/ic_illus_meeting.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M72,8.517L72,24.68c0,4.696 -3.82,8.517 -8.517,8.517 -0.65,0 -1.18,0.53 -1.18,1.18v3.43c0,1.606 -0.958,3.04 -2.44,3.654 -0.493,0.204 -1.008,0.303 -1.518,0.303 -1.027,0 -2.034,-0.401 -2.792,-1.16l-0.035,-0.036 -5.419,-5.616c-0.704,-0.702 -1.136,-1.009 -1.768,-1.257 -1.446,-0.568 -2.157,-2.2 -1.59,-3.646 0.568,-1.446 2.2,-2.158 3.647,-1.59 1.7,0.668 2.785,1.612 3.706,2.532 0.011,0.013 0.024,0.024 0.035,0.036l2.582,2.677c0.34,-3.438 3.247,-6.133 6.772,-6.133 1.595,0 2.892,-1.297 2.892,-2.89L66.375,8.516c0,-1.595 -1.297,-2.892 -2.892,-2.892L50.906,5.624c-1.553,0 -2.812,-1.259 -2.812,-2.813C48.094,1.26 49.353,0 50.906,0h12.577C68.18,0 72,3.82 72,8.517zM21.375,19.828c1.553,0 2.813,-1.259 2.813,-2.812 0,-1.554 -1.26,-2.813 -2.813,-2.813 -1.553,0 -2.813,1.26 -2.813,2.813 0,1.553 1.26,2.812 2.813,2.812zM31.219,19.828c1.553,0 2.812,-1.259 2.812,-2.812 0,-1.554 -1.259,-2.813 -2.812,-2.813 -1.554,0 -2.813,1.26 -2.813,2.813 0,1.553 1.26,2.812 2.813,2.812zM11.672,19.828c1.553,0 2.812,-1.259 2.812,-2.812 0,-1.554 -1.259,-2.813 -2.812,-2.813 -1.554,0 -2.813,1.26 -2.813,2.813 0,1.553 1.26,2.812 2.813,2.812zM72,67.954v1.234C72,70.74 70.741,72 69.187,72c-1.553,0 -2.812,-1.259 -2.812,-2.813v-1.233c0,-0.565 -0.233,-1.097 -0.641,-1.46 -1.427,-1.274 -3.902,-2.79 -7.586,-2.79 -3.683,0 -6.158,1.516 -7.585,2.79 -0.408,0.363 -0.641,0.895 -0.641,1.46v1.234c0,1.553 -1.26,2.812 -2.813,2.812 -1.553,0 -2.812,-1.259 -2.812,-2.813v-1.233c0,-0.562 -0.235,-1.092 -0.644,-1.455 -1.44,-1.275 -3.936,-2.796 -7.653,-2.796 -3.717,0 -6.213,1.52 -7.652,2.796 -0.41,0.363 -0.645,0.893 -0.645,1.455v1.234c0,1.553 -1.259,2.812 -2.812,2.812 -1.554,0 -2.813,-1.259 -2.813,-2.813v-1.233c0,-0.565 -0.233,-1.097 -0.64,-1.46 -1.428,-1.274 -3.903,-2.79 -7.586,-2.79 -3.684,0 -6.159,1.516 -7.586,2.79 -0.408,0.363 -0.641,0.895 -0.641,1.46v1.234C5.625,70.74 4.366,72 2.812,72 1.26,72 0,70.741 0,69.187v-1.233c0,-2.167 0.919,-4.23 2.522,-5.659 1.048,-0.934 2.464,-1.955 4.268,-2.758 -0.74,-1.255 -1.165,-2.714 -1.165,-4.271 0,-4.653 3.785,-8.438 8.438,-8.438 4.652,0 8.437,3.785 8.437,8.438 0,1.62 -0.46,3.136 -1.256,4.422 1.493,0.705 2.707,1.554 3.652,2.36 0.992,-0.84 2.275,-1.728 3.867,-2.45 -0.762,-1.267 -1.2,-2.75 -1.2,-4.332 0,-4.653 3.784,-8.438 8.437,-8.438s8.438,3.785 8.438,8.438c0,1.583 -0.44,3.065 -1.2,4.332 1.59,0.722 2.874,1.61 3.866,2.45 0.991,-0.845 2.277,-1.737 3.87,-2.461 -0.756,-1.266 -1.193,-2.743 -1.193,-4.321 0,-4.653 3.785,-8.438 8.438,-8.438 4.652,0 8.437,3.785 8.437,8.438 0,1.599 -0.447,3.096 -1.223,4.371 1.698,0.787 3.04,1.762 4.045,2.658C71.081,63.725 72,65.787 72,67.954zM11.25,55.266c0,1.55 1.262,2.812 2.813,2.812 1.55,0 2.812,-1.262 2.812,-2.812 0,-1.551 -1.262,-2.813 -2.813,-2.813 -1.55,0 -2.812,1.262 -2.812,2.813zM36,58.078c1.55,0 2.813,-1.262 2.813,-2.812 0,-1.551 -1.262,-2.813 -2.813,-2.813 -1.55,0 -2.813,1.262 -2.813,2.813 0,1.55 1.262,2.812 2.813,2.812zM55.406,55.266c0,1.55 1.262,2.812 2.813,2.812 1.55,0 2.812,-1.262 2.812,-2.812 0,-1.551 -1.262,-2.813 -2.812,-2.813 -1.551,0 -2.813,1.262 -2.813,2.813zM0,24.68L0,8.517C0,3.82 3.82,0 8.517,0h25.857c4.696,0 8.517,3.82 8.517,8.517L42.891,24.68c0,4.696 -3.82,8.517 -8.517,8.517h-8.212c-1.608,0 -3.12,0.623 -4.262,1.756l-5.418,5.615 -0.035,0.036c-0.759,0.759 -1.765,1.16 -2.792,1.16 -0.51,0 -1.025,-0.099 -1.517,-0.303 -1.483,-0.614 -2.441,-2.047 -2.441,-3.653v-3.43c0,-0.652 -0.53,-1.181 -1.18,-1.181C3.82,33.198 0,29.377 0,24.68zM5.625,24.68c0,1.594 1.297,2.892 2.892,2.892 3.525,0 6.433,2.694 6.772,6.132l2.582,-2.677 0.036,-0.036c2.205,-2.205 5.136,-3.42 8.255,-3.42h8.212c1.595,0 2.892,-1.297 2.892,-2.89L37.266,8.516c0,-1.595 -1.297,-2.892 -2.892,-2.892L8.517,5.624c-1.595,0 -2.892,1.297 -2.892,2.892L5.625,24.68z"
-      android:fillColor="#000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_office_space.xml b/app/src/main/res/drawable/ic_illus_office_space.xml
deleted file mode 100644
index 973dafea0..000000000
--- a/app/src/main/res/drawable/ic_illus_office_space.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M71.93,44.771v24.281c0,1.55 -1.258,2.808 -2.808,2.808 -1.55,0 -2.807,-1.257 -2.807,-2.808v-24.28c0,-1.548 -1.26,-2.808 -2.807,-2.808h-1.946l-0.042,0.217c-1.429,7.435 -7.503,13.014 -14.854,13.957v7.695c6.027,0.516 10.41,2.588 10.619,2.688 1.397,0.671 1.986,2.348 1.315,3.746 -0.483,1.005 -1.487,1.593 -2.533,1.593 -0.405,0 -0.816,-0.089 -1.206,-0.274 -0.067,-0.032 -4.84,-2.254 -10.862,-2.254 -6.097,0 -10.808,2.228 -10.855,2.25 -1.397,0.67 -3.074,0.082 -3.745,-1.315 -0.67,-1.398 -0.082,-3.075 1.315,-3.746 0.206,-0.098 4.456,-2.108 10.338,-2.662v-7.746c-7.273,-0.69 -13.44,-3.301 -13.737,-3.428 -1.425,-0.611 -2.085,-2.261 -1.475,-3.686 0.61,-1.424 2.26,-2.084 3.684,-1.475 0.102,0.043 7.473,3.142 14.928,3.142 5.632,0 10.492,-4.014 11.555,-9.545l4.727,-24.577c0.069,-0.52 0.34,-2.11 1.227,-3.722 1.511,-2.747 4.054,-4.26 7.16,-4.26 1.551,0 2.808,1.256 2.808,2.806s-1.257,2.807 -2.807,2.807c-1.015,0 -1.668,0.374 -2.184,1.25 -0.486,0.826 -0.623,1.735 -0.639,1.85 -0.007,0.093 -0.017,0.142 -0.035,0.237L62.642,36.35h0.866c4.643,0 8.421,3.778 8.421,8.421zM47.789,41.964L8.49,41.964c-1.547,0 -2.807,1.26 -2.807,2.807v24.281c0,1.55 -1.256,2.807 -2.807,2.807 -1.55,0 -2.807,-1.256 -2.807,-2.807v-24.28c0,-4.644 3.778,-8.422 8.421,-8.422h3.507c-0.261,-0.63 -0.456,-1.3 -0.573,-2l-1.492,-8.904c-0.136,-0.814 0.093,-1.647 0.626,-2.277 0.533,-0.63 1.317,-0.994 2.143,-0.994h3.897c-0.158,-0.439 -0.372,-0.913 -0.663,-1.395 -1.48,-2.453 -4.232,-4.026 -8.182,-4.677 -1.53,-0.252 -2.565,-1.696 -2.313,-3.226 0.251,-1.53 1.697,-2.566 3.226,-2.313 3.265,0.537 5.753,1.57 7.65,2.8 -0.832,-2.96 -2.167,-6.078 -4.297,-8.845 -0.945,-1.229 -0.715,-2.992 0.514,-3.937 1.23,-0.945 2.991,-0.715 3.936,0.513 3.063,3.982 4.765,8.499 5.698,12.56 1.786,-3.52 4.683,-6.99 9.384,-8.948 1.43,-0.596 3.074,0.08 3.67,1.512 0.597,1.43 -0.08,3.074 -1.511,3.67 -3.438,1.432 -5.95,4.275 -7.466,8.448 -0.51,1.4 -0.823,2.736 -1.019,3.838h2.914c0.825,0 1.609,0.363 2.142,0.994 0.534,0.63 0.763,1.463 0.626,2.277l-1.492,8.905c-0.117,0.7 -0.311,1.369 -0.572,2h18.945c1.55,0 2.807,1.256 2.807,2.806s-1.257,2.807 -2.807,2.807zM20.42,36.35c1.72,0 3.174,-1.23 3.459,-2.927l0.943,-5.634h-2.678l-0.04,0.002 -0.04,-0.002h-6.047l0.944,5.634c0.284,1.697 1.739,2.927 3.46,2.927z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_other.xml b/app/src/main/res/drawable/ic_illus_other.xml
deleted file mode 100644
index 148291144..000000000
--- a/app/src/main/res/drawable/ic_illus_other.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M67.827,63.6c-0.09,-0.108 -0.186,-0.213 -0.284,-0.314 -0.046,-0.078 -0.095,-0.155 -0.148,-0.229 -5.88,-8.127 -13.13,-12.495 -20.991,-12.662 -0.488,-3.839 -1.274,-7.567 -2.349,-11.149 4.134,-0.532 7.338,-4.072 7.338,-8.349 0,-4.642 -3.777,-8.42 -8.42,-8.42 -1.42,0 -2.759,0.355 -3.933,0.978 -0.362,-1.127 -0.955,-2.151 -1.724,-3.017 8.207,-3.005 17.606,-4.166 24.897,4.733 -0.517,0.044 -1.038,0.078 -1.562,0.1 -1.55,0.066 -2.751,1.375 -2.685,2.924 0.063,1.508 1.306,2.688 2.802,2.688l0.121,-0.003c2.324,-0.1 4.61,-0.39 6.794,-0.867 0.882,-0.192 1.617,-0.797 1.977,-1.624 0.36,-0.828 0.299,-1.778 -0.163,-2.554 -2.746,-4.615 -6.124,-8.073 -10.042,-10.28 -1.49,-0.838 -3.062,-1.497 -4.706,-1.977 3.229,-2.373 5.785,-4.88 7.734,-7.577 0.533,-0.738 0.676,-1.69 0.381,-2.552 -0.294,-0.862 -0.988,-1.527 -1.862,-1.785C57.353,0.59 54.26,0.045 51.55,0.004c-6.42,-0.1 -11.984,2.055 -16.097,6.233 -0.611,0.621 -1.187,1.286 -1.723,1.985 -0.569,-1.288 -1.417,-2.587 -2.678,-3.712 -2.577,-2.298 -6.155,-2.798 -8.704,-2.813 -2.02,-0.017 -3.54,0.3 -3.707,0.337 -0.778,0.165 -1.449,0.654 -1.846,1.343 -0.398,0.688 -0.484,1.514 -0.238,2.27 0.117,0.359 0.405,1.197 0.858,2.224 -2.812,0.018 -5.696,0.629 -8.57,1.835 -2.628,1.103 -5.236,2.67 -7.754,4.66 -0.704,0.556 -1.1,1.416 -1.065,2.312 0.036,0.897 0.497,1.723 1.243,2.223 2.756,1.845 5.858,3.316 9.042,4.32 -2.098,1.67 -3.814,3.714 -5.118,6.109 -2.05,3.766 -3.089,8.43 -3.089,13.864 0,0.824 0.363,1.607 0.99,2.14 0.512,0.434 1.157,0.667 1.817,0.667 0.152,0 0.305,-0.012 0.457,-0.037 5.026,-0.83 10.128,-3.196 14.755,-6.847 1.217,-0.96 1.425,-2.725 0.465,-3.942s-2.725,-1.425 -3.943,-0.465c-2.077,1.64 -5.1,3.625 -8.73,4.846C9.227,28.106 16.79,24.9 22.874,23.89c-0.178,0.68 -0.274,1.395 -0.274,2.131 0,4.643 3.778,8.42 8.42,8.42 1.42,0 2.76,-0.354 3.934,-0.977 0.478,1.49 1.362,2.8 2.52,3.803 1.564,4.206 2.669,8.68 3.296,13.345 -6.84,0.988 -13.13,5.24 -18.343,12.445 -0.053,0.075 -0.102,0.151 -0.148,0.23 -0.098,0.1 -0.193,0.205 -0.284,0.314 -1.479,1.77 -2.948,2.786 -4.03,2.786 -1.082,0 -2.55,-1.016 -4.03,-2.786 -1.202,-1.44 -3.008,-2.267 -4.952,-2.267s-3.75,0.826 -4.952,2.267C2.55,65.371 1.082,66.387 0,66.387L0,72c2.872,0 5.678,-1.615 8.338,-4.8 0.132,-0.158 0.373,-0.252 0.644,-0.252 0.272,0 0.512,0.094 0.644,0.252 2.661,3.185 5.466,4.8 8.338,4.8 2.872,0 5.677,-1.615 8.338,-4.8 0.132,-0.158 0.373,-0.252 0.644,-0.252 0.272,0 0.513,0.094 0.645,0.252 2.66,3.185 5.465,4.8 8.338,4.8 2.871,0 5.677,-1.615 8.338,-4.8 0.131,-0.158 0.372,-0.252 0.643,-0.252 0.272,0 0.513,0.094 0.645,0.252 2.66,3.185 5.466,4.8 8.338,4.8 2.872,0 5.677,-1.615 8.338,-4.8 0.131,-0.158 0.372,-0.252 0.644,-0.252 0.271,0 0.512,0.094 0.644,0.252 2.66,3.185 5.466,4.8 8.338,4.8v-5.613c-1.083,-0.001 -2.55,-1.016 -4.03,-2.787zM42.973,28.09c1.547,0 2.806,1.26 2.806,2.807 0,1.548 -1.259,2.807 -2.806,2.807 -1.548,0 -2.807,-1.259 -2.807,-2.807 0,-1.547 1.259,-2.806 2.807,-2.806zM51.463,5.616c1.096,0.017 2.293,0.142 3.609,0.38 -2.41,2.341 -5.523,4.558 -9.415,6.711l-0.031,0.02c-3.52,0.288 -6.768,1.186 -9.377,2.103 2.085,-4.544 6.673,-9.347 15.214,-9.214zM27.316,8.7c0.93,0.829 1.415,1.915 1.666,2.901 -1.115,-0.798 -2.303,-1.485 -3.54,-2.039 -0.161,-0.145 -0.34,-0.274 -0.54,-0.381 -0.411,-0.221 -0.94,-0.92 -1.458,-1.817 1.691,0.15 3.069,0.62 3.872,1.336zM11.02,14.883c7.585,-3.185 13.318,-0.395 16.627,2.909 -2.187,0.114 -5.516,0.309 -9.091,1.321 -0.047,-0.004 -0.093,-0.012 -0.14,-0.015 -3.34,-0.202 -6.982,-1.195 -10.296,-2.76 0.965,-0.564 1.933,-1.05 2.9,-1.455zM31.02,28.828c-1.547,0 -2.806,-1.26 -2.806,-2.807 0,-1.548 1.259,-2.807 2.807,-2.807s2.807,1.26 2.807,2.807c0,1.548 -1.26,2.807 -2.807,2.807zM57.923,63.6c-1.479,1.77 -2.947,2.786 -4.03,2.786 -1.082,0 -2.55,-1.015 -4.029,-2.786 -1.203,-1.44 -3.009,-2.266 -4.953,-2.266 -1.944,0 -3.749,0.826 -4.952,2.266 -1.478,1.77 -2.947,2.786 -4.03,2.786 -1.082,0 -2.55,-1.015 -4.03,-2.786 -0.435,-0.52 -0.95,-0.96 -1.521,-1.31 4.109,-4.176 8.635,-6.288 13.505,-6.29l0.002,0.001h2.05c4.872,0 9.4,2.112 13.51,6.288 -0.571,0.35 -1.086,0.79 -1.522,1.311z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_private_event.xml b/app/src/main/res/drawable/ic_illus_private_event.xml
deleted file mode 100644
index ec124b779..000000000
--- a/app/src/main/res/drawable/ic_illus_private_event.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M71.93,41.548c0,0.632 -0.06,1.273 -0.176,1.905 -0.28,1.525 -1.74,2.534 -3.267,2.255 -1.524,-0.28 -2.534,-1.743 -2.255,-3.267 0.055,-0.299 0.083,-0.6 0.083,-0.893 0,-3.32 -1.91,-7.734 -3.212,-10.25L49.32,31.298c-0.742,1.439 -1.684,3.498 -2.355,5.614L58.89,36.912c1.55,0 2.807,1.257 2.807,2.807s-1.257,2.807 -2.807,2.807L46.212,42.526c0.806,3.82 6.001,8.296 9.998,8.296 1.05,0 2.42,-0.369 3.665,-0.986 1.39,-0.69 3.073,-0.122 3.762,1.268 0.689,1.388 0.121,3.073 -1.267,3.761 -1.098,0.544 -2.235,0.955 -3.353,1.22v8.616c3.992,0.439 7.379,1.649 7.552,1.711 1.457,0.528 2.212,2.137 1.684,3.595 -0.413,1.142 -1.49,1.853 -2.64,1.853 -0.317,0 -0.64,-0.055 -0.955,-0.169 -0.039,-0.014 -4.316,-1.533 -8.362,-1.533 -4.034,0 -8.196,1.512 -8.237,1.527 -1.454,0.534 -3.068,-0.21 -3.603,-1.662 -0.537,-1.453 0.204,-3.065 1.656,-3.603 0.167,-0.062 3.393,-1.243 7.291,-1.698v-8.644c-2.637,-0.647 -5.367,-2.145 -7.69,-4.273 -3.318,-3.043 -5.222,-6.782 -5.222,-10.257 0,-6.424 4.561,-14.166 4.756,-14.492 0.505,-0.851 1.422,-1.372 2.412,-1.372h17.102c0.99,0 1.906,0.521 2.412,1.372 0.194,0.326 4.756,8.068 4.756,14.492zM33.24,35.891c2.204,5.037 3.32,10.38 3.32,15.878v17.283c0,1.55 -1.256,2.807 -2.806,2.807L2.877,71.859c-1.55,0 -2.807,-1.256 -2.807,-2.807L0.07,51.77c0,-5.498 1.118,-10.84 3.321,-15.878l5.886,-13.454c0.41,-0.936 0.617,-1.928 0.617,-2.95L9.894,5.522C8.684,5.21 7.79,4.115 7.79,2.807 7.789,1.257 9.046,0 10.596,0h15.439c1.55,0 2.807,1.257 2.807,2.807 0,1.308 -0.896,2.403 -2.106,2.715v13.965c0,1.022 0.208,2.014 0.618,2.95l5.886,13.454zM30.947,51.769c0,-4.72 -0.96,-9.304 -2.85,-13.628L22.21,24.687c-0.722,-1.65 -1.088,-3.4 -1.088,-5.2L21.122,5.614L15.51,5.614v13.873c0,1.801 -0.366,3.55 -1.088,5.2L9.072,36.913L20.14,36.913c1.55,0 2.807,1.257 2.807,2.807s-1.257,2.807 -2.807,2.807L6.963,42.527c-0.848,2.996 -1.279,6.09 -1.279,9.243v14.476h25.263L30.947,51.77z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_illus_shop.xml b/app/src/main/res/drawable/ic_illus_shop.xml
deleted file mode 100644
index b29bc4209..000000000
--- a/app/src/main/res/drawable/ic_illus_shop.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72dp"
-    android:height="72dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-  <path
-      android:pathData="M69.188,39.516h-9.422L59.766,38.39c0,-6.048 -4.92,-10.97 -10.97,-10.97 -6.048,0 -10.968,4.922 -10.968,10.97v1.125L27.562,39.515c-1.553,0 -2.812,1.259 -2.812,2.812v18.844c0,1.868 0.46,3.642 1.324,5.203L11.25,66.374c-3.207,0 -5.625,-2.237 -5.625,-5.203L5.625,19.125h13.078v2.813c0,1.553 1.26,2.812 2.813,2.812 1.553,0 2.812,-1.259 2.812,-2.813v-2.812h10.688v2.813c0,1.553 1.259,2.812 2.812,2.812 1.554,0 2.813,-1.259 2.813,-2.813v-2.812h13.5v2.813c0,1.553 1.259,2.812 2.812,2.812 1.554,0 2.813,-1.259 2.813,-2.813v-5.625c0,-1.553 -1.26,-2.812 -2.813,-2.812L40.641,13.5v-2.531C40.64,4.92 35.72,0 29.67,0c-6.048,0 -10.968,4.92 -10.968,10.969L18.702,13.5L2.813,13.5C1.258,13.5 0,14.759 0,16.313v44.859c0,3.017 1.196,5.792 3.367,7.813C5.455,70.93 8.255,72 11.25,72h49.5C66.953,72 72,66.953 72,60.75L72,42.328c0,-1.553 -1.259,-2.812 -2.813,-2.812zM24.328,10.969c0,-2.947 2.397,-5.344 5.344,-5.344 2.946,0 5.344,2.397 5.344,5.344L35.016,13.5L24.328,13.5v-2.531zM43.453,38.39c0,-2.947 2.397,-5.344 5.344,-5.344 2.946,0 5.344,2.397 5.344,5.344v1.125L43.453,39.515L43.453,38.39zM66.375,60.75c0,3.101 -2.524,5.625 -5.625,5.625L36,66.375c-3.207,0 -5.625,-2.237 -5.625,-5.203L30.375,45.14h7.453v2.953c0,1.553 1.26,2.812 2.813,2.812 1.553,0 2.812,-1.259 2.812,-2.812L43.453,45.14h10.688v2.953c0,1.553 1.259,2.812 2.812,2.812 1.554,0 2.813,-1.259 2.813,-2.812L59.766,45.14h6.609L66.375,60.75z"
-      android:fillColor="#000"
-      android:fillType="nonZero"/>
-</vector>
diff --git a/app/src/main/res/drawable/reminder_toggle_background_color.xml b/app/src/main/res/drawable/reminder_toggle_background_color.xml
new file mode 100644
index 000000000..1df3bbb8d
--- /dev/null
+++ b/app/src/main/res/drawable/reminder_toggle_background_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="true"
+		android:color="#25292859"/>
+</selector>
diff --git a/app/src/main/res/drawable/reminder_toggle_text_color.xml b/app/src/main/res/drawable/reminder_toggle_text_color.xml
new file mode 100644
index 000000000..18533db95
--- /dev/null
+++ b/app/src/main/res/drawable/reminder_toggle_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/primary" android:state_checked="true" />
+	<item android:color="@color/grey_dark" />
+</selector>
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
index 47337fd07..dd421f10e 100644
--- a/app/src/main/res/layout/card_checkin.xml
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -28,7 +28,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginStart="@dimen/spacing_medium"
 				android:layout_weight="1"
-				android:text="[TBT] My Check-Ins" />
+				android:text="@string/module_checkins_title" />
 
 			<ImageView
 				android:layout_width="@dimen/chevron_size_title"
@@ -52,7 +52,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_small"
-				android:text="[TBT] Hier wird eine Beschreibung sein." />
+				android:text="@string/module_checkins_description" />
 
 			<Button
 				android:id="@+id/checkin_button"
@@ -61,7 +61,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginVertical="@dimen/spacing_medium_large"
 				android:drawableStart="@drawable/ic_qr"
-				android:text="[TBT] Scan QR Code" />
+				android:text="@string/scan_qr_code_button_title" />
 
 		</LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index 677f684dc..14b37e57e 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -5,6 +5,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="@color/white"
 	android:orientation="vertical">
 
 	<androidx.appcompat.widget.Toolbar
@@ -34,12 +35,11 @@
 				android:layout_weight="2" />
 
 			<ImageView
-				android:id="@+id/check_in_fragment_venue_type_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
 				android:layout_marginTop="@dimen/spacing_large"
-				tools:src="@drawable/ic_tea" />
+				android:src="@drawable/ic_illu_check_in" />
 
 			<TextView
 				android:id="@+id/check_in_fragment_title"
@@ -87,15 +87,16 @@
 					android:layout_gravity="center"
 					android:layout_marginTop="@dimen/spacing_medium"
 					android:layout_marginBottom="@dimen/spacing_large"
+					app:checkedButton="@id/check_in_fragment_toggle_button_2"
 					app:selectionRequired="true"
 					app:singleSelection="true">
 
 					<com.google.android.material.button.MaterialButton
 						android:id="@+id/check_in_fragment_toggle_button_1"
 						style="@style/CrowdNotifier.ToggleButton"
-						android:textColorHighlight="@color/blue_main"
 						android:text="Off"
-						android:textAllCaps="true" />
+						android:textAllCaps="true"
+						android:textColorHighlight="@color/blue_main" />
 
 					<com.google.android.material.button.MaterialButton
 						android:id="@+id/check_in_fragment_toggle_button_2"
@@ -131,12 +132,12 @@
 
 	<Button
 		android:id="@+id/check_in_fragment_check_in_button"
-		style="@style/CrowdNotifier.Button"
-		android:layout_width="wrap_content"
+		style="@style/NextStep.Button"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
 		android:layout_marginVertical="@dimen/spacing_larger"
-		android:elevation="@dimen/card_elevation"
 		android:text="@string/check_in_now_button_title" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_check_out.xml b/app/src/main/res/layout/fragment_check_out.xml
index 72460f1bf..0e4830200 100644
--- a/app/src/main/res/layout/fragment_check_out.xml
+++ b/app/src/main/res/layout/fragment_check_out.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="@color/white"
 	android:elevation="@dimen/modal_elevation"
 	android:orientation="vertical">
 
@@ -59,20 +60,12 @@
 			android:paddingHorizontal="@dimen/spacing_very_large"
 			android:paddingBottom="@dimen/spacing_large">
 
-			<ImageView
-				android:id="@+id/check_out_fragment_venue_type_icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:layout_marginTop="@dimen/spacing_very_large"
-				android:src="@drawable/ic_tea" />
-
 			<TextView
 				android:id="@+id/check_out_fragment_title"
 				style="@style/CrowdNotifier.Text.Title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_medium"
+				android:layout_marginTop="@dimen/spacing_larger"
 				android:gravity="center"
 				tools:text="Cyber Cafe SV" />
 
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 516ec643f..09058451b 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -22,7 +22,7 @@
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
 		app:navigationIcon="@drawable/ic_arrow_back"
-		app:title="[TBT] Checkins" />
+		app:title="@string/module_checkins_title" />
 
 	<ScrollView
 		android:id="@+id/travel_scroll_view"
@@ -82,7 +82,7 @@
 							android:layout_height="wrap_content"
 							android:layout_marginVertical="@dimen/spacing_medium_large"
 							android:drawableStart="@drawable/ic_qr"
-							android:text="[TBT] Scan QR Code" />
+							android:text="@string/scan_qr_code_button_title" />
 
 					</LinearLayout>
 
@@ -112,6 +112,7 @@
 							tools:text="20:32" />
 
 						<TextView
+							android:id="@+id/checkin_place"
 							style="@style/NextStep.Text.Bold"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 534303b5c..e0876a30e 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1609,4 +1609,20 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1c6e963df..8a82a9356 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1606,7 +1606,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="web_generator_title_label">"Titel"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Druck-PDF anzeigen"</string>
+    <string name="show_pdf_button">"PDF drucken"</string>
 
     <!-- Check-Ins: Kategorie Kantine -->
     <string name="web_generator_category_canteen">"Kantine"</string>
@@ -1673,4 +1673,21 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <!-- Fuzzy -->
     <string name="checkin_checked_in">"Sie sind eingecheckt"</string>
     <string name="checkout_from_to_date">"{DATE1} bis {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Mehr zum Covidcode"</string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button">"Entfernen"</string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title">"Löschen"</string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <!-- Fuzzy -->
+    <string name="share_button_title">"Teilen"</string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title">"Drucken"</string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Checken Sie bei Events ein und sehen Sie ihre vergangenen Check-Ins."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b18df561d..4a53321ab 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1600,4 +1600,20 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8a6f2ccda..35095dd50 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1635,4 +1635,20 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 154a54dc4..f2450c89a 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1605,4 +1605,20 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d2040e8ec..a83736638 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1643,4 +1643,20 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c073997cd..1efeaaa4f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1610,4 +1610,20 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index bdddffe8a..51c904d97 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1605,4 +1605,20 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 6b668efc1..08b877ad5 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1610,4 +1610,20 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 0b1406016..ed032faee 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1605,4 +1605,20 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 1881bc6e5..c5958769b 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1585,4 +1585,20 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6976c1b7d..5316ac739 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1587,4 +1587,20 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/crowdnotifier_styles.xml b/app/src/main/res/values/crowdnotifier_styles.xml
index 22e442c39..6672bfd69 100644
--- a/app/src/main/res/values/crowdnotifier_styles.xml
+++ b/app/src/main/res/values/crowdnotifier_styles.xml
@@ -72,6 +72,9 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:textAllCaps">false</item>
+		<item name="backgroundTint">@drawable/reminder_toggle_background_color</item>
+		<item name="strokeColor">@drawable/reminder_toggle_text_color</item>
+		<item name="android:textColor">@drawable/reminder_toggle_text_color</item>
 		<item name="android:layout_height">wrap_content</item>
 	</style>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 304d08d62..41b54eec7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1632,4 +1632,20 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in"></string>
     <string name="checkout_from_to_date"></string>
+    <string name="inform_detail_covidcode_info_button"></string>
+
+    <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
+    <string name="remove_from_diary_button"></string>
+
+    <!-- Check-Ins: QR-Code löschen Titel Button -->
+    <string name="delete_button_title"></string>
+
+    <!-- Check-Ins: Teile QR-Code Button Titel -->
+    <string name="share_button_title"></string>
+
+    <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
+    <string name="print_button_title"></string>
+
+    <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
+    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 478fc104c..4fd8a10bc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,6 +20,7 @@
 		<item name="android:statusBarColor">@color/white</item>
 		<item name="toolbarStyle">@style/NextStep.Toolbar</item>
 		<item name="toolbarNavigationButtonStyle">@style/NextStep.Toolbar.Button.Navigation</item>
+		<item name="android:timePickerDialogTheme">@style/NextStep.TimePicker</item>
 	</style>
 
 	<!-- Text -->
@@ -333,4 +334,17 @@
 		<item name="fontFamily">@font/inter_light</item>
 	</style>
 
+	<style name="NextStep.TimePicker" parent="Theme.AppCompat.Light.Dialog">
+		<item name="colorAccent">@color/primary</item>
+		<item name="android:colorAccent">@color/primary</item>
+		<item name="colorPrimary">@color/primary</item>
+		<item name="colorPrimaryDark">@color/primary</item>
+		<item name="buttonBarButtonStyle">@color/primary</item>
+		<item name="android:buttonBarButtonStyle">@style/NextStep.TimePicker.Button</item>
+	</style>
+
+	<style name="NextStep.TimePicker.Button" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+		<item name="android:textColor">@color/primary</item>
+	</style>
+
 </resources>

From a1125429749abd7df35d46466cef632abec02b94 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 3 May 2021 14:26:20 +0200
Subject: [PATCH 015/207] Fix Build issues by integrating latest SDK

---
 app/build.gradle                              |  2 +-
 .../networking/TraceKeysRepository.java       |  7 ++++--
 app/src/main/proto/Proto.proto                | 23 +++++++++++--------
 build.gradle                                  |  8 +------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6e56b4dd2..d7b6b2848 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,7 +207,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:3.0'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-6'
 
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index d2e795ca7..ef5724f3a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.crowdnotifier.android.sdk.model.DayDate;
 import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
 import org.dpppt.android.sdk.DP3T;
 import org.dpppt.android.sdk.backend.UserAgentInterceptor;
@@ -84,8 +85,10 @@ private List<ProblematicEventInfo> handleSuccessfulResponse(Response<ResponseBod
 			ArrayList<ProblematicEventInfo> problematicEventInfos = new ArrayList<>();
 			for (Proto.ProblematicEvent event : problematicEventWrapper.getEventsList()) {
 				problematicEventInfos.add(new ProblematicEventInfo(event.getIdentity().toByteArray(),
-						event.getSecretKeyForIdentity().toByteArray(), event.getStartTime(), event.getEndTime(),
-						event.getEncryptedAssociatedData().toByteArray(), event.getCipherTextNonce().toByteArray()));
+						event.getSecretKeyForIdentity().toByteArray(),
+						event.getEncryptedAssociatedData().toByteArray(), event.getCipherTextNonce().toByteArray(),
+						new DayDate(event.getDay()))
+				);
 			}
 			return problematicEventInfos;
 		} catch (IOException e) {
diff --git a/app/src/main/proto/Proto.proto b/app/src/main/proto/Proto.proto
index 4cc1ccc85..51c02fa6b 100644
--- a/app/src/main/proto/Proto.proto
+++ b/app/src/main/proto/Proto.proto
@@ -10,25 +10,30 @@ message ProblematicEvent {
   int32 version = 1;
   bytes identity = 2;
   bytes secretKeyForIdentity = 3;
-  int64 startTime = 4;
-  int64 endTime = 5;
-  bytes encryptedAssociatedData = 6;
-  bytes cipherTextNonce = 7;
+  int64 day = 4;
+  bytes encryptedAssociatedData = 5;
+  bytes cipherTextNonce = 6;
 }
+
 message AssociatedData {
   int32 version = 1;
   string message = 2;
-  bytes countryData = 3;
-}
-message NotifyMeAssociatedData {
-  int32 version = 1;
-  EventCriticality criticality = 2;
+  int64 startTime = 3;
+  int64 endTime = 4;
+  bytes countryData = 5;
 }
+
 enum EventCriticality {
   LOW = 0;
   HIGH = 1;
 }
 
+message SwissCovidAssociatedData {
+  int32 version = 1;
+  EventCriticality criticality = 2;
+}
+
+
 message SwissCovidLocationData {
   uint32 version = 1;
   VenueType type = 2;
diff --git a/build.gradle b/build.gradle
index d730aeb42..29b62a76a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.1.0'
+		classpath 'com.android.tools.build:gradle:4.1.3'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
 	}
@@ -30,12 +30,6 @@ allprojects {
 		google()
 		jcenter()
 		mavenCentral()
-		maven {
-			url  "https://dl.bintray.com/terl/lazysodium-maven"
-		}
-		maven {
-			url "https://dl.bintray.com/crowdnotifier/crowdnotifier-sdk-android"
-		}
 	}
 }
 

From e92ceac9818feb094c1c5a5127c4ce4ed3d71d9b Mon Sep 17 00:00:00 2001
From: Clea Benz <benz@ubique.ch>
Date: Wed, 28 Apr 2021 17:00:35 +0200
Subject: [PATCH 016/207] PP-966: add recycler for qr codes

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |    8 +
 .../checkin/events/EventsOverviewFragment.kt  |   47 +
 .../bag/dp3t/checkin/events/QrCodeAdapter.kt  |  107 +
 .../checkin/events/QrCodeBaseViewHolder.kt    |    8 +
 .../bag/dp3t/checkin/events/QrCodeItem.kt     |   14 +
 app/src/main/res/drawable/ic_delete.xml       |   10 +
 app/src/main/res/drawable/ic_qr_code.xml      |   10 +
 .../res/layout/fragment_events_overview.xml   |   32 +
 .../main/res/layout/item_generate_qr_code.xml |   16 +
 app/src/main/res/layout/item_qr_code.xml      |   52 +
 .../res/layout/item_qr_code_empty_list.xml    |   26 +
 app/src/main/res/values/strings.xml           | 1880 +++++++++--------
 12 files changed, 1271 insertions(+), 939 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
 create mode 100644 app/src/main/res/drawable/ic_delete.xml
 create mode 100644 app/src/main/res/drawable/ic_qr_code.xml
 create mode 100644 app/src/main/res/layout/fragment_events_overview.xml
 create mode 100644 app/src/main/res/layout/item_generate_qr_code.xml
 create mode 100644 app/src/main/res/layout/item_qr_code.xml
 create mode 100644 app/src/main/res/layout/item_qr_code_empty_list.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index c5e6031d7..3031c1c69 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -10,6 +10,7 @@ import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
+import ch.admin.bag.dp3t.checkin.events.EventsOverviewFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
 
@@ -37,6 +38,13 @@ class CheckinOverviewFragment : Fragment() {
 			requireActivity().supportFragmentManager.popBackStack()
 		}
 
+		binding.checkinOverviewScanQr.setOnClickListener {
+			requireActivity().supportFragmentManager.beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, EventsOverviewFragment.newInstance())
+				.addToBackStack(EventsOverviewFragment::class.java.canonicalName)
+				.commit()
+		}
 		binding.checkinOverviewHistory.setOnClickListener { v: View? -> }
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
new file mode 100644
index 000000000..538bacbbc
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -0,0 +1,47 @@
+package ch.admin.bag.dp3t.checkin.events
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
+
+class EventsOverviewFragment : Fragment() {
+
+	companion object {
+		fun newInstance(): EventsOverviewFragment {
+			return EventsOverviewFragment()
+		}
+	}
+
+	private lateinit var binding: FragmentEventsOverviewBinding
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		super.onCreateView(inflater, container, savedInstanceState)
+		binding = FragmentEventsOverviewBinding.inflate(layoutInflater)
+		return binding.root
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		val adapter = QrCodeAdapter(object : OnClickListener {
+			override fun generateQrCode() {
+				/*requireActivity().supportFragmentManager.beginTransaction()
+					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+					.replace(R.id.main_fragment_container, )
+					.addToBackStack(::class.java.canonicalName)
+					.commit()*/
+			}
+
+			override fun onQrCodeClicked(qrCodeItem: QrCodeItem) {
+				TODO("Not yet implemented")
+			}
+
+		})
+		binding.qrList.adapter = adapter
+		adapter.setItems(emptyList())
+	}
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
new file mode 100644
index 000000000..5b86b7344
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
@@ -0,0 +1,107 @@
+package ch.admin.bag.dp3t.checkin.events
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
+import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
+import ch.admin.bag.dp3t.databinding.ItemQrCodeEmptyListBinding
+
+class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeBaseViewHolder<*>>() {
+
+	companion object {
+		private const val TYPE_GENERATE_QR_CODE = 0
+		private const val TYPE_QR_CODE = 1
+		private const val TYPE_QR_EMPTY_LIST = 2
+	}
+
+	private var items: List<Any> = emptyList()
+
+	fun setItems(qrCodes: List<QrCodeItem>) {
+		val newItems: ArrayList<Any> = ArrayList()
+		newItems.add(GenerateQrCodeItem())
+		if (qrCodes.isEmpty()) {
+			newItems.add(QrCodeEmptyListItem())
+		} else {
+			newItems.addAll(qrCodes)
+		}
+		this.items = newItems
+		notifyDataSetChanged()
+	}
+
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QrCodeBaseViewHolder<*> {
+		return when (viewType) {
+			TYPE_GENERATE_QR_CODE -> {
+				val binding = ItemGenerateQrCodeBinding
+					.inflate(LayoutInflater.from(parent.context), parent, false)
+				return GenerateQrCodeViewHolder(binding)
+			}
+			TYPE_QR_CODE -> {
+				val binding = ItemQrCodeBinding
+					.inflate(LayoutInflater.from(parent.context), parent, false)
+				return QrCodeViewHolder(binding)
+			}
+			TYPE_QR_EMPTY_LIST -> {
+				val binding = ItemQrCodeEmptyListBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+				return QrCodeEmptyListViewHolder(binding)
+			}
+			else -> throw IllegalArgumentException("invalid view type")
+		}
+	}
+
+	override fun onBindViewHolder(holder: QrCodeBaseViewHolder<*>, position: Int) {
+		val item = items[position]
+		when (holder) {
+			is GenerateQrCodeViewHolder -> holder.bind(item as GenerateQrCodeItem)
+			is QrCodeViewHolder -> holder.bind(item as QrCodeItem)
+			is QrCodeEmptyListViewHolder -> holder.bind(item as QrCodeEmptyListItem)
+			else -> throw  IllegalArgumentException()
+		}
+	}
+
+	override fun getItemViewType(position: Int): Int {
+		return when (items[position]) {
+			is QrCodeItem -> TYPE_QR_CODE
+			is GenerateQrCodeItem -> TYPE_GENERATE_QR_CODE
+			is QrCodeEmptyListItem -> TYPE_QR_EMPTY_LIST
+			else -> throw java.lang.IllegalArgumentException("Invalid type of data at position $position")
+		}
+	}
+
+	override fun getItemCount(): Int {
+		return items.size
+	}
+
+	inner class GenerateQrCodeViewHolder(private val binding: ItemGenerateQrCodeBinding) :
+		QrCodeBaseViewHolder<GenerateQrCodeItem>(binding.root) {
+		override fun bind(item: GenerateQrCodeItem) {
+			binding.qrCodeGenerate.setOnClickListener {
+				onClickListener.generateQrCode()
+			}
+		}
+
+	}
+
+	inner class QrCodeViewHolder(private val binding: ItemQrCodeBinding) : QrCodeBaseViewHolder<QrCodeItem>(binding.root) {
+		override fun bind(item: QrCodeItem) {
+			binding.qrCodeName.setText("UB E21.7")
+			binding.qrCodeLocation.setText("Sitzungsraum")
+			binding.root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
+		}
+
+	}
+
+	inner class QrCodeEmptyListViewHolder(binding: ItemQrCodeEmptyListBinding) :
+		QrCodeBaseViewHolder<QrCodeEmptyListItem>(binding.root) {
+		override fun bind(item: QrCodeEmptyListItem) {
+
+		}
+	}
+}
+
+interface OnClickListener {
+	fun generateQrCode()
+	fun onQrCodeClicked(qrCodeItem: QrCodeItem)
+}
+
+
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt
new file mode 100644
index 000000000..ebd765497
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt
@@ -0,0 +1,8 @@
+package ch.admin.bag.dp3t.checkin.events
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class QrCodeBaseViewHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
+	abstract  fun bind(item: T)
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
new file mode 100644
index 000000000..ee82321ee
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
@@ -0,0 +1,14 @@
+package ch.admin.bag.dp3t.checkin.events
+
+class QrCodeItem {
+
+}
+
+class GenerateQrCodeItem {
+
+}
+
+class QrCodeEmptyListItem {
+
+}
+
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 000000000..5204eb007
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.5,3h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"
+      android:fillColor="#E20008"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
new file mode 100644
index 000000000..77567b22b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qr_code.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="50dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M23.106,26.894v20.833L2.273,47.727L2.273,26.894h20.833zM32.576,40.152l-0.001,3.785 15.152,0.002v3.788h-18.94v-7.575h3.789zM19.316,30.682L6.06,30.682v13.256h13.257L19.317,30.68zM32.576,26.894l-0.001,5.681h3.787l0.002,-5.681h11.363v13.258L43.94,40.152l-0.002,-9.47L40.15,30.682l0.002,5.682L28.788,36.364v-9.47h3.788zM15.53,34.47v5.682L9.848,40.152L9.848,34.47h5.682zM23.106,2.273v20.833L2.273,23.106L2.273,2.273h20.833zM47.727,2.273v20.833L26.894,23.106L26.894,2.273h20.833zM19.317,6.06L6.06,6.06v13.257h13.257L19.317,6.06zM43.937,6.06L30.681,6.06v13.257h13.256L43.937,6.06zM15.53,9.848v5.682L9.848,15.53L9.848,9.848h5.682zM40.152,9.848v5.682L34.47,15.53L34.47,9.848h5.682z"
+      android:fillColor="#4A4969"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_events_overview.xml b/app/src/main/res/layout/fragment_events_overview.xml
new file mode 100644
index 000000000..da51a06c4
--- /dev/null
+++ b/app/src/main/res/layout/fragment_events_overview.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/grey_light"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/generate_qr_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back"
+		app:title="[TBT] Veranstaltungen" />
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/qr_list"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_generate_qr_code.xml b/app/src/main/res/layout/item_generate_qr_code.xml
new file mode 100644
index 000000000..5f5f7bc28
--- /dev/null
+++ b/app/src/main/res/layout/item_generate_qr_code.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center_horizontal"
+	android:layout_marginVertical="@dimen/spacing_very_large"
+	android:gravity="center_horizontal">
+
+	<Button
+		android:id="@+id/qr_code_generate"
+		style="@style/NextStep.Button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/qr_code_erstellen" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_qr_code.xml b/app/src/main/res/layout/item_qr_code.xml
new file mode 100644
index 000000000..d6843ef02
--- /dev/null
+++ b/app/src/main/res/layout/item_qr_code.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_marginHorizontal="@dimen/spacing_medium_large"
+	android:layout_marginBottom="@dimen/spacing_medium_large"
+	android:layout_height="wrap_content">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginVertical="@dimen/spacing_large"
+		android:layout_marginStart="@dimen/spacing_large"
+		android:layout_marginEnd="@dimen/spacing_medium"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/ic_qr_code" />
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:orientation="vertical"
+			android:paddingHorizontal="@dimen/spacing_medium_large">
+
+			<TextView
+				android:id="@+id/qr_code_location"
+				style="@style/NextStep.Text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				tools:title="Sitzungsraum" />
+
+			<TextView
+				android:id="@+id/qr_code_name"
+				style="@style/NextStep.Text.Title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				tools:title="UB E21.7" />
+		</LinearLayout>
+
+		<ImageView
+			android:id="@+id/qr_code_delete"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/ic_delete" />
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_qr_code_empty_list.xml b/app/src/main/res/layout/item_qr_code_empty_list.xml
new file mode 100644
index 000000000..05191d2ac
--- /dev/null
+++ b/app/src/main/res/layout/item_qr_code_empty_list.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center"
+	android:gravity="center"
+	android:orientation="vertical"
+	android:padding="@dimen/spacing_enormous">
+
+	<View
+		android:layout_width="100dp"
+		android:layout_height="100dp"
+		android:layout_gravity="center_horizontal"
+		android:background="@color/grey_dark_lighter" />
+
+	<TextView
+		style="@style/NextStep.Text.Small.GreyDark"
+		android:layout_width="170dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal"
+		android:gravity="center"
+		android:paddingVertical="20dp"
+		android:text="@string/qr_code_empty_list"
+		android:textStyle="bold" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 41b54eec7..be1cd7ada 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,663 +1,663 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- App Name -->
-    <string name="app_name">"SwissCovid"</string>
+	<!-- App Name -->
+	<string name="app_name">"SwissCovid"</string>
 
-    <!-- App Name (unter Icon auf iOS) -->
-    <string name="CFBundleDisplayName">"SwissCovid"</string>
+	<!-- App Name (unter Icon auf iOS) -->
+	<string name="CFBundleDisplayName">"SwissCovid"</string>
 
-    <!-- Loading View: Erneut laden -->
-    <string name="loading_view_reload">"Reload"</string>
+	<!-- Loading View: Erneut laden -->
+	<string name="loading_view_reload">"Reload"</string>
 
-    <!-- Fehler Titel in Loading View -->
-    <string name="loading_view_error_title">"Error"</string>
+	<!-- Fehler Titel in Loading View -->
+	<string name="loading_view_error_title">"Error"</string>
 
-    <!-- Alert: Titel wenn die App muss geupdatet werden -->
-    <string name="force_update_title">"Update required"</string>
+	<!-- Alert: Titel wenn die App muss geupdatet werden -->
+	<string name="force_update_title">"Update required"</string>
 
-    <!-- Informieren: Weiter Button -->
-    <string name="inform_continue_button">"Continue"</string>
+	<!-- Informieren: Weiter Button -->
+	<string name="inform_continue_button">"Continue"</string>
 
-    <!-- Informieren: Senden Button -->
-    <string name="inform_send_button_title">"Send"</string>
+	<!-- Informieren: Senden Button -->
+	<string name="inform_send_button_title">"Send"</string>
 
-    <!-- Informieren: Danke -->
-    <string name="inform_send_thankyou">"Thank you"</string>
+	<!-- Informieren: Danke -->
+	<string name="inform_send_thankyou">"Thank you"</string>
 
-    <!-- Informieren: Danke Text -->
-    <string name="inform_send_thankyou_text">"The private keys generated by your app are sent.
+	<!-- Informieren: Danke Text -->
+	<string name="inform_send_thankyou_text">"The private keys generated by your app are sent.
 
 Thank you for helping to break the chain of infection."</string>
 
-    <!-- Informieren: Button Titel -->
-    <string name="inform_fertig_button_title">"Close"</string>
+	<!-- Informieren: Button Titel -->
+	<string name="inform_fertig_button_title">"Close"</string>
 
-    <!-- Titel auf Homescreen für Begegnungen -->
-    <string name="handshakes_title_homescreen">"Encounters"</string>
+	<!-- Titel auf Homescreen für Begegnungen -->
+	<string name="handshakes_title_homescreen">"Encounters"</string>
 
-    <!-- Abbrechen -->
-    <string name="cancel">"Cancel"</string>
+	<!-- Abbrechen -->
+	<string name="cancel">"Cancel"</string>
 
-    <!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
-    <string name="push_exposed_title">"New message"</string>
+	<!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
+	<string name="push_exposed_title">"New message"</string>
 
-    <!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
-    <string name="push_exposed_text">"Open the app to read the message"</string>
+	<!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
+	<string name="push_exposed_text">"Open the app to read the message"</string>
 
-    <!-- Okay Button Titel -->
-    <string name="android_button_ok">"OK"</string>
+	<!-- Okay Button Titel -->
+	<string name="android_button_ok">"OK"</string>
 
-    <!-- Onboarding: Weiter Button Titel -->
-    <string name="onboarding_continue_button">"Continue"</string>
+	<!-- Onboarding: Weiter Button Titel -->
+	<string name="onboarding_continue_button">"Continue"</string>
 
-    <!-- Onboarding: Fertig Button -->
-    <string name="onboarding_finish_button">"Finish"</string>
+	<!-- Onboarding: Fertig Button -->
+	<string name="onboarding_finish_button">"Finish"</string>
 
-    <!-- Unerwarteter Fehler -->
-    <string name="unexpected_error_title">"An unexpected error has occurred"</string>
+	<!-- Unerwarteter Fehler -->
+	<string name="unexpected_error_title">"An unexpected error has occurred"</string>
 
-    <!-- Bluetooth Fehlermeldung -->
-    <string name="bluetooth_turned_off">"The app is not working because Bluetooth is turned off"</string>
+	<!-- Bluetooth Fehlermeldung -->
+	<string name="bluetooth_turned_off">"The app is not working because Bluetooth is turned off"</string>
 
-    <!-- Bluetooth Permission Fehler -->
-    <string name="bluetooth_permission_turned_off">"The app is not working because Bluetooth is not permitted"</string>
+	<!-- Bluetooth Permission Fehler -->
+	<string name="bluetooth_permission_turned_off">"The app is not working because Bluetooth is not permitted"</string>
 
-    <!-- Permission Text für Bluetooth -->
-    <string name="NSBluetoothPeripheralUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
+	<!-- Permission Text für Bluetooth -->
+	<string name="NSBluetoothPeripheralUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
 
-    <!-- Permission Text für Bluetooth -->
-    <string name="NSBluetoothAlwaysUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
+	<!-- Permission Text für Bluetooth -->
+	<string name="NSBluetoothAlwaysUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
 
-    <!-- Inform: Titel der Code abschicken Seite -->
-    <string name="inform_code_title">"Enter the Covidcode"</string>
+	<!-- Inform: Titel der Code abschicken Seite -->
+	<string name="inform_code_title">"Enter the Covidcode"</string>
 
-    <!-- Inform: Code eingeben Subtext -->
-    <string name="inform_code_text">"Enter the Covidcode you have received."</string>
+	<!-- Inform: Code eingeben Subtext -->
+	<string name="inform_code_text">"Enter the Covidcode you have received."</string>
 
-    <!-- Inform: Code eingeben kein Code Button Text -->
-    <string name="inform_code_no_code">"Do you need help?"</string>
+	<!-- Inform: Code eingeben kein Code Button Text -->
+	<string name="inform_code_no_code">"Do you need help?"</string>
 
-    <!-- Titel des Bluetooth Control -->
-    <string name="tracing_setting_title">"Proximity tracing"</string>
+	<!-- Titel des Bluetooth Control -->
+	<string name="tracing_setting_title">"Proximity tracing"</string>
 
-    <!-- Text beim Bluetooth Control -->
-    <!-- Fuzzy -->
-    <string name="tracing_setting_text_ios">"COVID-19 Exposure Notifications"</string>
+	<!-- Text beim Bluetooth Control -->
+	<!-- Fuzzy -->
+	<string name="tracing_setting_text_ios">"COVID-19 Exposure Notifications"</string>
 
-    <!-- Bluetooth Control: Tracking deaktiviert -->
-    <string name="bluetooth_setting_tracking_inactive">"Proximity tracing deactivated"</string>
+	<!-- Bluetooth Control: Tracking deaktiviert -->
+	<string name="bluetooth_setting_tracking_inactive">"Proximity tracing deactivated"</string>
 
-    <!-- Titel auf Homescreen -->
-    <string name="reports_title_homescreen">"Reports"</string>
+	<!-- Titel auf Homescreen -->
+	<string name="reports_title_homescreen">"Reports"</string>
 
-    <!-- Keine Meldungen Titel -->
-    <string name="meldungen_no_meldungen_title">"No reports"</string>
+	<!-- Keine Meldungen Titel -->
+	<string name="meldungen_no_meldungen_title">"No reports"</string>
 
-    <!-- Push deaktiviert Titel -->
-    <string name="push_deactivated_title">"Messages deactivated"</string>
+	<!-- Push deaktiviert Titel -->
+	<string name="push_deactivated_title">"Messages deactivated"</string>
 
-    <!-- Push deaktiviert Text -->
-    <string name="push_deactivated_text">"Change the settings to receive information directly in the event of a report."</string>
+	<!-- Push deaktiviert Text -->
+	<string name="push_deactivated_text">"Change the settings to receive information directly in the event of a report."</string>
 
-    <!-- Titel im Meldung Detail -->
-    <string name="meldungen_meldung_title">"Possible infection"</string>
+	<!-- Titel im Meldung Detail -->
+	<string name="meldungen_meldung_title">"Possible infection"</string>
 
-    <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"An infection could have occurred"</string>
+	<!-- Text im Meldung Detail -->
+	<string name="meldungen_meldung_text">"An infection could have occurred"</string>
 
-    <!-- Titel ob Tracing aktiv -->
-    <string name="tracing_active_title">"App active"</string>
+	<!-- Titel ob Tracing aktiv -->
+	<string name="tracing_active_title">"App active"</string>
 
-    <!-- Text bei Tracing aktiv -->
-    <string name="tracing_active_text">"Encounters will be registered anonymously."</string>
+	<!-- Text bei Tracing aktiv -->
+	<string name="tracing_active_text">"Encounters will be registered anonymously."</string>
 
-    <!-- Android: Fehler Text bei Tracing -->
-    <string name="android_tracing_error_title">"Proximity tracing not active"</string>
+	<!-- Android: Fehler Text bei Tracing -->
+	<string name="android_tracing_error_title">"Proximity tracing not active"</string>
 
-    <!-- Fehlertitel mit Foreground Service Notification -->
-    <string name="android_foreground_service_notification_errors">"App currently unable to function properly"</string>
+	<!-- Fehlertitel mit Foreground Service Notification -->
+	<string name="android_foreground_service_notification_errors">"App currently unable to function properly"</string>
 
-    <!-- Titel der Nachricht, die auf Beta-Status hinweist -->
-    <string name="preview_warning_title">"Version preview"</string>
+	<!-- Titel der Nachricht, die auf Beta-Status hinweist -->
+	<string name="preview_warning_title">"Version preview"</string>
 
-    <!-- Text der Nachricht, die auf Beta-Status hinweist -->
-    <string name="preview_warning_text">"This app provides a preview of how the DP-3T works. It is not a functioning COVID-19 tracker."</string>
+	<!-- Text der Nachricht, die auf Beta-Status hinweist -->
+	<string name="preview_warning_text">"This app provides a preview of how the DP-3T works. It is not a functioning COVID-19 tracker."</string>
 
-    <!-- Debug: Label auf dem Button, der zum Debug-Screen führt -->
-    <string name="debug_settings_title">"Debug settings"</string>
+	<!-- Debug: Label auf dem Button, der zum Debug-Screen führt -->
+	<string name="debug_settings_title">"Debug settings"</string>
 
-    <!-- Debug: Titel für die Debug-Einstellungen zur Status-Überschreibung -->
-    <string name="debug_state_setting_title">"Overwrite app status"</string>
+	<!-- Debug: Titel für die Debug-Einstellungen zur Status-Überschreibung -->
+	<string name="debug_state_setting_title">"Overwrite app status"</string>
 
-    <!-- Debug: Erklärungstext für die Debug-Einstellungen zur Status-Überschreibung -->
-    <string name="debug_state_setting_text">"This setting overwrites the app's visual status. Proximity tracing functionality remains unaffected."</string>
+	<!-- Debug: Erklärungstext für die Debug-Einstellungen zur Status-Überschreibung -->
+	<string name="debug_state_setting_text">"This setting overwrites the app's visual status. Proximity tracing functionality remains unaffected."</string>
 
-    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Keine -->
-    <string name="debug_state_setting_option_none">"No overwrite"</string>
+	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Keine -->
+	<string name="debug_state_setting_option_none">"No overwrite"</string>
 
-    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Gesund -->
-    <string name="debug_state_setting_option_ok">"Healthy"</string>
+	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Gesund -->
+	<string name="debug_state_setting_option_ok">"Healthy"</string>
 
-    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_exposed">"Contact has tested positive"</string>
+	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Einem positiven Kontakt ausgesetzt -->
+	<string name="debug_state_setting_option_exposed">"Contact has tested positive"</string>
 
-    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Selbst positiv getestet -->
-    <string name="debug_state_setting_option_infected">"Reported yourself as positive"</string>
+	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Selbst positiv getestet -->
+	<string name="debug_state_setting_option_infected">"Reported yourself as positive"</string>
 
-    <!-- Debug: Titel für die Debug-Info zum Tracing-Status -->
-    <string name="debug_sdk_state_title">"SDK status"</string>
+	<!-- Debug: Titel für die Debug-Info zum Tracing-Status -->
+	<string name="debug_sdk_state_title">"SDK status"</string>
 
-    <!-- Debug: Erklärungstext für die Debug-Info zum Tracing-Status -->
-    <string name="debug_sdk_state_text">"Current status of DP-3T SDK"</string>
+	<!-- Debug: Erklärungstext für die Debug-Info zum Tracing-Status -->
+	<string name="debug_sdk_state_text">"Current status of DP-3T SDK"</string>
 
-    <!-- Debug: Bezeichnung für den letzen sync-Zeitpunkt -->
-    <string name="debug_sdk_state_last_synced">"Last synchronisation"</string>
+	<!-- Debug: Bezeichnung für den letzen sync-Zeitpunkt -->
+	<string name="debug_sdk_state_last_synced">"Last synchronisation"</string>
 
-    <!-- Debug: Bezeichnung für den Fall, bei dem der User selber als positiv getestet gemeldet wurde -->
-    <string name="debug_sdk_state_self_exposed">"Reported yourself"</string>
+	<!-- Debug: Bezeichnung für den Fall, bei dem der User selber als positiv getestet gemeldet wurde -->
+	<string name="debug_sdk_state_self_exposed">"Reported yourself"</string>
 
-    <!-- Debug: Bezeichnung für den Fall, bei dem ein Kontakt als positiv getestet gemeldet wurde -->
-    <string name="debug_sdk_state_contact_exposed">"Contact reported"</string>
+	<!-- Debug: Bezeichnung für den Fall, bei dem ein Kontakt als positiv getestet gemeldet wurde -->
+	<string name="debug_sdk_state_contact_exposed">"Contact reported"</string>
 
-    <!-- Debug-Status-Bezeichnung für boleschen Wert 'true' -->
-    <string name="debug_sdk_state_boolean_true">"Yes"</string>
+	<!-- Debug-Status-Bezeichnung für boleschen Wert 'true' -->
+	<string name="debug_sdk_state_boolean_true">"Yes"</string>
 
-    <!-- Debug-Status-Bezeichnung für boleschen Wert 'false' -->
-    <string name="debug_sdk_state_boolean_false">"No"</string>
+	<!-- Debug-Status-Bezeichnung für boleschen Wert 'false' -->
+	<string name="debug_sdk_state_boolean_false">"No"</string>
 
-    <!-- Debug: Button-Text für das Zurücksetzen des lokalen SDK Zustandes -->
-    <string name="debug_sdk_button_reset">"Reset SDK"</string>
+	<!-- Debug: Button-Text für das Zurücksetzen des lokalen SDK Zustandes -->
+	<string name="debug_sdk_button_reset">"Reset SDK"</string>
 
-    <!-- Tab-Titel -->
-    <string name="tab_tracing_title">"Proximity tracing"</string>
+	<!-- Tab-Titel -->
+	<string name="tab_tracing_title">"Proximity tracing"</string>
 
-    <!-- Titel auf Homescreen für Was tun Section -->
-    <string name="whattodo_title_symptoms">"Symptoms of the disease"</string>
+	<!-- Titel auf Homescreen für Was tun Section -->
+	<string name="whattodo_title_symptoms">"Symptoms of the disease"</string>
 
-    <!-- Subtitel auf Homescreen für Was Tun Section -->
-    <string name="whattodo_subtitle_symptoms">"What to do if …"</string>
+	<!-- Subtitel auf Homescreen für Was Tun Section -->
+	<string name="whattodo_subtitle_symptoms">"What to do if …"</string>
 
-    <!-- Titel auf Homescreen bei Was tun Section -->
-    <string name="whattodo_title_positivetest">"you test positive"</string>
+	<!-- Titel auf Homescreen bei Was tun Section -->
+	<string name="whattodo_title_positivetest">"you test positive"</string>
 
-    <!-- Subtitel auf Homescreen bei Was tun Section -->
-    <string name="whattodo_subtitle_positivetest">"What to do if …"</string>
+	<!-- Subtitel auf Homescreen bei Was tun Section -->
+	<string name="whattodo_subtitle_positivetest">"What to do if …"</string>
 
-    <!-- Informieren Detail: Subtitel -->
-    <string name="inform_detail_subtitle">"What to do if …"</string>
+	<!-- Informieren Detail: Subtitel -->
+	<string name="inform_detail_subtitle">"What to do if …"</string>
 
-    <!-- Informieren Detail: Titel -->
-    <string name="inform_detail_title">"you test positive?"</string>
+	<!-- Informieren Detail: Titel -->
+	<string name="inform_detail_title">"you test positive?"</string>
 
-    <!-- Inform Detail: Weisse Box Subtitel -->
-    <string name="inform_detail_box_subtitle">"With the Covidcode"</string>
+	<!-- Inform Detail: Weisse Box Subtitel -->
+	<string name="inform_detail_box_subtitle">"With the Covidcode"</string>
 
-    <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Break the chains of infection"</string>
+	<!-- Inform Detai Weisse Box Titel -->
+	<string name="inform_detail_box_title">"Break the chains of infection"</string>
 
-    <!-- Inform Detail Weisse Box Button -->
-    <string name="inform_detail_box_button">"Enter the Covidcode"</string>
+	<!-- Inform Detail Weisse Box Button -->
+	<string name="inform_detail_box_button">"Enter the Covidcode"</string>
 
-    <!-- Informieren Detail Weisse Box Text -->
-    <string name="inform_detail_box_text">"By entering the Covidcode, you tell the app that you have tested positive for the coronavirus."</string>
+	<!-- Informieren Detail Weisse Box Text -->
+	<string name="inform_detail_box_text">"By entering the Covidcode, you tell the app that you have tested positive for the coronavirus."</string>
 
-    <!-- Symptome Detail Subtitel -->
-    <string name="symptom_detail_subtitle">"What do I do if …"</string>
+	<!-- Symptome Detail Subtitel -->
+	<string name="symptom_detail_subtitle">"What do I do if …"</string>
 
-    <!-- Symptom Detail Titel -->
-    <string name="symptom_detail_title">"I feel ill?"</string>
+	<!-- Symptom Detail Titel -->
+	<string name="symptom_detail_title">"I feel ill?"</string>
 
-    <!-- Symptom Detail Weisse Box Subtitel -->
-    <string name="symptom_detail_box_subtitle">"If you experience COVID-19 symptoms…"</string>
+	<!-- Symptom Detail Weisse Box Subtitel -->
+	<string name="symptom_detail_box_subtitle">"If you experience COVID-19 symptoms…"</string>
 
-    <!-- Symptom Detail Weisse Box Titel -->
-    <string name="symptom_detail_box_title">"Getting tested"</string>
+	<!-- Symptom Detail Weisse Box Titel -->
+	<string name="symptom_detail_box_title">"Getting tested"</string>
 
-    <!-- Symptom Detail Weisse Box Button -->
-    <string name="symptom_detail_box_button">"Further information"</string>
+	<!-- Symptom Detail Weisse Box Button -->
+	<string name="symptom_detail_box_button">"Further information"</string>
 
-    <!-- Symptom Detail Weisse Box Text -->
-    <string name="symptom_detail_box_text">"The FOPH recommends that anyone with COVID-19 symptoms should get tested. Call your doctor or your healthcare facility to schedule an appointment."</string>
+	<!-- Symptom Detail Weisse Box Text -->
+	<string name="symptom_detail_box_text">"The FOPH recommends that anyone with COVID-19 symptoms should get tested. Call your doctor or your healthcare facility to schedule an appointment."</string>
 
-    <!-- Informieren Titel in NavigationBar/Toolbar -->
-    <string name="inform_detail_navigation_title">"Tested positive"</string>
+	<!-- Informieren Titel in NavigationBar/Toolbar -->
+	<string name="inform_detail_navigation_title">"Tested positive"</string>
 
-    <!-- Symptome Detail: NavigationBar/Toolbar Titel -->
-    <string name="symptom_detail_navigation_title">"Symptoms"</string>
-    <string name="tracing_turned_off_title">"Proximity tracing deactivated"</string>
-    <string name="tracing_turned_off_text">"Activate proximity tracing so that the app works."</string>
-    <string name="bluetooth_turned_off_title">"Bluetooth off"</string>
-    <string name="bluetooth_turned_off_text">"Turn on Bluetooth on your device so that proximity tracing works."</string>
-    <string name="bluetooth_turn_on_button_title">"Turn on Bluetooth"</string>
-    <string name="bluetooth_permission_error_title">"Bluetooth use declined"</string>
-    <string name="bluetooth_permission_error_text">"Enable the use of Bluetooth so that proximity tracing works."</string>
-    <string name="push_open_settings_button">"Change settings"</string>
+	<!-- Symptome Detail: NavigationBar/Toolbar Titel -->
+	<string name="symptom_detail_navigation_title">"Symptoms"</string>
+	<string name="tracing_turned_off_title">"Proximity tracing deactivated"</string>
+	<string name="tracing_turned_off_text">"Activate proximity tracing so that the app works."</string>
+	<string name="bluetooth_turned_off_title">"Bluetooth off"</string>
+	<string name="bluetooth_turned_off_text">"Turn on Bluetooth on your device so that proximity tracing works."</string>
+	<string name="bluetooth_turn_on_button_title">"Turn on Bluetooth"</string>
+	<string name="bluetooth_permission_error_title">"Bluetooth use declined"</string>
+	<string name="bluetooth_permission_error_text">"Enable the use of Bluetooth so that proximity tracing works."</string>
+	<string name="push_open_settings_button">"Change settings"</string>
 
-    <!-- Meldungen Detail: Subtitel wenn keine Meldungen -->
-    <string name="meldungen_no_meldungen_subtitle">"No potential infections have been reported"</string>
+	<!-- Meldungen Detail: Subtitel wenn keine Meldungen -->
+	<string name="meldungen_no_meldungen_subtitle">"No potential infections have been reported"</string>
 
-    <!-- Keine Meldungen Weisse Box Titel -->
-    <string name="no_meldungen_box_title">"Protect yourself"</string>
+	<!-- Keine Meldungen Weisse Box Titel -->
+	<string name="no_meldungen_box_title">"Protect yourself"</string>
 
-    <!-- Keine Meldungen Weisse Box Subtitel -->
-    <string name="no_meldungen_box_subtitle">"What should I do?"</string>
+	<!-- Keine Meldungen Weisse Box Subtitel -->
+	<string name="no_meldungen_box_subtitle">"What should I do?"</string>
 
-    <!-- Keine Meldungen Weisse Box Text -->
-    <string name="no_meldungen_box_text">"Follow the government recommendations on hygiene and social distancing."</string>
+	<!-- Keine Meldungen Weisse Box Text -->
+	<string name="no_meldungen_box_text">"Follow the government recommendations on hygiene and social distancing."</string>
 
-    <!-- Meldung Detail: Positiv Getestet Titel -->
-    <string name="meldung_detail_positive_tested_title">"Tested positive"</string>
+	<!-- Meldung Detail: Positiv Getestet Titel -->
+	<string name="meldung_detail_positive_tested_title">"Tested positive"</string>
 
-    <!-- Meldung Detail: Positiv Getestet Subtitel -->
-    <string name="meldung_detail_positive_tested_subtitle">"You have tested positive for the coronavirus."</string>
+	<!-- Meldung Detail: Positiv Getestet Subtitel -->
+	<string name="meldung_detail_positive_tested_subtitle">"You have tested positive for the coronavirus."</string>
 
-    <!-- Meldung Detail Positiv Getestet Weisse Box Subtitel -->
-    <string name="meldung_detail_positive_test_box_subtitle">"What should I do?"</string>
+	<!-- Meldung Detail Positiv Getestet Weisse Box Subtitel -->
+	<string name="meldung_detail_positive_test_box_subtitle">"What should I do?"</string>
 
-    <!-- Meldung Detail Positiv Getestet Weisse Box Titel -->
-    <string name="meldung_detail_positive_test_box_title">"Isolation"</string>
+	<!-- Meldung Detail Positiv Getestet Weisse Box Titel -->
+	<string name="meldung_detail_positive_test_box_title">"Isolation"</string>
 
-    <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
-    <string name="meldung_detail_positive_test_box_text">"Follow the instructions you receive on isolation."</string>
-    <string name="tracing_ended_title">"Tracing deactivated"</string>
-    <string name="tracing_ended_text">"No further encounters registered"</string>
-    <string name="exposed_info_contact_hotline">"Contact the"</string>
-    <string name="meldung_homescreen_positive_info_line1">"Follow the"</string>
-    <string name="meldung_homescreen_positive_info_line2">"Instructions on self-isolation"</string>
+	<!-- Meldung Detail Positiv Getestet Weisse Box Text -->
+	<string name="meldung_detail_positive_test_box_text">"Follow the instructions you receive on isolation."</string>
+	<string name="tracing_ended_title">"Tracing deactivated"</string>
+	<string name="tracing_ended_text">"No further encounters registered"</string>
+	<string name="exposed_info_contact_hotline">"Contact the"</string>
+	<string name="meldung_homescreen_positive_info_line1">"Follow the"</string>
+	<string name="meldung_homescreen_positive_info_line2">"Instructions on self-isolation"</string>
 
-    <!-- Meldung Detail Exposed Neue Meldung -->
-    <string name="meldung_detail_exposed_new_meldung">"New report"</string>
+	<!-- Meldung Detail Exposed Neue Meldung -->
+	<string name="meldung_detail_exposed_new_meldung">"New report"</string>
 
-    <!-- Meldung Detail Exposed Titel -->
-    <string name="meldung_detail_exposed_title">"Potential infection"</string>
-    <string name="meldung_homescreen_positiv_title">"Tested positive"</string>
+	<!-- Meldung Detail Exposed Titel -->
+	<string name="meldung_detail_exposed_title">"Potential infection"</string>
+	<string name="meldung_homescreen_positiv_title">"Tested positive"</string>
 
-    <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"An infection could have occurred"</string>
+	<!-- Meldung Detail Exposed Subtitel -->
+	<string name="meldung_detail_exposed_subtitle">"An infection could have occurred"</string>
 
-    <!-- Meldung auf Homescreen: Positiv getestet -->
-    <string name="meldung_homescreen_positiv_text">"You have tested positive for the coronavirus."</string>
+	<!-- Meldung auf Homescreen: Positiv getestet -->
+	<string name="meldung_homescreen_positiv_text">"You have tested positive for the coronavirus."</string>
 
-    <!-- Debug Screen: Onboarding Reset Button -->
-    <string name="reset_onboarding">"Reset onboarding"</string>
+	<!-- Debug Screen: Onboarding Reset Button -->
+	<string name="reset_onboarding">"Reset onboarding"</string>
 
-    <!-- Heute -->
-    <string name="date_today">"Today"</string>
+	<!-- Heute -->
+	<string name="date_today">"Today"</string>
 
-    <!-- Meldung Detail: Vor wievielen Tagen {COUNT} wird durch Zahl ersetzt -->
-    <string name="date_days_ago">"{COUNT} days ago"</string>
+	<!-- Meldung Detail: Vor wievielen Tagen {COUNT} wird durch Zahl ersetzt -->
+	<string name="date_days_ago">"{COUNT} days ago"</string>
 
-    <!-- Meldungen Detail: Weisse Box Titel -->
-    <string name="meldungen_detail_call">"Call us"</string>
+	<!-- Meldungen Detail: Weisse Box Titel -->
+	<string name="meldungen_detail_call">"Call us"</string>
 
-    <!-- Meldungen Detail Text Weisse Box -->
-    <string name="meldungen_detail_call_text">"SwissCovid infoline"</string>
+	<!-- Meldungen Detail Text Weisse Box -->
+	<string name="meldungen_detail_call_text">"SwissCovid infoline"</string>
 
-    <!-- Meldungen Detail Weisse Box Button -->
-    <string name="meldungen_detail_call_button">"Call now"</string>
+	<!-- Meldungen Detail Weisse Box Button -->
+	<string name="meldungen_detail_call_button">"Call now"</string>
 
-    <!-- Meldungen Detail Weisse Box Titel der Erklärungen -->
-    <string name="meldungen_detail_explanation_title">"Be careful!"</string>
+	<!-- Meldungen Detail Weisse Box Titel der Erklärungen -->
+	<string name="meldungen_detail_explanation_title">"Be careful!"</string>
 
-    <!-- Meldungen Detail Weisse Box Erklärungstext 1 -->
-    <string name="meldungen_detail_explanation_text1">"You could be infectious without realising it."</string>
+	<!-- Meldungen Detail Weisse Box Erklärungstext 1 -->
+	<string name="meldungen_detail_explanation_text1">"You could be infectious without realising it."</string>
 
-    <!-- Meldungen Detail: Weisse Box Erklärtext 2 -->
-    <string name="meldungen_detail_explanation_text2">"Please protect your family, your friends and those around you. Avoid contacts for up to 10 days after a possible infection."</string>
+	<!-- Meldungen Detail: Weisse Box Erklärtext 2 -->
+	<string name="meldungen_detail_explanation_text2">"Please protect your family, your friends and those around you. Avoid contacts for up to 10 days after a possible infection."</string>
 
-    <!-- Meldungen Detail: Weisse Box Text -->
-    <string name="meldungen_detail_guard_text">"If you have any questions:
+	<!-- Meldungen Detail: Weisse Box Text -->
+	<string name="meldungen_detail_guard_text">"If you have any questions:
 Infoline SwissCovid
 +41 58 387 77 78"</string>
 
-    <!-- Meldungen Detail Button Weisse Box -->
-    <string name="meldungen_detail_call_again_button">"Call again"</string>
+	<!-- Meldungen Detail Button Weisse Box -->
+	<string name="meldungen_detail_call_again_button">"Call again"</string>
 
-    <!-- Meldungen Detail: Weisse Box Anruf Zeitpunkt -->
-    <string name="meldungen_detail_call_last_call">"Last call: {DATE}"</string>
+	<!-- Meldungen Detail: Weisse Box Anruf Zeitpunkt -->
+	<string name="meldungen_detail_call_last_call">"Last call: {DATE}"</string>
 
-    <!-- Subtitel im Onboarding erste Seite -->
-    <string name="app_subtitle">"Subtitle"</string>
+	<!-- Subtitel im Onboarding erste Seite -->
+	<string name="app_subtitle">"Subtitle"</string>
 
-    <!-- Onboarding: Titel oben -->
-    <string name="onboarding_prinzip_heading">"The goal"</string>
+	<!-- Onboarding: Titel oben -->
+	<string name="onboarding_prinzip_heading">"The goal"</string>
 
-    <!-- Onboarding: Titel -->
-    <string name="onboarding_prinzip_title">"Staying one step ahead of the virus"</string>
+	<!-- Onboarding: Titel -->
+	<string name="onboarding_prinzip_title">"Staying one step ahead of the virus"</string>
 
-    <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text1">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
+	<!-- Onboarding Prinzip Text -->
+	<string name="onboarding_prinzip_text1">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
 
-    <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"The app tells you if you might have been exposed to the coronavirus."</string>
+	<!-- Onboarding Prinzip Text -->
+	<string name="onboarding_prinzip_text2">"The app tells you if you might have been exposed to the coronavirus."</string>
 
-    <!-- Onboarding Privacy: Titel oben -->
-    <string name="onboarding_privacy_heading">"Privacy by design"</string>
+	<!-- Onboarding Privacy: Titel oben -->
+	<string name="onboarding_privacy_heading">"Privacy by design"</string>
 
-    <!-- Onboarding Privacy: Titel -->
-    <string name="onboarding_privacy_title">"Protection of privacy"</string>
+	<!-- Onboarding Privacy: Titel -->
+	<string name="onboarding_privacy_title">"Protection of privacy"</string>
 
-    <!-- Onboarding Privacy: Text -->
-    <string name="onboarding_privacy_text1">"Devices only exchange random IDs. The app does not gather location data or data on your identity."</string>
+	<!-- Onboarding Privacy: Text -->
+	<string name="onboarding_privacy_text1">"Devices only exchange random IDs. The app does not gather location data or data on your identity."</string>
 
-    <!-- Onboarding Privacy: Text -->
-    <string name="onboarding_privacy_text2">"The random IDs are stored on your device for 14 days and then deleted."</string>
+	<!-- Onboarding Privacy: Text -->
+	<string name="onboarding_privacy_text2">"The random IDs are stored on your device for 14 days and then deleted."</string>
 
-    <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"How does the app work?"</string>
+	<!-- Onboarding Begegnungen: Titel oben -->
+	<string name="onboarding_begegnungen_heading">"How does the app work?"</string>
 
-    <!-- Onboarding Begegnungen: Titel -->
-    <string name="onboarding_begegnungen_title">"Recognising encounters using Bluetooth"</string>
+	<!-- Onboarding Begegnungen: Titel -->
+	<string name="onboarding_begegnungen_title">"Recognising encounters using Bluetooth"</string>
 
-    <!-- Onboarding Begegnungen: Text -->
-    <string name="onboarding_begegnungen_text1">"The app automatically recognises when two users have been in close proximity for a certain time."</string>
+	<!-- Onboarding Begegnungen: Text -->
+	<string name="onboarding_begegnungen_text1">"The app automatically recognises when two users have been in close proximity for a certain time."</string>
 
-    <!-- Onboarding Begegnungen: Text -->
-    <string name="onboarding_begegnungen_text2">"It uses Bluetooth Low Energy (BLE) to do this. No GPS, mobile, Wi-Fi or other location data."</string>
+	<!-- Onboarding Begegnungen: Text -->
+	<string name="onboarding_begegnungen_text2">"It uses Bluetooth Low Energy (BLE) to do this. No GPS, mobile, Wi-Fi or other location data."</string>
 
-    <!-- Onboarding Meldung: Text oben -->
-    <string name="onboarding_meldung_heading">"What does the app do?"</string>
+	<!-- Onboarding Meldung: Text oben -->
+	<string name="onboarding_meldung_heading">"What does the app do?"</string>
 
-    <!-- Onboarding Meldung: Titel -->
-    <string name="onboarding_meldung_title">"Report of potential infection"</string>
+	<!-- Onboarding Meldung: Titel -->
+	<string name="onboarding_meldung_title">"Report of potential infection"</string>
 
-    <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"The app tells you if you might have been exposed to the coronavirus."</string>
+	<!-- Onboarding Meldung: Text -->
+	<string name="onboarding_meldung_text1">"The app tells you if you might have been exposed to the coronavirus."</string>
 
-    <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text2">"By responding appropriately, you can break the chain of infection and protect other people."</string>
+	<!-- Onboarding Meldung: Text -->
+	<string name="onboarding_meldung_text2">"By responding appropriately, you can break the chain of infection and protect other people."</string>
 
-    <!-- Onboarding Bluetooth: Titel -->
-    <string name="onboarding_bluetooth_title">"Enable Bluetooth"</string>
+	<!-- Onboarding Bluetooth: Titel -->
+	<string name="onboarding_bluetooth_title">"Enable Bluetooth"</string>
 
-    <!-- Onboarding Bluetooth: Text -->
-    <string name="onboarding_bluetooth_text">"In order to use the app, you must enable Bluetooth."</string>
+	<!-- Onboarding Bluetooth: Text -->
+	<string name="onboarding_bluetooth_text">"In order to use the app, you must enable Bluetooth."</string>
 
-    <!-- Onboarding Bluetooth: Button -->
-    <string name="onboarding_bluetooth_button">"Enable Bluetooth"</string>
+	<!-- Onboarding Bluetooth: Button -->
+	<string name="onboarding_bluetooth_button">"Enable Bluetooth"</string>
 
-    <!-- Onboarding: Untetitel unten -->
-    <string name="onboarding_good_to_know">"Good to know"</string>
+	<!-- Onboarding: Untetitel unten -->
+	<string name="onboarding_good_to_know">"Good to know"</string>
 
-    <!-- Onboarding Bluetooth: Titel unten -->
-    <string name="onboarding_bluetooth_gtk_title1">"You remain anonymous"</string>
+	<!-- Onboarding Bluetooth: Titel unten -->
+	<string name="onboarding_bluetooth_gtk_title1">"You remain anonymous"</string>
 
-    <!-- Onboarding Bluetooth: Text unten -->
-    <string name="onboarding_bluetooth_gtk_text1">"No personal data is visible via Bluetooth."</string>
+	<!-- Onboarding Bluetooth: Text unten -->
+	<string name="onboarding_bluetooth_gtk_text1">"No personal data is visible via Bluetooth."</string>
 
-    <!-- Onboarding Bluetooth: Titel unten -->
-    <string name="onboarding_bluetooth_gtk_title2">"Minor increase in battery usage"</string>
+	<!-- Onboarding Bluetooth: Titel unten -->
+	<string name="onboarding_bluetooth_gtk_title2">"Minor increase in battery usage"</string>
 
-    <!-- Onboarding Bluetooth: Text unten -->
-    <string name="onboarding_bluetooth_gtk_text2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
+	<!-- Onboarding Bluetooth: Text unten -->
+	<string name="onboarding_bluetooth_gtk_text2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
 
-    <!-- Onboarding Mitteilungen: Titel -->
-    <string name="onboarding_push_title">"Allow messages"</string>
+	<!-- Onboarding Mitteilungen: Titel -->
+	<string name="onboarding_push_title">"Allow messages"</string>
 
-    <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"In order to receive notifications from the app, you must enable messages."</string>
+	<!-- Onboarding Mitteilungen: Text -->
+	<string name="onboarding_push_text">"In order to receive notifications from the app, you must enable messages."</string>
 
-    <!-- Onboarding Mitteilungen: Button -->
-    <string name="onboarding_push_button">"Enable messages"</string>
+	<!-- Onboarding Mitteilungen: Button -->
+	<string name="onboarding_push_button">"Enable messages"</string>
 
-    <!-- Onboarding Mitteilungen: Titel Unten -->
-    <string name="onboarding_push_gtk_title1">"Notified immediately"</string>
+	<!-- Onboarding Mitteilungen: Titel Unten -->
+	<string name="onboarding_push_gtk_title1">"Notified immediately"</string>
 
-    <!-- Onboarding Mitteilungen: Text unten -->
-    <string name="onboarding_push_gtk_text1">"In the event of a potential infection, you will receive a message on the lock screen."</string>
+	<!-- Onboarding Mitteilungen: Text unten -->
+	<string name="onboarding_push_gtk_text1">"In the event of a potential infection, you will receive a message on the lock screen."</string>
 
-    <!-- Code senden: Abschluss Gute Besserung -->
-    <string name="inform_send_getwell_title">"Get well soon!"</string>
+	<!-- Code senden: Abschluss Gute Besserung -->
+	<string name="inform_send_getwell_title">"Get well soon!"</string>
 
-    <!-- Code senden: Abschluss Gute Besserung -->
-    <string name="inform_send_getwell_text">"Get well soon! 
+	<!-- Code senden: Abschluss Gute Besserung -->
+	<string name="inform_send_getwell_text">"Get well soon!
 
 Follow the instructions  you have received on isolation."</string>
 
-    <!-- Titel auf dem letzen Onboarding Screen -->
-    <string name="onboarding_go_title">"The app is ready to go"</string>
+	<!-- Titel auf dem letzen Onboarding Screen -->
+	<string name="onboarding_go_title">"The app is ready to go"</string>
 
-    <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Thank you for helping to break the chain of infection."</string>
+	<!-- Text auf dem letzten Onboarding Screen -->
+	<string name="onboarding_go_text">"Thank you for helping to break the chain of infection."</string>
 
-    <!-- Button-Label auf dem letzten Onboarding screen -->
-    <string name="onboarding_go_button">"Start"</string>
+	<!-- Button-Label auf dem letzten Onboarding screen -->
+	<string name="onboarding_go_button">"Start"</string>
 
-    <!-- Homescreen: Titel bei Fehler mit Daten -->
-    <string name="homescreen_meldung_data_outdated_title">"No current data"</string>
+	<!-- Homescreen: Titel bei Fehler mit Daten -->
+	<string name="homescreen_meldung_data_outdated_title">"No current data"</string>
 
-    <!-- Homescreen: Text bei Fehler mit Daten -->
-    <string name="homescreen_meldung_data_outdated_text">"It has not been possible to synchronise reports for some time. Please check that your device is connected to the internet."</string>
+	<!-- Homescreen: Text bei Fehler mit Daten -->
+	<string name="homescreen_meldung_data_outdated_text">"It has not been possible to synchronise reports for some time. Please check that your device is connected to the internet."</string>
 
-    <!-- Homescreen: Button Titel -->
-    <string name="homescreen_meldung_data_outdated_retry_button">"Retry"</string>
+	<!-- Homescreen: Button Titel -->
+	<string name="homescreen_meldung_data_outdated_retry_button">"Retry"</string>
 
-    <!-- Titel Fehlermeldung für ungültigen Code -->
-    <string name="inform_code_invalid_title">"Code invalid"</string>
+	<!-- Titel Fehlermeldung für ungültigen Code -->
+	<string name="inform_code_invalid_title">"Code invalid"</string>
 
-    <!-- Fehlermeldung Subtitle ungültiger Code -->
-    <string name="inform_code_invalid_subtitle">"If you have any problems, call the office that gave you the Covidcode."</string>
+	<!-- Fehlermeldung Subtitle ungültiger Code -->
+	<string name="inform_code_invalid_subtitle">"If you have any problems, call the office that gave you the Covidcode."</string>
 
-    <!-- Datum: Vor 1 Tag -->
-    <string name="date_one_day_ago">"1 day ago"</string>
+	<!-- Datum: Vor 1 Tag -->
+	<string name="date_one_day_ago">"1 day ago"</string>
 
-    <!-- Meldungen Detail: Titel -->
-    <string name="meldung_detail_new_contact_title">"Possible infection"</string>
+	<!-- Meldungen Detail: Titel -->
+	<string name="meldung_detail_new_contact_title">"Possible infection"</string>
 
-    <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"An infection could have occurred"</string>
+	<!-- Meldungen Detail: Text -->
+	<string name="meldung_detail_new_contact_subtitle">"An infection could have occurred"</string>
 
-    <!-- Fehler mit Uhrzeit Titel -->
-    <string name="time_inconsistency_title">"Time error"</string>
+	<!-- Fehler mit Uhrzeit Titel -->
+	<string name="time_inconsistency_title">"Time error"</string>
 
-    <!-- Fehler mit Uhrzeit Text -->
-    <string name="time_inconsistency_text">"The time must be set correctly for proximity tracing to work."</string>
+	<!-- Fehler mit Uhrzeit Text -->
+	<string name="time_inconsistency_text">"The time must be set correctly for proximity tracing to work."</string>
 
-    <!-- Begegnungen: Neustart Titel -->
-    <string name="begegnungen_restart_error_title">"Restart required"</string>
+	<!-- Begegnungen: Neustart Titel -->
+	<string name="begegnungen_restart_error_title">"Restart required"</string>
 
-    <!-- Begegnungen: Neustart Text -->
-    <string name="begegnungen_restart_error_text">"An unexpected error has occurred. Restart your device."</string>
+	<!-- Begegnungen: Neustart Text -->
+	<string name="begegnungen_restart_error_text">"An unexpected error has occurred. Restart your device."</string>
 
-    <!-- Fehler Titel für Hintergrund-Fehler -->
-    <string name="meldungen_background_error_title">"Background update deactivated."</string>
+	<!-- Fehler Titel für Hintergrund-Fehler -->
+	<string name="meldungen_background_error_title">"Background update deactivated."</string>
 
-    <!-- Text für Hintergrund Fehler -->
-    <string name="meldungen_background_error_text">"Go to \"Settings &gt; General &gt; Background App Refresh\" and ensure that \"Wi-Fi &amp; Mobile Data\" is selected. Background App Refresh can then be activated individually for each app."</string>
+	<!-- Text für Hintergrund Fehler -->
+	<string name="meldungen_background_error_text">"Go to \"Settings &gt; General &gt; Background App Refresh\" and ensure that \"Wi-Fi &amp; Mobile Data\" is selected. Background App Refresh can then be activated individually for each app."</string>
 
-    <!-- Button Titel für Hintergrundfehler beheben -->
-    <string name="meldungen_background_error_button">"Change settings"</string>
+	<!-- Button Titel für Hintergrundfehler beheben -->
+	<string name="meldungen_background_error_button">"Change settings"</string>
 
-    <!-- Default message for force update -->
-    <string name="force_update_text">"Install the new version of the app so that proximity tracing works."</string>
+	<!-- Default message for force update -->
+	<string name="force_update_text">"Install the new version of the app so that proximity tracing works."</string>
 
-    <!-- Ignorieren Button Titel -->
-    <string name="meldung_in_app_alert_ignore_button">"Ignore"</string>
+	<!-- Ignorieren Button Titel -->
+	<string name="meldung_in_app_alert_ignore_button">"Ignore"</string>
 
-    <!-- Button Titel -->
-    <string name="meldung_in_app_alert_accept_button">"To notifications"</string>
+	<!-- Button Titel -->
+	<string name="meldung_in_app_alert_accept_button">"To notifications"</string>
 
-    <!-- Meldungen Detail: Button Titel -->
-    <string name="meldungen_detail_call_again">"Call again"</string>
+	<!-- Meldungen Detail: Button Titel -->
+	<string name="meldungen_detail_call_again">"Call again"</string>
 
-    <!-- Fehlernachricht für Netzwerkfehler -->
-    <string name="network_error">"Please check your internet connection"</string>
+	<!-- Fehlernachricht für Netzwerkfehler -->
+	<string name="network_error">"Please check your internet connection"</string>
 
-    <!-- Unerwarteter Fehler, mit Aufforderung Aktion erneut zu versuchen -->
-    <string name="unexpected_error_with_retry">"An unexpected error has occurred. Please retry."</string>
+	<!-- Unerwarteter Fehler, mit Aufforderung Aktion erneut zu versuchen -->
+	<string name="unexpected_error_with_retry">"An unexpected error has occurred. Please retry."</string>
 
-    <!-- VoiceOver: Datum -->
-    <string name="accessibility_date">"Date"</string>
+	<!-- VoiceOver: Datum -->
+	<string name="accessibility_date">"Date"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_1nd">"First"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_1nd">"First"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_2nd">"Second"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_2nd">"Second"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_3nd">"Third"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_3nd">"Third"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_4nd">"Fourth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_4nd">"Fourth"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_5nd">"Fifth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_5nd">"Fifth"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_6nd">"Sixth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_6nd">"Sixth"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_7nd">"Seventh"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_7nd">"Seventh"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_8nd">"Eighth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_8nd">"Eighth"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_9nd">"Ninth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_9nd">"Ninth"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_10nd">"Tenth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_10nd">"Tenth"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_11nd">"Eleventh"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_11nd">"Eleventh"</string>
 
-    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-    <string name="accessibility_12nd">"Twelfth"</string>
+	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+	<string name="accessibility_12nd">"Twelfth"</string>
 
-    <!-- Voiceover: Hilfetext bei Codeeingabe -->
-    <!-- Fuzzy -->
-    <string name="accessibility_code_button_disabled_hint">"Please enter the code in full, then press button."</string>
+	<!-- Voiceover: Hilfetext bei Codeeingabe -->
+	<!-- Fuzzy -->
+	<string name="accessibility_code_button_disabled_hint">"Please enter the code in full, then press button."</string>
 
-    <!-- Fehler: Standortinformationen / Bluetooth -->
-    <!-- Fuzzy -->
-    <string name="android_foreground_service_notification_error_location_service">"On Android devices, Bluetooth depends on location sharing. This means the location function must be enabled even though the app never accesses your location."</string>
+	<!-- Fehler: Standortinformationen / Bluetooth -->
+	<!-- Fuzzy -->
+	<string name="android_foreground_service_notification_error_location_service">"On Android devices, Bluetooth depends on location sharing. This means the location function must be enabled even though the app never accesses your location."</string>
 
-    <!-- Location Services ausgeschaltet Titel -->
-    <!-- Fuzzy -->
-    <string name="android_error_location_services_title">"Location disabled"</string>
+	<!-- Location Services ausgeschaltet Titel -->
+	<!-- Fuzzy -->
+	<string name="android_error_location_services_title">"Location disabled"</string>
 
-    <!-- Location Services ausgeschaltet Button -->
-    <!-- Fuzzy -->
-    <string name="android_error_location_services_button">"Enable location"</string>
+	<!-- Location Services ausgeschaltet Button -->
+	<!-- Fuzzy -->
+	<string name="android_error_location_services_button">"Enable location"</string>
 
-    <!-- Information Button in the navigation bar -->
-    <string name="accessibility_info_button">"Information"</string>
+	<!-- Information Button in the navigation bar -->
+	<string name="accessibility_info_button">"Information"</string>
 
-    <!-- Synchronisations-Fehler Titel -->
-    <string name="sync_warning_notification_title">"Synchronise the app"</string>
+	<!-- Synchronisations-Fehler Titel -->
+	<string name="sync_warning_notification_title">"Synchronise the app"</string>
 
-    <!-- Synchronisations-Fehler Text -->
-    <string name="sync_warning_notification_text">"Open the app to check the list of random IDs reported."</string>
+	<!-- Synchronisations-Fehler Text -->
+	<string name="sync_warning_notification_text">"Open the app to check the list of random IDs reported."</string>
 
-    <!-- Meldungen Detail: Button bei Vollansicht -->
-    <string name="meldung_animation_continue_button">"Continue"</string>
+	<!-- Meldungen Detail: Button bei Vollansicht -->
+	<string name="meldung_animation_continue_button">"Continue"</string>
 
-    <!-- Titel Impressum Menu -->
-    <string name="menu_impressum">"Imprint"</string>
+	<!-- Titel Impressum Menu -->
+	<string name="menu_impressum">"Imprint"</string>
 
-    <!-- Begegnungen: FAQ Titel -->
-    <string name="begegnung_detail_faq1_title">"What is an encounter?"</string>
+	<!-- Begegnungen: FAQ Titel -->
+	<string name="begegnung_detail_faq1_title">"What is an encounter?"</string>
 
-    <!-- Begegnungen: FAQ Text -->
-    <string name="begegnung_detail_faq1_text">"If smartphones with the app are in close proximity for a certain time, this is registered on your device as an encounter."</string>
+	<!-- Begegnungen: FAQ Text -->
+	<string name="begegnung_detail_faq1_text">"If smartphones with the app are in close proximity for a certain time, this is registered on your device as an encounter."</string>
 
-    <!-- Begegnungen: FAQ Titel -->
-    <string name="begegnung_detail_faq2_title">"Is my data secure?"</string>
+	<!-- Begegnungen: FAQ Titel -->
+	<string name="begegnung_detail_faq2_title">"Is my data secure?"</string>
 
-    <!-- Begegnungen: FAQ Text -->
-    <string name="begegnung_detail_faq2_text">"In the event of an encounter, only random IDs are exchanged. 
+	<!-- Begegnungen: FAQ Text -->
+	<string name="begegnung_detail_faq2_text">"In the event of an encounter, only random IDs are exchanged.
 
 They are saved locally on the smartphones and then deleted 14 days later."</string>
 
-    <!-- Begegnungen: FAQ Titel -->
-    <string name="begegnungen_detail_faq3_title">"Does Bluetooth have to be turned on all the time?"</string>
+	<!-- Begegnungen: FAQ Titel -->
+	<string name="begegnungen_detail_faq3_title">"Does Bluetooth have to be turned on all the time?"</string>
 
-    <!-- Begegnungen: FAQ Text -->
-    <string name="begegnungen_detail_faq3_text">"In order to recognise encounters, Bluetooth must be turned on at all times. This causes only a minor increase in battery usage."</string>
+	<!-- Begegnungen: FAQ Text -->
+	<string name="begegnungen_detail_faq3_text">"In order to recognise encounters, Bluetooth must be turned on at all times. This causes only a minor increase in battery usage."</string>
 
-    <!-- FAQ Button Titel -->
-    <string name="faq_button_title">"FAQs"</string>
+	<!-- FAQ Button Titel -->
+	<string name="faq_button_title">"FAQs"</string>
 
-    <!-- Meldungen Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq1_title">"What are reports?"</string>
+	<!-- Meldungen Keine Meldungen FAQ Titel -->
+	<string name="meldungen_nomeldungen_faq1_title">"What are reports?"</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"The app checks regularly to see whether any users that you have encountered have reported testing positive for the virus. 
+	<!-- Meldungen: Keine Meldungen FAQ Text -->
+	<string name="meldungen_nomeldungen_faq1_text">"The app checks regularly to see whether any users that you have encountered have reported testing positive for the virus.
 
 If it is possible that you have been infected, you will receive a message on your lock screen."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"What is a potential infection?"</string>
+	<!-- Meldungen: Keine Meldungen FAQ Titel -->
+	<string name="meldungen_nomeldungen_faq2_titel">"What is a potential infection?"</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"The app not only checks whether you have had encounters with infected persons, but how long and how close these were. 
+	<!-- Meldungen: Keine Meldungen FAQ Text -->
+	<string name="meldungen_nomeldungen_faq2_text">"The app not only checks whether you have had encounters with infected persons, but how long and how close these were.
 
 You will only be notified if there is sufficient likelihood that you have been infected."</string>
 
-    <!-- Meldungen Detail Weisse Box Texte Unten -->
-    <string name="meldungen_detail_explanation_text3">"The infoline SwissCovid will advise you on getting a free test."</string>
+	<!-- Meldungen Detail Weisse Box Texte Unten -->
+	<string name="meldungen_detail_explanation_text3">"The infoline SwissCovid will advise you on getting a free test."</string>
 
-    <!-- Meldungen: Meldungen FAQ -->
-    <string name="meldungen_meldungen_faq1_title">"Do I have to call?"</string>
+	<!-- Meldungen: Meldungen FAQ -->
+	<string name="meldungen_meldungen_faq1_title">"Do I have to call?"</string>
 
-    <!-- Meldungen: Meldungen FAQ Text -->
-    <string name="meldungen_meldungen_faq1_text">"It is recommended that you call every time you receive a notification. 
+	<!-- Meldungen: Meldungen FAQ Text -->
+	<string name="meldungen_meldungen_faq1_text">"It is recommended that you call every time you receive a notification.
 
 You will remain anonymous. No personal data will be recorded.
 
 The counselling is free of charge. You just have to pay for the call."</string>
 
-    <!-- Meldungen Detail: Anruf Titel -->
-    <string name="meldungen_detail_call_thankyou_title">"Thank you for your cooperation."</string>
+	<!-- Meldungen Detail: Anruf Titel -->
+	<string name="meldungen_detail_call_thankyou_title">"Thank you for your cooperation."</string>
 
-    <!-- Meldungen Detail Anruf Danke Subtitel -->
-    <string name="meldungen_detail_call_thankyou_subtitle">"You are protecting other people."</string>
+	<!-- Meldungen Detail Anruf Danke Subtitel -->
+	<string name="meldungen_detail_call_thankyou_subtitle">"You are protecting other people."</string>
 
-    <!-- Keine Meldungen Link in weisser Box Titel -->
-    <string name="no_meldungen_box_link">"Protect yourself and others"</string>
+	<!-- Keine Meldungen Link in weisser Box Titel -->
+	<string name="no_meldungen_box_link">"Protect yourself and others"</string>
 
-    <!-- Keine Meldungen Weisse Box Link URL -->
-    <string name="no_meldungen_box_url">"https://www.foph-coronavirus.ch"</string>
+	<!-- Keine Meldungen Weisse Box Link URL -->
+	<string name="no_meldungen_box_url">"https://www.foph-coronavirus.ch"</string>
 
-    <!-- Informieren Detail: FAQ Titel -->
-    <string name="inform_detail_faq1_title">"What is a Covidcode?"</string>
+	<!-- Informieren Detail: FAQ Titel -->
+	<string name="inform_detail_faq1_title">"What is a Covidcode?"</string>
 
     <!-- Inform Detail: FAQ Text -->
     <string name="inform_detail_faq1_text">"People who test positive for coronavirus (with a PCR test or rapid antigen test) will receive a Covidcode.
 
 This guarantees that only confirmed cases are reported via the app."</string>
 
-    <!-- Not translated -->
-    <!-- Inform Detail: FAQ Titel -->
-    <string name="inform_detail_faq2_title">"What information gets sent?"</string>
+	<!-- Not translated -->
+	<!-- Inform Detail: FAQ Titel -->
+	<string name="inform_detail_faq2_title">"What information gets sent?"</string>
 
-    <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Only the private keys from your app are sent, no personal data. 
+	<!-- Inform Detail FAQ Text -->
+	<string name="inform_detail_faq2_text">"Only the private keys from your app are sent, no personal data.
 
 Other SwissCovid apps can then check if it is possible that they have been infected."</string>
 
-    <!-- Telefonnummer der Infoline -->
-    <string name="infoline_tel_number">"+41 58 387 77 78"</string>
+	<!-- Telefonnummer der Infoline -->
+	<string name="infoline_tel_number">"+41 58 387 77 78"</string>
 
-    <!-- URL für Häufige Fragen Button -->
-    <string name="faq_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/en/categories/swisscovid-app"</string>
+	<!-- URL für Häufige Fragen Button -->
+	<string name="faq_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/en/categories/swisscovid-app"</string>
 
-    <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Important information"</string>
+	<!-- Informieren Flow: Titel erster Screen -->
+	<string name="inform_code_intro_title">"Important information"</string>
 
-    <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
+	<!-- Informieren-Flow: Erster Screen Text -->
+	<string name="inform_code_intro_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
 
-    <!-- Inform-Flow: Erster Screen Button -->
-    <string name="inform_code_intro_button">"Agree"</string>
+	<!-- Inform-Flow: Erster Screen Button -->
+	<string name="inform_code_intro_button">"Agree"</string>
 
-    <!-- Symptome: FAQ Titel -->
-    <string name="symptom_faq1_title">"What are the symptoms of COVID-19?"</string>
+	<!-- Symptome: FAQ Titel -->
+	<string name="symptom_faq1_title">"What are the symptoms of COVID-19?"</string>
 
-    <!-- Symptome: FAQ Text -->
-    <string name="symptom_faq1_text">"These are the most common symptoms of COVID-19:
+	<!-- Symptome: FAQ Text -->
+	<string name="symptom_faq1_text">"These are the most common symptoms of COVID-19:
 
 – Fever, feverish feeling 
 – Sore throat
@@ -675,719 +675,719 @@ Other symptoms may include:
 – Gastrointestinal symptoms (nausea, vomiting, diarrhoea, stomach ache)
 – Skin rash"</string>
 
-    <!-- Meldungen: Positiv getestet FAQ Titel -->
-    <string name="meldungen_positive_tested_faq1_title">"Why is tracing deactivated?"</string>
+	<!-- Meldungen: Positiv getestet FAQ Titel -->
+	<string name="meldungen_positive_tested_faq1_title">"Why is tracing deactivated?"</string>
 
-    <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"After a positive test, tracing is automatically deactivated in the app. Tracing can be reactivated once you have completed your period of isolation."</string>
+	<!-- Meldungen: Positiv getestet FAQ Text -->
+	<string name="meldungen_positive_tested_faq1_text">"After a positive test, tracing is automatically deactivated in the app. Tracing can be reactivated once you have completed your period of isolation."</string>
 
-    <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
-    <string name="language_key">"en"</string>
+	<!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
+	<string name="language_key">"en"</string>
 
-    <!-- Meldungen Homescreen: Name Hotline -->
-    <string name="exposed_info_contact_hotline_name">"SwissCovid infoline"</string>
+	<!-- Meldungen Homescreen: Name Hotline -->
+	<string name="exposed_info_contact_hotline_name">"SwissCovid infoline"</string>
 
-    <!-- Meldung Detail: "Noch 1 Tag" Label -->
-    <string name="date_in_one_day">"1 more day"</string>
+	<!-- Meldung Detail: "Noch 1 Tag" Label -->
+	<string name="date_in_one_day">"1 more day"</string>
 
-    <!-- Meldung Detail: Anzeige "Noch x Tage" {COUNT} wird durch Zahl ersetzt -->
-    <string name="date_in_days">"There are {COUNT} days left"</string>
+	<!-- Meldung Detail: Anzeige "Noch x Tage" {COUNT} wird durch Zahl ersetzt -->
+	<string name="date_in_days">"There are {COUNT} days left"</string>
 
-    <!-- Datum: Text vor Datum: am 26.2.2020 / {DATE} wird ersetzt durch Datum -->
-    <string name="date_text_before_date">"on {DATE}"</string>
+	<!-- Datum: Text vor Datum: am 26.2.2020 / {DATE} wird ersetzt durch Datum -->
+	<string name="date_text_before_date">"on {DATE}"</string>
 
-    <!-- Accessibility Talk back information for android back button in toolbar -->
-    <string name="android_accessibility_back_button">"Back"</string>
+	<!-- Accessibility Talk back information for android back button in toolbar -->
+	<string name="android_accessibility_back_button">"Back"</string>
 
-    <!-- VoiceOver: Hilfetext bei Codeeingabe Button -->
-    <string name="accessibility_code_button_current_code_hint">"Code entered: "</string>
+	<!-- VoiceOver: Hilfetext bei Codeeingabe Button -->
+	<string name="accessibility_code_button_current_code_hint">"Code entered: "</string>
 
-    <!-- Accessibility: Codeeingabe einer Ziffer -->
-    <string name="accessibility_code_input_textfield">"Text box. Current figure: "</string>
+	<!-- Accessibility: Codeeingabe einer Ziffer -->
+	<string name="accessibility_code_input_textfield">"Text box. Current figure: "</string>
 
-    <!-- Accessibility: Code Input Textfeld wenn leer -->
-    <string name="accessibility_code_input_textfield_empty">"Text box. Empty."</string>
+	<!-- Accessibility: Code Input Textfeld wenn leer -->
+	<string name="accessibility_code_input_textfield_empty">"Text box. Empty."</string>
 
-    <!-- Accessibility: Hint zum doppelklicken wenn einzelnes Codefeld angeklickt -->
-    <string name="accessibility_code_input_hint">"Double-tap to edit"</string>
+	<!-- Accessibility: Hint zum doppelklicken wenn einzelnes Codefeld angeklickt -->
+	<string name="accessibility_code_input_hint">"Double-tap to edit"</string>
 
-    <!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine Website des BAG geöffnet wird -->
-    <!-- Fuzzy -->
-    <string name="accessibility_faq_button_hint">"This button exits the app and opens the F.O.P.H. website."</string>
+	<!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine Website des BAG geöffnet wird -->
+	<!-- Fuzzy -->
+	<string name="accessibility_faq_button_hint">"This button exits the app and opens the F.O.P.H. website."</string>
 
-    <!-- Titel auf der Onboarding Page für die Permission der Exposure-Library -->
-    <string name="onboarding_gaen_title">"Activate proximity tracing"</string>
+	<!-- Titel auf der Onboarding Page für die Permission der Exposure-Library -->
+	<string name="onboarding_gaen_title">"Activate proximity tracing"</string>
 
-    <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"COVID-19 Exposure Notifications must be activated to use the app."</string>
+	<!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
+	<!-- Fuzzy -->
+	<string name="onboarding_gaen_text_ios">"COVID-19 Exposure Notifications must be activated to use the app."</string>
 
-    <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
-    <string name="onboarding_gaen_button_activate">"Activate"</string>
+	<!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
+	<string name="onboarding_gaen_button_activate">"Activate"</string>
 
-    <!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 1 -->
-    <string name="onboarding_gaen_info_title_1">"Data protection"</string>
+	<!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 1 -->
+	<string name="onboarding_gaen_info_title_1">"Data protection"</string>
 
-    <!-- Onboarding Page für die Permission der Exposure-Library: Info Text 1 -->
-    <string name="onboarding_gaen_info_text_1">"Only random IDs are exchanged, not data about your location or your person."</string>
+	<!-- Onboarding Page für die Permission der Exposure-Library: Info Text 1 -->
+	<string name="onboarding_gaen_info_text_1">"Only random IDs are exchanged, not data about your location or your person."</string>
 
-    <!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 2 -->
-    <string name="onboarding_gaen_info_title_2">"Minor increase in battery usage"</string>
+	<!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 2 -->
+	<string name="onboarding_gaen_info_title_2">"Minor increase in battery usage"</string>
 
-    <!-- Onboarding Page für die Permission der Exposure-Library: Info Text 2 -->
-    <string name="onboarding_gaen_info_text_2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
+	<!-- Onboarding Page für die Permission der Exposure-Library: Info Text 2 -->
+	<string name="onboarding_gaen_info_text_2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
 
-    <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
-    <string name="onboarding_gaen_button_activated">"Activated"</string>
+	<!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
+	<string name="onboarding_gaen_button_activated">"Activated"</string>
 
-    <!-- Meldung in der App löschen, wenn möglicherweise angesteckt -->
-    <string name="delete_reports_button">"Delete notification"</string>
+	<!-- Meldung in der App löschen, wenn möglicherweise angesteckt -->
+	<string name="delete_reports_button">"Delete notification"</string>
 
-    <!-- Meldung im Löschen Dialog wenn möglicherweise angesteckt -->
-    <string name="delete_reports_dialog">"Do you really want to delete the notification?"</string>
+	<!-- Meldung im Löschen Dialog wenn möglicherweise angesteckt -->
+	<string name="delete_reports_dialog">"Do you really want to delete the notification?"</string>
 
-    <!-- Code-Eingabe in der App löschen, wenn infiziert -->
-    <string name="delete_infection_button">"End isolation?"</string>
+	<!-- Code-Eingabe in der App löschen, wenn infiziert -->
+	<string name="delete_infection_button">"End isolation?"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
-    <string name="delete_infection_dialog">"Do you really want to delete the notification? "</string>
-    <string name="android_onboarding_battery_permission_title">"Ignore battery optimisation"</string>
-    <string name="android_onboarding_battery_permission_text">"To be able to recognise encounters at all times, the battery optimisation function for this app must be disabled."</string>
-    <string name="android_onboarding_battery_permission_button">"Allow"</string>
-    <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
-    <string name="android_onboarding_battery_permission_info_1_title">"Only for this app"</string>
-    <string name="android_onboarding_battery_permission_info_1_text">"For the app to work, it must also run in the background. Battery optimisation can be disabled for individual apps, so that this is possible."</string>
-    <string name="android_onboarding_battery_permission_info_2_title">"Minor increase in battery usage"</string>
-    <string name="android_onboarding_battery_permission_info_2_text">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
-    <string name="android_foreground_service_notification_error_battery_optimization">"For proximity tracing to work precisely, the app must also run in the background. This will cause a minor increase in battery usage."</string>
+	<!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+	<string name="delete_infection_dialog">"Do you really want to delete the notification? "</string>
+	<string name="android_onboarding_battery_permission_title">"Ignore battery optimisation"</string>
+	<string name="android_onboarding_battery_permission_text">"To be able to recognise encounters at all times, the battery optimisation function for this app must be disabled."</string>
+	<string name="android_onboarding_battery_permission_button">"Allow"</string>
+	<string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
+	<string name="android_onboarding_battery_permission_info_1_title">"Only for this app"</string>
+	<string name="android_onboarding_battery_permission_info_1_text">"For the app to work, it must also run in the background. Battery optimisation can be disabled for individual apps, so that this is possible."</string>
+	<string name="android_onboarding_battery_permission_info_2_title">"Minor increase in battery usage"</string>
+	<string name="android_onboarding_battery_permission_info_2_text">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
+	<string name="android_foreground_service_notification_error_battery_optimization">"For proximity tracing to work precisely, the app must also run in the background. This will cause a minor increase in battery usage."</string>
 
-    <!-- Google Play Services nicht aktuell -->
-    <string name="gaen_not_aviable">"Google Play Services is not up to date"</string>
+	<!-- Google Play Services nicht aktuell -->
+	<string name="gaen_not_aviable">"Google Play Services is not up to date"</string>
 
-    <!-- Google Play Services nicht aktuell text -->
-    <string name="gaen_not_available_text">"Please update Google Play Services"</string>
+	<!-- Google Play Services nicht aktuell text -->
+	<string name="gaen_not_available_text">"Please update Google Play Services"</string>
 
-    <!-- Tracing wurde vom System deaktiviert, erneut starten -->
-    <string name="gaen_unexpectedly_disabled">"Proximity tracing has been deactivated. Please restart it."</string>
+	<!-- Tracing wurde vom System deaktiviert, erneut starten -->
+	<string name="gaen_unexpectedly_disabled">"Proximity tracing has been deactivated. Please restart it."</string>
 
-    <!-- Fehler-Titel, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_title_ios">"COVID-19 Exposure Notifications disabled"</string>
+	<!-- Fehler-Titel, wenn Tracing deaktiviert wurde im System, iOS -->
+	<!-- Fuzzy -->
+	<string name="tracing_permission_error_title_ios">"COVID-19 Exposure Notifications disabled"</string>
 
-    <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Activate COVID-19 Exposure Notifications for proximity tracing to work."</string>
+	<!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
+	<!-- Fuzzy -->
+	<string name="tracing_permission_error_text_ios">"Activate COVID-19 Exposure Notifications for proximity tracing to work."</string>
 
-    <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
-    <string name="user_cancelled_key_sharing_error">"The message could not be sent. Please allow your random IDs to be shared with the SwissCovid app."</string>
+	<!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
+	<string name="user_cancelled_key_sharing_error">"The message could not be sent. Please allow your random IDs to be shared with the SwissCovid app."</string>
 
-    <!-- Button um die Google Play Services zu aktualisieren -->
-    <string name="playservices_update">"Update"</string>
+	<!-- Button um die Google Play Services zu aktualisieren -->
+	<string name="playservices_update">"Update"</string>
 
-    <!-- Button um die Google Play Services zu installieren -->
-    <string name="playservices_install">"Install"</string>
+	<!-- Button um die Google Play Services zu installieren -->
+	<string name="playservices_install">"Install"</string>
 
-    <!-- Titel für Infos zu den Google Play Services -->
-    <string name="playservices_title">"Google Play Services"</string>
+	<!-- Titel für Infos zu den Google Play Services -->
+	<string name="playservices_title">"Google Play Services"</string>
 
-    <!-- Meldung, dass die Google Play Services benötigt werden -->
-    <string name="playservices_text">"To activate proximity tracing, an up-to-date version of Google Play Services is required.
+	<!-- Meldung, dass die Google Play Services benötigt werden -->
+	<string name="playservices_text">"To activate proximity tracing, an up-to-date version of Google Play Services is required.
 
 If no update is currently available on your device, please try again later."</string>
-    <string name="android_error_battery_optimization_title">"Optimisation of battery usage activated"</string>
-    <string name="android_error_battery_optimization_button">"Allow"</string>
-
-    <!-- Telefonnummer für Hilfe bei App-Problemen -->
-    <string name="app_hotline_tel_number">"+41 58 466 07 99"</string>
-
-    <!-- text shown in notification when we get an exception from the GAEN api -->
-    <string name="sync_api_error">"An unexpected error occurred when synchronising the notifications"</string>
-
-    <!-- Fehler, der bei ungültigen Zertifikat angezeigt wird. Kann z.B. passieren, wenn man in einem public wlan ist -->
-    <string name="certificate_validation_error">"Secure connection to server not possible. Please check or deactivate your VPN or proxy, or check whether you are connected to a public Wi-Fi system."</string>
-
-    <!-- Fehler-Titel wenn die Exposure Notifications nicht gestartet werden konnten. -->
-    <string name="android_en_start_failure">"COVID-19 notifications could not be activated"</string>
-    <string name="begegnung_detail_last_sync_title">"Latest successful synchronisation"</string>
-    <string name="synchronizations_view_title">"Summary"</string>
-    <string name="synchronizations_view_info_title">"Synchronisations"</string>
-    <string name="synchronizations_view_info_question">"What are synchronisations?"</string>
-    <string name="synchronizations_view_info_answer">"The app regularly checks the random IDs reported by users who have tested positive."</string>
-    <string name="synchronizations_view_period_title">"In the last 14 days"</string>
-    <string name="synchronizations_view_empty_list">"No entries"</string>
-    <string name="tracing_active_tracking_always_info">"SwissCovid remains active even if the app has been closed."</string>
-
-    <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
+	<string name="android_error_battery_optimization_title">"Optimisation of battery usage activated"</string>
+	<string name="android_error_battery_optimization_button">"Allow"</string>
+
+	<!-- Telefonnummer für Hilfe bei App-Problemen -->
+	<string name="app_hotline_tel_number">"+41 58 466 07 99"</string>
+
+	<!-- text shown in notification when we get an exception from the GAEN api -->
+	<string name="sync_api_error">"An unexpected error occurred when synchronising the notifications"</string>
+
+	<!-- Fehler, der bei ungültigen Zertifikat angezeigt wird. Kann z.B. passieren, wenn man in einem public wlan ist -->
+	<string name="certificate_validation_error">"Secure connection to server not possible. Please check or deactivate your VPN or proxy, or check whether you are connected to a public Wi-Fi system."</string>
+
+	<!-- Fehler-Titel wenn die Exposure Notifications nicht gestartet werden konnten. -->
+	<string name="android_en_start_failure">"COVID-19 notifications could not be activated"</string>
+	<string name="begegnung_detail_last_sync_title">"Latest successful synchronisation"</string>
+	<string name="synchronizations_view_title">"Summary"</string>
+	<string name="synchronizations_view_info_title">"Synchronisations"</string>
+	<string name="synchronizations_view_info_question">"What are synchronisations?"</string>
+	<string name="synchronizations_view_info_answer">"The app regularly checks the random IDs reported by users who have tested positive."</string>
+	<string name="synchronizations_view_period_title">"In the last 14 days"</string>
+	<string name="synchronizations_view_empty_list">"No entries"</string>
+	<string name="tracing_active_tracking_always_info">"SwissCovid remains active even if the app has been closed."</string>
+
+	<!-- title in splash screen of onboarding -->
+	<string name="oboarding_splashscreen_title">"SwissCovid
 breaks 
 chains of infection."</string>
-    <string name="inform_detail_faq3_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
-    <string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
+	<string name="inform_detail_faq3_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
+	<string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
 
-    <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"When the first symptoms appear, phone a doctor or health centre."</string>
+	<!-- Meldung Detail Weiss Box unten -->
+	<string name="meldungen_detail_explanation_text4">"When the first symptoms appear, phone a doctor or health centre."</string>
 
-    <!-- Text beim Bluetooth Control -->
-    <string name="tracing_setting_text_android">"COVID-19 Exposure Notifications"</string>
+	<!-- Text beim Bluetooth Control -->
+	<string name="tracing_setting_text_android">"COVID-19 Exposure Notifications"</string>
 
-    <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"COVID-19 Exposure Notifications must be activated to use the app."</string>
+	<!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
+	<string name="onboarding_gaen_text_android">"COVID-19 Exposure Notifications must be activated to use the app."</string>
 
-    <!-- Onboarding Disclaimer Screen: AppName Title -->
-    <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
+	<!-- Onboarding Disclaimer Screen: AppName Title -->
+	<string name="onboarding_disclaimer_heading">"SwissCovid"</string>
 
-    <!-- Onboarding Disclaimer Screen: Title -->
-    <string name="onboarding_disclaimer_title">"Tips on use"</string>
+	<!-- Onboarding Disclaimer Screen: Title -->
+	<string name="onboarding_disclaimer_title">"Tips on use"</string>
 
-    <!-- Onboarding Disclaimer Screen: Info -->
-    <string name="onboarding_disclaimer_info">"Here you will find the Data Protection Statement and Conditions of Use"</string>
+	<!-- Onboarding Disclaimer Screen: Info -->
+	<string name="onboarding_disclaimer_info">"Here you will find the Data Protection Statement and Conditions of Use"</string>
 
-    <!-- Onboarding Disclaimer Screen: Warning Title -->
-    <string name="onboarding_disclaimer_warning_title">"Warning: This app does not protect you from COVID-19 infection."</string>
+	<!-- Onboarding Disclaimer Screen: Warning Title -->
+	<string name="onboarding_disclaimer_warning_title">"Warning: This app does not protect you from COVID-19 infection."</string>
 
-    <!-- Onboarding Disclaimer Screen: Warning Text -->
-    <string name="onboarding_disclaimer_warning_body">"The app is intended for proximity tracing and to warn users of potential exposure to someone infected by COVID-19. It is not a diagnostic tool either. Please read the instructions provided in each app screen carefully."</string>
+	<!-- Onboarding Disclaimer Screen: Warning Text -->
+	<string name="onboarding_disclaimer_warning_body">"The app is intended for proximity tracing and to warn users of potential exposure to someone infected by COVID-19. It is not a diagnostic tool either. Please read the instructions provided in each app screen carefully."</string>
 
-    <!-- Onboarding Disclaimer Screen: Manufacturer Info -->
-    <string name="onboarding_disclaimer_manufacturer">"Federal Office of Public Health FOPH
+	<!-- Onboarding Disclaimer Screen: Manufacturer Info -->
+	<string name="onboarding_disclaimer_manufacturer">"Federal Office of Public Health FOPH
 Schwarzenburgstrasse 157
 3097 Liebefeld, Switzerland"</string>
 
-    <!-- Onboarding Disclaimer Screen: App version title -->
-    <string name="onboarding_disclaimer_app_version">"SwissCovid App Version"</string>
+	<!-- Onboarding Disclaimer Screen: App version title -->
+	<string name="onboarding_disclaimer_app_version">"SwissCovid App Version"</string>
 
-    <!-- Onboarding Disclaimer Screen: Release version title -->
-    <string name="onboarding_disclaimer_release_version">"Release Date:"</string>
+	<!-- Onboarding Disclaimer Screen: Release version title -->
+	<string name="onboarding_disclaimer_release_version">"Release Date:"</string>
 
-    <!-- onboarding privacy and conditions of use button -->
-    <string name="onboarding_disclaimer_legal_button">"Data Protection Statement &amp; Conditions of Use"</string>
+	<!-- onboarding privacy and conditions of use button -->
+	<string name="onboarding_disclaimer_legal_button">"Data Protection Statement &amp; Conditions of Use"</string>
 
-    <!-- onboarding privacy and conditions of use url -->
-    <string name="onboarding_disclaimer_legal_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/situation-schweiz-und-international/datenschutzerklaerung-nutzungsbedingungen.html"</string>
+	<!-- onboarding privacy and conditions of use url -->
+	<string name="onboarding_disclaimer_legal_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/situation-schweiz-und-international/datenschutzerklaerung-nutzungsbedingungen.html"</string>
 
-    <!-- Google Translation -->
-    <!-- Error shown when loading fails because there is not enough free disk space. -->
-    <string name="loading_error_no_disk_space">"Messages could not be checked because your mobile phone does not have enough free memory space. Please release memory space."</string>
+	<!-- Google Translation -->
+	<!-- Error shown when loading fails because there is not enough free disk space. -->
+	<string name="loading_error_no_disk_space">"Messages could not be checked because your mobile phone does not have enough free memory space. Please release memory space."</string>
 
-    <!-- Onboarding: Akzeptieren Buttton Titel -->
-    <string name="onboarding_accept_button">"Accept"</string>
+	<!-- Onboarding: Akzeptieren Buttton Titel -->
+	<string name="onboarding_accept_button">"Accept"</string>
 
-    <!-- Google Translation -->
-    <!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Titel -->
-    <string name="ratelimit_error_title">"Update currently not possible"</string>
+	<!-- Google Translation -->
+	<!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Titel -->
+	<string name="ratelimit_error_title">"Update currently not possible"</string>
 
-    <!-- Google Translation! -->
-    <!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Text -->
-    <string name="ratelimit_error_text">"There have already been too many requests today. The app will try again later."</string>
+	<!-- Google Translation! -->
+	<!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Text -->
+	<string name="ratelimit_error_text">"There have already been too many requests today. The app will try again later."</string>
 
-    <!-- Info to the user that tracing has been switched on -->
-    <string name="accessibility_tracing_has_been_activated">"Tracing has been activated"</string>
+	<!-- Info to the user that tracing has been switched on -->
+	<string name="accessibility_tracing_has_been_activated">"Tracing has been activated"</string>
 
-    <!-- Info to the user that tracing has been switched off -->
-    <string name="accessibility_tracing_has_been_deactivated">"Tracing has been deactivated"</string>
+	<!-- Info to the user that tracing has been switched off -->
+	<string name="accessibility_tracing_has_been_deactivated">"Tracing has been deactivated"</string>
 
-    <!-- Meldungen Detail Kostenloser Test Box Title -->
-    <string name="meldungen_detail_free_test_title">"Test available free of charge"</string>
+	<!-- Meldungen Detail Kostenloser Test Box Title -->
+	<string name="meldungen_detail_free_test_title">"Test available free of charge"</string>
 
-    <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <!-- Fuzzy -->
-    <string name="meldungen_detail_free_test_text_old">"The SwissCovid Guide has information about the possibility of a free coronavirus test."</string>
+	<!-- Meldungen Detail Kostenloser Test Box Text -->
+	<!-- Fuzzy -->
+	<string name="meldungen_detail_free_test_text_old">"The SwissCovid Guide has information about the possibility of a free coronavirus test."</string>
 
-    <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
-    <string name="activate_tracing_button">"Activate proximity tracing"</string>
+	<!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
+	<string name="activate_tracing_button">"Activate proximity tracing"</string>
 
-    <!-- Detailed Version of tracing_turned_off_text that is displayed to the user in the Tracing Detail View when the Tracing is deactivated. -->
-    <string name="tracing_turned_off_detailed_text">"Enable tracing so the app can save encounters and receive reports"</string>
+	<!-- Detailed Version of tracing_turned_off_text that is displayed to the user in the Tracing Detail View when the Tracing is deactivated. -->
+	<string name="tracing_turned_off_detailed_text">"Enable tracing so the app can save encounters and receive reports"</string>
 
-    <!-- Warning that is displayed to the user in the Home View under the Meldungen-Card. -->
-    <string name="meldungen_tracing_not_active_warning">"If tracing is disabled, you cannot receive any reports."</string>
+	<!-- Warning that is displayed to the user in the Home View under the Meldungen-Card. -->
+	<string name="meldungen_tracing_not_active_warning">"If tracing is disabled, you cannot receive any reports."</string>
 
-    <!-- Warning title for Meldungen-Card when Tracing is turned off. -->
-    <string name="meldungen_tracing_turned_off_title">"Attention!"</string>
+	<!-- Warning title for Meldungen-Card when Tracing is turned off. -->
+	<string name="meldungen_tracing_turned_off_title">"Attention!"</string>
 
-    <!-- Data Protection Header String in Onboarding Disclaimer View. -->
-    <string name="onboarding_disclaimer_data_protection_statement">"Data protection declaration"</string>
+	<!-- Data Protection Header String in Onboarding Disclaimer View. -->
+	<string name="onboarding_disclaimer_data_protection_statement">"Data protection declaration"</string>
 
-    <!-- Conditions of Use Header String in Onboarding Disclaimer View. -->
-    <string name="onboarding_disclaimer_conditions_of_use">"Terms of use"</string>
+	<!-- Conditions of Use Header String in Onboarding Disclaimer View. -->
+	<string name="onboarding_disclaimer_conditions_of_use">"Terms of use"</string>
 
-    <!-- Button title that links to the website with the data protection statement and conditions of use. -->
-    <string name="onboarding_disclaimer_to_online_version_button">"To the online version"</string>
+	<!-- Button title that links to the website with the data protection statement and conditions of use. -->
+	<string name="onboarding_disclaimer_to_online_version_button">"To the online version"</string>
 
-    <!-- Hint that is displayed to the user under the Meldungen-Card when the Tracing is turned off. -->
-    <string name="meldungen_tracing_turned_off_warning">"If tracing is disabled, you cannot receive any reports"</string>
+	<!-- Hint that is displayed to the user under the Meldungen-Card when the Tracing is turned off. -->
+	<string name="meldungen_tracing_turned_off_warning">"If tracing is disabled, you cannot receive any reports"</string>
 
-    <!-- Homescreen infobox close button accessibility handler -->
-    <string name="infobox_close_button_accessibility">"Close"</string>
+	<!-- Homescreen infobox close button accessibility handler -->
+	<string name="infobox_close_button_accessibility">"Close"</string>
 
-    <!-- Title for the Home View Travel Card. -->
-    <string name="travel_title">"Travel"</string>
+	<!-- Title for the Home View Travel Card. -->
+	<string name="travel_title">"Travel"</string>
 
-    <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid works in the following countries:"</string>
+	<!-- Info text that is displayed  on the Home Travel Card. -->
+	<string name="travel_home_description">"SwissCovid works in the following countries:"</string>
 
-    <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_title_1">"What does that mean?"</string>
+	<!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
+	<string name="travel_screen_explanation_title_1">"What does that mean?"</string>
 
-    <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"You don’t have to install another app if you’re travelling in one of the compatible countries.
+	<!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
+	<string name="travel_screen_explanation_text_1">"You don’t have to install another app if you’re travelling in one of the compatible countries.
 
 SwissCovid checks private keys published in the compatible countries. This means that you can also receive alerts of possible infection abroad."</string>
 
-    <!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_title_2">"What happens when the Covidcode is entered?"</string>
+	<!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
+	<string name="travel_screen_explanation_title_2">"What happens when the Covidcode is entered?"</string>
 
-    <!-- Second text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_2">"When the Covidcode is entered, the private keys sent by you are also shared with the compatible countries.
+	<!-- Second text for the travel feauter explenation at the bottom of the travel screen. -->
+	<string name="travel_screen_explanation_text_2">"When the Covidcode is entered, the private keys sent by you are also shared with the compatible countries.
 
 To enable travellers from abroad to also receive alerts, this happens regardless of whether you yourself are travelling abroad or not."</string>
 
-    <!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine website öffnet -->
-    <string name="accessibility_faq_button_hint_non_bag">"This button leaves the app and opens a website."</string>
+	<!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine website öffnet -->
+	<string name="accessibility_faq_button_hint_non_bag">"This button leaves the app and opens a website."</string>
 
-    <!-- voice over string der vorgelesen wird wenn noch kein sync stattgefunden hat -->
-    <string name="begegnung_detail_no_last_sync_accessibility">"No previous synchronisations"</string>
+	<!-- voice over string der vorgelesen wird wenn noch kein sync stattgefunden hat -->
+	<string name="begegnung_detail_no_last_sync_accessibility">"No previous synchronisations"</string>
 
-    <!-- Text für Hintergrundfehler auf Android -->
-    <string name="meldungen_background_error_text_android">"Change the settings to receive notification outside the app as well in the event of a report."</string>
+	<!-- Text für Hintergrundfehler auf Android -->
+	<string name="meldungen_background_error_text_android">"Change the settings to receive notification outside the app as well in the event of a report."</string>
 
-    <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
-    <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
+	<!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
+	<string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
+	<!-- Text beim Bluetooth Control iOS 13.5 -->
+	<string name="tracing_setting_text_ios_13_5"></string>
 
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
+	<!-- Text beim Bluetooth Control iOS 13.6 -->
+	<string name="tracing_setting_text_ios_13_6"></string>
 
-    <!-- Text beim Bluetooth Control iOS 14 -->
-    <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
-    <string name="bottom_nav_tab_home">"SwissCovid"</string>
-    <string name="bottom_nav_tab_stats">"Stats"</string>
-    <string name="stats_title">"already use SwissCovid"</string>
-    <string name="stats_legend_new_infections">"New infections reported"</string>
-    <string name="stats_legend_new_infections_average">"7-day average"</string>
-    <string name="stats_legend_entered_covidcodes">"Covidcodes entered"</string>
-    <string name="share_app_supertitle">"Together…"</string>
-    <string name="share_app_title">"against the spread of Covid"</string>
-    <string name="share_app_button">"Share app"</string>
-    <string name="share_app_body">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
+	<!-- Text beim Bluetooth Control iOS 14 -->
+	<string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
+	<string name="bottom_nav_tab_home">"SwissCovid"</string>
+	<string name="bottom_nav_tab_stats">"Stats"</string>
+	<string name="stats_title">"already use SwissCovid"</string>
+	<string name="stats_legend_new_infections">"New infections reported"</string>
+	<string name="stats_legend_new_infections_average">"7-day average"</string>
+	<string name="stats_legend_entered_covidcodes">"Covidcodes entered"</string>
+	<string name="share_app_supertitle">"Together…"</string>
+	<string name="share_app_title">"against the spread of Covid"</string>
+	<string name="share_app_button">"Share app"</string>
+	<string name="share_app_body">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
 
-    <!-- Text der geteilt wird -->
-    <string name="share_app_message">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
+	<!-- Text der geteilt wird -->
+	<string name="share_app_message">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
 
-    <!-- URL die geteilt wird -->
-    <string name="share_app_url">"https://foph-coronavirus.ch/swisscovid-app/#download"</string>
+	<!-- URL die geteilt wird -->
+	<string name="share_app_url">"https://foph-coronavirus.ch/swisscovid-app/#download"</string>
 
-    <!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59" -->
-    <string name="stats_counter">"{COUNT} M"</string>
+	<!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59" -->
+	<string name="stats_counter">"{COUNT} M"</string>
 
-    <!-- Statistik Tag der Daten "{DAY}" wird mit dem Aktualisierungsdatum ersetzt z.B. "14.9." -->
-    <string name="stats_source_day">"Stats as of {DAY}"</string>
+	<!-- Statistik Tag der Daten "{DAY}" wird mit dem Aktualisierungsdatum ersetzt z.B. "14.9." -->
+	<string name="stats_source_day">"Stats as of {DAY}"</string>
 
-    <!-- Links zu weiteren Statistiken -->
-    <string name="stats_more_statistics_button">"View more statistics"</string>
+	<!-- Links zu weiteren Statistiken -->
+	<string name="stats_more_statistics_button">"View more statistics"</string>
 
-    <!-- URL zu weiteren statistiken -->
-    <string name="stats_more_statistics_url">"https://www.covid19.admin.ch/en/overview"</string>
+	<!-- URL zu weiteren statistiken -->
+	<string name="stats_more_statistics_url">"https://www.covid19.admin.ch/en/overview"</string>
 
-    <!-- Body of the error message shown when the statistics data cannot be loaded -->
-    <string name="stats_loading_error_text">"Currently unable to load stats"</string>
+	<!-- Body of the error message shown when the statistics data cannot be loaded -->
+	<string name="stats_loading_error_text">"Currently unable to load stats"</string>
 
-    <!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59". Voll Millionen wort -->
-    <string name="stats_counter_full">"{COUNT} million"</string>
+	<!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59". Voll Millionen wort -->
+	<string name="stats_counter_full">"{COUNT} million"</string>
 
-    <!-- iOS settings tutorial title -->
-    <string name="ios_settings_tutorial_title">"Activate encounter notifications"</string>
+	<!-- iOS settings tutorial title -->
+	<string name="ios_settings_tutorial_title">"Activate encounter notifications"</string>
 
-    <!-- iOS settings tutorial open settings button -->
-    <string name="ios_settings_tutorial_open_settings_button">"Open settings"</string>
+	<!-- iOS settings tutorial open settings button -->
+	<string name="ios_settings_tutorial_open_settings_button">"Open settings"</string>
 
-    <!-- iOS settings tutorial schritt 1 -->
-    <string name="ios_settings_tutorial_step_1_text">"Open the system settings via the button below."</string>
+	<!-- iOS settings tutorial schritt 1 -->
+	<string name="ios_settings_tutorial_step_1_text">"Open the system settings via the button below."</string>
 
-    <!-- iOS settings tutorial schritt 2 -->
-    <string name="ios_settings_tutorial_step_2_text">"Select:"</string>
+	<!-- iOS settings tutorial schritt 2 -->
+	<string name="ios_settings_tutorial_step_2_text">"Select:"</string>
 
-    <!-- ios settings tutorial exposure notification text wie in iOS settings -->
-    <string name="ios_settings_tutorial_step_2_exposure_notification">"Exposure Notifications"</string>
+	<!-- ios settings tutorial exposure notification text wie in iOS settings -->
+	<string name="ios_settings_tutorial_step_2_exposure_notification">"Exposure Notifications"</string>
 
-    <!-- iOS settings tutorial schritt 3 -->
-    <string name="ios_settings_tutorial_step_3_text">"First activate the function…"</string>
+	<!-- iOS settings tutorial schritt 3 -->
+	<string name="ios_settings_tutorial_step_3_text">"First activate the function…"</string>
 
-    <!-- iOS settings tutorial share exposure notification text wie in iOS settings -->
-    <string name="ios_settings_tutorial_step_3_share_exposure_information">"Share Exposure Information"</string>
+	<!-- iOS settings tutorial share exposure notification text wie in iOS settings -->
+	<string name="ios_settings_tutorial_step_3_share_exposure_information">"Share Exposure Information"</string>
 
-    <!-- iOS settings tutorial schritt 4 -->
-    <string name="ios_settings_tutorial_step_4_text">"If not done already, you can now set SwissCovid as active region."</string>
+	<!-- iOS settings tutorial schritt 4 -->
+	<string name="ios_settings_tutorial_step_4_text">"If not done already, you can now set SwissCovid as active region."</string>
 
-    <!-- iOS settings tutorial set as aktive region wie in iOS settings -->
-    <string name="ios_settings_tutorial_step_4_set_as_aktive_region">"Set As Active Region"</string>
+	<!-- iOS settings tutorial set as aktive region wie in iOS settings -->
+	<string name="ios_settings_tutorial_step_4_set_as_aktive_region">"Set As Active Region"</string>
 
-    <!-- ios tracing permission fehlermeldung button text -->
-    <string name="ios_tracing_permission_error_button">"How it works"</string>
+	<!-- ios tracing permission fehlermeldung button text -->
+	<string name="ios_tracing_permission_error_button">"How it works"</string>
 
-    <!-- Subtitle für Meldung Detail Screen Header wenn nur eine Begegnung angezeigt wird. -->
-    <!-- Fuzzy -->
-    <string name="meldung_detail_exposed_subtitle_last_encounter">"Last contact"</string>
+	<!-- Subtitle für Meldung Detail Screen Header wenn nur eine Begegnung angezeigt wird. -->
+	<!-- Fuzzy -->
+	<string name="meldung_detail_exposed_subtitle_last_encounter">"Last contact"</string>
 
-    <!-- Subtitle für Meldung Detail Screen Header wenn alle Begegnungen angezeigt werden. -->
-    <string name="meldung_detail_exposed_subtitle_all_encounters">"All contacts"</string>
+	<!-- Subtitle für Meldung Detail Screen Header wenn alle Begegnungen angezeigt werden. -->
+	<string name="meldung_detail_exposed_subtitle_all_encounters">"All contacts"</string>
 
-    <!-- Button Titel im Meldung Detail Header, wenn nur eine Meldung angezeigt wird. -->
-    <!-- Fuzzy -->
-    <string name="meldung_detail_exposed_show_all_button">"Show all"</string>
+	<!-- Button Titel im Meldung Detail Header, wenn nur eine Meldung angezeigt wird. -->
+	<!-- Fuzzy -->
+	<string name="meldung_detail_exposed_show_all_button">"Show all"</string>
 
-    <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
-    <string name="meldung_detail_exposed_show_less_button">"Show fewer"</string>
+	<!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
+	<string name="meldung_detail_exposed_show_less_button">"Show fewer"</string>
 
-    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title">"SwissCovid Guide"</string>
+	<!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+	<string name="meldungen_detail_leitfaden_title">"SwissCovid Guide"</string>
 
-    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text">"Answer the questions in the SwissCovid Guide to find out how to respond."</string>
+	<!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+	<string name="meldungen_detail_leitfaden_text">"Answer the questions in the SwissCovid Guide to find out how to respond."</string>
 
-    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button">"Complete now"</string>
+	<!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+	<string name="meldungen_detail_open_leitfaden_button">"Complete now"</string>
 
-    <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title">"Information by phone"</string>
+	<!-- Title für Infotext zu SwissCovid Infoline -->
+	<string name="meldungen_tel_information_title">"Information by phone"</string>
 
-    <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text">"If you have further questions, feel free to call the SwissCovid Infoline for information by phone."</string>
+	<!-- Infotext zu SwissCovid Infoline -->
+	<string name="meldungen_tel_information_text">"If you have further questions, feel free to call the SwissCovid Infoline for information by phone."</string>
 
-    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text">"You can open the SwissCovid Guide again any time here."</string>
+	<!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+	<string name="meldungen_detail_leitfaden_again_text">"You can open the SwissCovid Guide again any time here."</string>
 
-    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button">"To the guide"</string>
+	<!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+	<string name="meldungen_detail_open_leitfaden_again_button">"To the guide"</string>
 
-    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
+	<!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+	<string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
 
-    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
+	<!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+	<string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
 
-    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog">"The notification of possible infection serves as the proof you need for a free coronavirus test. If you delete this notification you lose this proof and the link to the SwissCovid Guide."</string>
+	<!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+	<string name="delete_notification_dialog">"The notification of possible infection serves as the proof you need for a free coronavirus test. If you delete this notification you lose this proof and the link to the SwissCovid Guide."</string>
 
-    <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+	<!-- URL to the SwissCovid Leitfaden -->
+	<string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 
-    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
-    <string name="tracing_reminder_radio_four_hours">"4 hours"</string>
+	<!-- Tracing Erinnerung 4 Stunden Radio Button -->
+	<string name="tracing_reminder_radio_four_hours">"4 hours"</string>
 
-    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
-    <string name="tracing_reminder_radio_eight_hours">"8 hours"</string>
+	<!-- Tracing Erinnerung 8 Stunden Radio Button -->
+	<string name="tracing_reminder_radio_eight_hours">"8 hours"</string>
 
-    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
-    <string name="tracing_reminder_radio_twelve_hours">"12 hours"</string>
+	<!-- Tracing Erinnerung 12 Stunden Radio Button -->
+	<string name="tracing_reminder_radio_twelve_hours">"12 hours"</string>
 
-    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
-    <string name="tracing_reminder_radio_no_reminder">"No reminder"</string>
+	<!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+	<string name="tracing_reminder_radio_no_reminder">"No reminder"</string>
 
-    <!-- Tracing Erinnerung bestätigen Button -->
-    <string name="tracing_reminder_confirm_button">"OK"</string>
+	<!-- Tracing Erinnerung bestätigen Button -->
+	<string name="tracing_reminder_confirm_button">"OK"</string>
 
-    <!-- Tracing Erinnerung abbrechen Button -->
-    <string name="tracing_reminder_cancel_button">"Cancel"</string>
+	<!-- Tracing Erinnerung abbrechen Button -->
+	<string name="tracing_reminder_cancel_button">"Cancel"</string>
 
-    <!-- Tracing Erinnerung Titel -->
-    <string name="tracing_reminder_title">"Set reminder"</string>
+	<!-- Tracing Erinnerung Titel -->
+	<string name="tracing_reminder_title">"Set reminder"</string>
 
-    <!-- Tracing Erinnerung Untertitel -->
-    <string name="tracing_reminder_subtitle">"SwissCovid can remind you to reactivate tracing."</string>
+	<!-- Tracing Erinnerung Untertitel -->
+	<string name="tracing_reminder_subtitle">"SwissCovid can remind you to reactivate tracing."</string>
 
-    <!-- Tracing Erinnerung Warnung -->
-    <string name="tracing_reminder_warning">"Tracing is deactivated."</string>
+	<!-- Tracing Erinnerung Warnung -->
+	<string name="tracing_reminder_warning">"Tracing is deactivated."</string>
 
-    <!-- Kantonname Zürich -->
-    <string name="canton_zurich">"Zurich"</string>
+	<!-- Kantonname Zürich -->
+	<string name="canton_zurich">"Zurich"</string>
 
-    <!-- Kantonname Aargau -->
-    <!-- Fuzzy -->
-    <string name="canton_aargau">"Aargau"</string>
+	<!-- Kantonname Aargau -->
+	<!-- Fuzzy -->
+	<string name="canton_aargau">"Aargau"</string>
 
-    <!-- Kantonname Appenzell Innerrhoden -->
-    <!-- Fuzzy -->
-    <string name="canton_appenzell_innerrhoden">"Appenzell Innerrhoden"</string>
+	<!-- Kantonname Appenzell Innerrhoden -->
+	<!-- Fuzzy -->
+	<string name="canton_appenzell_innerrhoden">"Appenzell Innerrhoden"</string>
 
-    <!-- Kantonname Appenzell Ausserrhoden -->
-    <!-- Fuzzy -->
-    <string name="canton_appenzell_ausserrhoden">"Appenzell Ausserrhoden"</string>
+	<!-- Kantonname Appenzell Ausserrhoden -->
+	<!-- Fuzzy -->
+	<string name="canton_appenzell_ausserrhoden">"Appenzell Ausserrhoden"</string>
 
-    <!-- Kantonname Bern -->
-    <string name="canton_berne">"Bern"</string>
+	<!-- Kantonname Bern -->
+	<string name="canton_berne">"Bern"</string>
 
-    <!-- Kantonname Basel-Landschaft -->
-    <string name="canton_basel_country">"Basel-Landschaft"</string>
+	<!-- Kantonname Basel-Landschaft -->
+	<string name="canton_basel_country">"Basel-Landschaft"</string>
 
-    <!-- Kantonname Basel-Stadt -->
-    <string name="canton_basel_city">"Basel-Stadt"</string>
+	<!-- Kantonname Basel-Stadt -->
+	<string name="canton_basel_city">"Basel-Stadt"</string>
 
-    <!-- Kantonname Freiburg -->
-    <!-- Fuzzy -->
-    <string name="canton_fribourg">"Fribourg"</string>
+	<!-- Kantonname Freiburg -->
+	<!-- Fuzzy -->
+	<string name="canton_fribourg">"Fribourg"</string>
 
-    <!-- Kantonname Genf -->
-    <!-- Fuzzy -->
-    <string name="canton_geneva">"Geneva"</string>
+	<!-- Kantonname Genf -->
+	<!-- Fuzzy -->
+	<string name="canton_geneva">"Geneva"</string>
 
-    <!-- Kantonname Glarus -->
-    <!-- Fuzzy -->
-    <string name="canton_glarus">"Glarus"</string>
+	<!-- Kantonname Glarus -->
+	<!-- Fuzzy -->
+	<string name="canton_glarus">"Glarus"</string>
 
-    <!-- Kantonname Graubünden -->
-    <!-- Fuzzy -->
-    <string name="canton_graubuenden">"Graubünden"</string>
+	<!-- Kantonname Graubünden -->
+	<!-- Fuzzy -->
+	<string name="canton_graubuenden">"Graubünden"</string>
 
-    <!-- Kantonname Jura -->
-    <!-- Fuzzy -->
-    <string name="canton_jura">"Jura"</string>
+	<!-- Kantonname Jura -->
+	<!-- Fuzzy -->
+	<string name="canton_jura">"Jura"</string>
 
-    <!-- Kantonname Luzern -->
-    <!-- Fuzzy -->
-    <string name="canton_lucerne">"Lucerne"</string>
+	<!-- Kantonname Luzern -->
+	<!-- Fuzzy -->
+	<string name="canton_lucerne">"Lucerne"</string>
 
-    <!-- Kantonname Neuenburg -->
-    <!-- Fuzzy -->
-    <string name="canton_neuchatel">"Neuchâtel"</string>
+	<!-- Kantonname Neuenburg -->
+	<!-- Fuzzy -->
+	<string name="canton_neuchatel">"Neuchâtel"</string>
 
-    <!-- Kantonname Nidwalden -->
-    <!-- Fuzzy -->
-    <string name="canton_nidwalden">"Nidwalden"</string>
+	<!-- Kantonname Nidwalden -->
+	<!-- Fuzzy -->
+	<string name="canton_nidwalden">"Nidwalden"</string>
 
-    <!-- Kantonname Obwalden -->
-    <!-- Fuzzy -->
-    <string name="canton_obwalden">"Obwalden"</string>
+	<!-- Kantonname Obwalden -->
+	<!-- Fuzzy -->
+	<string name="canton_obwalden">"Obwalden"</string>
 
-    <!-- Kantonname St. Gallen -->
-    <!-- Fuzzy -->
-    <string name="canton_st_gallen">"St. Gallen"</string>
+	<!-- Kantonname St. Gallen -->
+	<!-- Fuzzy -->
+	<string name="canton_st_gallen">"St. Gallen"</string>
 
-    <!-- Kantonname Schaffhausen -->
-    <!-- Fuzzy -->
-    <string name="canton_schaffhausen">"Schaffhausen"</string>
+	<!-- Kantonname Schaffhausen -->
+	<!-- Fuzzy -->
+	<string name="canton_schaffhausen">"Schaffhausen"</string>
 
-    <!-- Kantonname Solothurn -->
-    <!-- Fuzzy -->
-    <string name="canton_solothurn">"Solothurn"</string>
+	<!-- Kantonname Solothurn -->
+	<!-- Fuzzy -->
+	<string name="canton_solothurn">"Solothurn"</string>
 
-    <!-- Kantonname Schwyz -->
-    <!-- Fuzzy -->
-    <string name="canton_schwyz">"Schwyz"</string>
+	<!-- Kantonname Schwyz -->
+	<!-- Fuzzy -->
+	<string name="canton_schwyz">"Schwyz"</string>
 
-    <!-- Kantonname Thurgau -->
-    <string name="canton_thurgovia">"Thurgau"</string>
+	<!-- Kantonname Thurgau -->
+	<string name="canton_thurgovia">"Thurgau"</string>
 
-    <!-- Kantonname Tessin -->
-    <!-- Fuzzy -->
-    <string name="canton_ticino">"Ticino"</string>
+	<!-- Kantonname Tessin -->
+	<!-- Fuzzy -->
+	<string name="canton_ticino">"Ticino"</string>
 
-    <!-- Kantonname Uri -->
-    <!-- Fuzzy -->
-    <string name="canton_uri">"Uri"</string>
+	<!-- Kantonname Uri -->
+	<!-- Fuzzy -->
+	<string name="canton_uri">"Uri"</string>
 
-    <!-- Kantonname Waadt -->
-    <!-- Fuzzy -->
-    <string name="canton_vaud">"Vaud"</string>
+	<!-- Kantonname Waadt -->
+	<!-- Fuzzy -->
+	<string name="canton_vaud">"Vaud"</string>
 
-    <!-- Kantonname Wallis -->
-    <!-- Fuzzy -->
-    <string name="canton_valais">"Valais"</string>
+	<!-- Kantonname Wallis -->
+	<!-- Fuzzy -->
+	<string name="canton_valais">"Valais"</string>
 
-    <!-- Kantonname Zug -->
-    <!-- Fuzzy -->
-    <string name="canton_zug">"Zug"</string>
+	<!-- Kantonname Zug -->
+	<!-- Fuzzy -->
+	<string name="canton_zug">"Zug"</string>
 
-    <!-- Kantonname Fürstentum Liechtenstein -->
-    <string name="country_liechtenstein">"Principality of Liechtenstein"</string>
+	<!-- Kantonname Fürstentum Liechtenstein -->
+	<string name="country_liechtenstein">"Principality of Liechtenstein"</string>
 
-    <!-- Test standorte Popup Titel -->
-    <string name="test_location_popup_title">"Where can I get a test?"</string>
+	<!-- Test standorte Popup Titel -->
+	<string name="test_location_popup_title">"Where can I get a test?"</string>
 
-    <!-- Test standorte Popup Text -->
-    <string name="test_location_popup_text">"You can be tested for the coronavirus at various doctors, test centres, hospitals and pharmacies. You will find information on the various testing facilities on the relevant cantonal websites:"</string>
+	<!-- Test standorte Popup Text -->
+	<string name="test_location_popup_text">"You can be tested for the coronavirus at various doctors, test centres, hospitals and pharmacies. You will find information on the various testing facilities on the relevant cantonal websites:"</string>
 
-    <!-- Notification Channel name for Tracing Reactivation Reminders on Android Devices (Only visible in System Settings) -->
-    <string name="android_reminder_channel_name">"Tracing activation reminder"</string>
+	<!-- Notification Channel name for Tracing Reactivation Reminders on Android Devices (Only visible in System Settings) -->
+	<string name="android_reminder_channel_name">"Tracing activation reminder"</string>
 
-    <!-- Titel der Tracing-Reaktivierungs-Notification -->
-    <string name="tracing_reminder_notification_title">"Activate tracing"</string>
+	<!-- Titel der Tracing-Reaktivierungs-Notification -->
+	<string name="tracing_reminder_notification_title">"Activate tracing"</string>
 
-    <!-- Subtitle der Tracing-Reaktivierungs-Notification -->
-    <string name="tracing_reminder_notification_subtitle">"Activate tracing so that the app can save contacts and receive notifications."</string>
+	<!-- Subtitle der Tracing-Reaktivierungs-Notification -->
+	<string name="tracing_reminder_notification_subtitle">"Activate tracing so that the app can save contacts and receive notifications."</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Titel -->
-    <string name="ios_software_update_blocking_title">"Software update required"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Titel -->
+	<string name="ios_software_update_blocking_title">"Software update required"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: text -->
-    <string name="ios_software_update_blocking_text">"For SwissCovid to work you must install the latest version of iOS."</string>
+	<!-- iOS Blockierende View bei benötigten OS update: text -->
+	<string name="ios_software_update_blocking_text">"For SwissCovid to work you must install the latest version of iOS."</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial title -->
-    <string name="ios_software_update_blocking_tutorial_title">"How to install it:"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial title -->
+	<string name="ios_software_update_blocking_tutorial_title">"How to install it:"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial first -->
-    <string name="ios_software_update_blocking_tutorial_first">"Open Settings on your home screen"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial first -->
+	<string name="ios_software_update_blocking_tutorial_first">"Open Settings on your home screen"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial second -->
-    <string name="ios_software_update_blocking_tutorial_second">"Go to..."</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial second -->
+	<string name="ios_software_update_blocking_tutorial_second">"Go to..."</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial second settings general (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
-    <string name="ios_software_update_blocking_tutorial_second_settings">"General"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial second settings general (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
+	<string name="ios_software_update_blocking_tutorial_second_settings">"General"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial third -->
-    <string name="ios_software_update_blocking_tutorial_third">"Select..."</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial third -->
+	<string name="ios_software_update_blocking_tutorial_third">"Select..."</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial third software update (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
-    <string name="ios_software_update_blocking_tutorial_third_software_update">"Software Update"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial third software update (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
+	<string name="ios_software_update_blocking_tutorial_third_software_update">"Software Update"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth -->
-    <string name="ios_software_update_blocking_tutorial_fourth">"Tap..."</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth -->
+	<string name="ios_software_update_blocking_tutorial_fourth">"Tap..."</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth load and install (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
-    <string name="ios_software_update_blocking_tutorial_fourth_load_and_install">"Download and Install"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth load and install (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
+	<string name="ios_software_update_blocking_tutorial_fourth_load_and_install">"Download and Install"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial apple button -->
-    <string name="ios_software_update_blocking_tutorial_apple">"Apple guide"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial apple button -->
+	<string name="ios_software_update_blocking_tutorial_apple">"Apple guide"</string>
 
-    <!-- iOS Blockierende View bei benötigten OS update: Tutorial apple url -->
-    <string name="ios_software_update_blocking_tutorial_apple_url">"https://support.apple.com/en-us/HT204204"</string>
+	<!-- iOS Blockierende View bei benötigten OS update: Tutorial apple url -->
+	<string name="ios_software_update_blocking_tutorial_apple_url">"https://support.apple.com/en-us/HT204204"</string>
 
-    <!-- iOS Notification Text bei benötigten OS update -->
-    <string name="ios_software_update_notification_title">"Software update required"</string>
+	<!-- iOS Notification Text bei benötigten OS update -->
+	<string name="ios_software_update_notification_title">"Software update required"</string>
 
-    <!-- iOS Notification Text bei benötigten OS update -->
-    <string name="ios_software_update_notification_text">"For SwissCovid to work you must install the latest version of iOS."</string>
+	<!-- iOS Notification Text bei benötigten OS update -->
+	<string name="ios_software_update_notification_text">"For SwissCovid to work you must install the latest version of iOS."</string>
 
-    <!-- Button Text um die Isolation zu beenden -->
-    <string name="delete_infection_dialog_finish_button">"End"</string>
+	<!-- Button Text um die Isolation zu beenden -->
+	<string name="delete_infection_dialog_finish_button">"End"</string>
 
-    <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Notifications will no longer be stored.
+	<!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
+	<string name="tracing_ended_info">"Notifications will no longer be stored.
 
 Tracing can be reactivated after isolation."</string>
-    <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
-    <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
-    <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
-    <string name="testlocation_url_canton_basel_country">"https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles"</string>
-    <string name="testlocation_url_canton_basel_city">"https://www.coronavirus.bs.ch/en.html"</string>
-    <string name="testlocation_url_canton_berne">"http://www.be.ch/corona"</string>
-    <string name="testlocation_url_canton_fribourg">"https://www.fr.ch/sante/covid-19/coronavirus-informations-actuelles-toutes-les-actualites-liees-au-covid-19-mesures-prises-faq-statistiques"</string>
-    <string name="testlocation_url_canton_geneva">"https://www.ge.ch/en/covid-19-how-protect-yourself-and-others"</string>
-    <string name="testlocation_url_canton_glarus">"https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817"</string>
-    <string name="testlocation_url_canton_graubuenden">"https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/Seiten/Start.aspx"</string>
-    <string name="testlocation_url_canton_jura">"https://www.jura.ch/fr/Autorites/Coronavirus/Accueil/Coronavirus-Informations-officielles-a-la-population-jurassienne.html"</string>
-    <string name="testlocation_url_canton_lucerne">"https://gesundheit.lu.ch/themen/Humanmedizin/Infektionskrankheiten/Informationen_Coronavirus"</string>
-    <string name="testlocation_url_canton_neuchatel">"https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/Pages/Coronavirus.aspx"</string>
-    <string name="testlocation_url_canton_nidwalden">"https://www.nw.ch/gesundheitsamtdienste/6044"</string>
-    <string name="testlocation_url_canton_obwalden">"https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962"</string>
-    <string name="testlocation_url_canton_st_gallen">"https://www.sg.ch/tools/informationen-coronavirus.html"</string>
-    <string name="testlocation_url_canton_schaffhausen">"https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-2954701-DE.html"</string>
-    <string name="testlocation_url_canton_schwyz">"https://www.sz.ch/behoerden/information-medien/medienmitteilungen/coronavirus.html/72-416-412-1379-6948"</string>
-    <string name="testlocation_url_canton_solothurn">"https://corona.so.ch/"</string>
-    <string name="testlocation_url_canton_thurgovia">"https://www.tg.ch/news/fachdossier-coronavirus.html/10552"</string>
-    <string name="testlocation_url_canton_ticino">"https://www4.ti.ch/dss/dsp/covid19/home/"</string>
-    <string name="testlocation_url_canton_uri">"https://www.ur.ch/themen/2962"</string>
-    <string name="testlocation_url_canton_valais">"https://www.vs.ch/web/coronavirus/"</string>
-    <string name="testlocation_url_canton_zug">"https://www.zg.ch/behoerden/gesundheitsdirektion/amt-fuer-gesundheit/corona"</string>
-    <string name="testlocation_url_canton_vaud">"https://www.vd.ch/toutes-les-actualites/hotline-et-informations-sur-le-coronavirus/"</string>
-
-    <!-- Fuzzy -->
-    <string name="testlocation_url_canton_zurich">"https://www.zh.ch/de/gesundheit/coronavirus.html"</string>
-    <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
-
-    <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Are you deaf or hard of hearing and unable to call the coronavirus infoline on the phone?
+	<string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
+	<string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
+	<string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
+	<string name="testlocation_url_canton_basel_country">"https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles"</string>
+	<string name="testlocation_url_canton_basel_city">"https://www.coronavirus.bs.ch/en.html"</string>
+	<string name="testlocation_url_canton_berne">"http://www.be.ch/corona"</string>
+	<string name="testlocation_url_canton_fribourg">"https://www.fr.ch/sante/covid-19/coronavirus-informations-actuelles-toutes-les-actualites-liees-au-covid-19-mesures-prises-faq-statistiques"</string>
+	<string name="testlocation_url_canton_geneva">"https://www.ge.ch/en/covid-19-how-protect-yourself-and-others"</string>
+	<string name="testlocation_url_canton_glarus">"https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817"</string>
+	<string name="testlocation_url_canton_graubuenden">"https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/Seiten/Start.aspx"</string>
+	<string name="testlocation_url_canton_jura">"https://www.jura.ch/fr/Autorites/Coronavirus/Accueil/Coronavirus-Informations-officielles-a-la-population-jurassienne.html"</string>
+	<string name="testlocation_url_canton_lucerne">"https://gesundheit.lu.ch/themen/Humanmedizin/Infektionskrankheiten/Informationen_Coronavirus"</string>
+	<string name="testlocation_url_canton_neuchatel">"https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/Pages/Coronavirus.aspx"</string>
+	<string name="testlocation_url_canton_nidwalden">"https://www.nw.ch/gesundheitsamtdienste/6044"</string>
+	<string name="testlocation_url_canton_obwalden">"https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962"</string>
+	<string name="testlocation_url_canton_st_gallen">"https://www.sg.ch/tools/informationen-coronavirus.html"</string>
+	<string name="testlocation_url_canton_schaffhausen">"https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-2954701-DE.html"</string>
+	<string name="testlocation_url_canton_schwyz">"https://www.sz.ch/behoerden/information-medien/medienmitteilungen/coronavirus.html/72-416-412-1379-6948"</string>
+	<string name="testlocation_url_canton_solothurn">"https://corona.so.ch/"</string>
+	<string name="testlocation_url_canton_thurgovia">"https://www.tg.ch/news/fachdossier-coronavirus.html/10552"</string>
+	<string name="testlocation_url_canton_ticino">"https://www4.ti.ch/dss/dsp/covid19/home/"</string>
+	<string name="testlocation_url_canton_uri">"https://www.ur.ch/themen/2962"</string>
+	<string name="testlocation_url_canton_valais">"https://www.vs.ch/web/coronavirus/"</string>
+	<string name="testlocation_url_canton_zug">"https://www.zg.ch/behoerden/gesundheitsdirektion/amt-fuer-gesundheit/corona"</string>
+	<string name="testlocation_url_canton_vaud">"https://www.vd.ch/toutes-les-actualites/hotline-et-informations-sur-le-coronavirus/"</string>
+
+	<!-- Fuzzy -->
+	<string name="testlocation_url_canton_zurich">"https://www.zh.ch/de/gesundheit/coronavirus.html"</string>
+	<string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
+
+	<!-- text for info box pop up for the hearing impaired -->
+	<string name="hearing_impaired_info">"Are you deaf or hard of hearing and unable to call the coronavirus infoline on the phone?
 
 Send an email to covid-support@medgate.ch."</string>
 
-    <!-- Überschrift des Covidcodes-Statistik-Moduls -->
-    <string name="stats_covidcodes_title">"Covidcodes"</string>
+	<!-- Überschrift des Covidcodes-Statistik-Moduls -->
+	<string name="stats_covidcodes_title">"Covidcodes"</string>
 
-    <!-- Überschrift des Fallzahlen-Statistik Moduls -->
-    <string name="stats_cases_title">"Numbers of cases"</string>
+	<!-- Überschrift des Fallzahlen-Statistik Moduls -->
+	<string name="stats_cases_title">"Numbers of cases"</string>
 
-    <!-- Untertitel des Fallzahlen-Statistik-Moduls -->
-    <string name="stats_cases_subtitle">"Current development"</string>
+	<!-- Untertitel des Fallzahlen-Statistik-Moduls -->
+	<string name="stats_cases_subtitle">"Current development"</string>
 
-    <!-- Label der "Total eingegebene Covidcodes" Statistik -->
-    <string name="stats_covidcodes_total_label">"entered"</string>
+	<!-- Label der "Total eingegebene Covidcodes" Statistik -->
+	<string name="stats_covidcodes_total_label">"entered"</string>
 
-    <!-- Label der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
-    <string name="stats_covidcodes_0to2days_label">"within 0-2 days"</string>
+	<!-- Label der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
+	<string name="stats_covidcodes_0to2days_label">"within 0-2 days"</string>
 
-    <!-- Label der "7-Tage-Schnitt Fallzahlen" Statistik -->
-    <string name="stats_cases_7day_average_label">"7-day average"</string>
+	<!-- Label der "7-Tage-Schnitt Fallzahlen" Statistik -->
+	<string name="stats_cases_7day_average_label">"7-day average"</string>
 
-    <!-- Label der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
-    <string name="stats_cases_rel_prev_week_label">"vs previous week"</string>
+	<!-- Label der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
+	<string name="stats_cases_rel_prev_week_label">"vs previous week"</string>
 
-    <!-- Überschrift des Info-Popups auf dem Statistik-Screen -->
-    <string name="stats_info_popup_title">"Details on the figures"</string>
+	<!-- Überschrift des Info-Popups auf dem Statistik-Screen -->
+	<string name="stats_info_popup_title">"Details on the figures"</string>
 
-    <!-- Untertitel des Infopopups zu Covidcodes-Statistiken -->
-    <string name="stats_info_popup_subtitle_covidcodes">"Covidcodes entered"</string>
+	<!-- Untertitel des Infopopups zu Covidcodes-Statistiken -->
+	<string name="stats_info_popup_subtitle_covidcodes">"Covidcodes entered"</string>
 
-    <!-- Untertitel des Infopopups zu Fallzahlen-Statistiken -->
-    <string name="stats_info_popup_subtitle_cases">"Numbers of cases"</string>
+	<!-- Untertitel des Infopopups zu Fallzahlen-Statistiken -->
+	<string name="stats_info_popup_subtitle_cases">"Numbers of cases"</string>
 
-    <!-- Beschreibung der "Total eingegebene Covidcodes" Statistik -->
-    <string name="stats_covidcodes_total_description">"Number of Covidcodes entered since the launch of the SwissCovid app in June 2020. This is the number of people who have notified their contacts of possible infection via the app."</string>
+	<!-- Beschreibung der "Total eingegebene Covidcodes" Statistik -->
+	<string name="stats_covidcodes_total_description">"Number of Covidcodes entered since the launch of the SwissCovid app in June 2020. This is the number of people who have notified their contacts of possible infection via the app."</string>
 
-    <!-- Beschreibung der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
-    <string name="stats_covidcodes_0to2days_description">"The percentage of Covidcodes entered already in the first two days after onset of symptoms. This figure is for the last 7 days.
+	<!-- Beschreibung der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
+	<string name="stats_covidcodes_0to2days_description">"The percentage of Covidcodes entered already in the first two days after onset of symptoms. This figure is for the last 7 days.
 
 Time is a crucial factor when it comes to combating coronavirus: the shorter the time between the onset of symptoms, the result of the test and entering the Covidcode, the earlier alerted contacts can stay at home and protect other people."</string>
 
-    <!-- Beschreibung der "7-Tage-Schnitt Fallzahlen" Statistik -->
-    <string name="stats_cases_7day_average_description">"Shows the average number of reported new infections per day over 7 days."</string>
+	<!-- Beschreibung der "7-Tage-Schnitt Fallzahlen" Statistik -->
+	<string name="stats_cases_7day_average_description">"Shows the average number of reported new infections per day over 7 days."</string>
 
-    <!-- Beschreibung der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
-    <string name="stats_cases_rel_prev_week_description">"Shows the change in the 7-day average compared with the situation a week ago."</string>
+	<!-- Beschreibung der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
+	<string name="stats_cases_rel_prev_week_description">"Shows the change in the 7-day average compared with the situation a week ago."</string>
 
-    <!-- Label der "Aktuelle Entwicklung" Statistik -->
-    <string name="stats_cases_current_label">"Current developments"</string>
+	<!-- Label der "Aktuelle Entwicklung" Statistik -->
+	<string name="stats_cases_current_label">"Current developments"</string>
 
-    <!-- Beschreibung der "Aktuelle Entwicklung" Statistik -->
-    <string name="stats_cases_current_description">"The chart shows new infections reported in the last 28 days. This gives an overview of current developments."</string>
+	<!-- Beschreibung der "Aktuelle Entwicklung" Statistik -->
+	<string name="stats_cases_current_description">"The chart shows new infections reported in the last 28 days. This gives an overview of current developments."</string>
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"Have you tested positive (PCR test or rapid antigen test) and did not receive a Covidcode after 4 hours?
 If so, contact the Coronavirus Infoline:"</string>
 
-    <!-- Inform Detail: Infobox Title -->
-    <string name="inform_detail_infobox1_title">"Don’t have a Covidcode yet?"</string>
+	<!-- Inform Detail: Infobox Title -->
+	<string name="inform_detail_infobox1_title">"Don’t have a Covidcode yet?"</string>
 
-    <!-- Titel des Popups mit der Frage, ob der User die Isolation beendet hat -->
-    <string name="homescreen_isolation_ended_popup_title">"Have you come out of isolation?"</string>
+	<!-- Titel des Popups mit der Frage, ob der User die Isolation beendet hat -->
+	<string name="homescreen_isolation_ended_popup_title">"Have you come out of isolation?"</string>
 
-    <!-- Text des Popups mit der Frage, ob der User die Isolation beendet hat -->
-    <string name="homescreen_isolation_ended_popup_text">"Tracing can be reactivated once you have completed your period of isolation."</string>
+	<!-- Text des Popups mit der Frage, ob der User die Isolation beendet hat -->
+	<string name="homescreen_isolation_ended_popup_text">"Tracing can be reactivated once you have completed your period of isolation."</string>
 
-    <!-- Ja-Antwort -->
-    <string name="answer_yes">"Yes"</string>
+	<!-- Ja-Antwort -->
+	<string name="answer_yes">"Yes"</string>
 
-    <!-- Nein-Antwort -->
-    <string name="answer_no">"No"</string>
+	<!-- Nein-Antwort -->
+	<string name="answer_no">"No"</string>
 
-    <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"Travelling abroad? SwissCovid works in these countries."</string>
+	<!-- Text in der Infobox auf dem Reisen-Screen -->
+	<string name="travel_screen_info">"Travelling abroad? SwissCovid works in these countries."</string>
 
-    <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
-    <string name="travel_screen_compatible_countries">"Compatible countries:"</string>
+	<!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
+	<string name="travel_screen_compatible_countries">"Compatible countries:"</string>
 
-    <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"To enable travellers from abroad to receive alerts as well, the private keys are also shared with the coronavirus apps in compatible countries."</string>
+	<!-- Informieren Flow: Erster Screen Reise-Infotext -->
+	<string name="inform_code_travel_text">"To enable travellers from abroad to receive alerts as well, the private keys are also shared with the coronavirus apps in compatible countries."</string>
 
-    <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
-    <string name="stats_covidcodes_total_header">"Total"</string>
+	<!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
+	<string name="stats_covidcodes_total_header">"Total"</string>
 
-    <!-- Überschrift der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
-    <string name="stats_covidcodes_0to2days_header">"Current"</string>
+	<!-- Überschrift der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
+	<string name="stats_covidcodes_0to2days_header">"Current"</string>
 
-    <!-- Überschrift im Popup für die "Veränderung zur Vorwoche" Statistik -->
-    <string name="stats_cases_rel_prev_week_popup_header">"Change versus previous week"</string>
+	<!-- Überschrift im Popup für die "Veränderung zur Vorwoche" Statistik -->
+	<string name="stats_cases_rel_prev_week_popup_header">"Change versus previous week"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Titel (Benachrichtigung) -->
     <string name="meldungen_positive_tested_faq2_title">"Who will be notified?"</string>
@@ -1422,20 +1422,17 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Update Boarding: Heading oben -->
     <string name="germany_update_boarding_heading">"SwissCovid update"</string>
 
-    <!-- Debug Screen: Update-Boarding Reset Button -->
-    <string name="reset_update_boarding">"Reset update boarding"</string>
+	<!-- Debug Screen: Update-Boarding Reset Button -->
+	<string name="reset_update_boarding">"Reset update boarding"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
     <string name="meldungen_detail_free_test_text">"A coronavirus test is advisable and recommended from the 5th day after the displayed contact date."</string>
 
-    <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt in wievielen Tagen ein Test gemacht werden soll. -->
-    <string name="meldungen_detail_free_test_in_x_tagen">"In {COUNT} days"</string>
-
-    <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass jetzt ein Test gemacht werden soll. -->
-    <string name="meldungen_detail_free_test_now">"Now"</string>
+	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt in wievielen Tagen ein Test gemacht werden soll. -->
+	<string name="meldungen_detail_free_test_in_x_tagen">"In {COUNT} days"</string>
 
-    <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
-    <string name="meldungen_detail_free_test_tomorrow">"In 1 day"</string>
+	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass jetzt ein Test gemacht werden soll. -->
+	<string name="meldungen_detail_free_test_now">"Now"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
     <string name="checkout_reminder_title"></string>
@@ -1607,7 +1604,6 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="error_action_update"></string>
     <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
 
@@ -1648,4 +1644,10 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <!-- Quick Action bei einer Reminder Notification, welche einen neuen Reminder setzt in 30 Minuten. -->
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
+	<string name="meldungen_detail_free_test_tomorrow"></string>
+	<string name="qr_code_erstellen">[TBT] QR-Code erstellen</string>
+	<string name="qr_code_empty_list">[TBT] Keine QR-Codes von Veranstaltungen erstellt</string>
 </resources>
\ No newline at end of file

From 7aaf695c28a98670dad15a7bd279167a4544c074 Mon Sep 17 00:00:00 2001
From: Clea Benz <benz@ubique.ch>
Date: Wed, 28 Apr 2021 22:07:28 +0200
Subject: [PATCH 017/207] PP-966: add generate qr-code screen

---
 .../checkin/events/EventsOverviewFragment.kt  | 10 ++-
 .../generateqrcode/GenerateQrCodeFragment.kt  | 78 +++++++++++++++++
 .../res/layout/fragment_generate_qr_code.xml  | 87 +++++++++++++++++++
 .../main/res/layout/item_generate_qr_code.xml |  2 +-
 app/src/main/res/values/strings.xml           |  6 +-
 5 files changed, 177 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_generate_qr_code.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index 538bacbbc..584fdf513 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -5,6 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.generateqrcode.GenerateQrCodeFragment
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
 
 class EventsOverviewFragment : Fragment() {
@@ -27,11 +29,11 @@ class EventsOverviewFragment : Fragment() {
 		super.onViewCreated(view, savedInstanceState)
 		val adapter = QrCodeAdapter(object : OnClickListener {
 			override fun generateQrCode() {
-				/*requireActivity().supportFragmentManager.beginTransaction()
+				requireActivity().supportFragmentManager.beginTransaction()
 					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-					.replace(R.id.main_fragment_container, )
-					.addToBackStack(::class.java.canonicalName)
-					.commit()*/
+					.replace(R.id.main_fragment_container, GenerateQrCodeFragment.newInstance())
+					.addToBackStack(GenerateQrCodeFragment::class.java.canonicalName)
+					.commit()
 			}
 
 			override fun onQrCodeClicked(qrCodeItem: QrCodeItem) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
new file mode 100644
index 000000000..4f1f2d765
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -0,0 +1,78 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.content.res.ColorStateList
+import android.graphics.BlendMode
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RadioButton
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.databinding.FragmentGenerateQrCodeBinding
+
+class GenerateQrCodeFragment : Fragment() {
+
+	companion object {
+		fun newInstance(): GenerateQrCodeFragment {
+			return GenerateQrCodeFragment()
+		}
+	}
+
+	private lateinit var binding: FragmentGenerateQrCodeBinding
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater)
+		return binding.root
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+
+		val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
+		for (event in events) {
+			val radioButton = RadioButton(requireContext())
+			radioButton.text = event.value
+			radioButton.setRadioButtonColor()
+			binding.generateQrCodeRadioGroup.addView(radioButton)
+		}
+	}
+
+	enum class EventType(val value: String) {
+		PRIVATE_EVENT("Privater Event"),
+		MEETING_ROOM("Sitzungsraum"),
+		OFFICE("Büroräume"),
+		OTHERS("Andere")
+	}
+}
+
+fun RadioButton.setRadioButtonColor() {
+	val colorStateListButton = ColorStateList(
+		arrayOf(
+			intArrayOf(-android.R.attr.state_checked),
+			intArrayOf(android.R.attr.state_checked)
+		), intArrayOf(
+			Color.parseColor("#cdcdd0"),
+			Color.parseColor("#5094bf")
+		)
+	)
+	val colorStateListText = ColorStateList(
+		arrayOf(
+			intArrayOf(-android.R.attr.state_checked),
+			intArrayOf(android.R.attr.state_checked)
+		), intArrayOf(
+			Color.parseColor("#4A4969"),
+			Color.parseColor("#5094bf")
+		)
+	)
+	buttonTintList = colorStateListButton
+	setTextColor(colorStateListText)
+
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		buttonTintBlendMode = BlendMode.SRC_IN
+	} else {
+		buttonTintMode = PorterDuff.Mode.SRC_IN
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
new file mode 100644
index 000000000..a56875985
--- /dev/null
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/white"
+	android:orientation="vertical"
+	android:padding="20dp">
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<TextView
+				style="@style/NextStep.Text.Blue"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="end"
+				android:text="@string/cancel" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginVertical="@dimen/spacing_huge"
+				android:text="@string/qr_code_erstellen_title" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/generate_qr_code_kategorie_title"
+				android:textAllCaps="true" />
+
+			<RadioGroup
+				android:id="@+id/generate_qr_code_radio_group"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:layout_marginBottom="@dimen/spacing_huger" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/generate_qr_code_name_title"
+				android:textAllCaps="true" />
+
+			<EditText
+				style="@style/NextStep.Text.Bold.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginVertical="@dimen/spacing_large"
+				android:backgroundTint="@color/blue_main"
+				android:hint="@string/generate_qr_code_name_hint"
+				app:backgroundTint="@color/blue_main" />
+
+		</LinearLayout>
+
+	</ScrollView>
+
+	<Button
+		android:id="@+id/qr_code_generate"
+		style="@style/NextStep.Button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal|bottom"
+		android:layout_marginTop="@dimen/spacing_medium"
+		android:text="@string/qr_code_erstellen_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_generate_qr_code.xml b/app/src/main/res/layout/item_generate_qr_code.xml
index 5f5f7bc28..dd34600f5 100644
--- a/app/src/main/res/layout/item_generate_qr_code.xml
+++ b/app/src/main/res/layout/item_generate_qr_code.xml
@@ -11,6 +11,6 @@
 		style="@style/NextStep.Button"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="@string/qr_code_erstellen" />
+		android:text="@string/qr_code_erstellen_button" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be1cd7ada..ea93042fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1648,6 +1648,10 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
 	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
 	<string name="meldungen_detail_free_test_tomorrow"></string>
-	<string name="qr_code_erstellen">[TBT] QR-Code erstellen</string>
+	<string name="qr_code_erstellen_button">[TBT] QR-Code erstellen</string>
 	<string name="qr_code_empty_list">[TBT] Keine QR-Codes von Veranstaltungen erstellt</string>
+	<string name="qr_code_erstellen_title">[TBT] QR-Code erstellen</string>
+	<string name="generate_qr_code_kategorie_title">Kategorie</string>
+	<string name="generate_qr_code_name_title">Titel</string>
+	<string name="generate_qr_code_name_hint">z.B. Raum- oder Eventname</string>
 </resources>
\ No newline at end of file

From f317be8752a9c1f0c172b662d473813b95a9204a Mon Sep 17 00:00:00 2001
From: Clea Benz <benz@ubique.ch>
Date: Sun, 2 May 2021 12:09:26 +0200
Subject: [PATCH 018/207] PP-966: save protobuff in datastore

---
 app/build.gradle                              |  1 +
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  2 +-
 .../checkin/events/EventsOverviewFragment.kt  | 19 +++++-
 .../bag/dp3t/checkin/events/QrCodeAdapter.kt  | 18 +++---
 .../bag/dp3t/checkin/events/QrCodeItem.kt     |  4 --
 .../generateqrcode/GenerateQrCodeFragment.kt  | 29 +++++++++
 .../generateqrcode/QRCodePayloadSerializer.kt | 30 +++++++++
 .../checkin/generateqrcode/QRCodeViewModel.kt | 62 +++++++++++++++++++
 .../bag/dp3t/checkin/generateqrcode/QrCode.kt | 32 ++++++++++
 .../res/layout/fragment_checkin_overview.xml  | 27 ++++++++
 .../res/layout/fragment_events_overview.xml   |  2 +-
 .../res/layout/fragment_generate_qr_code.xml  |  1 +
 12 files changed, 211 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt

diff --git a/app/build.gradle b/app/build.gradle
index d7b6b2848..d23bfe1df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -219,6 +219,7 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.0.0'
 	implementation 'androidx.security:security-crypto:1.0.0-rc03'
 	implementation 'androidx.work:work-runtime-ktx:2.5.0'
+	implementation "androidx.datastore:datastore:1.0.0-beta01"
 
 	implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
 	implementation 'io.reactivex.rxjava3:rxjava:3.0.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 3031c1c69..8dbfb57dc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -38,7 +38,7 @@ class CheckinOverviewFragment : Fragment() {
 			requireActivity().supportFragmentManager.popBackStack()
 		}
 
-		binding.checkinOverviewScanQr.setOnClickListener {
+		binding.qrCodeGenerate.setOnClickListener {
 			requireActivity().supportFragmentManager.beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 				.replace(R.id.main_fragment_container, EventsOverviewFragment.newInstance())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index 584fdf513..03e7baca2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -5,9 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.generateqrcode.GenerateQrCodeFragment
+import ch.admin.bag.dp3t.checkin.generateqrcode.QRCodeViewModel
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
+import org.crowdnotifier.android.sdk.model.v3.ProtoV3
 
 class EventsOverviewFragment : Fragment() {
 
@@ -18,6 +22,7 @@ class EventsOverviewFragment : Fragment() {
 	}
 
 	private lateinit var binding: FragmentEventsOverviewBinding
+	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		super.onCreateView(inflater, container, savedInstanceState)
@@ -27,6 +32,11 @@ class EventsOverviewFragment : Fragment() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+
+		binding.eventsToolbar.setNavigationOnClickListener {
+			requireActivity().supportFragmentManager.popBackStack()
+		}
+
 		val adapter = QrCodeAdapter(object : OnClickListener {
 			override fun generateQrCode() {
 				requireActivity().supportFragmentManager.beginTransaction()
@@ -36,13 +46,18 @@ class EventsOverviewFragment : Fragment() {
 					.commit()
 			}
 
-			override fun onQrCodeClicked(qrCodeItem: QrCodeItem) {
-				TODO("Not yet implemented")
+			override fun onQrCodeClicked(qrCodeItem: ProtoV3.QRCodePayload) {
+				//TODO show qr code
 			}
 
 		})
 		binding.qrList.adapter = adapter
 		adapter.setItems(emptyList())
+		qrCodeViewModel.loadQrCodePayloads()
+		qrCodeViewModel.qrCodeListStateLiveData.observe(viewLifecycleOwner, Observer {
+			adapter.setItems(it)
+		})
+
 	}
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
index 5b86b7344..298a384cf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.RecyclerView
 import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeEmptyListBinding
+import org.crowdnotifier.android.sdk.model.v3.ProtoV3
 
 class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeBaseViewHolder<*>>() {
 
@@ -17,7 +18,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 	private var items: List<Any> = emptyList()
 
-	fun setItems(qrCodes: List<QrCodeItem>) {
+	fun setItems(qrCodes: List<ProtoV3.QRCodePayload>) {
 		val newItems: ArrayList<Any> = ArrayList()
 		newItems.add(GenerateQrCodeItem())
 		if (qrCodes.isEmpty()) {
@@ -53,7 +54,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 		val item = items[position]
 		when (holder) {
 			is GenerateQrCodeViewHolder -> holder.bind(item as GenerateQrCodeItem)
-			is QrCodeViewHolder -> holder.bind(item as QrCodeItem)
+			is QrCodeViewHolder -> holder.bind(item as ProtoV3.QRCodePayload)
 			is QrCodeEmptyListViewHolder -> holder.bind(item as QrCodeEmptyListItem)
 			else -> throw  IllegalArgumentException()
 		}
@@ -61,7 +62,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 	override fun getItemViewType(position: Int): Int {
 		return when (items[position]) {
-			is QrCodeItem -> TYPE_QR_CODE
+			is ProtoV3.QRCodePayload -> TYPE_QR_CODE
 			is GenerateQrCodeItem -> TYPE_GENERATE_QR_CODE
 			is QrCodeEmptyListItem -> TYPE_QR_EMPTY_LIST
 			else -> throw java.lang.IllegalArgumentException("Invalid type of data at position $position")
@@ -82,10 +83,11 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 	}
 
-	inner class QrCodeViewHolder(private val binding: ItemQrCodeBinding) : QrCodeBaseViewHolder<QrCodeItem>(binding.root) {
-		override fun bind(item: QrCodeItem) {
-			binding.qrCodeName.setText("UB E21.7")
-			binding.qrCodeLocation.setText("Sitzungsraum")
+	inner class QrCodeViewHolder(private val binding: ItemQrCodeBinding) :
+		QrCodeBaseViewHolder<ProtoV3.QRCodePayload>(binding.root) {
+		override fun bind(item: ProtoV3.QRCodePayload) {
+			binding.qrCodeName.text = item.locationData.description
+			binding.qrCodeLocation.text = item.countryData.toString()
 			binding.root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
 		}
 
@@ -101,7 +103,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 interface OnClickListener {
 	fun generateQrCode()
-	fun onQrCodeClicked(qrCodeItem: QrCodeItem)
+	fun onQrCodeClicked(qrCodeItem: ProtoV3.QRCodePayload)
 }
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
index ee82321ee..88199a9f6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
@@ -1,9 +1,5 @@
 package ch.admin.bag.dp3t.checkin.events
 
-class QrCodeItem {
-
-}
-
 class GenerateQrCodeItem {
 
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 4f1f2d765..30772f492 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -11,7 +11,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import ch.admin.bag.dp3t.databinding.FragmentGenerateQrCodeBinding
+import org.crowdnotifier.android.sdk.model.v3.ProtoV3
 
 class GenerateQrCodeFragment : Fragment() {
 
@@ -22,6 +25,7 @@ class GenerateQrCodeFragment : Fragment() {
 	}
 
 	private lateinit var binding: FragmentGenerateQrCodeBinding
+	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater)
@@ -31,6 +35,10 @@ class GenerateQrCodeFragment : Fragment() {
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
+		binding.generateQrCodeCancel.setOnClickListener {
+			requireActivity().supportFragmentManager.popBackStack()
+		}
+
 		val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
 		for (event in events) {
 			val radioButton = RadioButton(requireContext())
@@ -38,6 +46,27 @@ class GenerateQrCodeFragment : Fragment() {
 			radioButton.setRadioButtonColor()
 			binding.generateQrCodeRadioGroup.addView(radioButton)
 		}
+
+		binding.qrCodeGenerate.setOnClickListener {
+			val trac = ProtoV3.TraceLocation.newBuilder().setDescription("mau").build()
+			val protobuff: ProtoV3.QRCodePayload =
+				ProtoV3.QRCodePayload.newBuilder().setVersion(3)
+					.setLocationData(trac).build()
+			//TODO PP-966  for saving a list, we need a superior class which contains an list of QRCodePayloads
+			//so we can use this approach https://stackoverflow.com/questions/64430872/how-to-save-a-list-of-objects-with-proto-datastore
+			qrCodeViewModel.saveQRCodePayload(protobuff)
+		}
+
+		qrCodeViewModel.qrCodeStateLiveData.observe(viewLifecycleOwner, Observer { state ->
+			when (state) {
+				is QrCodePayloadState.SUCCESS -> {
+					requireActivity().supportFragmentManager.popBackStack()
+				}
+				is QrCodePayloadState.ERROR -> {
+					//TODO PP-966 show error
+				}
+			}
+		})
 	}
 
 	enum class EventType(val value: String) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt
new file mode 100644
index 000000000..762ef0174
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt
@@ -0,0 +1,30 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.content.Context
+import androidx.datastore.core.CorruptionException
+import androidx.datastore.core.DataStore
+import androidx.datastore.core.Serializer
+import androidx.datastore.dataStore
+import com.google.protobuf.InvalidProtocolBufferException
+import org.crowdnotifier.android.sdk.model.v3.ProtoV3
+import java.io.InputStream
+import java.io.OutputStream
+
+object QRCodePayloadSerializer : Serializer<ProtoV3.QRCodePayload> {
+	override val defaultValue: ProtoV3.QRCodePayload = ProtoV3.QRCodePayload.getDefaultInstance()
+
+	override suspend fun readFrom(input: InputStream): ProtoV3.QRCodePayload {
+		try {
+			return ProtoV3.QRCodePayload.parseFrom(input)
+		} catch (exception: InvalidProtocolBufferException) {
+			throw  CorruptionException("Cannot read proto.", exception)
+		}
+	}
+
+	override suspend fun writeTo(t: ProtoV3.QRCodePayload, output: OutputStream) = t.writeTo(output)
+}
+
+val Context.qrCodePayloadDataStore: DataStore<ProtoV3.QRCodePayload> by dataStore(
+	fileName = "qrCodePayloads.pb",
+	serializer = QRCodePayloadSerializer
+)
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
new file mode 100644
index 000000000..0a2b2ac00
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -0,0 +1,62 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.app.Application
+import android.util.Log
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.crowdnotifier.android.sdk.model.v3.ProtoV3
+import java.io.IOException
+
+class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
+
+	private val qrCodeStateMutableLiveData: MutableLiveData<QrCodePayloadState> = MutableLiveData()
+	val qrCodeStateLiveData: LiveData<QrCodePayloadState> = qrCodeStateMutableLiveData
+
+	private val qrCodeListStateMutableLiveData: MutableLiveData<List<ProtoV3.QRCodePayload>> = MutableLiveData()
+	val qrCodeListStateLiveData: LiveData<List<ProtoV3.QRCodePayload>> = qrCodeListStateMutableLiveData
+
+	fun saveQRCodePayload(qrCodePayload: ProtoV3.QRCodePayload) {
+		viewModelScope.launch {
+			try {
+				val qrCodePayload = getApplication<Application>().qrCodePayloadDataStore.updateData {
+					qrCodePayload
+				}
+				qrCodeStateMutableLiveData.postValue(QrCodePayloadState.SUCCESS(qrCodePayload))
+			} catch (e: Exception) {
+				qrCodeStateMutableLiveData.postValue(QrCodePayloadState.ERROR(e))
+			}
+
+		}
+	}
+
+	fun loadQrCodePayloads() {
+		viewModelScope.launch {
+			val flow: Flow<ProtoV3.QRCodePayload> = getApplication<Application>().qrCodePayloadDataStore.data.catch { exception ->
+				if (exception is IOException) {
+					Log.e("QRCODEPayload", "Error reading sort order preferences.", exception)
+					emit(ProtoV3.QRCodePayload.getDefaultInstance())
+				} else {
+					throw exception
+				}
+			}
+
+			val arrayList = arrayListOf<ProtoV3.QRCodePayload>()
+			flow.collect { payload ->
+				arrayList.add(payload)
+				qrCodeListStateMutableLiveData.postValue(arrayList.toList())
+			}
+
+		}
+	}
+}
+
+sealed class QrCodePayloadState {
+	data class SUCCESS(val qrCodePayload: ProtoV3.QRCodePayload) : QrCodePayloadState()
+	data class ERROR(val exception: java.lang.Exception) : QrCodePayloadState()
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt
new file mode 100644
index 000000000..91abdf3cf
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt
@@ -0,0 +1,32 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.graphics.Bitmap
+import android.graphics.Color
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.MultiFormatWriter
+
+class QrCode private constructor(val value: String, val size: Int) {
+
+	companion object {
+		@JvmStatic
+		fun create(value: String): QrCode {
+			return QrCode(value, encode(value, 0).width)
+		}
+
+		@JvmStatic
+		private fun encode(value: String, size: Int) = MultiFormatWriter().encode(value, BarcodeFormat.QR_CODE, size, size, mapOf(EncodeHintType.MARGIN to 0))
+	}
+
+	fun renderToBitmap(outSize: Int = 0): Bitmap {
+		val bitMatrix = encode(value, outSize)
+		val bitmap = Bitmap.createBitmap(bitMatrix.width, bitMatrix.height, Bitmap.Config.RGB_565)
+		for (x in 0 until bitMatrix.width) {
+			for (y in 0 until bitMatrix.height) {
+				bitmap.setPixel(x, y, if (bitMatrix[x, y]) Color.BLACK else Color.WHITE)
+			}
+		}
+		return bitmap
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 09058451b..8635f0938 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -172,6 +172,33 @@
 
 			</androidx.cardview.widget.CardView>
 
+			<androidx.cardview.widget.CardView
+				android:id="@+id/qr_code_generate"
+				style="@style/NextStep.Card"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium_large"
+				android:layout_marginEnd="@dimen/spacing_medium_large"
+				android:layout_marginBottom="@dimen/spacing_medium_large">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<TextView
+						style="@style/NextStep.Text.Title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/spacing_large"
+						android:layout_marginTop="@dimen/spacing_medium_large"
+						android:layout_marginRight="@dimen/spacing_large"
+						android:layout_marginBottom="@dimen/spacing_medium"
+						android:text="[TBT] QR Code Generieren" />
+
+				</LinearLayout>
+			</androidx.cardview.widget.CardView>
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/main/res/layout/fragment_events_overview.xml b/app/src/main/res/layout/fragment_events_overview.xml
index da51a06c4..8c4d95f06 100644
--- a/app/src/main/res/layout/fragment_events_overview.xml
+++ b/app/src/main/res/layout/fragment_events_overview.xml
@@ -16,7 +16,7 @@
 	android:orientation="vertical">
 
 	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/generate_qr_toolbar"
+		android:id="@+id/events_toolbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index a56875985..7615aa690 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -27,6 +27,7 @@
 			android:orientation="vertical">
 
 			<TextView
+				android:id="@+id/generate_qr_code_cancel"
 				style="@style/NextStep.Text.Blue"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"

From 384818d024d17f041fbe7288dcb5ff7e73da4816 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 3 May 2021 18:41:27 +0200
Subject: [PATCH 019/207] Implemented Storing of List of QR Codes

---
 .../checkin/checkinflow/CheckInFragment.java  |   4 +-
 .../checkin/checkinflow/CheckOutFragment.java |   4 +-
 .../checkin/events/EventsOverviewFragment.kt  |  10 +-
 .../bag/dp3t/checkin/events/QrCodeAdapter.kt  |  18 +--
 .../generateqrcode/GenerateQrCodeFragment.kt  |  49 ++++----
 .../GeneratedQrCodesSerializer.kt             |  22 ++++
 .../generateqrcode/QRCodePayloadSerializer.kt |  30 -----
 .../checkin/generateqrcode/QRCodeViewModel.kt | 114 ++++++++++++------
 .../networking/TraceKeysRepository.java       |   7 +-
 .../checkin/utils/NotificationHelper.java     |   2 +-
 .../checkin/utils/QrCodePayloadExtensions.kt  |  10 ++
 .../checkin/utils/VenueInfoExtensions.java    |  31 -----
 .../dp3t/checkin/utils/VenueInfoExtensions.kt |  31 +++++
 app/src/main/proto/App.proto                  |  49 ++++++++
 .../{Proto.proto => Crowdnotifier.proto}      |  12 +-
 .../res/layout/fragment_generate_qr_code.xml  |   1 +
 16 files changed, 232 insertions(+), 162 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GeneratedQrCodesSerializer.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
 create mode 100644 app/src/main/proto/App.proto
 rename app/src/main/proto/{Proto.proto => Crowdnotifier.proto} (82%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
index 7dbc616d7..8ffc3ceae 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
@@ -21,7 +21,7 @@
 import ch.admin.bag.dp3t.checkin.models.ReminderOption;
 import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
-import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensions;
+import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
 
 public class CheckInFragment extends Fragment {
 
@@ -68,7 +68,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		MaterialButtonToggleGroup toggleGroup = view.findViewById(R.id.check_in_fragment_toggle_group);
 
 		titleTextView.setText(venueInfo.getTitle());
-		subtitleTextView.setText(VenueInfoExtensions.getSubtitle(venueInfo));
+		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
 
 		checkInButton.setOnClickListener(v -> {
 			long checkInTime = System.currentTimeMillis();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index b16d3ff5c..49adbc93d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -24,7 +24,7 @@
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
-import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensions;
+import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 public class CheckOutFragment extends Fragment {
@@ -87,7 +87,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
 
 		titleTextView.setText(venueInfo.getTitle());
-		subtitleTextView.setText(VenueInfoExtensions.getSubtitle(venueInfo));
+		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
 
 		checkInState.setCheckOutTime(System.currentTimeMillis());
 		refreshTimeTextViews();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index 03e7baca2..588e0e48c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -6,12 +6,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.generateqrcode.GenerateQrCodeFragment
 import ch.admin.bag.dp3t.checkin.generateqrcode.QRCodeViewModel
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
-import org.crowdnotifier.android.sdk.model.v3.ProtoV3
+import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class EventsOverviewFragment : Fragment() {
 
@@ -46,19 +45,16 @@ class EventsOverviewFragment : Fragment() {
 					.commit()
 			}
 
-			override fun onQrCodeClicked(qrCodeItem: ProtoV3.QRCodePayload) {
+			override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
 				//TODO show qr code
 			}
 
 		})
 		binding.qrList.adapter = adapter
 		adapter.setItems(emptyList())
-		qrCodeViewModel.loadQrCodePayloads()
-		qrCodeViewModel.qrCodeListStateLiveData.observe(viewLifecycleOwner, Observer {
+		qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner, {
 			adapter.setItems(it)
 		})
-
 	}
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
index 298a384cf..63e7406f1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView
 import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeEmptyListBinding
-import org.crowdnotifier.android.sdk.model.v3.ProtoV3
+import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeBaseViewHolder<*>>() {
 
@@ -18,7 +18,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 	private var items: List<Any> = emptyList()
 
-	fun setItems(qrCodes: List<ProtoV3.QRCodePayload>) {
+	fun setItems(qrCodes: List<VenueInfo>) {
 		val newItems: ArrayList<Any> = ArrayList()
 		newItems.add(GenerateQrCodeItem())
 		if (qrCodes.isEmpty()) {
@@ -54,7 +54,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 		val item = items[position]
 		when (holder) {
 			is GenerateQrCodeViewHolder -> holder.bind(item as GenerateQrCodeItem)
-			is QrCodeViewHolder -> holder.bind(item as ProtoV3.QRCodePayload)
+			is QrCodeViewHolder -> holder.bind(item as VenueInfo)
 			is QrCodeEmptyListViewHolder -> holder.bind(item as QrCodeEmptyListItem)
 			else -> throw  IllegalArgumentException()
 		}
@@ -62,7 +62,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 	override fun getItemViewType(position: Int): Int {
 		return when (items[position]) {
-			is ProtoV3.QRCodePayload -> TYPE_QR_CODE
+			is VenueInfo -> TYPE_QR_CODE
 			is GenerateQrCodeItem -> TYPE_GENERATE_QR_CODE
 			is QrCodeEmptyListItem -> TYPE_QR_EMPTY_LIST
 			else -> throw java.lang.IllegalArgumentException("Invalid type of data at position $position")
@@ -84,10 +84,10 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 	}
 
 	inner class QrCodeViewHolder(private val binding: ItemQrCodeBinding) :
-		QrCodeBaseViewHolder<ProtoV3.QRCodePayload>(binding.root) {
-		override fun bind(item: ProtoV3.QRCodePayload) {
-			binding.qrCodeName.text = item.locationData.description
-			binding.qrCodeLocation.text = item.countryData.toString()
+		QrCodeBaseViewHolder<VenueInfo>(binding.root) {
+		override fun bind(item: VenueInfo) {
+			binding.qrCodeName.text = item.title
+			binding.qrCodeLocation.text = "TODO"
 			binding.root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
 		}
 
@@ -103,7 +103,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 
 interface OnClickListener {
 	fun generateQrCode()
-	fun onQrCodeClicked(qrCodeItem: ProtoV3.QRCodePayload)
+	fun onQrCodeClicked(qrCodeItem: VenueInfo)
 }
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 30772f492..7d1f96e11 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.checkin.generateqrcode
 
+import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.BlendMode
 import android.graphics.Color
@@ -9,25 +10,24 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
 import android.widget.RadioButton
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
+import ch.admin.bag.dp3t.checkin.models.VenueType
 import ch.admin.bag.dp3t.databinding.FragmentGenerateQrCodeBinding
-import org.crowdnotifier.android.sdk.model.v3.ProtoV3
+
 
 class GenerateQrCodeFragment : Fragment() {
 
 	companion object {
-		fun newInstance(): GenerateQrCodeFragment {
-			return GenerateQrCodeFragment()
-		}
+		fun newInstance() = GenerateQrCodeFragment()
 	}
 
 	private lateinit var binding: FragmentGenerateQrCodeBinding
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater)
 		return binding.root
 	}
@@ -35,10 +35,9 @@ class GenerateQrCodeFragment : Fragment() {
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
-		binding.generateQrCodeCancel.setOnClickListener {
-			requireActivity().supportFragmentManager.popBackStack()
-		}
+		binding.generateQrCodeCancel.setOnClickListener { cancel() }
 
+		//TODO: Remove these hardcoded Events
 		val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
 		for (event in events) {
 			val radioButton = RadioButton(requireContext())
@@ -47,26 +46,20 @@ class GenerateQrCodeFragment : Fragment() {
 			binding.generateQrCodeRadioGroup.addView(radioButton)
 		}
 
-		binding.qrCodeGenerate.setOnClickListener {
-			val trac = ProtoV3.TraceLocation.newBuilder().setDescription("mau").build()
-			val protobuff: ProtoV3.QRCodePayload =
-				ProtoV3.QRCodePayload.newBuilder().setVersion(3)
-					.setLocationData(trac).build()
-			//TODO PP-966  for saving a list, we need a superior class which contains an list of QRCodePayloads
-			//so we can use this approach https://stackoverflow.com/questions/64430872/how-to-save-a-list-of-objects-with-proto-datastore
-			qrCodeViewModel.saveQRCodePayload(protobuff)
-		}
+		binding.qrCodeGenerate.setOnClickListener { generateQrCode() }
+
+	}
+
+	private fun generateQrCode() {
+		//TODO: Set correct Venue Type
+		qrCodeViewModel.generateAndSaveQrCode(binding.titleEditText.text.toString(), VenueType.CAFETERIA)
+		cancel()
+	}
 
-		qrCodeViewModel.qrCodeStateLiveData.observe(viewLifecycleOwner, Observer { state ->
-			when (state) {
-				is QrCodePayloadState.SUCCESS -> {
-					requireActivity().supportFragmentManager.popBackStack()
-				}
-				is QrCodePayloadState.ERROR -> {
-					//TODO PP-966 show error
-				}
-			}
-		})
+	private fun cancel() {
+		requireActivity().supportFragmentManager.popBackStack()
+		val inputMethodManager = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+		inputMethodManager.hideSoftInputFromWindow(binding.titleEditText.windowToken, 0)
 	}
 
 	enum class EventType(val value: String) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GeneratedQrCodesSerializer.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GeneratedQrCodesSerializer.kt
new file mode 100644
index 000000000..d9934a38a
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GeneratedQrCodesSerializer.kt
@@ -0,0 +1,22 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import androidx.datastore.core.CorruptionException
+import androidx.datastore.core.Serializer
+import ch.admin.bag.dp3t.checkin.models.GeneratedQrCodesWrapper
+import com.google.protobuf.InvalidProtocolBufferException
+import java.io.InputStream
+import java.io.OutputStream
+
+object GeneratedQrCodesSerializer : Serializer<GeneratedQrCodesWrapper> {
+	override val defaultValue: GeneratedQrCodesWrapper = GeneratedQrCodesWrapper.getDefaultInstance()
+
+	override suspend fun readFrom(input: InputStream): GeneratedQrCodesWrapper {
+		try {
+			return GeneratedQrCodesWrapper.parseFrom(input)
+		} catch (exception: InvalidProtocolBufferException) {
+			throw  CorruptionException("Cannot read proto.", exception)
+		}
+	}
+
+	override suspend fun writeTo(t: GeneratedQrCodesWrapper, output: OutputStream) = t.writeTo(output)
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt
deleted file mode 100644
index 762ef0174..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodePayloadSerializer.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package ch.admin.bag.dp3t.checkin.generateqrcode
-
-import android.content.Context
-import androidx.datastore.core.CorruptionException
-import androidx.datastore.core.DataStore
-import androidx.datastore.core.Serializer
-import androidx.datastore.dataStore
-import com.google.protobuf.InvalidProtocolBufferException
-import org.crowdnotifier.android.sdk.model.v3.ProtoV3
-import java.io.InputStream
-import java.io.OutputStream
-
-object QRCodePayloadSerializer : Serializer<ProtoV3.QRCodePayload> {
-	override val defaultValue: ProtoV3.QRCodePayload = ProtoV3.QRCodePayload.getDefaultInstance()
-
-	override suspend fun readFrom(input: InputStream): ProtoV3.QRCodePayload {
-		try {
-			return ProtoV3.QRCodePayload.parseFrom(input)
-		} catch (exception: InvalidProtocolBufferException) {
-			throw  CorruptionException("Cannot read proto.", exception)
-		}
-	}
-
-	override suspend fun writeTo(t: ProtoV3.QRCodePayload, output: OutputStream) = t.writeTo(output)
-}
-
-val Context.qrCodePayloadDataStore: DataStore<ProtoV3.QRCodePayload> by dataStore(
-	fileName = "qrCodePayloads.pb",
-	serializer = QRCodePayloadSerializer
-)
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 0a2b2ac00..4aa186c10 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -1,62 +1,96 @@
 package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.app.Application
+import android.content.Context
+import android.util.Base64
 import android.util.Log
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
+import androidx.datastore.core.DataStore
+import androidx.datastore.dataStore
+import androidx.lifecycle.*
+import ch.admin.bag.dp3t.checkin.models.GeneratedQrCodesWrapper
+import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
+import ch.admin.bag.dp3t.checkin.models.VenueType
+import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
+import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import org.crowdnotifier.android.sdk.model.v3.ProtoV3
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.model.v3.QRCodePayload
+import org.crowdnotifier.android.sdk.utils.Base64Util
 import java.io.IOException
 
-class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
+private const val MASTER_PUBLIC_KEY_BASE64 =
+	"TqRYigTM6YVO7/UJQuu3199mRqj0cSTp4DXCFlxbz9UqDLrASr07C9HJVWYtl08V7xGEGSSXWbQSRfRt/bqqDK0HQQGnZ/VWZxToo88txtgQ1ij7pYJwaBHAGGndLICL"
+private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
+private const val ONE_HOUR_IN_MILLIS = 60 * ONE_MINUTE_IN_MILLIS
+private const val AUTOMATIC_CHECKOUT_DELAY_MS = 12 * ONE_HOUR_IN_MILLIS
+private const val CHECKOUT_WARNING_DELAY_MS = 8 * ONE_HOUR_IN_MILLIS
+private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
+private const val QR_CODE_VALIDITY_DURATION_MS = 10 * 365 * 24 * ONE_HOUR_IN_MILLIS // 10 years
+private val REMINDER_DELAY_OPTIONS_MS = listOf(30, 60, 120, 240).map { it * ONE_HOUR_IN_MILLIS } // 30, 60, 120 and 240 minutes
 
-	private val qrCodeStateMutableLiveData: MutableLiveData<QrCodePayloadState> = MutableLiveData()
-	val qrCodeStateLiveData: LiveData<QrCodePayloadState> = qrCodeStateMutableLiveData
+private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper> by dataStore(
+	fileName = "generatedQrCodes.pb",
+	serializer = GeneratedQrCodesSerializer
+)
 
-	private val qrCodeListStateMutableLiveData: MutableLiveData<List<ProtoV3.QRCodePayload>> = MutableLiveData()
-	val qrCodeListStateLiveData: LiveData<List<ProtoV3.QRCodePayload>> = qrCodeListStateMutableLiveData
+class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
 
-	fun saveQRCodePayload(qrCodePayload: ProtoV3.QRCodePayload) {
-		viewModelScope.launch {
-			try {
-				val qrCodePayload = getApplication<Application>().qrCodePayloadDataStore.updateData {
-					qrCodePayload
-				}
-				qrCodeStateMutableLiveData.postValue(QrCodePayloadState.SUCCESS(qrCodePayload))
-			} catch (e: Exception) {
-				qrCodeStateMutableLiveData.postValue(QrCodePayloadState.ERROR(e))
-			}
 
+	private val generatedQrCodesFlow = getApplication<Application>().generatedQrCodesDataStore.data.buffer(1).catch { exception ->
+		if (exception is IOException) {
+			Log.e("QRCodeViewModel", "Error reading generated QR Codes.", exception)
+		} else {
+			throw exception
 		}
 	}
 
-	fun loadQrCodePayloads() {
-		viewModelScope.launch {
-			val flow: Flow<ProtoV3.QRCodePayload> = getApplication<Application>().qrCodePayloadDataStore.data.catch { exception ->
-				if (exception is IOException) {
-					Log.e("QRCODEPayload", "Error reading sort order preferences.", exception)
-					emit(ProtoV3.QRCodePayload.getDefaultInstance())
-				} else {
-					throw exception
-				}
-			}
-
-			val arrayList = arrayListOf<ProtoV3.QRCodePayload>()
-			flow.collect { payload ->
-				arrayList.add(payload)
-				qrCodeListStateMutableLiveData.postValue(arrayList.toList())
-			}
+	val generatedQrCodesLiveData = generatedQrCodesFlow.map { wrapper ->
+		wrapper.generatedQrCodesList.map { it.toVenueInfo() }
+	}.asLiveData()
+
+
+	fun generateAndSaveQrCode(description: String, venueType: VenueType) = viewModelScope.launch {
+
+		val swissCovidLocationData = SwissCovidLocationData.newBuilder()
+			.setVersion(SWISSCOVID_LOCATION_DATA_VERSION)
+			.setAutomaticCheckoutDelaylMs(AUTOMATIC_CHECKOUT_DELAY_MS)
+			.setCheckoutWarningDelayMs(CHECKOUT_WARNING_DELAY_MS)
+			.addAllReminderDelayOptionsMs(REMINDER_DELAY_OPTIONS_MS)
+			.setTypeValue(venueType.number)
+			.build()
+
+		val generatedVenueInfo = CrowdNotifier.generateVenueInfo(
+			description,
+			"",
+			swissCovidLocationData.toByteArray(),
+			System.currentTimeMillis() / 1000,
+			(System.currentTimeMillis() + QR_CODE_VALIDITY_DURATION_MS) / 1000,
+			Base64.decode(MASTER_PUBLIC_KEY_BASE64, Base64.DEFAULT)
+		)
+
 
+		val newWrapper = GeneratedQrCodesWrapper.newBuilder()
+			.addAllGeneratedQrCodes(generatedQrCodesFlow.first().generatedQrCodesList)
+			.addGeneratedQrCodes(generatedVenueInfo.toQrCodePayload())
+			.build()
+		saveGeneratedVenueInfo(newWrapper)
+
+	}
+
+	private suspend fun saveGeneratedVenueInfo(generatedQrCodesWrapper: GeneratedQrCodesWrapper) {
+
+		try {
+			getApplication<Application>().generatedQrCodesDataStore.updateData { generatedQrCodesWrapper }
+		} catch (e: Exception) {
+			//TODO: Handle Error
 		}
+
 	}
+
 }
 
 sealed class QrCodePayloadState {
-	data class SUCCESS(val qrCodePayload: ProtoV3.QRCodePayload) : QrCodePayloadState()
+	data class SUCCESS(val qrCodePayload: QRCodePayload) : QrCodePayloadState()
 	data class ERROR(val exception: java.lang.Exception) : QrCodePayloadState()
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index ef5724f3a..f2dc46e19 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -12,6 +12,8 @@
 import org.dpppt.android.sdk.backend.UserAgentInterceptor;
 
 import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.checkin.models.ProblematicEvent;
+import ch.admin.bag.dp3t.checkin.models.ProblematicEventWrapper;
 import ch.admin.bag.dp3t.checkin.models.Proto;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import okhttp3.OkHttpClient;
@@ -80,10 +82,9 @@ private List<ProblematicEventInfo> handleSuccessfulResponse(Response<ResponseBod
 				long keyBundleTagValue = Long.parseLong(keyBundleTag);
 				storage.setCrowdNotifierLastKeyBundleTag(keyBundleTagValue);
 			}
-			Proto.ProblematicEventWrapper problematicEventWrapper =
-					Proto.ProblematicEventWrapper.parseFrom(response.body().byteStream());
+			ProblematicEventWrapper problematicEventWrapper = ProblematicEventWrapper.parseFrom(response.body().byteStream());
 			ArrayList<ProblematicEventInfo> problematicEventInfos = new ArrayList<>();
-			for (Proto.ProblematicEvent event : problematicEventWrapper.getEventsList()) {
+			for (ProblematicEvent event : problematicEventWrapper.getEventsList()) {
 				problematicEventInfos.add(new ProblematicEventInfo(event.getIdentity().toByteArray(),
 						event.getSecretKeyForIdentity().toByteArray(),
 						event.getEncryptedAssociatedData().toByteArray(), event.getCipherTextNonce().toByteArray(),
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index a1fef797b..3a213d5be 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -160,7 +160,7 @@ public void startOngoingNotification(long startTime, VenueInfo venueInfo) {
 				.setSmallIcon(R.drawable.ic_notification)
 				.setContentTitle(context.getString(R.string.ongoing_notification_title)
 						.replace("{TIME}", StringUtil.getHourMinuteTimeString(startTime, ":")))
-				.setContentText(venueInfo.getTitle() + "\n" + VenueInfoExtensions.getSubtitle(venueInfo))
+				.setContentText(venueInfo.getTitle() + "\n" + VenueInfoExtensionsKt.getSubtitle(venueInfo))
 				.setPriority(NotificationCompat.PRIORITY_LOW)
 				.setOngoing(true)
 				.addAction(R.drawable.ic_close,
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
new file mode 100644
index 000000000..27769c2f4
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
@@ -0,0 +1,10 @@
+package ch.admin.bag.dp3t.checkin.utils
+
+import ch.admin.bag.dp3t.checkin.models.QRCodePayload
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.model.VenueInfo
+import org.crowdnotifier.android.sdk.utils.Base64Util
+
+fun QRCodePayload.toVenueInfo(): VenueInfo {
+	return CrowdNotifier.getVenueInfo("?v=3#" + Base64Util.toBase64(this.toByteArray()), "")
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
deleted file mode 100644
index e25e736d2..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package ch.admin.bag.dp3t.checkin.utils;
-
-
-import com.google.protobuf.InvalidProtocolBufferException;
-
-import org.crowdnotifier.android.sdk.model.VenueInfo;
-
-import ch.admin.bag.dp3t.checkin.models.Proto;
-
-public class VenueInfoExtensions {
-
-
-	public static Proto.SwissCovidLocationData getNotifyMeLocationData(VenueInfo venueInfo) {
-		if (venueInfo.getCountryData() == null) return Proto.SwissCovidLocationData.newBuilder().build();
-		try {
-			return Proto.SwissCovidLocationData.parseFrom(venueInfo.getCountryData());
-		} catch (InvalidProtocolBufferException e) {
-			return Proto.SwissCovidLocationData.newBuilder().build();
-		}
-	}
-
-	public static String getSubtitle(VenueInfo venueInfo) {
-		Proto.SwissCovidLocationData notifyMeLocationData = getNotifyMeLocationData(venueInfo);
-		if (notifyMeLocationData.getRoom() == null || notifyMeLocationData.getRoom().equals("")) {
-			return venueInfo.getAddress();
-		} else {
-			return venueInfo.getAddress() + ", " + notifyMeLocationData.getRoom();
-		}
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
new file mode 100644
index 000000000..bed63156b
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
@@ -0,0 +1,31 @@
+package ch.admin.bag.dp3t.checkin.utils
+
+import ch.admin.bag.dp3t.checkin.models.QRCodePayload
+import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
+import com.google.protobuf.InvalidProtocolBufferException
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
+	return if (countryData == null) {
+		SwissCovidLocationData.newBuilder().build()
+	} else {
+		try {
+			SwissCovidLocationData.parseFrom(countryData)
+		} catch (e: InvalidProtocolBufferException) {
+			SwissCovidLocationData.newBuilder().build()
+		}
+	}
+}
+
+fun VenueInfo.getSubtitle(): String {
+	//TODO: This is to be defined what the subtitle will be for SwissCovid
+	return ""
+}
+
+fun VenueInfo.toQrCodePayload(): QRCodePayload {
+	try {
+		return QRCodePayload.parseFrom(qrCodePayload)
+	} catch (e: InvalidProtocolBufferException) {
+		throw RuntimeException("VenueInfo contains invalid qrCodePayload bytes!")
+	}
+}
diff --git a/app/src/main/proto/App.proto b/app/src/main/proto/App.proto
new file mode 100644
index 000000000..57b19ad8a
--- /dev/null
+++ b/app/src/main/proto/App.proto
@@ -0,0 +1,49 @@
+syntax = "proto3";
+
+option java_package = "ch.admin.bag.dp3t.checkin.models";
+option java_multiple_files = true;
+
+message GeneratedQrCodesWrapper{
+  repeated QRCodePayload generatedQrCodes = 1;
+}
+
+message QRCodePayload {
+  uint32 version = 1;
+  TraceLocation locationData = 2;
+  CrowdNotifierData crowdNotifierData = 3;
+
+  bytes countryData = 4;
+}
+
+message TraceLocation {
+  uint32 version = 1;
+
+  // max. 100 characters
+  string description = 2;
+
+  // max. 100 characters
+  string address = 3;
+
+  // UNIX timestamp (in seconds)
+  uint64 startTimestamp = 4;
+
+  // UNIX timestamp (in seconds)
+  uint64 endTimestamp = 5;
+}
+
+message CrowdNotifierData {
+  uint32 version = 1;
+  bytes publicKey = 2;
+  bytes cryptographicSeed = 3;
+
+  // Ignore ;)
+  uint32 type = 4; // exact semantic tbd
+}
+
+message AssociatedData {
+  int32 version = 1;
+  string message = 2;
+  int64 startTimestamp = 3;
+  int64 endTimestamp = 4;
+  bytes countryData = 5;
+}
diff --git a/app/src/main/proto/Proto.proto b/app/src/main/proto/Crowdnotifier.proto
similarity index 82%
rename from app/src/main/proto/Proto.proto
rename to app/src/main/proto/Crowdnotifier.proto
index 51c02fa6b..4b9c2ecc4 100644
--- a/app/src/main/proto/Proto.proto
+++ b/app/src/main/proto/Crowdnotifier.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
-package ch.admin.bag.dp3t.checkin.models;
+
+option java_package = "ch.admin.bag.dp3t.checkin.models";
+option java_multiple_files = true;
 
 message ProblematicEventWrapper {
   int32 version = 1;
@@ -15,14 +17,6 @@ message ProblematicEvent {
   bytes cipherTextNonce = 6;
 }
 
-message AssociatedData {
-  int32 version = 1;
-  string message = 2;
-  int64 startTime = 3;
-  int64 endTime = 4;
-  bytes countryData = 5;
-}
-
 enum EventCriticality {
   LOW = 0;
   HIGH = 1;
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index 7615aa690..d56490974 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -64,6 +64,7 @@
 				android:textAllCaps="true" />
 
 			<EditText
+				android:id="@+id/title_edit_text"
 				style="@style/NextStep.Text.Bold.Blue"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"

From c565a9c5ee8c96b5b990bb1d02577adce5220c0b Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 4 May 2021 09:37:56 +0200
Subject: [PATCH 020/207] Implement deleting of generated QR Codes

---
 .../checkin/events/EventsOverviewFragment.kt  | 24 ++++++++++++-------
 .../bag/dp3t/checkin/events/QrCodeAdapter.kt  | 11 +++++----
 .../checkin/generateqrcode/QRCodeViewModel.kt | 11 +++++++++
 .../networking/TraceKeysRepository.java       |  1 -
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index 588e0e48c..0de7b368f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -32,29 +32,35 @@ class EventsOverviewFragment : Fragment() {
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
-		binding.eventsToolbar.setNavigationOnClickListener {
-			requireActivity().supportFragmentManager.popBackStack()
-		}
+		binding.eventsToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
 		val adapter = QrCodeAdapter(object : OnClickListener {
 			override fun generateQrCode() {
-				requireActivity().supportFragmentManager.beginTransaction()
-					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-					.replace(R.id.main_fragment_container, GenerateQrCodeFragment.newInstance())
-					.addToBackStack(GenerateQrCodeFragment::class.java.canonicalName)
-					.commit()
+				showGenerateQrCodeScreen()
 			}
 
 			override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
 				//TODO show qr code
 			}
 
+			override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
+				qrCodeViewModel.deleteQrCode(qrCodeItem)
+			}
+
 		})
+
 		binding.qrList.adapter = adapter
-		adapter.setItems(emptyList())
 		qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner, {
 			adapter.setItems(it)
 		})
 	}
 
+	private fun showGenerateQrCodeScreen() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, GenerateQrCodeFragment.newInstance())
+			.addToBackStack(GenerateQrCodeFragment::class.java.canonicalName)
+			.commit()
+	}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
index 63e7406f1..982a5731a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
@@ -86,11 +86,13 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 	inner class QrCodeViewHolder(private val binding: ItemQrCodeBinding) :
 		QrCodeBaseViewHolder<VenueInfo>(binding.root) {
 		override fun bind(item: VenueInfo) {
-			binding.qrCodeName.text = item.title
-			binding.qrCodeLocation.text = "TODO"
-			binding.root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
+			binding.apply {
+				qrCodeName.text = item.title
+				qrCodeLocation.text = "TODO"
+				root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
+				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item) }
+			}
 		}
-
 	}
 
 	inner class QrCodeEmptyListViewHolder(binding: ItemQrCodeEmptyListBinding) :
@@ -104,6 +106,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 interface OnClickListener {
 	fun generateQrCode()
 	fun onQrCodeClicked(qrCodeItem: VenueInfo)
+	fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo)
 }
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 4aa186c10..e41fc78a4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -15,6 +15,7 @@ import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.model.VenueInfo
 import org.crowdnotifier.android.sdk.model.v3.QRCodePayload
 import org.crowdnotifier.android.sdk.utils.Base64Util
 import java.io.IOException
@@ -50,6 +51,16 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 	}.asLiveData()
 
 
+	fun deleteQrCode(venueInfo: VenueInfo) = viewModelScope.launch {
+		val builder = GeneratedQrCodesWrapper.newBuilder()
+		generatedQrCodesFlow.first().generatedQrCodesList.forEach {
+			if (venueInfo.toQrCodePayload() != it) {
+				builder.addGeneratedQrCodes(it)
+			}
+		}
+		saveGeneratedVenueInfo(builder.build())
+	}
+
 	fun generateAndSaveQrCode(description: String, venueType: VenueType) = viewModelScope.launch {
 
 		val swissCovidLocationData = SwissCovidLocationData.newBuilder()
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index f2dc46e19..98f9aee6f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -14,7 +14,6 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.checkin.models.ProblematicEvent;
 import ch.admin.bag.dp3t.checkin.models.ProblematicEventWrapper;
-import ch.admin.bag.dp3t.checkin.models.Proto;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;

From e022eb1e14e0e63a7ecb9a28666071a63c616db0 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 4 May 2021 11:26:15 +0200
Subject: [PATCH 021/207] Implement QR Code Display

---
 .../checkin/events/EventsOverviewFragment.kt  | 11 ++-
 .../checkin/generateqrcode/QrCodeFragment.kt  | 31 ++++++
 app/src/main/res/drawable/ic_check_in.xml     | 10 ++
 app/src/main/res/drawable/ic_print_pdf.xml    | 10 ++
 app/src/main/res/drawable/ic_share.xml        | 10 ++
 app/src/main/res/layout/fragment_qr_code.xml  | 96 +++++++++++++++++++
 6 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
 create mode 100644 app/src/main/res/drawable/ic_check_in.xml
 create mode 100644 app/src/main/res/drawable/ic_print_pdf.xml
 create mode 100644 app/src/main/res/drawable/ic_share.xml
 create mode 100644 app/src/main/res/layout/fragment_qr_code.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index 0de7b368f..509e1e6ad 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -9,6 +9,7 @@ import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.generateqrcode.GenerateQrCodeFragment
 import ch.admin.bag.dp3t.checkin.generateqrcode.QRCodeViewModel
+import ch.admin.bag.dp3t.checkin.generateqrcode.QrCodeFragment
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
@@ -40,7 +41,7 @@ class EventsOverviewFragment : Fragment() {
 			}
 
 			override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
-				//TODO show qr code
+				showQrCodeFragment()
 			}
 
 			override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
@@ -55,6 +56,14 @@ class EventsOverviewFragment : Fragment() {
 		})
 	}
 
+	private fun showQrCodeFragment() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, QrCodeFragment.newInstance())
+			.addToBackStack(QrCodeFragment::class.java.canonicalName)
+			.commit()
+	}
+
 	private fun showGenerateQrCodeScreen() {
 		requireActivity().supportFragmentManager.beginTransaction()
 			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
new file mode 100644
index 000000000..e42a18670
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -0,0 +1,31 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+class QrCodeFragment : Fragment() {
+
+	companion object {
+		fun newInstance(venueInfo: VenueInfo) = QrCodeFragment().apply {
+			arguments = bundleOf("fef" to venueInfo)
+		}
+	}
+
+	private lateinit var binding: FragmentQrCodeBinding
+
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		super.onCreateView(inflater, container, savedInstanceState)
+		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
+			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+			val venueInfo = arguments?.get("fef") as VenueInfo
+		}.root
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check_in.xml b/app/src/main/res/drawable/ic_check_in.xml
new file mode 100644
index 000000000..4c60e940d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_in.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.5,7L10.1,8.4l2.6,2.6L2.5,11v2h10.2l-2.6,2.6L11.5,17l5,-5 -5,-5zM20.5,19h-8v2h8c1.1,0 2,-0.9 2,-2L22.5,5c0,-1.1 -0.9,-2 -2,-2h-8v2h8v14z"
+      android:fillColor="#5094BF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_print_pdf.xml b/app/src/main/res/drawable/ic_print_pdf.xml
new file mode 100644
index 000000000..4175e1d9d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_print_pdf.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 000000000..35a3e5a67
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.5,5l-1.42,1.42 -1.59,-1.59L13.49,16h-1.98L11.51,4.83L9.92,6.42 8.5,5l4,-4 4,4zM20.5,10v11c0,1.1 -0.9,2 -2,2L6.5,23c-1.11,0 -2,-0.9 -2,-2L4.5,10c0,-1.11 0.89,-2 2,-2h3v2L6.5,10v11h12L18.5,10h-3L15.5,8h3c1.1,0 2,0.89 2,2z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
new file mode 100644
index 000000000..6bbb157b2
--- /dev/null
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:padding="@dimen/spacing_large">
+
+	<TextView
+		android:id="@+id/cancel_button"
+		style="@style/NextStep.Text.Blue"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="end"
+		android:text="@string/cancel" />
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/title_textview"
+				style="@style/NextStep.Text.SplashTitle.Dark"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal"
+				tools:text="Reuss Ubique" />
+
+			<TextView
+				android:id="@+id/subtitle_textview"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_small"
+				android:gravity="center_horizontal"
+				android:textStyle="normal"
+				tools:text="Office space" />
+
+			<ImageView
+				android:id="@+id/qr_code_imageview"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="@dimen/spacing_larger"
+				android:adjustViewBounds="true"
+				tools:src="@drawable/ic_qr_code" />
+
+			<Button
+				android:id="@+id/checkin_button"
+				style="@style/NextStep.Button.Outlined"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_huger"
+				android:drawableEnd="@drawable/ic_check_in"
+				android:text="@string/checkin_button_title" />
+
+			<Button
+				android:id="@+id/share_button"
+				style="@style/NextStep.Button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_huger"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:drawableEnd="@drawable/ic_share"
+				android:text="@string/share_button_title" />
+
+			<Button
+				android:id="@+id/print_pdf_button"
+				style="@style/NextStep.Button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_huger"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:drawableEnd="@drawable/ic_print_pdf"
+				android:text="@string/print_button_title" />
+
+			<Button
+				android:id="@+id/delete_button"
+				style="@style/NextStep.Button.Transparent"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_huger"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:drawableEnd="@drawable/ic_delete"
+				android:text="@string/delete_button_title"
+				android:textColor="@color/red_main" />
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
\ No newline at end of file

From 1fb077ac3dd0833f670972100fa4f1138e05a8df Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 4 May 2021 15:22:14 +0200
Subject: [PATCH 022/207] Implemented QR Code PDF Generation

---
 app/src/main/AndroidManifest.xml              | 10 +++
 .../checkin/events/EventsOverviewFragment.kt  |  5 +-
 .../generateqrcode/PdfPrintDocumentAdapter.kt | 63 +++++++++++++++
 .../checkin/generateqrcode/QRCodeViewModel.kt | 60 ++++++++++++---
 .../checkin/generateqrcode/QrCodeFragment.kt  | 77 +++++++++++++++++--
 .../bag/dp3t/checkin/utils/SingleLiveEvent.kt | 58 ++++++++++++++
 app/src/main/res/layout/fragment_qr_code.xml  | 29 +++++--
 app/src/main/res/xml/provider_paths.xml       |  4 +
 8 files changed, 280 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfPrintDocumentAdapter.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/SingleLiveEvent.kt
 create mode 100644 app/src/main/res/xml/provider_paths.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2324fbe37..ab7b259d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,6 +83,16 @@
 				<action android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter>
 		</receiver>
+
+		<provider
+			android:name="androidx.core.content.FileProvider"
+			android:authorities="${applicationId}.provider"
+			android:exported="false"
+			android:grantUriPermissions="true">
+			<meta-data
+				android:name="android.support.FILE_PROVIDER_PATHS"
+				android:resource="@xml/provider_paths" />
+		</provider>
 	</application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index 509e1e6ad..ec5eac9a9 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -41,7 +41,7 @@ class EventsOverviewFragment : Fragment() {
 			}
 
 			override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
-				showQrCodeFragment()
+				showQrCodeFragment(qrCodeItem)
 			}
 
 			override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
@@ -56,7 +56,8 @@ class EventsOverviewFragment : Fragment() {
 		})
 	}
 
-	private fun showQrCodeFragment() {
+	private fun showQrCodeFragment(venueInfo: VenueInfo) {
+		qrCodeViewModel.selectedQrCode = venueInfo
 		requireActivity().supportFragmentManager.beginTransaction()
 			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 			.replace(R.id.main_fragment_container, QrCodeFragment.newInstance())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfPrintDocumentAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfPrintDocumentAdapter.kt
new file mode 100644
index 000000000..ddcdd8268
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfPrintDocumentAdapter.kt
@@ -0,0 +1,63 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.os.Bundle
+import android.os.CancellationSignal
+import android.os.ParcelFileDescriptor
+import android.print.PageRange
+import android.print.PrintAttributes
+import android.print.PrintDocumentAdapter
+import android.print.PrintDocumentInfo
+import android.util.Log
+import java.io.*
+
+class PdfPrintDocumentAdapter(private val file: File) : PrintDocumentAdapter() {
+
+	override fun onLayout(
+		oldAttributes: PrintAttributes?,
+		newAttributes: PrintAttributes?,
+		cancellationSignal: CancellationSignal,
+		callback: LayoutResultCallback,
+		extras: Bundle?
+	) {
+		if (cancellationSignal.isCanceled) {
+			callback.onLayoutCancelled()
+			return
+		}
+
+		val info = PrintDocumentInfo.Builder("swisscovid-qr-code.pdf")
+			.setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+			.setPageCount(PrintDocumentInfo.PAGE_COUNT_UNKNOWN)
+			.build()
+
+		callback.onLayoutFinished(info, oldAttributes != newAttributes)
+	}
+
+	override fun onWrite(
+		pages: Array<out PageRange>,
+		destination: ParcelFileDescriptor,
+		cancellationSignal: CancellationSignal,
+		callback: WriteResultCallback
+	) {
+		var inputStream: InputStream? = null
+		var outputStream: OutputStream? = null
+
+		try {
+			inputStream = FileInputStream(file)
+			outputStream = FileOutputStream(destination.fileDescriptor)
+
+			inputStream.copyTo(outputStream)
+
+			if (cancellationSignal.isCanceled) {
+				callback.onWriteCancelled()
+			} else {
+				callback.onWriteFinished(arrayOf(PageRange.ALL_PAGES))
+			}
+		} catch (ex: Exception) {
+			callback.onWriteFailed(ex.message)
+			Log.e("PDFDocumentAdapter", "Could not write: ${ex.localizedMessage}")
+		} finally {
+			inputStream?.close()
+			outputStream?.close()
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index e41fc78a4..c84fc1371 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -2,6 +2,9 @@ package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.app.Application
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Paint
+import android.graphics.pdf.PdfDocument
 import android.util.Base64
 import android.util.Log
 import androidx.datastore.core.DataStore
@@ -10,16 +13,19 @@ import androidx.lifecycle.*
 import ch.admin.bag.dp3t.checkin.models.GeneratedQrCodesWrapper
 import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
 import ch.admin.bag.dp3t.checkin.models.VenueType
+import ch.admin.bag.dp3t.checkin.utils.SingleLiveEvent
 import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
 import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.model.VenueInfo
-import org.crowdnotifier.android.sdk.model.v3.QRCodePayload
-import org.crowdnotifier.android.sdk.utils.Base64Util
+import java.io.File
+import java.io.FileOutputStream
 import java.io.IOException
 
+
 private const val MASTER_PUBLIC_KEY_BASE64 =
 	"TqRYigTM6YVO7/UJQuu3199mRqj0cSTp4DXCFlxbz9UqDLrASr07C9HJVWYtl08V7xGEGSSXWbQSRfRt/bqqDK0HQQGnZ/VWZxToo88txtgQ1ij7pYJwaBHAGGndLICL"
 private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
@@ -29,6 +35,8 @@ private const val CHECKOUT_WARNING_DELAY_MS = 8 * ONE_HOUR_IN_MILLIS
 private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
 private const val QR_CODE_VALIDITY_DURATION_MS = 10 * 365 * 24 * ONE_HOUR_IN_MILLIS // 10 years
 private val REMINDER_DELAY_OPTIONS_MS = listOf(30, 60, 120, 240).map { it * ONE_HOUR_IN_MILLIS } // 30, 60, 120 and 240 minutes
+private const val QR_CODE_PIXEL_SIZE = 1000
+const val QR_CODE_PDF_FILE_NAME = "swisscovid-qr-code.pdf"
 
 private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper> by dataStore(
 	fileName = "generatedQrCodes.pb",
@@ -37,7 +45,6 @@ private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper
 
 class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
 
-
 	private val generatedQrCodesFlow = getApplication<Application>().generatedQrCodesDataStore.data.buffer(1).catch { exception ->
 		if (exception is IOException) {
 			Log.e("QRCodeViewModel", "Error reading generated QR Codes.", exception)
@@ -50,6 +57,15 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		wrapper.generatedQrCodesList.map { it.toVenueInfo() }
 	}.asLiveData()
 
+	var selectedQrCode: VenueInfo? = null
+		set(value) {
+			selectedQrCodeBitmap.value = null
+			value?.let { generateQrCodeBitmap(it) }
+			field = value
+		}
+
+	val selectedQrCodeBitmap = MutableLiveData<Bitmap?>()
+	val selectedQrCodePdf = SingleLiveEvent<File>()
 
 	fun deleteQrCode(venueInfo: VenueInfo) = viewModelScope.launch {
 		val builder = GeneratedQrCodesWrapper.newBuilder()
@@ -58,7 +74,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 				builder.addGeneratedQrCodes(it)
 			}
 		}
-		saveGeneratedVenueInfo(builder.build())
+		saveGeneratedQrCode(builder.build())
 	}
 
 	fun generateAndSaveQrCode(description: String, venueType: VenueType) = viewModelScope.launch {
@@ -85,23 +101,43 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 			.addAllGeneratedQrCodes(generatedQrCodesFlow.first().generatedQrCodesList)
 			.addGeneratedQrCodes(generatedVenueInfo.toQrCodePayload())
 			.build()
-		saveGeneratedVenueInfo(newWrapper)
+		saveGeneratedQrCode(newWrapper)
+	}
+
+	fun createQrCodePdf() = viewModelScope.launch(Dispatchers.IO) {
+
+		val directory = File(getApplication<Application>().externalCacheDir, "pdfs").apply { if (!exists()) mkdirs() }
+		val file = File(directory, QR_CODE_PDF_FILE_NAME)
+
+		val document = PdfDocument()
+		val pageInfo = PdfDocument.PageInfo.Builder(1240, 1748, 1).create()
+		val page = document.startPage(pageInfo)
+		val canvas = page.canvas
 
+		selectedQrCodeBitmap.value?.let {
+			canvas.drawBitmap(it, 120f, 120f, Paint())
+		}
+
+		document.finishPage(page)
+		FileOutputStream(file).use {
+			document.writeTo(it)
+			document.close()
+		}
+
+		selectedQrCodePdf.postValue(file)
 	}
 
-	private suspend fun saveGeneratedVenueInfo(generatedQrCodesWrapper: GeneratedQrCodesWrapper) {
 
+	private suspend fun saveGeneratedQrCode(generatedQrCodesWrapper: GeneratedQrCodesWrapper) {
 		try {
 			getApplication<Application>().generatedQrCodesDataStore.updateData { generatedQrCodesWrapper }
 		} catch (e: Exception) {
-			//TODO: Handle Error
+			throw RuntimeException(e)
 		}
-
 	}
 
-}
+	private fun generateQrCodeBitmap(venueInfo: VenueInfo) = viewModelScope.launch(Dispatchers.IO) {
+		selectedQrCodeBitmap.postValue(QrCode.create(venueInfo.toQrCodeString()).renderToBitmap(QR_CODE_PIXEL_SIZE))
+	}
 
-sealed class QrCodePayloadState {
-	data class SUCCESS(val qrCodePayload: QRCodePayload) : QrCodePayloadState()
-	data class ERROR(val exception: java.lang.Exception) : QrCodePayloadState()
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index e42a18670..39efc2fae 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -1,31 +1,94 @@
 package ch.admin.bag.dp3t.checkin.generateqrcode
 
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.print.PrintAttributes
+import android.print.PrintManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
+import androidx.core.content.FileProvider
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
-import org.crowdnotifier.android.sdk.model.VenueInfo
+import java.io.File
+
 
 class QrCodeFragment : Fragment() {
 
 	companion object {
-		fun newInstance(venueInfo: VenueInfo) = QrCodeFragment().apply {
-			arguments = bundleOf("fef" to venueInfo)
-		}
+		fun newInstance() = QrCodeFragment()
 	}
 
-	private lateinit var binding: FragmentQrCodeBinding
+	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		super.onCreateView(inflater, container, savedInstanceState)
 		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
 			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
-			val venueInfo = arguments?.get("fef") as VenueInfo
+			qrCodeViewModel.selectedQrCode?.let { venueInfo ->
+				titleTextview.text = venueInfo.title
+				subtitleTextview.text = "TODO"
+				qrCodeViewModel.selectedQrCodeBitmap.observe(viewLifecycleOwner) {
+					if (it == null) {
+						qrCodeImageview.visibility = View.INVISIBLE
+						qrCodeLoadingProgressbar.isVisible = true
+						shareButton.isEnabled = false
+						printPdfButton.isEnabled = false
+					} else {
+						qrCodeImageview.visibility = View.VISIBLE
+						qrCodeLoadingProgressbar.isVisible = false
+						qrCodeImageview.setImageBitmap(it)
+						shareButton.isEnabled = true
+						printPdfButton.isEnabled = true
+					}
+				}
+				shareButton.setOnClickListener { generatePdf(isPrint = false) }
+				printPdfButton.setOnClickListener { generatePdf(isPrint = true) }
+				deleteButton.setOnClickListener {
+					qrCodeViewModel.deleteQrCode(venueInfo)
+					requireActivity().supportFragmentManager.popBackStack()
+				}
+			}
 		}.root
 	}
 
+	private fun generatePdf(isPrint: Boolean) {
+		val pdf = qrCodeViewModel.selectedQrCodePdf.value
+		if (pdf == null) {
+			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) {
+				if (isPrint) printPdf(it) else sharePdf(it)
+			}
+			qrCodeViewModel.createQrCodePdf()
+		} else {
+			if (isPrint) printPdf(pdf) else sharePdf(pdf)
+		}
+	}
+
+	private fun printPdf(file: File) {
+		context?.let {
+			val manager = it.getSystemService(Context.PRINT_SERVICE) as PrintManager
+			val adapter = PdfPrintDocumentAdapter(file)
+			val attributes = PrintAttributes.Builder().build()
+			manager.print("SwissCovid QR Code", adapter, attributes)
+		}
+	}
+
+	private fun sharePdf(file: File) {
+		context?.let {
+			val pdfUri: Uri = FileProvider.getUriForFile(it, it.applicationContext.packageName.toString() + ".provider", file)
+
+			Intent().apply {
+				action = Intent.ACTION_SEND
+				type = "application/pdf"
+				putExtra(Intent.EXTRA_STREAM, pdfUri)
+				startActivity(this)
+			}
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/SingleLiveEvent.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/SingleLiveEvent.kt
new file mode 100644
index 000000000..7bbb652c1
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/SingleLiveEvent.kt
@@ -0,0 +1,58 @@
+package ch.admin.bag.dp3t.checkin.utils
+
+import android.util.Log
+import androidx.annotation.MainThread
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import java.util.concurrent.atomic.AtomicBoolean
+
+private const val TAG = "SingleLiveEvent"
+
+/**
+ * A lifecycle-aware observable that sends only new updates after subscription, used for events like
+ * navigation and Snackbar messages.
+ *
+ *
+ * This avoids a common problem with events: on configuration change (like rotation) an update
+ * can be emitted if the observer is active. This LiveData only calls the observable if there's an
+ * explicit call to setValue() or call().
+ *
+ *
+ * Note that only one observer is going to be notified of changes.
+ *
+ * Inspired by https://github.com/android/architecture-samples/blob/dev-todo-mvvm-live/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/SingleLiveEvent.java
+ */
+class SingleLiveEvent<T> : MutableLiveData<T>() {
+
+	// flag to avoid calling Observer's `onChanged()` when it's registered
+	private val mPending = AtomicBoolean(false)
+
+	@MainThread
+	override fun observe(owner: LifecycleOwner, observer: Observer<in T>) {
+		if (hasActiveObservers()) {
+			Log.w(TAG, "Multiple observers registered but only one will be notified of changes.")
+		}
+
+		// Observe the internal MutableLiveData
+		super.observe(owner, { t ->
+			if (mPending.compareAndSet(true, false)) {
+				observer.onChanged(t)
+			}
+		})
+	}
+
+	@MainThread
+	override fun setValue(t: T) {
+		mPending.set(true)
+		super.setValue(t)
+	}
+}
+
+/**
+ * Used for cases where T is Unit, to make calls cleaner.
+ */
+@MainThread
+fun SingleLiveEvent<Unit?>.call() {
+	setValue(null)
+}
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index 6bbb157b2..14c5bb822 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -41,13 +42,31 @@
 				android:textStyle="normal"
 				tools:text="Office space" />
 
-			<ImageView
-				android:id="@+id/qr_code_imageview"
+			<androidx.constraintlayout.widget.ConstraintLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/spacing_larger"
-				android:adjustViewBounds="true"
-				tools:src="@drawable/ic_qr_code" />
+				android:layout_margin="@dimen/spacing_larger">
+
+				<ImageView
+					android:id="@+id/qr_code_imageview"
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					app:layout_constraintDimensionRatio="H,1:1"
+					app:layout_constraintTop_toTopOf="parent"
+					tools:src="@drawable/ic_qr_code" />
+
+				<ProgressBar
+					android:id="@+id/qrCodeLoadingProgressbar"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:visibility="gone"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent" />
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
 
 			<Button
 				android:id="@+id/checkin_button"
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 000000000..8bf5b48ac
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+	<external-cache-path name="pdfs" path="/"/>
+</paths>

From a275e7da8e9eb2ae0bc9383f4e9d7ade87f642ff Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 4 May 2021 17:31:18 +0200
Subject: [PATCH 023/207] Clean ups

---
 app/build.gradle                              |  2 +-
 .../dp3t/checkin/CheckinOverviewFragment.kt   | 55 ++++++++-----------
 .../checkin/events/EventsOverviewFragment.kt  | 42 ++++++--------
 .../generateqrcode/GenerateQrCodeFragment.kt  | 39 ++++++-------
 .../checkin/generateqrcode/QRCodeViewModel.kt |  7 ++-
 .../checkin/generateqrcode/QrCodeFragment.kt  |  1 -
 .../checkin/utils/QrCodePayloadExtensions.kt  |  4 +-
 .../res/layout/fragment_events_overview.xml   |  2 +-
 .../res/layout/fragment_generate_qr_code.xml  | 10 ++--
 app/src/main/res/layout/fragment_qr_code.xml  |  1 +
 .../main/res/layout/item_generate_qr_code.xml |  2 +-
 .../res/layout/item_qr_code_empty_list.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  7 +--
 13 files changed, 78 insertions(+), 96 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d23bfe1df..700cf2f49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,7 +207,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-6'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-7'
 
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 8dbfb57dc..f4439d1ac 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -23,46 +23,39 @@ class CheckinOverviewFragment : Fragment() {
 		}
 	}
 
-	private lateinit var binding: FragmentCheckinOverviewBinding
-
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		super.onCreateView(inflater, container, savedInstanceState)
-		binding = FragmentCheckinOverviewBinding.inflate(layoutInflater)
-		return binding.root
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		binding.checkinOverviewToolbar.setNavigationOnClickListener { v ->
-			requireActivity().supportFragmentManager.popBackStack()
-		}
+		return FragmentCheckinOverviewBinding.inflate(layoutInflater).apply {
+			checkinOverviewToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
-		binding.qrCodeGenerate.setOnClickListener {
-			requireActivity().supportFragmentManager.beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, EventsOverviewFragment.newInstance())
-				.addToBackStack(EventsOverviewFragment::class.java.canonicalName)
-				.commit()
-		}
-		binding.checkinOverviewHistory.setOnClickListener { v: View? -> }
+			qrCodeGenerate.setOnClickListener { showEventsOverviewFragment() }
 
+			checkinOverviewHistory.setOnClickListener { v: View? -> }
 
-		crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner, { isCheckedIn ->
-			binding.checkoutView.isVisible = isCheckedIn
-			binding.checkinView.isVisible = !isCheckedIn
-			if (isCheckedIn) {
-				crowdNotifierViewModel.startCheckInTimer()
-			}
-		})
+			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner, { isCheckedIn ->
+				checkoutView.isVisible = isCheckedIn
+				checkinView.isVisible = !isCheckedIn
+				if (isCheckedIn) {
+					crowdNotifierViewModel.startCheckInTimer()
+				}
+			})
 
-		binding.checkinButton.setOnClickListener { v -> showQrCodeScannerFragment() }
-		binding.checkoutButton.setOnClickListener { v -> showCheckOutFragment() }
+			checkinButton.setOnClickListener { showQrCodeScannerFragment() }
+			checkoutButton.setOnClickListener { showCheckOutFragment() }
 
+			crowdNotifierViewModel.timeSinceCheckIn.observe(viewLifecycleOwner) { duration ->
+				checkinTime.text = StringUtil.getShortDurationString(duration)
+			}
+		}.root
+	}
 
-		crowdNotifierViewModel.timeSinceCheckIn.observe(
-			viewLifecycleOwner,
-			{ duration -> binding.checkinTime.text = StringUtil.getShortDurationString(duration) })
+	private fun showEventsOverviewFragment() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, EventsOverviewFragment.newInstance())
+			.addToBackStack(EventsOverviewFragment::class.java.canonicalName)
+			.commit()
 	}
 
 	private fun showCheckOutFragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
index ec5eac9a9..a34518013 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
@@ -21,39 +21,33 @@ class EventsOverviewFragment : Fragment() {
 		}
 	}
 
-	private lateinit var binding: FragmentEventsOverviewBinding
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		super.onCreateView(inflater, container, savedInstanceState)
-		binding = FragmentEventsOverviewBinding.inflate(layoutInflater)
-		return binding.root
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
+		return FragmentEventsOverviewBinding.inflate(layoutInflater).apply {
+			eventsToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
-		binding.eventsToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+			val adapter = QrCodeAdapter(object : OnClickListener {
+				override fun generateQrCode() {
+					showGenerateQrCodeScreen()
+				}
 
-		val adapter = QrCodeAdapter(object : OnClickListener {
-			override fun generateQrCode() {
-				showGenerateQrCodeScreen()
-			}
+				override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
+					showQrCodeFragment(qrCodeItem)
+				}
 
-			override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
-				showQrCodeFragment(qrCodeItem)
-			}
+				override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
+					qrCodeViewModel.deleteQrCode(qrCodeItem)
+				}
 
-			override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
-				qrCodeViewModel.deleteQrCode(qrCodeItem)
-			}
+			})
 
-		})
+			qrList.adapter = adapter
+			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner, {
+				adapter.setItems(it)
+			})
 
-		binding.qrList.adapter = adapter
-		qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner, {
-			adapter.setItems(it)
-		})
+		}.root
 	}
 
 	private fun showQrCodeFragment(venueInfo: VenueInfo) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 7d1f96e11..175cc9237 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -28,31 +28,28 @@ class GenerateQrCodeFragment : Fragment() {
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater)
-		return binding.root
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-
-		binding.generateQrCodeCancel.setOnClickListener { cancel() }
+		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater).apply {
+			generateQrCodeCancel.setOnClickListener { cancel() }
+
+			//TODO: Remove these hardcoded Events
+			val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
+			for (event in events) {
+				val radioButton = RadioButton(requireContext())
+				radioButton.text = event.value
+				radioButton.setRadioButtonColor()
+				generateQrCodeRadioGroup.addView(radioButton)
+			}
+			qrCodeGenerate.setOnClickListener {
+				//TODO: Set correct Venue Type
+				generateQrCode(titleEditText.text.toString(), VenueType.CAFETERIA)
+			}
 
-		//TODO: Remove these hardcoded Events
-		val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
-		for (event in events) {
-			val radioButton = RadioButton(requireContext())
-			radioButton.text = event.value
-			radioButton.setRadioButtonColor()
-			binding.generateQrCodeRadioGroup.addView(radioButton)
 		}
-
-		binding.qrCodeGenerate.setOnClickListener { generateQrCode() }
-
+		return binding.root
 	}
 
-	private fun generateQrCode() {
-		//TODO: Set correct Venue Type
-		qrCodeViewModel.generateAndSaveQrCode(binding.titleEditText.text.toString(), VenueType.CAFETERIA)
+	private fun generateQrCode(title: String, venueType: VenueType) {
+		qrCodeViewModel.generateAndSaveQrCode(title, venueType)
 		cancel()
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index c84fc1371..33da8a013 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -10,6 +10,7 @@ import android.util.Log
 import androidx.datastore.core.DataStore
 import androidx.datastore.dataStore
 import androidx.lifecycle.*
+import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.checkin.models.GeneratedQrCodesWrapper
 import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
 import ch.admin.bag.dp3t.checkin.models.VenueType
@@ -110,7 +111,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		val file = File(directory, QR_CODE_PDF_FILE_NAME)
 
 		val document = PdfDocument()
-		val pageInfo = PdfDocument.PageInfo.Builder(1240, 1748, 1).create()
+		val pageInfo = PdfDocument.PageInfo.Builder(1240, 1748, 1).create() // A4 size
 		val page = document.startPage(pageInfo)
 		val canvas = page.canvas
 
@@ -137,7 +138,9 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 	}
 
 	private fun generateQrCodeBitmap(venueInfo: VenueInfo) = viewModelScope.launch(Dispatchers.IO) {
-		selectedQrCodeBitmap.postValue(QrCode.create(venueInfo.toQrCodeString()).renderToBitmap(QR_CODE_PIXEL_SIZE))
+		selectedQrCodeBitmap.postValue(
+			QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX)).renderToBitmap(QR_CODE_PIXEL_SIZE)
+		)
 	}
 
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 39efc2fae..46f10647b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -27,7 +27,6 @@ class QrCodeFragment : Fragment() {
 
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		super.onCreateView(inflater, container, savedInstanceState)
 		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
 			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			qrCodeViewModel.selectedQrCode?.let { venueInfo ->
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
index 27769c2f4..2b3479888 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
@@ -1,10 +1,10 @@
 package ch.admin.bag.dp3t.checkin.utils
 
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
-import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.model.VenueInfo
 import org.crowdnotifier.android.sdk.utils.Base64Util
+import org.crowdnotifier.android.sdk.utils.QrUtils
 
 fun QRCodePayload.toVenueInfo(): VenueInfo {
-	return CrowdNotifier.getVenueInfo("?v=3#" + Base64Util.toBase64(this.toByteArray()), "")
+	return QrUtils.getVenueInfoFromQrCode(Base64Util.toBase64(this.toByteArray()))
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_events_overview.xml b/app/src/main/res/layout/fragment_events_overview.xml
index 8c4d95f06..875c50fd3 100644
--- a/app/src/main/res/layout/fragment_events_overview.xml
+++ b/app/src/main/res/layout/fragment_events_overview.xml
@@ -21,7 +21,7 @@
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
 		app:navigationIcon="@drawable/ic_arrow_back"
-		app:title="[TBT] Veranstaltungen" />
+		app:title="@string/events_title" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/qr_list"
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index d56490974..6b2fec1aa 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -40,13 +40,13 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_horizontal"
 				android:layout_marginVertical="@dimen/spacing_huge"
-				android:text="@string/qr_code_erstellen_title" />
+				android:text="@string/checkins_create_qr_code" />
 
 			<TextView
 				style="@style/NextStep.Text"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/generate_qr_code_kategorie_title"
+				android:text="@string/web_generator_category_label"
 				android:textAllCaps="true" />
 
 			<RadioGroup
@@ -60,7 +60,7 @@
 				style="@style/NextStep.Text"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/generate_qr_code_name_title"
+				android:text="@string/web_generator_title_label"
 				android:textAllCaps="true" />
 
 			<EditText
@@ -70,7 +70,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginVertical="@dimen/spacing_large"
 				android:backgroundTint="@color/blue_main"
-				android:hint="@string/generate_qr_code_name_hint"
+				android:hint="@string/web_generator_title_placeholder"
 				app:backgroundTint="@color/blue_main" />
 
 		</LinearLayout>
@@ -84,6 +84,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_horizontal|bottom"
 		android:layout_marginTop="@dimen/spacing_medium"
-		android:text="@string/qr_code_erstellen_button" />
+		android:text="@string/checkins_create_qr_code" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index 14c5bb822..3ebef1eae 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="@color/white"
 	android:orientation="vertical"
 	android:padding="@dimen/spacing_large">
 
diff --git a/app/src/main/res/layout/item_generate_qr_code.xml b/app/src/main/res/layout/item_generate_qr_code.xml
index dd34600f5..420b33600 100644
--- a/app/src/main/res/layout/item_generate_qr_code.xml
+++ b/app/src/main/res/layout/item_generate_qr_code.xml
@@ -11,6 +11,6 @@
 		style="@style/NextStep.Button"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="@string/qr_code_erstellen_button" />
+		android:text="@string/checkins_create_qr_code" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_qr_code_empty_list.xml b/app/src/main/res/layout/item_qr_code_empty_list.xml
index 05191d2ac..c7728bb3e 100644
--- a/app/src/main/res/layout/item_qr_code_empty_list.xml
+++ b/app/src/main/res/layout/item_qr_code_empty_list.xml
@@ -20,7 +20,7 @@
 		android:layout_gravity="center_horizontal"
 		android:gravity="center"
 		android:paddingVertical="20dp"
-		android:text="@string/qr_code_empty_list"
+		android:text="[TBT] Keine QR-Codes von Veranstaltungen erstellt"
 		android:textStyle="bold" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea93042fa..190de1942 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1648,10 +1648,5 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
 	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
 	<string name="meldungen_detail_free_test_tomorrow"></string>
-	<string name="qr_code_erstellen_button">[TBT] QR-Code erstellen</string>
-	<string name="qr_code_empty_list">[TBT] Keine QR-Codes von Veranstaltungen erstellt</string>
-	<string name="qr_code_erstellen_title">[TBT] QR-Code erstellen</string>
-	<string name="generate_qr_code_kategorie_title">Kategorie</string>
-	<string name="generate_qr_code_name_title">Titel</string>
-	<string name="generate_qr_code_name_hint">z.B. Raum- oder Eventname</string>
+
 </resources>
\ No newline at end of file

From be7f26844e3ae9427e950c6421e7223f3c2354f9 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 4 May 2021 17:37:37 +0200
Subject: [PATCH 024/207] Implemented Check-In from QrCodeFragment

---
 .../dp3t/checkin/CheckinOverviewFragment.kt    |  2 +-
 .../EventsOverviewFragment.kt                  |  5 +----
 .../QrCodeAdapter.kt                           |  2 +-
 .../QrCodeBaseViewHolder.kt                    |  2 +-
 .../checkin/generateqrcode/QrCodeFragment.kt   | 18 ++++++++++++++++++
 .../{events => generateqrcode}/QrCodeItem.kt   |  2 +-
 6 files changed, 23 insertions(+), 8 deletions(-)
 rename app/src/main/java/ch/admin/bag/dp3t/checkin/{events => generateqrcode}/EventsOverviewFragment.kt (90%)
 rename app/src/main/java/ch/admin/bag/dp3t/checkin/{events => generateqrcode}/QrCodeAdapter.kt (98%)
 rename app/src/main/java/ch/admin/bag/dp3t/checkin/{events => generateqrcode}/QrCodeBaseViewHolder.kt (80%)
 rename app/src/main/java/ch/admin/bag/dp3t/checkin/{events => generateqrcode}/QrCodeItem.kt (56%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index f4439d1ac..ed52cd3d8 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -10,7 +10,7 @@ import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
-import ch.admin.bag.dp3t.checkin.events.EventsOverviewFragment
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
similarity index 90%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index a34518013..f20e6924b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.checkin.events
+package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,9 +7,6 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.checkin.generateqrcode.GenerateQrCodeFragment
-import ch.admin.bag.dp3t.checkin.generateqrcode.QRCodeViewModel
-import ch.admin.bag.dp3t.checkin.generateqrcode.QrCodeFragment
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
similarity index 98%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index 982a5731a..f91632cab 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.checkin.events
+package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt
similarity index 80%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt
index ebd765497..6b6dd7836 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeBaseViewHolder.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.checkin.events
+package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 46f10647b..5945818a1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -13,6 +13,11 @@ import androidx.core.content.FileProvider
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
+import ch.admin.bag.dp3t.checkin.models.CheckInState
+import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
 import java.io.File
 
@@ -24,6 +29,7 @@ class QrCodeFragment : Fragment() {
 	}
 
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
 
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -52,6 +58,11 @@ class QrCodeFragment : Fragment() {
 					qrCodeViewModel.deleteQrCode(venueInfo)
 					requireActivity().supportFragmentManager.popBackStack()
 				}
+				checkinButton.setOnClickListener {
+					crowdNotifierViewModel.checkInState =
+						CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), ReminderOption.OFF)
+					showCheckInFragment()
+				}
 			}
 		}.root
 	}
@@ -90,4 +101,11 @@ class QrCodeFragment : Fragment() {
 		}
 	}
 
+	private fun showCheckInFragment() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, CheckInFragment.newInstance())
+			.addToBackStack(CheckInFragment::class.java.canonicalName)
+			.commitAllowingStateLoss()
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt
similarity index 56%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt
index 88199a9f6..df34967da 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/events/QrCodeItem.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.checkin.events
+package ch.admin.bag.dp3t.checkin.generateqrcode
 
 class GenerateQrCodeItem {
 

From f3fe90ae0151a96a9b53aa3adc4dab29c31da4ef Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 4 May 2021 18:30:08 +0200
Subject: [PATCH 025/207] Fix DKA problem and disable check-in if already
 checked-in

---
 .../generateqrcode/EventsOverviewFragment.kt  |  8 +-
 .../generateqrcode/GenerateQrCodeFragment.kt  |  6 +-
 .../checkin/generateqrcode/QRCodeViewModel.kt | 28 ++-----
 .../checkin/generateqrcode/QrCodeFragment.kt  | 82 +++++++++----------
 .../dp3t/checkin/generateqrcode/QrCodeItem.kt | 10 ---
 .../checkin/generateqrcode/QrCodeItems.kt     |  6 ++
 .../main/res/drawable/bg_button_outlined.xml  | 29 +++++--
 .../drawable/outlined_button_text_color.xml   |  8 ++
 app/src/main/res/values/styles.xml            |  3 +-
 9 files changed, 92 insertions(+), 88 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
 create mode 100644 app/src/main/res/drawable/outlined_button_text_color.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index f20e6924b..080c10ab7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -13,9 +13,7 @@ import org.crowdnotifier.android.sdk.model.VenueInfo
 class EventsOverviewFragment : Fragment() {
 
 	companion object {
-		fun newInstance(): EventsOverviewFragment {
-			return EventsOverviewFragment()
-		}
+		fun newInstance() = EventsOverviewFragment()
 	}
 
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
@@ -43,15 +41,13 @@ class EventsOverviewFragment : Fragment() {
 			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner, {
 				adapter.setItems(it)
 			})
-
 		}.root
 	}
 
 	private fun showQrCodeFragment(venueInfo: VenueInfo) {
-		qrCodeViewModel.selectedQrCode = venueInfo
 		requireActivity().supportFragmentManager.beginTransaction()
 			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, QrCodeFragment.newInstance())
+			.replace(R.id.main_fragment_container, QrCodeFragment.newInstance(venueInfo))
 			.addToBackStack(QrCodeFragment::class.java.canonicalName)
 			.commit()
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 175cc9237..762d87df2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -29,7 +29,7 @@ class GenerateQrCodeFragment : Fragment() {
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater).apply {
-			generateQrCodeCancel.setOnClickListener { cancel() }
+			generateQrCodeCancel.setOnClickListener { popFragmentAndHideKeyboard() }
 
 			//TODO: Remove these hardcoded Events
 			val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
@@ -50,10 +50,10 @@ class GenerateQrCodeFragment : Fragment() {
 
 	private fun generateQrCode(title: String, venueType: VenueType) {
 		qrCodeViewModel.generateAndSaveQrCode(title, venueType)
-		cancel()
+		popFragmentAndHideKeyboard()
 	}
 
-	private fun cancel() {
+	private fun popFragmentAndHideKeyboard() {
 		requireActivity().supportFragmentManager.popBackStack()
 		val inputMethodManager = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
 		inputMethodManager.hideSoftInputFromWindow(binding.titleEditText.windowToken, 0)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 33da8a013..ba1d62d32 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -44,7 +44,7 @@ private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper
 	serializer = GeneratedQrCodesSerializer
 )
 
-class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
+class QRCodeViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
 
 	private val generatedQrCodesFlow = getApplication<Application>().generatedQrCodesDataStore.data.buffer(1).catch { exception ->
 		if (exception is IOException) {
@@ -58,14 +58,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		wrapper.generatedQrCodesList.map { it.toVenueInfo() }
 	}.asLiveData()
 
-	var selectedQrCode: VenueInfo? = null
-		set(value) {
-			selectedQrCodeBitmap.value = null
-			value?.let { generateQrCodeBitmap(it) }
-			field = value
-		}
-
-	val selectedQrCodeBitmap = MutableLiveData<Bitmap?>()
+	val selectedQrCodeBitmap = SingleLiveEvent<Bitmap>()
 	val selectedQrCodePdf = SingleLiveEvent<File>()
 
 	fun deleteQrCode(venueInfo: VenueInfo) = viewModelScope.launch {
@@ -105,7 +98,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		saveGeneratedQrCode(newWrapper)
 	}
 
-	fun createQrCodePdf() = viewModelScope.launch(Dispatchers.IO) {
+	fun createQrCodePdf(bitmap: Bitmap) = viewModelScope.launch(Dispatchers.IO) {
 
 		val directory = File(getApplication<Application>().externalCacheDir, "pdfs").apply { if (!exists()) mkdirs() }
 		val file = File(directory, QR_CODE_PDF_FILE_NAME)
@@ -115,9 +108,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		val page = document.startPage(pageInfo)
 		val canvas = page.canvas
 
-		selectedQrCodeBitmap.value?.let {
-			canvas.drawBitmap(it, 120f, 120f, Paint())
-		}
+		canvas.drawBitmap(bitmap, 120f, 120f, Paint())
 
 		document.finishPage(page)
 		FileOutputStream(file).use {
@@ -128,6 +119,11 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		selectedQrCodePdf.postValue(file)
 	}
 
+	fun generateQrCodeBitmap(venueInfo: VenueInfo) = viewModelScope.launch(Dispatchers.IO) {
+		selectedQrCodeBitmap.postValue(
+			QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX)).renderToBitmap(QR_CODE_PIXEL_SIZE)
+		)
+	}
 
 	private suspend fun saveGeneratedQrCode(generatedQrCodesWrapper: GeneratedQrCodesWrapper) {
 		try {
@@ -137,10 +133,4 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		}
 	}
 
-	private fun generateQrCodeBitmap(venueInfo: VenueInfo) = viewModelScope.launch(Dispatchers.IO) {
-		selectedQrCodeBitmap.postValue(
-			QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX)).renderToBitmap(QR_CODE_PIXEL_SIZE)
-		)
-	}
-
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 5945818a1..348a37bd1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -10,6 +10,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.FileProvider
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -17,15 +18,23 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
+import ch.admin.bag.dp3t.checkin.models.QRCodePayload
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
+import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
+import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
+import com.google.protobuf.ByteString
+import org.crowdnotifier.android.sdk.model.VenueInfo
 import java.io.File
 
+private const val KEY_VENUE_INFO = "KEY_VENUE_INFO"
 
 class QrCodeFragment : Fragment() {
 
 	companion object {
-		fun newInstance() = QrCodeFragment()
+		fun newInstance(venueInfo: VenueInfo) = QrCodeFragment().apply {
+			arguments = bundleOf(KEY_VENUE_INFO to venueInfo.toQrCodePayload().toByteString())
+		}
 	}
 
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
@@ -35,48 +44,39 @@ class QrCodeFragment : Fragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
 			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
-			qrCodeViewModel.selectedQrCode?.let { venueInfo ->
-				titleTextview.text = venueInfo.title
-				subtitleTextview.text = "TODO"
-				qrCodeViewModel.selectedQrCodeBitmap.observe(viewLifecycleOwner) {
-					if (it == null) {
-						qrCodeImageview.visibility = View.INVISIBLE
-						qrCodeLoadingProgressbar.isVisible = true
-						shareButton.isEnabled = false
-						printPdfButton.isEnabled = false
-					} else {
-						qrCodeImageview.visibility = View.VISIBLE
-						qrCodeLoadingProgressbar.isVisible = false
-						qrCodeImageview.setImageBitmap(it)
-						shareButton.isEnabled = true
-						printPdfButton.isEnabled = true
-					}
-				}
-				shareButton.setOnClickListener { generatePdf(isPrint = false) }
-				printPdfButton.setOnClickListener { generatePdf(isPrint = true) }
-				deleteButton.setOnClickListener {
-					qrCodeViewModel.deleteQrCode(venueInfo)
-					requireActivity().supportFragmentManager.popBackStack()
-				}
-				checkinButton.setOnClickListener {
-					crowdNotifierViewModel.checkInState =
-						CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), ReminderOption.OFF)
-					showCheckInFragment()
-				}
+			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
+			titleTextview.text = venueInfo.title
+			subtitleTextview.text = "TODO"
+			qrCodeImageview.visibility = View.INVISIBLE
+			qrCodeLoadingProgressbar.isVisible = true
+			shareButton.isEnabled = false
+			printPdfButton.isEnabled = false
+			qrCodeViewModel.selectedQrCodeBitmap.observe(viewLifecycleOwner) {
+				qrCodeImageview.visibility = View.VISIBLE
+				qrCodeLoadingProgressbar.isVisible = false
+				qrCodeImageview.setImageBitmap(it)
+				qrCodeViewModel.createQrCodePdf(it)
 			}
-		}.root
-	}
-
-	private fun generatePdf(isPrint: Boolean) {
-		val pdf = qrCodeViewModel.selectedQrCodePdf.value
-		if (pdf == null) {
-			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) {
-				if (isPrint) printPdf(it) else sharePdf(it)
+			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) { pdfFile ->
+				shareButton.isEnabled = true
+				printPdfButton.isEnabled = true
+				shareButton.setOnClickListener { sharePdf(pdfFile) }
+				printPdfButton.setOnClickListener { printPdf(pdfFile) }
 			}
-			qrCodeViewModel.createQrCodePdf()
-		} else {
-			if (isPrint) printPdf(pdf) else sharePdf(pdf)
-		}
+			qrCodeViewModel.generateQrCodeBitmap(venueInfo)
+			deleteButton.setOnClickListener {
+				qrCodeViewModel.deleteQrCode(venueInfo)
+				requireActivity().supportFragmentManager.popBackStack()
+			}
+			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner) { isCheckedIn ->
+				checkinButton.isEnabled = !isCheckedIn
+			}
+			checkinButton.setOnClickListener {
+				crowdNotifierViewModel.checkInState =
+					CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), ReminderOption.OFF)
+				showCheckInFragment()
+			}
+		}.root
 	}
 
 	private fun printPdf(file: File) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt
deleted file mode 100644
index df34967da..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItem.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package ch.admin.bag.dp3t.checkin.generateqrcode
-
-class GenerateQrCodeItem {
-
-}
-
-class QrCodeEmptyListItem {
-
-}
-
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
new file mode 100644
index 000000000..4e2415339
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
@@ -0,0 +1,6 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+class GenerateQrCodeItem
+
+class QrCodeEmptyListItem
+
diff --git a/app/src/main/res/drawable/bg_button_outlined.xml b/app/src/main/res/drawable/bg_button_outlined.xml
index b22125795..a45c24395 100644
--- a/app/src/main/res/drawable/bg_button_outlined.xml
+++ b/app/src/main/res/drawable/bg_button_outlined.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
   ~
   ~ This Source Code Form is subject to the terms of the Mozilla Public
@@ -9,9 +8,23 @@
   ~ SPDX-License-Identifier: MPL-2.0
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<stroke android:width="@dimen/stroke_width_default" android:color="@color/blue_main"/>
-	<solid android:color="@color/transparent"/>
-	<corners android:radius="@dimen/button_corner_radius"/>
-</shape>
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:state_enabled="true">
+		<shape android:shape="rectangle">
+			<stroke android:width="@dimen/stroke_width_default" android:color="@color/blue_main" />
+			<solid android:color="@color/transparent" />
+			<corners android:radius="@dimen/button_corner_radius" />
+		</shape>
+	</item>
+
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<stroke android:width="@dimen/stroke_width_default" android:color="@color/blue_main_light" />
+			<solid android:color="@color/transparent" />
+			<corners android:radius="@dimen/button_corner_radius" />
+		</shape>
+	</item>
+
+</selector>
+
diff --git a/app/src/main/res/drawable/outlined_button_text_color.xml b/app/src/main/res/drawable/outlined_button_text_color.xml
new file mode 100644
index 000000000..7be84b0a8
--- /dev/null
+++ b/app/src/main/res/drawable/outlined_button_text_color.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:color="@color/blue_main" android:state_enabled="true" />
+
+	<item android:color="@color/blue_main_light" android:state_enabled="false" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fd8a10bc..c3e132417 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -247,7 +247,8 @@
 	</style>
 
 	<style name="NextStep.Button.Outlined">
-		<item name="android:textColor">@color/blue_main</item>
+		<item name="android:drawableTint">@drawable/outlined_button_text_color</item>
+		<item name="android:textColor">@drawable/outlined_button_text_color</item>
 		<item name="android:textAllCaps">true</item>
 		<item name="android:background">@drawable/bg_button_outlined</item>
 	</style>

From 7102c4e8335fbe8a24f93f4626570118952fe06a Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 5 May 2021 10:46:44 +0200
Subject: [PATCH 026/207] PP-973: Implemented Info Tab

---
 .../ch/admin/bag/dp3t/TabbarHostFragment.java |  7 ++-
 .../dp3t/checkin/CheckinOverviewFragment.kt   | 11 ----
 .../ch/admin/bag/dp3t/home/HomeFragment.java  | 56 -----------------
 .../admin/bag/dp3t/infotab/InfoTabFragment.kt | 58 +++++++++++++++++
 .../admin/bag/dp3t/util/FragmentExtensions.kt | 12 ++++
 .../res/layout/fragment_checkin_overview.xml  | 27 --------
 app/src/main/res/layout/fragment_home.xml     | 20 ------
 app/src/main/res/layout/fragment_info_tab.xml | 62 +++++++++++++++++++
 app/src/main/res/menu/menu_bottom_nav_bar.xml |  4 ++
 9 files changed, 142 insertions(+), 115 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/FragmentExtensions.kt
 create mode 100644 app/src/main/res/layout/fragment_info_tab.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/TabbarHostFragment.java b/app/src/main/java/ch/admin/bag/dp3t/TabbarHostFragment.java
index 34938a7ee..b8cdc100e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/TabbarHostFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/TabbarHostFragment.java
@@ -25,6 +25,7 @@
 import ch.admin.bag.dp3t.debug.DebugFragment;
 import ch.admin.bag.dp3t.home.HomeFragment;
 import ch.admin.bag.dp3t.html.HtmlFragment;
+import ch.admin.bag.dp3t.infotab.InfoTabFragment;
 import ch.admin.bag.dp3t.stats.StatsFragment;
 import ch.admin.bag.dp3t.stats.StatsViewModel;
 import ch.admin.bag.dp3t.util.AssetUtil;
@@ -112,7 +113,6 @@ private void setupBottomNavigationView() {
 			lastSelectedTab = item.getItemId();
 			lastTabSwitch = System.currentTimeMillis();
 
-			// Use a switch anyway, there may be more tabs in the future
 			switch (item.getItemId()) {
 				case R.id.bottom_nav_stats:
 					getChildFragmentManager().beginTransaction()
@@ -121,6 +121,11 @@ private void setupBottomNavigationView() {
 
 					statsViewModel.loadStats();
 					break;
+				case R.id.bottom_nav_info:
+					getChildFragmentManager().beginTransaction()
+							.replace(R.id.tabs_fragment_container, InfoTabFragment.newInstance())
+							.commit();
+					break;
 				default:
 					getChildFragmentManager().beginTransaction()
 							.replace(R.id.tabs_fragment_container, HomeFragment.newInstance())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index ed52cd3d8..8a24e79dd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -10,7 +10,6 @@ import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
-import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
 
@@ -29,8 +28,6 @@ class CheckinOverviewFragment : Fragment() {
 		return FragmentCheckinOverviewBinding.inflate(layoutInflater).apply {
 			checkinOverviewToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
-			qrCodeGenerate.setOnClickListener { showEventsOverviewFragment() }
-
 			checkinOverviewHistory.setOnClickListener { v: View? -> }
 
 			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner, { isCheckedIn ->
@@ -50,14 +47,6 @@ class CheckinOverviewFragment : Fragment() {
 		}.root
 	}
 
-	private fun showEventsOverviewFragment() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, EventsOverviewFragment.newInstance())
-			.addToBackStack(EventsOverviewFragment::class.java.canonicalName)
-			.commit()
-	}
-
 	private fun showCheckOutFragment() {
 		requireActivity().supportFragmentManager.beginTransaction()
 			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index e74043f37..7bec4252e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -29,13 +29,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.constraintlayout.helper.widget.Flow;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.dpppt.android.sdk.TracingStatus;
@@ -57,13 +55,9 @@
 import ch.admin.bag.dp3t.networking.models.InfoBoxModelCollection;
 import ch.admin.bag.dp3t.reports.ReportsFragment;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.travel.TravelFragment;
-import ch.admin.bag.dp3t.travel.TravelUtils;
 import ch.admin.bag.dp3t.util.*;
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
 import ch.admin.bag.dp3t.whattodo.WtdInfolineAccessabilityDialogFragment;
-import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment;
-import ch.admin.bag.dp3t.whattodo.WtdSymptomsFragment;
 
 import static android.view.View.VISIBLE;
 
@@ -81,12 +75,7 @@ public class HomeFragment extends Fragment {
 	private View reportStatusBubble;
 	private View reportStatusView;
 	private View reportErrorView;
-	private View travelCard;
 	private View checkinCard;
-	private View cardSymptomsFrame;
-	private View cardTestFrame;
-	private View cardSymptoms;
-	private View cardTest;
 	private View loadingView;
 
 	private SecureStorage secureStorage;
@@ -122,14 +111,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		reportStatusBubble = view.findViewById(R.id.report_status_bubble);
 		reportStatusView = reportStatusBubble.findViewById(R.id.report_status);
 		reportErrorView = reportStatusBubble.findViewById(R.id.report_errors);
-		travelCard = view.findViewById(R.id.card_travel);
 		checkinCard = view.findViewById(R.id.card_checkin);
 		headerView = view.findViewById(R.id.home_header_view);
 		scrollView = view.findViewById(R.id.home_scroll_view);
-		cardSymptoms = view.findViewById(R.id.card_what_to_do_symptoms);
-		cardSymptomsFrame = view.findViewById(R.id.frame_card_symptoms);
-		cardTest = view.findViewById(R.id.card_what_to_do_test);
-		cardTestFrame = view.findViewById(R.id.frame_card_test);
 		loadingView = view.findViewById(R.id.loading_view);
 
 		setupHeader();
@@ -137,8 +121,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		setupTracingView();
 		setupNotification();
 		setupCheckinCard();
-		setupTravelCard();
-		setupWhatToDo();
 		setupNonProductionHint();
 		setupScrollBehavior();
 
@@ -246,14 +228,10 @@ private void setupTracingView() {
 
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
 			if (tracingStatusInterface.isReportedAsInfected()) {
-				cardSymptomsFrame.setVisibility(View.GONE);
-				cardTestFrame.setVisibility(View.GONE);
 				tracingCard.findViewById(R.id.contacs_chevron).setVisibility(View.GONE);
 				tracingCard.setOnClickListener(null);
 				tracingCard.setForeground(null);
 			} else {
-				cardSymptomsFrame.setVisibility(VISIBLE);
-				cardTestFrame.setVisibility(VISIBLE);
 				tracingCard.findViewById(R.id.contacs_chevron).setVisibility(VISIBLE);
 				tracingCard.setOnClickListener(v -> showContactsFragment());
 			}
@@ -419,40 +397,6 @@ private void showCheckinOverviewFragment() {
 				.commit();
 	}
 
-	private void setupTravelCard() {
-		travelCard.setOnClickListener(
-				v -> requireActivity().getSupportFragmentManager().beginTransaction()
-						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-						.replace(R.id.main_fragment_container, TravelFragment.newInstance())
-						.addToBackStack(TravelFragment.class.getCanonicalName())
-						.commit()
-		);
-
-		List<String> countries = secureStorage.getInteropCountries();
-		if (!countries.isEmpty()) {
-			travelCard.setVisibility(VISIBLE);
-			Flow flowConstraint = travelCard.findViewById(R.id.travel_flags_flow);
-			TravelUtils.inflateFlagFlow(flowConstraint, countries);
-		} else {
-			travelCard.setVisibility(View.GONE);
-		}
-	}
-
-	private void setupWhatToDo() {
-		cardSymptoms.setOnClickListener(
-				v -> requireActivity().getSupportFragmentManager().beginTransaction()
-						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-						.replace(R.id.main_fragment_container, WtdSymptomsFragment.newInstance())
-						.addToBackStack(WtdSymptomsFragment.class.getCanonicalName())
-						.commit());
-		cardTest.setOnClickListener(
-				v -> requireActivity().getSupportFragmentManager().beginTransaction()
-						.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-						.replace(R.id.main_fragment_container, WtdPositiveTestFragment.newInstance())
-						.addToBackStack(WtdPositiveTestFragment.class.getCanonicalName())
-						.commit());
-	}
-
 	private void setupNonProductionHint() {
 		View nonProduction = requireView().findViewById(R.id.non_production_message);
 		if (BuildConfig.IS_FLAVOR_PROD || BuildConfig.IS_FLAVOR_ABNAHME) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
new file mode 100644
index 000000000..949a7d48d
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
@@ -0,0 +1,58 @@
+package ch.admin.bag.dp3t.infotab
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
+import ch.admin.bag.dp3t.databinding.FragmentInfoTabBinding
+import ch.admin.bag.dp3t.storage.SecureStorage
+import ch.admin.bag.dp3t.travel.TravelFragment
+import ch.admin.bag.dp3t.travel.TravelUtils
+import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment
+import ch.admin.bag.dp3t.whattodo.WtdSymptomsFragment
+
+class InfoTabFragment : Fragment() {
+
+
+	companion object {
+		@JvmStatic
+		fun newInstance() = InfoTabFragment()
+	}
+
+	private lateinit var binding: FragmentInfoTabBinding
+	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
+	private val tracingViewModel: TracingViewModel by activityViewModels()
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentInfoTabBinding.inflate(inflater).apply {
+			frameCardSymptoms.root.setOnClickListener { showFragment(WtdSymptomsFragment.newInstance()) }
+			frameCardTest.root.setOnClickListener { showFragment(WtdPositiveTestFragment.newInstance()) }
+			tracingViewModel.appStatusLiveData.observe(viewLifecycleOwner) { tracingStatusInterface ->
+				frameCardSymptoms.root.isVisible = !tracingStatusInterface.isReportedAsInfected
+				frameCardTest.root.isVisible = !tracingStatusInterface.isReportedAsInfected
+			}
+			qrCodeGenerate.setOnClickListener { showFragment(EventsOverviewFragment.newInstance()) }
+		}
+		setupTravelCard()
+		return binding.root
+	}
+
+
+	private fun setupTravelCard() {
+		binding.cardTravel.apply {
+			cardTravel.setOnClickListener { showFragment(TravelFragment.newInstance()) }
+			val countries: List<String> = secureStorage.interopCountries
+			cardTravel.isVisible = countries.isNotEmpty()
+			if (countries.isNotEmpty()) {
+				TravelUtils.inflateFlagFlow(travelFlagsFlow, countries)
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/util/FragmentExtensions.kt
new file mode 100644
index 000000000..fda1fe032
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/FragmentExtensions.kt
@@ -0,0 +1,12 @@
+package ch.admin.bag.dp3t.util
+
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+
+fun Fragment.showFragment(fragment: Fragment){
+	requireActivity().supportFragmentManager.beginTransaction()
+		.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+		.replace(R.id.main_fragment_container, fragment)
+		.addToBackStack(fragment::class.java.canonicalName)
+		.commit()
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 8635f0938..09058451b 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -172,33 +172,6 @@
 
 			</androidx.cardview.widget.CardView>
 
-			<androidx.cardview.widget.CardView
-				android:id="@+id/qr_code_generate"
-				style="@style/NextStep.Card"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="@dimen/spacing_medium_large"
-				android:layout_marginEnd="@dimen/spacing_medium_large"
-				android:layout_marginBottom="@dimen/spacing_medium_large">
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical">
-
-					<TextView
-						style="@style/NextStep.Text.Title"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/spacing_large"
-						android:layout_marginTop="@dimen/spacing_medium_large"
-						android:layout_marginRight="@dimen/spacing_large"
-						android:layout_marginBottom="@dimen/spacing_medium"
-						android:text="[TBT] QR Code Generieren" />
-
-				</LinearLayout>
-			</androidx.cardview.widget.CardView>
-
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 3fd3debde..3698f92af 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -68,26 +68,6 @@
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="@dimen/spacing_medium_large" />
 
-				<include
-					layout="@layout/card_travel"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="@dimen/spacing_very_large" />
-
-				<include
-					android:id="@+id/frame_card_symptoms"
-					layout="@layout/card_what_to_do_symptoms"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="@dimen/spacing_very_small" />
-
-				<include
-					android:id="@+id/frame_card_test"
-					layout="@layout/card_what_to_do_test"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="@dimen/spacing_very_large" />
-
 				<LinearLayout
 					android:id="@+id/non_production_message"
 					android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_info_tab.xml b/app/src/main/res/layout/fragment_info_tab.xml
new file mode 100644
index 000000000..890f310bb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_info_tab.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:clipChildren="false"
+		android:clipToPadding="false"
+		android:orientation="vertical"
+		android:paddingHorizontal="@dimen/spacing_medium_large"
+		android:paddingVertical="@dimen/spacing_very_large">
+
+		<include
+			android:id="@+id/card_travel"
+			layout="@layout/card_travel"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/spacing_very_large" />
+
+		<include
+			android:id="@+id/frame_card_symptoms"
+			layout="@layout/card_what_to_do_symptoms"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/spacing_very_small" />
+
+		<include
+			android:id="@+id/frame_card_test"
+			layout="@layout/card_what_to_do_test"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/spacing_very_large" />
+
+		<androidx.cardview.widget.CardView
+			android:id="@+id/qr_code_generate"
+			style="@style/NextStep.Card"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/spacing_very_large">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical">
+
+				<TextView
+					style="@style/NextStep.Text.Title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginHorizontal="@dimen/spacing_large"
+					android:layout_marginTop="@dimen/spacing_medium_large"
+					android:layout_marginBottom="@dimen/spacing_medium"
+					android:text="[TBT] QR Code Generieren" />
+
+			</LinearLayout>
+		</androidx.cardview.widget.CardView>
+
+	</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_bottom_nav_bar.xml b/app/src/main/res/menu/menu_bottom_nav_bar.xml
index f3adadba1..6b62f7bd6 100644
--- a/app/src/main/res/menu/menu_bottom_nav_bar.xml
+++ b/app/src/main/res/menu/menu_bottom_nav_bar.xml
@@ -12,6 +12,10 @@
 		android:id="@+id/bottom_nav_home"
 		android:icon="@drawable/ic_begegnungen"
 		android:title="@string/bottom_nav_tab_home" />
+	<item
+		android:id="@+id/bottom_nav_info"
+		android:icon="@drawable/ic_info"
+		android:title="@string/bottom_nav_tab_info" />
 	<item
 		android:id="@+id/bottom_nav_stats"
 		android:icon="@drawable/ic_stats"

From ceac631091f2c7d2d225a8555734cb73c27f2df5 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 4 May 2021 15:10:57 +0200
Subject: [PATCH 027/207] added card and biometrics for diary screen

---
 app/build.gradle                              |   2 +
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  36 ++++-
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |  21 +++
 app/src/main/res/drawable/illu_diary.xml      | 124 ++++++++++++++++++
 .../res/layout/fragment_checkin_overview.xml  |  59 +++++++--
 5 files changed, 232 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
 create mode 100644 app/src/main/res/drawable/illu_diary.xml

diff --git a/app/build.gradle b/app/build.gradle
index 700cf2f49..3d9d1e094 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,6 +239,8 @@ dependencies {
 	//DO NOT UPDATE ZXING TO 3.4.0! (3.4.0 is not compatible with API Level 23 or lower)
 	implementation "com.google.zxing:core:3.3.0"
 
+	implementation 'androidx.biometric:biometric:1.1.0'
+
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	androidTestImplementation 'androidx.test:runner:1.3.0'
 	androidTestImplementation 'androidx.test:core:1.3.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 8a24e79dd..0e544a345 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -4,12 +4,16 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
+import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
 
@@ -28,7 +32,7 @@ class CheckinOverviewFragment : Fragment() {
 		return FragmentCheckinOverviewBinding.inflate(layoutInflater).apply {
 			checkinOverviewToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
-			checkinOverviewHistory.setOnClickListener { v: View? -> }
+			checkinOverviewDiary.setOnClickListener { authenticateAndShowDiary() }
 
 			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner, { isCheckedIn ->
 				checkoutView.isVisible = isCheckedIn
@@ -62,4 +66,34 @@ class CheckinOverviewFragment : Fragment() {
 			.addToBackStack(QrCodeScannerFragment::class.java.canonicalName)
 			.commit()
 	}
+
+	private fun authenticateAndShowDiary() {
+		val executor = ContextCompat.getMainExecutor(requireContext())
+		val biometricPrompt = BiometricPrompt(requireActivity(), executor, object : BiometricPrompt.AuthenticationCallback() {
+			override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+				showDiaryFragment()
+			}
+		})
+
+		if (BiometricManager.from(requireContext()).canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL or BiometricManager.Authenticators.BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS
+		) {
+			val promptInfo = BiometricPrompt.PromptInfo.Builder()
+				.setTitle(getString(R.string.authenticate_for_diary))
+				.setAllowedAuthenticators(
+					BiometricManager.Authenticators.DEVICE_CREDENTIAL or BiometricManager.Authenticators.BIOMETRIC_WEAK
+				)
+				.build()
+			biometricPrompt.authenticate(promptInfo)
+		} else {
+			showDiaryFragment()
+		}
+	}
+
+	private fun showDiaryFragment() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			.replace(R.id.main_fragment_container, DiaryFragment.newInstance())
+			.addToBackStack(DiaryFragment::class.java.canonicalName)
+			.commit()
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
new file mode 100644
index 000000000..b28ae960a
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -0,0 +1,21 @@
+package ch.admin.bag.dp3t.checkin.diary
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class DiaryFragment : Fragment() {
+
+	companion object {
+		fun newInstance(): DiaryFragment {
+			return DiaryFragment()
+		}
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		TODO()
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/illu_diary.xml b/app/src/main/res/drawable/illu_diary.xml
new file mode 100644
index 000000000..f7ca670e0
--- /dev/null
+++ b/app/src/main/res/drawable/illu_diary.xml
@@ -0,0 +1,124 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="76dp"
+    android:height="111dp"
+    android:viewportWidth="76"
+    android:viewportHeight="111">
+  <path
+      android:pathData="M76,104.697c-1.423,8.768 -76.113,8.032 -76,0 1.423,-8.769 76.113,-8.033 76,0z"
+      android:strokeAlpha="0.314"
+      android:fillColor="#E6E6E6"
+      android:fillType="nonZero"
+      android:fillAlpha="0.314"/>
+  <path
+      android:pathData="M19.258,49.335L58.258,49.335L58.258,103.507L19.258,103.507z"
+      android:fillColor="#73A9CC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M33.258,59.295L29.258,63.38 29.258,49.336 37.258,49.336 37.258,63.38z"
+      android:fillColor="#E5F8F6"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.258,49.335L22.796,45.323 61.258,45.323 58.211,49.335z"
+      android:strokeAlpha="0.406"
+      android:fillColor="#63A0C7"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.406"/>
+  <path
+      android:pathData="M58.258,49.135L58.258,103.507 61.258,100.329 61.258,45.323z"
+      android:strokeAlpha="0.406"
+      android:fillColor="#63A0C7"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.406"/>
+  <path
+      android:pathData="M30.403,44.417L31.94,42.313 40.57,42.313 39.163,44.417z"
+      android:fillColor="#E5F8F6"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M34.338,24.398l-1.559,1.546 -0.45,1.007c-0.912,0.723 -0.402,0.915 -1.402,0.332l-7.45,-6.514s-3.723,-1.945 -2.024,-4.626c1.7,-2.683 3.975,2.541 3.975,2.541l4.503,3.297 2.418,-0.166 1.99,2.584z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M11.7,70.49L9.285,74.104 15.503,76.02 16.254,70.78z"
+      android:fillColor="#B3B3B3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M25.902,21.822L20.177,26.293 20.507,49.589 25.848,49.589 25.848,34.558 33.2,44.902 42.073,40.43 35.919,31.631z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M25.902,21.822L20.177,26.293 20.507,49.104 25.363,49.589 27.305,38.921 33.2,44.902 42.073,40.43 35.919,31.631z"
+      android:fillColor="#CCC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M43.002,50.332L39.262,50.332 19.26,49.442 16.137,70.923 11.282,70.923 11.282,44.255 16.137,37.467 39.406,39.76 46.166,48.359z"
+      android:fillColor="#CCC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M34.71,37.677l-1.092,1.245 -11.168,-0.97 -1.456,-0 -3.89,-0.274 -1.937,1.729s-0.661,-4.116 3.891,-4.768l4.363,-0.081 6.313,-1.108 4.976,4.229z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M34.339,24.4l0.081,0.27c-1.169,0.528 -1.905,1.015 -2.208,1.461 -0.304,0.445 -0.344,1.098 -0.121,1.956l-4.081,-3.254c-3.472,-2.454 -4.854,-3.726 -4.149,-3.82 1.058,-0.14 0.749,-0.991 2.175,-1.22 0.951,-0.151 1.183,-0.215 0.695,-0.187 0.93,0.082 1.635,0.394 2.115,0.937 0.481,0.543 0.881,0.991 1.204,1.344l4.289,2.512z"
+      android:fillColor="#B3B3B3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M24.131,19.097L21.116,10.34A0.372,0.372 116,0 1,21.346 9.867L24.066,8.931A0.372,0.372 116,0 1,24.539 9.161L27.554,17.919A0.372,0.372 116,0 1,27.323 18.391L24.604,19.328A0.372,0.372 116,0 1,24.131 19.097z"
+      android:fillColor="#272655"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M24.131,19.097L21.116,10.34A0.372,0.372 116,0 1,21.346 9.867L24.066,8.931A0.372,0.372 116,0 1,24.539 9.161L27.554,17.919A0.372,0.372 116,0 1,27.323 18.391L24.604,19.328A0.372,0.372 116,0 1,24.131 19.097z"
+      android:strokeAlpha="0.05"
+      android:fillColor="#1A1938"
+      android:fillType="nonZero"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M24.223,19.364L21.024,10.073A0.09,0.09 116,0 1,21.08 9.959L24.332,8.839A0.09,0.09 116,0 1,24.447 8.895L27.646,18.185A0.09,0.09 116,0 1,27.59 18.3L24.337,19.42A0.09,0.09 116,0 1,24.223 19.364z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M23.425,11.401m0.326,0.946a1,1 100.951,1 1,-0.651 -1.891a1,1 88.355,1 1,0.651 1.891"
+      android:fillColor="#272655"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M34.341,8.019a5.685,5.657 0,1 0,11.37 0a5.685,5.657 0,1 0,-11.37 0z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M37.07,12.42l2.55,6.234 6.092,-2.61s-1.984,-4.93 -1.984,-5.074c0,-0.145 -6.658,1.45 -6.658,1.45z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M52.761,40.202l-0.423,1.287 -2.029,9.175 -2.173,0.573 -1.594,-2.007 -3.187,-2.293 -2.318,-3.727 -1.988,-3.277 -0.62,-1.024 -4.475,-8.643 -5.667,-5.955c-1,-1.133 -1.665,-1.749 -1.995,-1.848 -0.329,-0.1 -1.045,0.122 -2.148,0.666l1.68,-1.565 4.926,0.258h0.725l2.025,-0.29 1.63,-1.132 4.203,-3.32 2.573,-0.534 3.7,-1.965 1.516,0.245 5.216,4.3c1.333,3.566 2.016,7.338 2.015,11.14 0,3.374 -0.537,6.727 -1.592,9.936z"
+      android:fillColor="#B3B3B3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M12.372,74.458l-0.13,-0.229 -0.18,-0.297 -0.148,-0.235 -0.082,-0.122 -0.172,-0.246c-0.356,-0.487 -0.76,-0.91 -0.998,-0.74l-1.88,1.4 -0.678,0.509 -2.705,2.455 -0.538,0.06 -0.472,0.065 -0.565,0.093 -0.369,0.07 -0.381,0.081 -0.386,0.094 -0.383,0.107 -0.25,0.078 -0.242,0.085 -0.233,0.09c-0.076,0.032 -0.15,0.064 -0.222,0.098l-0.207,0.104 -0.191,0.11c-0.971,0.609 -1.145,1.515 1.058,2.837 3.164,1.899 5.571,1.808 7.014,1.414l0.252,-0.075 0.23,-0.08 0.209,-0.08 0.186,-0.082 0.238,-0.117 0.237,-0.135 0.192,-0.13 0.463,0.028 0.608,0.024 0.374,0.01 0.412,0.006 0.673,-0.002 0.474,-0.01 0.487,-0.02 0.492,-0.031c1.888,-0.14 3.734,-0.552 3.729,-1.63 -0.005,-0.817 -0.327,-1.82 -0.731,-2.755l-0.191,-0.427 -0.099,-0.208 -0.199,-0.402 -0.099,-0.193 -0.195,-0.365 -0.185,-0.335 -0.323,-0.554 -0.26,-0.421 -0.048,-0.075 -0.22,0.132 -0.246,0.137 -0.203,0.107 -0.228,0.111 -0.246,0.112 -0.128,0.055 -0.265,0.102c-0.894,0.321 -1.878,0.423 -2.05,-0.578z"
+      android:fillColor="#999"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M52.079,28.821L46.629,32.466 38.495,39.924 37.881,38.882 36.16,30.133 36.591,30.133 41.036,21.822z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M52.079,28.821L46.629,32.466 38.495,39.924 37.881,38.882 36.16,30.133 36.591,30.133 41.036,21.822z"
+      android:fillColor="#9E9E9E"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M36.967,29.883L35.382,29.883 34.373,32.711 32.067,33.277 38.099,39.924 47.057,32.145 52.534,28.61 41.436,21.822z"
+      android:fillColor="#B3B3B3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M35.395,5.107c-0.305,-0.203 -0.603,-0.496 -0.892,-0.877C35.995,2.33 37.332,0.231 39.81,0.04c2.478,-0.19 4.334,0.277 6.126,1.925 1.792,1.648 1.915,4.35 2.148,4.69 0.233,0.34 0.081,9.114 -1.052,11.08 -0.606,1.052 -1.024,-0.47 -2.273,-1.935 -0.206,-0.242 -0.703,-0.242 -1.493,0 0.355,-3.853 0.205,-6.112 -0.45,-6.778 -0.168,-0.17 -0.35,-0.324 -0.534,-0.478l-0.988,-0.834c-1.149,-0.97 -5.443,-2.298 -5.9,-2.603z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M41.163,8.924a1.137,1.131 0,1 0,2.274 0a1.137,1.131 0,1 0,-2.274 0z"
+      android:fillColor="#E9C3C3"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M36.045,39.406l-13.917,-1.45 -0.302,-0.134c-0.284,-0.776 -0.4,-1.336 -0.348,-1.68 0.052,-0.345 0.052,-0.873 0,-1.584l11.209,-1.423c2.747,2.661 4.513,4.429 5.3,5.302 0.787,0.873 0.14,1.196 -1.942,0.97zM41.25,13.62c-0.07,0.062 -0.14,0.124 -0.213,0.18 -1.564,0.432 -3.257,0.162 -4.608,-0.733 -1.352,-0.895 -2.218,-2.321 -2.36,-3.883l2.663,-0.09 4.99,1.172c-0.082,0.073 -0.16,0.143 -0.231,0.21l-0.138,0.133c-0.717,0.716 -0.821,1.203 -0.525,2.038l0.058,0.155 0.033,0.081 0.07,0.17 0.122,0.27 0.139,0.296z"
+      android:fillColor="#B3B3B3"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 09058451b..e8a40485b 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -142,31 +142,72 @@
 					</LinearLayout>
 
 				</LinearLayout>
+
 			</androidx.cardview.widget.CardView>
 
 			<androidx.cardview.widget.CardView
-				android:id="@+id/checkin_overview_history"
+				android:id="@+id/checkin_overview_diary"
 				style="@style/NextStep.Card"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="@dimen/spacing_medium_large"
 				android:layout_marginEnd="@dimen/spacing_medium_large"
-				android:layout_marginBottom="@dimen/spacing_medium_large">
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:foreground="?selectableItemBackground">
 
 				<LinearLayout
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:orientation="vertical">
 
-					<TextView
-						style="@style/NextStep.Text.Title"
+					<LinearLayout
+						android:id="@+id/contacts_header"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_marginTop="5dp"
+						android:gravity="center_vertical"
+						android:orientation="horizontal"
+						android:paddingBottom="5dp">
+
+						<TextView
+							style="@style/NextStep.Text.Title"
+							android:layout_width="0dp"
+							android:layout_height="wrap_content"
+							android:layout_marginStart="@dimen/spacing_medium"
+							android:layout_weight="1"
+							android:text="@string/diary_title" />
+
+						<ImageView
+							android:id="@+id/contacs_chevron"
+							android:layout_width="@dimen/chevron_size_title"
+							android:layout_height="@dimen/chevron_size_title"
+							android:layout_marginEnd="@dimen/spacing_small"
+							android:src="@drawable/ic_chevron_right"
+							android:tint="@color/dark_main" />
+
+					</LinearLayout>
+
+					<LinearLayout
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/spacing_large"
-						android:layout_marginTop="@dimen/spacing_medium_large"
-						android:layout_marginRight="@dimen/spacing_large"
-						android:layout_marginBottom="@dimen/spacing_medium"
-						android:text="[TBT] history" />
+						android:layout_margin="@dimen/spacing_medium"
+						android:orientation="horizontal">
+
+						<TextView
+							style="@style/NextStep.Text"
+							android:layout_width="0dp"
+							android:layout_height="wrap_content"
+							android:layout_marginEnd="@dimen/spacing_small"
+							android:layout_weight="1"
+							android:text="@string/checkin_detail_diary_text" />
+
+						<ImageView
+							android:layout_width="76dp"
+							android:layout_height="wrap_content"
+							android:scaleType="center"
+							android:src="@drawable/illu_diary" />
+
+					</LinearLayout>
 
 				</LinearLayout>
 

From d25bec1b23518c9e5c3ca33add233e065e4c15a3 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Thu, 6 May 2021 14:33:27 +0200
Subject: [PATCH 028/207] diary list screen

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  18 +--
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |  69 ++++++++-
 .../diary/DiaryRecyclerViewAdapter.java       | 132 ++++++++++++++++++
 .../checkin/diary/items/ItemVenueVisit.java   |  38 +++++
 .../diary/items/ItemVenueVisitDayHeader.java  |  20 +++
 .../diary/items/VenueVisitRecyclerItem.java   |  11 ++
 .../bag/dp3t/checkin/utils/DateTimeUtils.java |  52 +++++++
 .../dp3t/checkin/utils/VenueInfoExtensions.kt |   2 +-
 .../res/drawable-nodpi/hidden_event_blur.png  | Bin 0 -> 956 bytes
 .../res/layout/fragment_checkin_diary.xml     |  74 ++++++++++
 .../res/layout/item_checkin_venue_visit.xml   | 104 ++++++++++++++
 .../item_checkin_venue_visits_day_header.xml  |  16 +++
 app/src/main/res/values/colors.xml            |   2 +-
 .../main/res/values/crowdnotifier_styles.xml  |  11 ++
 app/src/main/res/values/dimens.xml            |   2 +
 15 files changed, 538 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisit.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitDayHeader.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java
 create mode 100644 app/src/main/res/drawable-nodpi/hidden_event_blur.png
 create mode 100644 app/src/main/res/layout/fragment_checkin_diary.xml
 create mode 100644 app/src/main/res/layout/item_checkin_venue_visit.xml
 create mode 100644 app/src/main/res/layout/item_checkin_venue_visits_day_header.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 0e544a345..8678efffb 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -68,15 +68,15 @@ class CheckinOverviewFragment : Fragment() {
 	}
 
 	private fun authenticateAndShowDiary() {
-		val executor = ContextCompat.getMainExecutor(requireContext())
-		val biometricPrompt = BiometricPrompt(requireActivity(), executor, object : BiometricPrompt.AuthenticationCallback() {
-			override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-				showDiaryFragment()
-			}
-		})
-
-		if (BiometricManager.from(requireContext()).canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL or BiometricManager.Authenticators.BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS
-		) {
+		val biometricState = BiometricManager.from(requireContext())
+			.canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL or BiometricManager.Authenticators.BIOMETRIC_WEAK)
+		if (biometricState == BiometricManager.BIOMETRIC_SUCCESS) {
+			val executor = ContextCompat.getMainExecutor(requireContext())
+			val biometricPrompt = BiometricPrompt(requireActivity(), executor, object : BiometricPrompt.AuthenticationCallback() {
+				override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+					showDiaryFragment()
+				}
+			})
 			val promptInfo = BiometricPrompt.PromptInfo.Builder()
 				.setTitle(getString(R.string.authenticate_for_diary))
 				.setAllowedAuthenticators(
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index b28ae960a..2834ac460 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -4,18 +4,83 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit
+import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader
+import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.checkin.utils.DateTimeUtils
+import ch.admin.bag.dp3t.databinding.FragmentCheckinDiaryBinding
+import ch.admin.bag.dp3t.reports.ReportsFragment
+import org.crowdnotifier.android.sdk.model.ExposureEvent
+import java.util.*
 
 class DiaryFragment : Fragment() {
 
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
+
 	companion object {
 		fun newInstance(): DiaryFragment {
 			return DiaryFragment()
 		}
 	}
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		TODO()
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentCheckinDiaryBinding.inflate(inflater, container, false).apply {
+			checkinDiaryToolbar.setNavigationOnClickListener {
+				parentFragmentManager.popBackStack()
+			}
+
+			val recyclerAdapter = DiaryRecyclerViewAdapter()
+			checkinDiaryRecyclerView.adapter = recyclerAdapter
+
+			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { exposures ->
+				val items: ArrayList<VenueVisitRecyclerItem> = ArrayList<VenueVisitRecyclerItem>()
+				val diaryEntries: List<DiaryEntry> = DiaryStorage.getInstance(context).entries.sortedByDescending {
+					it.arrivalTime
+				}
+				val isEmpty = diaryEntries.isEmpty()
+				checkinDiaryEmptyView.isVisible = isEmpty
+				var daysAgoString = ""
+				for (diaryEntry in diaryEntries) {
+					val newDaysAgoString: String = DateTimeUtils.getDaysAgoString(diaryEntry.getArrivalTime(), context)
+					if (newDaysAgoString != daysAgoString) {
+						daysAgoString = newDaysAgoString
+						items.add(ItemVenueVisitDayHeader(daysAgoString))
+					}
+					items.add(ItemVenueVisit(getExposureWithId(exposures, diaryEntry.id), diaryEntry) { v ->
+						onDiaryEntryClicked(diaryEntry, getExposureWithId(exposures, diaryEntry.id))
+					})
+				}
+				recyclerAdapter.setData(items)
+			}
+		}.root
+	}
+
+
+	private fun getExposureWithId(exposures: List<ExposureEvent>, id: Long): ExposureEvent? {
+		return exposures.firstOrNull { it.id == id }
+	}
+
+	private fun onDiaryEntryClicked(diaryEntry: DiaryEntry, exposureEvent: ExposureEvent?) {
+		if (exposureEvent != null) {
+			requireActivity().supportFragmentManager.beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, ReportsFragment.newInstance())
+				.addToBackStack(ReportsFragment::class.java.canonicalName)
+				.commit()
+		} else {
+			/*requireActivity().supportFragmentManager.beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, EditDiaryEntryFragment.newInstance(true, diaryEntry.id))
+				.addToBackStack(EditDiaryEntryFragment::class.java.canonicalName)
+				.commit()*/
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
new file mode 100644
index 000000000..3a8209f6f
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -0,0 +1,132 @@
+package ch.admin.bag.dp3t.checkin.diary;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit;
+import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader;
+import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem;
+import ch.admin.bag.dp3t.checkin.utils.DateTimeUtils;
+import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
+
+public class DiaryRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+	private final List<VenueVisitRecyclerItem> items = new ArrayList<>();
+
+	@Override
+	public int getItemViewType(int position) { return items.get(position).getViewType().ordinal(); }
+
+	@NonNull
+	@Override
+	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+		VenueVisitRecyclerItem.ViewType type = VenueVisitRecyclerItem.ViewType.values()[viewType];
+
+		switch (type) {
+			case DAY_HEADER:
+				return new DayHeaderViewHolder(
+						LayoutInflater.from(parent.getContext()).inflate(R.layout.item_checkin_venue_visits_day_header, parent, false));
+			case VENUE:
+				return new VenueVisitViewHolder(
+						LayoutInflater.from(parent.getContext()).inflate(R.layout.item_checkin_venue_visit, parent, false));
+			default:
+				throw new IllegalArgumentException();
+		}
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+		VenueVisitRecyclerItem item = items.get(position);
+
+		switch (item.getViewType()) {
+			case DAY_HEADER:
+				((DayHeaderViewHolder) holder).bind((ItemVenueVisitDayHeader) item);
+				break;
+			case VENUE:
+				((VenueVisitViewHolder) holder).bind((ItemVenueVisit) item);
+				break;
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+		return items.size();
+	}
+
+	public void setData(List<VenueVisitRecyclerItem> items) {
+		this.items.clear();
+		this.items.addAll(items);
+		notifyDataSetChanged();
+	}
+
+
+	public static class DayHeaderViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView dayLabel;
+
+		public DayHeaderViewHolder(View itemView) {
+			super(itemView);
+			dayLabel = itemView.findViewById(R.id.item_diary_day_header_text_view);
+		}
+
+		public void bind(ItemVenueVisitDayHeader item) {
+			dayLabel.setText(item.getDayLabel());
+		}
+
+	}
+
+
+	public static class VenueVisitViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView timeTextView;
+		private final TextView nameTextView;
+		private final TextView locationTextView;
+		private final ImageView statusIcon;
+		private final View infoBox;
+		private final TextView infoBoxText;
+
+		public VenueVisitViewHolder(View itemView) {
+			super(itemView);
+			this.timeTextView = itemView.findViewById(R.id.item_diary_entry_time);
+			this.nameTextView = itemView.findViewById(R.id.item_diary_entry_name);
+			this.locationTextView = itemView.findViewById(R.id.item_diary_entry_location);
+			this.statusIcon = itemView.findViewById(R.id.item_diary_entry_status_icon);
+			this.infoBox = itemView.findViewById(R.id.item_diary_entry_infobox);
+			this.infoBoxText = itemView.findViewById(R.id.item_diary_entry_infobox_text);
+		}
+
+		public void bind(ItemVenueVisit item) {
+			VenueInfo venueInfo = item.getDiaryEntry().getVenueInfo();
+			nameTextView.setText(venueInfo.getTitle());
+			locationTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
+			String start = DateTimeUtils.getHourMinuteTimeString(item.getDiaryEntry().getArrivalTime(), ":");
+			String end = DateTimeUtils.getHourMinuteTimeString(item.getDiaryEntry().getDepartureTime(), ":");
+			timeTextView.setText(start + " — " + end);
+			if (item.getExposure() == null) {
+				infoBox.setVisibility(View.GONE);
+				statusIcon.setVisibility(View.GONE);
+			} else {
+				if (item.getExposure().getMessage() != null && !item.getExposure().getMessage().isEmpty()) {
+					infoBox.setVisibility(View.VISIBLE);
+					infoBoxText.setText(item.getExposure().getMessage());
+				} else {
+					infoBox.setVisibility(View.GONE);
+				}
+				statusIcon.setVisibility(View.VISIBLE);
+			}
+			itemView.setOnClickListener(item.getOnClickListener());
+		}
+
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisit.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisit.java
new file mode 100644
index 000000000..d5cf871ac
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisit.java
@@ -0,0 +1,38 @@
+package ch.admin.bag.dp3t.checkin.diary.items;
+
+import android.view.View;
+
+import org.crowdnotifier.android.sdk.model.ExposureEvent;
+
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
+
+public class ItemVenueVisit extends VenueVisitRecyclerItem {
+
+	private final ExposureEvent exposure;
+	private final DiaryEntry diaryEntry;
+	private final View.OnClickListener onClickListener;
+
+	public ItemVenueVisit(ExposureEvent exposure, DiaryEntry diaryEntry, View.OnClickListener onClickListener) {
+		this.exposure = exposure;
+		this.diaryEntry = diaryEntry;
+		this.onClickListener = onClickListener;
+	}
+
+	public ExposureEvent getExposure() {
+		return exposure;
+	}
+
+	public DiaryEntry getDiaryEntry() {
+		return diaryEntry;
+	}
+
+	public View.OnClickListener getOnClickListener() {
+		return onClickListener;
+	}
+
+	@Override
+	public ViewType getViewType() {
+		return ViewType.VENUE;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitDayHeader.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitDayHeader.java
new file mode 100644
index 000000000..2c91b13a0
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitDayHeader.java
@@ -0,0 +1,20 @@
+package ch.admin.bag.dp3t.checkin.diary.items;
+
+public class ItemVenueVisitDayHeader extends VenueVisitRecyclerItem {
+
+	private final String dayLabel;
+
+	public ItemVenueVisitDayHeader(String dayLabel) {
+		this.dayLabel = dayLabel;
+	}
+
+	public String getDayLabel() {
+		return dayLabel;
+	}
+
+	@Override
+	public ViewType getViewType() {
+		return ViewType.DAY_HEADER;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java
new file mode 100644
index 000000000..b648735b3
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java
@@ -0,0 +1,11 @@
+package ch.admin.bag.dp3t.checkin.diary.items;
+
+public abstract class VenueVisitRecyclerItem {
+
+	public enum ViewType {
+		VENUE, DAY_HEADER
+	}
+
+	public abstract ViewType getViewType();
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java
new file mode 100644
index 000000000..b3e02390d
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java
@@ -0,0 +1,52 @@
+package ch.admin.bag.dp3t.checkin.utils;
+
+import android.content.Context;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+import ch.admin.bag.dp3t.R;
+
+public class DateTimeUtils {
+
+	public static String getHourMinuteTimeString(long timeStamp, String delimiter) {
+		Calendar time = Calendar.getInstance();
+		time.setTimeInMillis(timeStamp);
+		return prependZero(time.get(Calendar.HOUR_OF_DAY)) + delimiter + prependZero(time.get(Calendar.MINUTE));
+	}
+
+	public static String getDaysAgoString(long timeStamp, Context context) {
+		final long diff = getStartOfDay().getTime() - timeStamp;
+		if (diff < 0) {
+			return context.getResources().getString(R.string.date_today);
+		} else {
+			long daysAgo = TimeUnit.MILLISECONDS.toDays(diff) + 1;
+			if (daysAgo == 1) {
+				return context.getResources().getString(R.string.date_one_day_ago);
+			} else {
+				return context.getResources().getString(R.string.date_days_ago)
+						.replace("{COUNT}", String.valueOf(daysAgo));
+			}
+		}
+	}
+
+	private static String prependZero(int timeUnit) {
+		if (timeUnit < 10) {
+			return "0" + timeUnit;
+		} else {
+			return String.valueOf(timeUnit);
+		}
+	}
+
+	private static Date getStartOfDay() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(new Date());
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.set(Calendar.MINUTE, 0);
+		calendar.set(Calendar.SECOND, 0);
+		calendar.set(Calendar.MILLISECOND, 0);
+		return calendar.getTime();
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
index bed63156b..8d6fa1a1e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
@@ -19,7 +19,7 @@ fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
 
 fun VenueInfo.getSubtitle(): String {
 	//TODO: This is to be defined what the subtitle will be for SwissCovid
-	return ""
+	return "*subtitle*"
 }
 
 fun VenueInfo.toQrCodePayload(): QRCodePayload {
diff --git a/app/src/main/res/drawable-nodpi/hidden_event_blur.png b/app/src/main/res/drawable-nodpi/hidden_event_blur.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a85d1df51d9d6c68c9e8729a171cc9be1d3291
GIT binary patch
literal 956
zcmV;t14I0YP)<h;3K|Lk000e1NJLTq007be001rs1^@s6UCBov00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D15rstK~#8N?VQ_=
z;xG_I+1vkr@Lpz9h!YjPb_QlhoK5OTC3kEOFU^r5MDykHIX?UM;W^%JW7rwbh!AP^
zMWoshkH}H?_;uvk2A8G^6rpy&dm^-?(MW{v39koHG!o$gc^w9@B!RCX&R45FVLe<R
z^2ciMI&4f&0-skcfohPb_Zs0fAdDh`Y9iAP=t;o5M#TAcOO+|CPnGEREmfw7G>Dc6
zE)gPqpMprp#JXS%uf+vHCM5E(E*Qgxv;=TD5C@So<}?}uA}PP7NFYY$MMN4vPb7jo
zq;(pF?LZh#qMuWciBl;e4M0-#aG^MbBGFj97qy1;W&mn}QyWs7MZy@o2kFU<s3HN4
z@dl+?`yu_=89k9g2v5)xsr7|5Ut;$Iy+}`XLKVpyqnhYWkza=~cn?|$gIM}#r^ax*
zwbo$_^uha~IO)#-^t({SzsPz7V~eG=@H|xrmxtex6kTgA0u7|~=67in$wumv4Zb(5
z1Cmsc_#swtkr=~<^aOB05C@s4wdVW6>v1`h)@j6vBqGrudII>oYGkUZe;=V<Llpvv
zTJgORX%I_q{3?@zJdD04tcL_aCLdiKufxW?CxWlLIMlu#)&psf#cSbp7{DVU)ID5B
zqHS@BoJh0-9+hEfUxZqp$TFVA9y}sJZ%+gYM`uZ%yR~Oe8s;KVI1@-y#hR~sLezO(
z*Mx8eTp|x#>z)ukuex>HyY30$C{$61|LmX|-dX}wK_m}PG!V_Ruk{)s{O?E>M#NEC
zPn0wza6u5q|M3YCktiG)L~)4_iSfE;NhFsDk&ww{3*o3B5+{=6@qdMeU|o?E34=U8
zrqn0DAu@#{GJkBFKqN&1k@-}T6g^xh<YDxLa76q)ULByG(S&oiIKd0mgm5-m@Bg{3
zB83n>KozNeF6<?Qv(a*3c0o51Dt?3!J`<7<&V+>FW&_cUhFPkfNOf!pG`~m)2ZZ-G
z;SL?6!rDJ_2p32vk-}|o#ZRXYjt;UQ5pkIoMG{pe>WCE1f{TPqcM^%73@w>_Bq1Cf
zL_#JXq506NsPirlYjsZuM+9MziNLj9lA*O0iNYB{92ZE;*N+MjaYDG~PO6Uz60ySB
esHc%}x%>qcRVPyI3hlc90000<MNUMnLSTaA*_1i}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_checkin_diary.xml b/app/src/main/res/layout/fragment_checkin_diary.xml
new file mode 100644
index 000000000..f28dd5f4e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_checkin_diary.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/grey_light"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/checkin_diary_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back"
+		app:title="@string/diary_title" />
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/checkin_diary_recycler_view"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:clipToPadding="false"
+			android:orientation="vertical"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingBottom="@dimen/spacing_small"
+			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+			tools:itemCount="2"
+			tools:listitem="@layout/item_checkin_venue_visit" />
+
+		<LinearLayout
+			android:id="@+id/checkin_diary_empty_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:layout_marginHorizontal="@dimen/spacing_very_large"
+			android:orientation="vertical"
+			android:visibility="gone"
+			tools:visibility="visible">
+
+			<TextView
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:gravity="center"
+				android:text="@string/empty_diary_title" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:gravity="center"
+				android:text="@string/empty_diary_text" />
+
+		</LinearLayout>
+
+	</FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_checkin_venue_visit.xml b/app/src/main/res/layout/item_checkin_venue_visit.xml
new file mode 100644
index 000000000..29585483b
--- /dev/null
+++ b/app/src/main/res/layout/item_checkin_venue_visit.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/CrowdNotifier.Card.Small"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginVertical="@dimen/spacing_tiny_small">
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginVertical="@dimen/spacing_medium"
+		android:layout_marginHorizontal="@dimen/spacing_large">
+
+		<ImageView
+			android:id="@+id/item_diary_hidden_event_placeholder"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/hidden_event_blur"
+			android:visibility="gone"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<ImageView
+			android:id="@+id/item_diary_entry_status_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/ic_info"
+			android:tint="@color/red_main"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<LinearLayout
+			android:id="@+id/item_diary_entry_info_container"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingEnd="@dimen/spacing_medium_large"
+			app:layout_constraintEnd_toStartOf="@id/item_diary_entry_status_icon"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent">
+
+			<TextView
+				android:id="@+id/item_diary_entry_name"
+				style="@style/CrowdNotifier.Text.Subtitle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				tools:text="Meeting Room IP32" />
+
+			<TextView
+				android:id="@+id/item_diary_entry_location"
+				style="@style/CrowdNotifier.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_tiny_small"
+				tools:text="EPFL Campus, Lausanne" />
+
+			<TextView
+				android:id="@+id/item_diary_entry_time"
+				style="@style/CrowdNotifier.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_tiny_small"
+				tools:text="10:01 - 11:35" />
+
+		</LinearLayout>
+
+		<androidx.cardview.widget.CardView
+			android:id="@+id/item_diary_entry_infobox"
+			style="@style/CrowdNotifier.Card.Tertiary"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_large"
+			app:layout_constraintTop_toBottomOf="@id/item_diary_entry_info_container">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="@dimen/spacing_medium"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/item_diary_entry_infobox_header"
+					style="@style/CrowdNotifier.Text.Status.Tertiary"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="[TBT] report_information_button_title" />
+
+				<TextView
+					android:id="@+id/item_diary_entry_infobox_text"
+					style="@style/CrowdNotifier.Text"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_very_small"
+					tools:text="Please call the EPFL-Infoline to receive further instructions." />
+
+			</LinearLayout>
+
+		</androidx.cardview.widget.CardView>
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml b/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml
new file mode 100644
index 000000000..aac69e378
--- /dev/null
+++ b/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_marginTop="@dimen/spacing_very_large"
+	android:layout_marginBottom="@dimen/spacing_small">
+
+	<TextView
+		android:id="@+id/item_diary_day_header_text_view"
+		style="@style/CrowdNotifier.Text.Status.Small"
+		tools:text="4 days ago"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f4c8b4795..dc3966307 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -85,6 +85,6 @@
 	<color name="light_grey">#f2f2f2</color>
 	<color name="transparent_milk">#c0f2f2f2</color>
 
-
+	<color name="tertiary_light">#fdedf0</color>
 
 </resources>
diff --git a/app/src/main/res/values/crowdnotifier_styles.xml b/app/src/main/res/values/crowdnotifier_styles.xml
index 6672bfd69..5ea6611bc 100644
--- a/app/src/main/res/values/crowdnotifier_styles.xml
+++ b/app/src/main/res/values/crowdnotifier_styles.xml
@@ -18,6 +18,17 @@
 		<item name="cardBackgroundColor">@color/light_grey</item>
 	</style>
 
+	<style name="CrowdNotifier.Card.Small">
+		<item name="android:minHeight">0dp</item>
+		<item name="cardCornerRadius">@dimen/checkin_diary_entry_corner_radius</item>
+	</style>
+
+	<style name="CrowdNotifier.Card.Tertiary">
+		<item name="android:minHeight">0dp</item>
+		<item name="cardCornerRadius">@dimen/checkin_diary_entry_corner_radius</item>
+		<item name="cardBackgroundColor">@color/tertiary_light</item>
+	</style>
+
 	<style name="CrowdNotifier.Text" parent="TextAppearance.AppCompat">
 		<item name="android:textSize">@dimen/text_size_normal</item>
 		<item name="android:textColor">@color/main</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 6e4427309..b5f481ad2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -110,4 +110,6 @@
 	<dimen name="edit_text_stroke_width">2dp</dimen>
 	<dimen name="edit_text_radius">3dp</dimen>
 
+	<dimen name="checkin_diary_entry_corner_radius">3dp</dimen>
+
 </resources>
\ No newline at end of file

From 3113fe91dd8e5e475044417a503c529141e7dec8 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Thu, 6 May 2021 19:14:31 +0200
Subject: [PATCH 029/207] proguard rule for jna

---
 app/proguard-rules.pro | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 244ed4eab..319c99004 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -23,4 +23,6 @@
 -dontobfuscate
 
 -keep class ch.admin.bag.dp3t.inform.models.** { *; }
--keep class ch.admin.bag.dp3t.networking.models.** { *; }
\ No newline at end of file
+-keep class ch.admin.bag.dp3t.networking.models.** { *; }
+
+-keep class com.sun.jna.** { *; }

From 2710e2a4381e867401ea57b3693ca36511d39279 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 11 May 2021 14:44:44 +0200
Subject: [PATCH 030/207] added screen to edit checkin in diary

---
 .../checkin/checkinflow/CheckOutFragment.java |    9 +-
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |   13 +-
 .../diary/DiaryRecyclerViewAdapter.java       |    6 +-
 .../checkin/diary/EditDiaryEntryFragment.java |  144 ++
 .../diary/HideInDiaryDialogFragment.java      |   72 +
 .../bag/dp3t/checkin/utils/DateTimeUtils.java |   52 -
 .../ch/admin/bag/dp3t/util/StringUtil.java    |   25 +
 .../layout/dialog_fragment_hide_in_diary.xml  |   75 +
 ...ut.xml => fragment_check_out_and_edit.xml} |   13 +-
 app/src/main/res/values-bs/strings.xml        |   26 +
 app/src/main/res/values-de/strings.xml        |   26 +
 app/src/main/res/values-es/strings.xml        |   26 +
 app/src/main/res/values-fr/strings.xml        |   26 +
 app/src/main/res/values-hr/strings.xml        |   26 +
 app/src/main/res/values-it/strings.xml        |   26 +
 app/src/main/res/values-pt/strings.xml        |   26 +
 app/src/main/res/values-rm/strings.xml        |   26 +
 app/src/main/res/values-sq/strings.xml        |   26 +
 app/src/main/res/values-sr/strings.xml        |   26 +
 app/src/main/res/values-ti/strings.xml        |   26 +
 app/src/main/res/values-tr/strings.xml        |   26 +
 app/src/main/res/values/strings.xml           | 1903 +++++++++--------
 22 files changed, 1620 insertions(+), 1004 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java
 create mode 100644 app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
 rename app/src/main/res/layout/{fragment_check_out.xml => fragment_check_out_and_edit.xml} (92%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index 49adbc93d..60048a8d5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -3,8 +3,8 @@
 import android.app.TimePickerDialog;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -45,8 +45,9 @@ public class CheckOutFragment extends Fragment {
 	private TextView fromTime;
 	private TextView toTime;
 	private TextView dateTextView;
+	private Button hideInDiaryButton;
 
-	public CheckOutFragment() { super(R.layout.fragment_check_out); }
+	public CheckOutFragment() { super(R.layout.fragment_check_out_and_edit); }
 
 	public static CheckOutFragment newInstance() {
 		return new CheckOutFragment();
@@ -85,6 +86,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
 		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
+		hideInDiaryButton = view.findViewById(R.id.edit_diary_entry_hide_from_diary_button);
 
 		titleTextView.setText(venueInfo.getTitle());
 		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
@@ -95,6 +97,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime.setOnClickListener(v -> showTimePicker(true));
 		toTime.setOnClickListener(v -> showTimePicker(false));
 
+		hideInDiaryButton.setVisibility(View.GONE);
+
 		doneButton.setOnClickListener(v -> {
 			CrowdNotifierReminderHelper.removeAllReminders(getContext());
 			saveEntry();
@@ -114,7 +118,6 @@ private void refreshTimeTextViews() {
 	}
 
 	private void showTimePicker(boolean isFromTime) {
-
 		Calendar time = Calendar.getInstance();
 		if (isFromTime) {
 			time.setTimeInMillis(checkInState.getCheckInTime());
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 2834ac460..0c5a98420 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -9,14 +9,15 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
-import ch.admin.bag.dp3t.checkin.utils.DateTimeUtils
 import ch.admin.bag.dp3t.databinding.FragmentCheckinDiaryBinding
 import ch.admin.bag.dp3t.reports.ReportsFragment
+import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.model.ExposureEvent
 import java.util.*
 
@@ -48,7 +49,7 @@ class DiaryFragment : Fragment() {
 				checkinDiaryEmptyView.isVisible = isEmpty
 				var daysAgoString = ""
 				for (diaryEntry in diaryEntries) {
-					val newDaysAgoString: String = DateTimeUtils.getDaysAgoString(diaryEntry.getArrivalTime(), context)
+					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.getArrivalTime(), context)
 					if (newDaysAgoString != daysAgoString) {
 						daysAgoString = newDaysAgoString
 						items.add(ItemVenueVisitDayHeader(daysAgoString))
@@ -75,11 +76,11 @@ class DiaryFragment : Fragment() {
 				.addToBackStack(ReportsFragment::class.java.canonicalName)
 				.commit()
 		} else {
-			/*requireActivity().supportFragmentManager.beginTransaction()
+			requireActivity().supportFragmentManager.beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, EditDiaryEntryFragment.newInstance(true, diaryEntry.id))
-				.addToBackStack(EditDiaryEntryFragment::class.java.canonicalName)
-				.commit()*/
+				.replace(R.id.main_fragment_container, EditDiaryEntryFragment.newInstance(diaryEntry.id))
+				.addToBackStack(CheckOutFragment::class.java.canonicalName)
+				.commit()
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index 3a8209f6f..e234dfaf5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -17,8 +17,8 @@
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit;
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader;
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem;
-import ch.admin.bag.dp3t.checkin.utils.DateTimeUtils;
 import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
+import ch.admin.bag.dp3t.util.StringUtil;
 
 public class DiaryRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -109,8 +109,8 @@ public void bind(ItemVenueVisit item) {
 			VenueInfo venueInfo = item.getDiaryEntry().getVenueInfo();
 			nameTextView.setText(venueInfo.getTitle());
 			locationTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
-			String start = DateTimeUtils.getHourMinuteTimeString(item.getDiaryEntry().getArrivalTime(), ":");
-			String end = DateTimeUtils.getHourMinuteTimeString(item.getDiaryEntry().getDepartureTime(), ":");
+			String start = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getArrivalTime(), ":");
+			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getDepartureTime(), ":");
 			timeTextView.setText(start + " — " + end);
 			if (item.getExposure() == null) {
 				infoBox.setVisibility(View.GONE);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
new file mode 100644
index 000000000..eb847a346
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
@@ -0,0 +1,144 @@
+package ch.admin.bag.dp3t.checkin.diary;
+
+import android.app.TimePickerDialog;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import java.util.Calendar;
+
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
+import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
+import ch.admin.bag.dp3t.util.StringUtil;
+
+public class EditDiaryEntryFragment extends Fragment {
+
+	public final static String TAG = EditDiaryEntryFragment.class.getCanonicalName();
+
+	private final static long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
+	private final static String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
+
+	private DiaryStorage diaryStorage;
+	private DiaryEntry diaryEntry;
+
+	private TextView titleTextView;
+	private TextView subtitleTextView;
+	private View doneButton;
+	private View cancelButton;
+	private EditText commentEditText;
+	private TextView fromTime;
+	private TextView toTime;
+	private TextView dateTextView;
+	private View hideInDiaryButton;
+
+
+	public EditDiaryEntryFragment() { super(R.layout.fragment_check_out_and_edit); }
+
+	public static EditDiaryEntryFragment newInstance(long diaryEntryId) {
+		EditDiaryEntryFragment fragment = new EditDiaryEntryFragment();
+		Bundle args = new Bundle();
+		args.putLong(ARG_DIARY_ENTRY_ID, diaryEntryId);
+		fragment.setArguments(args);
+		return fragment;
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		diaryStorage = DiaryStorage.getInstance(requireContext());
+		long diaryEntryId = getArguments().getLong(ARG_DIARY_ENTRY_ID);
+		diaryEntry = diaryStorage.getDiaryEntryWithId(diaryEntryId);
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		titleTextView = view.findViewById(R.id.check_out_fragment_title);
+		subtitleTextView = view.findViewById(R.id.check_out_fragment_subtitle);
+		doneButton = view.findViewById(R.id.check_out_fragment_done_button);
+		cancelButton = view.findViewById(R.id.check_out_fragment_cancel_button);
+		commentEditText = view.findViewById(R.id.check_out_fragment_comment_edit_text);
+		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
+		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
+		dateTextView = view.findViewById(R.id.check_out_fragment_date);
+		hideInDiaryButton = view.findViewById(R.id.edit_diary_entry_hide_from_diary_button);
+
+		titleTextView.setText(diaryEntry.getVenueInfo().getTitle());
+		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(diaryEntry.getVenueInfo()));
+
+		refreshTimeTextViews();
+
+		fromTime.setOnClickListener(v -> showTimePicker(true));
+		toTime.setOnClickListener(v -> showTimePicker(false));
+		commentEditText.setText(diaryEntry.getComment());
+
+		hideInDiaryButton.setVisibility(View.VISIBLE);
+		hideInDiaryButton.setOnClickListener(v -> hideInDiary());
+
+		doneButton.setOnClickListener(v -> {
+			saveEntry();
+			requireActivity().getSupportFragmentManager().popBackStack();
+		});
+		cancelButton.setOnClickListener(v -> {
+			requireActivity().getSupportFragmentManager().popBackStack();
+		});
+	}
+
+	private void refreshTimeTextViews() {
+		fromTime.setText(StringUtil.getHourMinuteTimeString(diaryEntry.getArrivalTime(), "  :  "));
+		toTime.setText(StringUtil.getHourMinuteTimeString(diaryEntry.getDepartureTime(), "  :  "));
+		dateTextView.setText(StringUtil.getCheckOutDateString(getContext(), diaryEntry.getArrivalTime(),
+				diaryEntry.getDepartureTime()));
+	}
+
+	private void showTimePicker(boolean isFromTime) {
+		Calendar time = Calendar.getInstance();
+		if (isFromTime) {
+			time.setTimeInMillis(diaryEntry.getArrivalTime());
+		} else {
+			time.setTimeInMillis(diaryEntry.getDepartureTime());
+		}
+		int hour = time.get(Calendar.HOUR_OF_DAY);
+		int minute = time.get(Calendar.MINUTE);
+		TimePickerDialog timePicker;
+		timePicker = new TimePickerDialog(getContext(), (picker, selectedHour, selectedMinute) -> {
+			time.set(Calendar.HOUR_OF_DAY, selectedHour);
+			time.set(Calendar.MINUTE, selectedMinute);
+			if (isFromTime) {
+				diaryEntry.setArrivalTime(time.getTimeInMillis());
+			} else {
+				diaryEntry.setDepartureTime(time.getTimeInMillis());
+			}
+			if (diaryEntry.getDepartureTime() < diaryEntry.getArrivalTime()) {
+				diaryEntry.setDepartureTime(diaryEntry.getDepartureTime() + ONE_DAY_IN_MILLIS);
+			} else if (diaryEntry.getArrivalTime() + ONE_DAY_IN_MILLIS < diaryEntry.getDepartureTime()) {
+				diaryEntry.setDepartureTime(diaryEntry.getDepartureTime() - ONE_DAY_IN_MILLIS);
+			}
+			refreshTimeTextViews();
+		}, hour, minute, true);
+
+		timePicker.show();
+	}
+
+	private void saveEntry() {
+		String comment = commentEditText.getText().toString();
+		diaryEntry.setComment(comment);
+		CrowdNotifier.updateCheckIn(diaryEntry.getId(), diaryEntry.getArrivalTime(), diaryEntry.getDepartureTime(),
+				diaryEntry.getVenueInfo(), getContext());
+		diaryStorage.updateEntry(diaryEntry);
+	}
+
+	private void hideInDiary() {
+		requireActivity().getSupportFragmentManager().beginTransaction()
+				.add(HideInDiaryDialogFragment.newInstance(diaryEntry.getId()), HideInDiaryDialogFragment.TAG)
+				.commit();
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
new file mode 100644
index 000000000..0a910cf4e
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
@@ -0,0 +1,72 @@
+package ch.admin.bag.dp3t.checkin.diary;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
+
+public class HideInDiaryDialogFragment extends DialogFragment {
+
+	public final static String TAG = HideInDiaryDialogFragment.class.getCanonicalName();
+	private final static String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
+
+	private DiaryStorage diaryStorage;
+	private DiaryEntry diaryEntry;
+
+	public static HideInDiaryDialogFragment newInstance(long entryId) {
+		HideInDiaryDialogFragment fragment = new HideInDiaryDialogFragment();
+		Bundle args = new Bundle();
+		args.putLong(ARG_DIARY_ENTRY_ID, entryId);
+		fragment.setArguments(args);
+		return fragment;
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		diaryStorage = DiaryStorage.getInstance(getContext());
+		diaryEntry = diaryStorage.getDiaryEntryWithId(getArguments().getLong(ARG_DIARY_ENTRY_ID));
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		return inflater.inflate(R.layout.dialog_fragment_hide_in_diary, container);
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		View closeButton = view.findViewById(R.id.remove_diary_entry_dialog_close_button);
+		View hideButton = view.findViewById(R.id.hide_diary_entry_dialog_hide_button);
+		TextView explanationText = view.findViewById(R.id.hide_diary_entry_dialog_text);
+
+		String locationInfo = diaryEntry.getVenueInfo().getDescription() + ", " + diaryEntry.getVenueInfo().getAddress();
+		explanationText.setText(getString(R.string.remove_diary_warning_text).replace("{LOCATION_INFO}", locationInfo));
+		closeButton.setOnClickListener(v -> dismiss());
+		hideButton.setOnClickListener(v -> hideNow());
+	}
+
+	@Override
+	public void onResume() {
+		getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		getDialog().getWindow().setBackgroundDrawableResource(R.drawable.dialog_background);
+
+		super.onResume();
+	}
+
+	private void hideNow() {
+		diaryStorage.removeEntry(diaryEntry.getId());
+		dismiss();
+		requireActivity().getSupportFragmentManager().popBackStack();
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java
deleted file mode 100644
index b3e02390d..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/DateTimeUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package ch.admin.bag.dp3t.checkin.utils;
-
-import android.content.Context;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
-import ch.admin.bag.dp3t.R;
-
-public class DateTimeUtils {
-
-	public static String getHourMinuteTimeString(long timeStamp, String delimiter) {
-		Calendar time = Calendar.getInstance();
-		time.setTimeInMillis(timeStamp);
-		return prependZero(time.get(Calendar.HOUR_OF_DAY)) + delimiter + prependZero(time.get(Calendar.MINUTE));
-	}
-
-	public static String getDaysAgoString(long timeStamp, Context context) {
-		final long diff = getStartOfDay().getTime() - timeStamp;
-		if (diff < 0) {
-			return context.getResources().getString(R.string.date_today);
-		} else {
-			long daysAgo = TimeUnit.MILLISECONDS.toDays(diff) + 1;
-			if (daysAgo == 1) {
-				return context.getResources().getString(R.string.date_one_day_ago);
-			} else {
-				return context.getResources().getString(R.string.date_days_ago)
-						.replace("{COUNT}", String.valueOf(daysAgo));
-			}
-		}
-	}
-
-	private static String prependZero(int timeUnit) {
-		if (timeUnit < 10) {
-			return "0" + timeUnit;
-		} else {
-			return String.valueOf(timeUnit);
-		}
-	}
-
-	private static Date getStartOfDay() {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.set(Calendar.HOUR_OF_DAY, 0);
-		calendar.set(Calendar.MINUTE, 0);
-		calendar.set(Calendar.SECOND, 0);
-		calendar.set(Calendar.MILLISECOND, 0);
-		return calendar.getTime();
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index 85fe8b9ff..d4b481a0d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -120,4 +120,29 @@ public static String getCheckOutDateString(Context context, long checkInTime, lo
 		}
 	}
 
+	public static String getDaysAgoString(long timeStamp, Context context) {
+		final long diff = getStartOfDay().getTime() - timeStamp;
+		if (diff < 0) {
+			return context.getResources().getString(R.string.date_today);
+		} else {
+			long daysAgo = TimeUnit.MILLISECONDS.toDays(diff) + 1;
+			if (daysAgo == 1) {
+				return context.getResources().getString(R.string.date_one_day_ago);
+			} else {
+				return context.getResources().getString(R.string.date_days_ago)
+						.replace("{COUNT}", String.valueOf(daysAgo));
+			}
+		}
+	}
+
+	private static Date getStartOfDay() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(new Date());
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.set(Calendar.MINUTE, 0);
+		calendar.set(Calendar.SECOND, 0);
+		calendar.set(Calendar.MILLISECOND, 0);
+		return calendar.getTime();
+	}
+
 }
diff --git a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
new file mode 100644
index 000000000..0b9d12d44
--- /dev/null
+++ b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/CrowdNotifier.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_margin="@dimen/spacing_medium"
+	android:clickable="false"
+	android:focusable="false">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<ImageButton
+			android:id="@+id/remove_diary_entry_dialog_close_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:layout_marginTop="@dimen/spacing_small"
+			android:layout_marginEnd="@dimen/spacing_small"
+			android:background="@drawable/ripple_rounded"
+			android:clickable="true"
+			android:focusable="true"
+			android:padding="@dimen/spacing_medium_large"
+			android:src="@drawable/ic_close" />
+
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:paddingHorizontal="@dimen/spacing_very_large"
+				android:paddingBottom="@dimen/spacing_huge">
+
+				<TextView
+					style="@style/CrowdNotifier.Text.Title"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/remove_diary_warning_title" />
+
+				<TextView
+					android:id="@+id/hide_diary_entry_dialog_text"
+					style="@style/CrowdNotifier.Text"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_large"
+					tools:text="@string/remove_diary_warning_text" />
+
+				<TextView
+					style="@style/CrowdNotifier.Text"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_large"
+					android:text="@string/remove_diary_warning_star_text" />
+
+				<Button
+					android:id="@+id/hide_diary_entry_dialog_hide_button"
+					style="@style/CrowdNotifier.Button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:layout_marginTop="@dimen/spacing_very_large"
+					android:text="@string/remove_diary_remove_now_button" />
+
+			</LinearLayout>
+
+		</ScrollView>
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_check_out.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
similarity index 92%
rename from app/src/main/res/layout/fragment_check_out.xml
rename to app/src/main/res/layout/fragment_check_out_and_edit.xml
index 0e4830200..c6b61575a 100644
--- a/app/src/main/res/layout/fragment_check_out.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -51,7 +51,7 @@
 
 	<ScrollView
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="match_parent">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -159,6 +159,17 @@
 				android:layout_marginTop="@dimen/spacing_small"
 				android:hint="@string/edit_mode_comment_placeholder" />
 
+			<Button
+				android:id="@+id/edit_diary_entry_hide_from_diary_button"
+				style="@style/CrowdNotifier.Button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:visibility="gone"
+				tools:visibility="visible"
+				android:text="@string/remove_from_diary_button" />
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index e0876a30e..6877d5508 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1625,4 +1625,30 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8a82a9356..ed07d6cc4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1690,4 +1690,30 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Checken Sie bei Events ein und sehen Sie ihre vergangenen Check-Ins."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title">"Check-Ins teilen"</string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"Sie können Events teilen um andere zu warnen, welche mit Ihnen am selben Event waren."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all">"Alle wählen"</string>
+    <string name="inform_dont_send_button_title">"Nicht senden"</string>
+    <string name="inform_try_again_button_title">"Erneut versuchen"</string>
+    <string name="inform_dont_share_button_title">"Nicht teilen"</string>
+    <string name="inform_really_not_share_title">"Sind Sie sicher?"</string>
+    <string name="inform_really_not_share_subtitle">"[TBT] Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified."</string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title">"Achtung"</string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text">"Sind Sie sicher, dass Sie “{LOCATION_INFO}” in Ihrem Tagebuch nicht mehr anzeigen möchten? Diese Aktion kann nicht rückgängig gemacht werden."</string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button">"Nicht mehr anzeigen"</string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text">"Die App speichert diesen Eintrag noch für 14 Tage verschlüsselt im Hintergrund, damit Sie bei einer möglichen Ansteckung trotzdem gewarnt werden können."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4a53321ab..2792da15f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1616,4 +1616,30 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 35095dd50..96fd96b6b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1651,4 +1651,30 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f2450c89a..4fc2e48a6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1621,4 +1621,30 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a83736638..f2e2d4a08 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1659,4 +1659,30 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1efeaaa4f..cb200fb1a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1626,4 +1626,30 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 51c904d97..088b461aa 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1621,4 +1621,30 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 08b877ad5..156f6af20 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1626,4 +1626,30 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ed032faee..20475ba02 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1621,4 +1621,30 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index c5958769b..7881310fc 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1601,4 +1601,30 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5316ac739..82a989383 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1603,4 +1603,30 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 190de1942..2c3b1c55f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,663 +1,663 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<!-- App Name -->
-	<string name="app_name">"SwissCovid"</string>
+    <!-- App Name -->
+    <string name="app_name">"SwissCovid"</string>
 
-	<!-- App Name (unter Icon auf iOS) -->
-	<string name="CFBundleDisplayName">"SwissCovid"</string>
+    <!-- App Name (unter Icon auf iOS) -->
+    <string name="CFBundleDisplayName">"SwissCovid"</string>
 
-	<!-- Loading View: Erneut laden -->
-	<string name="loading_view_reload">"Reload"</string>
+    <!-- Loading View: Erneut laden -->
+    <string name="loading_view_reload">"Reload"</string>
 
-	<!-- Fehler Titel in Loading View -->
-	<string name="loading_view_error_title">"Error"</string>
+    <!-- Fehler Titel in Loading View -->
+    <string name="loading_view_error_title">"Error"</string>
 
-	<!-- Alert: Titel wenn die App muss geupdatet werden -->
-	<string name="force_update_title">"Update required"</string>
+    <!-- Alert: Titel wenn die App muss geupdatet werden -->
+    <string name="force_update_title">"Update required"</string>
 
-	<!-- Informieren: Weiter Button -->
-	<string name="inform_continue_button">"Continue"</string>
+    <!-- Informieren: Weiter Button -->
+    <string name="inform_continue_button">"Continue"</string>
 
-	<!-- Informieren: Senden Button -->
-	<string name="inform_send_button_title">"Send"</string>
+    <!-- Informieren: Senden Button -->
+    <string name="inform_send_button_title">"Send"</string>
 
-	<!-- Informieren: Danke -->
-	<string name="inform_send_thankyou">"Thank you"</string>
+    <!-- Informieren: Danke -->
+    <string name="inform_send_thankyou">"Thank you"</string>
 
-	<!-- Informieren: Danke Text -->
-	<string name="inform_send_thankyou_text">"The private keys generated by your app are sent.
+    <!-- Informieren: Danke Text -->
+    <string name="inform_send_thankyou_text">"The private keys generated by your app are sent.
 
 Thank you for helping to break the chain of infection."</string>
 
-	<!-- Informieren: Button Titel -->
-	<string name="inform_fertig_button_title">"Close"</string>
+    <!-- Informieren: Button Titel -->
+    <string name="inform_fertig_button_title">"Close"</string>
 
-	<!-- Titel auf Homescreen für Begegnungen -->
-	<string name="handshakes_title_homescreen">"Encounters"</string>
+    <!-- Titel auf Homescreen für Begegnungen -->
+    <string name="handshakes_title_homescreen">"Encounters"</string>
 
-	<!-- Abbrechen -->
-	<string name="cancel">"Cancel"</string>
+    <!-- Abbrechen -->
+    <string name="cancel">"Cancel"</string>
 
-	<!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
-	<string name="push_exposed_title">"New message"</string>
+    <!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
+    <string name="push_exposed_title">"New message"</string>
 
-	<!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
-	<string name="push_exposed_text">"Open the app to read the message"</string>
+    <!-- Titel für Push-Nachrichten, wenn erkannt wird, dass ein Nutzer exposed war -->
+    <string name="push_exposed_text">"Open the app to read the message"</string>
 
-	<!-- Okay Button Titel -->
-	<string name="android_button_ok">"OK"</string>
+    <!-- Okay Button Titel -->
+    <string name="android_button_ok">"OK"</string>
 
-	<!-- Onboarding: Weiter Button Titel -->
-	<string name="onboarding_continue_button">"Continue"</string>
+    <!-- Onboarding: Weiter Button Titel -->
+    <string name="onboarding_continue_button">"Continue"</string>
 
-	<!-- Onboarding: Fertig Button -->
-	<string name="onboarding_finish_button">"Finish"</string>
+    <!-- Onboarding: Fertig Button -->
+    <string name="onboarding_finish_button">"Finish"</string>
 
-	<!-- Unerwarteter Fehler -->
-	<string name="unexpected_error_title">"An unexpected error has occurred"</string>
+    <!-- Unerwarteter Fehler -->
+    <string name="unexpected_error_title">"An unexpected error has occurred"</string>
 
-	<!-- Bluetooth Fehlermeldung -->
-	<string name="bluetooth_turned_off">"The app is not working because Bluetooth is turned off"</string>
+    <!-- Bluetooth Fehlermeldung -->
+    <string name="bluetooth_turned_off">"The app is not working because Bluetooth is turned off"</string>
 
-	<!-- Bluetooth Permission Fehler -->
-	<string name="bluetooth_permission_turned_off">"The app is not working because Bluetooth is not permitted"</string>
+    <!-- Bluetooth Permission Fehler -->
+    <string name="bluetooth_permission_turned_off">"The app is not working because Bluetooth is not permitted"</string>
 
-	<!-- Permission Text für Bluetooth -->
-	<string name="NSBluetoothPeripheralUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
+    <!-- Permission Text für Bluetooth -->
+    <string name="NSBluetoothPeripheralUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
 
-	<!-- Permission Text für Bluetooth -->
-	<string name="NSBluetoothAlwaysUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
+    <!-- Permission Text für Bluetooth -->
+    <string name="NSBluetoothAlwaysUsageDescription">"Encounters will be recognised in the background via low energy Bluetooth."</string>
 
-	<!-- Inform: Titel der Code abschicken Seite -->
-	<string name="inform_code_title">"Enter the Covidcode"</string>
+    <!-- Inform: Titel der Code abschicken Seite -->
+    <string name="inform_code_title">"Enter the Covidcode"</string>
 
-	<!-- Inform: Code eingeben Subtext -->
-	<string name="inform_code_text">"Enter the Covidcode you have received."</string>
+    <!-- Inform: Code eingeben Subtext -->
+    <string name="inform_code_text">"Enter the Covidcode you have received."</string>
 
-	<!-- Inform: Code eingeben kein Code Button Text -->
-	<string name="inform_code_no_code">"Do you need help?"</string>
+    <!-- Inform: Code eingeben kein Code Button Text -->
+    <string name="inform_code_no_code">"Do you need help?"</string>
 
-	<!-- Titel des Bluetooth Control -->
-	<string name="tracing_setting_title">"Proximity tracing"</string>
+    <!-- Titel des Bluetooth Control -->
+    <string name="tracing_setting_title">"Proximity tracing"</string>
 
-	<!-- Text beim Bluetooth Control -->
-	<!-- Fuzzy -->
-	<string name="tracing_setting_text_ios">"COVID-19 Exposure Notifications"</string>
+    <!-- Text beim Bluetooth Control -->
+    <!-- Fuzzy -->
+    <string name="tracing_setting_text_ios">"COVID-19 Exposure Notifications"</string>
 
-	<!-- Bluetooth Control: Tracking deaktiviert -->
-	<string name="bluetooth_setting_tracking_inactive">"Proximity tracing deactivated"</string>
+    <!-- Bluetooth Control: Tracking deaktiviert -->
+    <string name="bluetooth_setting_tracking_inactive">"Proximity tracing deactivated"</string>
 
-	<!-- Titel auf Homescreen -->
-	<string name="reports_title_homescreen">"Reports"</string>
+    <!-- Titel auf Homescreen -->
+    <string name="reports_title_homescreen">"Reports"</string>
 
-	<!-- Keine Meldungen Titel -->
-	<string name="meldungen_no_meldungen_title">"No reports"</string>
+    <!-- Keine Meldungen Titel -->
+    <string name="meldungen_no_meldungen_title">"No reports"</string>
 
-	<!-- Push deaktiviert Titel -->
-	<string name="push_deactivated_title">"Messages deactivated"</string>
+    <!-- Push deaktiviert Titel -->
+    <string name="push_deactivated_title">"Messages deactivated"</string>
 
-	<!-- Push deaktiviert Text -->
-	<string name="push_deactivated_text">"Change the settings to receive information directly in the event of a report."</string>
+    <!-- Push deaktiviert Text -->
+    <string name="push_deactivated_text">"Change the settings to receive information directly in the event of a report."</string>
 
-	<!-- Titel im Meldung Detail -->
-	<string name="meldungen_meldung_title">"Possible infection"</string>
+    <!-- Titel im Meldung Detail -->
+    <string name="meldungen_meldung_title">"Possible infection"</string>
 
-	<!-- Text im Meldung Detail -->
-	<string name="meldungen_meldung_text">"An infection could have occurred"</string>
+    <!-- Text im Meldung Detail -->
+    <string name="meldungen_meldung_text">"An infection could have occurred"</string>
 
-	<!-- Titel ob Tracing aktiv -->
-	<string name="tracing_active_title">"App active"</string>
+    <!-- Titel ob Tracing aktiv -->
+    <string name="tracing_active_title">"App active"</string>
 
-	<!-- Text bei Tracing aktiv -->
-	<string name="tracing_active_text">"Encounters will be registered anonymously."</string>
+    <!-- Text bei Tracing aktiv -->
+    <string name="tracing_active_text">"Encounters will be registered anonymously."</string>
 
-	<!-- Android: Fehler Text bei Tracing -->
-	<string name="android_tracing_error_title">"Proximity tracing not active"</string>
+    <!-- Android: Fehler Text bei Tracing -->
+    <string name="android_tracing_error_title">"Proximity tracing not active"</string>
 
-	<!-- Fehlertitel mit Foreground Service Notification -->
-	<string name="android_foreground_service_notification_errors">"App currently unable to function properly"</string>
+    <!-- Fehlertitel mit Foreground Service Notification -->
+    <string name="android_foreground_service_notification_errors">"App currently unable to function properly"</string>
 
-	<!-- Titel der Nachricht, die auf Beta-Status hinweist -->
-	<string name="preview_warning_title">"Version preview"</string>
+    <!-- Titel der Nachricht, die auf Beta-Status hinweist -->
+    <string name="preview_warning_title">"Version preview"</string>
 
-	<!-- Text der Nachricht, die auf Beta-Status hinweist -->
-	<string name="preview_warning_text">"This app provides a preview of how the DP-3T works. It is not a functioning COVID-19 tracker."</string>
+    <!-- Text der Nachricht, die auf Beta-Status hinweist -->
+    <string name="preview_warning_text">"This app provides a preview of how the DP-3T works. It is not a functioning COVID-19 tracker."</string>
 
-	<!-- Debug: Label auf dem Button, der zum Debug-Screen führt -->
-	<string name="debug_settings_title">"Debug settings"</string>
+    <!-- Debug: Label auf dem Button, der zum Debug-Screen führt -->
+    <string name="debug_settings_title">"Debug settings"</string>
 
-	<!-- Debug: Titel für die Debug-Einstellungen zur Status-Überschreibung -->
-	<string name="debug_state_setting_title">"Overwrite app status"</string>
+    <!-- Debug: Titel für die Debug-Einstellungen zur Status-Überschreibung -->
+    <string name="debug_state_setting_title">"Overwrite app status"</string>
 
-	<!-- Debug: Erklärungstext für die Debug-Einstellungen zur Status-Überschreibung -->
-	<string name="debug_state_setting_text">"This setting overwrites the app's visual status. Proximity tracing functionality remains unaffected."</string>
+    <!-- Debug: Erklärungstext für die Debug-Einstellungen zur Status-Überschreibung -->
+    <string name="debug_state_setting_text">"This setting overwrites the app's visual status. Proximity tracing functionality remains unaffected."</string>
 
-	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Keine -->
-	<string name="debug_state_setting_option_none">"No overwrite"</string>
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Keine -->
+    <string name="debug_state_setting_option_none">"No overwrite"</string>
 
-	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Gesund -->
-	<string name="debug_state_setting_option_ok">"Healthy"</string>
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Gesund -->
+    <string name="debug_state_setting_option_ok">"Healthy"</string>
 
-	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Einem positiven Kontakt ausgesetzt -->
-	<string name="debug_state_setting_option_exposed">"Contact has tested positive"</string>
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_exposed">"Contact has tested positive"</string>
 
-	<!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Selbst positiv getestet -->
-	<string name="debug_state_setting_option_infected">"Reported yourself as positive"</string>
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Selbst positiv getestet -->
+    <string name="debug_state_setting_option_infected">"Reported yourself as positive"</string>
 
-	<!-- Debug: Titel für die Debug-Info zum Tracing-Status -->
-	<string name="debug_sdk_state_title">"SDK status"</string>
+    <!-- Debug: Titel für die Debug-Info zum Tracing-Status -->
+    <string name="debug_sdk_state_title">"SDK status"</string>
 
-	<!-- Debug: Erklärungstext für die Debug-Info zum Tracing-Status -->
-	<string name="debug_sdk_state_text">"Current status of DP-3T SDK"</string>
+    <!-- Debug: Erklärungstext für die Debug-Info zum Tracing-Status -->
+    <string name="debug_sdk_state_text">"Current status of DP-3T SDK"</string>
 
-	<!-- Debug: Bezeichnung für den letzen sync-Zeitpunkt -->
-	<string name="debug_sdk_state_last_synced">"Last synchronisation"</string>
+    <!-- Debug: Bezeichnung für den letzen sync-Zeitpunkt -->
+    <string name="debug_sdk_state_last_synced">"Last synchronisation"</string>
 
-	<!-- Debug: Bezeichnung für den Fall, bei dem der User selber als positiv getestet gemeldet wurde -->
-	<string name="debug_sdk_state_self_exposed">"Reported yourself"</string>
+    <!-- Debug: Bezeichnung für den Fall, bei dem der User selber als positiv getestet gemeldet wurde -->
+    <string name="debug_sdk_state_self_exposed">"Reported yourself"</string>
 
-	<!-- Debug: Bezeichnung für den Fall, bei dem ein Kontakt als positiv getestet gemeldet wurde -->
-	<string name="debug_sdk_state_contact_exposed">"Contact reported"</string>
+    <!-- Debug: Bezeichnung für den Fall, bei dem ein Kontakt als positiv getestet gemeldet wurde -->
+    <string name="debug_sdk_state_contact_exposed">"Contact reported"</string>
 
-	<!-- Debug-Status-Bezeichnung für boleschen Wert 'true' -->
-	<string name="debug_sdk_state_boolean_true">"Yes"</string>
+    <!-- Debug-Status-Bezeichnung für boleschen Wert 'true' -->
+    <string name="debug_sdk_state_boolean_true">"Yes"</string>
 
-	<!-- Debug-Status-Bezeichnung für boleschen Wert 'false' -->
-	<string name="debug_sdk_state_boolean_false">"No"</string>
+    <!-- Debug-Status-Bezeichnung für boleschen Wert 'false' -->
+    <string name="debug_sdk_state_boolean_false">"No"</string>
 
-	<!-- Debug: Button-Text für das Zurücksetzen des lokalen SDK Zustandes -->
-	<string name="debug_sdk_button_reset">"Reset SDK"</string>
+    <!-- Debug: Button-Text für das Zurücksetzen des lokalen SDK Zustandes -->
+    <string name="debug_sdk_button_reset">"Reset SDK"</string>
 
-	<!-- Tab-Titel -->
-	<string name="tab_tracing_title">"Proximity tracing"</string>
+    <!-- Tab-Titel -->
+    <string name="tab_tracing_title">"Proximity tracing"</string>
 
-	<!-- Titel auf Homescreen für Was tun Section -->
-	<string name="whattodo_title_symptoms">"Symptoms of the disease"</string>
+    <!-- Titel auf Homescreen für Was tun Section -->
+    <string name="whattodo_title_symptoms">"Symptoms of the disease"</string>
 
-	<!-- Subtitel auf Homescreen für Was Tun Section -->
-	<string name="whattodo_subtitle_symptoms">"What to do if …"</string>
+    <!-- Subtitel auf Homescreen für Was Tun Section -->
+    <string name="whattodo_subtitle_symptoms">"What to do if …"</string>
 
-	<!-- Titel auf Homescreen bei Was tun Section -->
-	<string name="whattodo_title_positivetest">"you test positive"</string>
+    <!-- Titel auf Homescreen bei Was tun Section -->
+    <string name="whattodo_title_positivetest">"you test positive"</string>
 
-	<!-- Subtitel auf Homescreen bei Was tun Section -->
-	<string name="whattodo_subtitle_positivetest">"What to do if …"</string>
+    <!-- Subtitel auf Homescreen bei Was tun Section -->
+    <string name="whattodo_subtitle_positivetest">"What to do if …"</string>
 
-	<!-- Informieren Detail: Subtitel -->
-	<string name="inform_detail_subtitle">"What to do if …"</string>
+    <!-- Informieren Detail: Subtitel -->
+    <string name="inform_detail_subtitle">"What to do if …"</string>
 
-	<!-- Informieren Detail: Titel -->
-	<string name="inform_detail_title">"you test positive?"</string>
+    <!-- Informieren Detail: Titel -->
+    <string name="inform_detail_title">"you test positive?"</string>
 
-	<!-- Inform Detail: Weisse Box Subtitel -->
-	<string name="inform_detail_box_subtitle">"With the Covidcode"</string>
+    <!-- Inform Detail: Weisse Box Subtitel -->
+    <string name="inform_detail_box_subtitle">"With the Covidcode"</string>
 
-	<!-- Inform Detai Weisse Box Titel -->
-	<string name="inform_detail_box_title">"Break the chains of infection"</string>
+    <!-- Inform Detai Weisse Box Titel -->
+    <string name="inform_detail_box_title">"Break the chains of infection"</string>
 
-	<!-- Inform Detail Weisse Box Button -->
-	<string name="inform_detail_box_button">"Enter the Covidcode"</string>
+    <!-- Inform Detail Weisse Box Button -->
+    <string name="inform_detail_box_button">"Enter the Covidcode"</string>
 
-	<!-- Informieren Detail Weisse Box Text -->
-	<string name="inform_detail_box_text">"By entering the Covidcode, you tell the app that you have tested positive for the coronavirus."</string>
+    <!-- Informieren Detail Weisse Box Text -->
+    <string name="inform_detail_box_text">"By entering the Covidcode, you tell the app that you have tested positive for the coronavirus."</string>
 
-	<!-- Symptome Detail Subtitel -->
-	<string name="symptom_detail_subtitle">"What do I do if …"</string>
+    <!-- Symptome Detail Subtitel -->
+    <string name="symptom_detail_subtitle">"What do I do if …"</string>
 
-	<!-- Symptom Detail Titel -->
-	<string name="symptom_detail_title">"I feel ill?"</string>
+    <!-- Symptom Detail Titel -->
+    <string name="symptom_detail_title">"I feel ill?"</string>
 
-	<!-- Symptom Detail Weisse Box Subtitel -->
-	<string name="symptom_detail_box_subtitle">"If you experience COVID-19 symptoms…"</string>
+    <!-- Symptom Detail Weisse Box Subtitel -->
+    <string name="symptom_detail_box_subtitle">"If you experience COVID-19 symptoms…"</string>
 
-	<!-- Symptom Detail Weisse Box Titel -->
-	<string name="symptom_detail_box_title">"Getting tested"</string>
+    <!-- Symptom Detail Weisse Box Titel -->
+    <string name="symptom_detail_box_title">"Getting tested"</string>
 
-	<!-- Symptom Detail Weisse Box Button -->
-	<string name="symptom_detail_box_button">"Further information"</string>
+    <!-- Symptom Detail Weisse Box Button -->
+    <string name="symptom_detail_box_button">"Further information"</string>
 
-	<!-- Symptom Detail Weisse Box Text -->
-	<string name="symptom_detail_box_text">"The FOPH recommends that anyone with COVID-19 symptoms should get tested. Call your doctor or your healthcare facility to schedule an appointment."</string>
+    <!-- Symptom Detail Weisse Box Text -->
+    <string name="symptom_detail_box_text">"The FOPH recommends that anyone with COVID-19 symptoms should get tested. Call your doctor or your healthcare facility to schedule an appointment."</string>
 
-	<!-- Informieren Titel in NavigationBar/Toolbar -->
-	<string name="inform_detail_navigation_title">"Tested positive"</string>
+    <!-- Informieren Titel in NavigationBar/Toolbar -->
+    <string name="inform_detail_navigation_title">"Tested positive"</string>
 
-	<!-- Symptome Detail: NavigationBar/Toolbar Titel -->
-	<string name="symptom_detail_navigation_title">"Symptoms"</string>
-	<string name="tracing_turned_off_title">"Proximity tracing deactivated"</string>
-	<string name="tracing_turned_off_text">"Activate proximity tracing so that the app works."</string>
-	<string name="bluetooth_turned_off_title">"Bluetooth off"</string>
-	<string name="bluetooth_turned_off_text">"Turn on Bluetooth on your device so that proximity tracing works."</string>
-	<string name="bluetooth_turn_on_button_title">"Turn on Bluetooth"</string>
-	<string name="bluetooth_permission_error_title">"Bluetooth use declined"</string>
-	<string name="bluetooth_permission_error_text">"Enable the use of Bluetooth so that proximity tracing works."</string>
-	<string name="push_open_settings_button">"Change settings"</string>
+    <!-- Symptome Detail: NavigationBar/Toolbar Titel -->
+    <string name="symptom_detail_navigation_title">"Symptoms"</string>
+    <string name="tracing_turned_off_title">"Proximity tracing deactivated"</string>
+    <string name="tracing_turned_off_text">"Activate proximity tracing so that the app works."</string>
+    <string name="bluetooth_turned_off_title">"Bluetooth off"</string>
+    <string name="bluetooth_turned_off_text">"Turn on Bluetooth on your device so that proximity tracing works."</string>
+    <string name="bluetooth_turn_on_button_title">"Turn on Bluetooth"</string>
+    <string name="bluetooth_permission_error_title">"Bluetooth use declined"</string>
+    <string name="bluetooth_permission_error_text">"Enable the use of Bluetooth so that proximity tracing works."</string>
+    <string name="push_open_settings_button">"Change settings"</string>
 
-	<!-- Meldungen Detail: Subtitel wenn keine Meldungen -->
-	<string name="meldungen_no_meldungen_subtitle">"No potential infections have been reported"</string>
+    <!-- Meldungen Detail: Subtitel wenn keine Meldungen -->
+    <string name="meldungen_no_meldungen_subtitle">"No potential infections have been reported"</string>
 
-	<!-- Keine Meldungen Weisse Box Titel -->
-	<string name="no_meldungen_box_title">"Protect yourself"</string>
+    <!-- Keine Meldungen Weisse Box Titel -->
+    <string name="no_meldungen_box_title">"Protect yourself"</string>
 
-	<!-- Keine Meldungen Weisse Box Subtitel -->
-	<string name="no_meldungen_box_subtitle">"What should I do?"</string>
+    <!-- Keine Meldungen Weisse Box Subtitel -->
+    <string name="no_meldungen_box_subtitle">"What should I do?"</string>
 
-	<!-- Keine Meldungen Weisse Box Text -->
-	<string name="no_meldungen_box_text">"Follow the government recommendations on hygiene and social distancing."</string>
+    <!-- Keine Meldungen Weisse Box Text -->
+    <string name="no_meldungen_box_text">"Follow the government recommendations on hygiene and social distancing."</string>
 
-	<!-- Meldung Detail: Positiv Getestet Titel -->
-	<string name="meldung_detail_positive_tested_title">"Tested positive"</string>
+    <!-- Meldung Detail: Positiv Getestet Titel -->
+    <string name="meldung_detail_positive_tested_title">"Tested positive"</string>
 
-	<!-- Meldung Detail: Positiv Getestet Subtitel -->
-	<string name="meldung_detail_positive_tested_subtitle">"You have tested positive for the coronavirus."</string>
+    <!-- Meldung Detail: Positiv Getestet Subtitel -->
+    <string name="meldung_detail_positive_tested_subtitle">"You have tested positive for the coronavirus."</string>
 
-	<!-- Meldung Detail Positiv Getestet Weisse Box Subtitel -->
-	<string name="meldung_detail_positive_test_box_subtitle">"What should I do?"</string>
+    <!-- Meldung Detail Positiv Getestet Weisse Box Subtitel -->
+    <string name="meldung_detail_positive_test_box_subtitle">"What should I do?"</string>
 
-	<!-- Meldung Detail Positiv Getestet Weisse Box Titel -->
-	<string name="meldung_detail_positive_test_box_title">"Isolation"</string>
+    <!-- Meldung Detail Positiv Getestet Weisse Box Titel -->
+    <string name="meldung_detail_positive_test_box_title">"Isolation"</string>
 
-	<!-- Meldung Detail Positiv Getestet Weisse Box Text -->
-	<string name="meldung_detail_positive_test_box_text">"Follow the instructions you receive on isolation."</string>
-	<string name="tracing_ended_title">"Tracing deactivated"</string>
-	<string name="tracing_ended_text">"No further encounters registered"</string>
-	<string name="exposed_info_contact_hotline">"Contact the"</string>
-	<string name="meldung_homescreen_positive_info_line1">"Follow the"</string>
-	<string name="meldung_homescreen_positive_info_line2">"Instructions on self-isolation"</string>
+    <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
+    <string name="meldung_detail_positive_test_box_text">"Follow the instructions you receive on isolation."</string>
+    <string name="tracing_ended_title">"Tracing deactivated"</string>
+    <string name="tracing_ended_text">"No further encounters registered"</string>
+    <string name="exposed_info_contact_hotline">"Contact the"</string>
+    <string name="meldung_homescreen_positive_info_line1">"Follow the"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Instructions on self-isolation"</string>
 
-	<!-- Meldung Detail Exposed Neue Meldung -->
-	<string name="meldung_detail_exposed_new_meldung">"New report"</string>
+    <!-- Meldung Detail Exposed Neue Meldung -->
+    <string name="meldung_detail_exposed_new_meldung">"New report"</string>
 
-	<!-- Meldung Detail Exposed Titel -->
-	<string name="meldung_detail_exposed_title">"Potential infection"</string>
-	<string name="meldung_homescreen_positiv_title">"Tested positive"</string>
+    <!-- Meldung Detail Exposed Titel -->
+    <string name="meldung_detail_exposed_title">"Potential infection"</string>
+    <string name="meldung_homescreen_positiv_title">"Tested positive"</string>
 
-	<!-- Meldung Detail Exposed Subtitel -->
-	<string name="meldung_detail_exposed_subtitle">"An infection could have occurred"</string>
+    <!-- Meldung Detail Exposed Subtitel -->
+    <string name="meldung_detail_exposed_subtitle">"An infection could have occurred"</string>
 
-	<!-- Meldung auf Homescreen: Positiv getestet -->
-	<string name="meldung_homescreen_positiv_text">"You have tested positive for the coronavirus."</string>
+    <!-- Meldung auf Homescreen: Positiv getestet -->
+    <string name="meldung_homescreen_positiv_text">"You have tested positive for the coronavirus."</string>
 
-	<!-- Debug Screen: Onboarding Reset Button -->
-	<string name="reset_onboarding">"Reset onboarding"</string>
+    <!-- Debug Screen: Onboarding Reset Button -->
+    <string name="reset_onboarding">"Reset onboarding"</string>
 
-	<!-- Heute -->
-	<string name="date_today">"Today"</string>
+    <!-- Heute -->
+    <string name="date_today">"Today"</string>
 
-	<!-- Meldung Detail: Vor wievielen Tagen {COUNT} wird durch Zahl ersetzt -->
-	<string name="date_days_ago">"{COUNT} days ago"</string>
+    <!-- Meldung Detail: Vor wievielen Tagen {COUNT} wird durch Zahl ersetzt -->
+    <string name="date_days_ago">"{COUNT} days ago"</string>
 
-	<!-- Meldungen Detail: Weisse Box Titel -->
-	<string name="meldungen_detail_call">"Call us"</string>
+    <!-- Meldungen Detail: Weisse Box Titel -->
+    <string name="meldungen_detail_call">"Call us"</string>
 
-	<!-- Meldungen Detail Text Weisse Box -->
-	<string name="meldungen_detail_call_text">"SwissCovid infoline"</string>
+    <!-- Meldungen Detail Text Weisse Box -->
+    <string name="meldungen_detail_call_text">"SwissCovid infoline"</string>
 
-	<!-- Meldungen Detail Weisse Box Button -->
-	<string name="meldungen_detail_call_button">"Call now"</string>
+    <!-- Meldungen Detail Weisse Box Button -->
+    <string name="meldungen_detail_call_button">"Call now"</string>
 
-	<!-- Meldungen Detail Weisse Box Titel der Erklärungen -->
-	<string name="meldungen_detail_explanation_title">"Be careful!"</string>
+    <!-- Meldungen Detail Weisse Box Titel der Erklärungen -->
+    <string name="meldungen_detail_explanation_title">"Be careful!"</string>
 
-	<!-- Meldungen Detail Weisse Box Erklärungstext 1 -->
-	<string name="meldungen_detail_explanation_text1">"You could be infectious without realising it."</string>
+    <!-- Meldungen Detail Weisse Box Erklärungstext 1 -->
+    <string name="meldungen_detail_explanation_text1">"You could be infectious without realising it."</string>
 
-	<!-- Meldungen Detail: Weisse Box Erklärtext 2 -->
-	<string name="meldungen_detail_explanation_text2">"Please protect your family, your friends and those around you. Avoid contacts for up to 10 days after a possible infection."</string>
+    <!-- Meldungen Detail: Weisse Box Erklärtext 2 -->
+    <string name="meldungen_detail_explanation_text2">"Please protect your family, your friends and those around you. Avoid contacts for up to 10 days after a possible infection."</string>
 
-	<!-- Meldungen Detail: Weisse Box Text -->
-	<string name="meldungen_detail_guard_text">"If you have any questions:
+    <!-- Meldungen Detail: Weisse Box Text -->
+    <string name="meldungen_detail_guard_text">"If you have any questions:
 Infoline SwissCovid
 +41 58 387 77 78"</string>
 
-	<!-- Meldungen Detail Button Weisse Box -->
-	<string name="meldungen_detail_call_again_button">"Call again"</string>
+    <!-- Meldungen Detail Button Weisse Box -->
+    <string name="meldungen_detail_call_again_button">"Call again"</string>
 
-	<!-- Meldungen Detail: Weisse Box Anruf Zeitpunkt -->
-	<string name="meldungen_detail_call_last_call">"Last call: {DATE}"</string>
+    <!-- Meldungen Detail: Weisse Box Anruf Zeitpunkt -->
+    <string name="meldungen_detail_call_last_call">"Last call: {DATE}"</string>
 
-	<!-- Subtitel im Onboarding erste Seite -->
-	<string name="app_subtitle">"Subtitle"</string>
+    <!-- Subtitel im Onboarding erste Seite -->
+    <string name="app_subtitle">"Subtitle"</string>
 
-	<!-- Onboarding: Titel oben -->
-	<string name="onboarding_prinzip_heading">"The goal"</string>
+    <!-- Onboarding: Titel oben -->
+    <string name="onboarding_prinzip_heading">"The goal"</string>
 
-	<!-- Onboarding: Titel -->
-	<string name="onboarding_prinzip_title">"Staying one step ahead of the virus"</string>
+    <!-- Onboarding: Titel -->
+    <string name="onboarding_prinzip_title">"Staying one step ahead of the virus"</string>
 
-	<!-- Onboarding Prinzip Text -->
-	<string name="onboarding_prinzip_text1">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
+    <!-- Onboarding Prinzip Text -->
+    <string name="onboarding_prinzip_text1">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
 
-	<!-- Onboarding Prinzip Text -->
-	<string name="onboarding_prinzip_text2">"The app tells you if you might have been exposed to the coronavirus."</string>
+    <!-- Onboarding Prinzip Text -->
+    <string name="onboarding_prinzip_text2">"The app tells you if you might have been exposed to the coronavirus."</string>
 
-	<!-- Onboarding Privacy: Titel oben -->
-	<string name="onboarding_privacy_heading">"Privacy by design"</string>
+    <!-- Onboarding Privacy: Titel oben -->
+    <string name="onboarding_privacy_heading">"Privacy by design"</string>
 
-	<!-- Onboarding Privacy: Titel -->
-	<string name="onboarding_privacy_title">"Protection of privacy"</string>
+    <!-- Onboarding Privacy: Titel -->
+    <string name="onboarding_privacy_title">"Protection of privacy"</string>
 
-	<!-- Onboarding Privacy: Text -->
-	<string name="onboarding_privacy_text1">"Devices only exchange random IDs. The app does not gather location data or data on your identity."</string>
+    <!-- Onboarding Privacy: Text -->
+    <string name="onboarding_privacy_text1">"Devices only exchange random IDs. The app does not gather location data or data on your identity."</string>
 
-	<!-- Onboarding Privacy: Text -->
-	<string name="onboarding_privacy_text2">"The random IDs are stored on your device for 14 days and then deleted."</string>
+    <!-- Onboarding Privacy: Text -->
+    <string name="onboarding_privacy_text2">"The random IDs are stored on your device for 14 days and then deleted."</string>
 
-	<!-- Onboarding Begegnungen: Titel oben -->
-	<string name="onboarding_begegnungen_heading">"How does the app work?"</string>
+    <!-- Onboarding Begegnungen: Titel oben -->
+    <string name="onboarding_begegnungen_heading">"How does the app work?"</string>
 
-	<!-- Onboarding Begegnungen: Titel -->
-	<string name="onboarding_begegnungen_title">"Recognising encounters using Bluetooth"</string>
+    <!-- Onboarding Begegnungen: Titel -->
+    <string name="onboarding_begegnungen_title">"Recognising encounters using Bluetooth"</string>
 
-	<!-- Onboarding Begegnungen: Text -->
-	<string name="onboarding_begegnungen_text1">"The app automatically recognises when two users have been in close proximity for a certain time."</string>
+    <!-- Onboarding Begegnungen: Text -->
+    <string name="onboarding_begegnungen_text1">"The app automatically recognises when two users have been in close proximity for a certain time."</string>
 
-	<!-- Onboarding Begegnungen: Text -->
-	<string name="onboarding_begegnungen_text2">"It uses Bluetooth Low Energy (BLE) to do this. No GPS, mobile, Wi-Fi or other location data."</string>
+    <!-- Onboarding Begegnungen: Text -->
+    <string name="onboarding_begegnungen_text2">"It uses Bluetooth Low Energy (BLE) to do this. No GPS, mobile, Wi-Fi or other location data."</string>
 
-	<!-- Onboarding Meldung: Text oben -->
-	<string name="onboarding_meldung_heading">"What does the app do?"</string>
+    <!-- Onboarding Meldung: Text oben -->
+    <string name="onboarding_meldung_heading">"What does the app do?"</string>
 
-	<!-- Onboarding Meldung: Titel -->
-	<string name="onboarding_meldung_title">"Report of potential infection"</string>
+    <!-- Onboarding Meldung: Titel -->
+    <string name="onboarding_meldung_title">"Report of potential infection"</string>
 
-	<!-- Onboarding Meldung: Text -->
-	<string name="onboarding_meldung_text1">"The app tells you if you might have been exposed to the coronavirus."</string>
+    <!-- Onboarding Meldung: Text -->
+    <string name="onboarding_meldung_text1">"The app tells you if you might have been exposed to the coronavirus."</string>
 
-	<!-- Onboarding Meldung: Text -->
-	<string name="onboarding_meldung_text2">"By responding appropriately, you can break the chain of infection and protect other people."</string>
+    <!-- Onboarding Meldung: Text -->
+    <string name="onboarding_meldung_text2">"By responding appropriately, you can break the chain of infection and protect other people."</string>
 
-	<!-- Onboarding Bluetooth: Titel -->
-	<string name="onboarding_bluetooth_title">"Enable Bluetooth"</string>
+    <!-- Onboarding Bluetooth: Titel -->
+    <string name="onboarding_bluetooth_title">"Enable Bluetooth"</string>
 
-	<!-- Onboarding Bluetooth: Text -->
-	<string name="onboarding_bluetooth_text">"In order to use the app, you must enable Bluetooth."</string>
+    <!-- Onboarding Bluetooth: Text -->
+    <string name="onboarding_bluetooth_text">"In order to use the app, you must enable Bluetooth."</string>
 
-	<!-- Onboarding Bluetooth: Button -->
-	<string name="onboarding_bluetooth_button">"Enable Bluetooth"</string>
+    <!-- Onboarding Bluetooth: Button -->
+    <string name="onboarding_bluetooth_button">"Enable Bluetooth"</string>
 
-	<!-- Onboarding: Untetitel unten -->
-	<string name="onboarding_good_to_know">"Good to know"</string>
+    <!-- Onboarding: Untetitel unten -->
+    <string name="onboarding_good_to_know">"Good to know"</string>
 
-	<!-- Onboarding Bluetooth: Titel unten -->
-	<string name="onboarding_bluetooth_gtk_title1">"You remain anonymous"</string>
+    <!-- Onboarding Bluetooth: Titel unten -->
+    <string name="onboarding_bluetooth_gtk_title1">"You remain anonymous"</string>
 
-	<!-- Onboarding Bluetooth: Text unten -->
-	<string name="onboarding_bluetooth_gtk_text1">"No personal data is visible via Bluetooth."</string>
+    <!-- Onboarding Bluetooth: Text unten -->
+    <string name="onboarding_bluetooth_gtk_text1">"No personal data is visible via Bluetooth."</string>
 
-	<!-- Onboarding Bluetooth: Titel unten -->
-	<string name="onboarding_bluetooth_gtk_title2">"Minor increase in battery usage"</string>
+    <!-- Onboarding Bluetooth: Titel unten -->
+    <string name="onboarding_bluetooth_gtk_title2">"Minor increase in battery usage"</string>
 
-	<!-- Onboarding Bluetooth: Text unten -->
-	<string name="onboarding_bluetooth_gtk_text2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
+    <!-- Onboarding Bluetooth: Text unten -->
+    <string name="onboarding_bluetooth_gtk_text2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
 
-	<!-- Onboarding Mitteilungen: Titel -->
-	<string name="onboarding_push_title">"Allow messages"</string>
+    <!-- Onboarding Mitteilungen: Titel -->
+    <string name="onboarding_push_title">"Allow messages"</string>
 
-	<!-- Onboarding Mitteilungen: Text -->
-	<string name="onboarding_push_text">"In order to receive notifications from the app, you must enable messages."</string>
+    <!-- Onboarding Mitteilungen: Text -->
+    <string name="onboarding_push_text">"In order to receive notifications from the app, you must enable messages."</string>
 
-	<!-- Onboarding Mitteilungen: Button -->
-	<string name="onboarding_push_button">"Enable messages"</string>
+    <!-- Onboarding Mitteilungen: Button -->
+    <string name="onboarding_push_button">"Enable messages"</string>
 
-	<!-- Onboarding Mitteilungen: Titel Unten -->
-	<string name="onboarding_push_gtk_title1">"Notified immediately"</string>
+    <!-- Onboarding Mitteilungen: Titel Unten -->
+    <string name="onboarding_push_gtk_title1">"Notified immediately"</string>
 
-	<!-- Onboarding Mitteilungen: Text unten -->
-	<string name="onboarding_push_gtk_text1">"In the event of a potential infection, you will receive a message on the lock screen."</string>
+    <!-- Onboarding Mitteilungen: Text unten -->
+    <string name="onboarding_push_gtk_text1">"In the event of a potential infection, you will receive a message on the lock screen."</string>
 
-	<!-- Code senden: Abschluss Gute Besserung -->
-	<string name="inform_send_getwell_title">"Get well soon!"</string>
+    <!-- Code senden: Abschluss Gute Besserung -->
+    <string name="inform_send_getwell_title">"Get well soon!"</string>
 
-	<!-- Code senden: Abschluss Gute Besserung -->
-	<string name="inform_send_getwell_text">"Get well soon!
+    <!-- Code senden: Abschluss Gute Besserung -->
+    <string name="inform_send_getwell_text">"Get well soon! 
 
 Follow the instructions  you have received on isolation."</string>
 
-	<!-- Titel auf dem letzen Onboarding Screen -->
-	<string name="onboarding_go_title">"The app is ready to go"</string>
+    <!-- Titel auf dem letzen Onboarding Screen -->
+    <string name="onboarding_go_title">"The app is ready to go"</string>
 
-	<!-- Text auf dem letzten Onboarding Screen -->
-	<string name="onboarding_go_text">"Thank you for helping to break the chain of infection."</string>
+    <!-- Text auf dem letzten Onboarding Screen -->
+    <string name="onboarding_go_text">"Thank you for helping to break the chain of infection."</string>
 
-	<!-- Button-Label auf dem letzten Onboarding screen -->
-	<string name="onboarding_go_button">"Start"</string>
+    <!-- Button-Label auf dem letzten Onboarding screen -->
+    <string name="onboarding_go_button">"Start"</string>
 
-	<!-- Homescreen: Titel bei Fehler mit Daten -->
-	<string name="homescreen_meldung_data_outdated_title">"No current data"</string>
+    <!-- Homescreen: Titel bei Fehler mit Daten -->
+    <string name="homescreen_meldung_data_outdated_title">"No current data"</string>
 
-	<!-- Homescreen: Text bei Fehler mit Daten -->
-	<string name="homescreen_meldung_data_outdated_text">"It has not been possible to synchronise reports for some time. Please check that your device is connected to the internet."</string>
+    <!-- Homescreen: Text bei Fehler mit Daten -->
+    <string name="homescreen_meldung_data_outdated_text">"It has not been possible to synchronise reports for some time. Please check that your device is connected to the internet."</string>
 
-	<!-- Homescreen: Button Titel -->
-	<string name="homescreen_meldung_data_outdated_retry_button">"Retry"</string>
+    <!-- Homescreen: Button Titel -->
+    <string name="homescreen_meldung_data_outdated_retry_button">"Retry"</string>
 
-	<!-- Titel Fehlermeldung für ungültigen Code -->
-	<string name="inform_code_invalid_title">"Code invalid"</string>
+    <!-- Titel Fehlermeldung für ungültigen Code -->
+    <string name="inform_code_invalid_title">"Code invalid"</string>
 
-	<!-- Fehlermeldung Subtitle ungültiger Code -->
-	<string name="inform_code_invalid_subtitle">"If you have any problems, call the office that gave you the Covidcode."</string>
+    <!-- Fehlermeldung Subtitle ungültiger Code -->
+    <string name="inform_code_invalid_subtitle">"If you have any problems, call the office that gave you the Covidcode."</string>
 
-	<!-- Datum: Vor 1 Tag -->
-	<string name="date_one_day_ago">"1 day ago"</string>
+    <!-- Datum: Vor 1 Tag -->
+    <string name="date_one_day_ago">"1 day ago"</string>
 
-	<!-- Meldungen Detail: Titel -->
-	<string name="meldung_detail_new_contact_title">"Possible infection"</string>
+    <!-- Meldungen Detail: Titel -->
+    <string name="meldung_detail_new_contact_title">"Possible infection"</string>
 
-	<!-- Meldungen Detail: Text -->
-	<string name="meldung_detail_new_contact_subtitle">"An infection could have occurred"</string>
+    <!-- Meldungen Detail: Text -->
+    <string name="meldung_detail_new_contact_subtitle">"An infection could have occurred"</string>
 
-	<!-- Fehler mit Uhrzeit Titel -->
-	<string name="time_inconsistency_title">"Time error"</string>
+    <!-- Fehler mit Uhrzeit Titel -->
+    <string name="time_inconsistency_title">"Time error"</string>
 
-	<!-- Fehler mit Uhrzeit Text -->
-	<string name="time_inconsistency_text">"The time must be set correctly for proximity tracing to work."</string>
+    <!-- Fehler mit Uhrzeit Text -->
+    <string name="time_inconsistency_text">"The time must be set correctly for proximity tracing to work."</string>
 
-	<!-- Begegnungen: Neustart Titel -->
-	<string name="begegnungen_restart_error_title">"Restart required"</string>
+    <!-- Begegnungen: Neustart Titel -->
+    <string name="begegnungen_restart_error_title">"Restart required"</string>
 
-	<!-- Begegnungen: Neustart Text -->
-	<string name="begegnungen_restart_error_text">"An unexpected error has occurred. Restart your device."</string>
+    <!-- Begegnungen: Neustart Text -->
+    <string name="begegnungen_restart_error_text">"An unexpected error has occurred. Restart your device."</string>
 
-	<!-- Fehler Titel für Hintergrund-Fehler -->
-	<string name="meldungen_background_error_title">"Background update deactivated."</string>
+    <!-- Fehler Titel für Hintergrund-Fehler -->
+    <string name="meldungen_background_error_title">"Background update deactivated."</string>
 
-	<!-- Text für Hintergrund Fehler -->
-	<string name="meldungen_background_error_text">"Go to \"Settings &gt; General &gt; Background App Refresh\" and ensure that \"Wi-Fi &amp; Mobile Data\" is selected. Background App Refresh can then be activated individually for each app."</string>
+    <!-- Text für Hintergrund Fehler -->
+    <string name="meldungen_background_error_text">"Go to \"Settings &gt; General &gt; Background App Refresh\" and ensure that \"Wi-Fi &amp; Mobile Data\" is selected. Background App Refresh can then be activated individually for each app."</string>
 
-	<!-- Button Titel für Hintergrundfehler beheben -->
-	<string name="meldungen_background_error_button">"Change settings"</string>
+    <!-- Button Titel für Hintergrundfehler beheben -->
+    <string name="meldungen_background_error_button">"Change settings"</string>
 
-	<!-- Default message for force update -->
-	<string name="force_update_text">"Install the new version of the app so that proximity tracing works."</string>
+    <!-- Default message for force update -->
+    <string name="force_update_text">"Install the new version of the app so that proximity tracing works."</string>
 
-	<!-- Ignorieren Button Titel -->
-	<string name="meldung_in_app_alert_ignore_button">"Ignore"</string>
+    <!-- Ignorieren Button Titel -->
+    <string name="meldung_in_app_alert_ignore_button">"Ignore"</string>
 
-	<!-- Button Titel -->
-	<string name="meldung_in_app_alert_accept_button">"To notifications"</string>
+    <!-- Button Titel -->
+    <string name="meldung_in_app_alert_accept_button">"To notifications"</string>
 
-	<!-- Meldungen Detail: Button Titel -->
-	<string name="meldungen_detail_call_again">"Call again"</string>
+    <!-- Meldungen Detail: Button Titel -->
+    <string name="meldungen_detail_call_again">"Call again"</string>
 
-	<!-- Fehlernachricht für Netzwerkfehler -->
-	<string name="network_error">"Please check your internet connection"</string>
+    <!-- Fehlernachricht für Netzwerkfehler -->
+    <string name="network_error">"Please check your internet connection"</string>
 
-	<!-- Unerwarteter Fehler, mit Aufforderung Aktion erneut zu versuchen -->
-	<string name="unexpected_error_with_retry">"An unexpected error has occurred. Please retry."</string>
+    <!-- Unerwarteter Fehler, mit Aufforderung Aktion erneut zu versuchen -->
+    <string name="unexpected_error_with_retry">"An unexpected error has occurred. Please retry."</string>
 
-	<!-- VoiceOver: Datum -->
-	<string name="accessibility_date">"Date"</string>
+    <!-- VoiceOver: Datum -->
+    <string name="accessibility_date">"Date"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_1nd">"First"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_1nd">"First"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_2nd">"Second"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_2nd">"Second"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_3nd">"Third"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_3nd">"Third"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_4nd">"Fourth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_4nd">"Fourth"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_5nd">"Fifth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_5nd">"Fifth"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_6nd">"Sixth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_6nd">"Sixth"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_7nd">"Seventh"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_7nd">"Seventh"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_8nd">"Eighth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_8nd">"Eighth"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_9nd">"Ninth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_9nd">"Ninth"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_10nd">"Tenth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_10nd">"Tenth"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_11nd">"Eleventh"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_11nd">"Eleventh"</string>
 
-	<!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
-	<string name="accessibility_12nd">"Twelfth"</string>
+    <!-- Voiceover Codeeingabe: Nummerierte Textfelder -->
+    <string name="accessibility_12nd">"Twelfth"</string>
 
-	<!-- Voiceover: Hilfetext bei Codeeingabe -->
-	<!-- Fuzzy -->
-	<string name="accessibility_code_button_disabled_hint">"Please enter the code in full, then press button."</string>
+    <!-- Voiceover: Hilfetext bei Codeeingabe -->
+    <!-- Fuzzy -->
+    <string name="accessibility_code_button_disabled_hint">"Please enter the code in full, then press button."</string>
 
-	<!-- Fehler: Standortinformationen / Bluetooth -->
-	<!-- Fuzzy -->
-	<string name="android_foreground_service_notification_error_location_service">"On Android devices, Bluetooth depends on location sharing. This means the location function must be enabled even though the app never accesses your location."</string>
+    <!-- Fehler: Standortinformationen / Bluetooth -->
+    <!-- Fuzzy -->
+    <string name="android_foreground_service_notification_error_location_service">"On Android devices, Bluetooth depends on location sharing. This means the location function must be enabled even though the app never accesses your location."</string>
 
-	<!-- Location Services ausgeschaltet Titel -->
-	<!-- Fuzzy -->
-	<string name="android_error_location_services_title">"Location disabled"</string>
+    <!-- Location Services ausgeschaltet Titel -->
+    <!-- Fuzzy -->
+    <string name="android_error_location_services_title">"Location disabled"</string>
 
-	<!-- Location Services ausgeschaltet Button -->
-	<!-- Fuzzy -->
-	<string name="android_error_location_services_button">"Enable location"</string>
+    <!-- Location Services ausgeschaltet Button -->
+    <!-- Fuzzy -->
+    <string name="android_error_location_services_button">"Enable location"</string>
 
-	<!-- Information Button in the navigation bar -->
-	<string name="accessibility_info_button">"Information"</string>
+    <!-- Information Button in the navigation bar -->
+    <string name="accessibility_info_button">"Information"</string>
 
-	<!-- Synchronisations-Fehler Titel -->
-	<string name="sync_warning_notification_title">"Synchronise the app"</string>
+    <!-- Synchronisations-Fehler Titel -->
+    <string name="sync_warning_notification_title">"Synchronise the app"</string>
 
-	<!-- Synchronisations-Fehler Text -->
-	<string name="sync_warning_notification_text">"Open the app to check the list of random IDs reported."</string>
+    <!-- Synchronisations-Fehler Text -->
+    <string name="sync_warning_notification_text">"Open the app to check the list of random IDs reported."</string>
 
-	<!-- Meldungen Detail: Button bei Vollansicht -->
-	<string name="meldung_animation_continue_button">"Continue"</string>
+    <!-- Meldungen Detail: Button bei Vollansicht -->
+    <string name="meldung_animation_continue_button">"Continue"</string>
 
-	<!-- Titel Impressum Menu -->
-	<string name="menu_impressum">"Imprint"</string>
+    <!-- Titel Impressum Menu -->
+    <string name="menu_impressum">"Imprint"</string>
 
-	<!-- Begegnungen: FAQ Titel -->
-	<string name="begegnung_detail_faq1_title">"What is an encounter?"</string>
+    <!-- Begegnungen: FAQ Titel -->
+    <string name="begegnung_detail_faq1_title">"What is an encounter?"</string>
 
-	<!-- Begegnungen: FAQ Text -->
-	<string name="begegnung_detail_faq1_text">"If smartphones with the app are in close proximity for a certain time, this is registered on your device as an encounter."</string>
+    <!-- Begegnungen: FAQ Text -->
+    <string name="begegnung_detail_faq1_text">"If smartphones with the app are in close proximity for a certain time, this is registered on your device as an encounter."</string>
 
-	<!-- Begegnungen: FAQ Titel -->
-	<string name="begegnung_detail_faq2_title">"Is my data secure?"</string>
+    <!-- Begegnungen: FAQ Titel -->
+    <string name="begegnung_detail_faq2_title">"Is my data secure?"</string>
 
-	<!-- Begegnungen: FAQ Text -->
-	<string name="begegnung_detail_faq2_text">"In the event of an encounter, only random IDs are exchanged.
+    <!-- Begegnungen: FAQ Text -->
+    <string name="begegnung_detail_faq2_text">"In the event of an encounter, only random IDs are exchanged. 
 
 They are saved locally on the smartphones and then deleted 14 days later."</string>
 
-	<!-- Begegnungen: FAQ Titel -->
-	<string name="begegnungen_detail_faq3_title">"Does Bluetooth have to be turned on all the time?"</string>
+    <!-- Begegnungen: FAQ Titel -->
+    <string name="begegnungen_detail_faq3_title">"Does Bluetooth have to be turned on all the time?"</string>
 
-	<!-- Begegnungen: FAQ Text -->
-	<string name="begegnungen_detail_faq3_text">"In order to recognise encounters, Bluetooth must be turned on at all times. This causes only a minor increase in battery usage."</string>
+    <!-- Begegnungen: FAQ Text -->
+    <string name="begegnungen_detail_faq3_text">"In order to recognise encounters, Bluetooth must be turned on at all times. This causes only a minor increase in battery usage."</string>
 
-	<!-- FAQ Button Titel -->
-	<string name="faq_button_title">"FAQs"</string>
+    <!-- FAQ Button Titel -->
+    <string name="faq_button_title">"FAQs"</string>
 
-	<!-- Meldungen Keine Meldungen FAQ Titel -->
-	<string name="meldungen_nomeldungen_faq1_title">"What are reports?"</string>
+    <!-- Meldungen Keine Meldungen FAQ Titel -->
+    <string name="meldungen_nomeldungen_faq1_title">"What are reports?"</string>
 
-	<!-- Meldungen: Keine Meldungen FAQ Text -->
-	<string name="meldungen_nomeldungen_faq1_text">"The app checks regularly to see whether any users that you have encountered have reported testing positive for the virus.
+    <!-- Meldungen: Keine Meldungen FAQ Text -->
+    <string name="meldungen_nomeldungen_faq1_text">"The app checks regularly to see whether any users that you have encountered have reported testing positive for the virus. 
 
 If it is possible that you have been infected, you will receive a message on your lock screen."</string>
 
-	<!-- Meldungen: Keine Meldungen FAQ Titel -->
-	<string name="meldungen_nomeldungen_faq2_titel">"What is a potential infection?"</string>
+    <!-- Meldungen: Keine Meldungen FAQ Titel -->
+    <string name="meldungen_nomeldungen_faq2_titel">"What is a potential infection?"</string>
 
-	<!-- Meldungen: Keine Meldungen FAQ Text -->
-	<string name="meldungen_nomeldungen_faq2_text">"The app not only checks whether you have had encounters with infected persons, but how long and how close these were.
+    <!-- Meldungen: Keine Meldungen FAQ Text -->
+    <string name="meldungen_nomeldungen_faq2_text">"The app not only checks whether you have had encounters with infected persons, but how long and how close these were. 
 
 You will only be notified if there is sufficient likelihood that you have been infected."</string>
 
-	<!-- Meldungen Detail Weisse Box Texte Unten -->
-	<string name="meldungen_detail_explanation_text3">"The infoline SwissCovid will advise you on getting a free test."</string>
+    <!-- Meldungen Detail Weisse Box Texte Unten -->
+    <string name="meldungen_detail_explanation_text3">"The infoline SwissCovid will advise you on getting a free test."</string>
 
-	<!-- Meldungen: Meldungen FAQ -->
-	<string name="meldungen_meldungen_faq1_title">"Do I have to call?"</string>
+    <!-- Meldungen: Meldungen FAQ -->
+    <string name="meldungen_meldungen_faq1_title">"Do I have to call?"</string>
 
-	<!-- Meldungen: Meldungen FAQ Text -->
-	<string name="meldungen_meldungen_faq1_text">"It is recommended that you call every time you receive a notification.
+    <!-- Meldungen: Meldungen FAQ Text -->
+    <string name="meldungen_meldungen_faq1_text">"It is recommended that you call every time you receive a notification. 
 
 You will remain anonymous. No personal data will be recorded.
 
 The counselling is free of charge. You just have to pay for the call."</string>
 
-	<!-- Meldungen Detail: Anruf Titel -->
-	<string name="meldungen_detail_call_thankyou_title">"Thank you for your cooperation."</string>
+    <!-- Meldungen Detail: Anruf Titel -->
+    <string name="meldungen_detail_call_thankyou_title">"Thank you for your cooperation."</string>
 
-	<!-- Meldungen Detail Anruf Danke Subtitel -->
-	<string name="meldungen_detail_call_thankyou_subtitle">"You are protecting other people."</string>
+    <!-- Meldungen Detail Anruf Danke Subtitel -->
+    <string name="meldungen_detail_call_thankyou_subtitle">"You are protecting other people."</string>
 
-	<!-- Keine Meldungen Link in weisser Box Titel -->
-	<string name="no_meldungen_box_link">"Protect yourself and others"</string>
+    <!-- Keine Meldungen Link in weisser Box Titel -->
+    <string name="no_meldungen_box_link">"Protect yourself and others"</string>
 
-	<!-- Keine Meldungen Weisse Box Link URL -->
-	<string name="no_meldungen_box_url">"https://www.foph-coronavirus.ch"</string>
+    <!-- Keine Meldungen Weisse Box Link URL -->
+    <string name="no_meldungen_box_url">"https://www.foph-coronavirus.ch"</string>
 
-	<!-- Informieren Detail: FAQ Titel -->
-	<string name="inform_detail_faq1_title">"What is a Covidcode?"</string>
+    <!-- Informieren Detail: FAQ Titel -->
+    <string name="inform_detail_faq1_title">"What is a Covidcode?"</string>
 
     <!-- Inform Detail: FAQ Text -->
     <string name="inform_detail_faq1_text">"People who test positive for coronavirus (with a PCR test or rapid antigen test) will receive a Covidcode.
 
 This guarantees that only confirmed cases are reported via the app."</string>
 
-	<!-- Not translated -->
-	<!-- Inform Detail: FAQ Titel -->
-	<string name="inform_detail_faq2_title">"What information gets sent?"</string>
+    <!-- Not translated -->
+    <!-- Inform Detail: FAQ Titel -->
+    <string name="inform_detail_faq2_title">"What information gets sent?"</string>
 
-	<!-- Inform Detail FAQ Text -->
-	<string name="inform_detail_faq2_text">"Only the private keys from your app are sent, no personal data.
+    <!-- Inform Detail FAQ Text -->
+    <string name="inform_detail_faq2_text">"Only the private keys from your app are sent, no personal data. 
 
 Other SwissCovid apps can then check if it is possible that they have been infected."</string>
 
-	<!-- Telefonnummer der Infoline -->
-	<string name="infoline_tel_number">"+41 58 387 77 78"</string>
+    <!-- Telefonnummer der Infoline -->
+    <string name="infoline_tel_number">"+41 58 387 77 78"</string>
 
-	<!-- URL für Häufige Fragen Button -->
-	<string name="faq_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/en/categories/swisscovid-app"</string>
+    <!-- URL für Häufige Fragen Button -->
+    <string name="faq_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/en/categories/swisscovid-app"</string>
 
-	<!-- Informieren Flow: Titel erster Screen -->
-	<string name="inform_code_intro_title">"Important information"</string>
+    <!-- Informieren Flow: Titel erster Screen -->
+    <string name="inform_code_intro_title">"Important information"</string>
 
-	<!-- Informieren-Flow: Erster Screen Text -->
-	<string name="inform_code_intro_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
+    <!-- Informieren-Flow: Erster Screen Text -->
+    <string name="inform_code_intro_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
 
-	<!-- Inform-Flow: Erster Screen Button -->
-	<string name="inform_code_intro_button">"Agree"</string>
+    <!-- Inform-Flow: Erster Screen Button -->
+    <string name="inform_code_intro_button">"Agree"</string>
 
-	<!-- Symptome: FAQ Titel -->
-	<string name="symptom_faq1_title">"What are the symptoms of COVID-19?"</string>
+    <!-- Symptome: FAQ Titel -->
+    <string name="symptom_faq1_title">"What are the symptoms of COVID-19?"</string>
 
-	<!-- Symptome: FAQ Text -->
-	<string name="symptom_faq1_text">"These are the most common symptoms of COVID-19:
+    <!-- Symptome: FAQ Text -->
+    <string name="symptom_faq1_text">"These are the most common symptoms of COVID-19:
 
 – Fever, feverish feeling 
 – Sore throat
@@ -675,719 +675,719 @@ Other symptoms may include:
 – Gastrointestinal symptoms (nausea, vomiting, diarrhoea, stomach ache)
 – Skin rash"</string>
 
-	<!-- Meldungen: Positiv getestet FAQ Titel -->
-	<string name="meldungen_positive_tested_faq1_title">"Why is tracing deactivated?"</string>
+    <!-- Meldungen: Positiv getestet FAQ Titel -->
+    <string name="meldungen_positive_tested_faq1_title">"Why is tracing deactivated?"</string>
 
-	<!-- Meldungen: Positiv getestet FAQ Text -->
-	<string name="meldungen_positive_tested_faq1_text">"After a positive test, tracing is automatically deactivated in the app. Tracing can be reactivated once you have completed your period of isolation."</string>
+    <!-- Meldungen: Positiv getestet FAQ Text -->
+    <string name="meldungen_positive_tested_faq1_text">"After a positive test, tracing is automatically deactivated in the app. Tracing can be reactivated once you have completed your period of isolation."</string>
 
-	<!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
-	<string name="language_key">"en"</string>
+    <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
+    <string name="language_key">"en"</string>
 
-	<!-- Meldungen Homescreen: Name Hotline -->
-	<string name="exposed_info_contact_hotline_name">"SwissCovid infoline"</string>
+    <!-- Meldungen Homescreen: Name Hotline -->
+    <string name="exposed_info_contact_hotline_name">"SwissCovid infoline"</string>
 
-	<!-- Meldung Detail: "Noch 1 Tag" Label -->
-	<string name="date_in_one_day">"1 more day"</string>
+    <!-- Meldung Detail: "Noch 1 Tag" Label -->
+    <string name="date_in_one_day">"1 more day"</string>
 
-	<!-- Meldung Detail: Anzeige "Noch x Tage" {COUNT} wird durch Zahl ersetzt -->
-	<string name="date_in_days">"There are {COUNT} days left"</string>
+    <!-- Meldung Detail: Anzeige "Noch x Tage" {COUNT} wird durch Zahl ersetzt -->
+    <string name="date_in_days">"There are {COUNT} days left"</string>
 
-	<!-- Datum: Text vor Datum: am 26.2.2020 / {DATE} wird ersetzt durch Datum -->
-	<string name="date_text_before_date">"on {DATE}"</string>
+    <!-- Datum: Text vor Datum: am 26.2.2020 / {DATE} wird ersetzt durch Datum -->
+    <string name="date_text_before_date">"on {DATE}"</string>
 
-	<!-- Accessibility Talk back information for android back button in toolbar -->
-	<string name="android_accessibility_back_button">"Back"</string>
+    <!-- Accessibility Talk back information for android back button in toolbar -->
+    <string name="android_accessibility_back_button">"Back"</string>
 
-	<!-- VoiceOver: Hilfetext bei Codeeingabe Button -->
-	<string name="accessibility_code_button_current_code_hint">"Code entered: "</string>
+    <!-- VoiceOver: Hilfetext bei Codeeingabe Button -->
+    <string name="accessibility_code_button_current_code_hint">"Code entered: "</string>
 
-	<!-- Accessibility: Codeeingabe einer Ziffer -->
-	<string name="accessibility_code_input_textfield">"Text box. Current figure: "</string>
+    <!-- Accessibility: Codeeingabe einer Ziffer -->
+    <string name="accessibility_code_input_textfield">"Text box. Current figure: "</string>
 
-	<!-- Accessibility: Code Input Textfeld wenn leer -->
-	<string name="accessibility_code_input_textfield_empty">"Text box. Empty."</string>
+    <!-- Accessibility: Code Input Textfeld wenn leer -->
+    <string name="accessibility_code_input_textfield_empty">"Text box. Empty."</string>
 
-	<!-- Accessibility: Hint zum doppelklicken wenn einzelnes Codefeld angeklickt -->
-	<string name="accessibility_code_input_hint">"Double-tap to edit"</string>
+    <!-- Accessibility: Hint zum doppelklicken wenn einzelnes Codefeld angeklickt -->
+    <string name="accessibility_code_input_hint">"Double-tap to edit"</string>
 
-	<!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine Website des BAG geöffnet wird -->
-	<!-- Fuzzy -->
-	<string name="accessibility_faq_button_hint">"This button exits the app and opens the F.O.P.H. website."</string>
+    <!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine Website des BAG geöffnet wird -->
+    <!-- Fuzzy -->
+    <string name="accessibility_faq_button_hint">"This button exits the app and opens the F.O.P.H. website."</string>
 
-	<!-- Titel auf der Onboarding Page für die Permission der Exposure-Library -->
-	<string name="onboarding_gaen_title">"Activate proximity tracing"</string>
+    <!-- Titel auf der Onboarding Page für die Permission der Exposure-Library -->
+    <string name="onboarding_gaen_title">"Activate proximity tracing"</string>
 
-	<!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-	<!-- Fuzzy -->
-	<string name="onboarding_gaen_text_ios">"COVID-19 Exposure Notifications must be activated to use the app."</string>
+    <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
+    <!-- Fuzzy -->
+    <string name="onboarding_gaen_text_ios">"COVID-19 Exposure Notifications must be activated to use the app."</string>
 
-	<!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
-	<string name="onboarding_gaen_button_activate">"Activate"</string>
+    <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
+    <string name="onboarding_gaen_button_activate">"Activate"</string>
 
-	<!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 1 -->
-	<string name="onboarding_gaen_info_title_1">"Data protection"</string>
+    <!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 1 -->
+    <string name="onboarding_gaen_info_title_1">"Data protection"</string>
 
-	<!-- Onboarding Page für die Permission der Exposure-Library: Info Text 1 -->
-	<string name="onboarding_gaen_info_text_1">"Only random IDs are exchanged, not data about your location or your person."</string>
+    <!-- Onboarding Page für die Permission der Exposure-Library: Info Text 1 -->
+    <string name="onboarding_gaen_info_text_1">"Only random IDs are exchanged, not data about your location or your person."</string>
 
-	<!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 2 -->
-	<string name="onboarding_gaen_info_title_2">"Minor increase in battery usage"</string>
+    <!-- Onboarding Page für die Permission der Exposure-Library: Info Titel 2 -->
+    <string name="onboarding_gaen_info_title_2">"Minor increase in battery usage"</string>
 
-	<!-- Onboarding Page für die Permission der Exposure-Library: Info Text 2 -->
-	<string name="onboarding_gaen_info_text_2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
+    <!-- Onboarding Page für die Permission der Exposure-Library: Info Text 2 -->
+    <string name="onboarding_gaen_info_text_2">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
 
-	<!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
-	<string name="onboarding_gaen_button_activated">"Activated"</string>
+    <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
+    <string name="onboarding_gaen_button_activated">"Activated"</string>
 
-	<!-- Meldung in der App löschen, wenn möglicherweise angesteckt -->
-	<string name="delete_reports_button">"Delete notification"</string>
+    <!-- Meldung in der App löschen, wenn möglicherweise angesteckt -->
+    <string name="delete_reports_button">"Delete notification"</string>
 
-	<!-- Meldung im Löschen Dialog wenn möglicherweise angesteckt -->
-	<string name="delete_reports_dialog">"Do you really want to delete the notification?"</string>
+    <!-- Meldung im Löschen Dialog wenn möglicherweise angesteckt -->
+    <string name="delete_reports_dialog">"Do you really want to delete the notification?"</string>
 
-	<!-- Code-Eingabe in der App löschen, wenn infiziert -->
-	<string name="delete_infection_button">"End isolation?"</string>
+    <!-- Code-Eingabe in der App löschen, wenn infiziert -->
+    <string name="delete_infection_button">"End isolation?"</string>
 
-	<!-- Meldung im Löschen Dialog nach Code-Einfragen -->
-	<string name="delete_infection_dialog">"Do you really want to delete the notification? "</string>
-	<string name="android_onboarding_battery_permission_title">"Ignore battery optimisation"</string>
-	<string name="android_onboarding_battery_permission_text">"To be able to recognise encounters at all times, the battery optimisation function for this app must be disabled."</string>
-	<string name="android_onboarding_battery_permission_button">"Allow"</string>
-	<string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
-	<string name="android_onboarding_battery_permission_info_1_title">"Only for this app"</string>
-	<string name="android_onboarding_battery_permission_info_1_text">"For the app to work, it must also run in the background. Battery optimisation can be disabled for individual apps, so that this is possible."</string>
-	<string name="android_onboarding_battery_permission_info_2_title">"Minor increase in battery usage"</string>
-	<string name="android_onboarding_battery_permission_info_2_text">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
-	<string name="android_foreground_service_notification_error_battery_optimization">"For proximity tracing to work precisely, the app must also run in the background. This will cause a minor increase in battery usage."</string>
+    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <string name="delete_infection_dialog">"Do you really want to delete the notification? "</string>
+    <string name="android_onboarding_battery_permission_title">"Ignore battery optimisation"</string>
+    <string name="android_onboarding_battery_permission_text">"To be able to recognise encounters at all times, the battery optimisation function for this app must be disabled."</string>
+    <string name="android_onboarding_battery_permission_button">"Allow"</string>
+    <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
+    <string name="android_onboarding_battery_permission_info_1_title">"Only for this app"</string>
+    <string name="android_onboarding_battery_permission_info_1_text">"For the app to work, it must also run in the background. Battery optimisation can be disabled for individual apps, so that this is possible."</string>
+    <string name="android_onboarding_battery_permission_info_2_title">"Minor increase in battery usage"</string>
+    <string name="android_onboarding_battery_permission_info_2_text">"The app operates using as little energy as possible. There is only a minor increase in battery usage."</string>
+    <string name="android_foreground_service_notification_error_battery_optimization">"For proximity tracing to work precisely, the app must also run in the background. This will cause a minor increase in battery usage."</string>
 
-	<!-- Google Play Services nicht aktuell -->
-	<string name="gaen_not_aviable">"Google Play Services is not up to date"</string>
+    <!-- Google Play Services nicht aktuell -->
+    <string name="gaen_not_aviable">"Google Play Services is not up to date"</string>
 
-	<!-- Google Play Services nicht aktuell text -->
-	<string name="gaen_not_available_text">"Please update Google Play Services"</string>
+    <!-- Google Play Services nicht aktuell text -->
+    <string name="gaen_not_available_text">"Please update Google Play Services"</string>
 
-	<!-- Tracing wurde vom System deaktiviert, erneut starten -->
-	<string name="gaen_unexpectedly_disabled">"Proximity tracing has been deactivated. Please restart it."</string>
+    <!-- Tracing wurde vom System deaktiviert, erneut starten -->
+    <string name="gaen_unexpectedly_disabled">"Proximity tracing has been deactivated. Please restart it."</string>
 
-	<!-- Fehler-Titel, wenn Tracing deaktiviert wurde im System, iOS -->
-	<!-- Fuzzy -->
-	<string name="tracing_permission_error_title_ios">"COVID-19 Exposure Notifications disabled"</string>
+    <!-- Fehler-Titel, wenn Tracing deaktiviert wurde im System, iOS -->
+    <!-- Fuzzy -->
+    <string name="tracing_permission_error_title_ios">"COVID-19 Exposure Notifications disabled"</string>
 
-	<!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-	<!-- Fuzzy -->
-	<string name="tracing_permission_error_text_ios">"Activate COVID-19 Exposure Notifications for proximity tracing to work."</string>
+    <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
+    <!-- Fuzzy -->
+    <string name="tracing_permission_error_text_ios">"Activate COVID-19 Exposure Notifications for proximity tracing to work."</string>
 
-	<!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
-	<string name="user_cancelled_key_sharing_error">"The message could not be sent. Please allow your random IDs to be shared with the SwissCovid app."</string>
+    <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
+    <string name="user_cancelled_key_sharing_error">"The message could not be sent. Please allow your random IDs to be shared with the SwissCovid app."</string>
 
-	<!-- Button um die Google Play Services zu aktualisieren -->
-	<string name="playservices_update">"Update"</string>
+    <!-- Button um die Google Play Services zu aktualisieren -->
+    <string name="playservices_update">"Update"</string>
 
-	<!-- Button um die Google Play Services zu installieren -->
-	<string name="playservices_install">"Install"</string>
+    <!-- Button um die Google Play Services zu installieren -->
+    <string name="playservices_install">"Install"</string>
 
-	<!-- Titel für Infos zu den Google Play Services -->
-	<string name="playservices_title">"Google Play Services"</string>
+    <!-- Titel für Infos zu den Google Play Services -->
+    <string name="playservices_title">"Google Play Services"</string>
 
-	<!-- Meldung, dass die Google Play Services benötigt werden -->
-	<string name="playservices_text">"To activate proximity tracing, an up-to-date version of Google Play Services is required.
+    <!-- Meldung, dass die Google Play Services benötigt werden -->
+    <string name="playservices_text">"To activate proximity tracing, an up-to-date version of Google Play Services is required.
 
 If no update is currently available on your device, please try again later."</string>
-	<string name="android_error_battery_optimization_title">"Optimisation of battery usage activated"</string>
-	<string name="android_error_battery_optimization_button">"Allow"</string>
-
-	<!-- Telefonnummer für Hilfe bei App-Problemen -->
-	<string name="app_hotline_tel_number">"+41 58 466 07 99"</string>
-
-	<!-- text shown in notification when we get an exception from the GAEN api -->
-	<string name="sync_api_error">"An unexpected error occurred when synchronising the notifications"</string>
-
-	<!-- Fehler, der bei ungültigen Zertifikat angezeigt wird. Kann z.B. passieren, wenn man in einem public wlan ist -->
-	<string name="certificate_validation_error">"Secure connection to server not possible. Please check or deactivate your VPN or proxy, or check whether you are connected to a public Wi-Fi system."</string>
-
-	<!-- Fehler-Titel wenn die Exposure Notifications nicht gestartet werden konnten. -->
-	<string name="android_en_start_failure">"COVID-19 notifications could not be activated"</string>
-	<string name="begegnung_detail_last_sync_title">"Latest successful synchronisation"</string>
-	<string name="synchronizations_view_title">"Summary"</string>
-	<string name="synchronizations_view_info_title">"Synchronisations"</string>
-	<string name="synchronizations_view_info_question">"What are synchronisations?"</string>
-	<string name="synchronizations_view_info_answer">"The app regularly checks the random IDs reported by users who have tested positive."</string>
-	<string name="synchronizations_view_period_title">"In the last 14 days"</string>
-	<string name="synchronizations_view_empty_list">"No entries"</string>
-	<string name="tracing_active_tracking_always_info">"SwissCovid remains active even if the app has been closed."</string>
-
-	<!-- title in splash screen of onboarding -->
-	<string name="oboarding_splashscreen_title">"SwissCovid
+    <string name="android_error_battery_optimization_title">"Optimisation of battery usage activated"</string>
+    <string name="android_error_battery_optimization_button">"Allow"</string>
+
+    <!-- Telefonnummer für Hilfe bei App-Problemen -->
+    <string name="app_hotline_tel_number">"+41 58 466 07 99"</string>
+
+    <!-- text shown in notification when we get an exception from the GAEN api -->
+    <string name="sync_api_error">"An unexpected error occurred when synchronising the notifications"</string>
+
+    <!-- Fehler, der bei ungültigen Zertifikat angezeigt wird. Kann z.B. passieren, wenn man in einem public wlan ist -->
+    <string name="certificate_validation_error">"Secure connection to server not possible. Please check or deactivate your VPN or proxy, or check whether you are connected to a public Wi-Fi system."</string>
+
+    <!-- Fehler-Titel wenn die Exposure Notifications nicht gestartet werden konnten. -->
+    <string name="android_en_start_failure">"COVID-19 notifications could not be activated"</string>
+    <string name="begegnung_detail_last_sync_title">"Latest successful synchronisation"</string>
+    <string name="synchronizations_view_title">"Summary"</string>
+    <string name="synchronizations_view_info_title">"Synchronisations"</string>
+    <string name="synchronizations_view_info_question">"What are synchronisations?"</string>
+    <string name="synchronizations_view_info_answer">"The app regularly checks the random IDs reported by users who have tested positive."</string>
+    <string name="synchronizations_view_period_title">"In the last 14 days"</string>
+    <string name="synchronizations_view_empty_list">"No entries"</string>
+    <string name="tracing_active_tracking_always_info">"SwissCovid remains active even if the app has been closed."</string>
+
+    <!-- title in splash screen of onboarding -->
+    <string name="oboarding_splashscreen_title">"SwissCovid 
 breaks 
 chains of infection."</string>
-	<string name="inform_detail_faq3_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
-	<string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
+    <string name="inform_detail_faq3_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
+    <string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
 
-	<!-- Meldung Detail Weiss Box unten -->
-	<string name="meldungen_detail_explanation_text4">"When the first symptoms appear, phone a doctor or health centre."</string>
+    <!-- Meldung Detail Weiss Box unten -->
+    <string name="meldungen_detail_explanation_text4">"When the first symptoms appear, phone a doctor or health centre."</string>
 
-	<!-- Text beim Bluetooth Control -->
-	<string name="tracing_setting_text_android">"COVID-19 Exposure Notifications"</string>
+    <!-- Text beim Bluetooth Control -->
+    <string name="tracing_setting_text_android">"COVID-19 Exposure Notifications"</string>
 
-	<!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-	<string name="onboarding_gaen_text_android">"COVID-19 Exposure Notifications must be activated to use the app."</string>
+    <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
+    <string name="onboarding_gaen_text_android">"COVID-19 Exposure Notifications must be activated to use the app."</string>
 
-	<!-- Onboarding Disclaimer Screen: AppName Title -->
-	<string name="onboarding_disclaimer_heading">"SwissCovid"</string>
+    <!-- Onboarding Disclaimer Screen: AppName Title -->
+    <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
 
-	<!-- Onboarding Disclaimer Screen: Title -->
-	<string name="onboarding_disclaimer_title">"Tips on use"</string>
+    <!-- Onboarding Disclaimer Screen: Title -->
+    <string name="onboarding_disclaimer_title">"Tips on use"</string>
 
-	<!-- Onboarding Disclaimer Screen: Info -->
-	<string name="onboarding_disclaimer_info">"Here you will find the Data Protection Statement and Conditions of Use"</string>
+    <!-- Onboarding Disclaimer Screen: Info -->
+    <string name="onboarding_disclaimer_info">"Here you will find the Data Protection Statement and Conditions of Use"</string>
 
-	<!-- Onboarding Disclaimer Screen: Warning Title -->
-	<string name="onboarding_disclaimer_warning_title">"Warning: This app does not protect you from COVID-19 infection."</string>
+    <!-- Onboarding Disclaimer Screen: Warning Title -->
+    <string name="onboarding_disclaimer_warning_title">"Warning: This app does not protect you from COVID-19 infection."</string>
 
-	<!-- Onboarding Disclaimer Screen: Warning Text -->
-	<string name="onboarding_disclaimer_warning_body">"The app is intended for proximity tracing and to warn users of potential exposure to someone infected by COVID-19. It is not a diagnostic tool either. Please read the instructions provided in each app screen carefully."</string>
+    <!-- Onboarding Disclaimer Screen: Warning Text -->
+    <string name="onboarding_disclaimer_warning_body">"The app is intended for proximity tracing and to warn users of potential exposure to someone infected by COVID-19. It is not a diagnostic tool either. Please read the instructions provided in each app screen carefully."</string>
 
-	<!-- Onboarding Disclaimer Screen: Manufacturer Info -->
-	<string name="onboarding_disclaimer_manufacturer">"Federal Office of Public Health FOPH
+    <!-- Onboarding Disclaimer Screen: Manufacturer Info -->
+    <string name="onboarding_disclaimer_manufacturer">"Federal Office of Public Health FOPH
 Schwarzenburgstrasse 157
 3097 Liebefeld, Switzerland"</string>
 
-	<!-- Onboarding Disclaimer Screen: App version title -->
-	<string name="onboarding_disclaimer_app_version">"SwissCovid App Version"</string>
+    <!-- Onboarding Disclaimer Screen: App version title -->
+    <string name="onboarding_disclaimer_app_version">"SwissCovid App Version"</string>
 
-	<!-- Onboarding Disclaimer Screen: Release version title -->
-	<string name="onboarding_disclaimer_release_version">"Release Date:"</string>
+    <!-- Onboarding Disclaimer Screen: Release version title -->
+    <string name="onboarding_disclaimer_release_version">"Release Date:"</string>
 
-	<!-- onboarding privacy and conditions of use button -->
-	<string name="onboarding_disclaimer_legal_button">"Data Protection Statement &amp; Conditions of Use"</string>
+    <!-- onboarding privacy and conditions of use button -->
+    <string name="onboarding_disclaimer_legal_button">"Data Protection Statement &amp; Conditions of Use"</string>
 
-	<!-- onboarding privacy and conditions of use url -->
-	<string name="onboarding_disclaimer_legal_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/situation-schweiz-und-international/datenschutzerklaerung-nutzungsbedingungen.html"</string>
+    <!-- onboarding privacy and conditions of use url -->
+    <string name="onboarding_disclaimer_legal_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/situation-schweiz-und-international/datenschutzerklaerung-nutzungsbedingungen.html"</string>
 
-	<!-- Google Translation -->
-	<!-- Error shown when loading fails because there is not enough free disk space. -->
-	<string name="loading_error_no_disk_space">"Messages could not be checked because your mobile phone does not have enough free memory space. Please release memory space."</string>
+    <!-- Google Translation -->
+    <!-- Error shown when loading fails because there is not enough free disk space. -->
+    <string name="loading_error_no_disk_space">"Messages could not be checked because your mobile phone does not have enough free memory space. Please release memory space."</string>
 
-	<!-- Onboarding: Akzeptieren Buttton Titel -->
-	<string name="onboarding_accept_button">"Accept"</string>
+    <!-- Onboarding: Akzeptieren Buttton Titel -->
+    <string name="onboarding_accept_button">"Accept"</string>
 
-	<!-- Google Translation -->
-	<!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Titel -->
-	<string name="ratelimit_error_title">"Update currently not possible"</string>
+    <!-- Google Translation -->
+    <!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Titel -->
+    <string name="ratelimit_error_title">"Update currently not possible"</string>
 
-	<!-- Google Translation! -->
-	<!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Text -->
-	<string name="ratelimit_error_text">"There have already been too many requests today. The app will try again later."</string>
+    <!-- Google Translation! -->
+    <!-- Meldungen: Fehler Meldung Rate-Limit (error 13) Text -->
+    <string name="ratelimit_error_text">"There have already been too many requests today. The app will try again later."</string>
 
-	<!-- Info to the user that tracing has been switched on -->
-	<string name="accessibility_tracing_has_been_activated">"Tracing has been activated"</string>
+    <!-- Info to the user that tracing has been switched on -->
+    <string name="accessibility_tracing_has_been_activated">"Tracing has been activated"</string>
 
-	<!-- Info to the user that tracing has been switched off -->
-	<string name="accessibility_tracing_has_been_deactivated">"Tracing has been deactivated"</string>
+    <!-- Info to the user that tracing has been switched off -->
+    <string name="accessibility_tracing_has_been_deactivated">"Tracing has been deactivated"</string>
 
-	<!-- Meldungen Detail Kostenloser Test Box Title -->
-	<string name="meldungen_detail_free_test_title">"Test available free of charge"</string>
+    <!-- Meldungen Detail Kostenloser Test Box Title -->
+    <string name="meldungen_detail_free_test_title">"Test available free of charge"</string>
 
-	<!-- Meldungen Detail Kostenloser Test Box Text -->
-	<!-- Fuzzy -->
-	<string name="meldungen_detail_free_test_text_old">"The SwissCovid Guide has information about the possibility of a free coronavirus test."</string>
+    <!-- Meldungen Detail Kostenloser Test Box Text -->
+    <!-- Fuzzy -->
+    <string name="meldungen_detail_free_test_text_old">"The SwissCovid Guide has information about the possibility of a free coronavirus test."</string>
 
-	<!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
-	<string name="activate_tracing_button">"Activate proximity tracing"</string>
+    <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
+    <string name="activate_tracing_button">"Activate proximity tracing"</string>
 
-	<!-- Detailed Version of tracing_turned_off_text that is displayed to the user in the Tracing Detail View when the Tracing is deactivated. -->
-	<string name="tracing_turned_off_detailed_text">"Enable tracing so the app can save encounters and receive reports"</string>
+    <!-- Detailed Version of tracing_turned_off_text that is displayed to the user in the Tracing Detail View when the Tracing is deactivated. -->
+    <string name="tracing_turned_off_detailed_text">"Enable tracing so the app can save encounters and receive reports"</string>
 
-	<!-- Warning that is displayed to the user in the Home View under the Meldungen-Card. -->
-	<string name="meldungen_tracing_not_active_warning">"If tracing is disabled, you cannot receive any reports."</string>
+    <!-- Warning that is displayed to the user in the Home View under the Meldungen-Card. -->
+    <string name="meldungen_tracing_not_active_warning">"If tracing is disabled, you cannot receive any reports."</string>
 
-	<!-- Warning title for Meldungen-Card when Tracing is turned off. -->
-	<string name="meldungen_tracing_turned_off_title">"Attention!"</string>
+    <!-- Warning title for Meldungen-Card when Tracing is turned off. -->
+    <string name="meldungen_tracing_turned_off_title">"Attention!"</string>
 
-	<!-- Data Protection Header String in Onboarding Disclaimer View. -->
-	<string name="onboarding_disclaimer_data_protection_statement">"Data protection declaration"</string>
+    <!-- Data Protection Header String in Onboarding Disclaimer View. -->
+    <string name="onboarding_disclaimer_data_protection_statement">"Data protection declaration"</string>
 
-	<!-- Conditions of Use Header String in Onboarding Disclaimer View. -->
-	<string name="onboarding_disclaimer_conditions_of_use">"Terms of use"</string>
+    <!-- Conditions of Use Header String in Onboarding Disclaimer View. -->
+    <string name="onboarding_disclaimer_conditions_of_use">"Terms of use"</string>
 
-	<!-- Button title that links to the website with the data protection statement and conditions of use. -->
-	<string name="onboarding_disclaimer_to_online_version_button">"To the online version"</string>
+    <!-- Button title that links to the website with the data protection statement and conditions of use. -->
+    <string name="onboarding_disclaimer_to_online_version_button">"To the online version"</string>
 
-	<!-- Hint that is displayed to the user under the Meldungen-Card when the Tracing is turned off. -->
-	<string name="meldungen_tracing_turned_off_warning">"If tracing is disabled, you cannot receive any reports"</string>
+    <!-- Hint that is displayed to the user under the Meldungen-Card when the Tracing is turned off. -->
+    <string name="meldungen_tracing_turned_off_warning">"If tracing is disabled, you cannot receive any reports"</string>
 
-	<!-- Homescreen infobox close button accessibility handler -->
-	<string name="infobox_close_button_accessibility">"Close"</string>
+    <!-- Homescreen infobox close button accessibility handler -->
+    <string name="infobox_close_button_accessibility">"Close"</string>
 
-	<!-- Title for the Home View Travel Card. -->
-	<string name="travel_title">"Travel"</string>
+    <!-- Title for the Home View Travel Card. -->
+    <string name="travel_title">"Travel"</string>
 
-	<!-- Info text that is displayed  on the Home Travel Card. -->
-	<string name="travel_home_description">"SwissCovid works in the following countries:"</string>
+    <!-- Info text that is displayed  on the Home Travel Card. -->
+    <string name="travel_home_description">"SwissCovid works in the following countries:"</string>
 
-	<!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
-	<string name="travel_screen_explanation_title_1">"What does that mean?"</string>
+    <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
+    <string name="travel_screen_explanation_title_1">"What does that mean?"</string>
 
-	<!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-	<string name="travel_screen_explanation_text_1">"You don’t have to install another app if you’re travelling in one of the compatible countries.
+    <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
+    <string name="travel_screen_explanation_text_1">"You don’t have to install another app if you’re travelling in one of the compatible countries.
 
 SwissCovid checks private keys published in the compatible countries. This means that you can also receive alerts of possible infection abroad."</string>
 
-	<!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
-	<string name="travel_screen_explanation_title_2">"What happens when the Covidcode is entered?"</string>
+    <!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
+    <string name="travel_screen_explanation_title_2">"What happens when the Covidcode is entered?"</string>
 
-	<!-- Second text for the travel feauter explenation at the bottom of the travel screen. -->
-	<string name="travel_screen_explanation_text_2">"When the Covidcode is entered, the private keys sent by you are also shared with the compatible countries.
+    <!-- Second text for the travel feauter explenation at the bottom of the travel screen. -->
+    <string name="travel_screen_explanation_text_2">"When the Covidcode is entered, the private keys sent by you are also shared with the compatible countries.
 
 To enable travellers from abroad to also receive alerts, this happens regardless of whether you yourself are travelling abroad or not."</string>
 
-	<!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine website öffnet -->
-	<string name="accessibility_faq_button_hint_non_bag">"This button leaves the app and opens a website."</string>
+    <!-- Accessibility: FAQ button hint wenn die app verlassen wird und eine website öffnet -->
+    <string name="accessibility_faq_button_hint_non_bag">"This button leaves the app and opens a website."</string>
 
-	<!-- voice over string der vorgelesen wird wenn noch kein sync stattgefunden hat -->
-	<string name="begegnung_detail_no_last_sync_accessibility">"No previous synchronisations"</string>
+    <!-- voice over string der vorgelesen wird wenn noch kein sync stattgefunden hat -->
+    <string name="begegnung_detail_no_last_sync_accessibility">"No previous synchronisations"</string>
 
-	<!-- Text für Hintergrundfehler auf Android -->
-	<string name="meldungen_background_error_text_android">"Change the settings to receive notification outside the app as well in the event of a report."</string>
+    <!-- Text für Hintergrundfehler auf Android -->
+    <string name="meldungen_background_error_text_android">"Change the settings to receive notification outside the app as well in the event of a report."</string>
 
-	<!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
-	<string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
+    <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
+    <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-	<!-- Text beim Bluetooth Control iOS 13.5 -->
-	<string name="tracing_setting_text_ios_13_5"></string>
+    <!-- Text beim Bluetooth Control iOS 13.5 -->
+    <string name="tracing_setting_text_ios_13_5"></string>
 
-	<!-- Text beim Bluetooth Control iOS 13.6 -->
-	<string name="tracing_setting_text_ios_13_6"></string>
+    <!-- Text beim Bluetooth Control iOS 13.6 -->
+    <string name="tracing_setting_text_ios_13_6"></string>
 
-	<!-- Text beim Bluetooth Control iOS 14 -->
-	<string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
-	<string name="bottom_nav_tab_home">"SwissCovid"</string>
-	<string name="bottom_nav_tab_stats">"Stats"</string>
-	<string name="stats_title">"already use SwissCovid"</string>
-	<string name="stats_legend_new_infections">"New infections reported"</string>
-	<string name="stats_legend_new_infections_average">"7-day average"</string>
-	<string name="stats_legend_entered_covidcodes">"Covidcodes entered"</string>
-	<string name="share_app_supertitle">"Together…"</string>
-	<string name="share_app_title">"against the spread of Covid"</string>
-	<string name="share_app_button">"Share app"</string>
-	<string name="share_app_body">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
+    <!-- Text beim Bluetooth Control iOS 14 -->
+    <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
+    <string name="bottom_nav_tab_home">"SwissCovid"</string>
+    <string name="bottom_nav_tab_stats">"Stats"</string>
+    <string name="stats_title">"already use SwissCovid"</string>
+    <string name="stats_legend_new_infections">"New infections reported"</string>
+    <string name="stats_legend_new_infections_average">"7-day average"</string>
+    <string name="stats_legend_entered_covidcodes">"Covidcodes entered"</string>
+    <string name="share_app_supertitle">"Together…"</string>
+    <string name="share_app_title">"against the spread of Covid"</string>
+    <string name="share_app_button">"Share app"</string>
+    <string name="share_app_body">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
 
-	<!-- Text der geteilt wird -->
-	<string name="share_app_message">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
+    <!-- Text der geteilt wird -->
+    <string name="share_app_message">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
 
-	<!-- URL die geteilt wird -->
-	<string name="share_app_url">"https://foph-coronavirus.ch/swisscovid-app/#download"</string>
+    <!-- URL die geteilt wird -->
+    <string name="share_app_url">"https://foph-coronavirus.ch/swisscovid-app/#download"</string>
 
-	<!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59" -->
-	<string name="stats_counter">"{COUNT} M"</string>
+    <!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59" -->
+    <string name="stats_counter">"{COUNT} M"</string>
 
-	<!-- Statistik Tag der Daten "{DAY}" wird mit dem Aktualisierungsdatum ersetzt z.B. "14.9." -->
-	<string name="stats_source_day">"Stats as of {DAY}"</string>
+    <!-- Statistik Tag der Daten "{DAY}" wird mit dem Aktualisierungsdatum ersetzt z.B. "14.9." -->
+    <string name="stats_source_day">"Stats as of {DAY}"</string>
 
-	<!-- Links zu weiteren Statistiken -->
-	<string name="stats_more_statistics_button">"View more statistics"</string>
+    <!-- Links zu weiteren Statistiken -->
+    <string name="stats_more_statistics_button">"View more statistics"</string>
 
-	<!-- URL zu weiteren statistiken -->
-	<string name="stats_more_statistics_url">"https://www.covid19.admin.ch/en/overview"</string>
+    <!-- URL zu weiteren statistiken -->
+    <string name="stats_more_statistics_url">"https://www.covid19.admin.ch/en/overview"</string>
 
-	<!-- Body of the error message shown when the statistics data cannot be loaded -->
-	<string name="stats_loading_error_text">"Currently unable to load stats"</string>
+    <!-- Body of the error message shown when the statistics data cannot be loaded -->
+    <string name="stats_loading_error_text">"Currently unable to load stats"</string>
 
-	<!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59". Voll Millionen wort -->
-	<string name="stats_counter_full">"{COUNT} million"</string>
+    <!-- Zahlenformat für die Aktive nutzer nummer {COUNT} wird durch die aktuelle Zahl ersetzt z.b. "1.59". Voll Millionen wort -->
+    <string name="stats_counter_full">"{COUNT} million"</string>
 
-	<!-- iOS settings tutorial title -->
-	<string name="ios_settings_tutorial_title">"Activate encounter notifications"</string>
+    <!-- iOS settings tutorial title -->
+    <string name="ios_settings_tutorial_title">"Activate encounter notifications"</string>
 
-	<!-- iOS settings tutorial open settings button -->
-	<string name="ios_settings_tutorial_open_settings_button">"Open settings"</string>
+    <!-- iOS settings tutorial open settings button -->
+    <string name="ios_settings_tutorial_open_settings_button">"Open settings"</string>
 
-	<!-- iOS settings tutorial schritt 1 -->
-	<string name="ios_settings_tutorial_step_1_text">"Open the system settings via the button below."</string>
+    <!-- iOS settings tutorial schritt 1 -->
+    <string name="ios_settings_tutorial_step_1_text">"Open the system settings via the button below."</string>
 
-	<!-- iOS settings tutorial schritt 2 -->
-	<string name="ios_settings_tutorial_step_2_text">"Select:"</string>
+    <!-- iOS settings tutorial schritt 2 -->
+    <string name="ios_settings_tutorial_step_2_text">"Select:"</string>
 
-	<!-- ios settings tutorial exposure notification text wie in iOS settings -->
-	<string name="ios_settings_tutorial_step_2_exposure_notification">"Exposure Notifications"</string>
+    <!-- ios settings tutorial exposure notification text wie in iOS settings -->
+    <string name="ios_settings_tutorial_step_2_exposure_notification">"Exposure Notifications"</string>
 
-	<!-- iOS settings tutorial schritt 3 -->
-	<string name="ios_settings_tutorial_step_3_text">"First activate the function…"</string>
+    <!-- iOS settings tutorial schritt 3 -->
+    <string name="ios_settings_tutorial_step_3_text">"First activate the function…"</string>
 
-	<!-- iOS settings tutorial share exposure notification text wie in iOS settings -->
-	<string name="ios_settings_tutorial_step_3_share_exposure_information">"Share Exposure Information"</string>
+    <!-- iOS settings tutorial share exposure notification text wie in iOS settings -->
+    <string name="ios_settings_tutorial_step_3_share_exposure_information">"Share Exposure Information"</string>
 
-	<!-- iOS settings tutorial schritt 4 -->
-	<string name="ios_settings_tutorial_step_4_text">"If not done already, you can now set SwissCovid as active region."</string>
+    <!-- iOS settings tutorial schritt 4 -->
+    <string name="ios_settings_tutorial_step_4_text">"If not done already, you can now set SwissCovid as active region."</string>
 
-	<!-- iOS settings tutorial set as aktive region wie in iOS settings -->
-	<string name="ios_settings_tutorial_step_4_set_as_aktive_region">"Set As Active Region"</string>
+    <!-- iOS settings tutorial set as aktive region wie in iOS settings -->
+    <string name="ios_settings_tutorial_step_4_set_as_aktive_region">"Set As Active Region"</string>
 
-	<!-- ios tracing permission fehlermeldung button text -->
-	<string name="ios_tracing_permission_error_button">"How it works"</string>
+    <!-- ios tracing permission fehlermeldung button text -->
+    <string name="ios_tracing_permission_error_button">"How it works"</string>
 
-	<!-- Subtitle für Meldung Detail Screen Header wenn nur eine Begegnung angezeigt wird. -->
-	<!-- Fuzzy -->
-	<string name="meldung_detail_exposed_subtitle_last_encounter">"Last contact"</string>
+    <!-- Subtitle für Meldung Detail Screen Header wenn nur eine Begegnung angezeigt wird. -->
+    <!-- Fuzzy -->
+    <string name="meldung_detail_exposed_subtitle_last_encounter">"Last contact"</string>
 
-	<!-- Subtitle für Meldung Detail Screen Header wenn alle Begegnungen angezeigt werden. -->
-	<string name="meldung_detail_exposed_subtitle_all_encounters">"All contacts"</string>
+    <!-- Subtitle für Meldung Detail Screen Header wenn alle Begegnungen angezeigt werden. -->
+    <string name="meldung_detail_exposed_subtitle_all_encounters">"All contacts"</string>
 
-	<!-- Button Titel im Meldung Detail Header, wenn nur eine Meldung angezeigt wird. -->
-	<!-- Fuzzy -->
-	<string name="meldung_detail_exposed_show_all_button">"Show all"</string>
+    <!-- Button Titel im Meldung Detail Header, wenn nur eine Meldung angezeigt wird. -->
+    <!-- Fuzzy -->
+    <string name="meldung_detail_exposed_show_all_button">"Show all"</string>
 
-	<!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
-	<string name="meldung_detail_exposed_show_less_button">"Show fewer"</string>
+    <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
+    <string name="meldung_detail_exposed_show_less_button">"Show fewer"</string>
 
-	<!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-	<string name="meldungen_detail_leitfaden_title">"SwissCovid Guide"</string>
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid Guide"</string>
 
-	<!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-	<string name="meldungen_detail_leitfaden_text">"Answer the questions in the SwissCovid Guide to find out how to respond."</string>
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text">"Answer the questions in the SwissCovid Guide to find out how to respond."</string>
 
-	<!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-	<string name="meldungen_detail_open_leitfaden_button">"Complete now"</string>
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button">"Complete now"</string>
 
-	<!-- Title für Infotext zu SwissCovid Infoline -->
-	<string name="meldungen_tel_information_title">"Information by phone"</string>
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title">"Information by phone"</string>
 
-	<!-- Infotext zu SwissCovid Infoline -->
-	<string name="meldungen_tel_information_text">"If you have further questions, feel free to call the SwissCovid Infoline for information by phone."</string>
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text">"If you have further questions, feel free to call the SwissCovid Infoline for information by phone."</string>
 
-	<!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-	<string name="meldungen_detail_leitfaden_again_text">"You can open the SwissCovid Guide again any time here."</string>
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text">"You can open the SwissCovid Guide again any time here."</string>
 
-	<!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-	<string name="meldungen_detail_open_leitfaden_again_button">"To the guide"</string>
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button">"To the guide"</string>
 
-	<!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-	<string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
 
-	<!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-	<string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
 
-	<!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-	<string name="delete_notification_dialog">"The notification of possible infection serves as the proof you need for a free coronavirus test. If you delete this notification you lose this proof and the link to the SwissCovid Guide."</string>
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog">"The notification of possible infection serves as the proof you need for a free coronavirus test. If you delete this notification you lose this proof and the link to the SwissCovid Guide."</string>
 
-	<!-- URL to the SwissCovid Leitfaden -->
-	<string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 
-	<!-- Tracing Erinnerung 4 Stunden Radio Button -->
-	<string name="tracing_reminder_radio_four_hours">"4 hours"</string>
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours">"4 hours"</string>
 
-	<!-- Tracing Erinnerung 8 Stunden Radio Button -->
-	<string name="tracing_reminder_radio_eight_hours">"8 hours"</string>
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours">"8 hours"</string>
 
-	<!-- Tracing Erinnerung 12 Stunden Radio Button -->
-	<string name="tracing_reminder_radio_twelve_hours">"12 hours"</string>
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours">"12 hours"</string>
 
-	<!-- Tracing Erinnerung keine Erinngerung Radio Button -->
-	<string name="tracing_reminder_radio_no_reminder">"No reminder"</string>
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder">"No reminder"</string>
 
-	<!-- Tracing Erinnerung bestätigen Button -->
-	<string name="tracing_reminder_confirm_button">"OK"</string>
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button">"OK"</string>
 
-	<!-- Tracing Erinnerung abbrechen Button -->
-	<string name="tracing_reminder_cancel_button">"Cancel"</string>
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button">"Cancel"</string>
 
-	<!-- Tracing Erinnerung Titel -->
-	<string name="tracing_reminder_title">"Set reminder"</string>
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title">"Set reminder"</string>
 
-	<!-- Tracing Erinnerung Untertitel -->
-	<string name="tracing_reminder_subtitle">"SwissCovid can remind you to reactivate tracing."</string>
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle">"SwissCovid can remind you to reactivate tracing."</string>
 
-	<!-- Tracing Erinnerung Warnung -->
-	<string name="tracing_reminder_warning">"Tracing is deactivated."</string>
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning">"Tracing is deactivated."</string>
 
-	<!-- Kantonname Zürich -->
-	<string name="canton_zurich">"Zurich"</string>
+    <!-- Kantonname Zürich -->
+    <string name="canton_zurich">"Zurich"</string>
 
-	<!-- Kantonname Aargau -->
-	<!-- Fuzzy -->
-	<string name="canton_aargau">"Aargau"</string>
+    <!-- Kantonname Aargau -->
+    <!-- Fuzzy -->
+    <string name="canton_aargau">"Aargau"</string>
 
-	<!-- Kantonname Appenzell Innerrhoden -->
-	<!-- Fuzzy -->
-	<string name="canton_appenzell_innerrhoden">"Appenzell Innerrhoden"</string>
+    <!-- Kantonname Appenzell Innerrhoden -->
+    <!-- Fuzzy -->
+    <string name="canton_appenzell_innerrhoden">"Appenzell Innerrhoden"</string>
 
-	<!-- Kantonname Appenzell Ausserrhoden -->
-	<!-- Fuzzy -->
-	<string name="canton_appenzell_ausserrhoden">"Appenzell Ausserrhoden"</string>
+    <!-- Kantonname Appenzell Ausserrhoden -->
+    <!-- Fuzzy -->
+    <string name="canton_appenzell_ausserrhoden">"Appenzell Ausserrhoden"</string>
 
-	<!-- Kantonname Bern -->
-	<string name="canton_berne">"Bern"</string>
+    <!-- Kantonname Bern -->
+    <string name="canton_berne">"Bern"</string>
 
-	<!-- Kantonname Basel-Landschaft -->
-	<string name="canton_basel_country">"Basel-Landschaft"</string>
+    <!-- Kantonname Basel-Landschaft -->
+    <string name="canton_basel_country">"Basel-Landschaft"</string>
 
-	<!-- Kantonname Basel-Stadt -->
-	<string name="canton_basel_city">"Basel-Stadt"</string>
+    <!-- Kantonname Basel-Stadt -->
+    <string name="canton_basel_city">"Basel-Stadt"</string>
 
-	<!-- Kantonname Freiburg -->
-	<!-- Fuzzy -->
-	<string name="canton_fribourg">"Fribourg"</string>
+    <!-- Kantonname Freiburg -->
+    <!-- Fuzzy -->
+    <string name="canton_fribourg">"Fribourg"</string>
 
-	<!-- Kantonname Genf -->
-	<!-- Fuzzy -->
-	<string name="canton_geneva">"Geneva"</string>
+    <!-- Kantonname Genf -->
+    <!-- Fuzzy -->
+    <string name="canton_geneva">"Geneva"</string>
 
-	<!-- Kantonname Glarus -->
-	<!-- Fuzzy -->
-	<string name="canton_glarus">"Glarus"</string>
+    <!-- Kantonname Glarus -->
+    <!-- Fuzzy -->
+    <string name="canton_glarus">"Glarus"</string>
 
-	<!-- Kantonname Graubünden -->
-	<!-- Fuzzy -->
-	<string name="canton_graubuenden">"Graubünden"</string>
+    <!-- Kantonname Graubünden -->
+    <!-- Fuzzy -->
+    <string name="canton_graubuenden">"Graubünden"</string>
 
-	<!-- Kantonname Jura -->
-	<!-- Fuzzy -->
-	<string name="canton_jura">"Jura"</string>
+    <!-- Kantonname Jura -->
+    <!-- Fuzzy -->
+    <string name="canton_jura">"Jura"</string>
 
-	<!-- Kantonname Luzern -->
-	<!-- Fuzzy -->
-	<string name="canton_lucerne">"Lucerne"</string>
+    <!-- Kantonname Luzern -->
+    <!-- Fuzzy -->
+    <string name="canton_lucerne">"Lucerne"</string>
 
-	<!-- Kantonname Neuenburg -->
-	<!-- Fuzzy -->
-	<string name="canton_neuchatel">"Neuchâtel"</string>
+    <!-- Kantonname Neuenburg -->
+    <!-- Fuzzy -->
+    <string name="canton_neuchatel">"Neuchâtel"</string>
 
-	<!-- Kantonname Nidwalden -->
-	<!-- Fuzzy -->
-	<string name="canton_nidwalden">"Nidwalden"</string>
+    <!-- Kantonname Nidwalden -->
+    <!-- Fuzzy -->
+    <string name="canton_nidwalden">"Nidwalden"</string>
 
-	<!-- Kantonname Obwalden -->
-	<!-- Fuzzy -->
-	<string name="canton_obwalden">"Obwalden"</string>
+    <!-- Kantonname Obwalden -->
+    <!-- Fuzzy -->
+    <string name="canton_obwalden">"Obwalden"</string>
 
-	<!-- Kantonname St. Gallen -->
-	<!-- Fuzzy -->
-	<string name="canton_st_gallen">"St. Gallen"</string>
+    <!-- Kantonname St. Gallen -->
+    <!-- Fuzzy -->
+    <string name="canton_st_gallen">"St. Gallen"</string>
 
-	<!-- Kantonname Schaffhausen -->
-	<!-- Fuzzy -->
-	<string name="canton_schaffhausen">"Schaffhausen"</string>
+    <!-- Kantonname Schaffhausen -->
+    <!-- Fuzzy -->
+    <string name="canton_schaffhausen">"Schaffhausen"</string>
 
-	<!-- Kantonname Solothurn -->
-	<!-- Fuzzy -->
-	<string name="canton_solothurn">"Solothurn"</string>
+    <!-- Kantonname Solothurn -->
+    <!-- Fuzzy -->
+    <string name="canton_solothurn">"Solothurn"</string>
 
-	<!-- Kantonname Schwyz -->
-	<!-- Fuzzy -->
-	<string name="canton_schwyz">"Schwyz"</string>
+    <!-- Kantonname Schwyz -->
+    <!-- Fuzzy -->
+    <string name="canton_schwyz">"Schwyz"</string>
 
-	<!-- Kantonname Thurgau -->
-	<string name="canton_thurgovia">"Thurgau"</string>
+    <!-- Kantonname Thurgau -->
+    <string name="canton_thurgovia">"Thurgau"</string>
 
-	<!-- Kantonname Tessin -->
-	<!-- Fuzzy -->
-	<string name="canton_ticino">"Ticino"</string>
+    <!-- Kantonname Tessin -->
+    <!-- Fuzzy -->
+    <string name="canton_ticino">"Ticino"</string>
 
-	<!-- Kantonname Uri -->
-	<!-- Fuzzy -->
-	<string name="canton_uri">"Uri"</string>
+    <!-- Kantonname Uri -->
+    <!-- Fuzzy -->
+    <string name="canton_uri">"Uri"</string>
 
-	<!-- Kantonname Waadt -->
-	<!-- Fuzzy -->
-	<string name="canton_vaud">"Vaud"</string>
+    <!-- Kantonname Waadt -->
+    <!-- Fuzzy -->
+    <string name="canton_vaud">"Vaud"</string>
 
-	<!-- Kantonname Wallis -->
-	<!-- Fuzzy -->
-	<string name="canton_valais">"Valais"</string>
+    <!-- Kantonname Wallis -->
+    <!-- Fuzzy -->
+    <string name="canton_valais">"Valais"</string>
 
-	<!-- Kantonname Zug -->
-	<!-- Fuzzy -->
-	<string name="canton_zug">"Zug"</string>
+    <!-- Kantonname Zug -->
+    <!-- Fuzzy -->
+    <string name="canton_zug">"Zug"</string>
 
-	<!-- Kantonname Fürstentum Liechtenstein -->
-	<string name="country_liechtenstein">"Principality of Liechtenstein"</string>
+    <!-- Kantonname Fürstentum Liechtenstein -->
+    <string name="country_liechtenstein">"Principality of Liechtenstein"</string>
 
-	<!-- Test standorte Popup Titel -->
-	<string name="test_location_popup_title">"Where can I get a test?"</string>
+    <!-- Test standorte Popup Titel -->
+    <string name="test_location_popup_title">"Where can I get a test?"</string>
 
-	<!-- Test standorte Popup Text -->
-	<string name="test_location_popup_text">"You can be tested for the coronavirus at various doctors, test centres, hospitals and pharmacies. You will find information on the various testing facilities on the relevant cantonal websites:"</string>
+    <!-- Test standorte Popup Text -->
+    <string name="test_location_popup_text">"You can be tested for the coronavirus at various doctors, test centres, hospitals and pharmacies. You will find information on the various testing facilities on the relevant cantonal websites:"</string>
 
-	<!-- Notification Channel name for Tracing Reactivation Reminders on Android Devices (Only visible in System Settings) -->
-	<string name="android_reminder_channel_name">"Tracing activation reminder"</string>
+    <!-- Notification Channel name for Tracing Reactivation Reminders on Android Devices (Only visible in System Settings) -->
+    <string name="android_reminder_channel_name">"Tracing activation reminder"</string>
 
-	<!-- Titel der Tracing-Reaktivierungs-Notification -->
-	<string name="tracing_reminder_notification_title">"Activate tracing"</string>
+    <!-- Titel der Tracing-Reaktivierungs-Notification -->
+    <string name="tracing_reminder_notification_title">"Activate tracing"</string>
 
-	<!-- Subtitle der Tracing-Reaktivierungs-Notification -->
-	<string name="tracing_reminder_notification_subtitle">"Activate tracing so that the app can save contacts and receive notifications."</string>
+    <!-- Subtitle der Tracing-Reaktivierungs-Notification -->
+    <string name="tracing_reminder_notification_subtitle">"Activate tracing so that the app can save contacts and receive notifications."</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Titel -->
-	<string name="ios_software_update_blocking_title">"Software update required"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Titel -->
+    <string name="ios_software_update_blocking_title">"Software update required"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: text -->
-	<string name="ios_software_update_blocking_text">"For SwissCovid to work you must install the latest version of iOS."</string>
+    <!-- iOS Blockierende View bei benötigten OS update: text -->
+    <string name="ios_software_update_blocking_text">"For SwissCovid to work you must install the latest version of iOS."</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial title -->
-	<string name="ios_software_update_blocking_tutorial_title">"How to install it:"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial title -->
+    <string name="ios_software_update_blocking_tutorial_title">"How to install it:"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial first -->
-	<string name="ios_software_update_blocking_tutorial_first">"Open Settings on your home screen"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial first -->
+    <string name="ios_software_update_blocking_tutorial_first">"Open Settings on your home screen"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial second -->
-	<string name="ios_software_update_blocking_tutorial_second">"Go to..."</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial second -->
+    <string name="ios_software_update_blocking_tutorial_second">"Go to..."</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial second settings general (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
-	<string name="ios_software_update_blocking_tutorial_second_settings">"General"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial second settings general (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
+    <string name="ios_software_update_blocking_tutorial_second_settings">"General"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial third -->
-	<string name="ios_software_update_blocking_tutorial_third">"Select..."</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial third -->
+    <string name="ios_software_update_blocking_tutorial_third">"Select..."</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial third software update (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
-	<string name="ios_software_update_blocking_tutorial_third_software_update">"Software Update"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial third software update (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
+    <string name="ios_software_update_blocking_tutorial_third_software_update">"Software Update"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth -->
-	<string name="ios_software_update_blocking_tutorial_fourth">"Tap..."</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth -->
+    <string name="ios_software_update_blocking_tutorial_fourth">"Tap..."</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth load and install (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
-	<string name="ios_software_update_blocking_tutorial_fourth_load_and_install">"Download and Install"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial fourth load and install (Muss mit dem Eintrag in den IOS Einstellungen übereinstimmen!) -->
+    <string name="ios_software_update_blocking_tutorial_fourth_load_and_install">"Download and Install"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial apple button -->
-	<string name="ios_software_update_blocking_tutorial_apple">"Apple guide"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial apple button -->
+    <string name="ios_software_update_blocking_tutorial_apple">"Apple guide"</string>
 
-	<!-- iOS Blockierende View bei benötigten OS update: Tutorial apple url -->
-	<string name="ios_software_update_blocking_tutorial_apple_url">"https://support.apple.com/en-us/HT204204"</string>
+    <!-- iOS Blockierende View bei benötigten OS update: Tutorial apple url -->
+    <string name="ios_software_update_blocking_tutorial_apple_url">"https://support.apple.com/en-us/HT204204"</string>
 
-	<!-- iOS Notification Text bei benötigten OS update -->
-	<string name="ios_software_update_notification_title">"Software update required"</string>
+    <!-- iOS Notification Text bei benötigten OS update -->
+    <string name="ios_software_update_notification_title">"Software update required"</string>
 
-	<!-- iOS Notification Text bei benötigten OS update -->
-	<string name="ios_software_update_notification_text">"For SwissCovid to work you must install the latest version of iOS."</string>
+    <!-- iOS Notification Text bei benötigten OS update -->
+    <string name="ios_software_update_notification_text">"For SwissCovid to work you must install the latest version of iOS."</string>
 
-	<!-- Button Text um die Isolation zu beenden -->
-	<string name="delete_infection_dialog_finish_button">"End"</string>
+    <!-- Button Text um die Isolation zu beenden -->
+    <string name="delete_infection_dialog_finish_button">"End"</string>
 
-	<!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-	<string name="tracing_ended_info">"Notifications will no longer be stored.
+    <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
+    <string name="tracing_ended_info">"Notifications will no longer be stored.
 
 Tracing can be reactivated after isolation."</string>
-	<string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
-	<string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
-	<string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
-	<string name="testlocation_url_canton_basel_country">"https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles"</string>
-	<string name="testlocation_url_canton_basel_city">"https://www.coronavirus.bs.ch/en.html"</string>
-	<string name="testlocation_url_canton_berne">"http://www.be.ch/corona"</string>
-	<string name="testlocation_url_canton_fribourg">"https://www.fr.ch/sante/covid-19/coronavirus-informations-actuelles-toutes-les-actualites-liees-au-covid-19-mesures-prises-faq-statistiques"</string>
-	<string name="testlocation_url_canton_geneva">"https://www.ge.ch/en/covid-19-how-protect-yourself-and-others"</string>
-	<string name="testlocation_url_canton_glarus">"https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817"</string>
-	<string name="testlocation_url_canton_graubuenden">"https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/Seiten/Start.aspx"</string>
-	<string name="testlocation_url_canton_jura">"https://www.jura.ch/fr/Autorites/Coronavirus/Accueil/Coronavirus-Informations-officielles-a-la-population-jurassienne.html"</string>
-	<string name="testlocation_url_canton_lucerne">"https://gesundheit.lu.ch/themen/Humanmedizin/Infektionskrankheiten/Informationen_Coronavirus"</string>
-	<string name="testlocation_url_canton_neuchatel">"https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/Pages/Coronavirus.aspx"</string>
-	<string name="testlocation_url_canton_nidwalden">"https://www.nw.ch/gesundheitsamtdienste/6044"</string>
-	<string name="testlocation_url_canton_obwalden">"https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962"</string>
-	<string name="testlocation_url_canton_st_gallen">"https://www.sg.ch/tools/informationen-coronavirus.html"</string>
-	<string name="testlocation_url_canton_schaffhausen">"https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-2954701-DE.html"</string>
-	<string name="testlocation_url_canton_schwyz">"https://www.sz.ch/behoerden/information-medien/medienmitteilungen/coronavirus.html/72-416-412-1379-6948"</string>
-	<string name="testlocation_url_canton_solothurn">"https://corona.so.ch/"</string>
-	<string name="testlocation_url_canton_thurgovia">"https://www.tg.ch/news/fachdossier-coronavirus.html/10552"</string>
-	<string name="testlocation_url_canton_ticino">"https://www4.ti.ch/dss/dsp/covid19/home/"</string>
-	<string name="testlocation_url_canton_uri">"https://www.ur.ch/themen/2962"</string>
-	<string name="testlocation_url_canton_valais">"https://www.vs.ch/web/coronavirus/"</string>
-	<string name="testlocation_url_canton_zug">"https://www.zg.ch/behoerden/gesundheitsdirektion/amt-fuer-gesundheit/corona"</string>
-	<string name="testlocation_url_canton_vaud">"https://www.vd.ch/toutes-les-actualites/hotline-et-informations-sur-le-coronavirus/"</string>
-
-	<!-- Fuzzy -->
-	<string name="testlocation_url_canton_zurich">"https://www.zh.ch/de/gesundheit/coronavirus.html"</string>
-	<string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
-
-	<!-- text for info box pop up for the hearing impaired -->
-	<string name="hearing_impaired_info">"Are you deaf or hard of hearing and unable to call the coronavirus infoline on the phone?
+    <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
+    <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
+    <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
+    <string name="testlocation_url_canton_basel_country">"https://www.baselland.ch/politik-und-behorden/direktionen/volkswirtschafts-und-gesundheitsdirektion/amt-fur-gesundheit/medizinische-dienste/kantonsarztlicher-dienst/aktuelles"</string>
+    <string name="testlocation_url_canton_basel_city">"https://www.coronavirus.bs.ch/en.html"</string>
+    <string name="testlocation_url_canton_berne">"http://www.be.ch/corona"</string>
+    <string name="testlocation_url_canton_fribourg">"https://www.fr.ch/sante/covid-19/coronavirus-informations-actuelles-toutes-les-actualites-liees-au-covid-19-mesures-prises-faq-statistiques"</string>
+    <string name="testlocation_url_canton_geneva">"https://www.ge.ch/en/covid-19-how-protect-yourself-and-others"</string>
+    <string name="testlocation_url_canton_glarus">"https://www.gl.ch/verwaltung/finanzen-und-gesundheit/gesundheit/coronavirus.html/4817"</string>
+    <string name="testlocation_url_canton_graubuenden">"https://www.gr.ch/DE/institutionen/verwaltung/djsg/ga/coronavirus/info/Seiten/Start.aspx"</string>
+    <string name="testlocation_url_canton_jura">"https://www.jura.ch/fr/Autorites/Coronavirus/Accueil/Coronavirus-Informations-officielles-a-la-population-jurassienne.html"</string>
+    <string name="testlocation_url_canton_lucerne">"https://gesundheit.lu.ch/themen/Humanmedizin/Infektionskrankheiten/Informationen_Coronavirus"</string>
+    <string name="testlocation_url_canton_neuchatel">"https://www.ne.ch/autorites/DFS/SCSP/medecin-cantonal/maladies-vaccinations/Pages/Coronavirus.aspx"</string>
+    <string name="testlocation_url_canton_nidwalden">"https://www.nw.ch/gesundheitsamtdienste/6044"</string>
+    <string name="testlocation_url_canton_obwalden">"https://www.ow.ch/de/verwaltung/dienstleistungen/?dienst_id=5962"</string>
+    <string name="testlocation_url_canton_st_gallen">"https://www.sg.ch/tools/informationen-coronavirus.html"</string>
+    <string name="testlocation_url_canton_schaffhausen">"https://sh.ch/CMS/Webseite/Kanton-Schaffhausen/Beh-rde/Verwaltung/Departement-des-Innern/Gesundheitsamt-2954701-DE.html"</string>
+    <string name="testlocation_url_canton_schwyz">"https://www.sz.ch/behoerden/information-medien/medienmitteilungen/coronavirus.html/72-416-412-1379-6948"</string>
+    <string name="testlocation_url_canton_solothurn">"https://corona.so.ch/"</string>
+    <string name="testlocation_url_canton_thurgovia">"https://www.tg.ch/news/fachdossier-coronavirus.html/10552"</string>
+    <string name="testlocation_url_canton_ticino">"https://www4.ti.ch/dss/dsp/covid19/home/"</string>
+    <string name="testlocation_url_canton_uri">"https://www.ur.ch/themen/2962"</string>
+    <string name="testlocation_url_canton_valais">"https://www.vs.ch/web/coronavirus/"</string>
+    <string name="testlocation_url_canton_zug">"https://www.zg.ch/behoerden/gesundheitsdirektion/amt-fuer-gesundheit/corona"</string>
+    <string name="testlocation_url_canton_vaud">"https://www.vd.ch/toutes-les-actualites/hotline-et-informations-sur-le-coronavirus/"</string>
+
+    <!-- Fuzzy -->
+    <string name="testlocation_url_canton_zurich">"https://www.zh.ch/de/gesundheit/coronavirus.html"</string>
+    <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
+
+    <!-- text for info box pop up for the hearing impaired -->
+    <string name="hearing_impaired_info">"Are you deaf or hard of hearing and unable to call the coronavirus infoline on the phone?
 
 Send an email to covid-support@medgate.ch."</string>
 
-	<!-- Überschrift des Covidcodes-Statistik-Moduls -->
-	<string name="stats_covidcodes_title">"Covidcodes"</string>
+    <!-- Überschrift des Covidcodes-Statistik-Moduls -->
+    <string name="stats_covidcodes_title">"Covidcodes"</string>
 
-	<!-- Überschrift des Fallzahlen-Statistik Moduls -->
-	<string name="stats_cases_title">"Numbers of cases"</string>
+    <!-- Überschrift des Fallzahlen-Statistik Moduls -->
+    <string name="stats_cases_title">"Numbers of cases"</string>
 
-	<!-- Untertitel des Fallzahlen-Statistik-Moduls -->
-	<string name="stats_cases_subtitle">"Current development"</string>
+    <!-- Untertitel des Fallzahlen-Statistik-Moduls -->
+    <string name="stats_cases_subtitle">"Current development"</string>
 
-	<!-- Label der "Total eingegebene Covidcodes" Statistik -->
-	<string name="stats_covidcodes_total_label">"entered"</string>
+    <!-- Label der "Total eingegebene Covidcodes" Statistik -->
+    <string name="stats_covidcodes_total_label">"entered"</string>
 
-	<!-- Label der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
-	<string name="stats_covidcodes_0to2days_label">"within 0-2 days"</string>
+    <!-- Label der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
+    <string name="stats_covidcodes_0to2days_label">"within 0-2 days"</string>
 
-	<!-- Label der "7-Tage-Schnitt Fallzahlen" Statistik -->
-	<string name="stats_cases_7day_average_label">"7-day average"</string>
+    <!-- Label der "7-Tage-Schnitt Fallzahlen" Statistik -->
+    <string name="stats_cases_7day_average_label">"7-day average"</string>
 
-	<!-- Label der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
-	<string name="stats_cases_rel_prev_week_label">"vs previous week"</string>
+    <!-- Label der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
+    <string name="stats_cases_rel_prev_week_label">"vs previous week"</string>
 
-	<!-- Überschrift des Info-Popups auf dem Statistik-Screen -->
-	<string name="stats_info_popup_title">"Details on the figures"</string>
+    <!-- Überschrift des Info-Popups auf dem Statistik-Screen -->
+    <string name="stats_info_popup_title">"Details on the figures"</string>
 
-	<!-- Untertitel des Infopopups zu Covidcodes-Statistiken -->
-	<string name="stats_info_popup_subtitle_covidcodes">"Covidcodes entered"</string>
+    <!-- Untertitel des Infopopups zu Covidcodes-Statistiken -->
+    <string name="stats_info_popup_subtitle_covidcodes">"Covidcodes entered"</string>
 
-	<!-- Untertitel des Infopopups zu Fallzahlen-Statistiken -->
-	<string name="stats_info_popup_subtitle_cases">"Numbers of cases"</string>
+    <!-- Untertitel des Infopopups zu Fallzahlen-Statistiken -->
+    <string name="stats_info_popup_subtitle_cases">"Numbers of cases"</string>
 
-	<!-- Beschreibung der "Total eingegebene Covidcodes" Statistik -->
-	<string name="stats_covidcodes_total_description">"Number of Covidcodes entered since the launch of the SwissCovid app in June 2020. This is the number of people who have notified their contacts of possible infection via the app."</string>
+    <!-- Beschreibung der "Total eingegebene Covidcodes" Statistik -->
+    <string name="stats_covidcodes_total_description">"Number of Covidcodes entered since the launch of the SwissCovid app in June 2020. This is the number of people who have notified their contacts of possible infection via the app."</string>
 
-	<!-- Beschreibung der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
-	<string name="stats_covidcodes_0to2days_description">"The percentage of Covidcodes entered already in the first two days after onset of symptoms. This figure is for the last 7 days.
+    <!-- Beschreibung der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
+    <string name="stats_covidcodes_0to2days_description">"The percentage of Covidcodes entered already in the first two days after onset of symptoms. This figure is for the last 7 days.
 
 Time is a crucial factor when it comes to combating coronavirus: the shorter the time between the onset of symptoms, the result of the test and entering the Covidcode, the earlier alerted contacts can stay at home and protect other people."</string>
 
-	<!-- Beschreibung der "7-Tage-Schnitt Fallzahlen" Statistik -->
-	<string name="stats_cases_7day_average_description">"Shows the average number of reported new infections per day over 7 days."</string>
+    <!-- Beschreibung der "7-Tage-Schnitt Fallzahlen" Statistik -->
+    <string name="stats_cases_7day_average_description">"Shows the average number of reported new infections per day over 7 days."</string>
 
-	<!-- Beschreibung der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
-	<string name="stats_cases_rel_prev_week_description">"Shows the change in the 7-day average compared with the situation a week ago."</string>
+    <!-- Beschreibung der "Änderung gegenüber Vorwoche Fallzahlen" Statistik -->
+    <string name="stats_cases_rel_prev_week_description">"Shows the change in the 7-day average compared with the situation a week ago."</string>
 
-	<!-- Label der "Aktuelle Entwicklung" Statistik -->
-	<string name="stats_cases_current_label">"Current developments"</string>
+    <!-- Label der "Aktuelle Entwicklung" Statistik -->
+    <string name="stats_cases_current_label">"Current developments"</string>
 
-	<!-- Beschreibung der "Aktuelle Entwicklung" Statistik -->
-	<string name="stats_cases_current_description">"The chart shows new infections reported in the last 28 days. This gives an overview of current developments."</string>
+    <!-- Beschreibung der "Aktuelle Entwicklung" Statistik -->
+    <string name="stats_cases_current_description">"The chart shows new infections reported in the last 28 days. This gives an overview of current developments."</string>
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"Have you tested positive (PCR test or rapid antigen test) and did not receive a Covidcode after 4 hours?
 If so, contact the Coronavirus Infoline:"</string>
 
-	<!-- Inform Detail: Infobox Title -->
-	<string name="inform_detail_infobox1_title">"Don’t have a Covidcode yet?"</string>
+    <!-- Inform Detail: Infobox Title -->
+    <string name="inform_detail_infobox1_title">"Don’t have a Covidcode yet?"</string>
 
-	<!-- Titel des Popups mit der Frage, ob der User die Isolation beendet hat -->
-	<string name="homescreen_isolation_ended_popup_title">"Have you come out of isolation?"</string>
+    <!-- Titel des Popups mit der Frage, ob der User die Isolation beendet hat -->
+    <string name="homescreen_isolation_ended_popup_title">"Have you come out of isolation?"</string>
 
-	<!-- Text des Popups mit der Frage, ob der User die Isolation beendet hat -->
-	<string name="homescreen_isolation_ended_popup_text">"Tracing can be reactivated once you have completed your period of isolation."</string>
+    <!-- Text des Popups mit der Frage, ob der User die Isolation beendet hat -->
+    <string name="homescreen_isolation_ended_popup_text">"Tracing can be reactivated once you have completed your period of isolation."</string>
 
-	<!-- Ja-Antwort -->
-	<string name="answer_yes">"Yes"</string>
+    <!-- Ja-Antwort -->
+    <string name="answer_yes">"Yes"</string>
 
-	<!-- Nein-Antwort -->
-	<string name="answer_no">"No"</string>
+    <!-- Nein-Antwort -->
+    <string name="answer_no">"No"</string>
 
-	<!-- Text in der Infobox auf dem Reisen-Screen -->
-	<string name="travel_screen_info">"Travelling abroad? SwissCovid works in these countries."</string>
+    <!-- Text in der Infobox auf dem Reisen-Screen -->
+    <string name="travel_screen_info">"Travelling abroad? SwissCovid works in these countries."</string>
 
-	<!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
-	<string name="travel_screen_compatible_countries">"Compatible countries:"</string>
+    <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
+    <string name="travel_screen_compatible_countries">"Compatible countries:"</string>
 
-	<!-- Informieren Flow: Erster Screen Reise-Infotext -->
-	<string name="inform_code_travel_text">"To enable travellers from abroad to receive alerts as well, the private keys are also shared with the coronavirus apps in compatible countries."</string>
+    <!-- Informieren Flow: Erster Screen Reise-Infotext -->
+    <string name="inform_code_travel_text">"To enable travellers from abroad to receive alerts as well, the private keys are also shared with the coronavirus apps in compatible countries."</string>
 
-	<!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
-	<string name="stats_covidcodes_total_header">"Total"</string>
+    <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
+    <string name="stats_covidcodes_total_header">"Total"</string>
 
-	<!-- Überschrift der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
-	<string name="stats_covidcodes_0to2days_header">"Current"</string>
+    <!-- Überschrift der "Innert 0-2 Tagen eingegebene Covidcodes" Statistik -->
+    <string name="stats_covidcodes_0to2days_header">"Current"</string>
 
-	<!-- Überschrift im Popup für die "Veränderung zur Vorwoche" Statistik -->
-	<string name="stats_cases_rel_prev_week_popup_header">"Change versus previous week"</string>
+    <!-- Überschrift im Popup für die "Veränderung zur Vorwoche" Statistik -->
+    <string name="stats_cases_rel_prev_week_popup_header">"Change versus previous week"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Titel (Benachrichtigung) -->
     <string name="meldungen_positive_tested_faq2_title">"Who will be notified?"</string>
@@ -1422,17 +1422,20 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Update Boarding: Heading oben -->
     <string name="germany_update_boarding_heading">"SwissCovid update"</string>
 
-	<!-- Debug Screen: Update-Boarding Reset Button -->
-	<string name="reset_update_boarding">"Reset update boarding"</string>
+    <!-- Debug Screen: Update-Boarding Reset Button -->
+    <string name="reset_update_boarding">"Reset update boarding"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
     <string name="meldungen_detail_free_test_text">"A coronavirus test is advisable and recommended from the 5th day after the displayed contact date."</string>
 
-	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt in wievielen Tagen ein Test gemacht werden soll. -->
-	<string name="meldungen_detail_free_test_in_x_tagen">"In {COUNT} days"</string>
+    <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt in wievielen Tagen ein Test gemacht werden soll. -->
+    <string name="meldungen_detail_free_test_in_x_tagen">"In {COUNT} days"</string>
+
+    <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass jetzt ein Test gemacht werden soll. -->
+    <string name="meldungen_detail_free_test_now">"Now"</string>
 
-	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass jetzt ein Test gemacht werden soll. -->
-	<string name="meldungen_detail_free_test_now">"Now"</string>
+    <!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
+    <string name="meldungen_detail_free_test_tomorrow">"In 1 day"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
     <string name="checkout_reminder_title"></string>
@@ -1604,6 +1607,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="error_action_update"></string>
     <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
+    <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
     <string name="ongoing_notification_title"></string>
 
@@ -1644,9 +1648,30 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
     <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
-    <!-- Quick Action bei einer Reminder Notification, welche einen neuen Reminder setzt in 30 Minuten. -->
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-	<!-- Anzeige in der blauen Box im MeldungenDetail Screen, welche angibt dass in 1 Tag ein Test gemacht werden soll. -->
-	<string name="meldungen_detail_free_test_tomorrow"></string>
 
+    <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_title"></string>
+
+    <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
+    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+
+    <!-- Button text, um alle Checkins zu selektieren -->
+    <string name="inform_share_checkins_select_all"></string>
+    <string name="inform_dont_send_button_title"></string>
+    <string name="inform_try_again_button_title"></string>
+    <string name="inform_dont_share_button_title"></string>
+    <string name="inform_really_not_share_title"></string>
+    <string name="inform_really_not_share_subtitle"></string>
+
+    <!-- Remove from Diary Warning view title -->
+    <string name="remove_diary_warning_title"></string>
+
+    <!-- Remove from diary warning view explanation text -->
+    <string name="remove_diary_warning_text"></string>
+
+    <!-- Remove from diary warning view remove button title -->
+    <string name="remove_diary_remove_now_button"></string>
+
+    <!-- Remove from diary warning start text -->
+    <string name="remove_diary_warning_star_text"></string>
 </resources>
\ No newline at end of file

From 82fc60da83d3e770a5e3a3979346eba8a0130a68 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 11 May 2021 20:50:14 +0200
Subject: [PATCH 031/207] code cleanup, tag fix

---
 .../bag/dp3t/checkin/checkinflow/CheckOutFragment.java      | 4 ++--
 .../java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt   | 3 +--
 .../bag/dp3t/checkin/diary/EditDiaryEntryFragment.java      | 6 +++---
 .../bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java   | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index 60048a8d5..ffe61a47f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -29,9 +29,9 @@
 
 public class CheckOutFragment extends Fragment {
 
-	public final static String TAG = CheckOutFragment.class.getCanonicalName();
+	public static final String TAG = CheckOutFragment.class.getCanonicalName();
 
-	private final static long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
+	private static final long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
 
 	private CrowdNotifierViewModel viewModel;
 	private VenueInfo venueInfo;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 0c5a98420..6ac630f8a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -9,7 +9,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
-import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem
@@ -79,7 +78,7 @@ class DiaryFragment : Fragment() {
 			requireActivity().supportFragmentManager.beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 				.replace(R.id.main_fragment_container, EditDiaryEntryFragment.newInstance(diaryEntry.id))
-				.addToBackStack(CheckOutFragment::class.java.canonicalName)
+				.addToBackStack(EditDiaryEntryFragment.TAG)
 				.commit()
 		}
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
index eb847a346..cc36bb165 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
@@ -21,10 +21,10 @@
 
 public class EditDiaryEntryFragment extends Fragment {
 
-	public final static String TAG = EditDiaryEntryFragment.class.getCanonicalName();
+	public static final String TAG = EditDiaryEntryFragment.class.getCanonicalName();
 
-	private final static long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
-	private final static String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
+	private static final long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
+	private static final String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
 
 	private DiaryStorage diaryStorage;
 	private DiaryEntry diaryEntry;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
index 0a910cf4e..7b8a85d91 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
@@ -15,8 +15,8 @@
 
 public class HideInDiaryDialogFragment extends DialogFragment {
 
-	public final static String TAG = HideInDiaryDialogFragment.class.getCanonicalName();
-	private final static String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
+	public static final String TAG = HideInDiaryDialogFragment.class.getCanonicalName();
+	private static final String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
 
 	private DiaryStorage diaryStorage;
 	private DiaryEntry diaryEntry;

From 22cfe834d3107cd4f319f3b034a32cb3beebfaa5 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 11 May 2021 19:02:54 +0200
Subject: [PATCH 032/207] Home Screen UI Improvements

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  | 22 ++++++++++++++
 app/src/main/res/layout/card_checkin.xml      | 21 ++++++++-----
 .../main/res/layout/card_enter_covidcode.xml  | 30 +++++++++++++++++++
 app/src/main/res/layout/fragment_home.xml     |  8 ++++-
 app/src/main/res/values-bs/strings.xml        |  3 ++
 app/src/main/res/values-de/strings.xml        |  3 ++
 app/src/main/res/values-es/strings.xml        |  3 ++
 app/src/main/res/values-fr/strings.xml        |  3 ++
 app/src/main/res/values-hr/strings.xml        |  3 ++
 app/src/main/res/values-it/strings.xml        |  3 ++
 app/src/main/res/values-pt/strings.xml        |  3 ++
 app/src/main/res/values-rm/strings.xml        |  3 ++
 app/src/main/res/values-sq/strings.xml        |  3 ++
 app/src/main/res/values-sr/strings.xml        |  3 ++
 app/src/main/res/values-ti/strings.xml        |  3 ++
 app/src/main/res/values-tr/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  3 ++
 17 files changed, 112 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/layout/card_enter_covidcode.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 7bec4252e..0c73fac5b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -51,6 +51,7 @@
 import ch.admin.bag.dp3t.home.model.TracingState;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
 import ch.admin.bag.dp3t.home.views.HeaderView;
+import ch.admin.bag.dp3t.inform.InformActivity;
 import ch.admin.bag.dp3t.networking.models.InfoBoxModel;
 import ch.admin.bag.dp3t.networking.models.InfoBoxModelCollection;
 import ch.admin.bag.dp3t.reports.ReportsFragment;
@@ -77,6 +78,7 @@ public class HomeFragment extends Fragment {
 	private View reportErrorView;
 	private View checkinCard;
 	private View loadingView;
+	private View covidCodeCard;
 
 	private SecureStorage secureStorage;
 
@@ -115,6 +117,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		headerView = view.findViewById(R.id.home_header_view);
 		scrollView = view.findViewById(R.id.home_scroll_view);
 		loadingView = view.findViewById(R.id.loading_view);
+		covidCodeCard = view.findViewById(R.id.card_covidcode);
 
 		setupHeader();
 		setupInfobox();
@@ -123,6 +126,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		setupCheckinCard();
 		setupNonProductionHint();
 		setupScrollBehavior();
+		setupCovidCodeCard();
 
 		showEndIsolationDialogIfNecessary();
 	}
@@ -353,11 +357,13 @@ private void setupCheckinCard() {
 
 		View checkinView = checkinCard.findViewById(R.id.checkin_view);
 		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
+		TextView checkinVenueTitle = checkinCard.findViewById(R.id.checkin_venue_title);
 
 		crowdNotifierViewModel.isCheckedIn().observe(getViewLifecycleOwner(), isCheckedIn -> {
 			if (isCheckedIn) {
 				checkoutView.setVisibility(View.VISIBLE);
 				checkinView.setVisibility(View.GONE);
+				checkinVenueTitle.setText(crowdNotifierViewModel.getCheckInState().getVenueInfo().getTitle());
 				crowdNotifierViewModel.startCheckInTimer();
 			} else {
 				checkoutView.setVisibility(View.GONE);
@@ -373,6 +379,22 @@ private void setupCheckinCard() {
 				duration -> checkinTime.setText(StringUtil.getShortDurationString(duration)));
 	}
 
+	private void setupCovidCodeCard() {
+
+		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), (tracingStatusInterface) -> {
+			if (tracingStatusInterface.isReportedAsInfected()) {
+				covidCodeCard.setVisibility(View.GONE);
+			} else {
+				covidCodeCard.setVisibility(View.VISIBLE);
+			}
+		});
+
+		covidCodeCard.findViewById(R.id.enter_covidcode_button).setOnClickListener(v -> {
+			Intent intent = new Intent(getActivity(), InformActivity.class);
+			startActivity(intent);
+		});
+	}
+
 	private void showCheckOutFragment() {
 		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
index dd421f10e..ef3080f60 100644
--- a/app/src/main/res/layout/card_checkin.xml
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -74,21 +74,30 @@
 			android:visibility="visible">
 
 			<TextView
-				android:id="@+id/checkin_time"
-				style="@style/NextStep.Text.SplashTitle.Dark"
+				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_small"
 				android:gravity="center_horizontal"
-				tools:text="20:32" />
+				android:text="@string/checkin_checked_in" />
 
 			<TextView
-				style="@style/NextStep.Text"
+				android:id="@+id/checkin_venue_title"
+				style="@style/NextStep.Text.Bold"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_tiny_small"
 				android:gravity="center_horizontal"
-				android:text="[TBT] Sie sind eingecheckt." />
+				tools:text="Event name" />
+
+			<TextView
+				android:id="@+id/checkin_time"
+				style="@style/NextStep.Text.SplashTitle.Dark"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:gravity="center_horizontal"
+				tools:text="20:32" />
 
 			<Button
 				android:id="@+id/checkout_button"
@@ -96,8 +105,6 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginVertical="@dimen/spacing_medium_large"
-				android:drawableStart="@drawable/ic_qr"
-				android:drawableTint="@color/blue_main"
 				android:text="@string/checkout_button_title"
 				android:textAllCaps="false" />
 
diff --git a/app/src/main/res/layout/card_enter_covidcode.xml b/app/src/main/res/layout/card_enter_covidcode.xml
new file mode 100644
index 000000000..95ba33211
--- /dev/null
+++ b/app/src/main/res/layout/card_enter_covidcode.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/NextStep.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<LinearLayout
+		android:id="@+id/card_covidcode"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/spacing_medium_large"
+		android:orientation="vertical">
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/home_covidcode_card_title" />
+
+		<Button
+			android:id="@+id/enter_covidcode_button"
+			style="@style/NextStep.Button.Outlined.Purple"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_medium"
+			android:text="@string/inform_code_title" />
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 3698f92af..5d0caab71 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -50,6 +50,12 @@
 					android:visibility="gone"
 					tools:visibility="visible" />
 
+				<include
+					layout="@layout/card_notifications"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/spacing_medium_large" />
+
 				<include
 					layout="@layout/card_checkin"
 					android:layout_width="match_parent"
@@ -63,7 +69,7 @@
 					android:layout_marginBottom="@dimen/spacing_medium_large" />
 
 				<include
-					layout="@layout/card_notifications"
+					layout="@layout/card_enter_covidcode"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="@dimen/spacing_medium_large" />
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 6877d5508..90df366b2 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1651,4 +1651,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ed07d6cc4..6024a57d6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1716,4 +1716,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text">"Die App speichert diesen Eintrag noch für 14 Tage verschlüsselt im Hintergrund, damit Sie bei einer möglichen Ansteckung trotzdem gewarnt werden können."</string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Positiv getestet? Bitte geben Sie Ihren CovidCode ein um andere zu warnen."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2792da15f..3ef29b2b2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1642,4 +1642,7 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 96fd96b6b..cf71713c5 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1677,4 +1677,7 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 4fc2e48a6..237b448e8 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1647,4 +1647,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f2e2d4a08..6e5e249ca 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1685,4 +1685,7 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index cb200fb1a..b700732b9 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1652,4 +1652,7 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 088b461aa..5b16c3545 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1647,4 +1647,7 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 156f6af20..7c56fad91 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1652,4 +1652,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 20475ba02..a20dcbee7 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1647,4 +1647,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 7881310fc..3a07f02db 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1627,4 +1627,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 82a989383..1aa9c1963 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1629,4 +1629,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2c3b1c55f..02f5896c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1674,4 +1674,7 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
 </resources>
\ No newline at end of file

From 76d7cb854e269130a04d29b7be659dc6fd4bd827 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 11 May 2021 19:52:01 +0200
Subject: [PATCH 033/207] Implement Isolation Homescreen State

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  | 76 +++++++++++++++++--
 .../res/drawable/ic_illu_checkin_ended.xml    | 62 +++++++++++++++
 app/src/main/res/layout/card_checkin.xml      |  7 +-
 .../main/res/layout/card_enter_covidcode.xml  |  1 +
 app/src/main/res/values-bs/strings.xml        |  3 +
 app/src/main/res/values-de/strings.xml        |  3 +
 app/src/main/res/values-es/strings.xml        |  3 +
 app/src/main/res/values-fr/strings.xml        |  3 +
 app/src/main/res/values-hr/strings.xml        |  3 +
 app/src/main/res/values-it/strings.xml        |  3 +
 app/src/main/res/values-pt/strings.xml        |  3 +
 app/src/main/res/values-rm/strings.xml        |  3 +
 app/src/main/res/values-sq/strings.xml        |  3 +
 app/src/main/res/values-sr/strings.xml        |  3 +
 app/src/main/res/values-ti/strings.xml        |  3 +
 app/src/main/res/values-tr/strings.xml        |  3 +
 app/src/main/res/values/strings.xml           |  3 +
 17 files changed, 176 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_illu_checkin_ended.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 0c73fac5b..1dc521855 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -16,6 +16,7 @@
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -23,6 +24,7 @@
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ScrollView;
 import android.widget.TextView;
@@ -30,6 +32,8 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -353,12 +357,51 @@ private boolean isNotificationChannelEnabled(Context context, @Nullable String c
 
 	private void setupCheckinCard() {
 
+		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
+			if (tracingStatusInterface.isReportedAsInfected()) {
+				setupCheckinCardIsolationMode();
+			} else {
+				setupCheckinCardNonIsolationMode();
+			}
+		});
+	}
+
+	private void setupCheckinCardIsolationMode() {
+		checkinCard.setOnClickListener(null);
+		checkinCard.setClickable(false);
+		View checkinView = checkinCard.findViewById(R.id.checkin_view);
+		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
+		View isolationView = checkinCard.findViewById(R.id.isolation_view);
+
+		checkinView.setVisibility(View.GONE);
+		checkoutView.setVisibility(View.GONE);
+		isolationView.setVisibility(View.VISIBLE);
+
+		TextView title = checkinCard.findViewById(R.id.status_title);
+		title.setTextColor(ResourcesCompat.getColor(getResources(), R.color.purple_main, null));
+		title.setText(R.string.checkin_ended_title);
+
+		TextView subtitle = checkinCard.findViewById(R.id.status_text);
+		subtitle.setTextColor(ResourcesCompat.getColor(getResources(), R.color.purple_main, null));
+		subtitle.setText(R.string.checkin_ended_text);
+
+		checkinCard.findViewById(R.id.status_background)
+				.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.status_purple_bg)));
+
+		((ImageView) checkinCard.findViewById(R.id.status_icon)).setImageResource(R.drawable.ic_stopp);
+
+		((ImageView) checkinCard.findViewById(R.id.status_illustration)).setImageResource(R.drawable.ic_illu_checkin_ended);
+	}
+
+	private void setupCheckinCardNonIsolationMode() {
 		checkinCard.setOnClickListener(v -> showCheckinOverviewFragment());
 
 		View checkinView = checkinCard.findViewById(R.id.checkin_view);
 		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
+		View isolationView = checkinCard.findViewById(R.id.isolation_view);
 		TextView checkinVenueTitle = checkinCard.findViewById(R.id.checkin_venue_title);
 
+		isolationView.setVisibility(View.GONE);
 		crowdNotifierViewModel.isCheckedIn().observe(getViewLifecycleOwner(), isCheckedIn -> {
 			if (isCheckedIn) {
 				checkoutView.setVisibility(View.VISIBLE);
@@ -380,19 +423,36 @@ private void setupCheckinCard() {
 	}
 
 	private void setupCovidCodeCard() {
+		Button covidCodeButton = covidCodeCard.findViewById(R.id.enter_covidcode_button);
+		TextView covidCodeText = covidCodeCard.findViewById(R.id.enter_covidcode_text);
 
-		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), (tracingStatusInterface) -> {
+		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
 			if (tracingStatusInterface.isReportedAsInfected()) {
-				covidCodeCard.setVisibility(View.GONE);
+				covidCodeButton.setText(R.string.delete_infection_button);
+				covidCodeText.setText(R.string.home_end_isolation_card_title);
+				covidCodeButton.setOnClickListener(v -> {
+					AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle);
+					builder.setMessage(R.string.delete_infection_dialog)
+							.setPositiveButton(R.string.delete_infection_dialog_finish_button, (dialog, id) -> {
+								tracingStatusInterface.resetInfectionStatus(getContext());
+								secureStorage.setIsolationEndDialogTimestamp(-1L);
+								secureStorage.setPositiveReportOldestSharedKey(-1L);
+							})
+							.setNegativeButton(R.string.cancel, (dialog, id) -> {
+								//do nothing
+							});
+					builder.create();
+					builder.show();
+				});
 			} else {
-				covidCodeCard.setVisibility(View.VISIBLE);
+				covidCodeButton.setText(R.string.inform_code_title);
+				covidCodeText.setText(R.string.home_covidcode_card_title);
+				covidCodeButton.setOnClickListener(v -> {
+					Intent intent = new Intent(getActivity(), InformActivity.class);
+					startActivity(intent);
+				});
 			}
 		});
-
-		covidCodeCard.findViewById(R.id.enter_covidcode_button).setOnClickListener(v -> {
-			Intent intent = new Intent(getActivity(), InformActivity.class);
-			startActivity(intent);
-		});
 	}
 
 	private void showCheckOutFragment() {
diff --git a/app/src/main/res/drawable/ic_illu_checkin_ended.xml b/app/src/main/res/drawable/ic_illu_checkin_ended.xml
new file mode 100644
index 000000000..2b762a497
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illu_checkin_ended.xml
@@ -0,0 +1,62 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="110dp"
+    android:viewportWidth="80"
+    android:viewportHeight="110">
+  <path
+      android:pathData="M9,98a31,3 0,1 0,62 0a31,3 0,1 0,-62 0z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#8D6A9F"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.4"/>
+  <path
+      android:pathData="M62.003,20.643L62.654,20.643A0.346,0.346 0,0 1,63 20.989L63,31.328A0.346,0.346 0,0 1,62.654 31.674L62.003,31.674A0.346,0.346 0,0 1,61.657 31.328L61.657,20.989A0.346,0.346 0,0 1,62.003 20.643z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M17.373,12.001L17.681,12.001A0.346,0.346 0,0 1,18.027 12.347L18.027,15.287A0.346,0.346 0,0 1,17.681 15.633L17.373,15.633A0.346,0.346 0,0 1,17.027 15.287L17.027,12.347A0.346,0.346 0,0 1,17.373 12.001z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M17.346,18.65L17.654,18.65A0.346,0.346 0,0 1,18 18.996L18,24.625A0.346,0.346 0,0 1,17.654 24.971L17.346,24.971A0.346,0.346 0,0 1,17 24.625L17,18.996A0.346,0.346 0,0 1,17.346 18.65z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M17.36,27.183L17.668,27.183A0.346,0.346 0,0 1,18.014 27.529L18.014,33.212A0.346,0.346 0,0 1,17.668 33.558L17.36,33.558A0.346,0.346 0,0 1,17.014 33.212L17.014,27.529A0.346,0.346 0,0 1,17.36 27.183z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M23.346,0L56.491,0A5.891,5.891 0,0 1,62.382 5.891L62.382,85.109A5.891,5.891 0,0 1,56.491 91L23.346,91A5.891,5.891 0,0 1,17.455 85.109L17.455,5.891A5.891,5.891 0,0 1,23.346 0z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M36.17,2.718L41.274,2.718A0.585,0.585 0,0 1,41.859 3.303L41.859,3.402A0.585,0.585 0,0 1,41.274 3.987L36.17,3.987A0.585,0.585 0,0 1,35.585 3.402L35.585,3.303A0.585,0.585 0,0 1,36.17 2.718z"
+      android:fillColor="#E6E8EC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M43.529,3.352m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#E6E8EC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M56.24,2.452L51.1,2.452v0.618c0,1.617 -1.315,2.927 -2.937,2.927L31.766,5.997c-1.622,0 -2.937,-1.31 -2.937,-2.927v-0.618L24.003,2.452c-0.946,0 -1.854,0.374 -2.523,1.041 -0.669,0.667 -1.044,1.572 -1.044,2.515v79.147c0,0.943 0.375,1.848 1.044,2.515 0.67,0.667 1.577,1.041 2.523,1.041L56.24,88.711c1.97,0 3.568,-1.592 3.568,-3.556L59.808,6.008c0,-1.964 -1.598,-3.556 -3.568,-3.556z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M23.725,45.881a16.432,16.377 0,1 0,32.864 0a16.432,16.377 0,1 0,-32.864 0z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M38.914,46.958v8.904L29.979,55.862v-8.904h8.935zM42.975,52.624v1.618l6.498,0.001v1.62h-8.122v-3.239h1.624zM37.289,48.576L31.604,48.576v5.666h5.685v-5.666zM42.975,46.958v2.428h1.624v-2.428h4.874v5.666h-1.625v-4.048h-1.625l0.001,2.43h-4.873v-4.048h1.624zM35.665,50.196v2.428L33.228,52.624v-2.428h2.437zM38.914,36.434v8.905L29.979,45.339L29.979,36.434h8.935zM49.473,36.434v8.905h-8.935L40.538,36.434h8.935zM37.289,38.054L31.604,38.054v5.665h5.685L37.289,38.053zM47.848,38.054h-5.685v5.665h5.685L47.848,38.053zM35.665,39.671L35.665,42.101L33.228,42.101L33.228,39.671h2.437zM46.224,39.671L46.224,42.101h-2.437L43.787,39.671L46.225,39.671z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M25.253,32.986L52.356,60.088 50.873,61.571 23.77,34.468z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M30.291,34.217L51.203,55.129 49.225,57.107 28.313,36.195z"
+      android:fillColor="#7E5F8E"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
index ef3080f60..1378cd75d 100644
--- a/app/src/main/res/layout/card_checkin.xml
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -60,7 +60,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginVertical="@dimen/spacing_medium_large"
-				android:drawableStart="@drawable/ic_qr"
+				android:drawableEnd="@drawable/ic_qr"
 				android:text="@string/scan_qr_code_button_title" />
 
 		</LinearLayout>
@@ -110,6 +110,11 @@
 
 		</LinearLayout>
 
+		<include
+			android:id="@+id/isolation_view"
+			layout="@layout/layout_status"
+			android:visibility="gone" />
+
 	</LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/card_enter_covidcode.xml b/app/src/main/res/layout/card_enter_covidcode.xml
index 95ba33211..79b210a4b 100644
--- a/app/src/main/res/layout/card_enter_covidcode.xml
+++ b/app/src/main/res/layout/card_enter_covidcode.xml
@@ -12,6 +12,7 @@
 		android:orientation="vertical">
 
 		<TextView
+			android:id="@+id/enter_covidcode_text"
 			style="@style/NextStep.Text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 90df366b2..f75693c07 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1654,4 +1654,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6024a57d6..1df5d516d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1719,4 +1719,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Positiv getestet? Bitte geben Sie Ihren CovidCode ein um andere zu warnen."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"Sie sind im Isolations-Modus weil Sie positiv getestet wurden."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3ef29b2b2..4bc6d345a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1645,4 +1645,7 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cf71713c5..a44252711 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1680,4 +1680,7 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 237b448e8..98b7a038f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1650,4 +1650,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6e5e249ca..d7f3af234 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1688,4 +1688,7 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b700732b9..9a29096af 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1655,4 +1655,7 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 5b16c3545..eab41c2a5 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1650,4 +1650,7 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 7c56fad91..fe242c3ff 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1655,4 +1655,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a20dcbee7..526d8ad59 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1650,4 +1650,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 3a07f02db..d06e1a4bb 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1630,4 +1630,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1aa9c1963..6f122ba10 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1632,4 +1632,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02f5896c4..9ca7ca181 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1677,4 +1677,7 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+
+    <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
 </resources>
\ No newline at end of file

From f563b886cf481b28abaa0bcc48af2b0fb52c703c Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 12 May 2021 09:21:37 +0200
Subject: [PATCH 034/207] Make Diary accessible during Isolation

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  7 ++++
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  3 +-
 .../res/layout/fragment_checkin_overview.xml  | 36 +++++++++++++++++++
 app/src/main/res/values-bs/strings.xml        |  6 ++++
 app/src/main/res/values-de/strings.xml        |  6 ++++
 app/src/main/res/values-es/strings.xml        |  6 ++++
 app/src/main/res/values-fr/strings.xml        |  6 ++++
 app/src/main/res/values-hr/strings.xml        |  6 ++++
 app/src/main/res/values-it/strings.xml        |  6 ++++
 app/src/main/res/values-pt/strings.xml        |  6 ++++
 app/src/main/res/values-rm/strings.xml        |  6 ++++
 app/src/main/res/values-sq/strings.xml        |  6 ++++
 app/src/main/res/values-sr/strings.xml        |  6 ++++
 app/src/main/res/values-ti/strings.xml        |  6 ++++
 app/src/main/res/values-tr/strings.xml        |  6 ++++
 app/src/main/res/values/strings.xml           |  6 ++++
 16 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 8678efffb..a59a4a587 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -16,6 +16,7 @@ import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 
 class CheckinOverviewFragment : Fragment() {
 
@@ -27,6 +28,7 @@ class CheckinOverviewFragment : Fragment() {
 	}
 
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
+	private val tracingViewModel: TracingViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return FragmentCheckinOverviewBinding.inflate(layoutInflater).apply {
@@ -34,6 +36,11 @@ class CheckinOverviewFragment : Fragment() {
 
 			checkinOverviewDiary.setOnClickListener { authenticateAndShowDiary() }
 
+			tracingViewModel.appStatusLiveData.observe(viewLifecycleOwner) {
+				checkinOverviewIsolation.isVisible = it.isReportedAsInfected
+				checkinOverviewScanQr.isVisible = !it.isReportedAsInfected
+			}
+
 			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner, { isCheckedIn ->
 				checkoutView.isVisible = isCheckedIn
 				checkinView.isVisible = !isCheckedIn
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 1dc521855..4ea8c6332 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -367,8 +367,7 @@ private void setupCheckinCard() {
 	}
 
 	private void setupCheckinCardIsolationMode() {
-		checkinCard.setOnClickListener(null);
-		checkinCard.setClickable(false);
+		checkinCard.setOnClickListener(v -> showCheckinOverviewFragment());
 		View checkinView = checkinCard.findViewById(R.id.checkin_view);
 		View checkoutView = checkinCard.findViewById(R.id.checkout_view);
 		View isolationView = checkinCard.findViewById(R.id.isolation_view);
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index e8a40485b..0de1edca1 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -145,6 +145,42 @@
 
 			</androidx.cardview.widget.CardView>
 
+			<androidx.cardview.widget.CardView
+				android:id="@+id/checkin_overview_isolation"
+				style="@style/NextStep.Card"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium_large"
+				android:layout_marginEnd="@dimen/spacing_medium_large"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:visibility="gone">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:foreground="?selectableItemBackground"
+					android:orientation="vertical">
+
+					<ImageView
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal"
+						android:layout_marginVertical="@dimen/spacing_large"
+						android:src="@drawable/ic_illu_checkin_ended" />
+
+					<TextView
+						style="@style/NextStep.Text"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginHorizontal="@dimen/spacing_larger"
+						android:layout_marginBottom="@dimen/spacing_large"
+						android:gravity="center_horizontal"
+						android:text="@string/checkin_overview_isolation_text" />
+
+				</LinearLayout>
+
+			</androidx.cardview.widget.CardView>
+
 			<androidx.cardview.widget.CardView
 				android:id="@+id/checkin_overview_diary"
 				style="@style/NextStep.Card"
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index f75693c07..bd55e69c1 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1657,4 +1657,10 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1df5d516d..6b27303b4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1722,4 +1722,10 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"Sie sind im Isolations-Modus weil Sie positiv getestet wurden."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"Sie können nicht mehr einchecken, wenn Sie positiv getestet wurden."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4bc6d345a..d448f034c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1648,4 +1648,10 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a44252711..64e8f9991 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1683,4 +1683,10 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 98b7a038f..7e113ce91 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1653,4 +1653,10 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d7f3af234..293d522d6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1691,4 +1691,10 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 9a29096af..7d4905acb 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1658,4 +1658,10 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index eab41c2a5..b5a810982 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1653,4 +1653,10 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index fe242c3ff..708f63b9e 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1658,4 +1658,10 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 526d8ad59..f632c61fb 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1653,4 +1653,10 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index d06e1a4bb..e23e5e813 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1633,4 +1633,10 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6f122ba10..160b07352 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1635,4 +1635,10 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ca7ca181..5eb7e7e86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1680,4 +1680,10 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+
+    <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
+    <string name="reminder_option_hours_minutes"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
+    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 </resources>
\ No newline at end of file

From 75782becd82d3857527f8e3efd9d28382afdfb23 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 11 May 2021 17:56:35 +0200
Subject: [PATCH 035/207] Use Reminder Config from QR Code

---
 .../java/ch/admin/bag/dp3t/MainActivity.java  |   3 +-
 .../dp3t/checkin/CrowdNotifierViewModel.java  |   9 +-
 .../checkin/checkinflow/CheckInFragment.java  | 106 ------------------
 .../checkin/checkinflow/CheckInFragment.kt    |  95 ++++++++++++++++
 .../checkinflow/QrCodeScannerFragment.java    |   4 +-
 .../checkin/generateqrcode/QRCodeViewModel.kt |   3 +-
 .../checkin/generateqrcode/QrCodeFragment.kt  |   3 +-
 .../bag/dp3t/checkin/models/CheckInState.java |  14 +--
 .../dp3t/checkin/models/ReminderOption.java   |  68 -----------
 .../bag/dp3t/checkin/models/ReminderOption.kt |  36 ++++++
 .../startup/BootCompletedReceiver.java        |  41 -------
 .../checkin/startup/BootCompletedReceiver.kt  |  32 ++++++
 .../utils/CrowdNotifierReminderHelper.java    |  32 +++---
 .../dp3t/checkin/utils/VenueInfoExtensions.kt |   9 ++
 app/src/main/res/layout/fragment_check_in.xml |  40 +------
 .../main/res/values/crowdnotifier_styles.xml  |   3 +-
 16 files changed, 213 insertions(+), 285 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index a7f54f5c0..010f2d589 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -36,7 +36,6 @@
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.checkin.models.ReminderOption;
 import ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker;
 import ch.admin.bag.dp3t.checkin.utils.ErrorDialog;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
@@ -218,7 +217,7 @@ private void checkValidCheckInIntent() {
 				new ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show();
 			} else {
 				crowdNotifierViewModel.setCheckInState(new CheckInState(false, venueInfo, System.currentTimeMillis(),
-						System.currentTimeMillis(), ReminderOption.OFF));
+						System.currentTimeMillis(), 0));
 				showCheckInScreen();
 			}
 		} catch (QrUtils.QRException e) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 4139bd8d5..0a167e36d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -24,7 +24,6 @@
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.checkin.models.ReminderOption;
 
 import static ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_EXPOSURE_NOTIFICATION;
 import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
@@ -175,12 +174,12 @@ public ExposureEvent getExposureWithId(long id) {
 		return null;
 	}
 
-	public ReminderOption getSelectedReminderOption() {
-		return checkInState.getSelectedTimerOption();
+	public long getSelectedReminderDelay() {
+		return checkInState.getSelectedReminderDelay();
 	}
 
-	public void setSelectedReminderOption(ReminderOption selectedReminderOption) {
-		this.checkInState.setSelectedTimerOption(selectedReminderOption);
+	public void setSelectedReminderDelay(long selectedReminderDelay) {
+		this.checkInState.setSelectedTimerOption(selectedReminderDelay);
 		storage.setCheckInState(checkInState);
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
deleted file mode 100644
index 8ffc3ceae..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package ch.admin.bag.dp3t.checkin.checkinflow;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.button.MaterialButtonToggleGroup;
-
-import org.crowdnotifier.android.sdk.model.VenueInfo;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
-import ch.admin.bag.dp3t.checkin.models.ReminderOption;
-import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
-import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
-import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
-
-public class CheckInFragment extends Fragment {
-
-	public static final String TAG = CheckInFragment.class.getCanonicalName();
-
-	private CrowdNotifierViewModel viewModel;
-	private VenueInfo venueInfo;
-
-	public CheckInFragment() { super(R.layout.fragment_check_in); }
-
-	public static CheckInFragment newInstance() {
-		return new CheckInFragment();
-	}
-
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		viewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
-		if (viewModel.getCheckInState() != null) {
-			venueInfo = viewModel.getCheckInState().getVenueInfo();
-		}
-		checkIfAutoCheckoutHappened();
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		checkIfAutoCheckoutHappened();
-	}
-
-	private void checkIfAutoCheckoutHappened() {
-		if (viewModel.getCheckInState() == null) {
-			popBackToHomeFragment();
-		}
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		TextView titleTextView = view.findViewById(R.id.check_in_fragment_title);
-		TextView subtitleTextView = view.findViewById(R.id.check_in_fragment_subtitle);
-		View checkInButton = view.findViewById(R.id.check_in_fragment_check_in_button);
-		Toolbar toolbar = view.findViewById(R.id.check_in_fragment_toolbar);
-		MaterialButtonToggleGroup toggleGroup = view.findViewById(R.id.check_in_fragment_toggle_group);
-
-		titleTextView.setText(venueInfo.getTitle());
-		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
-
-		checkInButton.setOnClickListener(v -> {
-			long checkInTime = System.currentTimeMillis();
-			viewModel.startCheckInTimer();
-			viewModel.setCheckedIn(true);
-			viewModel.getCheckInState().setCheckInTime(checkInTime);
-			NotificationHelper.getInstance(getContext()).startOngoingNotification(checkInTime, venueInfo);
-			CrowdNotifierReminderHelper.set8HourReminder(checkInTime, getContext());
-			CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, getContext());
-			CrowdNotifierReminderHelper
-					.setReminder(checkInTime + viewModel.getSelectedReminderOption().getDelayMillis(), getContext());
-			popBackToHomeFragment();
-		});
-
-		for (ReminderOption option : ReminderOption.values()) {
-			((MaterialButton) view.findViewById(option.getToggleButtonId())).setText(option.getName(getContext()));
-		}
-		toggleGroup.check(viewModel.getSelectedReminderOption().getToggleButtonId());
-		toggleGroup.addOnButtonCheckedListener((group, checkedId, isChecked) -> {
-			if (isChecked) {
-				ReminderOption selectedReminderOption = ReminderOption.getReminderOptionForToggleButtonId(checkedId);
-				viewModel.setSelectedReminderOption(selectedReminderOption);
-			}
-		});
-
-		toolbar.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
-
-		super.onViewCreated(view, savedInstanceState);
-	}
-
-	private void popBackToHomeFragment() {
-		requireActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
new file mode 100644
index 000000000..03b8970d7
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -0,0 +1,95 @@
+package ch.admin.bag.dp3t.checkin.checkinflow
+
+import android.os.Bundle
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.LinearLayout
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.models.ReminderOption
+import ch.admin.bag.dp3t.checkin.utils.*
+import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
+import com.google.android.material.button.MaterialButton
+
+class CheckInFragment : Fragment() {
+
+	companion object {
+		val TAG = CheckInFragment::class.java.canonicalName
+
+		@JvmStatic
+		fun newInstance(): CheckInFragment {
+			return CheckInFragment()
+		}
+	}
+
+	private val viewModel: CrowdNotifierViewModel by activityViewModels()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		checkIfAutoCheckoutHappened()
+	}
+
+	override fun onStart() {
+		super.onStart()
+		checkIfAutoCheckoutHappened()
+	}
+
+	private fun checkIfAutoCheckoutHappened() {
+		if (viewModel.checkInState == null) {
+			popBackToHomeFragment()
+		}
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return FragmentCheckInBinding.inflate(inflater).apply {
+			val venueInfo = viewModel.checkInState?.venueInfo ?: return root
+
+			titleTextview.text = venueInfo.title
+			subtitleTextview.text = venueInfo.getSubtitle()
+			checkInButton.setOnClickListener {
+				val checkInTime = System.currentTimeMillis()
+				viewModel.startCheckInTimer()
+				viewModel.setCheckedIn(true)
+				viewModel.checkInState.checkInTime = checkInTime
+				NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, venueInfo)
+				CrowdNotifierReminderHelper.setCheckoutWarning(checkInTime, venueInfo.getCheckoutWarningDelay(), context)
+				CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, venueInfo.getAutoCheckoutDelay(), context)
+				CrowdNotifierReminderHelper.setReminder(checkInTime + viewModel.selectedReminderDelay, context)
+				popBackToHomeFragment()
+			}
+
+			reminderToggleGroup.removeAllViews()
+			val reminderOptions = venueInfo.getReminderDelayOptions().toMutableList()
+			reminderOptions.add(0, ReminderOption(0L))
+			for (option in reminderOptions) {
+				val toggleButton =
+					MaterialButton(ContextThemeWrapper(requireContext(), R.style.CrowdNotifier_ToggleButton), null, 0)
+				toggleButton.text = option.getDisplayString(requireContext())
+				toggleButton.tag = option.delayMillis
+				reminderToggleGroup.addView(toggleButton, LinearLayout.LayoutParams(0, WRAP_CONTENT, 1f))
+				if (viewModel.selectedReminderDelay == option.delayMillis) {
+					reminderToggleGroup.check(toggleButton.id)
+				}
+			}
+
+			reminderToggleGroup.addOnButtonCheckedListener { toggleGroup, checkedId, isChecked ->
+				if (isChecked) {
+					viewModel.selectedReminderDelay = toggleGroup.findViewById<View>(checkedId).tag as Long
+				}
+			}
+
+			toolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+		}.root
+	}
+
+	private fun popBackToHomeFragment() {
+		requireActivity().supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 6b2a768ef..588569735 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -42,7 +42,6 @@
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.checkin.models.ReminderOption;
 import ch.admin.bag.dp3t.checkin.utils.ErrorDialog;
 import ch.admin.bag.dp3t.checkin.utils.ErrorHelper;
 
@@ -190,8 +189,7 @@ public synchronized void onQRCodeFound(String qrCodeData) {
 			VenueInfo venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX);
 			isQRScanningEnabled = false;
 			if (getActivity() != null) getActivity().runOnUiThread(() -> viewModel.setCheckInState(
-					new CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(),
-							ReminderOption.OFF)));
+					new CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)));
 			showCheckInFragment();
 			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.VALID));
 		} catch (QrUtils.QRException e) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index ba1d62d32..5ed49d8d1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -35,7 +35,8 @@ private const val AUTOMATIC_CHECKOUT_DELAY_MS = 12 * ONE_HOUR_IN_MILLIS
 private const val CHECKOUT_WARNING_DELAY_MS = 8 * ONE_HOUR_IN_MILLIS
 private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
 private const val QR_CODE_VALIDITY_DURATION_MS = 10 * 365 * 24 * ONE_HOUR_IN_MILLIS // 10 years
-private val REMINDER_DELAY_OPTIONS_MS = listOf(30, 60, 120, 240).map { it * ONE_HOUR_IN_MILLIS } // 30, 60, 120 and 240 minutes
+private val REMINDER_DELAY_OPTIONS_MS =
+	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120, 240).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, 120 and 240 minutes
 private const val QR_CODE_PIXEL_SIZE = 1000
 const val QR_CODE_PDF_FILE_NAME = "swisscovid-qr-code.pdf"
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 348a37bd1..734ecaab9 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -19,7 +19,6 @@ import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
-import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
 import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
@@ -73,7 +72,7 @@ class QrCodeFragment : Fragment() {
 			}
 			checkinButton.setOnClickListener {
 				crowdNotifierViewModel.checkInState =
-					CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), ReminderOption.OFF)
+					CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
 				showCheckInFragment()
 			}
 		}.root
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
index 1aef35468..a44772b82 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
@@ -7,15 +7,15 @@ public class CheckInState {
 	private VenueInfo venueInfo;
 	private long checkInTime;
 	private long checkOutTime;
-	ReminderOption selectedTimerOption;
+	long selectedReminderDelay;
 
 	public CheckInState(boolean isCheckedIn, VenueInfo venueInfo, long checkInTime, long checkOutTime,
-			ReminderOption selectedTimerOption) {
+			long selectedReminderDelay) {
 		this.isCheckedIn = isCheckedIn;
 		this.venueInfo = venueInfo;
 		this.checkInTime = checkInTime;
 		this.checkOutTime = checkOutTime;
-		this.selectedTimerOption = selectedTimerOption;
+		this.selectedReminderDelay = selectedReminderDelay;
 	}
 
 	public boolean isCheckedIn() {
@@ -34,8 +34,8 @@ public long getCheckOutTime() {
 		return checkOutTime;
 	}
 
-	public ReminderOption getSelectedTimerOption() {
-		return selectedTimerOption;
+	public long getSelectedReminderDelay() {
+		return selectedReminderDelay;
 	}
 
 	public void setCheckedIn(boolean checkedIn) {
@@ -50,8 +50,8 @@ public void setCheckOutTime(long checkOutTime) {
 		this.checkOutTime = checkOutTime;
 	}
 
-	public void setSelectedTimerOption(ReminderOption selectedTimerOption) {
-		this.selectedTimerOption = selectedTimerOption;
+	public void setSelectedTimerOption(long selectedReminderDelay) {
+		this.selectedReminderDelay = selectedReminderDelay;
 	}
 
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
deleted file mode 100644
index d42decc86..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package ch.admin.bag.dp3t.checkin.models;
-
-import android.content.Context;
-import androidx.annotation.IdRes;
-
-import ch.admin.bag.dp3t.BuildConfig;
-import ch.admin.bag.dp3t.R;
-
-public enum ReminderOption {
-
-	OFF(0, R.id.check_in_fragment_toggle_button_1),
-	THIRTY_MINUTES(BuildConfig.FLAVOR.equals("dev") ? 1 : 30, R.id.check_in_fragment_toggle_button_2),
-	ONE_HOUR(60, R.id.check_in_fragment_toggle_button_3),
-	TWO_HOURS(120, R.id.check_in_fragment_toggle_button_4),
-	FOUR_HOURS(240, R.id.check_in_fragment_toggle_button_5);
-
-	private static final long MINUTE_IN_MILLIS = 60 * 1000L;
-
-	private int delayMinutes;
-	@IdRes private int toggleButtonId;
-	private String name;
-
-	ReminderOption(int delayMinutes, @IdRes int toggleButtonId) {
-		this.delayMinutes = delayMinutes;
-		this.toggleButtonId = toggleButtonId;
-		this.name = name;
-	}
-
-	public int getToggleButtonId() {
-		return toggleButtonId;
-	}
-
-	public int getDelayMinutes() {
-		return delayMinutes;
-	}
-
-	public long getDelayMillis() {
-		return delayMinutes * MINUTE_IN_MILLIS;
-	}
-
-	public int getDelayHours() {
-		return delayMinutes / 60;
-	}
-
-	public String getName(Context context) {
-		switch (this) {
-			case THIRTY_MINUTES:
-				return context.getString(R.string.reminder_option_minutes).replace("{MINUTES}", String.valueOf(getDelayMinutes()));
-			case OFF:
-				return context.getString(R.string.reminder_option_off);
-			default:
-				return context.getString(R.string.reminder_option_hours).replace("{HOURS}", String.valueOf(getDelayHours()));
-		}
-	}
-
-	public static ReminderOption getReminderOptionForToggleButtonId(@IdRes int toggleButtonId) {
-		switch (toggleButtonId) {
-			case R.id.check_in_fragment_toggle_button_2:
-				return THIRTY_MINUTES;
-			case R.id.check_in_fragment_toggle_button_3:
-				return ONE_HOUR;
-			case R.id.check_in_fragment_toggle_button_4:
-				return TWO_HOURS;
-			default:
-				return OFF;
-		}
-	}
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
new file mode 100644
index 000000000..f75dcb8ef
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
@@ -0,0 +1,36 @@
+package ch.admin.bag.dp3t.checkin.models
+
+import android.content.Context
+import ch.admin.bag.dp3t.R
+import java.util.concurrent.TimeUnit
+
+class ReminderOption(val delayMillis: Long) {
+
+	fun getDisplayString(context: Context): String {
+		return when {
+			delayMillis < TimeUnit.MINUTES.toMillis(1) -> context.getString(R.string.reminder_option_off)
+			delayMillis < TimeUnit.HOURS.toMillis(1) -> {
+				val minutes = TimeUnit.MILLISECONDS.toMinutes(delayMillis)
+				minutes.toMinutesString(context)
+			}
+			else -> {
+				val hours = TimeUnit.MILLISECONDS.toHours(delayMillis)
+				val minutes = TimeUnit.MILLISECONDS.toMinutes(delayMillis) - TimeUnit.HOURS.toMinutes(hours)
+				if (minutes > 0L) {
+					"${hours.toHoursString(context)} ${minutes.toMinutesString(context)}"
+				} else {
+					hours.toHoursString(context)
+				}
+			}
+		}
+	}
+
+	private fun Long.toHoursString(context: Context): String {
+		return context.getString(R.string.reminder_option_hours).replace("{HOURS}", this.toString())
+	}
+
+	private fun Long.toMinutesString(context: Context): String {
+		return context.getString(R.string.reminder_option_minutes).replace("{MINUTES}", this.toString())
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java
deleted file mode 100644
index ff612451d..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package ch.admin.bag.dp3t.checkin.startup;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
-import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
-import ch.admin.bag.dp3t.checkin.models.CheckInState;
-
-public class BootCompletedReceiver extends BroadcastReceiver {
-
-	@Override
-	public void onReceive(Context context, Intent intent) {
-		if (!Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-			return;
-		}
-
-		invalidateCheckIn(context);
-	}
-
-	private void invalidateCheckIn(Context context) {
-		SecureStorage storage = SecureStorage.getInstance(context);
-		CheckInState checkInState = storage.getCheckInState();
-		if (checkInState == null) {
-			return;
-		}
-
-		boolean checkedOut = CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
-
-		if (!checkedOut) {
-			long checkInTime = checkInState.getCheckInTime();
-			NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, checkInState.getVenueInfo());
-			CrowdNotifierReminderHelper.set8HourReminder(checkInTime, context);
-			CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, context);
-			CrowdNotifierReminderHelper.setReminder(checkInTime + checkInState.getSelectedTimerOption().getDelayMillis(), context);
-		}
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt
new file mode 100644
index 000000000..82173ec81
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt
@@ -0,0 +1,32 @@
+package ch.admin.bag.dp3t.checkin.startup
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
+import ch.admin.bag.dp3t.checkin.utils.getAutoCheckoutDelay
+import ch.admin.bag.dp3t.checkin.utils.getCheckoutWarningDelay
+import ch.admin.bag.dp3t.storage.SecureStorage
+
+class BootCompletedReceiver : BroadcastReceiver() {
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) {
+			return
+		}
+		invalidateCheckIn(context)
+	}
+
+	private fun invalidateCheckIn(context: Context) {
+		val storage = SecureStorage.getInstance(context)
+		val checkInState = storage.checkInState ?: return
+		val checkedOut = CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState)
+		if (!checkedOut) {
+			val checkInTime = checkInState.checkInTime
+			NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, checkInState.venueInfo)
+			CrowdNotifierReminderHelper.setCheckoutWarning(checkInTime, checkInState.venueInfo.getCheckoutWarningDelay(), context)
+			CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, checkInState.venueInfo.getAutoCheckoutDelay(), context)
+			CrowdNotifierReminderHelper.setReminder(checkInTime + checkInState.selectedReminderDelay, context)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
index 7eeb5d70e..5a3516206 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
@@ -21,16 +21,14 @@ public class CrowdNotifierReminderHelper extends BroadcastReceiver {
 	public static final String ACTION_DID_AUTO_CHECKOUT = BuildConfig.APPLICATION_ID + ".ACTION_DID_AUTO_CHECKOUT";
 	private static final int REMINDER_INTENT_ID = 12;
 	private static final String ACTION_REMINDER = BuildConfig.APPLICATION_ID + ".ACTION_REMINDER";
-	private static final int EIGHT_HOUR_REMINDER_INTENT_ID = 13;
-	private static final String ACTION_EIGHT_HOUR_REMINDER = BuildConfig.APPLICATION_ID + ".ACTION_EIGHT_HOUR_REMINDER";
+	private static final int CHECKOUT_WARNING_INTENT_ID = 13;
+	private static final String ACTION_CHECKOUT_WARNING = BuildConfig.APPLICATION_ID + ".ACTION_CHECKOUT_WARNING";
 	private static final int AUTO_CHECK_OUT_INTENT_ID = 14;
 	private static final String ACTION_AUTO_CHECKOUT = BuildConfig.APPLICATION_ID + ".ACTION_AUTO_CHECKOUT";
-	private static final long EIGHT_HOURS = 1000L * 60 * 60 * 8;
-	public static final long TWELVE_HOURS = 1000L * 60 * 60 * 12;
 
 	public static void removeAllReminders(Context context) {
 		removeReminder(context);
-		remove8HourReminder(context);
+		removeCheckoutWarning(context);
 		removeAutoCheckOut(context);
 	}
 
@@ -44,19 +42,19 @@ public static void setReminder(long alarmTime, Context context) {
 		setReminder(alarmTime, pendingIntent, context);
 	}
 
-	public static void set8HourReminder(long checkInTime, Context context) {
+	public static void setCheckoutWarning(long checkInTime, long delay, Context context) {
 		PendingIntent pendingIntent = getPendingIntent(context, true);
-		setReminder(checkInTime + EIGHT_HOURS, pendingIntent, context);
+		setReminder(checkInTime + delay, pendingIntent, context);
 	}
 
-	public static void remove8HourReminder(Context context) {
+	public static void removeCheckoutWarning(Context context) {
 		PendingIntent pendingIntent = getPendingIntent(context, true);
 		removeReminder(pendingIntent, context);
 	}
 
-	public static void setAutoCheckOut(long checkInTime, Context context) {
+	public static void setAutoCheckOut(long checkInTime, long delay, Context context) {
 		PendingIntent pendingIntent = getAutoCheckOutPendingIntent(context);
-		setReminder(checkInTime + TWELVE_HOURS, pendingIntent, context);
+		setReminder(checkInTime + delay, pendingIntent, context);
 	}
 
 	public static void removeAutoCheckOut(Context context) {
@@ -81,8 +79,8 @@ private static void removeReminder(PendingIntent pendingIntent, Context context)
 	private static PendingIntent getPendingIntent(Context context, boolean eightHours) {
 		Intent intent = new Intent(context, CrowdNotifierReminderHelper.class);
 		if (eightHours) {
-			intent.setAction(ACTION_EIGHT_HOUR_REMINDER);
-			return PendingIntent.getBroadcast(context, EIGHT_HOUR_REMINDER_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+			intent.setAction(ACTION_CHECKOUT_WARNING);
+			return PendingIntent.getBroadcast(context, CHECKOUT_WARNING_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 		} else {
 			intent.setAction(ACTION_REMINDER);
 			return PendingIntent.getBroadcast(context, REMINDER_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -99,7 +97,7 @@ private static PendingIntent getAutoCheckOutPendingIntent(Context context) {
 	public void onReceive(Context context, Intent intent) {
 		CheckInState checkInState = SecureStorage.getInstance(context).getCheckInState();
 		if (ACTION_REMINDER.equals(intent.getAction()) ||
-				ACTION_EIGHT_HOUR_REMINDER.equals(intent.getAction()) && checkInState != null) {
+				ACTION_CHECKOUT_WARNING.equals(intent.getAction()) && checkInState != null) {
 			NotificationHelper.getInstance(context).showReminderNotification();
 		} else if (ACTION_AUTO_CHECKOUT.equals(intent.getAction())) {
 			autoCheckoutIfNecessary(context, checkInState);
@@ -107,7 +105,11 @@ public void onReceive(Context context, Intent intent) {
 	}
 
 	public static boolean autoCheckoutIfNecessary(Context context, CheckInState checkInState) {
-		if (checkInState == null || checkInState.getCheckInTime() > System.currentTimeMillis() - TWELVE_HOURS) {
+		if (checkInState == null) {
+			return false;
+		}
+		long autoCheckoutDelay = VenueInfoExtensionsKt.getAutoCheckoutDelay(checkInState.getVenueInfo());
+		if (checkInState.getCheckInTime() > System.currentTimeMillis() - autoCheckoutDelay) {
 			return false;
 		}
 
@@ -116,7 +118,7 @@ public static boolean autoCheckoutIfNecessary(Context context, CheckInState chec
 		notificationHelper.removeReminderNotification();
 		notificationHelper.showAutoCheckoutNotification();
 		long checkIn = checkInState.getCheckInTime();
-		long checkOut = checkIn + TWELVE_HOURS;
+		long checkOut = checkIn + autoCheckoutDelay;
 		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, checkInState.getVenueInfo(), context);
 		DiaryStorage.getInstance(context).addEntry(new DiaryEntry(id, checkIn, checkOut, checkInState.getVenueInfo(), ""));
 		SecureStorage storage = SecureStorage.getInstance(context);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
index 8d6fa1a1e..31760d06e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
@@ -1,6 +1,7 @@
 package ch.admin.bag.dp3t.checkin.utils
 
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
+import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
 import com.google.protobuf.InvalidProtocolBufferException
 import org.crowdnotifier.android.sdk.model.VenueInfo
@@ -29,3 +30,11 @@ fun VenueInfo.toQrCodePayload(): QRCodePayload {
 		throw RuntimeException("VenueInfo contains invalid qrCodePayload bytes!")
 	}
 }
+
+fun VenueInfo.getAutoCheckoutDelay() = getSwissCovidLocationData().automaticCheckoutDelaylMs
+
+fun VenueInfo.getCheckoutWarningDelay() = getSwissCovidLocationData().checkoutWarningDelayMs
+
+fun VenueInfo.getReminderDelayOptions() = getSwissCovidLocationData().reminderDelayOptionsMsList.map { ReminderOption(it) }
+
+
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index 14b37e57e..9ce96bfe8 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -9,7 +9,7 @@
 	android:orientation="vertical">
 
 	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/check_in_fragment_toolbar"
+		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
@@ -42,7 +42,7 @@
 				android:src="@drawable/ic_illu_check_in" />
 
 			<TextView
-				android:id="@+id/check_in_fragment_title"
+				android:id="@+id/title_textview"
 				style="@style/CrowdNotifier.Text.Title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
 				tools:text="Cyber Cafe SV" />
 
 			<TextView
-				android:id="@+id/check_in_fragment_subtitle"
+				android:id="@+id/subtitle_textview"
 				style="@style/CrowdNotifier.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
 				android:layout_weight="1" />
 
 			<LinearLayout
-				android:id="@+id/check_in_fragment_reminder_container"
+				android:id="@+id/reminder_container"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/spacing_large"
@@ -81,43 +81,15 @@
 					android:text="@string/checkin_set_reminder" />
 
 				<com.google.android.material.button.MaterialButtonToggleGroup
-					android:id="@+id/check_in_fragment_toggle_group"
+					android:id="@+id/reminder_toggle_group"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center"
 					android:layout_marginTop="@dimen/spacing_medium"
 					android:layout_marginBottom="@dimen/spacing_large"
-					app:checkedButton="@id/check_in_fragment_toggle_button_2"
 					app:selectionRequired="true"
 					app:singleSelection="true">
 
-					<com.google.android.material.button.MaterialButton
-						android:id="@+id/check_in_fragment_toggle_button_1"
-						style="@style/CrowdNotifier.ToggleButton"
-						android:text="Off"
-						android:textAllCaps="true"
-						android:textColorHighlight="@color/blue_main" />
-
-					<com.google.android.material.button.MaterialButton
-						android:id="@+id/check_in_fragment_toggle_button_2"
-						style="@style/CrowdNotifier.ToggleButton"
-						android:text="30'" />
-
-					<com.google.android.material.button.MaterialButton
-						android:id="@+id/check_in_fragment_toggle_button_3"
-						style="@style/CrowdNotifier.ToggleButton"
-						android:text="1h" />
-
-					<com.google.android.material.button.MaterialButton
-						android:id="@+id/check_in_fragment_toggle_button_4"
-						style="@style/CrowdNotifier.ToggleButton"
-						android:text="2h" />
-
-					<com.google.android.material.button.MaterialButton
-						android:id="@+id/check_in_fragment_toggle_button_5"
-						style="@style/CrowdNotifier.ToggleButton"
-						android:text="4h" />
-
 				</com.google.android.material.button.MaterialButtonToggleGroup>
 
 			</LinearLayout>
@@ -131,7 +103,7 @@
 	</ScrollView>
 
 	<Button
-		android:id="@+id/check_in_fragment_check_in_button"
+		android:id="@+id/check_in_button"
 		style="@style/NextStep.Button"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/crowdnotifier_styles.xml b/app/src/main/res/values/crowdnotifier_styles.xml
index 5ea6611bc..6601099ea 100644
--- a/app/src/main/res/values/crowdnotifier_styles.xml
+++ b/app/src/main/res/values/crowdnotifier_styles.xml
@@ -83,10 +83,11 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:textAllCaps">false</item>
-		<item name="backgroundTint">@drawable/reminder_toggle_background_color</item>
+		<item name="android:backgroundTint">@drawable/reminder_toggle_background_color</item>
 		<item name="strokeColor">@drawable/reminder_toggle_text_color</item>
 		<item name="android:textColor">@drawable/reminder_toggle_text_color</item>
 		<item name="android:layout_height">wrap_content</item>
+		<item name="android:minWidth">0dp</item>
 	</style>
 
 	<style name="CrowdNotifier.Button" parent="Widget.MaterialComponents.Button">

From 027630ffbc2ec6b9fbe64b0eb6a35d183e1c57a1 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 12 May 2021 09:37:47 +0200
Subject: [PATCH 036/207] Code cleanups

---
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  2 +-
 .../checkin/checkinflow/CheckInFragment.kt    | 22 ++++++++++++-------
 .../checkin/generateqrcode/QRCodeViewModel.kt |  4 ++--
 .../bag/dp3t/checkin/models/CheckInState.java |  2 +-
 .../dp3t/checkin/utils/VenueInfoExtensions.kt | 12 ++++++++--
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 0a167e36d..693d2ce2b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -179,7 +179,7 @@ public long getSelectedReminderDelay() {
 	}
 
 	public void setSelectedReminderDelay(long selectedReminderDelay) {
-		this.checkInState.setSelectedTimerOption(selectedReminderDelay);
+		this.checkInState.setSelectedReminderDelay(selectedReminderDelay);
 		storage.setCheckInState(checkInState);
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 03b8970d7..3c2dc9645 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -16,6 +16,7 @@ import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.utils.*
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
 import com.google.android.material.button.MaterialButton
+import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class CheckInFragment : Fragment() {
 
@@ -53,14 +54,7 @@ class CheckInFragment : Fragment() {
 			titleTextview.text = venueInfo.title
 			subtitleTextview.text = venueInfo.getSubtitle()
 			checkInButton.setOnClickListener {
-				val checkInTime = System.currentTimeMillis()
-				viewModel.startCheckInTimer()
-				viewModel.setCheckedIn(true)
-				viewModel.checkInState.checkInTime = checkInTime
-				NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, venueInfo)
-				CrowdNotifierReminderHelper.setCheckoutWarning(checkInTime, venueInfo.getCheckoutWarningDelay(), context)
-				CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, venueInfo.getAutoCheckoutDelay(), context)
-				CrowdNotifierReminderHelper.setReminder(checkInTime + viewModel.selectedReminderDelay, context)
+				performCheckIn(venueInfo)
 				popBackToHomeFragment()
 			}
 
@@ -88,6 +82,18 @@ class CheckInFragment : Fragment() {
 		}.root
 	}
 
+	private fun performCheckIn(venueInfo: VenueInfo) {
+		val checkInTime = System.currentTimeMillis()
+		viewModel.startCheckInTimer()
+		viewModel.setCheckedIn(true)
+		viewModel.checkInState.checkInTime = checkInTime
+		NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, venueInfo)
+		CrowdNotifierReminderHelper.setCheckoutWarning(checkInTime, venueInfo.getCheckoutWarningDelay(), context)
+		CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, venueInfo.getAutoCheckoutDelay(), context)
+		CrowdNotifierReminderHelper.setReminder(checkInTime + viewModel.selectedReminderDelay, context)
+
+	}
+
 	private fun popBackToHomeFragment() {
 		requireActivity().supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 5ed49d8d1..d33816a7d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -34,7 +34,7 @@ private const val ONE_HOUR_IN_MILLIS = 60 * ONE_MINUTE_IN_MILLIS
 private const val AUTOMATIC_CHECKOUT_DELAY_MS = 12 * ONE_HOUR_IN_MILLIS
 private const val CHECKOUT_WARNING_DELAY_MS = 8 * ONE_HOUR_IN_MILLIS
 private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
-private const val QR_CODE_VALIDITY_DURATION_MS = 10 * 365 * 24 * ONE_HOUR_IN_MILLIS // 10 years
+private const val QR_CODE_VALIDITY_DURATION_MS = 100000 * 24 * ONE_HOUR_IN_MILLIS // 100'000 days
 private val REMINDER_DELAY_OPTIONS_MS =
 	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120, 240).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, 120 and 240 minutes
 private const val QR_CODE_PIXEL_SIZE = 1000
@@ -45,7 +45,7 @@ private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper
 	serializer = GeneratedQrCodesSerializer
 )
 
-class QRCodeViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
+class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
 
 	private val generatedQrCodesFlow = getApplication<Application>().generatedQrCodesDataStore.data.buffer(1).catch { exception ->
 		if (exception is IOException) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
index a44772b82..bb7709af4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
@@ -50,7 +50,7 @@ public void setCheckOutTime(long checkOutTime) {
 		this.checkOutTime = checkOutTime;
 	}
 
-	public void setSelectedTimerOption(long selectedReminderDelay) {
+	public void setSelectedReminderDelay(long selectedReminderDelay) {
 		this.selectedReminderDelay = selectedReminderDelay;
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
index 31760d06e..4c55d38f1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
@@ -6,6 +6,8 @@ import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
 import com.google.protobuf.InvalidProtocolBufferException
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
+private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
+
 fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
 	return if (countryData == null) {
 		SwissCovidLocationData.newBuilder().build()
@@ -35,6 +37,12 @@ fun VenueInfo.getAutoCheckoutDelay() = getSwissCovidLocationData().automaticChec
 
 fun VenueInfo.getCheckoutWarningDelay() = getSwissCovidLocationData().checkoutWarningDelayMs
 
-fun VenueInfo.getReminderDelayOptions() = getSwissCovidLocationData().reminderDelayOptionsMsList.map { ReminderOption(it) }
-
+fun VenueInfo.getReminderDelayOptions(): List<ReminderOption> {
+	if (getSwissCovidLocationData().reminderDelayOptionsMsList.size == 0) {
+		//Fallback if reminderDelayOptionsMsList is empty (30, 60, 120 and 240 minutes)
+		return listOf(30, 60, 120, 240).map { ReminderOption(it * ONE_MINUTE_IN_MILLIS) }
+	}
+	return getSwissCovidLocationData().reminderDelayOptionsMsList.asSequence().distinct().filter { it > 0 }.sorted()
+		.map { ReminderOption(it) }.take(4).toList()
+}
 

From 1729841bf5a8c7754371047bc741332dd1380e0d Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 13 May 2021 15:02:06 +0200
Subject: [PATCH 037/207] Clean up Info Tab

---
 .../admin/bag/dp3t/infotab/InfoTabFragment.kt |  68 ++-
 .../whattodo/WtdPositiveTestFragment.java     |  52 ---
 .../main/res/drawable/ic_illu_covidcode.xml   |  41 ++
 .../res/drawable/ic_illu_veranstaltungen.xml  |  82 ++++
 .../main/res/layout/card_generate_qr_code.xml |  71 ++++
 .../main/res/layout/card_what_to_do_test.xml  | 205 ++++++---
 app/src/main/res/layout/fragment_info_tab.xml |  37 +-
 .../res/layout/fragment_what_to_do_test.xml   | 388 +++++-------------
 app/src/main/res/values-bs/strings.xml        |   5 +-
 app/src/main/res/values-de/strings.xml        |   5 +-
 app/src/main/res/values-es/strings.xml        |   5 +-
 app/src/main/res/values-fr/strings.xml        |   5 +-
 app/src/main/res/values-hr/strings.xml        |   5 +-
 app/src/main/res/values-it/strings.xml        |   5 +-
 app/src/main/res/values-pt/strings.xml        |   5 +-
 app/src/main/res/values-rm/strings.xml        |   5 +-
 app/src/main/res/values-sq/strings.xml        |   5 +-
 app/src/main/res/values-sr/strings.xml        |   5 +-
 app/src/main/res/values-ti/strings.xml        |   5 +-
 app/src/main/res/values-tr/strings.xml        |   5 +-
 app/src/main/res/values/strings.xml           |   5 +-
 app/src/main/res/values/styles.xml            |   1 +
 22 files changed, 578 insertions(+), 432 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_illu_covidcode.xml
 create mode 100644 app/src/main/res/drawable/ic_illu_veranstaltungen.xml
 create mode 100644 app/src/main/res/layout/card_generate_qr_code.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
index 949a7d48d..0d0ea5c0c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
@@ -1,5 +1,7 @@
 package ch.admin.bag.dp3t.infotab
 
+import android.content.Intent
+import android.graphics.Paint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -7,13 +9,17 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.databinding.FragmentInfoTabBinding
+import ch.admin.bag.dp3t.inform.InformActivity
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.travel.TravelFragment
 import ch.admin.bag.dp3t.travel.TravelUtils
+import ch.admin.bag.dp3t.util.UrlUtil
 import ch.admin.bag.dp3t.util.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import ch.admin.bag.dp3t.whattodo.WtdInfolineAccessabilityDialogFragment
 import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment
 import ch.admin.bag.dp3t.whattodo.WtdSymptomsFragment
 
@@ -32,17 +38,73 @@ class InfoTabFragment : Fragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentInfoTabBinding.inflate(inflater).apply {
 			frameCardSymptoms.root.setOnClickListener { showFragment(WtdSymptomsFragment.newInstance()) }
-			frameCardTest.root.setOnClickListener { showFragment(WtdPositiveTestFragment.newInstance()) }
 			tracingViewModel.appStatusLiveData.observe(viewLifecycleOwner) { tracingStatusInterface ->
-				frameCardSymptoms.root.isVisible = !tracingStatusInterface.isReportedAsInfected
 				frameCardTest.root.isVisible = !tracingStatusInterface.isReportedAsInfected
 			}
-			qrCodeGenerate.setOnClickListener { showFragment(EventsOverviewFragment.newInstance()) }
+			qrCodeGenerate.root.setOnClickListener { showFragment(EventsOverviewFragment.newInstance()) }
 		}
 		setupTravelCard()
+		setupPositiveTestCard()
 		return binding.root
 	}
 
+	private fun setupPositiveTestCard() {
+		fillContentFromConfigServer()
+		binding.frameCardTest.apply {
+			wtdMoreAboutCovidcodeButton.paintFlags = wtdMoreAboutCovidcodeButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+			wtdMoreAboutCovidcodeButton.setOnClickListener {
+				showFragment(WtdPositiveTestFragment.newInstance())
+			}
+			wtdInformButton.setOnClickListener {
+				startActivity(Intent(activity, InformActivity::class.java))
+			}
+		}
+	}
+
+	private fun fillContentFromConfigServer() {
+		val textModel = secureStorage.getWhatToDoPositiveTestTexts(getString(R.string.language_key)) ?: return
+		binding.frameCardTest.apply {
+			wtdInformBoxSupertitle.text = textModel.enterCovidcodeBoxSupertitle
+			wtdInformBoxTitle.text = textModel.enterCovidcodeBoxTitle
+			wtdInformBoxText.text = textModel.enterCovidcodeBoxText
+			wtdInformButton.text = textModel.enterCovidcodeBoxButtonTitle
+			wtdInformInfobox.isVisible = textModel.infoBox != null
+			textModel.infoBox?.let { infoBox ->
+				wtdInformInfoboxTitle.text = infoBox.title
+				wtdInformInfoboxMsg.text = infoBox.msg
+				if (infoBox.url != null && infoBox.urlTitle != null) {
+					wtdInformInfoboxLinkText.text = infoBox.urlTitle
+					wtdInformInfoboxLinkLayout.setOnClickListener { UrlUtil.openUrl(it.context, infoBox.url) }
+					wtdInformInfoboxLinkLayout.isVisible = true
+					if (infoBox.url.startsWith("tel://")) {
+						wtdInformInfoboxLinkIcon.setImageResource(R.drawable.ic_phone)
+					} else {
+						wtdInformInfoboxLinkIcon.setImageResource(R.drawable.ic_launch)
+					}
+				} else {
+					wtdInformInfoboxLinkLayout.isVisible = false
+				}
+				if (infoBox.hearingImpairedInfo != null) {
+					wtdInformInfoboxLinkIcon.setImageResource(R.drawable.ic_phone)
+					wtdInformInfoboxLinkHearingImpaired.setOnClickListener { showWtdInfolineAccessabilityDialogFragment(infoBox.hearingImpairedInfo) }
+					wtdInformInfoboxLinkHearingImpaired.isVisible = true
+				} else {
+					wtdInformInfoboxLinkIcon.setImageResource(R.drawable.ic_launch)
+					wtdInformInfoboxLinkHearingImpaired.isVisible = false
+				}
+			}
+		}
+	}
+
+	private fun showWtdInfolineAccessabilityDialogFragment(hearingImpairedInfo: String) {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.add(
+				WtdInfolineAccessabilityDialogFragment.newInstance(hearingImpairedInfo),
+				WtdInfolineAccessabilityDialogFragment::class.java.canonicalName
+			)
+			.commit()
+	}
+
 
 	private fun setupTravelCard() {
 		binding.cardTravel.apply {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java b/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java
index ddf0f5b99..101376c17 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java
@@ -10,7 +10,6 @@
 package ch.admin.bag.dp3t.whattodo;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
@@ -22,9 +21,7 @@
 import androidx.fragment.app.Fragment;
 
 import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.inform.InformActivity;
 import ch.admin.bag.dp3t.networking.models.FaqEntryModel;
-import ch.admin.bag.dp3t.networking.models.InfoBoxModel;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsModel;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.util.PhoneUtil;
@@ -47,11 +44,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 		fillContentFromConfigServer(view);
 
-		view.findViewById(R.id.wtd_inform_button).setOnClickListener(v -> {
-			Intent intent = new Intent(getActivity(), InformActivity.class);
-			startActivity(intent);
-		});
-
 		view.findViewById(R.id.wtd_inform_faq_button).setOnClickListener(v -> {
 			UrlUtil.openUrl(getContext(), getString(R.string.faq_button_url));
 		});
@@ -71,50 +63,6 @@ private void fillContentFromConfigServer(View view) {
 				secureStorage.getWhatToDoPositiveTestTexts(context.getString(R.string.language_key));
 
 		if (textModel != null) {
-			((TextView) view.findViewById(R.id.wtd_inform_box_supertitle)).setText(textModel.getEnterCovidcodeBoxSupertitle());
-			((TextView) view.findViewById(R.id.wtd_inform_box_title)).setText(textModel.getEnterCovidcodeBoxTitle());
-			((TextView) view.findViewById(R.id.wtd_inform_box_text)).setText(textModel.getEnterCovidcodeBoxText());
-			((TextView) view.findViewById(R.id.wtd_inform_button)).setText(textModel.getEnterCovidcodeBoxButtonTitle());
-			InfoBoxModel infoBox = textModel.getInfoBox();
-
-			if (infoBox != null) {
-				view.findViewById(R.id.wtd_inform_infobox).setVisibility(View.VISIBLE);
-				((TextView) view.findViewById(R.id.wtd_inform_infobox_title)).setText(infoBox.getTitle());
-				((TextView) view.findViewById(R.id.wtd_inform_infobox_msg)).setText(infoBox.getMsg());
-
-				if (infoBox.getUrl() != null && infoBox.getUrlTitle() != null) {
-					((TextView) view.findViewById(R.id.wtd_inform_infobox_link_text)).setText(infoBox.getUrlTitle());
-					view.findViewById(R.id.wtd_inform_infobox_link_layout).setOnClickListener(v -> {
-						UrlUtil.openUrl(v.getContext(), infoBox.getUrl());
-					});
-					view.findViewById(R.id.wtd_inform_infobox_link_layout).setVisibility(View.VISIBLE);
-					ImageView linkIcon = view.findViewById(R.id.wtd_inform_infobox_link_icon);
-					if (infoBox.getUrl().startsWith("tel://")) {
-						linkIcon.setImageResource(R.drawable.ic_phone);
-					} else {
-						linkIcon.setImageResource(R.drawable.ic_launch);
-					}
-				} else {
-					view.findViewById(R.id.wtd_inform_infobox_link_layout).setVisibility(View.GONE);
-				}
-
-				if (infoBox.getHearingImpairedInfo() != null) {
-					((ImageView) view.findViewById(R.id.wtd_inform_infobox_link_icon)).setImageResource(R.drawable.ic_phone);
-					view.findViewById(R.id.wtd_inform_infobox_link_hearing_impaired).setOnClickListener(v -> {
-						requireActivity().getSupportFragmentManager().beginTransaction()
-								.add(WtdInfolineAccessabilityDialogFragment.newInstance(infoBox.getHearingImpairedInfo()),
-										WtdInfolineAccessabilityDialogFragment.class.getCanonicalName())
-								.commit();
-					});
-					view.findViewById(R.id.wtd_inform_infobox_link_hearing_impaired).setVisibility(View.VISIBLE);
-				} else {
-					((ImageView) view.findViewById(R.id.wtd_inform_infobox_link_icon)).setImageResource(R.drawable.ic_launch);
-					view.findViewById(R.id.wtd_inform_infobox_link_hearing_impaired).setVisibility(View.GONE);
-				}
-			} else {
-				view.findViewById(R.id.wtd_inform_infobox).setVisibility(View.GONE);
-			}
-
 			LinearLayout faqLayout = view.findViewById(R.id.wtd_inform_faq_layout);
 			faqLayout.removeAllViews();
 
diff --git a/app/src/main/res/drawable/ic_illu_covidcode.xml b/app/src/main/res/drawable/ic_illu_covidcode.xml
new file mode 100644
index 000000000..12c9e4087
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illu_covidcode.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="110dp"
+    android:viewportWidth="80"
+    android:viewportHeight="110">
+  <path
+      android:pathData="M8,102.382a32.5,2.382 0,1 0,65 0a32.5,2.382 0,1 0,-65 0z"
+      android:strokeAlpha="0.25"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"
+      android:fillAlpha="0.25"/>
+  <path
+      android:pathData="M62.333,8.997v88.932c0.002,1.169 -0.503,2.28 -1.38,3.039 -0.708,0.618 -1.612,0.957 -2.547,0.955L22.927,101.923c-0.782,0 -1.546,-0.236 -2.195,-0.68C19.648,100.497 19,99.256 19,97.93L19,8.997c-0.003,-1.058 0.41,-2.073 1.146,-2.823C20.883,5.424 21.883,5.002 22.927,5h5.31v0.693c-0.005,1.813 1.443,3.286 3.233,3.291h18.044c0.691,0.002 1.364,-0.224 1.918,-0.642 0.112,-0.083 0.218,-0.174 0.318,-0.271 0.639,-0.622 0.999,-1.481 0.997,-2.378L52.747,5h5.659c1.044,0.002 2.045,0.425 2.781,1.174 0.737,0.75 1.15,1.765 1.146,2.823z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M24.667,64.839L33,64.839L33,77.481L24.667,77.481zM36.333,64.839L44.666,64.839L44.666,77.481L36.333,77.481zM48,64.839L56.333,64.839L56.333,77.481L48,77.481z"
+      android:fillColor="#F3F0F5"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M40.312,21.013L28,28.676s0,15.805 12.312,24.426C52.625,44.481 52.625,28.676 52.625,28.676L40.312,21.013z"
+      android:fillColor="#A387B2"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M40.386,21.013l-0.21,0.131v31.808l0.21,0.15C52.698,44.481 52.698,28.676 52.698,28.676L40.386,21.013z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M44.502,32.23h-0.829L43.673,30.589c0,-1.852 -1.448,-3.392 -3.265,-3.42 -0.884,-0.01 -1.736,0.342 -2.366,0.975 -0.63,0.634 -0.985,1.497 -0.988,2.4v1.686h-0.827c-0.76,0.002 -1.377,0.63 -1.38,1.406v6.748c0.003,0.775 0.62,1.404 1.38,1.406h8.275c0.76,-0.002 1.376,-0.63 1.378,-1.406v-6.748c-0.002,-0.775 -0.617,-1.404 -1.378,-1.406zM40.848,36.616v2.417c0.001,0.266 -0.2,0.487 -0.46,0.507 -0.131,0.006 -0.26,-0.043 -0.356,-0.136 -0.095,-0.093 -0.15,-0.222 -0.15,-0.357v-2.432c-0.46,-0.229 -0.705,-0.752 -0.59,-1.261 0.116,-0.51 0.56,-0.87 1.073,-0.87 0.513,0 0.957,0.36 1.073,0.87 0.115,0.51 -0.13,1.032 -0.59,1.261v0.001zM42.709,32.23h-4.69L38.019,30.543c0,-1.32 1.05,-2.39 2.344,-2.39 1.295,0 2.344,1.07 2.344,2.39l0.002,1.687z"
+      android:fillColor="#4A4969"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M26.333,75.796L31.333,75.796M38,75.796L43,75.796M49.667,75.796L54.667,75.796"
+      android:strokeWidth="1.686"
+      android:fillColor="#00000000"
+      android:strokeColor="#8D6A9F"
+      android:fillType="evenOdd"
+      android:strokeLineCap="square"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_illu_veranstaltungen.xml b/app/src/main/res/drawable/ic_illu_veranstaltungen.xml
new file mode 100644
index 000000000..ba94bcc5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_illu_veranstaltungen.xml
@@ -0,0 +1,82 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="81dp"
+    android:height="111dp"
+    android:viewportWidth="81"
+    android:viewportHeight="111">
+  <path
+      android:pathData="M7.8,59.821a15,1.679 0,1 0,30 0a15,1.679 0,1 0,-30 0z"
+      android:strokeAlpha="0.103"
+      android:fillColor="#63A0C7"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.103"/>
+  <path
+      android:pathData="M28.425,33.372l-0.347,1.494s0.116,3.447 -0.809,3.102c-0.924,-0.344 -0.693,-3.332 -0.693,-3.332l0.809,-1.494 1.04,0.23z"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M20.925,14.485a2.25,2.239 0,1 0,4.5 0a2.25,2.239 0,1 0,-4.5 0z"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M21.521,15.231L21.3,18.613l2.767,0.35s0,-2.799 0.221,-3.149c0.222,-0.35 -2.767,-0.583 -2.767,-0.583z"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M28.05,19.432l-3.758,-1.595s-1.795,-1.39 -2.847,-0.36l-0.472,0.68S16.8,19.791 16.8,21.073l1.63,6.41s-0.925,3.614 0.467,3.846l7.54,0.692s1.043,-1.283 0.113,-2.914l0.345,-3.847 1.155,-5.829z"
+      android:fillColor="#D5E4ED"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M25.425,19.826l2.471,-0.117s0.787,0.228 1.35,2.405c0.564,2.177 0.679,5.729 0.679,5.729l-1.342,6.418 -1.686,-0.227 0.67,-6.189 -1.128,-4.124 -1.014,-3.895zM18.201,20.455l-1.315,0.388s-1.108,1.562 -1.107,2.364c0,0.802 -0.479,6.876 -0.479,6.876l3.157,4.924 0.968,-2.407 -1.943,-3.092 1.573,-3.783 -0.854,-5.27z"
+      android:fillColor="#D5E4ED"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M26.565,31.638l-8.358,-0.735s-0.826,5.264 -0.71,7.355c0.117,2.09 0.233,5.342 0.233,5.342L16.8,57.769l3.604,-0.465 0.465,-11.73 1.511,-6.387 1.744,8.13 1.162,10.452 3.139,-0.349 -1.046,-12.659s0.93,-11.381 -0.814,-13.123z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M27.82,57.022l1.078,0.35s2.275,-0.583 1.677,0.934c-0.6,1.517 -2.276,1.283 -2.276,1.283s-2.036,1.517 -2.874,0.35l0.479,-2.45 1.916,-0.467zM19.195,57.022l1.078,0.35s2.275,-0.583 1.677,0.934c-0.6,1.517 -2.276,1.283 -2.276,1.283S17.638,61.106 16.8,59.94l0.479,-2.45 1.916,-0.467zM21.361,16.724s-2.486,-1.79 -1.184,-3.939c0.904,-1.49 2.775,-1.372 3.837,-1.16 0.58,0.108 1.072,0.497 1.312,1.041 0.178,0.418 0.178,0.835 -0.532,0.835 -1.42,0 -0.71,1.075 -0.71,1.075s-0.947,0.238 -0.71,1.074c0.236,0.835 -2.013,1.074 -2.013,1.074z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M26.8,103.667a25,2.833 0,1 0,50 0a25,2.833 0,1 0,-50 0z"
+      android:strokeAlpha="0.103"
+      android:fillColor="#63A0C7"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.103"/>
+  <path
+      android:pathData="M54.466,99.574s-4.328,0.348 -3.884,1.97c0.444,1.624 3.884,1.392 3.884,1.392s2.663,-0.232 4.106,0.232c1.443,0.463 3.107,0 3.218,-0.812 0.111,-0.811 -0.776,-1.39 -0.776,-1.39l-0.555,-1.16 -5.993,-0.232z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M64.906,63.056l0.464,1.71s2.089,3.956 -0.464,3.956c-2.552,0 -1.624,-3.635 -1.624,-3.635l-0.232,-1.71 1.856,-0.321z"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M48.675,28.111a4.688,4.722 0,1 0,9.376 0a4.688,4.722 0,1 0,-9.376 0z"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M51.8,31.72s0.537,2.551 0.215,3.771c-0.322,1.22 6.66,-0.221 6.66,-0.221s-2.47,-4.215 -2.363,-4.326L51.8,31.721z"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M52.783,34.625s-2.004,-0.553 -2.671,0.113c-0.668,0.667 -4.562,2.557 -4.562,2.557l2.686,16.316 11.574,-2.563L61.8,35.616s-3.158,-1.843 -3.694,-1.475c-0.537,0.369 -5.323,0.484 -5.323,0.484z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M46.589,37.526l-0.519,-0.285s-1.964,0.398 -1.855,1.95c0.11,1.552 0.549,10.199 0.549,10.199L43.05,65.023l3.13,0.551L49.3,52.49l-2.711,-14.964zM61.352,36.267l0.516,-0.286s1.958,0.395 1.852,1.947c-0.107,1.552 -0.53,10.2 -0.53,10.2l1.735,15.63 -3.12,0.557 -3.13,-13.079 2.677,-14.969z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M48.08,52.023l-0.448,6.798 -1.457,13.595 2.13,28.194 7.397,0.223 -2.242,-26.856 2.242,-9.25 7.327,-0.27s0.519,-10.65 -3.628,-13.994l-11.32,1.56z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M56.465,63.242L55.31,87.765 54.925,100.166 61.413,100.833 63.05,64.364 60.533,61.796zM55.332,21.566S51.087,21.008 49.89,23.13c0,0 -0.326,1.564 -1.415,2.123 -1.088,0.559 0.218,2.458 0.544,3.016 0.327,0.559 1.198,3.799 0.218,4.58 -0.98,0.783 1.742,3.017 1.742,3.017s1.306,1.787 0.217,3.128c-1.088,1.34 1.415,1.787 1.415,1.787s-0.544,3.799 0.436,2.793c0,0 0.435,8.602 4.57,3.24 4.137,-5.362 5.878,-7.932 4.137,-10.054 -1.742,-2.123 -0.436,-4.022 -0.436,-4.022s0.545,-1.117 -0.653,-2.793C59.468,28.27 59.468,21.566 55.332,21.566zM48.841,100.204s-4.328,0.347 -3.884,1.97c0.444,1.623 3.884,1.391 3.884,1.391s2.663,-0.231 4.106,0.232c1.443,0.464 3.107,0 3.218,-0.811 0.111,-0.812 -0.776,-1.391 -0.776,-1.391l-0.555,-1.16 -5.993,-0.231z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M43.694,64.944l-0.464,1.711s-2.089,3.956 0.464,3.956c2.552,0 1.624,-3.635 1.624,-3.635l0.232,-1.71 -1.856,-0.322z"
+      android:fillColor="#9F616A"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/card_generate_qr_code.xml b/app/src/main/res/layout/card_generate_qr_code.xml
new file mode 100644
index 000000000..be0db1315
--- /dev/null
+++ b/app/src/main/res/layout/card_generate_qr_code.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/card_travel"
+	style="@style/NextStep.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:foreground="?selectableItemBackground">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginTop="5dp"
+			android:gravity="center_vertical"
+			android:orientation="horizontal"
+			android:paddingBottom="5dp">
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium"
+				android:layout_weight="1"
+				android:text="@string/events_title" />
+
+			<ImageView
+				android:layout_width="@dimen/chevron_size_title"
+				android:layout_height="@dimen/chevron_size_title"
+				android:layout_marginEnd="@dimen/spacing_small"
+				android:src="@drawable/ic_chevron_right"
+				android:tint="@color/dark_main" />
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/spacing_medium_large"
+			android:orientation="horizontal">
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="@string/events_subtitle" />
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/ic_illu_veranstaltungen" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/card_what_to_do_test.xml b/app/src/main/res/layout/card_what_to_do_test.xml
index ce65ed5d1..23a8f27d0 100644
--- a/app/src/main/res/layout/card_what_to_do_test.xml
+++ b/app/src/main/res/layout/card_what_to_do_test.xml
@@ -8,72 +8,183 @@
   ~ SPDX-License-Identifier: MPL-2.0
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:elevation="@dimen/card_elevation">
 
-	<androidx.cardview.widget.CardView
-		style="@style/NextStep.Card"
+	<LinearLayout
+		android:id="@+id/card_what_to_do_test"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_gravity="bottom"
-		android:layout_marginTop="@dimen/card_what_to_do_ill_margin"
-		android:elevation="@dimen/card_elevation">
+		android:foreground="?selectableItemBackground"
+		android:gravity="center_vertical"
+		android:orientation="vertical"
+		android:padding="@dimen/spacing_medium">
+
+		<TextView
+			android:id="@+id/wtd_inform_box_supertitle"
+			style="@style/NextStep.Text.Bold.Purple"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_medium_large"
+			android:layout_marginTop="@dimen/spacing_medium_large"
+			android:text="@string/meldung_homescreen_positiv_title" />
+
+		<TextView
+			android:id="@+id/wtd_inform_box_title"
+			style="@style/NextStep.Text.Title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_medium_large"
+			android:layout_marginTop="@dimen/spacing_tiny_small"
+			android:text="@string/inform_detail_box_title" />
 
 		<LinearLayout
-			android:id="@+id/card_what_to_do_test"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:foreground="?selectableItemBackground"
-			android:orientation="horizontal"
-			android:gravity="center_vertical"
-			android:paddingLeft="@dimen/card_ill_width"
-			android:paddingTop="@dimen/spacing_large"
-			android:paddingBottom="@dimen/spacing_large">
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_medium_large"
+			android:layout_marginTop="@dimen/spacing_medium"
+			android:orientation="horizontal">
 
-			<LinearLayout
+			<TextView
+				android:id="@+id/wtd_inform_box_text"
+				style="@style/NextStep.Text"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:layout_marginLeft="@dimen/spacing_very_large"
+				android:layout_gravity="bottom"
+				android:layout_marginEnd="@dimen/spacing_medium"
 				android:layout_weight="1"
-				android:gravity="center_vertical"
-				android:orientation="vertical"
-				android:paddingLeft="@dimen/spacing_small">
+				android:text="@string/inform_detail_box_text" />
 
-				<TextView
-					style="@style/NextStep.Text"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:text="@string/whattodo_subtitle_positivetest" />
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/ic_illu_covidcode" />
+
+		</LinearLayout>
+
+		<TextView
+			android:id="@+id/wtd_more_about_covidcode_button"
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_medium_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/inform_detail_covidcode_info_button" />
+
+		<Button
+			android:id="@+id/wtd_inform_button"
+			style="@style/NextStep.Button.Purple"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_large"
+			android:text="@string/inform_code_title" />
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:id="@+id/wtd_inform_infobox"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_large"
+			android:background="@color/status_purple_bg"
+			android:padding="@dimen/spacing_medium"
+			android:visibility="gone"
+			tools:visibility="visible">
+
+			<ImageView
+				android:id="@+id/wtd_inform_infobox_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/spacing_very_small"
+				android:src="@drawable/ic_info"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				android:tint="@color/purple_main" />
+
+			<TextView
+				android:id="@+id/wtd_inform_infobox_title"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_medium"
+				android:layout_marginBottom="@dimen/spacing_very_small"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toEndOf="@+id/wtd_inform_infobox_icon"
+				app:layout_constraintTop_toTopOf="parent"
+				tools:text="Infobox Title" />
+
+			<TextView
+				android:id="@+id/wtd_inform_infobox_msg"
+				style="@style/NextStep.Text"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="@+id/wtd_inform_infobox_title"
+				app:layout_constraintTop_toBottomOf="@+id/wtd_inform_infobox_title"
+				tools:text="Text for the Infobox" />
+
+			<LinearLayout
+				android:id="@+id/wtd_inform_infobox_link_layout"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:background="@drawable/ripple_button"
+				android:orientation="horizontal"
+				android:paddingTop="@dimen/spacing_small"
+				android:paddingEnd="@dimen/spacing_medium"
+				android:paddingBottom="@dimen/spacing_small"
+				app:layout_constraintEnd_toStartOf="@+id/wtd_inform_infobox_link_hearing_impaired"
+				app:layout_constraintHorizontal_bias="0"
+				app:layout_constraintStart_toStartOf="@+id/wtd_inform_infobox_title"
+				app:layout_constraintTop_toBottomOf="@+id/wtd_inform_infobox_msg"
+				app:layout_constraintWidth_default="wrap">
+
+				<ImageView
+					android:id="@+id/wtd_inform_infobox_link_icon"
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/ic_launch"
+					android:tint="@color/purple_main" />
 
 				<TextView
-					style="@style/NextStep.Text.Bold"
-					android:layout_width="match_parent"
+					android:id="@+id/wtd_inform_infobox_link_text"
+					style="@style/NextStep.Text.Bold.Purple"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:breakStrategy="high_quality"
-					android:hyphenationFrequency="full"
-					android:text="@string/whattodo_title_positivetest" />
+					android:layout_marginLeft="@dimen/spacing_small"
+					tools:text="+41 12 345 67 89" />
 
 			</LinearLayout>
 
-			<ImageView
-				android:layout_width="@dimen/chevron_size_title"
-				android:layout_height="@dimen/chevron_size_title"
-				android:layout_marginEnd="@dimen/spacing_small"
-				android:src="@drawable/ic_chevron_right"
-				android:tint="@color/purple_main" />
+			<LinearLayout
+				android:id="@+id/wtd_inform_infobox_link_hearing_impaired"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:background="@drawable/ripple_button"
+				android:orientation="horizontal"
+				android:padding="@dimen/spacing_small"
+				android:visibility="gone"
+				app:layout_constraintBottom_toBottomOf="@+id/wtd_inform_infobox_link_layout"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toTopOf="@+id/wtd_inform_infobox_link_layout"
+				tools:visibility="visible">
 
-		</LinearLayout>
+				<ImageView
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:src="@drawable/ic_hearing_impaired"
+					android:tint="@color/purple_main" />
+			</LinearLayout>
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
 
-	</androidx.cardview.widget.CardView>
+	</LinearLayout>
 
-	<ImageView
-		android:id="@+id/card_wtd_test_illustration"
-		android:layout_width="@dimen/card_ill_width"
-		android:layout_height="110dp"
-		android:layout_marginStart="@dimen/spacing_large"
-		android:layout_marginBottom="@dimen/spacing_medium"
-		android:elevation="@dimen/card_elevation"
-		android:src="@drawable/ill_positiv_getestet" />
+</androidx.cardview.widget.CardView>
 
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_info_tab.xml b/app/src/main/res/layout/fragment_info_tab.xml
index 890f310bb..f91fc29dd 100644
--- a/app/src/main/res/layout/fragment_info_tab.xml
+++ b/app/src/main/res/layout/fragment_info_tab.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/infotab_scrollview"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -13,49 +14,31 @@
 		android:paddingVertical="@dimen/spacing_very_large">
 
 		<include
-			android:id="@+id/card_travel"
-			layout="@layout/card_travel"
+			android:id="@+id/frame_card_test"
+			layout="@layout/card_what_to_do_test"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/spacing_very_large" />
+			android:layout_marginBottom="@dimen/spacing_medium" />
 
 		<include
 			android:id="@+id/frame_card_symptoms"
 			layout="@layout/card_what_to_do_symptoms"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/spacing_very_small" />
+			android:layout_marginBottom="@dimen/spacing_very_large" />
 
 		<include
-			android:id="@+id/frame_card_test"
-			layout="@layout/card_what_to_do_test"
+			android:id="@+id/card_travel"
+			layout="@layout/card_travel"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="@dimen/spacing_very_large" />
 
-		<androidx.cardview.widget.CardView
+		<include
 			android:id="@+id/qr_code_generate"
-			style="@style/NextStep.Card"
+			layout="@layout/card_generate_qr_code"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/spacing_very_large">
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical">
-
-				<TextView
-					style="@style/NextStep.Text.Title"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginHorizontal="@dimen/spacing_large"
-					android:layout_marginTop="@dimen/spacing_medium_large"
-					android:layout_marginBottom="@dimen/spacing_medium"
-					android:text="[TBT] QR Code Generieren" />
-
-			</LinearLayout>
-		</androidx.cardview.widget.CardView>
+			android:layout_height="wrap_content" />
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_what_to_do_test.xml b/app/src/main/res/layout/fragment_what_to_do_test.xml
index ebac25c86..0dd97415e 100644
--- a/app/src/main/res/layout/fragment_what_to_do_test.xml
+++ b/app/src/main/res/layout/fragment_what_to_do_test.xml
@@ -31,339 +31,147 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/spacing_large"
 			android:layout_marginTop="@dimen/spacing_larger"
-			android:gravity="center_horizontal"
+			android:layout_marginEnd="@dimen/spacing_large"
+			android:layout_marginBottom="@dimen/spacing_very_large"
 			android:orientation="vertical">
 
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_horizontal"
-				android:text="@string/inform_detail_subtitle" />
-
-			<TextView
-				style="@style/NextStep.Text.Title"
+			<LinearLayout
+				android:id="@+id/wtd_inform_faq_layout"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:gravity="center"
-				android:text="@string/inform_detail_title" />
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:src="@drawable/ill_positiv" />
+				android:orientation="vertical">
 
-			<androidx.cardview.widget.CardView
-				style="@style/NextStep.Card"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="@dimen/spacing_medium_large"
-				android:layout_marginTop="-20dp"
-				android:layout_marginEnd="@dimen/spacing_medium_large"
-				android:layout_marginBottom="@dimen/spacing_large"
-				android:elevation="@dimen/card_elevation">
+				<TextView
+					style="@style/NextStep.Text.Bold"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/spacing_small"
+					android:text="@string/inform_detail_faq1_title" />
 
 				<LinearLayout
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_medium_large"
-					android:layout_marginBottom="@dimen/spacing_medium_large"
-					android:orientation="vertical">
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginStart="@dimen/spacing_larger"
-						android:layout_marginEnd="@dimen/spacing_larger"
-						android:layout_marginBottom="@dimen/spacing_medium"
-						android:orientation="vertical">
-
-						<TextView
-							android:id="@+id/wtd_inform_box_supertitle"
-							style="@style/NextStep.Text.Bold.Purple"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/inform_detail_box_subtitle" />
-
-						<TextView
-							android:id="@+id/wtd_inform_box_title"
-							style="@style/NextStep.Text.Title"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/inform_detail_box_title" />
-
-						<TextView
-							android:id="@+id/wtd_inform_box_text"
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_marginTop="@dimen/spacing_medium_large"
-							android:text="@string/inform_detail_box_text" />
-
-						<Button
-							android:id="@+id/wtd_inform_button"
-							style="@style/NextStep.Button.Purple"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center_horizontal"
-							android:layout_marginTop="@dimen/spacing_very_large"
-							android:text="@string/inform_detail_box_button"
-							android:textAllCaps="true" />
+					android:orientation="horizontal">
 
-					</LinearLayout>
+					<ImageView
+						android:layout_width="@dimen/icon_size"
+						android:layout_height="@dimen/icon_size"
+						android:layout_marginRight="@dimen/spacing_medium_large"
+						android:src="@drawable/ic_verified_user"
+						android:tint="@color/purple_main" />
 
-					<androidx.constraintlayout.widget.ConstraintLayout
-						android:id="@+id/wtd_inform_infobox"
+					<TextView
+						style="@style/NextStep.Text"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginStart="@dimen/spacing_medium"
-						android:layout_marginTop="@dimen/spacing_large"
-						android:layout_marginEnd="@dimen/spacing_medium"
-						android:background="@color/status_purple_bg"
-						android:padding="@dimen/spacing_medium"
-						android:visibility="gone"
-						tools:visibility="visible">
-
-						<ImageView
-							android:id="@+id/wtd_inform_infobox_icon"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginEnd="@dimen/spacing_very_small"
-							android:src="@drawable/ic_info"
-							android:tint="@color/purple_main"
-							app:layout_constraintStart_toStartOf="parent"
-							app:layout_constraintTop_toTopOf="parent" />
-
-						<TextView
-							android:id="@+id/wtd_inform_infobox_title"
-							style="@style/NextStep.Text.Bold"
-							android:layout_width="0dp"
-							android:layout_height="wrap_content"
-							android:layout_marginStart="@dimen/spacing_medium"
-							android:layout_marginBottom="@dimen/spacing_very_small"
-							app:layout_constraintEnd_toEndOf="parent"
-							app:layout_constraintStart_toEndOf="@+id/wtd_inform_infobox_icon"
-							app:layout_constraintTop_toTopOf="parent"
-							tools:text="Infobox Title" />
-
-						<TextView
-							android:id="@+id/wtd_inform_infobox_msg"
-							style="@style/NextStep.Text"
-							android:layout_width="0dp"
-							android:layout_height="wrap_content"
-							app:layout_constraintEnd_toEndOf="parent"
-							app:layout_constraintStart_toStartOf="@+id/wtd_inform_infobox_title"
-							app:layout_constraintTop_toBottomOf="@+id/wtd_inform_infobox_title"
-							tools:text="Text for the Infobox" />
-
-						<LinearLayout
-							android:id="@+id/wtd_inform_infobox_link_layout"
-							android:layout_width="0dp"
-							android:layout_height="wrap_content"
-							android:layout_marginTop="@dimen/spacing_very_small"
-							android:background="@drawable/ripple_button"
-							android:orientation="horizontal"
-							android:paddingTop="@dimen/spacing_small"
-							android:paddingEnd="@dimen/spacing_medium"
-							android:paddingBottom="@dimen/spacing_small"
-							app:layout_constraintEnd_toStartOf="@+id/wtd_inform_infobox_link_hearing_impaired"
-							app:layout_constraintHorizontal_bias="0"
-							app:layout_constraintStart_toStartOf="@+id/wtd_inform_infobox_title"
-							app:layout_constraintTop_toBottomOf="@+id/wtd_inform_infobox_msg"
-							app:layout_constraintWidth_default="wrap">
-
-							<ImageView
-								android:id="@+id/wtd_inform_infobox_link_icon"
-								android:layout_width="@dimen/icon_size"
-								android:layout_height="@dimen/icon_size"
-								android:layout_gravity="center_vertical"
-								android:src="@drawable/ic_launch"
-								android:tint="@color/purple_main" />
-
-							<TextView
-								android:id="@+id/wtd_inform_infobox_link_text"
-								style="@style/NextStep.Text.Bold.Purple"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_marginLeft="@dimen/spacing_small"
-								tools:text="+41 12 345 67 89" />
-
-						</LinearLayout>
-
-						<LinearLayout
-							android:id="@+id/wtd_inform_infobox_link_hearing_impaired"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:background="@drawable/ripple_button"
-							android:orientation="horizontal"
-							android:padding="@dimen/spacing_small"
-							android:visibility="gone"
-							app:layout_constraintBottom_toBottomOf="@+id/wtd_inform_infobox_link_layout"
-							app:layout_constraintEnd_toEndOf="parent"
-							app:layout_constraintTop_toTopOf="@+id/wtd_inform_infobox_link_layout"
-							tools:visibility="visible">
-
-						<ImageView
-								android:layout_width="@dimen/icon_size"
-								android:layout_height="@dimen/icon_size"
-								android:src="@drawable/ic_hearing_impaired"
-								android:tint="@color/purple_main" />
-						</LinearLayout>
-
-					</androidx.constraintlayout.widget.ConstraintLayout>
+						android:text="@string/inform_detail_faq1_text" />
 
 				</LinearLayout>
 
-			</androidx.cardview.widget.CardView>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_huger"
-				android:layout_marginEnd="@dimen/spacing_large"
-				android:layout_marginBottom="@dimen/spacing_very_large"
-				android:orientation="vertical">
-
 				<LinearLayout
-					android:id="@+id/wtd_inform_faq_layout"
-					android:layout_width="match_parent"
+					android:id="@+id/wtd_inform_call_infoline_coronavirus"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:orientation="vertical">
+					android:layout_marginStart="@dimen/spacing_larger"
+					android:layout_marginTop="@dimen/spacing_very_small"
+					android:background="@drawable/ripple_button"
+					android:orientation="horizontal"
+					android:paddingStart="@dimen/spacing_medium"
+					android:paddingTop="@dimen/spacing_small"
+					android:paddingEnd="@dimen/spacing_medium"
+					android:paddingBottom="@dimen/spacing_small">
+
+					<ImageView
+						android:layout_width="@dimen/icon_size"
+						android:layout_height="@dimen/icon_size"
+						android:src="@drawable/ic_launch"
+						android:tint="@color/purple_main" />
 
 					<TextView
-						style="@style/NextStep.Text.Bold"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_small"
-						android:text="@string/inform_detail_faq1_title" />
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="horizontal">
-
-						<ImageView
-							android:layout_width="@dimen/icon_size"
-							android:layout_height="@dimen/icon_size"
-							android:layout_marginRight="@dimen/spacing_medium_large"
-							android:src="@drawable/ic_verified_user"
-							android:tint="@color/purple_main" />
-
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/inform_detail_faq1_text" />
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:id="@+id/wtd_inform_call_infoline_coronavirus"
+						style="@style/NextStep.Text.Bold.Purple"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_marginStart="@dimen/spacing_larger"
-						android:layout_marginTop="@dimen/spacing_very_small"
-						android:background="@drawable/ripple_button"
-						android:orientation="horizontal"
-						android:paddingStart="@dimen/spacing_medium"
-						android:paddingTop="@dimen/spacing_small"
-						android:paddingEnd="@dimen/spacing_medium"
-						android:paddingBottom="@dimen/spacing_small">
+						android:layout_marginLeft="@dimen/spacing_small"
+						android:text="@string/infoline_coronavirus_number" />
 
-						<ImageView
-							android:layout_width="@dimen/icon_size"
-							android:layout_height="@dimen/icon_size"
-							android:src="@drawable/ic_launch"
-							android:tint="@color/purple_main" />
+				</LinearLayout>
 
-						<TextView
-							style="@style/NextStep.Text.Bold.Purple"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginLeft="@dimen/spacing_small"
-							android:text="@string/infoline_coronavirus_number" />
+				<TextView
+					style="@style/NextStep.Text.Bold"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_very_large"
+					android:layout_marginBottom="@dimen/spacing_small"
+					android:text="@string/inform_detail_faq2_title" />
 
-					</LinearLayout>
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal"
+					android:paddingBottom="@dimen/spacing_medium">
+
+					<ImageView
+						android:layout_width="@dimen/icon_size"
+						android:layout_height="@dimen/icon_size"
+						android:layout_marginRight="@dimen/spacing_medium_large"
+						android:src="@drawable/ic_key"
+						android:tint="@color/purple_main" />
 
 					<TextView
-						style="@style/NextStep.Text.Bold"
+						style="@style/NextStep.Text"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginTop="@dimen/spacing_very_large"
-						android:layout_marginBottom="@dimen/spacing_small"
-						android:text="@string/inform_detail_faq2_title" />
+						android:text="@string/inform_detail_faq2_text" />
 
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="horizontal"
-						android:paddingBottom="@dimen/spacing_medium">
+				</LinearLayout>
 
-						<ImageView
-							android:layout_width="@dimen/icon_size"
-							android:layout_height="@dimen/icon_size"
-							android:layout_marginRight="@dimen/spacing_medium_large"
-							android:src="@drawable/ic_key"
-							android:tint="@color/purple_main" />
+				<TextView
+					style="@style/NextStep.Text.Bold"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_very_large"
+					android:layout_marginBottom="@dimen/spacing_small"
+					android:text="@string/inform_detail_faq3_title" />
 
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/inform_detail_faq2_text" />
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal"
+					android:paddingBottom="@dimen/spacing_medium">
 
-					</LinearLayout>
+					<ImageView
+						android:layout_width="@dimen/icon_size"
+						android:layout_height="@dimen/icon_size"
+						android:layout_marginRight="@dimen/spacing_medium_large"
+						android:src="@drawable/ic_person"
+						android:tint="@color/purple_main" />
 
 					<TextView
-						style="@style/NextStep.Text.Bold"
+						style="@style/NextStep.Text"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginTop="@dimen/spacing_very_large"
-						android:layout_marginBottom="@dimen/spacing_small"
-						android:text="@string/inform_detail_faq3_title" />
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="horizontal"
-						android:paddingBottom="@dimen/spacing_medium">
-
-						<ImageView
-							android:layout_width="@dimen/icon_size"
-							android:layout_height="@dimen/icon_size"
-							android:layout_marginRight="@dimen/spacing_medium_large"
-							android:src="@drawable/ic_person"
-							android:tint="@color/purple_main" />
-
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/inform_detail_faq3_text" />
-
-					</LinearLayout>
+						android:text="@string/inform_detail_faq3_text" />
 
 				</LinearLayout>
 
-				<Button
-					android:id="@+id/wtd_inform_faq_button"
-					style="@style/NextStep.Button.Outlined.Purple"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center_horizontal"
-					android:layout_marginStart="@dimen/spacing_medium"
-					android:layout_marginTop="@dimen/spacing_large"
-					android:layout_marginEnd="@dimen/spacing_medium"
-					android:layout_marginBottom="@dimen/spacing_huger"
-					android:drawableRight="@drawable/ic_launch_purple"
-					android:paddingStart="@dimen/padding_start_icon_button"
-					android:text="@string/faq_button_title" />
-
 			</LinearLayout>
 
+			<Button
+				android:id="@+id/wtd_inform_faq_button"
+				style="@style/NextStep.Button.Outlined.Purple"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginStart="@dimen/spacing_medium"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:layout_marginEnd="@dimen/spacing_medium"
+				android:layout_marginBottom="@dimen/spacing_huger"
+				android:drawableRight="@drawable/ic_launch_purple"
+				android:paddingStart="@dimen/padding_start_icon_button"
+				android:text="@string/faq_button_title" />
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index bd55e69c1..a35cedd8c 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1492,7 +1492,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1663,4 +1663,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b27303b4..0cbea7657 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1552,7 +1552,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code">"QR-Code erstellen"</string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title">"Veranstaltungen"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1728,4 +1728,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"Sie können nicht mehr einchecken, wenn Sie positiv getestet wurden."</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Schützen Sie sich selber und andere indem Sie QR Codes für Arbeitsplätze, Konferenzräume oder andere private Events erstellen."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d448f034c..616f2feb9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1483,7 +1483,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1654,4 +1654,7 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 64e8f9991..79cfc9508 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1518,7 +1518,7 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1689,4 +1689,7 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 7e113ce91..619b7f5c9 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1488,7 +1488,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1659,4 +1659,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 293d522d6..1925da572 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1526,7 +1526,7 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1697,4 +1697,7 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 7d4905acb..496afa74c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1493,7 +1493,7 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1664,4 +1664,7 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index b5a810982..ce603cd7a 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1488,7 +1488,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1659,4 +1659,7 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 708f63b9e..40c0f0cfb 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1493,7 +1493,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1664,4 +1664,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index f632c61fb..a94813b0b 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1488,7 +1488,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1659,4 +1659,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index e23e5e813..13a3ad5fd 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1468,7 +1468,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1639,4 +1639,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 160b07352..b7fadd7c5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1470,7 +1470,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1641,4 +1641,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5eb7e7e86..b7a4dd850 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1515,7 +1515,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel -->
+    <!-- Veranstaltungen-Card Titel im Infotab -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1686,4 +1686,7 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+
+    <!-- Veranstaltungen-Card Text im Infotab -->
+    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c3e132417..f99a5ad1e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -259,6 +259,7 @@
 	</style>
 
 	<style name="NextStep.Button.Outlined.Purple">
+		<item name="android:drawableTint">@color/purple_main</item>
 		<item name="android:textColor">@color/purple_main</item>
 		<item name="android:background">@drawable/bg_button_outlined_purple</item>
 	</style>

From ff73cbd720f0fde4f5f1b2bc4a643de60a9547d7 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 14 May 2021 17:46:38 +0200
Subject: [PATCH 038/207] Removed Tracing disabled error state from Home Screen

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  | 37 +-----------------
 .../bag/dp3t/home/TracingBoxFragment.java     |  8 ++--
 .../bag/dp3t/home/model/TracingState.java     |  7 ++--
 .../admin/bag/dp3t/home/views/HeaderView.java | 14 ++-----
 .../bag/dp3t/util/TracingStatusHelper.java    | 38 ++++++++-----------
 5 files changed, 27 insertions(+), 77 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 4ea8c6332..3b84cab65 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -11,7 +11,6 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -41,7 +40,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.dpppt.android.sdk.TracingStatus;
-import org.dpppt.android.sdk.internal.logger.Logger;
 
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.R;
@@ -52,7 +50,6 @@
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
 import ch.admin.bag.dp3t.home.model.NotificationState;
 import ch.admin.bag.dp3t.home.model.NotificationStateError;
-import ch.admin.bag.dp3t.home.model.TracingState;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
 import ch.admin.bag.dp3t.home.views.HeaderView;
 import ch.admin.bag.dp3t.inform.InformActivity;
@@ -230,8 +227,7 @@ private void setupInfobox() {
 
 	private void setupTracingView() {
 		TypedValue outValue = new TypedValue();
-		requireContext().getTheme().resolveAttribute(
-				android.R.attr.selectableItemBackground, outValue, true);
+		requireContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
 		tracingCard.setForeground(requireContext().getDrawable(outValue.resourceId));
 
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
@@ -291,14 +287,7 @@ public void onAnimationEnd(Animator animation) {
 			}
 
 			TracingStatus.ErrorState errorState = tracingStatusInterface.getReportErrorState();
-			if (tracingStatusInterface.getTracingState().equals(TracingState.NOT_ACTIVE) &&
-					!tracingStatusInterface.isReportedAsInfected()) {
-				NotificationErrorStateHelper
-						.updateNotificationErrorView(reportErrorView, NotificationStateError.TRACING_DEACTIVATED);
-				reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
-					enableTracing();
-				});
-			} else if (errorState != null) {
+			if (errorState != null) {
 				TracingErrorStateHelper
 						.updateErrorView(reportErrorView, errorState);
 				reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
@@ -532,26 +521,4 @@ public void onChanged(TracingStatusInterface tracingStatusInterface) {
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), observer);
 	}
 
-	private void enableTracing() {
-		Activity activity = getActivity();
-		if (activity == null) {
-			return;
-		}
-
-		tracingViewModel.enableTracing(activity,
-				() -> { },
-				e -> {
-					String message = ENExceptionHelper.getErrorMessage(e, activity);
-					Logger.e(TAG, message);
-					new AlertDialog.Builder(activity, R.style.NextStep_AlertDialogStyle)
-							.setTitle(R.string.android_en_start_failure)
-							.setMessage(message)
-							.setPositiveButton(R.string.android_button_ok, (dialog, which) -> {})
-							.show();
-				},
-				() -> {
-					// cancelled
-				});
-	}
-
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java
index bb1ad7aa5..9a35a8c1a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java
@@ -91,19 +91,17 @@ private void showStatus() {
 			} else if (tracingStatusInterface.isReportedAsInfected()) {
 				tracingStatusView.setVisibility(View.VISIBLE);
 				tracingErrorView.setVisibility(View.GONE);
-				TracingStatusHelper.updateStatusView(tracingStatusView, TracingState.ENDED, isHomeFragment);
+				TracingStatusHelper.updateStatusView(tracingStatusView, TracingState.ENDED);
 			} else if (!isTracing) {
 				tracingStatusView.setVisibility(View.GONE);
 				tracingErrorView.setVisibility(View.VISIBLE);
 				TracingStatusHelper.showTracingDeactivated(tracingErrorView, isHomeFragment);
 				TextView buttonView = tracingErrorView.findViewById(R.id.error_status_button);
-				buttonView.setOnClickListener(v -> {
-					enableTracing();
-				});
+				buttonView.setOnClickListener(v -> enableTracing());
 			} else {
 				tracingStatusView.setVisibility(View.VISIBLE);
 				tracingErrorView.setVisibility(View.GONE);
-				TracingStatusHelper.updateStatusView(tracingStatusView, TracingState.ACTIVE, isHomeFragment);
+				TracingStatusHelper.updateStatusView(tracingStatusView, TracingState.ACTIVE);
 			}
 		});
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/model/TracingState.java b/app/src/main/java/ch/admin/bag/dp3t/home/model/TracingState.java
index 8df30ca50..c65846a3d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/model/TracingState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/model/TracingState.java
@@ -34,13 +34,12 @@ int getTitle(TracingState tracingState) {
 	}
 
 	public static @StringRes
-	int getText(TracingState tracingState, boolean isHomeFragment) {
+	int getText(TracingState tracingState) {
 		switch (tracingState) {
 			case ACTIVE:
 				return R.string.tracing_active_text;
 			case NOT_ACTIVE:
-				if (isHomeFragment) return R.string.tracing_turned_off_text;
-				else return R.string.tracing_turned_off_detailed_text;
+				return R.string.tracing_turned_off_detailed_text;
 			case ENDED:
 				return R.string.tracing_ended_text;
 		}
@@ -53,7 +52,7 @@ int getIcon(TracingState tracingState) {
 			case ACTIVE:
 				return R.drawable.ic_check;
 			case NOT_ACTIVE:
-				return R.drawable.ic_warning_red;
+				return R.drawable.ic_info;
 			case ENDED:
 				return R.drawable.ic_stopp;
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/views/HeaderView.java b/app/src/main/java/ch/admin/bag/dp3t/home/views/HeaderView.java
index 346b5ff4e..ac85cec89 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/views/HeaderView.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/views/HeaderView.java
@@ -141,16 +141,10 @@ public void setState(TracingStatusInterface state) {
 						iconRes = R.drawable.ic_warning;
 				}
 			} else {
-				if (state.getTracingState() == TracingState.ACTIVE) {
-					iconRes = R.drawable.ic_begegnungen;
-					iconTintColor = R.color.white;
-					iconBgRes = R.drawable.bg_header_icon_on;
-					backgroundColor = getResources().getColor(R.color.header_bg_on, null);
-				} else {
-					iconRes = R.drawable.ic_warning_red;
-					iconBgRes = R.drawable.bg_header_icon_off;
-					backgroundColor = getResources().getColor(R.color.header_bg_off, null);
-				}
+				iconRes = R.drawable.ic_begegnungen;
+				iconTintColor = R.color.white;
+				iconBgRes = R.drawable.bg_header_icon_on;
+				backgroundColor = getResources().getColor(R.color.header_bg_on, null);
 			}
 		} else if (state.getNotificationState() == NotificationState.POSITIVE_TESTED) {
 			backgroundColor = getResources().getColor(R.color.header_bg_exposed, null);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
index 930ae7d4f..3f7661048 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
@@ -17,17 +17,18 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.content.ContextCompat;
+import androidx.core.widget.ImageViewCompat;
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.home.model.TracingState;
 
 public class TracingStatusHelper {
 
-	public static void updateStatusView(View statusView, TracingState state, boolean isHomeFragment) {
-		updateStatusView(statusView, state, true, isHomeFragment);
+	public static void updateStatusView(View statusView, TracingState state) {
+		updateStatusView(statusView, state, true);
 	}
 
-	public static void updateStatusView(View statusView, TracingState state, boolean displayIllu, boolean isHomeFragment) {
+	public static void updateStatusView(View statusView, TracingState state, boolean displayIllu) {
 		Context context = statusView.getContext();
 		if (TracingState.getBackgroundColor(state) != -1) {
 			statusView.findViewById(R.id.status_background)
@@ -49,8 +50,8 @@ public static void updateStatusView(View statusView, TracingState state, boolean
 		} else {
 			titleView.setVisibility(View.GONE);
 		}
-		if (TracingState.getText(state, isHomeFragment) != -1) {
-			textView.setText(TracingState.getText(state, isHomeFragment));
+		if (TracingState.getText(state) != -1) {
+			textView.setText(TracingState.getText(state));
 			textView.setVisibility(View.VISIBLE);
 		} else {
 			textView.setVisibility(View.GONE);
@@ -76,28 +77,19 @@ public static void updateStatusView(View statusView, TracingState state, boolean
 	}
 
 	public static void showTracingDeactivated(View tracingErrorView, boolean isHomeFragment) {
+		int darkMainColor = ContextCompat.getColor(tracingErrorView.getContext(), R.color.dark_main);
+
 		ImageView iconView = tracingErrorView.findViewById(R.id.error_status_image);
-		if (TracingState.getIcon(TracingState.NOT_ACTIVE) != -1) {
-			iconView.setImageResource(TracingState.getIcon(TracingState.NOT_ACTIVE));
-			iconView.setVisibility(View.VISIBLE);
-		} else {
-			iconView.setVisibility(View.GONE);
-		}
+		iconView.setImageResource(R.drawable.ic_info);
+		ImageViewCompat.setImageTintList(iconView, ColorStateList.valueOf(darkMainColor));
+
 		TextView titleView = tracingErrorView.findViewById(R.id.error_status_title);
-		if (TracingState.getTitle(TracingState.NOT_ACTIVE) != -1) {
-			titleView.setText(TracingState.getTitle(TracingState.NOT_ACTIVE));
-			titleView.setVisibility(View.VISIBLE);
-		} else {
-			titleView.setVisibility(View.GONE);
-		}
+		titleView.setText(TracingState.getTitle(TracingState.NOT_ACTIVE));
+		titleView.setTextColor(darkMainColor);
 
 		TextView textView = tracingErrorView.findViewById(R.id.error_status_text);
-		if (TracingState.getText(TracingState.NOT_ACTIVE, isHomeFragment) != -1) {
-			textView.setText(TracingState.getText(TracingState.NOT_ACTIVE, isHomeFragment));
-			textView.setVisibility(View.VISIBLE);
-		} else {
-			textView.setVisibility(View.GONE);
-		}
+		textView.setText(TracingState.getText(TracingState.NOT_ACTIVE));
+
 		tracingErrorView.findViewById(R.id.error_status_code).setVisibility(View.GONE);
 		TextView buttonView = tracingErrorView.findViewById(R.id.error_status_button);
 		if (isHomeFragment) {

From f5ac74011974b9f72f1aa822fde10c375c3718f3 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 13 May 2021 15:48:03 +0200
Subject: [PATCH 039/207] Share PDF with link

---
 .../checkin/generateqrcode/QrCodeFragment.kt  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 734ecaab9..d35edf8ee 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -14,14 +14,17 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
+import ch.admin.bag.dp3t.checkin.utils.getSubtitle
 import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
 import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
+import ch.admin.bag.dp3t.util.showFragment
 import com.google.protobuf.ByteString
 import org.crowdnotifier.android.sdk.model.VenueInfo
 import java.io.File
@@ -45,7 +48,7 @@ class QrCodeFragment : Fragment() {
 			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
 			titleTextview.text = venueInfo.title
-			subtitleTextview.text = "TODO"
+			subtitleTextview.text = venueInfo.getSubtitle()
 			qrCodeImageview.visibility = View.INVISIBLE
 			qrCodeLoadingProgressbar.isVisible = true
 			shareButton.isEnabled = false
@@ -59,7 +62,7 @@ class QrCodeFragment : Fragment() {
 			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) { pdfFile ->
 				shareButton.isEnabled = true
 				printPdfButton.isEnabled = true
-				shareButton.setOnClickListener { sharePdf(pdfFile) }
+				shareButton.setOnClickListener { sharePdf(pdfFile, venueInfo) }
 				printPdfButton.setOnClickListener { printPdf(pdfFile) }
 			}
 			qrCodeViewModel.generateQrCodeBitmap(venueInfo)
@@ -73,7 +76,7 @@ class QrCodeFragment : Fragment() {
 			checkinButton.setOnClickListener {
 				crowdNotifierViewModel.checkInState =
 					CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
-				showCheckInFragment()
+				showFragment(CheckInFragment.newInstance())
 			}
 		}.root
 	}
@@ -87,24 +90,18 @@ class QrCodeFragment : Fragment() {
 		}
 	}
 
-	private fun sharePdf(file: File) {
+	private fun sharePdf(file: File, venueInfo: VenueInfo) {
 		context?.let {
 			val pdfUri: Uri = FileProvider.getUriForFile(it, it.applicationContext.packageName.toString() + ".provider", file)
 
 			Intent().apply {
 				action = Intent.ACTION_SEND
 				type = "application/pdf"
+				putExtra(Intent.EXTRA_TEXT, venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX))
 				putExtra(Intent.EXTRA_STREAM, pdfUri)
+				addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 				startActivity(this)
 			}
 		}
 	}
-
-	private fun showCheckInFragment() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, CheckInFragment.newInstance())
-			.addToBackStack(CheckInFragment::class.java.canonicalName)
-			.commitAllowingStateLoss()
-	}
 }
\ No newline at end of file

From 14e0c7a0af21af2b353e466857133279e7e61fff Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 13 May 2021 16:30:23 +0200
Subject: [PATCH 040/207] Implemented confirmation dialog for deleting QR Codes

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   | 34 ++++---------------
 .../generateqrcode/EventsOverviewFragment.kt  | 28 ++++++---------
 .../checkin/generateqrcode/QrCodeAdapter.kt   |  3 +-
 .../checkin/generateqrcode/QrCodeFragment.kt  | 15 ++++++--
 .../res/layout/fragment_events_overview.xml   |  2 +-
 app/src/main/res/layout/fragment_qr_code.xml  |  2 +-
 app/src/main/res/layout/item_qr_code.xml      | 23 ++++++++-----
 app/src/main/res/values-bs/strings.xml        |  3 ++
 app/src/main/res/values-de/strings.xml        |  3 ++
 app/src/main/res/values-es/strings.xml        |  3 ++
 app/src/main/res/values-fr/strings.xml        |  3 ++
 app/src/main/res/values-hr/strings.xml        |  3 ++
 app/src/main/res/values-it/strings.xml        |  3 ++
 app/src/main/res/values-pt/strings.xml        |  3 ++
 app/src/main/res/values-rm/strings.xml        |  3 ++
 app/src/main/res/values-sq/strings.xml        |  3 ++
 app/src/main/res/values-sr/strings.xml        |  3 ++
 app/src/main/res/values-ti/strings.xml        |  3 ++
 app/src/main/res/values-tr/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  3 ++
 app/src/main/res/values/styles.xml            |  1 +
 21 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index a59a4a587..b44e5bdc2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -16,6 +16,7 @@ import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
+import ch.admin.bag.dp3t.util.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 
 class CheckinOverviewFragment : Fragment() {
@@ -31,7 +32,7 @@ class CheckinOverviewFragment : Fragment() {
 	private val tracingViewModel: TracingViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return FragmentCheckinOverviewBinding.inflate(layoutInflater).apply {
+		return FragmentCheckinOverviewBinding.inflate(inflater).apply {
 			checkinOverviewToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
 			checkinOverviewDiary.setOnClickListener { authenticateAndShowDiary() }
@@ -49,8 +50,8 @@ class CheckinOverviewFragment : Fragment() {
 				}
 			})
 
-			checkinButton.setOnClickListener { showQrCodeScannerFragment() }
-			checkoutButton.setOnClickListener { showCheckOutFragment() }
+			checkinButton.setOnClickListener { showFragment(QrCodeScannerFragment.newInstance()) }
+			checkoutButton.setOnClickListener { showFragment(CheckOutFragment.newInstance()) }
 
 			crowdNotifierViewModel.timeSinceCheckIn.observe(viewLifecycleOwner) { duration ->
 				checkinTime.text = StringUtil.getShortDurationString(duration)
@@ -58,22 +59,6 @@ class CheckinOverviewFragment : Fragment() {
 		}.root
 	}
 
-	private fun showCheckOutFragment() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
-			.addToBackStack(CheckOutFragment::class.java.canonicalName)
-			.commit()
-	}
-
-	private fun showQrCodeScannerFragment() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, QrCodeScannerFragment.newInstance())
-			.addToBackStack(QrCodeScannerFragment::class.java.canonicalName)
-			.commit()
-	}
-
 	private fun authenticateAndShowDiary() {
 		val biometricState = BiometricManager.from(requireContext())
 			.canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL or BiometricManager.Authenticators.BIOMETRIC_WEAK)
@@ -81,7 +66,7 @@ class CheckinOverviewFragment : Fragment() {
 			val executor = ContextCompat.getMainExecutor(requireContext())
 			val biometricPrompt = BiometricPrompt(requireActivity(), executor, object : BiometricPrompt.AuthenticationCallback() {
 				override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-					showDiaryFragment()
+					showFragment(DiaryFragment.newInstance())
 				}
 			})
 			val promptInfo = BiometricPrompt.PromptInfo.Builder()
@@ -92,15 +77,8 @@ class CheckinOverviewFragment : Fragment() {
 				.build()
 			biometricPrompt.authenticate(promptInfo)
 		} else {
-			showDiaryFragment()
+			showFragment(DiaryFragment.newInstance())
 		}
 	}
 
-	private fun showDiaryFragment() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, DiaryFragment.newInstance())
-			.addToBackStack(DiaryFragment::class.java.canonicalName)
-			.commit()
-	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index 080c10ab7..e5cd37956 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -4,10 +4,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
+import ch.admin.bag.dp3t.util.showFragment
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class EventsOverviewFragment : Fragment() {
@@ -24,15 +26,15 @@ class EventsOverviewFragment : Fragment() {
 
 			val adapter = QrCodeAdapter(object : OnClickListener {
 				override fun generateQrCode() {
-					showGenerateQrCodeScreen()
+					showFragment(GenerateQrCodeFragment.newInstance())
 				}
 
 				override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
-					showQrCodeFragment(qrCodeItem)
+					showFragment(QrCodeFragment.newInstance(qrCodeItem))
 				}
 
 				override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
-					qrCodeViewModel.deleteQrCode(qrCodeItem)
+					showDeleteConfirmationDialog(qrCodeItem)
 				}
 
 			})
@@ -44,20 +46,12 @@ class EventsOverviewFragment : Fragment() {
 		}.root
 	}
 
-	private fun showQrCodeFragment(venueInfo: VenueInfo) {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, QrCodeFragment.newInstance(venueInfo))
-			.addToBackStack(QrCodeFragment::class.java.canonicalName)
-			.commit()
-	}
-
-	private fun showGenerateQrCodeScreen() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			.replace(R.id.main_fragment_container, GenerateQrCodeFragment.newInstance())
-			.addToBackStack(GenerateQrCodeFragment::class.java.canonicalName)
-			.commit()
+	private fun showDeleteConfirmationDialog(venueInfo: VenueInfo) {
+		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.delete_qr_code_dialog)
+			.setPositiveButton(R.string.delete_button_title) { _, _ -> qrCodeViewModel.deleteQrCode(venueInfo) }
+			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+			.show()
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index f91632cab..062030c6f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -3,6 +3,7 @@ package ch.admin.bag.dp3t.checkin.generateqrcode
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import ch.admin.bag.dp3t.checkin.utils.getSubtitle
 import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeEmptyListBinding
@@ -88,7 +89,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 		override fun bind(item: VenueInfo) {
 			binding.apply {
 				qrCodeName.text = item.title
-				qrCodeLocation.text = "TODO"
+				qrCodeLocation.text = item.getSubtitle()
 				root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
 				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item) }
 			}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index d35edf8ee..ef67a5dd1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -9,6 +9,7 @@ import android.print.PrintManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.FileProvider
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -67,8 +68,7 @@ class QrCodeFragment : Fragment() {
 			}
 			qrCodeViewModel.generateQrCodeBitmap(venueInfo)
 			deleteButton.setOnClickListener {
-				qrCodeViewModel.deleteQrCode(venueInfo)
-				requireActivity().supportFragmentManager.popBackStack()
+				showDeleteConfirmationDialog(venueInfo)
 			}
 			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner) { isCheckedIn ->
 				checkinButton.isEnabled = !isCheckedIn
@@ -104,4 +104,15 @@ class QrCodeFragment : Fragment() {
 			}
 		}
 	}
+
+	private fun showDeleteConfirmationDialog(venueInfo: VenueInfo) {
+		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.delete_qr_code_dialog)
+			.setPositiveButton(R.string.delete_button_title) { _, _ ->
+				qrCodeViewModel.deleteQrCode(venueInfo)
+				requireActivity().supportFragmentManager.popBackStack()
+			}
+			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+			.show()
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_events_overview.xml b/app/src/main/res/layout/fragment_events_overview.xml
index 875c50fd3..3f6b08a9c 100644
--- a/app/src/main/res/layout/fragment_events_overview.xml
+++ b/app/src/main/res/layout/fragment_events_overview.xml
@@ -26,7 +26,7 @@
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/qr_list"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="match_parent"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index 3ebef1eae..6f9c4403c 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -100,7 +100,7 @@
 
 			<Button
 				android:id="@+id/delete_button"
-				style="@style/NextStep.Button.Transparent"
+				style="@style/NextStep.Button.Outlined.Red"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/spacing_huger"
diff --git a/app/src/main/res/layout/item_qr_code.xml b/app/src/main/res/layout/item_qr_code.xml
index d6843ef02..235a74c92 100644
--- a/app/src/main/res/layout/item_qr_code.xml
+++ b/app/src/main/res/layout/item_qr_code.xml
@@ -2,49 +2,54 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
 	android:layout_marginHorizontal="@dimen/spacing_medium_large"
 	android:layout_marginBottom="@dimen/spacing_medium_large"
-	android:layout_height="wrap_content">
+	android:foreground="?selectableItemBackground">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginVertical="@dimen/spacing_large"
 		android:layout_marginStart="@dimen/spacing_large"
-		android:layout_marginEnd="@dimen/spacing_medium"
 		android:orientation="horizontal">
 
 		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_marginVertical="@dimen/spacing_large"
 			android:src="@drawable/ic_qr_code" />
 
 		<LinearLayout
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
+			android:layout_marginVertical="@dimen/spacing_large"
 			android:layout_weight="1"
 			android:orientation="vertical"
 			android:paddingHorizontal="@dimen/spacing_medium_large">
 
 			<TextView
-				android:id="@+id/qr_code_location"
-				style="@style/NextStep.Text"
+				android:id="@+id/qr_code_name"
+				style="@style/NextStep.Text.Title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				tools:title="Sitzungsraum" />
+				tools:text="UB E21.7" />
 
 			<TextView
-				android:id="@+id/qr_code_name"
-				style="@style/NextStep.Text.Title"
+				android:id="@+id/qr_code_location"
+				style="@style/NextStep.Text"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				tools:title="UB E21.7" />
+				tools:text="Sitzungsraum" />
+
 		</LinearLayout>
 
 		<ImageView
 			android:id="@+id/qr_code_delete"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_rounded"
+			android:padding="@dimen/spacing_medium"
 			android:src="@drawable/ic_delete" />
 
 	</LinearLayout>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index a35cedd8c..a9a0678b4 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1666,4 +1666,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0cbea7657..779eafc72 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1731,4 +1731,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Schützen Sie sich selber und andere indem Sie QR Codes für Arbeitsplätze, Konferenzräume oder andere private Events erstellen."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen?"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 616f2feb9..6d14702fe 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1657,4 +1657,7 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 79cfc9508..a595af16b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1692,4 +1692,7 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 619b7f5c9..bb9daf4fe 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1662,4 +1662,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1925da572..8f0ae136d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1700,4 +1700,7 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 496afa74c..7842fd1ac 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1667,4 +1667,7 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index ce603cd7a..44dc2b0b6 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1662,4 +1662,7 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 40c0f0cfb..704916862 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1667,4 +1667,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a94813b0b..532765cae 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1662,4 +1662,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 13a3ad5fd..ffded7f03 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1642,4 +1642,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b7fadd7c5..d50f3a872 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1644,4 +1644,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7a4dd850..59971f09c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1689,4 +1689,7 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
     <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+
+    <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
+    <string name="delete_qr_code_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f99a5ad1e..f7479d3a5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -254,6 +254,7 @@
 	</style>
 
 	<style name="NextStep.Button.Outlined.Red">
+		<item name="android:drawableTint">@color/red_main</item>
 		<item name="android:textColor">@color/red_main</item>
 		<item name="android:background">@drawable/bg_button_outlined_red</item>
 	</style>

From b179a0314fc723a79acd179f318d856b3f3401f5 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 13 May 2021 17:17:30 +0200
Subject: [PATCH 041/207] QR-Code Screen Clean Ups

---
 .../checkin/generateqrcode/QrCodeFragment.kt  | 12 +++++++---
 .../admin/bag/dp3t/util/LiveDataExtensions.kt | 11 ++++++++++
 .../{ic_print_pdf.xml => ic_print.xml}        |  2 +-
 app/src/main/res/layout/fragment_qr_code.xml  | 22 +++++++++----------
 app/src/main/res/values-bs/strings.xml        |  3 +++
 app/src/main/res/values-de/strings.xml        |  3 +++
 app/src/main/res/values-es/strings.xml        |  3 +++
 app/src/main/res/values-fr/strings.xml        |  3 +++
 app/src/main/res/values-hr/strings.xml        |  3 +++
 app/src/main/res/values-it/strings.xml        |  3 +++
 app/src/main/res/values-pt/strings.xml        |  3 +++
 app/src/main/res/values-rm/strings.xml        |  3 +++
 app/src/main/res/values-sq/strings.xml        |  3 +++
 app/src/main/res/values-sr/strings.xml        |  3 +++
 app/src/main/res/values-ti/strings.xml        |  3 +++
 app/src/main/res/values-tr/strings.xml        |  3 +++
 app/src/main/res/values/strings.xml           |  3 +++
 17 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/LiveDataExtensions.kt
 rename app/src/main/res/drawable/{ic_print_pdf.xml => ic_print.xml} (56%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index ef67a5dd1..c65b5ef81 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -25,7 +25,9 @@ import ch.admin.bag.dp3t.checkin.utils.getSubtitle
 import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
 import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
+import ch.admin.bag.dp3t.util.combineWith
 import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import com.google.protobuf.ByteString
 import org.crowdnotifier.android.sdk.model.VenueInfo
 import java.io.File
@@ -42,11 +44,12 @@ class QrCodeFragment : Fragment() {
 
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
+	private val tracingViewModel: TracingViewModel by activityViewModels()
 
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
-			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+			toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
 			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
 			titleTextview.text = venueInfo.title
 			subtitleTextview.text = venueInfo.getSubtitle()
@@ -70,8 +73,11 @@ class QrCodeFragment : Fragment() {
 			deleteButton.setOnClickListener {
 				showDeleteConfirmationDialog(venueInfo)
 			}
-			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner) { isCheckedIn ->
-				checkinButton.isEnabled = !isCheckedIn
+			crowdNotifierViewModel.isCheckedIn.combineWith(tracingViewModel.appStatusLiveData) { isCheckedIn, appStatusInterface ->
+				// show self-checkin button only if user is not in isolation and is not checked in already
+				appStatusInterface?.isReportedAsInfected == false && isCheckedIn == false
+			}.observe(viewLifecycleOwner) { showCheckinButton ->
+				checkinButton.isVisible = showCheckinButton
 			}
 			checkinButton.setOnClickListener {
 				crowdNotifierViewModel.checkInState =
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/LiveDataExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/util/LiveDataExtensions.kt
new file mode 100644
index 000000000..77a05a502
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/LiveDataExtensions.kt
@@ -0,0 +1,11 @@
+package ch.admin.bag.dp3t.util
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+
+fun <T, K, R> LiveData<T>.combineWith(liveData: LiveData<K>, block: (T?, K?) -> R): LiveData<R> {
+	val result = MediatorLiveData<R>()
+	result.addSource(this) { result.value = block(this.value, liveData.value) }
+	result.addSource(liveData) { result.value = block(this.value, liveData.value) }
+	return result
+}
diff --git a/app/src/main/res/drawable/ic_print_pdf.xml b/app/src/main/res/drawable/ic_print.xml
similarity index 56%
rename from app/src/main/res/drawable/ic_print_pdf.xml
rename to app/src/main/res/drawable/ic_print.xml
index 4175e1d9d..79355cf2f 100644
--- a/app/src/main/res/drawable/ic_print_pdf.xml
+++ b/app/src/main/res/drawable/ic_print.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"
+      android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,3L6,3v4h12L18,3z"
       android:fillColor="#FFF"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index 6f9c4403c..f73f4193d 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -5,16 +5,15 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="@color/white"
-	android:orientation="vertical"
-	android:padding="@dimen/spacing_large">
+	android:orientation="vertical">
 
-	<TextView
-		android:id="@+id/cancel_button"
-		style="@style/NextStep.Text.Blue"
-		android:layout_width="wrap_content"
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="end"
-		android:text="@string/cancel" />
+		app:layout_constraintTop_toTopOf="parent"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back" />
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -23,7 +22,8 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical">
+			android:orientation="vertical"
+			android:padding="@dimen/spacing_large">
 
 			<TextView
 				android:id="@+id/title_textview"
@@ -76,7 +76,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/spacing_huger"
 				android:drawableEnd="@drawable/ic_check_in"
-				android:text="@string/checkin_button_title" />
+				android:text="@string/self_checkin_button_title" />
 
 			<Button
 				android:id="@+id/share_button"
@@ -95,7 +95,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/spacing_huger"
 				android:layout_marginTop="@dimen/spacing_medium_large"
-				android:drawableEnd="@drawable/ic_print_pdf"
+				android:drawableEnd="@drawable/ic_print"
 				android:text="@string/print_button_title" />
 
 			<Button
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index a9a0678b4..4dd96d739 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1669,4 +1669,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 779eafc72..06e49f3d4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1734,4 +1734,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen?"</string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title">"Selbst einchecken"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6d14702fe..8e6871156 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1660,4 +1660,7 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a595af16b..63187c9d0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1695,4 +1695,7 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index bb9daf4fe..7209e4428 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1665,4 +1665,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8f0ae136d..cf6c1f31a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1703,4 +1703,7 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 7842fd1ac..85688d622 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1670,4 +1670,7 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 44dc2b0b6..e335a6c95 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1665,4 +1665,7 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 704916862..5f3ba732c 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1670,4 +1670,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 532765cae..30c259615 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1665,4 +1665,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index ffded7f03..920c2ded7 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1645,4 +1645,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d50f3a872..71d409b83 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1647,4 +1647,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 59971f09c..ed867215d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1692,4 +1692,7 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
+
+    <!-- Self-Check-In Button Titel im QR-Code Screen -->
+    <string name="self_checkin_button_title"></string>
 </resources>
\ No newline at end of file

From 0ad9d1ba957c55d55f90d55d1064e3fb0785569d Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 13 May 2021 17:25:03 +0200
Subject: [PATCH 042/207] Update Entry QR-Code URLs

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3d9d1e094..83ea09c2d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,7 +71,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
@@ -85,7 +85,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-t.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.test.BUCKET_PUBLIC_KEY}\""
@@ -99,7 +99,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
@@ -113,7 +113,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
@@ -126,7 +126,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-dev.notify-me.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""

From 23b2fa22dca25ebc6e938b62c4232ec9afa18397 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 13 May 2021 17:32:26 +0200
Subject: [PATCH 043/207] Add icon to check-in button

---
 app/src/main/res/layout/fragment_check_in.xml | 1 +
 app/src/main/res/values/styles.xml            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index 9ce96bfe8..a4bc061ca 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -110,6 +110,7 @@
 		android:layout_gravity="center"
 		android:layout_marginHorizontal="@dimen/spacing_larger"
 		android:layout_marginVertical="@dimen/spacing_larger"
+		android:drawableEnd="@drawable/ic_check_in"
 		android:text="@string/check_in_now_button_title" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f7479d3a5..40e7fa04b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -190,6 +190,7 @@
 	<!-- Buttons -->
 
 	<style name="NextStep.Button" parent="Widget.MaterialComponents.Button">
+		<item name="android:drawableTint">@color/white</item>
 		<item name="android:textColor">@color/white</item>
 		<item name="android:textAllCaps">false</item>
 		<item name="android:fontFamily">@font/inter_bold</item>

From 13b3b9bdf0eda838d02d2c0da071ef1a80e749a0 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 14 May 2021 18:07:28 +0200
Subject: [PATCH 044/207] Replace hardcoded Strings

---
 app/src/main/res/layout/fragment_checkin_overview.xml | 4 ++--
 app/src/main/res/values-bs/strings.xml                | 3 +++
 app/src/main/res/values-de/strings.xml                | 3 +++
 app/src/main/res/values-es/strings.xml                | 3 +++
 app/src/main/res/values-fr/strings.xml                | 3 +++
 app/src/main/res/values-hr/strings.xml                | 3 +++
 app/src/main/res/values-it/strings.xml                | 3 +++
 app/src/main/res/values-pt/strings.xml                | 3 +++
 app/src/main/res/values-rm/strings.xml                | 3 +++
 app/src/main/res/values-sq/strings.xml                | 3 +++
 app/src/main/res/values-sr/strings.xml                | 3 +++
 app/src/main/res/values-ti/strings.xml                | 3 +++
 app/src/main/res/values-tr/strings.xml                | 3 +++
 app/src/main/res/values/strings.xml                   | 3 +++
 14 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 0de1edca1..082b02e60 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -73,7 +73,7 @@
 							android:layout_height="wrap_content"
 							android:layout_marginTop="@dimen/spacing_small"
 							android:gravity="center_horizontal"
-							android:text="[TBT] Hier wird eine Beschreibung sein." />
+							android:text="@string/checkin_overview_checkins_explanation" />
 
 						<Button
 							android:id="@+id/checkin_button"
@@ -100,7 +100,7 @@
 							android:layout_height="wrap_content"
 							android:layout_marginTop="@dimen/spacing_tiny_small"
 							android:gravity="center_horizontal"
-							android:text="[TBT] Sie sind eingecheckt." />
+							android:text="@string/checkin_checked_in" />
 
 						<TextView
 							android:id="@+id/checkin_time"
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 4dd96d739..7ba04c230 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1672,4 +1672,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 06e49f3d4..d86061043 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1737,4 +1737,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Selbst einchecken"</string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation">"Schützen Sie sich und andere indem Sie bei Events ein- und auschecken."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8e6871156..169aa3ab4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1663,4 +1663,7 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 63187c9d0..0caceac7a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1698,4 +1698,7 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 7209e4428..81a63c7ac 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1668,4 +1668,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index cf6c1f31a..ccdc3b7eb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1706,4 +1706,7 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 85688d622..1471af556 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1673,4 +1673,7 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index e335a6c95..fc2510b8d 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1668,4 +1668,7 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 5f3ba732c..286ea9a02 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1673,4 +1673,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 30c259615..309fd0923 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1668,4 +1668,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 920c2ded7..950f817d2 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1648,4 +1648,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 71d409b83..3e14433ca 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1650,4 +1650,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed867215d..0b9ac42ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1695,4 +1695,7 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title"></string>
+
+    <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
+    <string name="checkin_overview_checkins_explanation"></string>
 </resources>
\ No newline at end of file

From ab0b2933d393dda751cc8edd32005094d9c0cce2 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 14 May 2021 20:19:42 +0200
Subject: [PATCH 045/207] Clean up generate QR Code Screen, implement VenueInfo
 subtitle

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  4 +
 .../checkin/checkinflow/CheckInFragment.kt    |  2 +-
 .../generateqrcode/GenerateQrCodeFragment.kt  | 31 ++++---
 .../checkin/generateqrcode/QrCodeAdapter.kt   |  2 +-
 .../checkin/generateqrcode/QrCodeFragment.kt  |  2 +-
 .../FragmentExtensions.kt                     |  0
 .../LiveDataExtensions.kt                     |  0
 .../QrCodePayloadExtensions.kt                |  0
 .../VenueInfoExtensions.kt                    |  8 +-
 .../dp3t/extensions/VenueTypeExtensions.kt    | 22 +++++
 .../res/layout/fragment_checkin_overview.xml  |  5 +-
 .../res/layout/fragment_generate_qr_code.xml  | 90 +++++++++++++------
 12 files changed, 118 insertions(+), 48 deletions(-)
 rename app/src/main/java/ch/admin/bag/dp3t/{util => extensions}/FragmentExtensions.kt (100%)
 rename app/src/main/java/ch/admin/bag/dp3t/{util => extensions}/LiveDataExtensions.kt (100%)
 rename app/src/main/java/ch/admin/bag/dp3t/{checkin/utils => extensions}/QrCodePayloadExtensions.kt (100%)
 rename app/src/main/java/ch/admin/bag/dp3t/{checkin/utils => extensions}/VenueInfoExtensions.kt (89%)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index b44e5bdc2..47a3c507e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -14,6 +14,7 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
+import ch.admin.bag.dp3t.checkin.utils.getSubtitle
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
 import ch.admin.bag.dp3t.util.showFragment
@@ -46,7 +47,10 @@ class CheckinOverviewFragment : Fragment() {
 				checkoutView.isVisible = isCheckedIn
 				checkinView.isVisible = !isCheckedIn
 				if (isCheckedIn) {
+					val venueInfo = crowdNotifierViewModel.checkInState.venueInfo
 					crowdNotifierViewModel.startCheckInTimer()
+					checkinTitle.text = venueInfo.description
+					checkinSubtitle.setText(venueInfo.getSubtitle())
 				}
 			})
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 3c2dc9645..0cf535902 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -52,7 +52,7 @@ class CheckInFragment : Fragment() {
 			val venueInfo = viewModel.checkInState?.venueInfo ?: return root
 
 			titleTextview.text = venueInfo.title
-			subtitleTextview.text = venueInfo.getSubtitle()
+			subtitleTextview.setText(venueInfo.getSubtitle())
 			checkInButton.setOnClickListener {
 				performCheckIn(venueInfo)
 				popBackToHomeFragment()
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 762d87df2..7a9032dd3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -12,11 +12,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.RadioButton
+import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.checkin.models.VenueType
 import ch.admin.bag.dp3t.databinding.FragmentGenerateQrCodeBinding
+import ch.admin.bag.dp3t.extensions.getNameRes
 
+private const val KEY_SELECTED_VENUE_TYPE = "KEY_SELECTED_VENUE_TYPE"
 
 class GenerateQrCodeFragment : Fragment() {
 
@@ -32,18 +35,22 @@ class GenerateQrCodeFragment : Fragment() {
 			generateQrCodeCancel.setOnClickListener { popFragmentAndHideKeyboard() }
 
 			//TODO: Remove these hardcoded Events
-			val events = arrayListOf(EventType.PRIVATE_EVENT, EventType.MEETING_ROOM, EventType.OFFICE, EventType.OTHERS)
-			for (event in events) {
+			val venueTypes = arrayListOf(VenueType.PRIVATE_EVENT, VenueType.MEETING_ROOM, VenueType.OFFICE_SPACE, VenueType.OTHER)
+			val selectedVenueType =
+				VenueType.forNumber(savedInstanceState?.getInt(KEY_SELECTED_VENUE_TYPE) ?: VenueType.PRIVATE_EVENT.number)
+			for (venueType in venueTypes) {
 				val radioButton = RadioButton(requireContext())
-				radioButton.text = event.value
+				radioButton.setText(venueType.getNameRes())
 				radioButton.setRadioButtonColor()
+				radioButton.tag = venueType.number
 				generateQrCodeRadioGroup.addView(radioButton)
+				if (venueType == selectedVenueType) generateQrCodeRadioGroup.check(radioButton.id)
 			}
 			qrCodeGenerate.setOnClickListener {
-				//TODO: Set correct Venue Type
-				generateQrCode(titleEditText.text.toString(), VenueType.CAFETERIA)
+				generateQrCode(titleEditText.text.toString(), getSelectedVenueType())
 			}
-
+			qrCodeGenerate.isEnabled = !titleEditText.text.isNullOrBlank()
+			titleEditText.doOnTextChanged { text, _, _, _ -> qrCodeGenerate.isEnabled = !text.isNullOrBlank() }
 		}
 		return binding.root
 	}
@@ -59,11 +66,13 @@ class GenerateQrCodeFragment : Fragment() {
 		inputMethodManager.hideSoftInputFromWindow(binding.titleEditText.windowToken, 0)
 	}
 
-	enum class EventType(val value: String) {
-		PRIVATE_EVENT("Privater Event"),
-		MEETING_ROOM("Sitzungsraum"),
-		OFFICE("Büroräume"),
-		OTHERS("Andere")
+	private fun getSelectedVenueType() =
+		VenueType.forNumber(binding.root.findViewById<View>(binding.generateQrCodeRadioGroup.checkedRadioButtonId).tag as Int)
+
+
+	override fun onSaveInstanceState(outState: Bundle) {
+		outState.putInt(KEY_SELECTED_VENUE_TYPE, getSelectedVenueType().number)
+		super.onSaveInstanceState(outState)
 	}
 }
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index 062030c6f..170b152eb 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -89,7 +89,7 @@ class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter
 		override fun bind(item: VenueInfo) {
 			binding.apply {
 				qrCodeName.text = item.title
-				qrCodeLocation.text = item.getSubtitle()
+				qrCodeLocation.setText(item.getSubtitle())
 				root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
 				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item) }
 			}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index c65b5ef81..d9fa07ee5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -52,7 +52,7 @@ class QrCodeFragment : Fragment() {
 			toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
 			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
 			titleTextview.text = venueInfo.title
-			subtitleTextview.text = venueInfo.getSubtitle()
+			subtitleTextview.setText(venueInfo.getSubtitle())
 			qrCodeImageview.visibility = View.INVISIBLE
 			qrCodeLoadingProgressbar.isVisible = true
 			shareButton.isEnabled = false
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
similarity index 100%
rename from app/src/main/java/ch/admin/bag/dp3t/util/FragmentExtensions.kt
rename to app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/LiveDataExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/LiveDataExtensions.kt
similarity index 100%
rename from app/src/main/java/ch/admin/bag/dp3t/util/LiveDataExtensions.kt
rename to app/src/main/java/ch/admin/bag/dp3t/extensions/LiveDataExtensions.kt
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/QrCodePayloadExtensions.kt
similarity index 100%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/utils/QrCodePayloadExtensions.kt
rename to app/src/main/java/ch/admin/bag/dp3t/extensions/QrCodePayloadExtensions.kt
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
similarity index 89%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
rename to app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
index 4c55d38f1..9f6899460 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
@@ -1,8 +1,10 @@
 package ch.admin.bag.dp3t.checkin.utils
 
+import androidx.annotation.StringRes
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
+import ch.admin.bag.dp3t.extensions.getNameRes
 import com.google.protobuf.InvalidProtocolBufferException
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
@@ -20,9 +22,9 @@ fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
 	}
 }
 
-fun VenueInfo.getSubtitle(): String {
-	//TODO: This is to be defined what the subtitle will be for SwissCovid
-	return "*subtitle*"
+@StringRes
+fun VenueInfo.getSubtitle(): Int {
+	return getSwissCovidLocationData().type.getNameRes()
 }
 
 fun VenueInfo.toQrCodePayload(): QRCodePayload {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
new file mode 100644
index 000000000..71745f35e
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
@@ -0,0 +1,22 @@
+package ch.admin.bag.dp3t.extensions
+
+import androidx.annotation.StringRes
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.models.VenueType
+
+@StringRes
+fun VenueType.getNameRes(): Int {
+	return when (this) {
+		VenueType.MEETING_ROOM -> R.string.web_generator_category_meeting_room
+		VenueType.CAFETERIA -> R.string.web_generator_category_cafeteria
+		VenueType.PRIVATE_EVENT -> R.string.web_generator_category_private_event
+		VenueType.CANTEEN -> R.string.web_generator_category_canteen
+		VenueType.LIBRARY -> R.string.web_generator_category_library
+		VenueType.LECTURE_ROOM -> R.string.web_generator_category_lecture_room
+		VenueType.SHOP -> R.string.web_generator_category_shop
+		VenueType.GYM -> R.string.web_generator_category_gym
+		VenueType.KITCHEN_AREA -> R.string.web_generator_category_kitchen_area
+		VenueType.OFFICE_SPACE -> R.string.web_generator_category_office_space
+		else -> R.string.web_generator_category_other
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 082b02e60..c5ca69821 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -112,7 +112,7 @@
 							tools:text="20:32" />
 
 						<TextView
-							android:id="@+id/checkin_place"
+							android:id="@+id/checkin_title"
 							style="@style/NextStep.Text.Bold"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
@@ -121,6 +121,7 @@
 							tools:text="Reuss, Ubique" />
 
 						<TextView
+							android:id="@+id/checkin_subtitle"
 							style="@style/NextStep.Text"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
@@ -134,8 +135,6 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:layout_marginVertical="@dimen/spacing_medium_large"
-							android:drawableStart="@drawable/ic_qr"
-							android:drawableTint="@color/blue_main"
 							android:text="@string/checkout_button_title"
 							android:textAllCaps="false" />
 
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index 6b2fec1aa..b8bac73a4 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -13,8 +13,28 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="@color/white"
-	android:orientation="vertical"
-	android:padding="20dp">
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/white"
+		android:elevation="@dimen/card_elevation">
+
+		<TextView
+			android:id="@+id/generate_qr_code_cancel"
+			style="@style/NextStep.Text.Blue"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/cancel" />
+
+	</FrameLayout>
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -24,26 +44,19 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical">
-
-			<TextView
-				android:id="@+id/generate_qr_code_cancel"
-				style="@style/NextStep.Text.Blue"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="end"
-				android:text="@string/cancel" />
+			android:orientation="vertical"
+			android:padding="@dimen/spacing_large">
 
 			<TextView
 				style="@style/NextStep.Text.Title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_horizontal"
-				android:layout_marginVertical="@dimen/spacing_huge"
+				android:layout_marginVertical="@dimen/spacing_very_large"
 				android:text="@string/checkins_create_qr_code" />
 
 			<TextView
-				style="@style/NextStep.Text"
+				style="@style/NextStep.Text.Bold.Dark"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/web_generator_category_label"
@@ -53,37 +66,58 @@
 				android:id="@+id/generate_qr_code_radio_group"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_very_large"
+				android:layout_marginTop="@dimen/spacing_large"
 				android:layout_marginBottom="@dimen/spacing_huger" />
 
 			<TextView
-				style="@style/NextStep.Text"
+				style="@style/NextStep.Text.Bold.Dark"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/web_generator_title_label"
 				android:textAllCaps="true" />
 
-			<EditText
-				android:id="@+id/title_edit_text"
-				style="@style/NextStep.Text.Bold.Blue"
+			<com.google.android.material.textfield.TextInputLayout
+				style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginVertical="@dimen/spacing_large"
-				android:backgroundTint="@color/blue_main"
-				android:hint="@string/web_generator_title_placeholder"
-				app:backgroundTint="@color/blue_main" />
+				app:boxBackgroundColor="@color/light_grey"
+				app:boxStrokeWidth="0dp"
+				app:boxStrokeWidthFocused="0dp"
+				app:hintEnabled="false"
+				app:hintTextColor="@color/dark_main">
+
+				<com.google.android.material.textfield.TextInputEditText
+					android:id="@+id/title_edit_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:hint="@string/web_generator_title_placeholder"
+					android:inputType="textNoSuggestions"
+					android:textColor="@color/blue_main"
+					android:textStyle="bold" />
+
+			</com.google.android.material.textfield.TextInputLayout>
 
 		</LinearLayout>
 
 	</ScrollView>
 
-	<Button
-		android:id="@+id/qr_code_generate"
-		style="@style/NextStep.Button"
-		android:layout_width="wrap_content"
+	<FrameLayout
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal|bottom"
-		android:layout_marginTop="@dimen/spacing_medium"
-		android:text="@string/checkins_create_qr_code" />
+		android:background="@color/white"
+		android:elevation="@dimen/card_elevation">
+
+		<Button
+			android:id="@+id/qr_code_generate"
+			style="@style/NextStep.Button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal|bottom"
+			android:layout_marginTop="@dimen/spacing_medium"
+			android:layout_marginBottom="@dimen/spacing_large"
+			android:text="@string/checkins_create_qr_code" />
+
+	</FrameLayout>
 
 </LinearLayout>
\ No newline at end of file

From 2a733f536b1edc40251e5ccf01ae4d62acd5c333 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Sat, 15 May 2021 12:26:55 +0200
Subject: [PATCH 046/207] Improve Design of QR Code PDF

---
 .../dp3t/checkin/generateqrcode/PdfCreator.kt | 83 +++++++++++++++++++
 .../checkin/generateqrcode/QRCodeViewModel.kt | 21 ++---
 .../checkin/generateqrcode/QrCodeFragment.kt  |  2 +-
 3 files changed, 91 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
new file mode 100644
index 000000000..530321beb
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
@@ -0,0 +1,83 @@
+package ch.admin.bag.dp3t.checkin.generateqrcode
+
+import android.content.Context
+import android.graphics.*
+import android.graphics.pdf.PdfDocument
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.utils.getSubtitle
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+private const val PDF_WIDTH = 1240
+private const val PDF_HEIGHT = 1748
+
+fun createEntryPdf(venueInfo: VenueInfo, bitmap: Bitmap, context: Context): PdfDocument {
+	val w = PDF_WIDTH
+	val h = PDF_HEIGHT
+
+	val document = PdfDocument()
+	val pageInfo = PdfDocument.PageInfo.Builder(w, h, 1).create() // A4 size
+	val page = document.startPage(pageInfo)
+	page.canvas.apply {
+		drawText(venueInfo.description, w / 2f, 200f, titlePaint)
+		drawText(context.getString(venueInfo.getSubtitle()), w / 2f, 250f, subtitlePaint)
+
+		val indicatorOffset = 20f
+		val qrCodeY = 400f
+		drawLinesAroundQrCode(
+			start = (w - bitmap.width) / 2f - indicatorOffset,
+			top = qrCodeY - indicatorOffset,
+			end = w - (w - bitmap.width) / 2f + indicatorOffset,
+			bottom = qrCodeY + bitmap.height + indicatorOffset,
+			this,
+			ContextCompat.getColor(context, R.color.blue_main)
+		)
+		drawBitmap(bitmap, (w - bitmap.width) / 2f, qrCodeY, Paint())
+
+		//TODO: draw swisscovid logo and slogan...
+
+	}
+
+	document.finishPage(page)
+	return document
+
+}
+
+private val titlePaint = Paint().apply {
+	textAlign = Paint.Align.CENTER
+	textSize = 50f
+	typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
+}
+
+private val subtitlePaint = Paint().apply {
+	textAlign = Paint.Align.CENTER
+	textSize = 30f
+}
+
+private fun drawLinesAroundQrCode(start: Float, top: Float, end: Float, bottom: Float, canvas: Canvas, @ColorInt strokeColor: Int) {
+	val indicatorWidth = (end - start) / 5
+
+	val linePaint = Paint().apply {
+		color = strokeColor
+		strokeWidth = 8f
+		style = Paint.Style.STROKE
+	}
+	canvas.apply {
+		drawPath(Path().apply {
+			moveTo(start, top + indicatorWidth)
+			lineTo(start, top)
+			lineTo(start + indicatorWidth, top)
+			moveTo(end - indicatorWidth, top)
+			lineTo(end, top)
+			lineTo(end, top + indicatorWidth)
+			moveTo(end, bottom - indicatorWidth)
+			lineTo(end, bottom)
+			lineTo(end - indicatorWidth, bottom)
+			moveTo(start + indicatorWidth, bottom)
+			lineTo(start, bottom)
+			lineTo(start, bottom - indicatorWidth)
+
+		}, linePaint)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index d33816a7d..23427c73b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -3,8 +3,6 @@ package ch.admin.bag.dp3t.checkin.generateqrcode
 import android.app.Application
 import android.content.Context
 import android.graphics.Bitmap
-import android.graphics.Paint
-import android.graphics.pdf.PdfDocument
 import android.util.Base64
 import android.util.Log
 import androidx.datastore.core.DataStore
@@ -37,7 +35,7 @@ private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
 private const val QR_CODE_VALIDITY_DURATION_MS = 100000 * 24 * ONE_HOUR_IN_MILLIS // 100'000 days
 private val REMINDER_DELAY_OPTIONS_MS =
 	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120, 240).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, 120 and 240 minutes
-private const val QR_CODE_PIXEL_SIZE = 1000
+private const val QR_CODE_PIXEL_SIZE = 500
 const val QR_CODE_PDF_FILE_NAME = "swisscovid-qr-code.pdf"
 
 private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper> by dataStore(
@@ -47,7 +45,7 @@ private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper
 
 class QRCodeViewModel(application: Application) : AndroidViewModel(application) {
 
-	private val generatedQrCodesFlow = getApplication<Application>().generatedQrCodesDataStore.data.buffer(1).catch { exception ->
+	private val generatedQrCodesFlow = application.generatedQrCodesDataStore.data.buffer(1).catch { exception ->
 		if (exception is IOException) {
 			Log.e("QRCodeViewModel", "Error reading generated QR Codes.", exception)
 		} else {
@@ -55,6 +53,8 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		}
 	}
 
+	private val pdfDirectory = File(application.externalCacheDir, "pdfs").apply { if (!exists()) mkdirs() }
+
 	val generatedQrCodesLiveData = generatedQrCodesFlow.map { wrapper ->
 		wrapper.generatedQrCodesList.map { it.toVenueInfo() }
 	}.asLiveData()
@@ -99,19 +99,12 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		saveGeneratedQrCode(newWrapper)
 	}
 
-	fun createQrCodePdf(bitmap: Bitmap) = viewModelScope.launch(Dispatchers.IO) {
-
-		val directory = File(getApplication<Application>().externalCacheDir, "pdfs").apply { if (!exists()) mkdirs() }
-		val file = File(directory, QR_CODE_PDF_FILE_NAME)
+	fun createQrCodePdf(venueInfo: VenueInfo, bitmap: Bitmap) = viewModelScope.launch(Dispatchers.IO) {
 
-		val document = PdfDocument()
-		val pageInfo = PdfDocument.PageInfo.Builder(1240, 1748, 1).create() // A4 size
-		val page = document.startPage(pageInfo)
-		val canvas = page.canvas
+		val document = createEntryPdf(venueInfo, bitmap, getApplication())
 
-		canvas.drawBitmap(bitmap, 120f, 120f, Paint())
+		val file = File(pdfDirectory, QR_CODE_PDF_FILE_NAME)
 
-		document.finishPage(page)
 		FileOutputStream(file).use {
 			document.writeTo(it)
 			document.close()
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index d9fa07ee5..5d7184d02 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -61,7 +61,7 @@ class QrCodeFragment : Fragment() {
 				qrCodeImageview.visibility = View.VISIBLE
 				qrCodeLoadingProgressbar.isVisible = false
 				qrCodeImageview.setImageBitmap(it)
-				qrCodeViewModel.createQrCodePdf(it)
+				qrCodeViewModel.createQrCodePdf(venueInfo, it)
 			}
 			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) { pdfFile ->
 				shareButton.isEnabled = true

From ffa70d9dc8f6e87d1fdb3c24b22c4f02b1434437 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 17 May 2021 10:50:53 +0200
Subject: [PATCH 047/207] Remove Notification Error from CrowdNotifierViewModel

---
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  5 ----
 .../models/CrowdNotifierErrorState.java       |  2 --
 .../bag/dp3t/checkin/utils/ErrorHelper.java   | 23 ++++---------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 693d2ce2b..daa31aac7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -8,7 +8,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.NonNull;
-import androidx.core.app.NotificationManagerCompat;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
@@ -132,13 +131,9 @@ public void refreshTraceKeys() {
 	}
 
 	public void refreshErrors() {
-		//TODO: Also check for disabled notification channels
-		boolean notificationsEnabled = NotificationManagerCompat.from(getApplication()).areNotificationsEnabled();
 
 		if (traceKeyLoadingState.getValue() == LoadingState.FAILURE) {
 			errorState.setValue(CrowdNotifierErrorState.NETWORK);
-		} else if (!notificationsEnabled) {
-			errorState.setValue(CrowdNotifierErrorState.NOTIFICATIONS_DISABLED);
 		} else {
 			errorState.setValue(null);
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
index d5913b1ca..3ea8044cc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
@@ -7,8 +7,6 @@
 
 public enum CrowdNotifierErrorState {
 	NETWORK(R.string.error_network_title, R.string.error_network_text, R.string.error_action_retry, R.drawable.ic_error),
-	NOTIFICATIONS_DISABLED(R.string.error_notification_deactivated_title, R.string.error_notification_deactivated_text,
-			R.string.error_action_change_settings, R.drawable.ic_notification_off),
 	CAMERA_ACCESS_DENIED(R.string.error_camera_permission_title, R.string.error_camera_permission_text,
 			R.string.error_action_change_settings, R.drawable.ic_cam_off),
 	NO_VALID_QR_CODE(R.string.error_title, R.string.qrscanner_error, R.string.android_button_ok, R.drawable.ic_error),
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
index 8fd2df547..1b1c8025e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.graphics.Paint;
 import android.net.Uri;
-import android.os.Build;
 import android.provider.Settings;
 import android.view.View;
 import android.widget.ImageView;
@@ -17,12 +16,13 @@
 
 public class ErrorHelper {
 
-	public static void updateErrorView(View errorView, CrowdNotifierErrorState errorState, Runnable customButtonClickAction, Context context) {
+	public static void updateErrorView(View errorView, CrowdNotifierErrorState errorState, Runnable customButtonClickAction,
+			Context context) {
 		updateErrorView(errorView, errorState, customButtonClickAction, context, true);
 	}
 
-	public static void updateErrorView(View errorView, CrowdNotifierErrorState errorState, Runnable customButtonClickAction, Context context,
-			boolean showButton) {
+	public static void updateErrorView(View errorView, CrowdNotifierErrorState errorState, Runnable customButtonClickAction,
+			Context context, boolean showButton) {
 		((TextView) errorView.findViewById(R.id.error_status_title)).setText(errorState.getTitleResId());
 		((TextView) errorView.findViewById(R.id.error_status_text)).setText(errorState.getTextResId());
 		((ImageView) errorView.findViewById(R.id.error_status_image))
@@ -42,9 +42,6 @@ public static void updateErrorView(View errorView, CrowdNotifierErrorState error
 	private static void executeErrorAction(CrowdNotifierErrorState errorState, Runnable customButtonClickAction, Context context) {
 		if (customButtonClickAction != null) customButtonClickAction.run();
 		switch (errorState) {
-			case NOTIFICATIONS_DISABLED:
-				openNotificationSettings(context);
-				break;
 			case CAMERA_ACCESS_DENIED:
 				openApplicationSettings(context);
 				break;
@@ -65,16 +62,4 @@ private static void openApplicationSettings(Context context) {
 		context.startActivity(intent);
 	}
 
-	private static void openNotificationSettings(Context context) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
-			intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
-			context.startActivity(intent);
-		} else {
-			Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-			intent.setData(Uri.parse("package:" + context.getPackageName()));
-			context.startActivity(intent);
-		}
-	}
-
 }

From ea4b1b9383813097887c047df9beab2e951001f4 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 17 May 2021 14:01:49 +0200
Subject: [PATCH 048/207] Error on Homescreen for repeated unsuccessful chekin
 trace keys sync

---
 .../java/ch/admin/bag/dp3t/MainActivity.java  |   1 -
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  30 ++---
 .../CrowdNotifierKeyLoadWorker.java           |   8 +-
 .../networking/TraceKeysRepository.java       |   5 +-
 .../ch/admin/bag/dp3t/home/HomeFragment.java  | 106 ++++++++++--------
 .../admin/bag/dp3t/storage/SecureStorage.java |   9 ++
 .../dp3t/util/TracingErrorStateHelper.java    |  44 ++++++--
 7 files changed, 129 insertions(+), 74 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 010f2d589..533a8619d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -163,7 +163,6 @@ protected void onStart() {
 		super.onStart();
 		secureStorage.setAppOpenAfterNotificationPending(false);
 		crowdNotifierViewModel.refreshTraceKeys();
-		crowdNotifierViewModel.refreshErrors();
 		autoCheckoutIfNecessary(this, crowdNotifierViewModel.getCheckInState());
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index daa31aac7..f6b7e365a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -22,18 +22,20 @@
 import ch.admin.bag.dp3t.checkin.networking.TraceKeysRepository;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
-import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
 
-import static ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_EXPOSURE_NOTIFICATION;
+import static ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_TRACE_KEY_SYNC;
 import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
 
+
 public class CrowdNotifierViewModel extends AndroidViewModel {
 
+	private static final long MAX_DURATION_WITHOUT_SUCCESSFUL_DOWNLOAD = 24 * 60 * 60 * 1000L;
 
 	private final MutableLiveData<List<ExposureEvent>> exposures = new MutableLiveData<>();
 	private final MutableLiveData<Long> timeSinceCheckIn = new MutableLiveData<>(0L);
 	private final MutableLiveData<LoadingState> traceKeyLoadingState = new MutableLiveData<>(LoadingState.SUCCESS);
-	private final MutableLiveData<CrowdNotifierErrorState> errorState = new MutableLiveData<>(null);
+	private final MutableLiveData<Boolean> hasTraceKeyDownloadError = new MutableLiveData<>(false);
+
 	private final MutableLiveData<Boolean> isCheckedIn = new MutableLiveData<>(false);
 	private CheckInState checkInState;
 
@@ -48,8 +50,9 @@ public class CrowdNotifierViewModel extends AndroidViewModel {
 		public void onReceive(Context context, Intent intent) {
 			if (ACTION_DID_AUTO_CHECKOUT.equals(intent.getAction())) {
 				setCheckInState(null);
-			} else if (ACTION_NEW_EXPOSURE_NOTIFICATION.equals(intent.getAction())) {
+			} else if (ACTION_NEW_TRACE_KEY_SYNC.equals(intent.getAction())) {
 				refreshExposures();
+				refreshTraceKeyLoadingError();
 			}
 		}
 	};
@@ -62,11 +65,10 @@ public CrowdNotifierViewModel(@NonNull Application application) {
 		updateCheckedIn();
 		LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(application);
 		localBroadcastManager.registerReceiver(broadcastReceiver, new IntentFilter(ACTION_DID_AUTO_CHECKOUT));
-		localBroadcastManager.registerReceiver(broadcastReceiver, new IntentFilter(ACTION_NEW_EXPOSURE_NOTIFICATION));
-		traceKeyLoadingState.observeForever(loadingState -> { if (loadingState != LoadingState.LOADING) refreshErrors(); });
+		localBroadcastManager.registerReceiver(broadcastReceiver, new IntentFilter(ACTION_NEW_TRACE_KEY_SYNC));
+		refreshTraceKeyLoadingError();
 	}
 
-
 	public void startCheckInTimer() {
 		handler.removeCallbacks(timeUpdateRunnable);
 		timeUpdateRunnable = () -> {
@@ -109,9 +111,7 @@ public LiveData<LoadingState> getTraceKeyLoadingState() {
 		return traceKeyLoadingState;
 	}
 
-	public LiveData<CrowdNotifierErrorState> getErrorState() {
-		return errorState;
-	}
+	public LiveData<Boolean> hasTraceKeyLoadingError() { return hasTraceKeyDownloadError; }
 
 	public LiveData<Boolean> isCheckedIn() {
 		return isCheckedIn;
@@ -123,19 +123,21 @@ public void refreshTraceKeys() {
 			if (traceKeys == null) {
 				traceKeyLoadingState.setValue(LoadingState.FAILURE);
 			} else {
+				SecureStorage.getInstance(getApplication()).setLastSuccessfulCheckinDownload(System.currentTimeMillis());
 				CrowdNotifier.checkForMatches(traceKeys, getApplication());
 				refreshExposures();
 				traceKeyLoadingState.setValue(LoadingState.SUCCESS);
 			}
+			refreshTraceKeyLoadingError();
 		});
 	}
 
-	public void refreshErrors() {
+	private void refreshTraceKeyLoadingError() {
 
-		if (traceKeyLoadingState.getValue() == LoadingState.FAILURE) {
-			errorState.setValue(CrowdNotifierErrorState.NETWORK);
+		if (storage.getLastSuccesssfulCheckinDownload() <= System.currentTimeMillis() - MAX_DURATION_WITHOUT_SUCCESSFUL_DOWNLOAD) {
+			hasTraceKeyDownloadError.setValue(true);
 		} else {
-			errorState.setValue(null);
+			hasTraceKeyDownloadError.setValue(false);
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
index a5f13f7a1..d76e7e222 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
@@ -24,8 +24,8 @@
 
 public class CrowdNotifierKeyLoadWorker extends Worker {
 
-	public static final String ACTION_NEW_EXPOSURE_NOTIFICATION = BuildConfig.APPLICATION_ID + ".ACTION_NEW_EXPOSURE_NOTIFICATION";
-	private static final String WORK_TAG = "ch.ubique.notifyme.app.network.KeyLoadWorker";
+	public static final String ACTION_NEW_TRACE_KEY_SYNC = BuildConfig.APPLICATION_ID + ".ACTION_NEW_TRACE_KEY_SYNC";
+	private static final String WORK_TAG = "ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker";
 	private static final int DAYS_TO_KEEP_VENUE_VISITS = 14;
 	private static final int REPEAT_INTERVAL_MINUTES = 120;
 	private static final String LOG_TAG = "KeyLoadWorker";
@@ -57,6 +57,7 @@ public Result doWork() {
 		List<ProblematicEventInfo> problematicEventInfos = new TraceKeysRepository(getApplicationContext()).loadTraceKeys();
 		if (problematicEventInfos == null) {
 			Log.d(LOG_TAG, "KeyLoadWorker failure");
+			LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(new Intent(ACTION_NEW_TRACE_KEY_SYNC));
 			return Result.retry();
 		}
 		List<ExposureEvent> exposures = CrowdNotifier.checkForMatches(problematicEventInfos, getApplicationContext());
@@ -64,11 +65,12 @@ public Result doWork() {
 			for (ExposureEvent exposureEvent : exposures) {
 				NotificationHelper.getInstance(getApplicationContext()).showExposureNotification(exposureEvent.getId());
 			}
-			LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(new Intent(ACTION_NEW_EXPOSURE_NOTIFICATION));
 		}
 		cleanUpOldData(getApplicationContext());
 		autoCheckoutIfNecessary(getApplicationContext(), SecureStorage.getInstance(getApplicationContext()).getCheckInState());
 
+		SecureStorage.getInstance(getApplicationContext()).setLastSuccessfulCheckinDownload(System.currentTimeMillis());
+		LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(new Intent(ACTION_NEW_TRACE_KEY_SYNC));
 		Log.d(LOG_TAG, "KeyLoadWorker success");
 		return Result.success();
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index 98f9aee6f..f502b3d02 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -10,6 +10,7 @@
 import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
 import org.dpppt.android.sdk.DP3T;
 import org.dpppt.android.sdk.backend.UserAgentInterceptor;
+import org.jetbrains.annotations.NotNull;
 
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.checkin.models.ProblematicEvent;
@@ -47,7 +48,7 @@ public TraceKeysRepository(Context context) {
 	public void loadTraceKeysAsync(Callback callback) {
 		traceKeysService.getTraceKeys(storage.getCrowdNotifierLastKeyBundleTag()).enqueue(new retrofit2.Callback<ResponseBody>() {
 			@Override
-			public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+			public void onResponse(@NotNull Call<ResponseBody> call, @NotNull Response<ResponseBody> response) {
 				if (response.isSuccessful()) {
 					callback.onTraceKeysLoaded(handleSuccessfulResponse(response));
 				} else {
@@ -56,7 +57,7 @@ public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response)
 			}
 
 			@Override
-			public void onFailure(Call<ResponseBody> call, Throwable t) {
+			public void onFailure(@NotNull Call<ResponseBody> call, @NotNull Throwable t) {
 				callback.onTraceKeysLoaded(null);
 			}
 		});
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 3b84cab65..6b3e3918b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -47,6 +47,7 @@
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment;
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
 import ch.admin.bag.dp3t.home.model.NotificationState;
 import ch.admin.bag.dp3t.home.model.NotificationStateError;
@@ -262,55 +263,72 @@ private void setupNotification() {
 		cardNotifications.setOnClickListener(v -> showReportsFragment());
 
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
-			//update status view
-			if (loadingView.getVisibility() == VISIBLE) {
+			updateNotification(tracingStatusInterface, crowdNotifierViewModel.hasTraceKeyLoadingError().getValue());
+		});
+		crowdNotifierViewModel.hasTraceKeyLoadingError().observe(getViewLifecycleOwner(), hasTraceKeyLoadingError -> {
+			updateNotification(tracingViewModel.getAppStatusLiveData().getValue(), hasTraceKeyLoadingError);
+		});
+	}
+
+	private void updateNotification(TracingStatusInterface tracingStatusInterface, boolean hasTraceKeyLoadingError) {
+		//update status view
+		if (loadingView.getVisibility() == VISIBLE) {
+			loadingView.animate()
+					.setStartDelay(getResources().getInteger(android.R.integer.config_mediumAnimTime))
+					.setDuration(getResources().getInteger(android.R.integer.config_mediumAnimTime))
+					.alpha(0f)
+					.setListener(new AnimatorListenerAdapter() {
+						@Override
+						public void onAnimationEnd(Animator animation) {
+							loadingView.setVisibility(View.GONE);
+						}
+					});
+		} else {
+			loadingView.setVisibility(View.GONE);
+		}
+		if (tracingStatusInterface.isReportedAsInfected()) {
+			NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.POSITIVE_TESTED);
+		} else if (tracingStatusInterface.wasContactReportedAsExposed()) {
+			long daysSinceExposure = tracingStatusInterface.getDaysSinceExposure();
+			NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.EXPOSED, daysSinceExposure);
+		} else {
+			NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.NO_REPORTS);
+		}
+
+		TracingStatus.ErrorState errorState = tracingStatusInterface.getReportErrorState();
+		if (errorState != null) {
+			TracingErrorStateHelper.updateErrorView(reportErrorView, errorState);
+			reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
+				loadingView.setVisibility(VISIBLE);
 				loadingView.animate()
-						.setStartDelay(getResources().getInteger(android.R.integer.config_mediumAnimTime))
+						.alpha(1f)
 						.setDuration(getResources().getInteger(android.R.integer.config_mediumAnimTime))
-						.alpha(0f)
 						.setListener(new AnimatorListenerAdapter() {
 							@Override
-							public void onAnimationEnd(Animator animation) {
-								loadingView.setVisibility(View.GONE);
-							}
+							public void onAnimationEnd(Animator animation) { tracingViewModel.sync(); }
 						});
-			} else {
-				loadingView.setVisibility(View.GONE);
-			}
-			if (tracingStatusInterface.isReportedAsInfected()) {
-				NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.POSITIVE_TESTED);
-			} else if (tracingStatusInterface.wasContactReportedAsExposed()) {
-				long daysSinceExposure = tracingStatusInterface.getDaysSinceExposure();
-				NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.EXPOSED, daysSinceExposure);
-			} else {
-				NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.NO_REPORTS);
-			}
-
-			TracingStatus.ErrorState errorState = tracingStatusInterface.getReportErrorState();
-			if (errorState != null) {
-				TracingErrorStateHelper
-						.updateErrorView(reportErrorView, errorState);
-				reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
-					loadingView.setVisibility(VISIBLE);
-					loadingView.animate()
-							.alpha(1f)
-							.setDuration(getResources().getInteger(android.R.integer.config_mediumAnimTime))
-							.setListener(new AnimatorListenerAdapter() {
-								@Override
-								public void onAnimationEnd(Animator animation) { tracingViewModel.sync(); }
-							});
-				});
-			} else if (!isNotificationChannelEnabled(getContext(), NotificationUtil.NOTIFICATION_CHANNEL_ID)) {
-				NotificationErrorStateHelper
-						.updateNotificationErrorView(reportErrorView, NotificationStateError.NOTIFICATION_STATE_ERROR);
-				reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
-					openChannelSettings(NotificationUtil.NOTIFICATION_CHANNEL_ID);
-				});
-			} else {
-				//hide errorview
-				TracingErrorStateHelper.updateErrorView(reportErrorView, null);
-			}
-		});
+			});
+		} else if (hasTraceKeyLoadingError) {
+			TracingErrorStateHelper.updateErrorView(reportErrorView, CrowdNotifierErrorState.NETWORK);
+			reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
+				loadingView.setVisibility(VISIBLE);
+				loadingView.animate()
+						.alpha(1f)
+						.setDuration(getResources().getInteger(android.R.integer.config_mediumAnimTime))
+						.setListener(new AnimatorListenerAdapter() {
+							@Override
+							public void onAnimationEnd(Animator animation) { crowdNotifierViewModel.refreshTraceKeys(); }
+						});
+			});
+		} else if (!isNotificationChannelEnabled(getContext(), NotificationUtil.NOTIFICATION_CHANNEL_ID)) {
+			NotificationErrorStateHelper
+					.updateNotificationErrorView(reportErrorView, NotificationStateError.NOTIFICATION_STATE_ERROR);
+			reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
+				openChannelSettings(NotificationUtil.NOTIFICATION_CHANNEL_ID);
+			});
+		} else {
+			TracingErrorStateHelper.hideErrorView(reportErrorView);
+		}
 	}
 
 	private void openChannelSettings(String channelId) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 81e7af219..9f4087214 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -74,6 +74,7 @@ public class SecureStorage {
 	private static final String KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY = "positive_report_oldest_shared_key";
 	private static final String KEY_CURRENT_CHECK_IN = "KEY_CURRENT_CHECK_IN";
 	private static final String KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG = "KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG";
+	private static final String KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD = "KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD";
 
 	private static SecureStorage instance;
 
@@ -162,6 +163,14 @@ public int getLastShownContactId() {
 		return prefs.getInt(KEY_LAST_SHOWN_CONTACT_ID, -1);
 	}
 
+	public void setLastSuccessfulCheckinDownload(long time) {
+		prefs.edit().putLong(KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD, time).apply();
+	}
+
+	public long getLastSuccesssfulCheckinDownload() {
+		return prefs.getLong(KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD, System.currentTimeMillis());
+	}
+
 	public void setLastShownContactId(int contactId) {
 		prefs.edit().putInt(KEY_LAST_SHOWN_CONTACT_ID, contactId).apply();
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/TracingErrorStateHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/TracingErrorStateHelper.java
index bea66b2a3..a5be5d824 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/TracingErrorStateHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/TracingErrorStateHelper.java
@@ -25,6 +25,7 @@
 import org.dpppt.android.sdk.TracingStatus;
 
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
 
 public class TracingErrorStateHelper {
 
@@ -156,39 +157,62 @@ public static boolean isReportsErrorState(TracingStatus.ErrorState error) {
 		return possibleNotificationErrorStatesOrderedByPriority.contains(error);
 	}
 
+	public static void hideErrorView(View tracingErrorView) {
+		tracingErrorView.setVisibility(View.GONE);
+	}
+
+	public static void updateErrorView(View tracingErrorView, CrowdNotifierErrorState errorState) {
+		if (errorState == null) {
+			tracingErrorView.setVisibility(View.GONE);
+			return;
+		}
+		tracingErrorView.setVisibility(View.VISIBLE);
+
+		updateErrorView(tracingErrorView, errorState.getImageResId(), errorState.getTitleResId(),
+				tracingErrorView.getResources().getString(errorState.getTextResId()), "CNNET", errorState.getActionResId());
+	}
+
 	public static void updateErrorView(View tracingErrorView, TracingStatus.ErrorState errorState) {
 		if (errorState == null) {
 			tracingErrorView.setVisibility(View.GONE);
 			return;
 		}
 		tracingErrorView.setVisibility(View.VISIBLE);
+
+		updateErrorView(tracingErrorView, TracingErrorStateHelper.getIcon(errorState),
+				TracingErrorStateHelper.getTitle(errorState),
+				TracingErrorStateHelper.getText(tracingErrorView.getContext(), errorState),
+				TracingErrorStateHelper.getErrorCode(errorState),
+				TracingErrorStateHelper.getButtonText(errorState));
+	}
+
+	private static void updateErrorView(View tracingErrorView, @DrawableRes int icon, @StringRes int title, String text,
+			String errorCodeString, @StringRes int buttonTitle) {
 		ImageView iconView = tracingErrorView.findViewById(R.id.error_status_image);
 		TextView titleView = tracingErrorView.findViewById(R.id.error_status_title);
 		TextView textView = tracingErrorView.findViewById(R.id.error_status_text);
 		TextView errorCode = tracingErrorView.findViewById(R.id.error_status_code);
 		TextView buttonView = tracingErrorView.findViewById(R.id.error_status_button);
 
-		iconView.setImageResource(TracingErrorStateHelper.getIcon(errorState));
+		iconView.setImageResource(icon);
 		iconView.setVisibility(View.VISIBLE);
-
-		titleView.setText(TracingErrorStateHelper.getTitle(errorState));
+		titleView.setText(title);
 		titleView.setVisibility(View.VISIBLE);
 
-		if (TracingErrorStateHelper.getText(textView.getContext(), errorState) != null) {
-			textView.setText(TracingErrorStateHelper.getText(textView.getContext(), errorState));
+		if (text != null) {
+			textView.setText(text);
 			textView.setVisibility(View.VISIBLE);
 		} else {
 			textView.setVisibility(View.GONE);
 		}
-		if (!TextUtils.isEmpty(TracingErrorStateHelper.getErrorCode(errorState))) {
-			errorCode.setText(TracingErrorStateHelper.getErrorCode(errorState));
+		if (!TextUtils.isEmpty(errorCodeString)) {
+			errorCode.setText(errorCodeString);
 			errorCode.setVisibility(View.VISIBLE);
 		} else {
 			errorCode.setVisibility(View.GONE);
 		}
-
-		if (TracingErrorStateHelper.getButtonText(errorState) != -1) {
-			buttonView.setText(TracingErrorStateHelper.getButtonText(errorState));
+		if (buttonTitle != -1) {
+			buttonView.setText(buttonTitle);
 			buttonView.setVisibility(View.VISIBLE);
 			buttonView.setPaintFlags(buttonView.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 		} else {

From 6579e9d47ff58e2f63abd724d576876d2480d8c2 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 18 May 2021 13:33:10 +0200
Subject: [PATCH 049/207] Replace flash icons

---
 .../checkin/checkinflow/QrCodeScannerFragment.java     |  4 ++--
 app/src/main/res/drawable/ic_flash_off.xml             | 10 ----------
 app/src/main/res/drawable/ic_flash_on.xml              | 10 ----------
 app/src/main/res/drawable/ic_light_off.xml             | 10 ++++++++++
 app/src/main/res/drawable/ic_light_on.xml              | 10 ++++++++++
 app/src/main/res/layout/fragment_qr_code_scanner.xml   |  2 +-
 6 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_flash_off.xml
 delete mode 100644 app/src/main/res/drawable/ic_flash_on.xml
 create mode 100644 app/src/main/res/drawable/ic_light_off.xml
 create mode 100644 app/src/main/res/drawable/ic_light_on.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 588569735..5d3b95240 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -133,9 +133,9 @@ private void setupFlashButton(Camera camera) {
 
 		camera.getCameraInfo().getTorchState().observe(getViewLifecycleOwner(), v -> {
 			if (v == TorchState.ON) {
-				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_flash_off));
+				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_off));
 			} else {
-				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_flash_on));
+				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_on));
 			}
 		});
 
diff --git a/app/src/main/res/drawable/ic_flash_off.xml b/app/src/main/res/drawable/ic_flash_off.xml
deleted file mode 100644
index 060da882b..000000000
--- a/app/src/main/res/drawable/ic_flash_off.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#413F8D"
-		android:fillType="evenOdd"
-		android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_flash_on.xml b/app/src/main/res/drawable/ic_flash_on.xml
deleted file mode 100644
index 1660f9a29..000000000
--- a/app/src/main/res/drawable/ic_flash_on.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M7,2L7,13 10,13 10,22 17,10 13,10 17,2z"
-      android:fillColor="#413F8D"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_light_off.xml b/app/src/main/res/drawable/ic_light_off.xml
new file mode 100644
index 000000000..46eee91e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_light_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,20c0,1.657 -1.343,3 -3,3 -1.598,0 -2.904,-1.249 -2.995,-2.824L9,20h6zM18.056,20.192L15.864,18L8,18v-2.255C6.186,14.48 5,12.38 5,10c0,-0.854 0.153,-1.673 0.433,-2.43L2.5,4.636l1.414,-1.414L6.44,5.747l13.03,13.031 -1.414,1.414zM12,3c3.866,0 7,3.134 7,7 0,1.545 -0.5,2.973 -1.348,4.131L7.869,4.35C9.027,3.5 10.455,3 12,3z"
+      android:fillColor="#4A4969"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_light_on.xml b/app/src/main/res/drawable/ic_light_on.xml
new file mode 100644
index 000000000..ea685d0da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_light_on.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,20c0,1.657 -1.343,3 -3,3 -1.598,0 -2.904,-1.249 -2.995,-2.824L9,20h6zM12,3c3.866,0 7,3.134 7,7 0,2.378 -1.186,4.48 -2.999,5.744L16,18L8,18v-2.255C6.186,14.48 5,12.38 5,10c0,-3.866 3.134,-7 7,-7zM3.416,9.73v1.407L1.5,11.137L1.5,9.731h1.916zM22.5,9.73v1.407h-1.916L20.584,9.731L22.5,9.731zM3.26,4.607l1.66,0.952 -0.707,1.218 -1.66,-0.952 0.707,-1.218zM20.739,4.607l0.707,1.217 -1.66,0.953 -0.707,-1.218 1.66,-0.953zM7.362,1.041l0.959,1.65 -1.226,0.703 -0.958,-1.65 1.225,-0.703zM16.637,1.041l1.225,0.704 -0.958,1.65 -1.225,-0.704 0.958,-1.65zM12.707,0v1.9h-1.414L11.293,0h1.414z"
+      android:fillColor="#5094BF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_qr_code_scanner.xml b/app/src/main/res/layout/fragment_qr_code_scanner.xml
index 01fe78e4f..934d8102b 100644
--- a/app/src/main/res/layout/fragment_qr_code_scanner.xml
+++ b/app/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -186,7 +186,7 @@
 			android:elevation="@dimen/card_elevation"
 			android:paddingHorizontal="@dimen/spacing_huge"
 			android:paddingVertical="@dimen/spacing_small"
-			android:src="@drawable/ic_flash_on"
+			android:src="@drawable/ic_light_on"
 			android:tint="@color/primary"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent" />

From aad9557cdc759d9cc564e98b15f32ee875d0ffde Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 18 May 2021 13:48:16 +0200
Subject: [PATCH 050/207] Move Generate QR Code from Info Tab to Checkin
 Overview Fragment

---
 .../ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt  | 4 ++++
 .../java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt     | 2 --
 app/src/main/res/layout/fragment_checkin_overview.xml     | 8 ++++++++
 app/src/main/res/layout/fragment_info_tab.xml             | 6 ------
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 47a3c507e..b00867b86 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -14,6 +14,7 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.checkin.utils.getSubtitle
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
@@ -60,6 +61,9 @@ class CheckinOverviewFragment : Fragment() {
 			crowdNotifierViewModel.timeSinceCheckIn.observe(viewLifecycleOwner) { duration ->
 				checkinTime.text = StringUtil.getShortDurationString(duration)
 			}
+
+			qrCodeGenerate.root.setOnClickListener { showFragment(EventsOverviewFragment.newInstance()) }
+
 		}.root
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
index 0d0ea5c0c..f93ea9da1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
@@ -10,7 +10,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.databinding.FragmentInfoTabBinding
 import ch.admin.bag.dp3t.inform.InformActivity
 import ch.admin.bag.dp3t.storage.SecureStorage
@@ -41,7 +40,6 @@ class InfoTabFragment : Fragment() {
 			tracingViewModel.appStatusLiveData.observe(viewLifecycleOwner) { tracingStatusInterface ->
 				frameCardTest.root.isVisible = !tracingStatusInterface.isReportedAsInfected
 			}
-			qrCodeGenerate.root.setOnClickListener { showFragment(EventsOverviewFragment.newInstance()) }
 		}
 		setupTravelCard()
 		setupPositiveTestCard()
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index c5ca69821..4b1ce3787 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -248,6 +248,14 @@
 
 			</androidx.cardview.widget.CardView>
 
+			<include
+				android:id="@+id/qr_code_generate"
+				layout="@layout/card_generate_qr_code"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:layout_marginBottom="@dimen/spacing_medium_large" />
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/main/res/layout/fragment_info_tab.xml b/app/src/main/res/layout/fragment_info_tab.xml
index f91fc29dd..b0f301855 100644
--- a/app/src/main/res/layout/fragment_info_tab.xml
+++ b/app/src/main/res/layout/fragment_info_tab.xml
@@ -34,12 +34,6 @@
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="@dimen/spacing_very_large" />
 
-		<include
-			android:id="@+id/qr_code_generate"
-			layout="@layout/card_generate_qr_code"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-
 	</LinearLayout>
 
 </ScrollView>
\ No newline at end of file

From 33abec8b04b000a0197bb308cb27e35f9fa7ab53 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 18 May 2021 14:23:09 +0200
Subject: [PATCH 051/207] Finalized (as much as possible) PDF Generation

---
 .../dp3t/checkin/generateqrcode/PdfCreator.kt |  48 +++++---
 app/src/main/res/layout/pdf_qr_code.xml       | 112 ++++++++++++++++++
 app/src/main/res/values-bs/strings.xml        |  36 ++++++
 app/src/main/res/values-de/strings.xml        |  36 ++++++
 app/src/main/res/values-es/strings.xml        |  36 ++++++
 app/src/main/res/values-fr/strings.xml        |  36 ++++++
 app/src/main/res/values-hr/strings.xml        |  36 ++++++
 app/src/main/res/values-it/strings.xml        |  36 ++++++
 app/src/main/res/values-pt/strings.xml        |  36 ++++++
 app/src/main/res/values-rm/strings.xml        |  36 ++++++
 app/src/main/res/values-sq/strings.xml        |  36 ++++++
 app/src/main/res/values-sr/strings.xml        |  36 ++++++
 app/src/main/res/values-ti/strings.xml        |  36 ++++++
 app/src/main/res/values-tr/strings.xml        |  36 ++++++
 app/src/main/res/values/strings.xml           |  36 ++++++
 15 files changed, 610 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/layout/pdf_qr_code.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
index 530321beb..d51a07744 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
@@ -3,40 +3,54 @@ package ch.admin.bag.dp3t.checkin.generateqrcode
 import android.content.Context
 import android.graphics.*
 import android.graphics.pdf.PdfDocument
+import android.view.LayoutInflater
+import android.view.View
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.utils.getSubtitle
+import ch.admin.bag.dp3t.databinding.PdfQrCodeBinding
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
+
 private const val PDF_WIDTH = 1240
 private const val PDF_HEIGHT = 1748
 
 fun createEntryPdf(venueInfo: VenueInfo, bitmap: Bitmap, context: Context): PdfDocument {
-	val w = PDF_WIDTH
-	val h = PDF_HEIGHT
 
 	val document = PdfDocument()
-	val pageInfo = PdfDocument.PageInfo.Builder(w, h, 1).create() // A4 size
+	val pageInfo = PdfDocument.PageInfo.Builder(PDF_WIDTH, PDF_HEIGHT, 1).create() // A4 size
 	val page = document.startPage(pageInfo)
 	page.canvas.apply {
-		drawText(venueInfo.description, w / 2f, 200f, titlePaint)
-		drawText(context.getString(venueInfo.getSubtitle()), w / 2f, 250f, subtitlePaint)
-
 		val indicatorOffset = 20f
 		val qrCodeY = 400f
 		drawLinesAroundQrCode(
-			start = (w - bitmap.width) / 2f - indicatorOffset,
+			start = (PDF_WIDTH - bitmap.width) / 2f - indicatorOffset,
 			top = qrCodeY - indicatorOffset,
-			end = w - (w - bitmap.width) / 2f + indicatorOffset,
+			end = PDF_WIDTH - (PDF_WIDTH - bitmap.width) / 2f + indicatorOffset,
 			bottom = qrCodeY + bitmap.height + indicatorOffset,
 			this,
-			ContextCompat.getColor(context, R.color.blue_main)
+			swissCovidBlue
 		)
-		drawBitmap(bitmap, (w - bitmap.width) / 2f, qrCodeY, Paint())
+		drawBitmap(bitmap, (PDF_WIDTH - bitmap.width) / 2f, qrCodeY, Paint())
 
-		//TODO: draw swisscovid logo and slogan...
+		drawText(
+			context.getString(R.string.check_in_now_button_title),
+			PDF_WIDTH / 2f,
+			qrCodeY + bitmap.height + 2 * indicatorOffset,
+			blueCenteredBoldPaint
+		)
 
+		val pdfView = PdfQrCodeBinding.inflate(LayoutInflater.from(context)).apply {
+			title.text = venueInfo.title
+			subtitle.text = context.getString(venueInfo.getSubtitle())
+		}.root
+
+		pdfView.measure(
+			View.MeasureSpec.makeMeasureSpec(PDF_WIDTH, View.MeasureSpec.EXACTLY),
+			View.MeasureSpec.makeMeasureSpec(PDF_HEIGHT, View.MeasureSpec.EXACTLY)
+		)
+		pdfView.layout(0, 0, PDF_WIDTH, PDF_HEIGHT)
+		pdfView.draw(this)
 	}
 
 	document.finishPage(page)
@@ -44,15 +58,13 @@ fun createEntryPdf(venueInfo: VenueInfo, bitmap: Bitmap, context: Context): PdfD
 
 }
 
-private val titlePaint = Paint().apply {
-	textAlign = Paint.Align.CENTER
-	textSize = 50f
-	typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
-}
+private val swissCovidBlue = Color.parseColor("#5094bf")
 
-private val subtitlePaint = Paint().apply {
+private val blueCenteredBoldPaint = Paint().apply {
+	color = swissCovidBlue
 	textAlign = Paint.Align.CENTER
 	textSize = 30f
+	typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
 }
 
 private fun drawLinesAroundQrCode(start: Float, top: Float, end: Float, bottom: Float, canvas: Canvas, @ColorInt strokeColor: Int) {
diff --git a/app/src/main/res/layout/pdf_qr_code.xml b/app/src/main/res/layout/pdf_qr_code.xml
new file mode 100644
index 000000000..e73ad5051
--- /dev/null
+++ b/app/src/main/res/layout/pdf_qr_code.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="90px"
+	tools:layout_height="1748px"
+	tools:layout_width="1240px">
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_horizontal"
+		android:textColor="@android:color/black"
+		android:textSize="50px"
+		android:textStyle="bold"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Title" />
+
+	<TextView
+		android:id="@+id/subtitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_horizontal"
+		android:textColor="@android:color/black"
+		android:textSize="40px"
+		app:layout_constraintTop_toBottomOf="@id/title"
+		tools:text="Subtitle" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="200px"
+		android:layout_marginBottom="50px"
+		android:orientation="vertical"
+		app:layout_constraintBottom_toTopOf="@id/swisscovid_icon"
+		app:layout_constraintStart_toStartOf="parent">
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/pdf_headline"
+			android:textColor="@color/blue_main"
+			android:textSize="40px" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/pdf_slogan"
+			android:textColor="@android:color/black"
+			android:textSize="70px"
+			android:textStyle="bold" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/pdf_explanation"
+			android:textColor="@android:color/black"
+			android:textSize="40px" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		android:layout_marginStart="20px"
+		android:gravity="center_vertical"
+		android:orientation="vertical"
+		app:layout_constraintBottom_toBottomOf="@id/swisscovid_icon"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/swisscovid_icon"
+		app:layout_constraintTop_toTopOf="@id/swisscovid_icon">
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/pdf_swisscovid_app"
+			android:textColor="@android:color/black"
+			android:textSize="40px"
+			android:textStyle="bold" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/pdf_download_app"
+			android:textColor="@color/blue_main"
+			android:textSize="25px" />
+
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/swisscovid_icon"
+		android:layout_width="90px"
+		android:layout_height="90px"
+		android:src="@mipmap/ic_launcher"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toStartOf="parent" />
+
+	<ImageView
+		android:layout_width="600px"
+		android:layout_height="600px"
+		android:layout_marginTop="250px"
+		android:visibility="gone"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:src="@drawable/ic_qr_code"
+		tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 7ba04c230..4df797f1e 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1675,4 +1675,40 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d86061043..987e42816 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1740,4 +1740,40 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation">"Schützen Sie sich und andere indem Sie bei Events ein- und auschecken."</string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title">"Sichern nicht möglich"</string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description">"Ihre gewählten Zeiten überschneiden sich mit anderen Check-Ins aus ihrem Tagebuch. Bitte überprüfen Sie nochmals Ihre Angabe."</string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Ihre ausgewählten Check-Ins wurden gesendet. Andere Leute, welche zur gleichen Zeit an den selben Events eingecheckt waren werden benachrichtigt."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline">"SwissCovid Check-Ins"</string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan">"Einchecken ohne Daten zu hinterlassen"</string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation">"Mit der SwissCovid App können Sie sich bei uns einfach einchecken ohne Ihre Daten zu hinterlassen. Bei einer Risikosituation werden Sie in der App schnell informiert."</string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app">"SwissCovid App"</string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app">"Jetzt downloaden"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 169aa3ab4..5c1a1e361 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1666,4 +1666,40 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0caceac7a..95395e56a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1701,4 +1701,40 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 81a63c7ac..ecd5f6050 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1671,4 +1671,40 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ccdc3b7eb..9a1227064 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1709,4 +1709,40 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1471af556..6ba737208 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1676,4 +1676,40 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index fc2510b8d..8a5461999 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1671,4 +1671,40 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 286ea9a02..4c8e9f065 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1676,4 +1676,40 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 309fd0923..35611deb7 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1671,4 +1671,40 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 950f817d2..d408a2863 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1651,4 +1651,40 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3e14433ca..c5a75e5ae 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1653,4 +1653,40 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b9ac42ed..6f2f62bd8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1698,4 +1698,40 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
     <string name="checkin_overview_checkins_explanation"></string>
+
+    <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_title"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
+    <string name="checkout_overlapping_alert_description"></string>
+
+    <!-- Informieren: Danke Text Checkins Teil -->
+    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, titel -->
+    <string name="inform_are_you_sure_title">"Are you sure?"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, text -->
+    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
+    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
+
+    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
+    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+
+    <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
+    <string name="pdf_headline"></string>
+
+    <!-- SwissCovid QR Code PDF: Slogan -->
+    <string name="pdf_slogan"></string>
+
+    <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
+    <string name="pdf_explanation"></string>
+
+    <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
+    <string name="pdf_swisscovid_app"></string>
+
+    <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
+    <string name="pdf_download_app"></string>
 </resources>
\ No newline at end of file

From c0bfcb5477805e8e92c0dc080375683067b212a2 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 18 May 2021 14:32:01 +0200
Subject: [PATCH 052/207] Remove Link from Share QR Code PDF Intent

---
 .../bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt  |  5 ++---
 .../main/java/ch/admin/bag/dp3t/home/HomeFragment.java | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 5d7184d02..806d820d4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -66,7 +66,7 @@ class QrCodeFragment : Fragment() {
 			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) { pdfFile ->
 				shareButton.isEnabled = true
 				printPdfButton.isEnabled = true
-				shareButton.setOnClickListener { sharePdf(pdfFile, venueInfo) }
+				shareButton.setOnClickListener { sharePdf(pdfFile) }
 				printPdfButton.setOnClickListener { printPdf(pdfFile) }
 			}
 			qrCodeViewModel.generateQrCodeBitmap(venueInfo)
@@ -96,14 +96,13 @@ class QrCodeFragment : Fragment() {
 		}
 	}
 
-	private fun sharePdf(file: File, venueInfo: VenueInfo) {
+	private fun sharePdf(file: File) {
 		context?.let {
 			val pdfUri: Uri = FileProvider.getUriForFile(it, it.applicationContext.packageName.toString() + ".provider", file)
 
 			Intent().apply {
 				action = Intent.ACTION_SEND
 				type = "application/pdf"
-				putExtra(Intent.EXTRA_TEXT, venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX))
 				putExtra(Intent.EXTRA_STREAM, pdfUri)
 				addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 				startActivity(this)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 6b3e3918b..d538b4765 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -262,12 +262,10 @@ private void showReportsFragment() {
 	private void setupNotification() {
 		cardNotifications.setOnClickListener(v -> showReportsFragment());
 
-		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
-			updateNotification(tracingStatusInterface, crowdNotifierViewModel.hasTraceKeyLoadingError().getValue());
-		});
-		crowdNotifierViewModel.hasTraceKeyLoadingError().observe(getViewLifecycleOwner(), hasTraceKeyLoadingError -> {
-			updateNotification(tracingViewModel.getAppStatusLiveData().getValue(), hasTraceKeyLoadingError);
-		});
+		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface ->
+				updateNotification(tracingStatusInterface, crowdNotifierViewModel.hasTraceKeyLoadingError().getValue()));
+		crowdNotifierViewModel.hasTraceKeyLoadingError().observe(getViewLifecycleOwner(), hasTraceKeyLoadingError ->
+				updateNotification(tracingViewModel.getAppStatusLiveData().getValue(), hasTraceKeyLoadingError));
 	}
 
 	private void updateNotification(TracingStatusInterface tracingStatusInterface, boolean hasTraceKeyLoadingError) {

From 37a265193f30f97dd1912775bc5089a015c785b8 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 18 May 2021 16:08:43 +0200
Subject: [PATCH 053/207] Finalized PDF Generation

---
 .../dp3t/checkin/generateqrcode/PdfCreator.kt | 19 ++++---
 .../checkin/generateqrcode/QRCodeViewModel.kt | 34 +++++++------
 .../bag/dp3t/checkin/generateqrcode/QrCode.kt | 22 ++++++++
 .../checkin/generateqrcode/QrCodeFragment.kt  |  5 +-
 app/src/main/res/drawable/pdf_icon.xml        | 50 +++++++++++++++++++
 app/src/main/res/layout/pdf_qr_code.xml       | 48 ++++++++++--------
 6 files changed, 133 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/drawable/pdf_icon.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
index d51a07744..626dc5390 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
@@ -6,23 +6,28 @@ import android.graphics.pdf.PdfDocument
 import android.view.LayoutInflater
 import android.view.View
 import androidx.annotation.ColorInt
+import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.utils.getSubtitle
 import ch.admin.bag.dp3t.databinding.PdfQrCodeBinding
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 
-private const val PDF_WIDTH = 1240
-private const val PDF_HEIGHT = 1748
+private const val PDF_WIDTH = 595
+private const val PDF_HEIGHT = 842
+private const val PDF_QR_CODE_MAX_PIXEL_SIZE = 310
 
-fun createEntryPdf(venueInfo: VenueInfo, bitmap: Bitmap, context: Context): PdfDocument {
+fun createEntryPdf(venueInfo: VenueInfo, context: Context): PdfDocument {
+
+	val bitmap =
+		QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX)).renderToMaxSizeBitmap(PDF_QR_CODE_MAX_PIXEL_SIZE)
 
 	val document = PdfDocument()
 	val pageInfo = PdfDocument.PageInfo.Builder(PDF_WIDTH, PDF_HEIGHT, 1).create() // A4 size
 	val page = document.startPage(pageInfo)
 	page.canvas.apply {
-		val indicatorOffset = 20f
-		val qrCodeY = 400f
+		val indicatorOffset = 15f
+		val qrCodeY = 150f
 		drawLinesAroundQrCode(
 			start = (PDF_WIDTH - bitmap.width) / 2f - indicatorOffset,
 			top = qrCodeY - indicatorOffset,
@@ -63,7 +68,7 @@ private val swissCovidBlue = Color.parseColor("#5094bf")
 private val blueCenteredBoldPaint = Paint().apply {
 	color = swissCovidBlue
 	textAlign = Paint.Align.CENTER
-	textSize = 30f
+	textSize = 13f
 	typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
 }
 
@@ -72,7 +77,7 @@ private fun drawLinesAroundQrCode(start: Float, top: Float, end: Float, bottom:
 
 	val linePaint = Paint().apply {
 		color = strokeColor
-		strokeWidth = 8f
+		strokeWidth = 6f
 		style = Paint.Style.STROKE
 	}
 	canvas.apply {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 23427c73b..b4e5528dc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -23,6 +23,7 @@ import org.crowdnotifier.android.sdk.model.VenueInfo
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import kotlin.math.max
 
 
 private const val MASTER_PUBLIC_KEY_BASE64 =
@@ -35,7 +36,7 @@ private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
 private const val QR_CODE_VALIDITY_DURATION_MS = 100000 * 24 * ONE_HOUR_IN_MILLIS // 100'000 days
 private val REMINDER_DELAY_OPTIONS_MS =
 	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120, 240).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, 120 and 240 minutes
-private const val QR_CODE_PIXEL_SIZE = 500
+private const val MAX_QR_CODE_PIXEL_SIZE = 1000
 const val QR_CODE_PDF_FILE_NAME = "swisscovid-qr-code.pdf"
 
 private val Context.generatedQrCodesDataStore: DataStore<GeneratedQrCodesWrapper> by dataStore(
@@ -72,7 +73,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		saveGeneratedQrCode(builder.build())
 	}
 
-	fun generateAndSaveQrCode(description: String, venueType: VenueType) = viewModelScope.launch {
+	fun generateAndSaveQrCode(description: String, venueType: VenueType) = viewModelScope.launch(Dispatchers.IO) {
 
 		val swissCovidLocationData = SwissCovidLocationData.newBuilder()
 			.setVersion(SWISSCOVID_LOCATION_DATA_VERSION)
@@ -99,24 +100,25 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		saveGeneratedQrCode(newWrapper)
 	}
 
-	fun createQrCodePdf(venueInfo: VenueInfo, bitmap: Bitmap) = viewModelScope.launch(Dispatchers.IO) {
+	fun generateQrCodeBitmapAndPdf(venueInfo: VenueInfo, qrCodeSize: Int) = viewModelScope.launch(Dispatchers.IO) {
+		launch(Dispatchers.IO) {
+			selectedQrCodeBitmap.postValue(
+				QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX))
+					.renderToBitmap(max(qrCodeSize, MAX_QR_CODE_PIXEL_SIZE))
+			)
+		}
+		launch(Dispatchers.IO) {
+			val document = createEntryPdf(venueInfo, getApplication())
 
-		val document = createEntryPdf(venueInfo, bitmap, getApplication())
+			val file = File(pdfDirectory, QR_CODE_PDF_FILE_NAME)
 
-		val file = File(pdfDirectory, QR_CODE_PDF_FILE_NAME)
+			FileOutputStream(file).use {
+				document.writeTo(it)
+				document.close()
+			}
 
-		FileOutputStream(file).use {
-			document.writeTo(it)
-			document.close()
+			selectedQrCodePdf.postValue(file)
 		}
-
-		selectedQrCodePdf.postValue(file)
-	}
-
-	fun generateQrCodeBitmap(venueInfo: VenueInfo) = viewModelScope.launch(Dispatchers.IO) {
-		selectedQrCodeBitmap.postValue(
-			QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX)).renderToBitmap(QR_CODE_PIXEL_SIZE)
-		)
 	}
 
 	private suspend fun saveGeneratedQrCode(generatedQrCodesWrapper: GeneratedQrCodesWrapper) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt
index 91abdf3cf..f280092bb 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCode.kt
@@ -5,6 +5,7 @@ import android.graphics.Color
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.EncodeHintType
 import com.google.zxing.MultiFormatWriter
+import kotlin.math.max
 
 class QrCode private constructor(val value: String, val size: Int) {
 
@@ -18,6 +19,10 @@ class QrCode private constructor(val value: String, val size: Int) {
 		private fun encode(value: String, size: Int) = MultiFormatWriter().encode(value, BarcodeFormat.QR_CODE, size, size, mapOf(EncodeHintType.MARGIN to 0))
 	}
 
+	/**
+	 * Renders a bitmap to the exact provided outsize. A margin might be added if the QR Code does not fit exactly into the provided
+	 * outSize.
+	 */
 	fun renderToBitmap(outSize: Int = 0): Bitmap {
 		val bitMatrix = encode(value, outSize)
 		val bitmap = Bitmap.createBitmap(bitMatrix.width, bitMatrix.height, Bitmap.Config.RGB_565)
@@ -29,4 +34,21 @@ class QrCode private constructor(val value: String, val size: Int) {
 		return bitmap
 	}
 
+
+	/**
+	 * Renders a bitmap to the closest possible size of maxOutSize but no larger than maxOutSize. No padding is added.
+	 */
+	fun renderToMaxSizeBitmap(maxOutSize: Int): Bitmap {
+		val bitMatrix = encode(value, 0)
+		val factor: Int = max(maxOutSize / bitMatrix.width, 1)
+		val bitmap = Bitmap.createBitmap(bitMatrix.width * factor, bitMatrix.height * factor, Bitmap.Config.RGB_565)
+		for (x in 0 until bitMatrix.width) {
+			for (y in 0 until bitMatrix.height) {
+				val intArray = IntArray(factor * factor) { if (bitMatrix[x, y]) Color.BLACK else Color.WHITE }
+				bitmap.setPixels(intArray, 0, factor, x * factor, y * factor, factor, factor)
+			}
+		}
+		return bitmap
+	}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 806d820d4..54d059e84 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -61,7 +61,6 @@ class QrCodeFragment : Fragment() {
 				qrCodeImageview.visibility = View.VISIBLE
 				qrCodeLoadingProgressbar.isVisible = false
 				qrCodeImageview.setImageBitmap(it)
-				qrCodeViewModel.createQrCodePdf(venueInfo, it)
 			}
 			qrCodeViewModel.selectedQrCodePdf.observe(viewLifecycleOwner) { pdfFile ->
 				shareButton.isEnabled = true
@@ -69,7 +68,9 @@ class QrCodeFragment : Fragment() {
 				shareButton.setOnClickListener { sharePdf(pdfFile) }
 				printPdfButton.setOnClickListener { printPdf(pdfFile) }
 			}
-			qrCodeViewModel.generateQrCodeBitmap(venueInfo)
+			qrCodeImageview.post {
+				qrCodeViewModel.generateQrCodeBitmapAndPdf(venueInfo, qrCodeImageview.width)
+			}
 			deleteButton.setOnClickListener {
 				showDeleteConfirmationDialog(venueInfo)
 			}
diff --git a/app/src/main/res/drawable/pdf_icon.xml b/app/src/main/res/drawable/pdf_icon.xml
new file mode 100644
index 000000000..02e6ce01c
--- /dev/null
+++ b/app/src/main/res/drawable/pdf_icon.xml
@@ -0,0 +1,50 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+  <path
+      android:pathData="M0,0H43.761V43.761H0z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <group>
+    <clip-path
+        android:pathData="M0,0H43.761V43.761H0z"/>
+    <path
+        android:pathData="M0,0H43.761V43.761H0z"
+        android:fillColor="#D8D8D8"
+        android:fillType="evenOdd"/>
+    <group>
+      <clip-path
+          android:pathData="M0,0H43.761V43.761H0z"/>
+      <path
+          android:pathData="M-10.94,-10.94L54.701,-10.94L54.701,54.701L-10.94,54.701z"
+          android:fillColor="#63A0C7"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M24.9761,16.6146c1.372,-0.4993 2.8844,0.2059 3.3837,1.5779 0.2042,0.561 0.2086,1.1404 0.0475,1.6684l5.8984,2.7505c0.3012,-0.4619 0.7472,-0.8328 1.3082,-1.037 1.372,-0.4993 2.8847,0.2068 3.3841,1.5788s-0.2059,2.8844 -1.5779,3.3837c-0.5413,0.197 -1.1027,0.2098 -1.6168,0.0606l-2.6353,6.0044c0.3848,0.2941 0.691,0.6999 0.8692,1.1894 0.4993,1.372 -0.2059,2.8844 -1.5779,3.3837 -1.372,0.4993 -2.8844,-0.2059 -3.3837,-1.5779 -0.0571,-0.1569 -0.0988,-0.3152 -0.1243,-0.473l-3.9329,-0.4553c-0.2128,0.8043 -0.8067,1.494 -1.6477,1.8001 -1.372,0.4993 -2.8853,-0.2056 -3.3847,-1.5775 -0.4993,-1.372 0.2052,-2.8863 1.5772,-3.3856 0.3712,-0.1351 0.7489,-0.1821 1.1151,-0.1526l0.6161,-2.6814 -2.3941,-1.9583c-0.2474,0.2295 -0.5461,0.4148 -0.8844,0.5379C18.6435,27.7522 17.1311,27.0469 16.6317,25.675c-0.4993,-1.372 0.2056,-2.8853 1.5775,-3.3847 0.95,-0.3458 1.9658,-0.1132 2.6676,0.5168l2.7604,-2.3158c-0.0946,-0.1518 -0.1757,-0.316 -0.2393,-0.4908C22.8989,18.6264 23.6042,17.1139 24.9761,16.6146zM23.9459,29.2042l-0.5324,2.3179c0.6899,0.264 1.2623,0.8133 1.5349,1.5623 0.1009,0.2772 0.1538,0.557 0.1604,0.8355l3.8266,0.444c0.037,-0.3019 0.1268,-0.5931 0.264,-0.8623l-5.2536,-4.2973zM29.5799,28.1582l1.4379,3.9505c0.5098,-0.1079 1.0259,-0.0584 1.4886,0.1222l2.6067,-5.9398c-0.4772,-0.2967 -0.8626,-0.7502 -1.0727,-1.3186l-3.0769,0.6655c0.0786,1.026 -0.4562,2.0241 -1.3835,2.5202zM24.7288,25.8001l-0.5944,2.5831 5.4989,4.4975c0.1909,-0.2036 0.4161,-0.3771 0.6737,-0.5144l-1.4375,-3.9495C27.6044,28.6835 26.3054,27.9857 25.8499,26.734c-0.0992,-0.2725 -0.151,-0.5495 -0.1592,-0.8232l-0.9609,-0.111zM26.7823,21.5771c-0.3702,0.1348 -0.7489,0.1821 -1.1151,0.1526L24.9004,25.0609l0.8775,0.101c0.2094,-0.8105 0.8051,-1.5041 1.6509,-1.8119 1.3626,-0.4959 2.8639,0.1963 3.3735,1.5497l3.081,-0.6659c-0.023,-0.3205 0.0148,-0.6375 0.1057,-0.9377l-5.9007,-2.7507c-0.3006,0.4606 -0.7458,0.828 -1.3049,1.0315zM21.3776,26.1271l2.1056,1.7238 0.4917,-2.1371 -2.3103,-0.2659c-0.0621,0.2386 -0.1596,0.4678 -0.287,0.6791zM24.1228,21.068L21.3599,23.3858c0.0927,0.1493 0.1705,0.3104 0.233,0.4824 0.1002,0.2753 0.1531,0.5551 0.16,0.8314L24.1447,24.973l0.7862,-3.4127c-0.2967,-0.1134 -0.5701,-0.2799 -0.8094,-0.4929z"
+          android:fillColor="#FFF"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M-10.9472,-10.9348L14.9725,-10.874 45.0401,-10.874 -10.9493,45.1154 -10.9493,40.5192 -10.9472,17.2023z"
+          android:fillColor="#000"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M-10.9472,-10.9348L14.9725,-10.874 45.0401,-10.874 -10.9493,45.1154 -10.9493,40.5192 -10.9472,17.2023z"
+          android:fillColor="#FFF"
+          android:fillType="evenOdd"/>
+      <group>
+        <clip-path
+            android:pathData="M7.218,7.59L16.663,7.59 16.663,18.049 7.218,18.049z"/>
+        <path
+            android:pathData="M16.648,8.36S14.888,7.59 11.94,7.59 7.233,8.36 7.233,8.36s-0.157,3.413 0.51,5.343c1.18,3.392 4.196,4.346 4.196,4.346h0.002s3.015,-0.954 4.195,-4.346c0.668,-1.93 0.51,-5.342 0.51,-5.342"
+            android:fillColor="#ff0000"
+            android:fillType="evenOdd"/>
+      </group>
+      <path
+          android:pathData="M15.068,11.303L15.068,13.183 12.875,13.183 12.875,15.376 10.995,15.376 10.995,13.183 8.801,13.183 8.801,11.303 10.995,11.303 10.995,9.11 12.874,9.11 12.875,11.303z"
+          android:fillColor="#FFF"
+          android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/pdf_qr_code.xml b/app/src/main/res/layout/pdf_qr_code.xml
index e73ad5051..f267effb9 100644
--- a/app/src/main/res/layout/pdf_qr_code.xml
+++ b/app/src/main/res/layout/pdf_qr_code.xml
@@ -4,18 +4,18 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:padding="90px"
-	tools:layout_height="1748px"
-	tools:layout_width="1240px">
+	android:padding="40px"
+	tools:layout_height="842px"
+	tools:layout_width="595px">
 
 	<TextView
 		android:id="@+id/title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:fontFamily="@font/inter_bold"
 		android:gravity="center_horizontal"
 		android:textColor="@android:color/black"
-		android:textSize="50px"
-		android:textStyle="bold"
+		android:textSize="22px"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:text="Title" />
 
@@ -23,17 +23,18 @@
 		android:id="@+id/subtitle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:fontFamily="@font/inter_light"
 		android:gravity="center_horizontal"
 		android:textColor="@android:color/black"
-		android:textSize="40px"
+		android:textSize="13px"
 		app:layout_constraintTop_toBottomOf="@id/title"
 		tools:text="Subtitle" />
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="200px"
-		android:layout_marginBottom="50px"
+		android:layout_marginEnd="170px"
+		android:layout_marginBottom="28px"
 		android:orientation="vertical"
 		app:layout_constraintBottom_toTopOf="@id/swisscovid_icon"
 		app:layout_constraintStart_toStartOf="parent">
@@ -41,24 +42,29 @@
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:fontFamily="@font/inter_regular"
 			android:text="@string/pdf_headline"
 			android:textColor="@color/blue_main"
-			android:textSize="40px" />
+			android:textSize="13px" />
 
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="3px"
+			android:fontFamily="@font/inter_bold"
 			android:text="@string/pdf_slogan"
 			android:textColor="@android:color/black"
-			android:textSize="70px"
-			android:textStyle="bold" />
+			android:textSize="28px" />
 
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="9px"
+			android:fontFamily="@font/inter_light"
+			android:lineSpacingExtra="5px"
 			android:text="@string/pdf_explanation"
 			android:textColor="@android:color/black"
-			android:textSize="40px" />
+			android:textSize="13px" />
 
 	</LinearLayout>
 
@@ -76,32 +82,34 @@
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:fontFamily="@font/inter_bold"
 			android:text="@string/pdf_swisscovid_app"
 			android:textColor="@android:color/black"
-			android:textSize="40px"
+			android:textSize="14px"
 			android:textStyle="bold" />
 
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:fontFamily="@font/inter_regular"
 			android:text="@string/pdf_download_app"
 			android:textColor="@color/blue_main"
-			android:textSize="25px" />
+			android:textSize="10px" />
 
 	</LinearLayout>
 
 	<ImageView
 		android:id="@+id/swisscovid_icon"
-		android:layout_width="90px"
-		android:layout_height="90px"
-		android:src="@mipmap/ic_launcher"
+		android:layout_width="44px"
+		android:layout_height="44px"
+		android:src="@drawable/pdf_icon"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent" />
 
 	<ImageView
-		android:layout_width="600px"
-		android:layout_height="600px"
-		android:layout_marginTop="250px"
+		android:layout_width="350px"
+		android:layout_height="350px"
+		android:layout_marginTop="90px"
 		android:visibility="gone"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"

From d8cd03be66da2686f7ea5843afc29aae00e3f74f Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 19 May 2021 11:32:05 +0200
Subject: [PATCH 054/207] Implemented new Design of Generate QR Code Screens

---
 .../generateqrcode/EventsOverviewFragment.kt  |  14 +-
 .../checkin/generateqrcode/QrCodeAdapter.kt   | 123 +++++++-------
 .../generateqrcode/QrCodeBaseViewHolder.kt    |   8 -
 .../checkin/generateqrcode/QrCodeItems.kt     |  29 +++-
 app/src/main/res/drawable/illu_events.xml     | 150 ++++++++++++++++++
 .../main/res/layout/card_generate_qr_code.xml |   3 +-
 .../res/layout/fragment_checkin_overview.xml  |  61 +++++++
 .../res/layout/item_events_explanation.xml    | 112 +++++++++++++
 .../main/res/layout/item_events_footer.xml    |  95 +++++++++++
 .../res/layout/item_qr_code_empty_list.xml    |  26 ---
 app/src/main/res/values-bs/strings.xml        |  38 ++++-
 app/src/main/res/values-de/strings.xml        |  68 ++++++--
 app/src/main/res/values-es/strings.xml        |  38 ++++-
 app/src/main/res/values-fr/strings.xml        |  38 ++++-
 app/src/main/res/values-hr/strings.xml        |  38 ++++-
 app/src/main/res/values-it/strings.xml        |  38 ++++-
 app/src/main/res/values-pt/strings.xml        |  38 ++++-
 app/src/main/res/values-rm/strings.xml        |  38 ++++-
 app/src/main/res/values-sq/strings.xml        |  38 ++++-
 app/src/main/res/values-sr/strings.xml        |  38 ++++-
 app/src/main/res/values-ti/strings.xml        |  38 ++++-
 app/src/main/res/values-tr/strings.xml        |  38 ++++-
 app/src/main/res/values/strings.xml           |  38 ++++-
 23 files changed, 949 insertions(+), 196 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt
 create mode 100644 app/src/main/res/drawable/illu_events.xml
 create mode 100644 app/src/main/res/layout/item_events_explanation.xml
 create mode 100644 app/src/main/res/layout/item_events_footer.xml
 delete mode 100644 app/src/main/res/layout/item_qr_code_empty_list.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index e5cd37956..b5af6225d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -40,9 +40,17 @@ class EventsOverviewFragment : Fragment() {
 			})
 
 			qrList.adapter = adapter
-			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner, {
-				adapter.setItems(it)
-			})
+			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner) { events ->
+				if (events.isEmpty()) {
+					adapter.setItems(listOf(ExplanationItem(showOnlyInfobox = false), FooterItem()))
+				} else {
+					adapter.setItems(events.map { EventItem(it) }.toMutableList<EventOverviewItem>().apply {
+						add(0, GenerateQrCodeButtonItem())
+						add(ExplanationItem(showOnlyInfobox = true))
+						add(FooterItem())
+					})
+				}
+			}
 		}.root
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index 170b152eb..cb3877ce6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -1,107 +1,90 @@
 package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EXPLANATION
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EVENT
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_FOOTER
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_GENERATE_QR_CODE_BUTTON
 import ch.admin.bag.dp3t.checkin.utils.getSubtitle
-import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
-import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
-import ch.admin.bag.dp3t.databinding.ItemQrCodeEmptyListBinding
+import ch.admin.bag.dp3t.databinding.*
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
-class QrCodeAdapter(val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeBaseViewHolder<*>>() {
+class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeAdapter.QrCodeBaseViewHolder>() {
 
-	companion object {
-		private const val TYPE_GENERATE_QR_CODE = 0
-		private const val TYPE_QR_CODE = 1
-		private const val TYPE_QR_EMPTY_LIST = 2
-	}
-
-	private var items: List<Any> = emptyList()
+	private var items: List<EventOverviewItem> = emptyList()
 
-	fun setItems(qrCodes: List<VenueInfo>) {
-		val newItems: ArrayList<Any> = ArrayList()
-		newItems.add(GenerateQrCodeItem())
-		if (qrCodes.isEmpty()) {
-			newItems.add(QrCodeEmptyListItem())
-		} else {
-			newItems.addAll(qrCodes)
-		}
-		this.items = newItems
+	fun setItems(newItems: List<EventOverviewItem>) {
+		this.items = ArrayList<EventOverviewItem>().apply { addAll(newItems) }
 		notifyDataSetChanged()
 	}
 
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QrCodeBaseViewHolder<*> {
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QrCodeBaseViewHolder {
+		val inflater = LayoutInflater.from(parent.context)
 		return when (viewType) {
-			TYPE_GENERATE_QR_CODE -> {
-				val binding = ItemGenerateQrCodeBinding
-					.inflate(LayoutInflater.from(parent.context), parent, false)
-				return GenerateQrCodeViewHolder(binding)
-			}
-			TYPE_QR_CODE -> {
-				val binding = ItemQrCodeBinding
-					.inflate(LayoutInflater.from(parent.context), parent, false)
-				return QrCodeViewHolder(binding)
-			}
-			TYPE_QR_EMPTY_LIST -> {
-				val binding = ItemQrCodeEmptyListBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-				return QrCodeEmptyListViewHolder(binding)
-			}
+			TYPE_GENERATE_QR_CODE_BUTTON -> GenerateQrCodeViewHolder(ItemGenerateQrCodeBinding.inflate(inflater, parent, false))
+			TYPE_EVENT -> EventViewHolder(ItemQrCodeBinding.inflate(inflater, parent, false))
+			TYPE_EXPLANATION -> ExplanationViewHolder(ItemEventsExplanationBinding.inflate(inflater, parent, false))
+			TYPE_FOOTER -> SimpleViewHolder(ItemEventsFooterBinding.inflate(inflater, parent, false))
 			else -> throw IllegalArgumentException("invalid view type")
 		}
 	}
 
-	override fun onBindViewHolder(holder: QrCodeBaseViewHolder<*>, position: Int) {
-		val item = items[position]
-		when (holder) {
-			is GenerateQrCodeViewHolder -> holder.bind(item as GenerateQrCodeItem)
-			is QrCodeViewHolder -> holder.bind(item as VenueInfo)
-			is QrCodeEmptyListViewHolder -> holder.bind(item as QrCodeEmptyListItem)
-			else -> throw  IllegalArgumentException()
-		}
+	override fun onBindViewHolder(holder: QrCodeBaseViewHolder, position: Int) {
+		holder.bind(items[position])
 	}
 
-	override fun getItemViewType(position: Int): Int {
-		return when (items[position]) {
-			is VenueInfo -> TYPE_QR_CODE
-			is GenerateQrCodeItem -> TYPE_GENERATE_QR_CODE
-			is QrCodeEmptyListItem -> TYPE_QR_EMPTY_LIST
-			else -> throw java.lang.IllegalArgumentException("Invalid type of data at position $position")
-		}
-	}
+	override fun getItemViewType(position: Int) = items[position].type
 
-	override fun getItemCount(): Int {
-		return items.size
+	override fun getItemCount() = items.size
+
+
+	/*--------VIEW HOLDERS-------*/
+
+	abstract class QrCodeBaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+		abstract fun bind(item: EventOverviewItem)
 	}
 
-	inner class GenerateQrCodeViewHolder(private val binding: ItemGenerateQrCodeBinding) :
-		QrCodeBaseViewHolder<GenerateQrCodeItem>(binding.root) {
-		override fun bind(item: GenerateQrCodeItem) {
-			binding.qrCodeGenerate.setOnClickListener {
-				onClickListener.generateQrCode()
-			}
+	inner class GenerateQrCodeViewHolder(private val binding: ItemGenerateQrCodeBinding) : QrCodeBaseViewHolder(binding.root) {
+		override fun bind(item: EventOverviewItem) {
+			binding.qrCodeGenerate.setOnClickListener { onClickListener.generateQrCode() }
 		}
 
 	}
 
-	inner class QrCodeViewHolder(private val binding: ItemQrCodeBinding) :
-		QrCodeBaseViewHolder<VenueInfo>(binding.root) {
-		override fun bind(item: VenueInfo) {
+	inner class EventViewHolder(private val binding: ItemQrCodeBinding) : QrCodeBaseViewHolder(binding.root) {
+		override fun bind(item: EventOverviewItem) {
+			item as EventItem
 			binding.apply {
-				qrCodeName.text = item.title
-				qrCodeLocation.setText(item.getSubtitle())
-				root.setOnClickListener { onClickListener.onQrCodeClicked(item) }
-				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item) }
+				qrCodeName.text = item.venueInfo.title
+				qrCodeLocation.setText(item.venueInfo.getSubtitle())
+				root.setOnClickListener { onClickListener.onQrCodeClicked(item.venueInfo) }
+				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item.venueInfo) }
 			}
 		}
 	}
 
-	inner class QrCodeEmptyListViewHolder(binding: ItemQrCodeEmptyListBinding) :
-		QrCodeBaseViewHolder<QrCodeEmptyListItem>(binding.root) {
-		override fun bind(item: QrCodeEmptyListItem) {
-
+	inner class ExplanationViewHolder(private val binding: ItemEventsExplanationBinding) : QrCodeBaseViewHolder(binding.root) {
+		override fun bind(item: EventOverviewItem) {
+			item as ExplanationItem
+			binding.apply {
+				illu.isVisible = !item.showOnlyInfobox
+				title.isVisible = !item.showOnlyInfobox
+				subtitle.isVisible = !item.showOnlyInfobox
+				heading.isVisible = !item.showOnlyInfobox
+				generateQrCodeButton.isVisible = !item.showOnlyInfobox
+				generateQrCodeButton.setOnClickListener { onClickListener.generateQrCode() }
+			}
 		}
 	}
+
+	inner class SimpleViewHolder(binding: ViewBinding) : QrCodeBaseViewHolder(binding.root) {
+		override fun bind(item: EventOverviewItem) {}
+	}
 }
 
 interface OnClickListener {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt
deleted file mode 100644
index 6b6dd7836..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeBaseViewHolder.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package ch.admin.bag.dp3t.checkin.generateqrcode
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-
-abstract class QrCodeBaseViewHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
-	abstract  fun bind(item: T)
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
index 4e2415339..aa5149bfa 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
@@ -1,6 +1,31 @@
 package ch.admin.bag.dp3t.checkin.generateqrcode
 
-class GenerateQrCodeItem
+import org.crowdnotifier.android.sdk.model.VenueInfo
 
-class QrCodeEmptyListItem
+abstract class EventOverviewItem {
+	companion object {
+		const val TYPE_EVENT = 0
+		const val TYPE_EXPLANATION = 1
+		const val TYPE_FOOTER = 2
+		const val TYPE_GENERATE_QR_CODE_BUTTON = 3
+	}
+
+	abstract val type: Int
+}
+
+class EventItem(val venueInfo: VenueInfo) : EventOverviewItem() {
+	override val type = TYPE_EVENT
+}
+
+class ExplanationItem(val showOnlyInfobox: Boolean) : EventOverviewItem() {
+	override val type = TYPE_EXPLANATION
+}
+
+class FooterItem : EventOverviewItem() {
+	override val type = TYPE_FOOTER
+}
+
+class GenerateQrCodeButtonItem : EventOverviewItem() {
+	override val type = TYPE_GENERATE_QR_CODE_BUTTON
+}
 
diff --git a/app/src/main/res/drawable/illu_events.xml b/app/src/main/res/drawable/illu_events.xml
new file mode 100644
index 000000000..f2c95be9a
--- /dev/null
+++ b/app/src/main/res/drawable/illu_events.xml
@@ -0,0 +1,150 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="325dp"
+    android:height="180dp"
+    android:viewportWidth="325"
+    android:viewportHeight="180">
+  <path
+      android:pathData="M137.212,29.678c19.616,-0.598 38.3,-6.166 56.14,-12.255 17.843,-6.09 35.514,-12.837 54.663,-16.063C260.328,-0.716 274.413,-1.01 284.336,4.794c9.55,5.584 12.634,15.223 14.294,24.169 1.248,6.73 -2.28,21.385 -5,40.11 -2.631,18.116 8.225,44.08 12.202,51.187 3.977,7.107 10.81,23.252 7.314,30.515 -3.45,7.186 -11.665,12.584 -20.582,16.382 -18.078,7.699 -39.397,9.906 -60.185,11.156 -46.02,2.765 -92.286,1.569 -138.427,0.37 -17.074,-0.447 -34.227,-0.895 -51.025,-3.217 -9.329,-1.288 -18.96,-3.338 -25.733,-8.271 -8.597,-6.268 -10.729,-16.883 -4.967,-24.744 9.663,-13.185 26.38,-16.451 33.133,-30.609 3.72,-7.787 -0.1,-16.463 -5.504,-23.685 -11.59,-15.498 -21.015,-29.088 -22.038,-46.8 -0.705,-12.16 8.635,-24.349 23.075,-30.104 15.137,-6.033 36.123,-5.274 47.291,4.713 11.5,10.284 31.707,14.239 49.028,13.712z"
+      android:fillColor="#EDF4F8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M63,21L263,21L263,103L63,103z"
+      android:fillColor="#DBDBDB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M122.8,46.522h14.911c1.018,-5.912 1.018,-11.956 0,-17.868h-14.91c1.68,5.836 1.68,12.031 0,17.868z"
+      android:fillColor="#63A0C7"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M216.34,54.936c7.88,0.084 15.75,-0.16 23.614,-0.733l-0.523,-0.689c-1.287,3.278 -1.251,6.733 -1.08,10.2 0.042,0.869 0.313,2.04 0.138,2.9 -0.22,1.083 -1.187,0.824 -2.148,0.856 -2.118,0.068 -4.235,0.118 -6.354,0.148 -2,0.028 -4,0.04 -6.001,0.033 -0.942,-0.002 -1.883,-0.01 -2.825,-0.02 -1.105,-0.012 -2.362,0.31 -2.647,-0.976 -0.183,-0.825 0.001,-1.91 0.002,-2.757l0.002,-3.101 0.004,-6.202c-0.01,-0.293 -0.25,-0.526 -0.542,-0.526 -0.292,0 -0.531,0.233 -0.541,0.526l-0.005,7.58 -0.003,3.446c0,0.684 -0.142,1.511 0.113,2.161 0.585,1.495 3.112,0.934 4.323,0.945 2.472,0.023 4.943,0.02 7.414,-0.011 2.472,-0.03 4.942,-0.087 7.412,-0.17 1.065,-0.035 2.537,0.208 2.86,-1.11 0.226,-0.926 -0.038,-2.131 -0.086,-3.075 -0.055,-1.077 -0.114,-2.154 -0.129,-3.233 -0.033,-2.518 0.212,-4.968 1.138,-7.325 0.044,-0.163 0.01,-0.338 -0.093,-0.473 -0.102,-0.135 -0.26,-0.215 -0.43,-0.215 -7.859,0.572 -15.73,0.816 -23.613,0.733 -0.292,0.01 -0.523,0.25 -0.523,0.544 0,0.294 0.231,0.534 0.523,0.544z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M218.586,55.528c3.372,1.2 6.66,2.627 9.842,4.272 2.854,1.482 6.59,3.102 8.555,5.751 0.412,0.556 1.352,0.014 0.935,-0.549 -2.006,-2.706 -5.459,-4.298 -8.36,-5.836 -3.445,-1.817 -7.016,-3.384 -10.684,-4.688 -0.658,-0.235 -0.941,0.816 -0.288,1.05z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M239.77,53.59c-3.58,1.538 -6.612,4.501 -9.81,6.697 -3.462,2.377 -7.027,4.589 -10.695,6.636 -0.608,0.342 -0.063,1.282 0.547,0.94 3.66,-2.054 7.225,-4.266 10.695,-6.636 3.197,-2.196 6.231,-5.16 9.81,-6.698 0.638,-0.274 0.087,-1.212 -0.547,-0.94zM146.266,56.968c7.3,0.111 14.601,0.082 21.901,-0.088 0.696,-0.016 0.698,-1.105 0,-1.089 -7.3,0.17 -14.6,0.2 -21.901,0.088 -0.292,0.01 -0.523,0.25 -0.523,0.544 0,0.294 0.231,0.534 0.523,0.545zM146.88,61.903c7.505,0.12 15.01,0.088 22.515,-0.098 0.696,-0.017 0.698,-1.105 0,-1.088 -7.504,0.185 -15.009,0.217 -22.515,0.097 -0.292,0.01 -0.523,0.25 -0.523,0.544 0,0.294 0.231,0.534 0.523,0.545zM146.059,67.231l21.287,-0.993c0.694,-0.033 0.698,-1.121 0,-1.089l-21.287,0.994c-0.694,0.032 -0.698,1.12 0,1.088zM179.217,62.056h20.262c0.292,-0.01 0.523,-0.251 0.523,-0.545 0,-0.293 -0.231,-0.534 -0.523,-0.544h-20.262c-0.292,0.01 -0.523,0.251 -0.523,0.544 0,0.294 0.231,0.535 0.523,0.545z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M198.592,55.833l3.165,2.904c0.362,0.332 1.358,1.018 1.583,1.452 0.465,0.898 -0.035,0.693 -0.832,1.004 -1.958,0.783 -3.763,1.91 -5.33,3.326 -0.523,0.464 0.245,1.232 0.766,0.77 1.43,-1.291 3.071,-2.322 4.852,-3.046 0.639,-0.254 1.85,-0.403 2.154,-1.168 0.371,-0.935 -0.811,-1.626 -1.372,-2.14l-4.22,-3.872c-0.515,-0.472 -1.283,0.296 -0.766,0.77z"
+      android:fillColor="#CDCDD0"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M149.418,98.324h14.911c1.018,-5.912 1.018,-11.956 0,-17.868L149.42,80.456c1.68,5.836 1.68,12.031 0,17.868zM87.325,84.9h14.91c1.018,-5.913 1.018,-11.957 0,-17.87h-14.91c1.68,5.837 1.68,12.033 0,17.87zM181.548,45.713h14.911c1.018,-5.912 1.018,-11.956 0,-17.868h-14.91c1.68,5.836 1.68,12.032 0,17.868z"
+      android:fillColor="#63A0C7"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M290.882,168L35,168 35,167.349 291,167.349z"
+      android:fillColor="#E8E8E8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M258.436,64.384L251.96,77.236l-19.36,8.825c-2.068,3.503 -8.638,3.772 -9.116,1.506 -0.536,-2.542 7.978,-6.633 7.978,-6.633l16.194,-10.982 1.417,-9.454 9.363,3.885zM257.672,150.638L258.866,160.216 251.94,160.695 251.223,150.638z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M256.716,158.779c0.62,-0.656 1.19,-1.356 1.71,-2.095 0.992,-1.377 1.873,5.687 1.873,5.687s0.955,2.874 0.716,4.31c-0.239,1.438 -5.732,1.438 -6.687,1.198 -0.955,-0.24 -5.732,0 -5.732,0h-7.165c-6.21,-2.873 0,-4.79 0,-4.79 1.911,-0.239 8.36,-6.225 8.36,-6.225l1.432,-2.634c0.956,-0.24 1.91,3.352 1.91,3.352l3.583,1.197z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M275.584,150.757L276.778,160.336 269.852,160.815 269.135,150.757z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M274.628,158.899c0.62,-0.656 1.19,-1.357 1.71,-2.095 0.992,-1.378 1.873,5.687 1.873,5.687s0.955,2.634 0.716,4.071c-0.239,1.437 -5.732,1.437 -6.687,1.197 -0.955,-0.24 -5.732,0.24 -5.732,0.24h-7.165c-6.21,-2.874 0,-4.79 0,-4.79 1.911,-0.239 8.36,-6.225 8.36,-6.225l1.432,-2.635c0.956,-0.239 1.911,3.353 1.911,3.353l3.582,1.197zM267.702,88.976c0.956,1.197 0.478,5.268 0.478,5.268s1.672,13.17 0.955,14.368c-0.716,1.197 0.478,2.155 1.195,3.831 0.716,1.677 1.432,5.748 1.432,5.748 4.06,3.352 3.822,18.678 3.822,18.678l1.433,13.649c-0.478,1.437 -7.165,1.676 -8.12,1.437 -0.956,-0.24 -3.822,-21.791 -3.822,-21.791l-6.448,-12.213s0.478,32.567 0.478,34.004c0,1.437 -6.449,0.718 -7.882,0.718 -1.433,0 -1.433,-23.946 -1.433,-23.946l-1.433,-6.226 -7.642,-28.496v-3.353l1.194,-1.676s24.838,-1.197 25.793,0z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M249.79,27.195a7.404,7.423 0,1 0,14.808 0a7.404,7.423 0,1 0,-14.808 0z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M253.492,30.666c1.5,3.352 0.612,8.032 -2.388,13.171l12.18,-5.747 -1.91,-1.676 0.477,-4.79 -8.359,-0.957z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M253.492,38.33c-1.595,0.95 -2.549,2.697 -3.097,4.475 -1.014,3.291 -1.624,6.694 -1.817,10.133l-0.579,10.296 -7.165,27.299c6.21,5.268 9.792,4.07 18.151,-0.24 8.36,-4.31 9.314,1.437 9.314,1.437s0.717,-0.24 0,-0.958c-0.716,-0.718 0,0 0.717,-0.718 0.716,-0.719 0,0 -0.239,-0.719 -0.239,-0.718 0,-0.24 0.239,-0.479 0.239,-0.24 -0.955,-2.394 -0.955,-2.394l1.91,-17.96 2.389,-25.383c-2.866,-3.592 -10.987,-6.705 -10.987,-6.705l-7.403,5.268c-2.388,0.958 -0.478,-2.873 -0.478,-2.873v-0.48z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M276.3,58.325l0.955,14.368 -12.18,17.48c0,4.071 -2.15,5.03 -2.15,5.03 -0.813,-1.304 -1.532,-2.664 -2.149,-4.072 -1.194,-2.634 0.717,-4.789 0.717,-4.789l8.359,-17.72 -3.583,-8.86 10.031,-1.437z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M272.24,43.239c4.06,1.436 4.777,17.002 4.777,17.002 -4.777,-2.635 -10.509,1.676 -10.509,1.676s-1.194,-4.071 -2.627,-9.34c-0.88,-3.011 -0.158,-6.265 1.91,-8.62 0,0 2.389,-2.155 6.45,-0.718z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M264,29.47c-0.942,-0.756 -2.228,0.618 -2.228,0.618l-0.754,-6.804s-4.712,0.567 -7.728,-0.19c-3.016,-0.755 -3.488,2.741 -3.488,2.741 -0.155,-1.412 -0.187,-2.835 -0.094,-4.253 0.189,-1.7 2.64,-3.402 6.975,-4.536 4.335,-1.134 6.597,3.78 6.597,3.78 3.016,1.513 1.663,9.4 0.72,8.644z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M47.034,129.388c0.814,3.24 7.755,10.526 14.917,17.368 -11.044,-27.352 -4.75,-57.287 -4.75,-57.287 -2.052,11.756 26.054,70.92 26.054,70.92l-6.402,3.785 -2.162,3.05c-21.678,-9.982 -27.657,-37.836 -27.657,-37.836z"
+      android:fillColor="#DBDBDB"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M76.515,63.702s-1.249,7.868 3.923,7.152c0,0 20.51,-4.649 21.58,-3.576 1.07,1.073 7.722,1.438 7.374,-3.085 -0.348,-4.538 -7.018,-1.922 -7.018,-1.922s-10.344,1.43 -12.484,0.358c-2.14,-1.073 -8.203,-0.715 -8.203,-0.715l-5.172,1.788z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M92.166,89.359l-2.844,27.054s-0.892,10.729 -3.567,13.053c0,0 0,3.398 -0.892,4.47l-1.248,14.127s1.783,5.185 1.605,6.08c-0.178,0.894 0.713,3.755 0.535,4.112 -0.178,0.358 -8.56,0 -8.56,0l1.783,-28.789 5.529,-40.054 7.659,-0.053z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M76.541,156.793s-3.74,9.456 -1.788,10.598c1.951,1.14 22.44,0.326 22.44,0.326s3.415,-2.12 -0.488,-3.587c0,0 -3.252,-0.163 -5.366,-1.468 -2.114,-1.304 -4.553,-3.75 -4.553,-3.75s-0.163,-3.587 -1.463,-2.771c-0.787,0.52 -1.319,1.348 -1.464,2.282l-7.318,-1.63z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M70.775,155.51s-4.102,10.372 -1.962,11.623c2.14,1.252 24.61,0.358 24.61,0.358s3.746,-2.325 -0.534,-3.934c0,0 -3.567,-0.179 -5.886,-1.61 -2.318,-1.43 -4.993,-4.112 -4.993,-4.112s-0.178,-3.934 -1.605,-3.04c-0.863,0.57 -1.446,1.48 -1.605,2.504l-8.025,-1.789z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M87.36,88.992s-1.962,18.418 -2.853,22.352c-0.561,2.59 -0.919,5.22 -1.07,7.867 0,0 -0.179,5.722 -1.784,7.332 -0.949,0.942 -1.466,2.237 -1.426,3.576 0,0 -1.606,18.06 -0.714,20.206 0.892,2.146 2.102,4.933 1.21,6.364 -0.891,1.43 -11.018,0.43 -11.018,-0.642 0,-1.073 0,-1.967 -0.535,-2.504 -0.535,-0.536 0,-3.933 0,-3.933s-2.14,-15.915 -0.179,-20.564c1.962,-4.649 2.854,-17.345 2.854,-17.345s-1.427,-14.484 -3.21,-16.808c-1.784,-2.325 0.356,-10.55 0.356,-10.55l18.37,4.649z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M82.34,31.796c0.206,0.474 0.703,0.738 1.154,0.988 2.619,1.446 4.81,3.543 6.97,5.616 -0.539,-1.831 -0.424,-3.793 0.325,-5.548 0.257,-0.599 0.595,-1.242 0.411,-1.867 -0.182,-0.447 -0.498,-0.827 -0.904,-1.085 -0.881,-0.683 -1.802,-1.313 -2.758,-1.887 -0.668,-0.4 -2.04,-1.467 -2.807,-1.35 -0.04,1.037 -0.061,1.966 -0.515,2.936 -0.107,0.23 -1.798,2.379 -1.877,2.198z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M84.15,26.765a7.312,7.331 0,1 0,14.624 0a7.312,7.331 0,1 0,-14.624 0z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M91.819,44.11s1.248,-6.259 -2.319,-8.404c-3.567,-2.146 -7.668,-4.65 -7.668,-4.65s-1.249,-0.178 -1.784,2.504c0,0 -10.165,1.967 -11.235,11.623 -1.07,9.656 0.713,23.782 0.713,23.782s-1.605,12.338 -3.567,18.954c0,0 -1.605,1.43 5.529,-0.715 7.134,-2.146 19.617,6.08 19.617,6.08s1.249,-1.252 1.249,-2.146c0,-0.894 2.675,-28.074 3.21,-30.577 0.535,-2.504 -2.14,-16.093 -3.745,-16.451z"
+      android:fillColor="#008775"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M89.739,27.52c0.439,-0.244 0.931,-0.375 1.434,-0.383 0.502,-0.007 0.993,-0.154 1.418,-0.423 0.69,-0.532 0.742,-1.56 1.247,-2.27 0.731,-1.03 2.19,-1.154 3.45,-1.102 0.77,0.031 1.6,0.077 2.25,-0.34 0.665,-0.43 0.967,-1.238 1.192,-1.999 0.265,-0.9 0.437,-2 -0.221,-2.668 -0.457,-0.463 -1.178,-0.555 -1.686,-0.962 -0.275,-0.22 -3.907,-1.105 -7.316,-1.9 -3.513,-0.819 -7.082,1.123 -8.311,4.522 -0.788,2.17 -1.462,4.21 -1.393,4.65 0.333,2.109 2.193,3.785 2.321,5.916 0.248,-1.196 1.079,-2.186 2.21,-2.636 0.14,-0.068 0.299,-0.088 0.45,-0.055 0.186,0.06 0.294,0.245 0.41,0.4 0.306,0.407 1.265,1.025 1.81,0.736 0.486,-0.258 0.123,-1.07 0.735,-1.486zM93.082,66.065c-0.318,0.313 -0.326,0.825 -0.016,1.147l5.141,5.336c0.151,0.157 0.359,0.246 0.576,0.248 0.217,0.002 0.426,-0.083 0.58,-0.237l15.69,-15.663c0.173,-0.173 0.26,-0.416 0.234,-0.66 -0.025,-0.244 -0.159,-0.464 -0.364,-0.598l-6.17,-4.029c-0.317,-0.21 -0.738,-0.168 -1.01,0.1l-14.66,14.356z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M115.16,55.876c-0.03,0.048 -0.067,0.092 -0.107,0.133L99.4,71.968c-0.154,0.153 -0.363,0.239 -0.58,0.237 -0.217,-0.003 -0.425,-0.092 -0.576,-0.249l-5.252,-5.557c-0.036,-0.038 -0.068,-0.078 -0.096,-0.122 -0.181,0.311 -0.11,0.708 0.17,0.935l5.141,5.336c0.151,0.157 0.359,0.246 0.576,0.248 0.217,0.002 0.426,-0.083 0.58,-0.237l15.69,-15.663c0.272,-0.271 0.317,-0.697 0.107,-1.02z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M113.708,56.069l-0.639,-0.408c0.139,0.247 0.089,0.558 -0.12,0.749 -0.21,0.191 -0.522,0.213 -0.755,0.052l-4.132,-2.848c-0.192,-0.132 -0.291,-0.362 -0.257,-0.593 0.034,-0.23 0.196,-0.42 0.418,-0.491l-0.33,-0.21c-0.087,-0.057 -0.202,-0.044 -0.276,0.03L93.72,66.046c-0.042,0.042 -0.065,0.1 -0.064,0.16 0,0.06 0.026,0.116 0.07,0.157l5.047,4.932c0.087,0.082 0.223,0.08 0.308,-0.004l14.665,-14.878c0.047,-0.047 0.07,-0.114 0.064,-0.18 -0.008,-0.068 -0.045,-0.128 -0.101,-0.164z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M97.666,63.022L101.93,67.053 112.071,57.006 106.924,53.647z"
+      android:fillColor="#E6E6E6"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M111.677,59.486c0.059,0.055 0.15,0.055 0.209,0l0.887,-0.89c0.057,-0.058 0.057,-0.151 0,-0.209 -0.058,-0.056 -0.15,-0.056 -0.209,0l-0.887,0.89c-0.057,0.057 -0.057,0.15 0,0.209zM110.183,60.984c0.058,0.057 0.151,0.057 0.209,0l0.887,-0.89c0.057,-0.058 0.057,-0.151 0,-0.209 -0.058,-0.057 -0.151,-0.057 -0.209,0l-0.887,0.89c-0.057,0.057 -0.057,0.15 0,0.209z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M97.765,66.482m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M71.31,60.918s-1.249,7.868 3.923,7.153c0,0 20.509,-4.65 21.579,-3.576 1.07,1.072 7.722,1.438 7.375,-3.085 -0.348,-4.539 -7.018,-1.922 -7.018,-1.922s-10.344,1.43 -12.484,0.357c-2.14,-1.072 -8.204,-0.715 -8.204,-0.715l-5.171,1.788z"
+      android:fillColor="#A0616A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M78.621,36.063s-8.025,0.894 -8.025,12.517v14.842l9.809,-4.113s4.102,-9.656 3.745,-12.338c-0.357,-2.682 -0.178,-10.55 -5.529,-10.908z"
+      android:fillColor="#008775"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/card_generate_qr_code.xml b/app/src/main/res/layout/card_generate_qr_code.xml
index be0db1315..3845d029a 100644
--- a/app/src/main/res/layout/card_generate_qr_code.xml
+++ b/app/src/main/res/layout/card_generate_qr_code.xml
@@ -9,7 +9,6 @@
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/card_travel"
 	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
@@ -57,7 +56,7 @@
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:text="@string/events_subtitle" />
+				android:text="@string/events_card_subtitle" />
 
 			<ImageView
 				android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 4b1ce3787..0606a8b3f 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -256,6 +256,67 @@
 				android:layout_marginHorizontal="@dimen/spacing_medium_large"
 				android:layout_marginBottom="@dimen/spacing_medium_large" />
 
+			<TextView
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:layout_marginBottom="@dimen/spacing_small"
+				android:text="@string/checkin_footer_title1" />
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_marginRight="@dimen/spacing_medium_large"
+					android:src="@drawable/ic_shield_checkmark"
+					android:tint="@color/blue_main" />
+
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="@string/checkin_footer_subtitle1" />
+
+			</LinearLayout>
+
+			<TextView
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:layout_marginBottom="@dimen/spacing_small"
+				android:text="@string/checkin_footer_title2" />
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:layout_marginBottom="@dimen/spacing_large"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_marginRight="@dimen/spacing_medium_large"
+					android:src="@drawable/ic_shield_checkmark"
+					android:tint="@color/blue_main" />
+
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="@string/checkin_footer_subtitle2" />
+
+			</LinearLayout>
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/main/res/layout/item_events_explanation.xml b/app/src/main/res/layout/item_events_explanation.xml
new file mode 100644
index 000000000..4384cf5f7
--- /dev/null
+++ b/app/src/main/res/layout/item_events_explanation.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<ImageView
+		android:id="@+id/illu"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/spacing_larger"
+		android:src="@drawable/illu_events" />
+
+	<androidx.cardview.widget.CardView
+		android:id="@+id/checkin_overview_isolation"
+		style="@style/NextStep.Card"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_medium_large"
+		android:layout_marginVertical="@dimen/spacing_larger">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/heading"
+				style="@style/NextStep.Text.Bold.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:text="@string/events_title" />
+
+			<TextView
+				android:id="@+id/title"
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
+				android:text="@string/events_empty_state_title" />
+
+			<TextView
+				android:id="@+id/subtitle"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:text="@string/events_empty_state_subtitle" />
+
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="@dimen/spacing_medium"
+				android:background="@color/status_blue_bg"
+				android:orientation="horizontal"
+				android:padding="@dimen/spacing_medium">
+
+				<ImageView
+					android:id="@+id/info_image_view"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:src="@drawable/ic_info"
+					android:tint="@color/blue_main"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent" />
+
+				<LinearLayout
+					android:id="@+id/info_box_container_layout"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="@dimen/spacing_very_small"
+					android:orientation="vertical"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toEndOf="@id/info_image_view"
+					app:layout_constraintTop_toTopOf="parent">
+
+					<TextView
+						style="@style/NextStep.Text.Bold.Blue"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="@dimen/spacing_very_small"
+						android:text="@string/events_info_box_title" />
+
+					<TextView
+						style="@style/NextStep.Text.Blue"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="@dimen/spacing_small"
+						android:text="@string/events_info_box_text" />
+
+				</LinearLayout>
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+			<Button
+				android:id="@+id/generate_qr_code_button"
+				style="@style/NextStep.Button.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium"
+				android:layout_marginBottom="@dimen/spacing_medium"
+				android:text="@string/checkins_create_qr_code" />
+
+		</LinearLayout>
+
+	</androidx.cardview.widget.CardView>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_events_footer.xml b/app/src/main/res/layout/item_events_footer.xml
new file mode 100644
index 000000000..58adb3b17
--- /dev/null
+++ b/app/src/main/res/layout/item_events_footer.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginTop="@dimen/spacing_larger"
+	android:orientation="vertical"
+	android:padding="@dimen/spacing_medium_large">
+
+	<TextView
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/spacing_small"
+		android:text="@string/events_footer_title1" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/spacing_large"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:layout_width="@dimen/icon_size"
+			android:layout_height="@dimen/icon_size"
+			android:layout_marginEnd="@dimen/spacing_medium_large"
+			android:src="@drawable/ic_shield_checkmark"
+			android:tint="@color/blue_main" />
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/events_footer_subtitle1" />
+
+	</LinearLayout>
+
+	<TextView
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/spacing_medium_large"
+		android:layout_marginBottom="@dimen/spacing_small"
+		android:text="@string/events_footer_title2" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/spacing_large"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:layout_width="@dimen/icon_size"
+			android:layout_height="@dimen/icon_size"
+			android:layout_marginEnd="@dimen/spacing_medium_large"
+			android:src="@drawable/ic_shield_checkmark"
+			android:tint="@color/blue_main" />
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/events_footer_subtitle2" />
+
+	</LinearLayout>
+
+	<TextView
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/spacing_medium_large"
+		android:layout_marginBottom="@dimen/spacing_small"
+		android:text="@string/events_footer_title3" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/spacing_large"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:layout_width="@dimen/icon_size"
+			android:layout_height="@dimen/icon_size"
+			android:layout_marginEnd="@dimen/spacing_medium_large"
+			android:src="@drawable/ic_shield_checkmark"
+			android:tint="@color/blue_main" />
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/events_footer_subtitle3" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_qr_code_empty_list.xml b/app/src/main/res/layout/item_qr_code_empty_list.xml
deleted file mode 100644
index c7728bb3e..000000000
--- a/app/src/main/res/layout/item_qr_code_empty_list.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_gravity="center"
-	android:gravity="center"
-	android:orientation="vertical"
-	android:padding="@dimen/spacing_enormous">
-
-	<View
-		android:layout_width="100dp"
-		android:layout_height="100dp"
-		android:layout_gravity="center_horizontal"
-		android:background="@color/grey_dark_lighter" />
-
-	<TextView
-		style="@style/NextStep.Text.Small.GreyDark"
-		android:layout_width="170dp"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:gravity="center"
-		android:paddingVertical="20dp"
-		android:text="[TBT] Keine QR-Codes von Veranstaltungen erstellt"
-		android:textStyle="bold" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 4df797f1e..40d996f5a 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1492,7 +1492,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1624,7 +1624,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1652,11 +1652,11 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1665,7 +1665,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1711,4 +1711,30 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 987e42816..8147b60db 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1526,7 +1526,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="qr_scanner_no_camera_permission">"Die App benötigt Zugriff auf die Kamera, um den QR-Code scannen zu können."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"Tagebuch"</string>
+    <string name="diary_title">"Meine Check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
     <string name="checkin_button_title">"Check-in"</string>
@@ -1541,10 +1541,10 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="face_id_reason_text">"Authentifizieren Sie sich für den Zugriff auf das Tagebuch"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Check out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-Ins"</string>
+    <string name="module_checkins_title">"Check-ins"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
     <string name="checkin_title">"Check-In"</string>
@@ -1552,8 +1552,8 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code">"QR-Code erstellen"</string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
-    <string name="events_title">"Veranstaltungen"</string>
+    <!-- Veranstaltungen-Screen Titel -->
+    <string name="events_title">"Check-ins anbieten?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Jetzt einchecken"</string>
@@ -1574,7 +1574,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="empty_diary_title">"Noch keine Tagebucheinträge vorhanden"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"Die Veranstaltungen, die besucht wurden, erscheinen im Tagebuch nach dem Check-out."</string>
+    <string name="empty_diary_text">"Wenn Sie einen Swiss-Covid-QR-Code scannen, um sich vor Ort einzuchecken, wird hier automatisch ein Eintrag angelegt."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
     <string name="camera_permission_dialog_text">"SwissCovid benötigt Zugriff auf die Kamera Ihres Gerätes. Die Kamera wird nur verwendet, um QR Codes zu scannen."</string>
@@ -1664,10 +1664,10 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="checkin_ended_text">"Neue Check-Ins sind nicht möglich."</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Schützen Sie sich und andere, indem Sie sich bei Events einchecken. Hier kommt wahrscheinlich noch mehr Text, der im Moment noch unklar ist."</string>
+    <string name="checkin_detail_checked_out_text">"Scannen Sie einen SwissCovid-QR-Code, um sich vor Ort einzuchecken."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"Im Tagebuch werden all Ihre Check-Ins gespeichert. Sie können diese freiwillig teilen, falls Sie positiv getestet werden."</string>
+    <string name="checkin_detail_diary_text">"Wenn Sie einen Swiss-Covid-QR-Code scannen, um sich vor Ort einzuchecken, wird hier automatisch ein Eintrag angelegt."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <!-- Fuzzy -->
@@ -1689,7 +1689,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="print_button_title">"Drucken"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Checken Sie bei Events ein und sehen Sie ihre vergangenen Check-Ins."</string>
+    <string name="module_checkins_description">"Scannen Sie einen SwissCovid-QR-Code, um sich vor Ort einzuchecken."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title">"Check-Ins teilen"</string>
@@ -1717,11 +1717,12 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text">"Die App speichert diesen Eintrag noch für 14 Tage verschlüsselt im Hintergrund, damit Sie bei einer möglichen Ansteckung trotzdem gewarnt werden können."</string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Positiv getestet? Bitte geben Sie Ihren CovidCode ein um andere zu warnen."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title">"Positiv getestet?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Sie sind im Isolations-Modus weil Sie positiv getestet wurden."</string>
+    <!-- Fuzzy -->
+    <string name="home_end_isolation_card_text">"Begegnungen und Check-ins wieder aktivieren."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
@@ -1730,7 +1731,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"Sie können nicht mehr einchecken, wenn Sie positiv getestet wurden."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Schützen Sie sich selber und andere indem Sie QR Codes für Arbeitsplätze, Konferenzräume oder andere private Events erstellen."</string>
+    <string name="events_card_subtitle">"Erstellen Sie einen QR-Code, mit dem sich Personen vor Ort einchecken können."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen?"</string>
@@ -1776,4 +1777,45 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app">"Jetzt downloaden"</string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title">"Einchecken ohne Daten 
+zu hinterlassen"</string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text">"Geben Sie hier ihren CovidCode ein"</string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title">"Isolation beenden?"</string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title">"Sie möchten Check-ins anbieten?"</string>
+
+    <!-- Fuzzy -->
+    <string name="checkin_footer_title1">"Warum eine Check-in-Funktion?"</string>
+
+    <!-- Fuzzy -->
+    <string name="checkin_footer_subtitle1">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand."</string>
+
+    <!-- Fuzzy -->
+    <string name="checkin_footer_title2">"Keine zentrale Datenspeicherung"</string>
+
+    <!-- Fuzzy -->
+    <string name="checkin_footer_subtitle2">"Für die SwissCovid-Check-ins müssen keine persönlichen Daten wie Name, Adresse oder Telefonnummer angegeben werden und es werden auch keine GPS-Standortdaten erfasst. Die Liste der Check-ins ist nur lokal auf Ihrem Smartphone gespeichert und wird an keinen zentralen Server gesendet. Nach 14 Tagen werden die lokalen Daten wieder gelöscht."</string>
+    <string name="events_empty_state_title">"Erstellen Sie einen QR-Code"</string>
+    <string name="events_empty_state_subtitle">"Mit einem SwissCovid-QR-Code, können sich Personen vor Ort einchecken, ohne Ihre Daten zu hinterlassen."</string>
+    <string name="events_info_box_title">"Kein Ersatz für die obligatorische Kontaktdatenerfassung"</string>
+    <string name="events_info_box_text">"SwissCovid-Check-ins sind kein Ersatz für die in der Covid-19-Verordnung vorgeschriebene Kontaktdatenerfassungspflicht."</string>
+    <string name="events_footer_title1">"Wo können Check-ins eingesetzt werden?"</string>
+    <string name="events_footer_title2">"Warum eine Check-in-Funktion?"</string>
+    <string name="events_footer_title3">"Ersetzen SwissCovid-Check-ins die Pflicht zur Kontaktdatenerfassung?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid-Check-ins können dort eingesetzt werden, wo Menschen 
+sich treffen aber keine Pflicht zur Kontaktdatenerfassung besteht. 
+
+Mögliche Einsatzorte:
+– Private Anlässe
+– Vereinsanlässe 
+– Zusammenkünfte im professionellen Umfeld wie z.B. Sitzungszimmer, Büroräume, Kantinen, etc."</string>
+    <string name="events_footer_subtitle2">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand."</string>
+    <string name="events_footer_subtitle3">"Nein, SwissCovid-Check-ins ersetzen die Pflicht zur Kontaktdatenerfassung, wie sie in der Covid-19-Verordnung festgehalten ist, nicht. Sie dienen lediglich als Ergänzung, um Teilnehmende rasch über eine mögliche Ansteckung zu informieren."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5c1a1e361..d70c426f5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1483,7 +1483,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1615,7 +1615,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1643,11 +1643,11 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1656,7 +1656,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1702,4 +1702,30 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 95395e56a..6b4136a49 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1518,7 +1518,7 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1650,7 +1650,7 @@ Contactez l'infoline coronavirus :"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1678,11 +1678,11 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1691,7 +1691,7 @@ Contactez l'infoline coronavirus :"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1737,4 +1737,30 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index ecd5f6050..2be499453 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1488,7 +1488,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1620,7 +1620,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1648,11 +1648,11 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1661,7 +1661,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1707,4 +1707,30 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9a1227064..b1547e661 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1526,7 +1526,7 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1658,7 +1658,7 @@ Contatta la Infoline coronavirus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1686,11 +1686,11 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1699,7 +1699,7 @@ Contatta la Infoline coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1745,4 +1745,30 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 6ba737208..fa093b78d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1493,7 +1493,7 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1625,7 +1625,7 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1653,11 +1653,11 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1666,7 +1666,7 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1712,4 +1712,30 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 8a5461999..a4b673bdd 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1488,7 +1488,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1620,7 +1620,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1648,11 +1648,11 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1661,7 +1661,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1707,4 +1707,30 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 4c8e9f065..30e5d2bee 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1493,7 +1493,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1625,7 +1625,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1653,11 +1653,11 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1666,7 +1666,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1712,4 +1712,30 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 35611deb7..bfc449ebc 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1488,7 +1488,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1620,7 +1620,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1648,11 +1648,11 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1661,7 +1661,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1707,4 +1707,30 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index d408a2863..8b743acc3 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1468,7 +1468,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1600,7 +1600,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1628,11 +1628,11 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1641,7 +1641,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1687,4 +1687,30 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c5a75e5ae..adefdeaef 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1470,7 +1470,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1602,7 +1602,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1630,11 +1630,11 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1643,7 +1643,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1689,4 +1689,30 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f2f62bd8..ebdd292f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1515,7 +1515,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code"></string>
 
-    <!-- Veranstaltungen-Card Titel im Infotab -->
+    <!-- Veranstaltungen-Screen Titel -->
     <string name="events_title"></string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
@@ -1647,7 +1647,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="print_button_title"></string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Check into various events and see your previous check-ins in your diary."</string>
+    <string name="module_checkins_description"></string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
     <string name="inform_share_checkins_title"></string>
@@ -1675,11 +1675,11 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Remove from diary warning start text -->
     <string name="remove_diary_warning_star_text"></string>
 
-    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive? Please enter your CovidCode to warn others."</string>
+    <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_title"></string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"You are in isolation mode because you tested positive to the virus."</string>
+    <string name="home_end_isolation_card_text"></string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes"></string>
@@ -1688,7 +1688,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_subtitle">"Protect yourself and others by generating QR codes for working spaces, meeting rooms or other private events."</string>
+    <string name="events_card_subtitle"></string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog"></string>
@@ -1734,4 +1734,30 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
     <string name="pdf_download_app"></string>
+
+    <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
+    <string name="checkin_detail_checked_out_title"></string>
+
+    <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
+    <string name="home_covidcode_card_text"></string>
+
+    <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
+    <string name="home_end_isolation_card_title"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
+    <string name="events_card_title"></string>
+    <string name="checkin_footer_title1"></string>
+    <string name="checkin_footer_subtitle1"></string>
+    <string name="checkin_footer_title2"></string>
+    <string name="checkin_footer_subtitle2"></string>
+    <string name="events_empty_state_title"></string>
+    <string name="events_empty_state_subtitle"></string>
+    <string name="events_info_box_title"></string>
+    <string name="events_info_box_text"></string>
+    <string name="events_footer_title1"></string>
+    <string name="events_footer_title2"></string>
+    <string name="events_footer_title3"></string>
+    <string name="events_footer_subtitle1"></string>
+    <string name="events_footer_subtitle2"></string>
+    <string name="events_footer_subtitle3"></string>
 </resources>
\ No newline at end of file

From f4054992f59a336f7f2161ad0ac36ad71af5185c Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 19 May 2021 13:15:52 +0200
Subject: [PATCH 055/207] Remove Venue Types and fix package names

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  4 +-
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  2 +-
 .../checkin/checkinflow/CheckInFragment.kt    |  4 ++
 .../checkin/checkinflow/CheckOutFragment.java |  2 +-
 .../diary/DiaryRecyclerViewAdapter.java       |  2 +-
 .../checkin/diary/EditDiaryEntryFragment.java |  2 +-
 .../generateqrcode/EventsOverviewFragment.kt  |  2 +-
 .../generateqrcode/GenerateQrCodeFragment.kt  | 67 +------------------
 .../dp3t/checkin/generateqrcode/PdfCreator.kt |  4 +-
 .../checkin/generateqrcode/QRCodeViewModel.kt |  8 +--
 .../checkin/generateqrcode/QrCodeAdapter.kt   |  2 +-
 .../checkin/generateqrcode/QrCodeFragment.kt  | 11 ++-
 .../checkin/startup/BootCompletedReceiver.kt  |  4 +-
 .../utils/CrowdNotifierReminderHelper.java    |  1 +
 .../checkin/utils/NotificationHelper.java     |  1 +
 .../bag/dp3t/extensions/FragmentExtensions.kt |  2 +-
 .../bag/dp3t/extensions/LiveDataExtensions.kt |  2 +-
 .../extensions/QrCodePayloadExtensions.kt     |  2 +-
 .../dp3t/extensions/VenueInfoExtensions.kt    |  3 +-
 .../dp3t/extensions/VenueTypeExtensions.kt    | 12 +---
 .../admin/bag/dp3t/infotab/InfoTabFragment.kt |  2 +-
 .../admin/bag/dp3t/storage/SecureStorage.java |  2 +-
 app/src/main/proto/Crowdnotifier.proto        | 13 +---
 .../res/layout/fragment_generate_qr_code.xml  | 16 +----
 .../res/layout/item_events_explanation.xml    |  2 +-
 .../main/res/layout/item_generate_qr_code.xml |  2 +-
 app/src/main/res/values-bs/strings.xml        | 24 +++++++
 app/src/main/res/values-de/strings.xml        | 26 ++++++-
 app/src/main/res/values-es/strings.xml        | 24 +++++++
 app/src/main/res/values-fr/strings.xml        | 24 +++++++
 app/src/main/res/values-hr/strings.xml        | 24 +++++++
 app/src/main/res/values-it/strings.xml        | 24 +++++++
 app/src/main/res/values-pt/strings.xml        | 24 +++++++
 app/src/main/res/values-rm/strings.xml        | 24 +++++++
 app/src/main/res/values-sq/strings.xml        | 24 +++++++
 app/src/main/res/values-sr/strings.xml        | 24 +++++++
 app/src/main/res/values-ti/strings.xml        | 24 +++++++
 app/src/main/res/values-tr/strings.xml        | 24 +++++++
 app/src/main/res/values/strings.xml           | 24 +++++++
 app/src/main/res/values/styles.xml            |  2 +-
 40 files changed, 357 insertions(+), 133 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index b00867b86..87e78dfba 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -15,10 +15,10 @@ import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
-import ch.admin.bag.dp3t.checkin.utils.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 
 class CheckinOverviewFragment : Fragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index f6b7e365a..ac80f2b8b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -134,7 +134,7 @@ public void refreshTraceKeys() {
 
 	private void refreshTraceKeyLoadingError() {
 
-		if (storage.getLastSuccesssfulCheckinDownload() <= System.currentTimeMillis() - MAX_DURATION_WITHOUT_SUCCESSFUL_DOWNLOAD) {
+		if (storage.getLastSuccessfulCheckinDownload() <= System.currentTimeMillis() - MAX_DURATION_WITHOUT_SUCCESSFUL_DOWNLOAD) {
 			hasTraceKeyDownloadError.setValue(true);
 		} else {
 			hasTraceKeyDownloadError.setValue(false);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 0cf535902..ff5fe5c68 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -15,6 +15,10 @@ import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.utils.*
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
+import ch.admin.bag.dp3t.extensions.getAutoCheckoutDelay
+import ch.admin.bag.dp3t.extensions.getCheckoutWarningDelay
+import ch.admin.bag.dp3t.extensions.getReminderDelayOptions
+import ch.admin.bag.dp3t.extensions.getSubtitle
 import com.google.android.material.button.MaterialButton
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index ffe61a47f..38d8c3446 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -24,7 +24,7 @@
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
-import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 public class CheckOutFragment extends Fragment {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index e234dfaf5..986cc45bd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -17,7 +17,7 @@
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit;
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader;
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem;
-import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 public class DiaryRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
index cc36bb165..ae6575726 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
@@ -16,7 +16,7 @@
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
-import ch.admin.bag.dp3t.checkin.utils.VenueInfoExtensionsKt;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 public class EditDiaryEntryFragment extends Fragment {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index b5af6225d..a51ff45ed 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.showFragment
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class EventsOverviewFragment : Fragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 7a9032dd3..9ff66d7c6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -1,25 +1,15 @@
 package ch.admin.bag.dp3t.checkin.generateqrcode
 
 import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.BlendMode
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import android.widget.RadioButton
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import ch.admin.bag.dp3t.checkin.models.VenueType
 import ch.admin.bag.dp3t.databinding.FragmentGenerateQrCodeBinding
-import ch.admin.bag.dp3t.extensions.getNameRes
-
-private const val KEY_SELECTED_VENUE_TYPE = "KEY_SELECTED_VENUE_TYPE"
 
 class GenerateQrCodeFragment : Fragment() {
 
@@ -34,29 +24,15 @@ class GenerateQrCodeFragment : Fragment() {
 		binding = FragmentGenerateQrCodeBinding.inflate(layoutInflater).apply {
 			generateQrCodeCancel.setOnClickListener { popFragmentAndHideKeyboard() }
 
-			//TODO: Remove these hardcoded Events
-			val venueTypes = arrayListOf(VenueType.PRIVATE_EVENT, VenueType.MEETING_ROOM, VenueType.OFFICE_SPACE, VenueType.OTHER)
-			val selectedVenueType =
-				VenueType.forNumber(savedInstanceState?.getInt(KEY_SELECTED_VENUE_TYPE) ?: VenueType.PRIVATE_EVENT.number)
-			for (venueType in venueTypes) {
-				val radioButton = RadioButton(requireContext())
-				radioButton.setText(venueType.getNameRes())
-				radioButton.setRadioButtonColor()
-				radioButton.tag = venueType.number
-				generateQrCodeRadioGroup.addView(radioButton)
-				if (venueType == selectedVenueType) generateQrCodeRadioGroup.check(radioButton.id)
-			}
-			qrCodeGenerate.setOnClickListener {
-				generateQrCode(titleEditText.text.toString(), getSelectedVenueType())
-			}
+			qrCodeGenerate.setOnClickListener { generateQrCode(titleEditText.text.toString()) }
 			qrCodeGenerate.isEnabled = !titleEditText.text.isNullOrBlank()
 			titleEditText.doOnTextChanged { text, _, _, _ -> qrCodeGenerate.isEnabled = !text.isNullOrBlank() }
 		}
 		return binding.root
 	}
 
-	private fun generateQrCode(title: String, venueType: VenueType) {
-		qrCodeViewModel.generateAndSaveQrCode(title, venueType)
+	private fun generateQrCode(title: String) {
+		qrCodeViewModel.generateAndSaveQrCode(title)
 		popFragmentAndHideKeyboard()
 	}
 
@@ -66,41 +42,4 @@ class GenerateQrCodeFragment : Fragment() {
 		inputMethodManager.hideSoftInputFromWindow(binding.titleEditText.windowToken, 0)
 	}
 
-	private fun getSelectedVenueType() =
-		VenueType.forNumber(binding.root.findViewById<View>(binding.generateQrCodeRadioGroup.checkedRadioButtonId).tag as Int)
-
-
-	override fun onSaveInstanceState(outState: Bundle) {
-		outState.putInt(KEY_SELECTED_VENUE_TYPE, getSelectedVenueType().number)
-		super.onSaveInstanceState(outState)
-	}
-}
-
-fun RadioButton.setRadioButtonColor() {
-	val colorStateListButton = ColorStateList(
-		arrayOf(
-			intArrayOf(-android.R.attr.state_checked),
-			intArrayOf(android.R.attr.state_checked)
-		), intArrayOf(
-			Color.parseColor("#cdcdd0"),
-			Color.parseColor("#5094bf")
-		)
-	)
-	val colorStateListText = ColorStateList(
-		arrayOf(
-			intArrayOf(-android.R.attr.state_checked),
-			intArrayOf(android.R.attr.state_checked)
-		), intArrayOf(
-			Color.parseColor("#4A4969"),
-			Color.parseColor("#5094bf")
-		)
-	)
-	buttonTintList = colorStateListButton
-	setTextColor(colorStateListText)
-
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		buttonTintBlendMode = BlendMode.SRC_IN
-	} else {
-		buttonTintMode = PorterDuff.Mode.SRC_IN
-	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
index 626dc5390..a5cd1eb6b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
@@ -8,7 +8,7 @@ import android.view.View
 import androidx.annotation.ColorInt
 import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.checkin.utils.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.databinding.PdfQrCodeBinding
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
@@ -47,7 +47,7 @@ fun createEntryPdf(venueInfo: VenueInfo, context: Context): PdfDocument {
 
 		val pdfView = PdfQrCodeBinding.inflate(LayoutInflater.from(context)).apply {
 			title.text = venueInfo.title
-			subtitle.text = context.getString(venueInfo.getSubtitle())
+			subtitle.setText(venueInfo.getSubtitle())
 		}.root
 
 		pdfView.measure(
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index b4e5528dc..1a8c94918 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -13,8 +13,8 @@ import ch.admin.bag.dp3t.checkin.models.GeneratedQrCodesWrapper
 import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
 import ch.admin.bag.dp3t.checkin.models.VenueType
 import ch.admin.bag.dp3t.checkin.utils.SingleLiveEvent
-import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
-import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
+import ch.admin.bag.dp3t.extensions.toQrCodePayload
+import ch.admin.bag.dp3t.extensions.toVenueInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -73,14 +73,14 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		saveGeneratedQrCode(builder.build())
 	}
 
-	fun generateAndSaveQrCode(description: String, venueType: VenueType) = viewModelScope.launch(Dispatchers.IO) {
+	fun generateAndSaveQrCode(description: String) = viewModelScope.launch(Dispatchers.IO) {
 
 		val swissCovidLocationData = SwissCovidLocationData.newBuilder()
 			.setVersion(SWISSCOVID_LOCATION_DATA_VERSION)
 			.setAutomaticCheckoutDelaylMs(AUTOMATIC_CHECKOUT_DELAY_MS)
 			.setCheckoutWarningDelayMs(CHECKOUT_WARNING_DELAY_MS)
 			.addAllReminderDelayOptionsMs(REMINDER_DELAY_OPTIONS_MS)
-			.setTypeValue(venueType.number)
+			.setType(VenueType.USER_QR_CODE)
 			.build()
 
 		val generatedVenueInfo = CrowdNotifier.generateVenueInfo(
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index cb3877ce6..4d63c35d9 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -10,7 +10,7 @@ import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EVENT
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_FOOTER
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_GENERATE_QR_CODE_BUTTON
-import ch.admin.bag.dp3t.checkin.utils.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.databinding.*
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 54d059e84..21b0cbee1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -15,18 +15,17 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
-import ch.admin.bag.dp3t.checkin.utils.getSubtitle
-import ch.admin.bag.dp3t.checkin.utils.toQrCodePayload
-import ch.admin.bag.dp3t.checkin.utils.toVenueInfo
+import ch.admin.bag.dp3t.extensions.getSubtitle
+import ch.admin.bag.dp3t.extensions.toQrCodePayload
+import ch.admin.bag.dp3t.extensions.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
-import ch.admin.bag.dp3t.util.combineWith
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.combineWith
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import com.google.protobuf.ByteString
 import org.crowdnotifier.android.sdk.model.VenueInfo
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt
index 82173ec81..411749ff1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/startup/BootCompletedReceiver.kt
@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
-import ch.admin.bag.dp3t.checkin.utils.getAutoCheckoutDelay
-import ch.admin.bag.dp3t.checkin.utils.getCheckoutWarningDelay
+import ch.admin.bag.dp3t.extensions.getAutoCheckoutDelay
+import ch.admin.bag.dp3t.extensions.getCheckoutWarningDelay
 import ch.admin.bag.dp3t.storage.SecureStorage
 
 class BootCompletedReceiver : BroadcastReceiver() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
index 5a3516206..3d1fe54ff 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
@@ -12,6 +12,7 @@
 
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 3a213d5be..505efda4f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -15,6 +15,7 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.MainActivity;
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
index fda1fe032..aa1182bf2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.util
+package ch.admin.bag.dp3t.extensions
 
 import androidx.fragment.app.Fragment
 import ch.admin.bag.dp3t.R
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/LiveDataExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/LiveDataExtensions.kt
index 77a05a502..2ccd23a2b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/LiveDataExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/LiveDataExtensions.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.util
+package ch.admin.bag.dp3t.extensions
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/QrCodePayloadExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/QrCodePayloadExtensions.kt
index 2b3479888..c5fa7fc2d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/QrCodePayloadExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/QrCodePayloadExtensions.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.checkin.utils
+package ch.admin.bag.dp3t.extensions
 
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
 import org.crowdnotifier.android.sdk.model.VenueInfo
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
index 9f6899460..de4b5a946 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
@@ -1,10 +1,9 @@
-package ch.admin.bag.dp3t.checkin.utils
+package ch.admin.bag.dp3t.extensions
 
 import androidx.annotation.StringRes
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
-import ch.admin.bag.dp3t.extensions.getNameRes
 import com.google.protobuf.InvalidProtocolBufferException
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
index 71745f35e..9706fe1f8 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
@@ -7,16 +7,8 @@ import ch.admin.bag.dp3t.checkin.models.VenueType
 @StringRes
 fun VenueType.getNameRes(): Int {
 	return when (this) {
-		VenueType.MEETING_ROOM -> R.string.web_generator_category_meeting_room
-		VenueType.CAFETERIA -> R.string.web_generator_category_cafeteria
-		VenueType.PRIVATE_EVENT -> R.string.web_generator_category_private_event
-		VenueType.CANTEEN -> R.string.web_generator_category_canteen
-		VenueType.LIBRARY -> R.string.web_generator_category_library
-		VenueType.LECTURE_ROOM -> R.string.web_generator_category_lecture_room
-		VenueType.SHOP -> R.string.web_generator_category_shop
-		VenueType.GYM -> R.string.web_generator_category_gym
-		VenueType.KITCHEN_AREA -> R.string.web_generator_category_kitchen_area
-		VenueType.OFFICE_SPACE -> R.string.web_generator_category_office_space
+		VenueType.USER_QR_CODE -> R.string.venue_type_user_qr_code
+		VenueType.CONTACT_TRACING_QR_CODE -> R.string.venue_type_contact_tracing_qr_code
 		else -> R.string.web_generator_category_other
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
index f93ea9da1..fa9ff0cee 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
@@ -16,7 +16,7 @@ import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.travel.TravelFragment
 import ch.admin.bag.dp3t.travel.TravelUtils
 import ch.admin.bag.dp3t.util.UrlUtil
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import ch.admin.bag.dp3t.whattodo.WtdInfolineAccessabilityDialogFragment
 import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 9f4087214..6739426d4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -167,7 +167,7 @@ public void setLastSuccessfulCheckinDownload(long time) {
 		prefs.edit().putLong(KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD, time).apply();
 	}
 
-	public long getLastSuccesssfulCheckinDownload() {
+	public long getLastSuccessfulCheckinDownload() {
 		return prefs.getLong(KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD, System.currentTimeMillis());
 	}
 
diff --git a/app/src/main/proto/Crowdnotifier.proto b/app/src/main/proto/Crowdnotifier.proto
index 4b9c2ecc4..393460e66 100644
--- a/app/src/main/proto/Crowdnotifier.proto
+++ b/app/src/main/proto/Crowdnotifier.proto
@@ -38,15 +38,6 @@ message SwissCovidLocationData {
 }
 
 enum VenueType {
-  OTHER = 0;
-  MEETING_ROOM = 1;
-  CAFETERIA = 2;
-  PRIVATE_EVENT = 3;
-  CANTEEN = 4;
-  LIBRARY = 5;
-  LECTURE_ROOM = 6;
-  SHOP = 7;
-  GYM = 8;
-  KITCHEN_AREA = 9;
-  OFFICE_SPACE = 10;
+  USER_QR_CODE = 0;
+  CONTACT_TRACING_QR_CODE = 1;
 }
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index b8bac73a4..dd32ec44e 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -55,20 +55,6 @@
 				android:layout_marginVertical="@dimen/spacing_very_large"
 				android:text="@string/checkins_create_qr_code" />
 
-			<TextView
-				style="@style/NextStep.Text.Bold.Dark"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/web_generator_category_label"
-				android:textAllCaps="true" />
-
-			<RadioGroup
-				android:id="@+id/generate_qr_code_radio_group"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:layout_marginBottom="@dimen/spacing_huger" />
-
 			<TextView
 				style="@style/NextStep.Text.Bold.Dark"
 				android:layout_width="wrap_content"
@@ -110,7 +96,7 @@
 
 		<Button
 			android:id="@+id/qr_code_generate"
-			style="@style/NextStep.Button"
+			style="@style/NextStep.Button.AllCaps"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal|bottom"
diff --git a/app/src/main/res/layout/item_events_explanation.xml b/app/src/main/res/layout/item_events_explanation.xml
index 4384cf5f7..a38fa2b37 100644
--- a/app/src/main/res/layout/item_events_explanation.xml
+++ b/app/src/main/res/layout/item_events_explanation.xml
@@ -98,7 +98,7 @@
 
 			<Button
 				android:id="@+id/generate_qr_code_button"
-				style="@style/NextStep.Button.Blue"
+				style="@style/NextStep.Button.AllCaps"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/spacing_medium"
diff --git a/app/src/main/res/layout/item_generate_qr_code.xml b/app/src/main/res/layout/item_generate_qr_code.xml
index 420b33600..638946310 100644
--- a/app/src/main/res/layout/item_generate_qr_code.xml
+++ b/app/src/main/res/layout/item_generate_qr_code.xml
@@ -8,7 +8,7 @@
 
 	<Button
 		android:id="@+id/qr_code_generate"
-		style="@style/NextStep.Button"
+		style="@style/NextStep.Button.AllCaps"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@string/checkins_create_qr_code" />
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 40d996f5a..e601cd482 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1737,4 +1737,28 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8147b60db..6b450e4de 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1584,7 +1584,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <!-- Fuzzy -->
-    <string name="web_generator_title_placeholder">"z.B. Raum- oder Eventname"</string>
+    <string name="web_generator_title_placeholder">"z.B. Raum oder Anlassname"</string>
 
     <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
     <!-- Fuzzy -->
@@ -1818,4 +1818,28 @@ Mögliche Einsatzorte:
 – Zusammenkünfte im professionellen Umfeld wie z.B. Sitzungszimmer, Büroräume, Kantinen, etc."</string>
     <string name="events_footer_subtitle2">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand."</string>
     <string name="events_footer_subtitle3">"Nein, SwissCovid-Check-ins ersetzen die Pflicht zur Kontaktdatenerfassung, wie sie in der Covid-19-Verordnung festgehalten ist, nicht. Sie dienen lediglich als Ergänzung, um Teilnehmende rasch über eine mögliche Ansteckung zu informieren."</string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle">"Mögliche Risikosituation:"</string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Begegnungen"</string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Was soll ich tun?"</string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed">"Positiver Check-in"</string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive Check-ins / Kontakte"</string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code">"User QR Code"</string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code">"Contact Tracing QR Code"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d70c426f5..27d8278f0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1728,4 +1728,28 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6b4136a49..af47a773b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1763,4 +1763,28 @@ Contactez l'infoline coronavirus :"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2be499453..8792222ff 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1733,4 +1733,28 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b1547e661..5e735e9ec 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1771,4 +1771,28 @@ Contatta la Infoline coronavirus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index fa093b78d..186647b3e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1738,4 +1738,28 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index a4b673bdd..cf82487ee 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1733,4 +1733,28 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 30e5d2bee..35520080d 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1738,4 +1738,28 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index bfc449ebc..96c75b988 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1733,4 +1733,28 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 8b743acc3..947e3be98 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1713,4 +1713,28 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index adefdeaef..ef33c6fa3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1715,4 +1715,28 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ebdd292f0..77e420c6a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1760,4 +1760,28 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
     <string name="events_footer_subtitle3"></string>
+
+    <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
+    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+
+    <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+
+    <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+
+    <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
+    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_checkin_exposed"></string>
+
+    <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
+    <string name="debug_state_setting_option_mutiple_exposed"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_user_qr_code"></string>
+
+    <!-- Anzeigename für User QR Codes -->
+    <string name="venue_type_contact_tracing_qr_code"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 40e7fa04b..543671f7b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -226,7 +226,7 @@
 	</style>
 
 	<style name="NextStep.Button.AllCaps">
-		<item name="textAllCaps">true</item>
+		<item name="android:textAllCaps">true</item>
 	</style>
 
 	<style name="NextStep.Button.Purple">

From e6e2a70b684f3411d3007b0bd2dc422e4925c709 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 17 May 2021 18:29:55 +0200
Subject: [PATCH 056/207] Started with Meldungen Screen

---
 .../bag/dp3t/reports/ReportsFragment.java     | 525 ------------------
 .../admin/bag/dp3t/reports/ReportsFragment.kt | 443 +++++++++++++++
 .../dp3t/reports/ReportsHeaderFragment.java   |   6 +-
 .../res/layout/card_what_to_do_leitfaden.xml  |  64 ++-
 .../layout/card_what_to_do_save_others.xml    | 318 -----------
 .../layout/card_what_to_do_save_yourself.xml  |   2 +-
 .../layout/card_what_to_do_self_isolation.xml |   2 +-
 app/src/main/res/layout/fragment_reports.xml  |   9 -
 8 files changed, 496 insertions(+), 873 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
 delete mode 100644 app/src/main/res/layout/card_what_to_do_save_others.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
deleted file mode 100644
index fd19ad455..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.reports;
-
-import android.animation.ValueAnimator;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.text.Spannable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.transition.AutoTransition;
-import androidx.transition.Transition;
-import androidx.transition.TransitionManager;
-
-import java.util.List;
-import java.util.TimeZone;
-
-import org.dpppt.android.sdk.models.DayDate;
-import org.dpppt.android.sdk.models.ExposureDay;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.contacts.ReactivateTracingReminderDialog;
-import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
-import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.util.*;
-import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
-import ch.admin.bag.dp3t.whattodo.WhereToTestDialogFragment;
-
-public class ReportsFragment extends Fragment {
-
-	public static ReportsFragment newInstance() {
-		return new ReportsFragment();
-	}
-
-	private final int DAYS_TO_STAY_IN_QUARANTINE = 10;
-	private final int MAX_EXPOSURE_AGE_TO_DO_A_TEST = 10;
-	private final int MIN_EXPOSURE_AGE_TO_DO_A_TEST = 5;
-	private final long ONE_DAY_IN_MILLIS = 24L * 60 * 60 * 1000;
-
-	private TracingViewModel tracingViewModel;
-	private SecureStorage secureStorage;
-
-	private View headerFragmentContainer;
-	private LockableScrollView scrollView;
-	private View scrollViewFirstchild;
-
-	private View healthyView;
-	private View saveOthersView;
-	private View leitfadenView;
-	private View infectedView;
-
-	private TextView xDaysLeftTextview;
-
-
-	private boolean leitfadenJustOpened = false;
-
-	public ReportsFragment() { super(R.layout.fragment_reports); }
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
-		secureStorage = SecureStorage.getInstance(getContext());
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		Toolbar toolbar = view.findViewById(R.id.reports_toolbar);
-		toolbar.setNavigationOnClickListener(v -> getParentFragmentManager().popBackStack());
-
-		headerFragmentContainer = view.findViewById(R.id.header_fragment_container);
-		scrollView = view.findViewById(R.id.reports_scrollview);
-		scrollViewFirstchild = view.findViewById(R.id.reports_scrollview_firstChild);
-
-		healthyView = view.findViewById(R.id.reports_healthy);
-		saveOthersView = view.findViewById(R.id.reports_save_others);
-		leitfadenView = view.findViewById(R.id.reports_leitfaden);
-		infectedView = view.findViewById(R.id.reports_infected);
-
-		xDaysLeftTextview = saveOthersView.findViewById(R.id.x_days_left_textview);
-
-		Button openSwisscovidLeitfadenButton1 = leitfadenView.findViewById(R.id.card_encounters_button);
-		View leitfadenInfoButton1 = leitfadenView.findViewById(R.id.leitfaden_info_button);
-		Button openSwisscovidLeitfadenButton2 = saveOthersView.findViewById(R.id.card_encounters_button);
-		View leitfadenInfoButton2 = saveOthersView.findViewById(R.id.leitfaden_info_button);
-
-		openSwisscovidLeitfadenButton1.setOnClickListener(view1 -> openSwissCovidLeitfaden());
-		leitfadenInfoButton1.setOnClickListener(v -> showLeitfadenInfo(openSwisscovidLeitfadenButton1.getText().toString()));
-		openSwisscovidLeitfadenButton2.setOnClickListener(view1 -> openSwissCovidLeitfaden());
-		leitfadenInfoButton2.setOnClickListener(v -> showLeitfadenInfo(openSwisscovidLeitfadenButton2.getText().toString()));
-
-		setupFreeTestInfoBox(leitfadenView);
-		setupFreeTestInfoBox(saveOthersView);
-
-		View callHotlineButton1 = leitfadenView.findViewById(R.id.item_call_hotline_layout);
-		View callHotlineButton2 = saveOthersView.findViewById(R.id.item_call_hotline_layout);
-		callHotlineButton1.setOnClickListener(v -> callHotline());
-		callHotlineButton2.setOnClickListener(v -> callHotline());
-
-		Button faqButton1 = healthyView.findViewById(R.id.card_encounters_faq_button);
-		Button faqButton2 = saveOthersView.findViewById(R.id.card_encounters_faq_button);
-		Button faqButton3 = leitfadenView.findViewById(R.id.card_encounters_faq_button);
-		Button faqButton4 = infectedView.findViewById(R.id.card_encounters_faq_button);
-
-		faqButton1.setOnClickListener(v -> showFaq());
-		faqButton2.setOnClickListener(v -> showFaq());
-		faqButton3.setOnClickListener(v -> showFaq());
-		faqButton4.setOnClickListener(v -> showFaq());
-
-		View infoLinkHealthy = healthyView.findViewById(R.id.card_encounters_link);
-
-		infoLinkHealthy.setOnClickListener(v -> openLink(R.string.no_meldungen_box_url));
-
-		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
-			healthyView.setVisibility(View.GONE);
-			saveOthersView.setVisibility(View.GONE);
-			leitfadenView.setVisibility(View.GONE);
-			infectedView.setVisibility(View.GONE);
-
-			ReportsHeaderFragment.Type headerType;
-			int numExposureDays = 0;
-
-			if (tracingStatusInterface.isReportedAsInfected()) {
-				headerType = ReportsHeaderFragment.Type.POSITIVE_TESTED;
-				infectedView.setVisibility(View.VISIBLE);
-
-				long oldestSharedKeyDateMillis = secureStorage.getPositiveReportOldestSharedKey();
-				if (oldestSharedKeyDateMillis > 0L) {
-
-					infectedView.findViewById(R.id.card_encounters_faq_who_is_notified_container).setVisibility(View.VISIBLE);
-					String formattedDate =
-							DateUtils.getFormattedDateWrittenMonth(oldestSharedKeyDateMillis, TimeZone.getTimeZone("UTC"));
-					String faqText = getString(R.string.meldungen_positive_tested_faq2_text).replace("{ONSET_DATE}",
-							formattedDate);
-					Spannable formattedText = StringUtil.makePartiallyBold(faqText, formattedDate);
-					((TextView) infectedView.findViewById(R.id.card_encounters_faq_who_is_notified)).setText(formattedText);
-				} else {
-					infectedView.findViewById(R.id.card_encounters_faq_who_is_notified_container).setVisibility(View.GONE);
-				}
-
-				infectedView.findViewById(R.id.delete_reports).setOnClickListener(v -> {
-					AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle);
-					builder.setMessage(R.string.delete_infection_dialog)
-							.setPositiveButton(R.string.delete_infection_dialog_finish_button, (dialog, id) -> {
-								tracingStatusInterface.resetInfectionStatus(getContext());
-								secureStorage.setIsolationEndDialogTimestamp(-1L);
-								secureStorage.setPositiveReportOldestSharedKey(-1L);
-								getParentFragmentManager().popBackStack();
-							})
-							.setNegativeButton(R.string.cancel, (dialog, id) -> {
-								//do nothing
-							});
-					builder.create();
-					builder.show();
-				});
-				if (!tracingStatusInterface.canInfectedStatusBeReset(getContext())) {
-					infectedView.findViewById(R.id.delete_reports).setVisibility(View.GONE);
-				}
-			} else if (tracingStatusInterface.wasContactReportedAsExposed()) {
-				headerType = ReportsHeaderFragment.Type.POSSIBLE_INFECTION;
-				numExposureDays = tracingStatusInterface.getExposureDays().size();
-				boolean isOpenLeitfadenPending = secureStorage.isOpenLeitfadenPending();
-				if (isOpenLeitfadenPending) {
-					leitfadenView.setVisibility(View.VISIBLE);
-				} else {
-					saveOthersView.setVisibility(View.VISIBLE);
-				}
-				int daysLeft = DAYS_TO_STAY_IN_QUARANTINE - (int) tracingStatusInterface.getDaysSinceExposure();
-				if (daysLeft > DAYS_TO_STAY_IN_QUARANTINE || daysLeft <= 0) {
-					xDaysLeftTextview.setVisibility(View.GONE);
-				} else if (daysLeft == 1) {
-					xDaysLeftTextview.setText(R.string.date_in_one_day);
-				} else {
-					xDaysLeftTextview.setText(getString(R.string.date_in_days).replace("{COUNT}", String.valueOf(daysLeft)));
-				}
-				leitfadenView.findViewById(R.id.delete_reports)
-						.setOnClickListener(v -> deleteNotifications(tracingStatusInterface));
-				saveOthersView.findViewById(R.id.delete_reports)
-						.setOnClickListener(v -> deleteNotifications(tracingStatusInterface));
-			} else {
-				healthyView.setVisibility(View.VISIBLE);
-				headerType = ReportsHeaderFragment.Type.NO_REPORTS;
-			}
-
-			setupHeaderFragment(headerType, numExposureDays);
-		});
-
-		NotificationManager notificationManager =
-				(NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
-		notificationManager.cancel(NotificationUtil.NOTIFICATION_ID_CONTACT);
-	}
-
-
-	private void deleteNotifications(TracingStatusInterface tracingStatusInterface) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.NextStep_AlertDialogStyle);
-		builder.setMessage(R.string.delete_notification_dialog)
-				.setPositiveButton(R.string.delete_reports_button, (dialog, id) -> {
-					tracingStatusInterface.resetExposureDays(getContext());
-					getParentFragmentManager().popBackStack();
-				})
-				.setNegativeButton(R.string.cancel, (dialog, id) -> {
-					//do nothing
-				});
-		builder.create();
-		builder.show();
-	}
-
-	private void setupFreeTestInfoBox(@NonNull View view) {
-
-		View testLocationsButton = view.findViewById(R.id.testlocations_link);
-		testLocationsButton.setOnClickListener(v -> showWhereToTestDialog());
-
-		TextView testCountdownTextView = view.findViewById(R.id.test_countdown_textview);
-
-		List<ExposureDay> exposureDays = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays();
-		DayDate today = new DayDate();
-		DayDate oldestExposure = null; // This includes only exposures that are newer than MIN_EXPOSURE_AGE_TO_DO_A_TEST
-
-		for (ExposureDay exposureDay : exposureDays) {
-			if (exposureDay.getExposedDate().addDays(MIN_EXPOSURE_AGE_TO_DO_A_TEST).isBeforeOrEquals(today) &&
-					!exposureDay.getExposedDate().addDays(MAX_EXPOSURE_AGE_TO_DO_A_TEST).isBefore(today)) {
-				testCountdownTextView.setText(R.string.meldungen_detail_free_test_now);
-				return;
-			}
-			if (!exposureDay.getExposedDate().addDays(MIN_EXPOSURE_AGE_TO_DO_A_TEST).isBeforeOrEquals(today)) {
-				if (oldestExposure == null || exposureDay.getExposedDate().isBefore(oldestExposure)) {
-					oldestExposure = exposureDay.getExposedDate();
-				}
-			}
-		}
-
-		if (oldestExposure != null) {
-			int daysSinceFirstExposure =
-					(int) ((today.getStartOfDayTimestamp() - oldestExposure.getStartOfDayTimestamp()) / ONE_DAY_IN_MILLIS);
-			int daysUntilTest = MIN_EXPOSURE_AGE_TO_DO_A_TEST - daysSinceFirstExposure;
-			if (daysUntilTest == 1) {
-				testCountdownTextView.setText(R.string.meldungen_detail_free_test_tomorrow);
-			} else {
-				testCountdownTextView.setText(getString(R.string.meldungen_detail_free_test_in_x_tagen)
-						.replace("{COUNT}", String.valueOf(daysUntilTest)));
-			}
-		} else {
-			testCountdownTextView.setVisibility(View.GONE);
-		}
-	}
-
-	private void showWhereToTestDialog() {
-		requireActivity().getSupportFragmentManager().beginTransaction()
-				.add(WhereToTestDialogFragment.newInstance(), WhereToTestDialogFragment.class.getCanonicalName())
-				.commit();
-	}
-
-	private void openLink(@StringRes int stringRes) {
-		UrlUtil.openUrl(getContext(), getString(stringRes));
-	}
-
-	private void showFaq() {
-		UrlUtil.openUrl(getContext(), getString(R.string.faq_button_url));
-	}
-
-	private void openSwissCovidLeitfaden() {
-		leitfadenJustOpened = true;
-		secureStorage.leitfadenOpened();
-		List<ExposureDay> exposureDays = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays();
-		StringBuilder contactDates = new StringBuilder();
-		String delimiter = "";
-		for (ExposureDay exposureDay : exposureDays) {
-			contactDates.append(delimiter);
-			contactDates.append(exposureDay.getExposedDate().formatAsString());
-			delimiter = ",";
-		}
-		UrlUtil.openUrl(getContext(), getString(R.string.swisscovid_leitfaden_url).replace("{CONTACT_DATES}", contactDates));
-	}
-
-	private void showLeitfadenInfo(String buttonTitleReplacementText) {
-		String title = getString(R.string.leitfaden_infopopup_title);
-		String subtitle = getString(R.string.leitfaden_infopopup_text).replace("{BUTTON_TITLE}", buttonTitleReplacementText);
-		requireActivity().getSupportFragmentManager().beginTransaction().add(
-				SimpleDismissableDialog.newInstance(title, subtitle),
-				ReactivateTracingReminderDialog.class.getCanonicalName()).commit();
-	}
-
-	private void callHotline() {
-		PhoneUtil.callHelpline(getContext());
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-
-		if (leitfadenJustOpened) {
-			leitfadenJustOpened = false;
-			leitfadenView.setVisibility(View.GONE);
-			saveOthersView.setVisibility(View.VISIBLE);
-		}
-	}
-
-
-	public void doHeaderAnimation(View info, View image, Button button, View showAllButton, int numExposureDays) {
-		secureStorage.setReportsHeaderAnimationPending(false);
-
-		ViewGroup rootView = (ViewGroup) getView();
-
-		scrollViewFirstchild.setPadding(scrollViewFirstchild.getPaddingLeft(),
-				rootView.getHeight(),
-				scrollViewFirstchild.getPaddingRight(), scrollViewFirstchild.getPaddingBottom());
-		scrollViewFirstchild.setVisibility(View.VISIBLE);
-
-		rootView.post(() -> {
-
-			AutoTransition autoTransition = new AutoTransition();
-			autoTransition.setDuration(300);
-			autoTransition.addListener(new Transition.TransitionListener() {
-				@Override
-				public void onTransitionStart(@NonNull Transition transition) {
-
-				}
-
-				@Override
-				public void onTransitionEnd(@NonNull Transition transition) {
-					headerFragmentContainer.post(() -> setupScrollBehavior());
-				}
-
-				@Override
-				public void onTransitionCancel(@NonNull Transition transition) {
-
-				}
-
-				@Override
-				public void onTransitionPause(@NonNull Transition transition) {
-
-				}
-
-				@Override
-				public void onTransitionResume(@NonNull Transition transition) {
-
-				}
-			});
-
-			TransitionManager.beginDelayedTransition(rootView, autoTransition);
-
-			updateHeaderSize(false, numExposureDays);
-
-			info.setVisibility(View.VISIBLE);
-			image.setVisibility(View.GONE);
-			button.setVisibility(View.GONE);
-			if (numExposureDays <= 1) {
-				showAllButton.setVisibility(View.GONE);
-			} else {
-				showAllButton.setVisibility(View.VISIBLE);
-			}
-		});
-	}
-
-	public void animateHeaderHeight(boolean showAll, int numExposureDays, View exposureDaysContainer, View dateTextView) {
-
-		int exposureDayItemHeight = getResources().getDimensionPixelSize(R.dimen.header_reports_exposure_day_height);
-		int endExposureDayTopPadding;
-		int endHeaderHeight;
-		int endDateTextHeight;
-		int endExposureDaysContainerHeight;
-		int endScrollViewPadding;
-		if (showAll) {
-			endExposureDayTopPadding = getResources().getDimensionPixelSize(R.dimen.spacing_medium);
-			endHeaderHeight = Math.min(getScreenHeight() / 3 * 2,
-					getResources().getDimensionPixelSize(R.dimen.header_height_reports_multiple_days) +
-							exposureDayItemHeight * (numExposureDays - 1) + endExposureDayTopPadding);
-			endDateTextHeight = 0;
-			endExposureDaysContainerHeight =
-					endHeaderHeight - getResources().getDimensionPixelSize(R.dimen.header_height_reports_multiple_days) +
-							exposureDayItemHeight;
-			endScrollViewPadding =
-					endHeaderHeight - getResources().getDimensionPixelSize(R.dimen.top_item_header_overlap_reports_multiple_days);
-		} else {
-			endExposureDayTopPadding = 0;
-			endHeaderHeight = getResources().getDimensionPixelSize(R.dimen.header_height_reports_multiple_days);
-			endDateTextHeight = exposureDayItemHeight;
-			endExposureDaysContainerHeight = 0;
-			endScrollViewPadding = getResources().getDimensionPixelSize(R.dimen.top_item_padding_reports_multiple_days);
-		}
-
-		int startExposureDayTopPadding = exposureDaysContainer.getPaddingTop();
-		int startHeaderHeight = headerFragmentContainer.getLayoutParams().height;
-		int startScrollViewPadding = scrollViewFirstchild.getPaddingTop();
-		int startDateTextHeight = dateTextView.getLayoutParams().height;
-		int startExposureDaysContainerHeight = exposureDaysContainer.getLayoutParams().height;
-
-		ValueAnimator anim = ValueAnimator.ofFloat(0, 1);
-		anim.addUpdateListener(v -> {
-					float value = (float) v.getAnimatedValue();
-					setHeight(headerFragmentContainer, value * (endHeaderHeight - startHeaderHeight) + startHeaderHeight);
-					setHeight(dateTextView, value * (endDateTextHeight - startDateTextHeight) + startDateTextHeight);
-					setHeight(exposureDaysContainer,
-							value * (endExposureDaysContainerHeight - startExposureDaysContainerHeight) + startExposureDaysContainerHeight);
-					scrollViewFirstchild.setPadding(scrollViewFirstchild.getPaddingLeft(),
-							(int) (value * (endScrollViewPadding - startScrollViewPadding) + startScrollViewPadding),
-							scrollViewFirstchild.getPaddingRight(), scrollViewFirstchild.getPaddingBottom());
-					exposureDaysContainer.setPadding(exposureDaysContainer.getPaddingLeft(),
-							(int) (value * (endExposureDayTopPadding - startExposureDayTopPadding) + startExposureDayTopPadding),
-							exposureDaysContainer.getPaddingRight(), exposureDaysContainer.getPaddingBottom());
-					if (value == 0) {
-						exposureDaysContainer.setVisibility(View.VISIBLE);
-						dateTextView.setVisibility(View.VISIBLE);
-					} else if (value == 1) {
-						if (showAll) {
-							dateTextView.setVisibility(View.GONE);
-						} else {
-							exposureDaysContainer.setVisibility(View.GONE);
-						}
-						headerFragmentContainer.post(this::setupScrollBehavior);
-					}
-				}
-		);
-		anim.setDuration(100);
-		anim.start();
-	}
-
-	private int getScreenHeight() {
-		return Resources.getSystem().getDisplayMetrics().heightPixels;
-	}
-
-	private void setHeight(View view, float height) {
-		ViewGroup.LayoutParams params = view.getLayoutParams();
-		params.height = (int) height;
-		view.setLayoutParams(params);
-	}
-
-	private void updateHeaderSize(boolean isReportsHeaderAnimationPending, int numExposureDays) {
-		ViewGroup.LayoutParams headerLp = headerFragmentContainer.getLayoutParams();
-		if (isReportsHeaderAnimationPending) {
-			headerLp.height = ViewGroup.LayoutParams.MATCH_PARENT;
-		} else if (numExposureDays <= 1) {
-			headerLp.height = getResources().getDimensionPixelSize(R.dimen.header_height_reports);
-			scrollViewFirstchild.setPadding(scrollViewFirstchild.getPaddingLeft(),
-					getResources().getDimensionPixelSize(R.dimen.top_item_padding_reports),
-					scrollViewFirstchild.getPaddingRight(), scrollViewFirstchild.getPaddingBottom());
-		} else {
-			headerLp.height = getResources().getDimensionPixelSize(R.dimen.header_height_reports_multiple_days);
-			scrollViewFirstchild.setPadding(scrollViewFirstchild.getPaddingLeft(),
-					getResources().getDimensionPixelSize(R.dimen.top_item_padding_reports_multiple_days),
-					scrollViewFirstchild.getPaddingRight(), scrollViewFirstchild.getPaddingBottom());
-		}
-		headerFragmentContainer.setLayoutParams(headerLp);
-		headerFragmentContainer.post(this::setupScrollBehavior);
-	}
-
-	private void setupScrollBehavior() {
-		if (!isVisible()) return;
-
-		Rect rect = new Rect();
-		headerFragmentContainer.getDrawingRect(rect);
-		scrollView.setScrollPreventRect(rect);
-
-		int scrollRangePx = scrollViewFirstchild.getPaddingTop();
-		int translationRangePx = -getResources().getDimensionPixelSize(R.dimen.spacing_huge);
-		scrollView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
-			float progress = computeScrollAnimProgress(scrollY, scrollRangePx);
-			headerFragmentContainer.setAlpha(1 - progress);
-			headerFragmentContainer.setTranslationY(progress * translationRangePx);
-		});
-		scrollView.post(() -> {
-			float progress = computeScrollAnimProgress(scrollView.getScrollY(), scrollRangePx);
-			headerFragmentContainer.setAlpha(1 - progress);
-			headerFragmentContainer.setTranslationY(progress * translationRangePx);
-		});
-	}
-
-	private float computeScrollAnimProgress(int scrollY, int scrollRange) {
-		return Math.min(scrollY, scrollRange) / (float) scrollRange;
-	}
-
-	private void setupHeaderFragment(ReportsHeaderFragment.Type headerType, int numExposureDays) {
-
-		boolean isReportsHeaderAnimationPending = secureStorage.isReportsHeaderAnimationPending();
-
-		updateHeaderSize(isReportsHeaderAnimationPending, numExposureDays);
-
-		if (isReportsHeaderAnimationPending) {
-			scrollViewFirstchild.setVisibility(View.GONE);
-		}
-
-		headerFragmentContainer.post(this::setupScrollBehavior);
-
-		Fragment header;
-		switch (headerType) {
-			case NO_REPORTS:
-				header = ReportsHeaderFragment.newInstance(ReportsHeaderFragment.Type.NO_REPORTS, false);
-				break;
-			case POSSIBLE_INFECTION:
-				header = ReportsHeaderFragment
-						.newInstance(ReportsHeaderFragment.Type.POSSIBLE_INFECTION, isReportsHeaderAnimationPending);
-				break;
-			case POSITIVE_TESTED:
-				header = ReportsHeaderFragment.newInstance(ReportsHeaderFragment.Type.POSITIVE_TESTED, false);
-				break;
-			default:
-				throw new IllegalStateException("Unexpected value: " + headerType);
-		}
-
-		getChildFragmentManager().beginTransaction()
-				.replace(R.id.header_fragment_container, header)
-				.commit();
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
new file mode 100644
index 000000000..3be7e7cc6
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -0,0 +1,443 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.reports
+
+import android.animation.ValueAnimator
+import android.app.NotificationManager
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.Rect
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.transition.AutoTransition
+import androidx.transition.Transition
+import androidx.transition.TransitionManager
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.contacts.ReactivateTracingReminderDialog
+import ch.admin.bag.dp3t.databinding.FragmentReportsBinding
+import ch.admin.bag.dp3t.home.model.TracingStatusInterface
+import ch.admin.bag.dp3t.storage.SecureStorage
+import ch.admin.bag.dp3t.util.*
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import ch.admin.bag.dp3t.whattodo.WhereToTestDialogFragment
+import org.dpppt.android.sdk.models.DayDate
+import java.util.*
+import kotlin.math.min
+
+private const val DAYS_TO_STAY_IN_QUARANTINE = 10
+private const val MAX_EXPOSURE_AGE_TO_DO_A_TEST = 10
+private const val MIN_EXPOSURE_AGE_TO_DO_A_TEST = 5
+private const val ONE_DAY_IN_MILLIS = 24L * 60 * 60 * 1000
+
+
+class ReportsFragment : Fragment() {
+
+	companion object {
+		@JvmStatic
+		fun newInstance() = ReportsFragment()
+	}
+
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
+	private val tracingViewModel: TracingViewModel by activityViewModels()
+	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
+
+	private lateinit var binding: FragmentReportsBinding
+
+	private var leitfadenJustOpened = false
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentReportsBinding.inflate(inflater)
+		return binding.apply {
+			reportsToolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
+
+			tracingViewModel.appStatusLiveData.observe(viewLifecycleOwner) {
+				when {
+					it.isReportedAsInfected -> setupState(State.POSITIVE_TESTED, it)
+					it.wasContactReportedAsExposed() -> setupState(State.POSSIBLE_INFECTION, it)
+					else -> setupState(State.NO_REPORTS, it)
+				}
+			}
+
+		}.root
+	}
+
+	private fun setupState(state: State, tracingStatusInterface: TracingStatusInterface) {
+
+		//TODO: Set up header
+		binding.apply {
+			reportsHealthy.root.isVisible = state == State.NO_REPORTS
+			reportsInfected.root.isVisible = state == State.POSITIVE_TESTED
+			reportsLeitfaden.root.isVisible = state == State.POSSIBLE_INFECTION
+		}
+		when (state) {
+			State.NO_REPORTS -> {
+				binding.reportsHealthy.apply {
+					cardEncountersLink.setOnClickListener { openLink(R.string.no_meldungen_box_url) }
+					faqButton.setOnClickListener { showFaq() }
+				}
+				setupHeaderFragment(ReportsHeaderFragment.Type.NO_REPORTS, 0);
+			}
+			State.POSSIBLE_INFECTION -> {
+				binding.reportsLeitfaden.apply {
+					itemCallHotlineLayout.setOnClickListener { callHotline() }
+					faqButton.setOnClickListener { showFaq() }
+					val isOpenLeitfadenPending = secureStorage.isOpenLeitfadenPending
+					fillLeitfadenNowButton.isVisible = isOpenLeitfadenPending
+					zumLeitfadenButton.isVisible = !isOpenLeitfadenPending
+					xDaysLeftTextview.isVisible = !isOpenLeitfadenPending
+					setupFreeTestInfoBox(tracingStatusInterface)
+					if (isOpenLeitfadenPending) {
+						fillLeitfadenNowButton.setOnClickListener { openSwissCovidLeitfaden() }
+						leitfadenInfoButton.setOnClickListener { showLeitfadenInfo(fillLeitfadenNowButton.text.toString()) }
+					} else {
+						zumLeitfadenButton.setOnClickListener { openSwissCovidLeitfaden() }
+						leitfadenInfoButton.setOnClickListener { showLeitfadenInfo(zumLeitfadenButton.text.toString()) }
+					}
+
+					val daysLeft = DAYS_TO_STAY_IN_QUARANTINE - tracingStatusInterface.daysSinceExposure.toInt()
+					if (daysLeft > DAYS_TO_STAY_IN_QUARANTINE || daysLeft <= 0) {
+						xDaysLeftTextview.isVisible = false
+					} else if (daysLeft == 1) {
+						xDaysLeftTextview.setText(R.string.date_in_one_day)
+					} else {
+						xDaysLeftTextview.text = getString(R.string.date_in_days).replace("{COUNT}", daysLeft.toString())
+					}
+					deleteReports.setOnClickListener { deleteNotifications(tracingStatusInterface) }
+				}
+				setupHeaderFragment(ReportsHeaderFragment.Type.POSSIBLE_INFECTION, tracingStatusInterface.exposureDays.size)
+
+			}
+			State.POSITIVE_TESTED -> {
+				val oldestSharedKeyDateMillis = secureStorage.positiveReportOldestSharedKey
+				binding.reportsInfected.apply {
+					faqButton.setOnClickListener { showFaq() }
+					cardEncountersFaqWhoIsNotifiedContainer.isVisible = oldestSharedKeyDateMillis > 0L
+					val formattedDate =
+						DateUtils.getFormattedDateWrittenMonth(oldestSharedKeyDateMillis, TimeZone.getTimeZone("UTC"))
+					val faqText = getString(R.string.meldungen_positive_tested_faq2_text).replace("{ONSET_DATE}", formattedDate)
+					val formattedText = StringUtil.makePartiallyBold(faqText, formattedDate)
+					cardEncountersFaqWhoIsNotified.text = formattedText
+					deleteReports.setOnClickListener { showDeleteReportConfirmationDialog() }
+					deleteReports.isVisible = tracingStatusInterface.canInfectedStatusBeReset(requireContext())
+				}
+				setupHeaderFragment(ReportsHeaderFragment.Type.POSITIVE_TESTED, 0)
+			}
+		}
+		val notificationManager = requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+		notificationManager.cancel(NotificationUtil.NOTIFICATION_ID_CONTACT)
+	}
+
+	private fun showDeleteReportConfirmationDialog() {
+		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.delete_infection_dialog)
+			.setPositiveButton(R.string.delete_infection_dialog_finish_button) { _, _ ->
+				tracingViewModel.appStatusLiveData.value?.resetInfectionStatus(context)
+				secureStorage.isolationEndDialogTimestamp = -1L
+				secureStorage.positiveReportOldestSharedKey = -1L
+				parentFragmentManager.popBackStack()
+			}
+			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+			.create()
+			.show()
+	}
+
+	private fun deleteNotifications(tracingStatusInterface: TracingStatusInterface) {
+		AlertDialog.Builder(requireActivity(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.delete_notification_dialog)
+			.setPositiveButton(R.string.delete_reports_button) { _, _ ->
+				tracingStatusInterface.resetExposureDays(context)
+				parentFragmentManager.popBackStack()
+			}
+			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+			.create()
+			.show()
+	}
+
+	private fun setupFreeTestInfoBox(tracingStatusInterface: TracingStatusInterface) {
+		binding.reportsLeitfaden.viewFreeTestInfoBox.apply {
+			testlocationsLink.setOnClickListener { showWhereToTestDialog() }
+			val today = DayDate()
+			if (tracingStatusInterface.exposureDays.filter {
+					it.exposedDate.addDays(MIN_EXPOSURE_AGE_TO_DO_A_TEST).isBeforeOrEquals(today)
+				}.find {
+					!it.exposedDate.addDays(MAX_EXPOSURE_AGE_TO_DO_A_TEST).isBefore(today)
+				} != null) {
+				testCountdownTextview.setText(R.string.meldungen_detail_free_test_now)
+				return
+			}
+
+			// This oldest exposure that is newer than MIN_EXPOSURE_AGE_TO_DO_A_TEST
+			val oldestExposure = tracingStatusInterface.exposureDays.filter {
+				!it.exposedDate.addDays(MIN_EXPOSURE_AGE_TO_DO_A_TEST).isBeforeOrEquals(today)
+			}.minOf { it.exposedDate }
+
+			testCountdownTextview.isVisible = oldestExposure != null
+
+			if (oldestExposure != null) {
+				val daysSinceFirstExposure =
+					((today.startOfDayTimestamp - oldestExposure.startOfDayTimestamp) / ONE_DAY_IN_MILLIS).toInt()
+				val daysUntilTest = MIN_EXPOSURE_AGE_TO_DO_A_TEST - daysSinceFirstExposure
+				if (daysUntilTest == 1) {
+					testCountdownTextview.setText(R.string.meldungen_detail_free_test_tomorrow)
+				} else {
+					testCountdownTextview.text = getString(R.string.meldungen_detail_free_test_in_x_tagen)
+						.replace("{COUNT}", daysUntilTest.toString())
+				}
+			}
+		}
+	}
+
+	private fun showWhereToTestDialog() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.add(WhereToTestDialogFragment.newInstance(), WhereToTestDialogFragment::class.java.canonicalName)
+			.commit()
+	}
+
+	private fun openLink(@StringRes stringRes: Int) {
+		UrlUtil.openUrl(context, getString(stringRes))
+	}
+
+	private fun showFaq() {
+		UrlUtil.openUrl(context, getString(R.string.faq_button_url))
+	}
+
+	private fun openSwissCovidLeitfaden() {
+		leitfadenJustOpened = true
+		secureStorage.leitfadenOpened()
+		val contactDates = StringBuilder()
+		var delimiter = ""
+		tracingViewModel.appStatusLiveData.value?.exposureDays?.forEach {
+			contactDates.append(delimiter)
+			contactDates.append(it.exposedDate.formatAsString())
+			delimiter = ","
+		}
+		UrlUtil.openUrl(context, getString(R.string.swisscovid_leitfaden_url).replace("{CONTACT_DATES}", contactDates.toString()))
+	}
+
+	private fun showLeitfadenInfo(buttonTitleReplacementText: String) {
+		val title = getString(R.string.leitfaden_infopopup_title)
+		val subtitle = getString(R.string.leitfaden_infopopup_text).replace("{BUTTON_TITLE}", buttonTitleReplacementText)
+		requireActivity().supportFragmentManager.beginTransaction().add(
+			SimpleDismissableDialog.newInstance(title, subtitle),
+			ReactivateTracingReminderDialog::class.java.canonicalName
+		).commit()
+	}
+
+	private fun callHotline() {
+		PhoneUtil.callHelpline(context)
+	}
+
+	override fun onResume() {
+		super.onResume()
+		if (leitfadenJustOpened) {
+			leitfadenJustOpened = false
+			setupState(State.POSSIBLE_INFECTION, tracingViewModel.tracingStatusInterface)
+		}
+	}
+
+	fun doHeaderAnimation(info: View, image: View, button: Button, showAllButton: View, numExposureDays: Int) {
+		secureStorage.isReportsHeaderAnimationPending = false
+		binding.apply {
+			reportsScrollviewFirstChild.updatePadding(top = root.height)
+			reportsScrollviewFirstChild.isVisible = true
+			root.post {
+				val autoTransition = AutoTransition()
+				autoTransition.duration = 300
+				autoTransition.addListener(object : Transition.TransitionListener {
+					override fun onTransitionStart(transition: Transition) {}
+					override fun onTransitionEnd(transition: Transition) {
+						headerFragmentContainer.post { setupScrollBehavior() }
+					}
+
+					override fun onTransitionCancel(transition: Transition) {}
+					override fun onTransitionPause(transition: Transition) {}
+					override fun onTransitionResume(transition: Transition) {}
+				})
+				TransitionManager.beginDelayedTransition(root, autoTransition)
+				updateHeaderSize(false, numExposureDays)
+				info.visibility = View.VISIBLE
+				image.visibility = View.GONE
+				button.visibility = View.GONE
+				if (numExposureDays <= 1) {
+					showAllButton.visibility = View.GONE
+				} else {
+					showAllButton.visibility = View.VISIBLE
+				}
+			}
+		}
+	}
+
+	fun animateHeaderHeight(showAll: Boolean, numExposureDays: Int, exposureDaysContainer: View, dateTextView: View) {
+		val exposureDayItemHeight = resources.getDimensionPixelSize(R.dimen.header_reports_exposure_day_height)
+		val endExposureDayTopPadding: Int
+		val endHeaderHeight: Int
+		val endDateTextHeight: Int
+		val endExposureDaysContainerHeight: Int
+		val endScrollViewPadding: Int
+		val screenHeight = Resources.getSystem().displayMetrics.heightPixels
+		if (showAll) {
+			endExposureDayTopPadding = resources.getDimensionPixelSize(R.dimen.spacing_medium)
+			endHeaderHeight = min(
+				screenHeight / 3 * 2,
+				resources.getDimensionPixelSize(R.dimen.header_height_reports_multiple_days) + exposureDayItemHeight * (numExposureDays - 1) + endExposureDayTopPadding
+			)
+			endDateTextHeight = 0
+			endExposureDaysContainerHeight =
+				endHeaderHeight - resources.getDimensionPixelSize(R.dimen.header_height_reports_multiple_days) + exposureDayItemHeight
+			endScrollViewPadding =
+				endHeaderHeight - resources.getDimensionPixelSize(R.dimen.top_item_header_overlap_reports_multiple_days)
+		} else {
+			endExposureDayTopPadding = 0
+			endHeaderHeight = resources.getDimensionPixelSize(R.dimen.header_height_reports_multiple_days)
+			endDateTextHeight = exposureDayItemHeight
+			endExposureDaysContainerHeight = 0
+			endScrollViewPadding = resources.getDimensionPixelSize(R.dimen.top_item_padding_reports_multiple_days)
+		}
+		val startExposureDayTopPadding = exposureDaysContainer.paddingTop
+
+		binding.apply {
+			val startHeaderHeight = headerFragmentContainer.layoutParams.height
+			val startScrollViewPadding = reportsScrollviewFirstChild.paddingTop
+			val startDateTextHeight = dateTextView.layoutParams.height
+			val startExposureDaysContainerHeight = exposureDaysContainer.layoutParams.height
+			val anim = ValueAnimator.ofFloat(0f, 1f)
+			anim.addUpdateListener { v: ValueAnimator ->
+				val value = v.animatedValue as Float
+				setHeight(headerFragmentContainer, value * (endHeaderHeight - startHeaderHeight) + startHeaderHeight)
+				setHeight(dateTextView, value * (endDateTextHeight - startDateTextHeight) + startDateTextHeight)
+				setHeight(
+					exposureDaysContainer,
+					value * (endExposureDaysContainerHeight - startExposureDaysContainerHeight) + startExposureDaysContainerHeight
+				)
+				reportsScrollviewFirstChild.setPadding(
+					reportsScrollviewFirstChild.paddingLeft,
+					(value * (endScrollViewPadding - startScrollViewPadding) + startScrollViewPadding).toInt(),
+					reportsScrollviewFirstChild.paddingRight, reportsScrollviewFirstChild.paddingBottom
+				)
+				exposureDaysContainer.setPadding(
+					exposureDaysContainer.paddingLeft,
+					(value * (endExposureDayTopPadding - startExposureDayTopPadding) + startExposureDayTopPadding).toInt(),
+					exposureDaysContainer.paddingRight, exposureDaysContainer.paddingBottom
+				)
+				if (value == 0f) {
+					exposureDaysContainer.visibility = View.VISIBLE
+					dateTextView.visibility = View.VISIBLE
+				} else if (value == 1f) {
+					if (showAll) {
+						dateTextView.visibility = View.GONE
+					} else {
+						exposureDaysContainer.visibility = View.GONE
+					}
+					headerFragmentContainer.post { setupScrollBehavior() }
+				}
+			}
+			anim.duration = 100
+			anim.start()
+		}
+	}
+
+	private fun setHeight(view: View, newHeight: Float) {
+		view.updateLayoutParams {
+			height = newHeight.toInt()
+		}
+	}
+
+	private fun updateHeaderSize(isReportsHeaderAnimationPending: Boolean, numExposureDays: Int) {
+		binding.apply {
+			val headerLp = headerFragmentContainer.layoutParams
+			if (isReportsHeaderAnimationPending) {
+				headerLp.height = ViewGroup.LayoutParams.MATCH_PARENT
+			} else if (numExposureDays <= 1) {
+				headerLp.height = resources.getDimensionPixelSize(R.dimen.header_height_reports)
+				reportsScrollviewFirstChild.setPadding(
+					reportsScrollviewFirstChild.paddingLeft,
+					resources.getDimensionPixelSize(R.dimen.top_item_padding_reports),
+					reportsScrollviewFirstChild.paddingRight, reportsScrollviewFirstChild.paddingBottom
+				)
+			} else {
+				headerLp.height = resources.getDimensionPixelSize(R.dimen.header_height_reports_multiple_days)
+				reportsScrollviewFirstChild.setPadding(
+					reportsScrollviewFirstChild.paddingLeft,
+					resources.getDimensionPixelSize(R.dimen.top_item_padding_reports_multiple_days),
+					reportsScrollviewFirstChild.paddingRight, reportsScrollviewFirstChild.paddingBottom
+				)
+			}
+			headerFragmentContainer.layoutParams = headerLp
+			headerFragmentContainer.post { setupScrollBehavior() }
+		}
+	}
+
+	private fun setupScrollBehavior() {
+		if (!isVisible) return
+		val rect = Rect()
+		binding.apply {
+			headerFragmentContainer.getDrawingRect(rect)
+			reportsScrollview.setScrollPreventRect(rect)
+			val scrollRangePx = reportsScrollviewFirstChild.paddingTop
+			val translationRangePx = -resources.getDimensionPixelSize(R.dimen.spacing_huge)
+			reportsScrollview.setOnScrollChangeListener { _, _, scrollY, _, _ ->
+				val progress = computeScrollAnimProgress(scrollY, scrollRangePx)
+				headerFragmentContainer.alpha = 1 - progress
+				headerFragmentContainer.translationY = progress * translationRangePx
+			}
+			reportsScrollview.post {
+				val progress = computeScrollAnimProgress(reportsScrollview.scrollY, scrollRangePx)
+				headerFragmentContainer.alpha = 1 - progress
+				headerFragmentContainer.translationY = progress * translationRangePx
+			}
+		}
+	}
+
+	private fun computeScrollAnimProgress(scrollY: Int, scrollRange: Int): Float {
+		return min(scrollY, scrollRange) / scrollRange.toFloat()
+	}
+
+	private fun setupHeaderFragment(headerType: ReportsHeaderFragment.Type, numExposureDays: Int) {
+		binding.apply {
+			val isReportsHeaderAnimationPending = secureStorage.isReportsHeaderAnimationPending
+			updateHeaderSize(isReportsHeaderAnimationPending, numExposureDays)
+			if (isReportsHeaderAnimationPending) {
+				reportsScrollviewFirstChild.visibility = View.GONE
+			}
+			headerFragmentContainer.post { setupScrollBehavior() }
+			val header: Fragment = when (headerType) {
+				ReportsHeaderFragment.Type.NO_REPORTS -> ReportsHeaderFragment.newInstance(
+					ReportsHeaderFragment.Type.NO_REPORTS,
+					false
+				)
+				ReportsHeaderFragment.Type.POSSIBLE_INFECTION -> ReportsHeaderFragment
+					.newInstance(ReportsHeaderFragment.Type.POSSIBLE_INFECTION, isReportsHeaderAnimationPending)
+				ReportsHeaderFragment.Type.POSITIVE_TESTED -> ReportsHeaderFragment.newInstance(
+					ReportsHeaderFragment.Type.POSITIVE_TESTED,
+					false
+				)
+			}
+			childFragmentManager.beginTransaction()
+				.replace(R.id.header_fragment_container, header)
+				.commit()
+		}
+	}
+
+	enum class State {
+		NO_REPORTS, POSSIBLE_INFECTION, POSITIVE_TESTED
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java
index b6eb4276d..059254523 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java
@@ -33,13 +33,13 @@
 public class ReportsHeaderFragment extends Fragment {
 
 	private static final String ARG_TYPE = "ARG_TYPE";
-	private static final String ARG_SHOWANIMATIONCONTROLS = "ARG_SHOWANIMATIONCONTROLS";
+	private static final String ARG_SHOW_ANIMATION_CONTROLS = "ARG_SHOW_ANIMATION_CONTROLS";
 
 	public static ReportsHeaderFragment newInstance(@NonNull Type type, boolean showAnimationControls) {
 		ReportsHeaderFragment reportsHeaderFragment = new ReportsHeaderFragment();
 		Bundle args = new Bundle();
 		args.putInt(ARG_TYPE, type.ordinal());
-		args.putBoolean(ARG_SHOWANIMATIONCONTROLS, showAnimationControls);
+		args.putBoolean(ARG_SHOW_ANIMATION_CONTROLS, showAnimationControls);
 		reportsHeaderFragment.setArguments(args);
 		return reportsHeaderFragment;
 	}
@@ -60,7 +60,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
 		type = Type.values()[getArguments().getInt(ARG_TYPE)];
-		showAnimationControls = getArguments().getBoolean(ARG_SHOWANIMATIONCONTROLS);
+		showAnimationControls = getArguments().getBoolean(ARG_SHOW_ANIMATION_CONTROLS);
 	}
 
 	@Nullable
diff --git a/app/src/main/res/layout/card_what_to_do_leitfaden.xml b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
index c138fd1ab..8c71e9e11 100644
--- a/app/src/main/res/layout/card_what_to_do_leitfaden.xml
+++ b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
@@ -97,21 +97,37 @@
 					app:barrierDirection="bottom"
 					app:constraint_referenced_ids="card_encounters_text_container,card_encounters_image" />
 
-				<Button
-					android:id="@+id/card_encounters_button"
-					style="@style/NextStep.Button.Blue"
+				<FrameLayout
+					android:id="@+id/card_encounters_button_container"
 					android:layout_width="0dp"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_small"
 					android:layout_marginEnd="@dimen/spacing_medium"
-					android:drawableEnd="@drawable/ic_launch"
-					android:paddingStart="@dimen/spacing_medium"
-					android:paddingEnd="@dimen/spacing_medium"
-					android:text="@string/meldungen_detail_open_leitfaden_button"
-					android:textAllCaps="true"
 					app:layout_constraintEnd_toStartOf="@id/leitfaden_info_button"
 					app:layout_constraintStart_toStartOf="parent"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1" />
+					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1">
+
+					<Button
+						android:id="@+id/fill_leitfaden_now_button"
+						style="@style/NextStep.Button.Blue"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:drawableEnd="@drawable/ic_launch"
+						android:paddingHorizontal="@dimen/spacing_medium"
+						android:text="@string/meldungen_detail_open_leitfaden_button"
+						android:textAllCaps="true" />
+
+					<Button
+						android:id="@+id/zum_leitfaden_button"
+						style="@style/NextStep.Button.Outlined"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:drawableEnd="@drawable/ic_launch_blue"
+						android:paddingHorizontal="@dimen/spacing_medium"
+						android:text="@string/meldungen_detail_open_leitfaden_again_button"
+						android:visibility="gone" />
+
+				</FrameLayout>
 
 				<ImageButton
 					android:id="@+id/leitfaden_info_button"
@@ -121,9 +137,9 @@
 					android:padding="@dimen/spacing_small"
 					android:src="@drawable/ic_info_black_outlined"
 					android:tint="@color/blue_main"
-					app:layout_constraintBottom_toBottomOf="@id/card_encounters_button"
+					app:layout_constraintBottom_toBottomOf="@id/card_encounters_button_container"
 					app:layout_constraintEnd_toEndOf="parent"
-					app:layout_constraintTop_toTopOf="@id/card_encounters_button" />
+					app:layout_constraintTop_toTopOf="@id/card_encounters_button_container" />
 
 				<TextView
 					android:id="@+id/card_encounters_last_call"
@@ -133,7 +149,7 @@
 					android:layout_marginTop="@dimen/spacing_small"
 					android:textColor="@color/grey_dark"
 					android:textSize="@dimen/text_size_small"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_button"
+					app:layout_constraintTop_toBottomOf="@id/card_encounters_button_container"
 					tools:text="@string/meldungen_detail_call_last_call" />
 
 				<LinearLayout
@@ -146,6 +162,7 @@
 					app:layout_constraintTop_toBottomOf="@id/card_encounters_last_call">
 
 					<include
+						android:id="@+id/view_free_test_info_box"
 						layout="@layout/view_free_test_info_box"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
@@ -184,11 +201,26 @@
 
 						<include layout="@layout/view_text_bullet" />
 
-						<TextView
-							style="@style/NextStep.Text"
+						<LinearLayout
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:text="@string/meldungen_detail_explanation_text2" />
+							android:orientation="vertical">
+
+							<TextView
+								style="@style/NextStep.Text"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:text="@string/meldungen_detail_explanation_text2" />
+
+							<TextView
+								android:id="@+id/x_days_left_textview"
+								style="@style/NextStep.Text.Bold"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:text="@string/date_in_one_day" />
+
+						</LinearLayout>
+
 					</LinearLayout>
 
 					<LinearLayout
@@ -308,7 +340,7 @@
 		android:paddingBottom="@dimen/spacing_medium_large">
 
 		<Button
-			android:id="@+id/card_encounters_faq_button"
+			android:id="@+id/faq_button"
 			style="@style/NextStep.Button.Outlined"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_what_to_do_save_others.xml b/app/src/main/res/layout/card_what_to_do_save_others.xml
deleted file mode 100644
index 3d6434f96..000000000
--- a/app/src/main/res/layout/card_what_to_do_save_others.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
-  ~
-  ~ This Source Code Form is subject to the terms of the Mozilla Public
-  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
-  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
-  ~
-  ~ SPDX-License-Identifier: MPL-2.0
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical">
-
-	<androidx.cardview.widget.CardView
-		style="@style/NextStep.Card"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical">
-
-			<androidx.constraintlayout.widget.ConstraintLayout
-				android:id="@+id/card_encounters"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:clipChildren="false"
-				android:clipToPadding="false"
-				android:foreground="?selectableItemBackground"
-				android:orientation="vertical"
-				android:paddingLeft="@dimen/spacing_larger"
-				android:paddingRight="@dimen/spacing_larger">
-
-				<TextView
-					android:id="@+id/card_encounters_subtitle"
-					style="@style/NextStep.Text.SubTitle"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_medium_large"
-					android:text="@string/no_meldungen_box_subtitle"
-					android:textColor="@color/blue_main"
-					app:layout_constraintTop_toTopOf="parent" />
-
-				<TextView
-					android:id="@+id/card_encounters_title"
-					style="@style/NextStep.Text.Title"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_tiny_small"
-					android:layout_marginBottom="@dimen/spacing_tiny_small"
-					android:text="@string/meldungen_detail_call_thankyou_title"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_subtitle" />
-
-				<ImageView
-					android:id="@+id/card_encounters_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/ill_verhalten"
-					app:layout_constraintRight_toRightOf="parent"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_title" />
-
-				<Space
-					android:id="@+id/card_encounters_space1"
-					android:layout_width="@dimen/spacing_medium"
-					android:layout_height="0dp"
-					app:layout_constraintLeft_toLeftOf="@id/card_encounters_image"
-					app:layout_constraintTop_toTopOf="@id/card_encounters_image" />
-
-				<TextView
-					android:id="@+id/card_encounters_text"
-					style="@style/NextStep.Text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_tiny_small"
-					android:gravity="center_vertical"
-					android:text="@string/meldungen_detail_leitfaden_again_text"
-					app:layout_constraintBottom_toTopOf="@id/card_encounters_barrier1"
-					app:layout_constraintLeft_toLeftOf="parent"
-					app:layout_constraintRight_toRightOf="@id/card_encounters_space1"
-					app:layout_constraintTop_toTopOf="@id/card_encounters_image" />
-
-				<androidx.constraintlayout.widget.Barrier
-					android:id="@+id/card_encounters_barrier1"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					app:barrierDirection="bottom"
-					app:constraint_referenced_ids="card_encounters_text,card_encounters_image" />
-
-				<Button
-					android:id="@+id/card_encounters_button"
-					style="@style/NextStep.Button.Outlined"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_small"
-					android:layout_marginEnd="@dimen/spacing_medium"
-					android:drawableEnd="@drawable/ic_launch_blue"
-					android:paddingStart="@dimen/spacing_medium"
-					android:paddingEnd="@dimen/spacing_medium"
-					android:text="@string/meldungen_detail_open_leitfaden_again_button"
-					app:layout_constraintEnd_toStartOf="@id/leitfaden_info_button"
-					app:layout_constraintStart_toStartOf="parent"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1" />
-
-				<ImageButton
-					android:id="@+id/leitfaden_info_button"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:background="@drawable/ripple_button"
-					android:padding="@dimen/spacing_small"
-					android:src="@drawable/ic_info_black_outlined"
-					android:tint="@color/blue_main"
-					app:layout_constraintBottom_toBottomOf="@id/card_encounters_button"
-					app:layout_constraintEnd_toEndOf="parent"
-					app:layout_constraintTop_toTopOf="@id/card_encounters_button" />
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_large"
-					android:clipChildren="false"
-					android:clipToPadding="false"
-					android:orientation="vertical"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_button">
-
-					<include
-						layout="@layout/view_free_test_info_box"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginStart="-15dp"
-						android:layout_marginEnd="-15dp"
-						android:layout_marginBottom="@dimen/spacing_medium_large" />
-
-					<TextView
-						style="@style/NextStep.Text.Bold"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:text="@string/meldungen_detail_explanation_title" />
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:orientation="horizontal">
-
-						<include layout="@layout/view_text_bullet" />
-
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/meldungen_detail_explanation_text1" />
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:orientation="horizontal">
-
-						<include layout="@layout/view_text_bullet" />
-
-						<LinearLayout
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:orientation="vertical">
-
-							<TextView
-								style="@style/NextStep.Text"
-								android:layout_width="match_parent"
-								android:layout_height="wrap_content"
-								android:text="@string/meldungen_detail_explanation_text2" />
-
-							<TextView
-								android:id="@+id/x_days_left_textview"
-								style="@style/NextStep.Text.Bold"
-								android:layout_width="match_parent"
-								android:layout_height="wrap_content"
-								android:text="@string/date_in_one_day" />
-
-						</LinearLayout>
-					</LinearLayout>
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:orientation="horizontal">
-
-						<include layout="@layout/view_text_bullet" />
-
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/meldungen_detail_explanation_text4" />
-
-					</LinearLayout>
-
-				</LinearLayout>
-
-			</androidx.constraintlayout.widget.ConstraintLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:paddingLeft="@dimen/spacing_medium"
-				android:paddingTop="@dimen/spacing_larger"
-				android:paddingRight="@dimen/spacing_medium"
-				android:paddingBottom="@dimen/spacing_larger">
-
-				<ImageView
-					android:layout_width="@dimen/icon_size"
-					android:layout_height="@dimen/icon_size"
-					android:layout_marginLeft="@dimen/spacing_very_small"
-					android:layout_marginRight="@dimen/spacing_small"
-					android:src="@drawable/ic_infoline" />
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical">
-
-					<TextView
-						style="@style/NextStep.Text.Bold"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_small"
-						android:text="@string/meldungen_tel_information_title" />
-
-					<TextView
-						style="@style/NextStep.Text"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:text="@string/meldungen_tel_information_text" />
-
-					<LinearLayout
-						android:id="@+id/item_call_hotline_layout"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginTop="@dimen/spacing_very_small"
-						android:background="@drawable/ripple_button"
-						android:orientation="horizontal"
-						android:paddingTop="@dimen/spacing_small"
-						android:paddingBottom="@dimen/spacing_small">
-
-						<ImageView
-							android:layout_width="@dimen/icon_size"
-							android:layout_height="@dimen/icon_size"
-							android:src="@drawable/ic_call"
-							android:tint="@color/blue_main" />
-
-						<TextView
-							android:id="@+id/item_call_hotline_text"
-							style="@style/NextStep.Text.Bold.Blue"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginLeft="@dimen/spacing_small"
-							android:text="@string/infoline_tel_number" />
-
-					</LinearLayout>
-
-				</LinearLayout>
-
-			</LinearLayout>
-
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@color/grey_light" />
-
-			<TextView
-				android:id="@+id/delete_reports"
-				style="@style/NextStep.Button.Transparent"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="10dp"
-				android:gravity="center"
-				android:paddingTop="15dp"
-				android:paddingBottom="10dp"
-				android:text="@string/delete_reports_button"
-				android:textAllCaps="true"
-				android:textColor="@color/blue_main"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/card_encounters_image" />
-		</LinearLayout>
-	</androidx.cardview.widget.CardView>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:paddingTop="@dimen/spacing_very_large"
-		android:paddingBottom="@dimen/spacing_medium_large">
-
-		<Button
-			android:id="@+id/card_encounters_faq_button"
-			style="@style/NextStep.Button.Outlined"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/spacing_medium"
-			android:layout_marginTop="@dimen/spacing_huger"
-			android:layout_marginRight="@dimen/spacing_medium"
-			android:drawableRight="@drawable/ic_launch_blue"
-			android:paddingStart="@dimen/padding_start_icon_button"
-			android:text="@string/faq_button_title" />
-
-	</LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_what_to_do_save_yourself.xml b/app/src/main/res/layout/card_what_to_do_save_yourself.xml
index d8ae2b4df..7fddb1f8b 100644
--- a/app/src/main/res/layout/card_what_to_do_save_yourself.xml
+++ b/app/src/main/res/layout/card_what_to_do_save_yourself.xml
@@ -171,7 +171,7 @@
 		</LinearLayout>
 
 		<Button
-			android:id="@+id/card_encounters_faq_button"
+			android:id="@+id/faq_button"
 			style="@style/NextStep.Button.Outlined"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_what_to_do_self_isolation.xml b/app/src/main/res/layout/card_what_to_do_self_isolation.xml
index 80a44722c..6c7be366e 100644
--- a/app/src/main/res/layout/card_what_to_do_self_isolation.xml
+++ b/app/src/main/res/layout/card_what_to_do_self_isolation.xml
@@ -184,7 +184,7 @@
 		</LinearLayout>
 
 		<Button
-			android:id="@+id/card_encounters_faq_button"
+			android:id="@+id/faq_button"
 			style="@style/NextStep.Button.Outlined.Purple"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml
index 0839b3ad5..27a20c7c2 100644
--- a/app/src/main/res/layout/fragment_reports.xml
+++ b/app/src/main/res/layout/fragment_reports.xml
@@ -66,15 +66,6 @@
 				android:visibility="gone"
 				tools:visibility="visible" />
 
-			<include
-				android:id="@+id/reports_save_others"
-				layout="@layout/card_what_to_do_save_others"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/spacing_medium_large"
-				android:visibility="gone"
-				tools:visibility="visible" />
-
 			<include
 				android:id="@+id/reports_infected"
 				layout="@layout/card_what_to_do_self_isolation"

From 139da8a42ef2a2630b32c11acb4d4c9c98290b80 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 19 May 2021 16:53:13 +0200
Subject: [PATCH 057/207] Merge ReportsHeaderFragment and ReportsFragment

---
 .../admin/bag/dp3t/reports/ReportsFragment.kt | 120 +++++++++---
 .../dp3t/reports/ReportsHeaderFragment.java   | 171 ------------------
 app/src/main/res/layout/fragment_reports.xml  |   2 +-
 3 files changed, 92 insertions(+), 201 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java

diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 3be7e7cc6..c66ee74a7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -13,12 +13,14 @@ import android.animation.ValueAnimator
 import android.app.NotificationManager
 import android.content.Context
 import android.content.res.Resources
+import android.graphics.Paint
 import android.graphics.Rect
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
@@ -39,6 +41,7 @@ import ch.admin.bag.dp3t.util.*
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import ch.admin.bag.dp3t.whattodo.WhereToTestDialogFragment
 import org.dpppt.android.sdk.models.DayDate
+import org.dpppt.android.sdk.models.ExposureDay
 import java.util.*
 import kotlin.math.min
 
@@ -79,6 +82,76 @@ class ReportsFragment : Fragment() {
 		}.root
 	}
 
+	private fun setupHeader(state: State) {
+		binding.apply {
+			val isReportsHeaderAnimationPending = secureStorage.isReportsHeaderAnimationPending
+			val exposureDays = tracingViewModel.appStatusLiveData.value?.exposureDays ?: listOf()
+			updateHeaderSize(isReportsHeaderAnimationPending, exposureDays.size)
+			if (isReportsHeaderAnimationPending) {
+				reportsScrollviewFirstChild.visibility = View.GONE
+			}
+			headerFragmentContainer.post { setupScrollBehavior() }
+
+			headerFragmentContainer.removeAllViews()
+			val layoutResource = when (state) {
+				State.NO_REPORTS -> R.layout.fragment_reports_header_no_reports
+				State.POSSIBLE_INFECTION -> R.layout.fragment_reports_header_possible_infection
+				State.POSITIVE_TESTED -> R.layout.fragment_reports_header_positive_tested
+			}
+			LayoutInflater.from(requireContext()).inflate(layoutResource, headerFragmentContainer, true)
+			if (state == State.NO_REPORTS || state == State.POSITIVE_TESTED) return
+
+			val date = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_date)
+			val info = headerFragmentContainer.findViewById<View>(R.id.fragment_reports_header_info)
+			val image = headerFragmentContainer.findViewById<View>(R.id.fragment_reports_header_image)
+			val continueButton = headerFragmentContainer.findViewById<Button>(R.id.fragment_reports_header_continue_button)
+			val subtitle = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_subtitle)
+			val showAllButton = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_show_all_button)
+			val daysContainer = headerFragmentContainer.findViewById<ViewGroup>(R.id.fragment_reports_dates_container)
+			val daysContainerScrollview = headerFragmentContainer.findViewById<View>(R.id.fragment_reports_dates_scroll_view)
+			val titleTextView = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_title)
+
+			if (exposureDays.isNotEmpty()) {
+				date.text = getDateString(exposureDays[exposureDays.size - 1], true)
+			}
+
+			daysContainer.removeAllViews()
+			for (exposureDay in exposureDays) {
+				val itemView = LayoutInflater.from(context).inflate(R.layout.item_reports_exposure_day, daysContainer, false)
+				val itemDate = itemView.findViewById<TextView>(R.id.exposure_day_textview)
+				itemDate.text = getDateString(exposureDay, false)
+				daysContainer.addView(itemView, 0)
+			}
+
+			showAllButton.isVisible = exposureDays.size > 1
+
+			showAllButton.setOnClickListener {
+				if (daysContainerScrollview.visibility == View.VISIBLE) {
+					subtitle.setText(R.string.meldung_detail_exposed_subtitle_last_encounter)
+					showAllButton.setText(R.string.meldung_detail_exposed_show_all_button)
+					animateHeaderHeight(false, exposureDays.size, daysContainerScrollview, date!!)
+				} else {
+					subtitle.setText(R.string.meldung_detail_exposed_subtitle_all_encounters)
+					showAllButton.setText(R.string.meldung_detail_exposed_show_less_button)
+					animateHeaderHeight(true, exposureDays.size, daysContainerScrollview, date!!)
+				}
+			}
+			showAllButton.paintFlags = showAllButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+
+
+			if (isReportsHeaderAnimationPending) {
+				info.visibility = View.GONE
+				showAllButton.visibility = View.GONE
+				image.visibility = View.VISIBLE
+				continueButton.visibility = View.VISIBLE
+				titleTextView.setText(R.string.meldung_detail_exposed_title)
+				continueButton.setOnClickListener {
+					doHeaderAnimation(info, image, continueButton, showAllButton, exposureDays.size)
+				}
+			}
+		}
+	}
+
 	private fun setupState(state: State, tracingStatusInterface: TracingStatusInterface) {
 
 		//TODO: Set up header
@@ -93,7 +166,6 @@ class ReportsFragment : Fragment() {
 					cardEncountersLink.setOnClickListener { openLink(R.string.no_meldungen_box_url) }
 					faqButton.setOnClickListener { showFaq() }
 				}
-				setupHeaderFragment(ReportsHeaderFragment.Type.NO_REPORTS, 0);
 			}
 			State.POSSIBLE_INFECTION -> {
 				binding.reportsLeitfaden.apply {
@@ -122,8 +194,6 @@ class ReportsFragment : Fragment() {
 					}
 					deleteReports.setOnClickListener { deleteNotifications(tracingStatusInterface) }
 				}
-				setupHeaderFragment(ReportsHeaderFragment.Type.POSSIBLE_INFECTION, tracingStatusInterface.exposureDays.size)
-
 			}
 			State.POSITIVE_TESTED -> {
 				val oldestSharedKeyDateMillis = secureStorage.positiveReportOldestSharedKey
@@ -138,11 +208,11 @@ class ReportsFragment : Fragment() {
 					deleteReports.setOnClickListener { showDeleteReportConfirmationDialog() }
 					deleteReports.isVisible = tracingStatusInterface.canInfectedStatusBeReset(requireContext())
 				}
-				setupHeaderFragment(ReportsHeaderFragment.Type.POSITIVE_TESTED, 0)
 			}
 		}
 		val notificationManager = requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 		notificationManager.cancel(NotificationUtil.NOTIFICATION_ID_CONTACT)
+		setupHeader(state)
 	}
 
 	private fun showDeleteReportConfirmationDialog() {
@@ -253,7 +323,7 @@ class ReportsFragment : Fragment() {
 		}
 	}
 
-	fun doHeaderAnimation(info: View, image: View, button: Button, showAllButton: View, numExposureDays: Int) {
+	private fun doHeaderAnimation(info: View, image: View, button: Button, showAllButton: View, numExposureDays: Int) {
 		secureStorage.isReportsHeaderAnimationPending = false
 		binding.apply {
 			reportsScrollviewFirstChild.updatePadding(top = root.height)
@@ -285,7 +355,7 @@ class ReportsFragment : Fragment() {
 		}
 	}
 
-	fun animateHeaderHeight(showAll: Boolean, numExposureDays: Int, exposureDaysContainer: View, dateTextView: View) {
+	private fun animateHeaderHeight(showAll: Boolean, numExposureDays: Int, exposureDaysContainer: View, dateTextView: View) {
 		val exposureDayItemHeight = resources.getDimensionPixelSize(R.dimen.header_reports_exposure_day_height)
 		val endExposureDayTopPadding: Int
 		val endHeaderHeight: Int
@@ -410,30 +480,22 @@ class ReportsFragment : Fragment() {
 		return min(scrollY, scrollRange) / scrollRange.toFloat()
 	}
 
-	private fun setupHeaderFragment(headerType: ReportsHeaderFragment.Type, numExposureDays: Int) {
-		binding.apply {
-			val isReportsHeaderAnimationPending = secureStorage.isReportsHeaderAnimationPending
-			updateHeaderSize(isReportsHeaderAnimationPending, numExposureDays)
-			if (isReportsHeaderAnimationPending) {
-				reportsScrollviewFirstChild.visibility = View.GONE
-			}
-			headerFragmentContainer.post { setupScrollBehavior() }
-			val header: Fragment = when (headerType) {
-				ReportsHeaderFragment.Type.NO_REPORTS -> ReportsHeaderFragment.newInstance(
-					ReportsHeaderFragment.Type.NO_REPORTS,
-					false
-				)
-				ReportsHeaderFragment.Type.POSSIBLE_INFECTION -> ReportsHeaderFragment
-					.newInstance(ReportsHeaderFragment.Type.POSSIBLE_INFECTION, isReportsHeaderAnimationPending)
-				ReportsHeaderFragment.Type.POSITIVE_TESTED -> ReportsHeaderFragment.newInstance(
-					ReportsHeaderFragment.Type.POSITIVE_TESTED,
-					false
-				)
-			}
-			childFragmentManager.beginTransaction()
-				.replace(R.id.header_fragment_container, header)
-				.commit()
+	private fun getDateString(exposureDay: ExposureDay, withDiff: Boolean): String {
+		val timestamp = exposureDay.exposedDate.getStartOfDay(TimeZone.getDefault())
+		if (!withDiff) {
+			return DateUtils.getFormattedDateWrittenMonth(timestamp)
+		}
+		var dateStr = getString(R.string.date_text_before_date).replace("{DATE}", DateUtils.getFormattedDate(timestamp))
+		dateStr += " / "
+		val daysDiff = DateUtils.getDaysDiff(timestamp)
+		dateStr += if (daysDiff == 0) {
+			getString(R.string.date_today)
+		} else if (daysDiff == 1) {
+			getString(R.string.date_one_day_ago)
+		} else {
+			getString(R.string.date_days_ago).replace("{COUNT}", daysDiff.toString())
 		}
+		return dateStr
 	}
 
 	enum class State {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java
deleted file mode 100644
index 059254523..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsHeaderFragment.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.reports;
-
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import java.util.List;
-import java.util.TimeZone;
-
-import org.dpppt.android.sdk.models.ExposureDay;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.util.DateUtils;
-import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
-
-public class ReportsHeaderFragment extends Fragment {
-
-	private static final String ARG_TYPE = "ARG_TYPE";
-	private static final String ARG_SHOW_ANIMATION_CONTROLS = "ARG_SHOW_ANIMATION_CONTROLS";
-
-	public static ReportsHeaderFragment newInstance(@NonNull Type type, boolean showAnimationControls) {
-		ReportsHeaderFragment reportsHeaderFragment = new ReportsHeaderFragment();
-		Bundle args = new Bundle();
-		args.putInt(ARG_TYPE, type.ordinal());
-		args.putBoolean(ARG_SHOW_ANIMATION_CONTROLS, showAnimationControls);
-		reportsHeaderFragment.setArguments(args);
-		return reportsHeaderFragment;
-	}
-
-	public enum Type {
-		NO_REPORTS,
-		POSSIBLE_INFECTION,
-		POSITIVE_TESTED
-	}
-
-
-	private TracingViewModel tracingViewModel;
-	private Type type;
-	private boolean showAnimationControls;
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
-		type = Type.values()[getArguments().getInt(ARG_TYPE)];
-		showAnimationControls = getArguments().getBoolean(ARG_SHOW_ANIMATION_CONTROLS);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-
-		View view = null;
-
-		switch (type) {
-			case NO_REPORTS:
-				view = inflater.inflate(R.layout.fragment_reports_header_no_reports, container, false);
-				break;
-			case POSSIBLE_INFECTION:
-				view = inflater.inflate(R.layout.fragment_reports_header_possible_infection, container, false);
-				break;
-			case POSITIVE_TESTED:
-				view = inflater.inflate(R.layout.fragment_reports_header_positive_tested, container, false);
-				break;
-		}
-		return view;
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-
-		if (type == Type.NO_REPORTS || type == Type.POSITIVE_TESTED) {
-			return;
-		}
-
-		TextView date = view.findViewById(R.id.fragment_reports_header_date);
-		View info = view.findViewById(R.id.fragment_reports_header_info);
-		View image = view.findViewById(R.id.fragment_reports_header_image);
-		Button continueButton = view.findViewById(R.id.fragment_reports_header_continue_button);
-		TextView subtitle = view.findViewById(R.id.fragment_reports_header_subtitle);
-		TextView showAllButton = view.findViewById(R.id.fragment_reports_header_show_all_button);
-		ViewGroup daysContainer = view.findViewById(R.id.fragment_reports_dates_container);
-		View daysContainerScrollview = view.findViewById(R.id.fragment_reports_dates_scroll_view);
-		TextView titleTextView = view.findViewById(R.id.fragment_reports_header_title);
-
-		List<ExposureDay> exposureDays = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays();
-
-		if (date != null && !exposureDays.isEmpty()) {
-			date.setText(getDateString(exposureDays.get(exposureDays.size() - 1), true));
-		}
-
-		daysContainer.removeAllViews();
-		for (ExposureDay exposureDay : exposureDays) {
-			View itemView = LayoutInflater.from(getContext()).inflate(R.layout.item_reports_exposure_day, daysContainer, false);
-			TextView itemDate = itemView.findViewById(R.id.exposure_day_textview);
-			itemDate.setText(getDateString(exposureDay, false));
-			daysContainer.addView(itemView, 0);
-		}
-		if (exposureDays.size() <= 1) {
-			showAllButton.setVisibility(View.GONE);
-		} else {
-			showAllButton.setVisibility(View.VISIBLE);
-		}
-
-		showAllButton.setOnClickListener(view1 -> {
-			if (daysContainerScrollview.getVisibility() == View.VISIBLE) {
-				subtitle.setText(R.string.meldung_detail_exposed_subtitle_last_encounter);
-				showAllButton.setText(R.string.meldung_detail_exposed_show_all_button);
-				((ReportsFragment) getParentFragment())
-						.animateHeaderHeight(false, exposureDays.size(), daysContainerScrollview, date);
-			} else {
-				subtitle.setText(R.string.meldung_detail_exposed_subtitle_all_encounters);
-				showAllButton.setText(R.string.meldung_detail_exposed_show_less_button);
-				((ReportsFragment) getParentFragment())
-						.animateHeaderHeight(true, exposureDays.size(), daysContainerScrollview, date);
-			}
-		});
-		showAllButton.setPaintFlags(showAllButton.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-
-		if (showAnimationControls) {
-
-			info.setVisibility(View.GONE);
-			showAllButton.setVisibility(View.GONE);
-			image.setVisibility(View.VISIBLE);
-			continueButton.setVisibility(View.VISIBLE);
-			titleTextView.setText(R.string.meldung_detail_exposed_title);
-			continueButton.setOnClickListener(view1 ->
-					((ReportsFragment) getParentFragment())
-							.doHeaderAnimation(info, image, continueButton, showAllButton, exposureDays.size())
-			);
-		}
-	}
-
-	private String getDateString(ExposureDay exposureDay, boolean withDiff) {
-		long timestamp = exposureDay.getExposedDate().getStartOfDay(TimeZone.getDefault());
-		if (!withDiff) {
-			return DateUtils.getFormattedDateWrittenMonth(timestamp);
-		}
-		String dateStr = getString(R.string.date_text_before_date).replace("{DATE}", DateUtils.getFormattedDate(timestamp));
-		dateStr += " / ";
-		int daysDiff = DateUtils.getDaysDiff(timestamp);
-
-		if (daysDiff == 0) {
-			dateStr += getString(R.string.date_today);
-		} else if (daysDiff == 1) {
-			dateStr += getString(R.string.date_one_day_ago);
-		} else {
-			dateStr += getString(R.string.date_days_ago).replace("{COUNT}", String.valueOf(daysDiff));
-		}
-		return dateStr;
-	}
-
-}
diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml
index 27a20c7c2..28427dd8f 100644
--- a/app/src/main/res/layout/fragment_reports.xml
+++ b/app/src/main/res/layout/fragment_reports.xml
@@ -23,7 +23,7 @@
 		app:navigationIcon="@drawable/ic_arrow_back"
 		app:title="@string/reports_title_homescreen" />
 
-	<androidx.fragment.app.FragmentContainerView
+	<FrameLayout
 		android:id="@+id/header_fragment_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

From 6a0bb8a1e2e3e268714bdf0015d0376639537259 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 20 May 2021 16:18:42 +0200
Subject: [PATCH 058/207] Implemented Reports Screens

---
 .../admin/bag/dp3t/debug/DebugFragment.java   |  47 ++-
 .../java/ch/admin/bag/dp3t/MainActivity.java  |  22 +-
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  19 ++
 .../CrowdNotifierKeyLoadWorker.java           |  14 +-
 .../checkin/utils/NotificationHelper.java     |  29 --
 .../extensions/ExposureEventExtensions.kt     |  13 +
 .../bag/dp3t/extensions/FragmentExtensions.kt |   4 +-
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  26 +-
 .../dp3t/home/model/NotificationState.java    |   4 +-
 .../admin/bag/dp3t/reports/ReportsFragment.kt | 228 +++++++------
 .../dp3t/reports/ReportsOverviewFragment.kt   |  81 +++++
 .../dp3t/reports/ReportsRecyclerAdapter.kt    |  86 +++++
 .../dp3t/util/NotificationStateHelper.java    |   5 +-
 .../ch/admin/bag/dp3t/util/StringUtil.java    |  26 ++
 app/src/main/res/drawable/ic_check_circle.xml |  29 +-
 .../res/drawable/ic_check_circle_large.xml    |  24 --
 app/src/main/res/drawable/ill_no_message.xml  | 308 +++++-------------
 .../layout/card_what_to_do_checkin_report.xml | 181 ++++++++++
 .../layout/card_what_to_do_save_yourself.xml  |   6 +-
 app/src/main/res/layout/fragment_reports.xml  |   9 +
 .../fragment_reports_header_no_reports.xml    |  12 +-
 ...ment_reports_header_possible_infection.xml |  30 +-
 .../res/layout/fragment_reports_overview.xml  |  35 ++
 app/src/main/res/layout/item_report.xml       |  85 +++++
 app/src/main/res/values-bs/strings.xml        |  13 +
 app/src/main/res/values-de/strings.xml        |  14 +
 app/src/main/res/values-es/strings.xml        |  13 +
 app/src/main/res/values-fr/strings.xml        |  13 +
 app/src/main/res/values-hr/strings.xml        |  13 +
 app/src/main/res/values-it/strings.xml        |  13 +
 app/src/main/res/values-pt/strings.xml        |  13 +
 app/src/main/res/values-rm/strings.xml        |  13 +
 app/src/main/res/values-sq/strings.xml        |  13 +
 app/src/main/res/values-sr/strings.xml        |  13 +
 app/src/main/res/values-ti/strings.xml        |  13 +
 app/src/main/res/values-tr/strings.xml        |  13 +
 app/src/main/res/values/strings.xml           |  13 +
 app/src/main/res/values/styles.xml            |   4 +
 38 files changed, 1056 insertions(+), 441 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt
 delete mode 100644 app/src/main/res/drawable/ic_check_circle_large.xml
 create mode 100644 app/src/main/res/layout/card_what_to_do_checkin_report.xml
 create mode 100644 app/src/main/res/layout/fragment_reports_overview.xml
 create mode 100644 app/src/main/res/layout/item_report.xml

diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index 378046470..511709766 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -26,7 +26,10 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import java.util.Arrays;
+import java.util.TimeZone;
 
+import org.crowdnotifier.android.sdk.model.ExposureEvent;
+import org.crowdnotifier.android.sdk.storage.ExposureStorage;
 import org.dpppt.android.sdk.DP3T;
 import org.dpppt.android.sdk.internal.nearby.ExposureWindowMatchingWorker;
 import org.dpppt.android.sdk.internal.storage.ExposureDayStorage;
@@ -34,9 +37,12 @@
 import org.dpppt.android.sdk.models.ExposureDay;
 
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
+import ch.admin.bag.dp3t.checkin.models.SwissCovidAssociatedData;
 import ch.admin.bag.dp3t.debug.model.DebugAppState;
 import ch.admin.bag.dp3t.networking.CertificatePinning;
 import ch.admin.bag.dp3t.storage.SecureStorage;
+import ch.admin.bag.dp3t.util.NotificationUtil;
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
 
 public class DebugFragment extends Fragment {
@@ -44,6 +50,7 @@ public class DebugFragment extends Fragment {
 	public static final boolean EXISTS = true;
 
 	private TracingViewModel tracingViewModel;
+	private CrowdNotifierViewModel crowdNotifierViewModel;
 
 	public static void startDebugFragment(FragmentManager parentFragmentManager) {
 		parentFragmentManager.beginTransaction()
@@ -65,6 +72,7 @@ public DebugFragment() {
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
+		crowdNotifierViewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
 	}
 
 	@Override
@@ -137,23 +145,30 @@ private void setupStateOptions(View view) {
 		updateRadioGroup(optionsGroup);
 
 		view.findViewById(R.id.debug_button_testmeldung).setOnClickListener(v -> {
-			showExposureDaysInputDialog();
+			showExposureDaysInputDialogs();
 		});
 	}
 
-	private void showExposureDaysInputDialog() {
+
+	private void showInputDialog(String title, String defaultInput, InputDialogCallback callback) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-		builder.setTitle(getString(R.string.number_of_exposure_days));
+		builder.setTitle(title);
 		final EditText input = new EditText(getContext());
-		input.setText("2");
+		input.setText(defaultInput);
 		input.setInputType(InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_CLASS_NUMBER);
 		builder.setView(input);
 		builder.setPositiveButton(R.string.android_button_ok,
-				(a, b) -> exposeMyself(Integer.parseInt(input.getText().toString())));
+				(a, b) -> callback.onResult(Integer.parseInt(input.getText().toString())));
 		builder.show();
 	}
 
-	private void exposeMyself(int numberOfDays) {
+	private void showExposureDaysInputDialogs() {
+		showInputDialog(getString(R.string.number_of_exposure_days), "0", (tracingExposures) ->
+				showInputDialog("How many Checkin Exposures should be simulated?", "1", (checkinExposures) ->
+						exposeMyself(tracingExposures, checkinExposures)));
+	}
+
+	private void exposeMyself(int numberOfDays, int numberOfCheckins) {
 
 		ExposureDayStorage eds = ExposureDayStorage.getInstance(requireContext());
 		eds.clear();
@@ -163,6 +178,21 @@ private void exposeMyself(int numberOfDays) {
 			ExposureDay exposureDay = new ExposureDay(i, dayOfExposure, System.currentTimeMillis());
 			eds.addExposureDays(requireContext(), Arrays.asList(exposureDay));
 		}
+
+		ExposureStorage exposureStorage = ExposureStorage.getInstance(requireContext());
+		exposureStorage.clear();
+		for (int i = 0; i < numberOfCheckins; i++) {
+			long exposureStart = new DayDate().subtractDays(i).getStartOfDay(TimeZone.getDefault()) + 1000L * 60 * 60 * 12;
+			long exposureEnd = exposureStart + 1000L * 60 * 60;
+			exposureStorage.addEntry(new ExposureEvent(-i, exposureStart, exposureEnd, "debug message",
+					SwissCovidAssociatedData.getDefaultInstance().toByteArray()));
+		}
+		if (numberOfCheckins > 0) {
+			SecureStorage secureStorage = SecureStorage.getInstance(requireContext());
+			NotificationUtil.generateContactNotification(requireContext());
+			secureStorage.setAppOpenAfterNotificationPending(true);
+			secureStorage.setReportsHeaderAnimationPending(true);
+		}
 		getActivity().finish();
 	}
 
@@ -193,4 +223,9 @@ public void setDebugAppState(DebugAppState debugAppState) {
 		((TracingStatusWrapper) tracingViewModel.getTracingStatusInterface()).setDebugAppState(getContext(), debugAppState);
 	}
 
+	private interface InputDialogCallback {
+		void onResult(int selectedNumber);
+
+	}
+
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 533a8619d..6d2c7ab38 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -21,6 +21,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -43,6 +44,7 @@
 import ch.admin.bag.dp3t.networking.ConfigWorker;
 import ch.admin.bag.dp3t.onboarding.OnboardingActivity;
 import ch.admin.bag.dp3t.reports.ReportsFragment;
+import ch.admin.bag.dp3t.reports.ReportsOverviewFragment;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.updateboarding.UpdateBoardingActivity;
 import ch.admin.bag.dp3t.util.UrlUtil;
@@ -53,7 +55,6 @@
 import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
 import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CHECK_OUT_NOW;
 import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION;
-import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION;
 import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_ONGOING_NOTIFICATION;
 import static ch.admin.bag.dp3t.inform.InformActivity.EXTRA_COVIDCODE;
 import static ch.admin.bag.dp3t.updateboarding.UpdateBoardingActivity.UPDATE_BOARDING_VERSION;
@@ -162,7 +163,6 @@ protected void onNewIntent(Intent intent) {
 	protected void onStart() {
 		super.onStart();
 		secureStorage.setAppOpenAfterNotificationPending(false);
-		crowdNotifierViewModel.refreshTraceKeys();
 		autoCheckoutIfNecessary(this, crowdNotifierViewModel.getCheckInState());
 	}
 
@@ -190,7 +190,8 @@ private void handleCustomIntents() {
 			secureStorage.setReportsHeaderAnimationPending(false);
 			showReportsFragment();
 		} else if (ACTION_EXPOSED_GOTO_REPORTS.equals(intentAction)) {
-			if (tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed()) {
+			if (tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed() ||
+					crowdNotifierViewModel.getExposures().getValue().size() > 0) {
 				showReportsFragment();
 			}
 		} else if (ACTION_ACTIVATE_TRACING.equals(intentAction)) {
@@ -200,8 +201,6 @@ private void handleCustomIntents() {
 			showCheckinOverviewFragment();
 		} else if (ACTION_CHECK_OUT_NOW.equals(intentAction) && crowdNotifierViewModel.isCheckedIn().getValue()) {
 			showCheckOutFragment();
-		} else if (ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION.equals(intentAction)) {
-			showReportsFragment();
 		} else if (getIntent().getData() != null) {
 			checkValidCovidcodeIntent();
 			checkValidCheckInIntent();
@@ -274,10 +273,19 @@ private void showHomeFragment() {
 	}
 
 	private void showReportsFragment() {
+		int checkinReports = crowdNotifierViewModel.getExposures().getValue().size();
+		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
+		Fragment reportsFragment;
+		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1)) {
+			reportsFragment = ReportsOverviewFragment.newInstance();
+		} else {
+			reportsFragment = ReportsFragment.newInstance(null);
+		}
+
 		getSupportFragmentManager()
 				.beginTransaction()
-				.replace(R.id.main_fragment_container, ReportsFragment.newInstance())
-				.addToBackStack(ReportsFragment.class.getCanonicalName())
+				.replace(R.id.main_fragment_container, reportsFragment)
+				.addToBackStack(reportsFragment.getClass().getCanonicalName())
 				.commit();
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index ac80f2b8b..9728b55e1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -22,6 +22,7 @@
 import ch.admin.bag.dp3t.checkin.networking.TraceKeysRepository;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.util.DateUtils;
 
 import static ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker.ACTION_NEW_TRACE_KEY_SYNC;
 import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
@@ -171,6 +172,24 @@ public ExposureEvent getExposureWithId(long id) {
 		return null;
 	}
 
+	public ExposureEvent getLatestExposure() {
+		List<ExposureEvent> exposureEvents = exposures.getValue();
+		if (exposureEvents == null || exposureEvents.isEmpty()) return null;
+		ExposureEvent latestExposureEvent = exposureEvents.get(0);
+		for (ExposureEvent exposureEvent : exposureEvents) {
+			if (exposureEvent.getEndTime() > latestExposureEvent.getEndTime()) {
+				latestExposureEvent = exposureEvent;
+			}
+		}
+		return latestExposureEvent;
+	}
+
+	public long getDaysSinceExposure() {
+		ExposureEvent latestExposure = getLatestExposure();
+		if (latestExposure == null) return -1;
+		return DateUtils.getDaysDiff(getLatestExposure().getEndTime());
+	}
+
 	public long getSelectedReminderDelay() {
 		return checkInState.getSelectedReminderDelay();
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
index d76e7e222..6cfb77a75 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
@@ -17,7 +17,7 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
+import ch.admin.bag.dp3t.util.NotificationUtil;
 
 import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
 
@@ -30,7 +30,6 @@ public class CrowdNotifierKeyLoadWorker extends Worker {
 	private static final int REPEAT_INTERVAL_MINUTES = 120;
 	private static final String LOG_TAG = "KeyLoadWorker";
 
-
 	public static void startKeyLoadWorker(Context context) {
 		Constraints constraints = new Constraints.Builder()
 				.setRequiredNetworkType(NetworkType.CONNECTED)
@@ -62,9 +61,7 @@ public Result doWork() {
 		}
 		List<ExposureEvent> exposures = CrowdNotifier.checkForMatches(problematicEventInfos, getApplicationContext());
 		if (!exposures.isEmpty()) {
-			for (ExposureEvent exposureEvent : exposures) {
-				NotificationHelper.getInstance(getApplicationContext()).showExposureNotification(exposureEvent.getId());
-			}
+			showExposureNotification();
 		}
 		cleanUpOldData(getApplicationContext());
 		autoCheckoutIfNecessary(getApplicationContext(), SecureStorage.getInstance(getApplicationContext()).getCheckInState());
@@ -75,6 +72,13 @@ public Result doWork() {
 		return Result.success();
 	}
 
+	private void showExposureNotification() {
+		SecureStorage secureStorage = SecureStorage.getInstance(getApplicationContext());
+		NotificationUtil.generateContactNotification(getApplicationContext());
+		secureStorage.setAppOpenAfterNotificationPending(true);
+		secureStorage.setReportsHeaderAnimationPending(true);
+	}
+
 	public static void cleanUpOldData(Context context) {
 		CrowdNotifier.cleanUpOldData(context, DAYS_TO_KEEP_VENUE_VISITS);
 		DiaryStorage.getInstance(context).removeEntriesBefore(DAYS_TO_KEEP_VENUE_VISITS);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 505efda4f..b0c2f54d3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -23,8 +23,6 @@
 
 public class NotificationHelper {
 
-	public static final String ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION = BuildConfig.APPLICATION_ID +
-			".ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION";
 	public static final String ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION = BuildConfig.APPLICATION_ID +
 			".ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION";
 	public static final String ACTION_AUTO_CHECKOUT_NOTIFICATION = BuildConfig.APPLICATION_ID +
@@ -33,9 +31,6 @@ public class NotificationHelper {
 	public static final String ACTION_CHECK_OUT_NOW = BuildConfig.APPLICATION_ID + ".ACTION_CHECK_OUT_NOW";
 	public static final String ACTION_SNOOZE = BuildConfig.APPLICATION_ID + ".ACTION_SNOOZE";
 
-	public static final String CROWDNOTIFIER_EXPOSURE_ID_EXTRA = "CROWDNOTIFIER_EXPOSURE_ID";
-
-	private final String CHANNEL_ID_EXPOSURE_NOTIFICATION = "ExposureNotificaitons";
 	private final String CHANNEL_ID_REMINDER = "Reminders";
 	private final String CHANNEL_ID_ONGOING_CHECK_IN = "Ongoing Check In";
 
@@ -80,16 +75,6 @@ private PendingIntent createBasicPendingIntent(String notificationAction) {
 				.getPendingIntent(notificationAction.hashCode(), PendingIntent.FLAG_UPDATE_CURRENT);
 	}
 
-	private PendingIntent createExposurePendingIntent(long exposureId) {
-		Intent intent = new Intent(context, MainActivity.class);
-		intent.setAction(ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION);
-		intent.putExtra(CROWDNOTIFIER_EXPOSURE_ID_EXTRA, exposureId);
-		intent.setAction(Long.toString(exposureId));
-		return TaskStackBuilder.create(context)
-				.addNextIntentWithParentStack(intent)
-				.getPendingIntent(ACTION_CROWDNOTIFIER_EXPOSURE_NOTIFICATION.hashCode(), PendingIntent.FLAG_ONE_SHOT);
-	}
-
 	private NotificationCompat.Builder getNotificationBuilder(String channelId) {
 		return new NotificationCompat.Builder(context, channelId)
 				.setAutoCancel(true)
@@ -111,20 +96,6 @@ public void showAutoCheckoutNotification() {
 		notificationManager.notify(AUTO_CHECKOUT_NOTIFICATION_ID, notification);
 	}
 
-	public void showExposureNotification(long exposureId) {
-
-		createNotificationChannel(CHANNEL_ID_EXPOSURE_NOTIFICATION,
-				context.getString(R.string.android_crowdnotifier_notification_channel_name), false, IMPORTANCE_HIGH);
-
-		Notification notification = getNotificationBuilder(CHANNEL_ID_EXPOSURE_NOTIFICATION)
-				.setContentIntent(createExposurePendingIntent(exposureId))
-				.setContentTitle(context.getString(R.string.push_exposed_title))
-				.setContentText(context.getString(R.string.push_exposed_text))
-				.build();
-
-		notificationManager.notify((int) exposureId, notification);
-	}
-
 	public void showReminderNotification() {
 
 		createNotificationChannel(CHANNEL_ID_REMINDER, context.getString(R.string.android_reminder_channel_name), false,
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
new file mode 100644
index 000000000..d8030afd6
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
@@ -0,0 +1,13 @@
+package ch.admin.bag.dp3t.extensions
+
+import android.content.Context
+import ch.admin.bag.dp3t.util.StringUtil
+import org.crowdnotifier.android.sdk.model.ExposureEvent
+import org.dpppt.android.sdk.models.DayDate
+
+fun ExposureEvent.getDetailsString(context: Context): String {
+	return "${StringUtil.getReportDateString(DayDate(endTime), true, false, context)}\n${
+		StringUtil.getHourMinuteTimeString(startTime, ":")
+	} - ${StringUtil.getHourMinuteTimeString(endTime, ":")}"
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
index aa1182bf2..ce5d4b094 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
@@ -3,10 +3,10 @@ package ch.admin.bag.dp3t.extensions
 import androidx.fragment.app.Fragment
 import ch.admin.bag.dp3t.R
 
-fun Fragment.showFragment(fragment: Fragment){
+fun Fragment.showFragment(fragment: Fragment, addToBackStack: Boolean = true) {
 	requireActivity().supportFragmentManager.beginTransaction()
 		.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 		.replace(R.id.main_fragment_container, fragment)
-		.addToBackStack(fragment::class.java.canonicalName)
+		.apply { if (addToBackStack) addToBackStack(fragment::class.java.canonicalName) }
 		.commit()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index d538b4765..c69feb93b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -49,6 +49,7 @@
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment;
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
 import ch.admin.bag.dp3t.contacts.ContactsFragment;
+import ch.admin.bag.dp3t.extensions.FragmentExtensionsKt;
 import ch.admin.bag.dp3t.home.model.NotificationState;
 import ch.admin.bag.dp3t.home.model.NotificationStateError;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
@@ -57,6 +58,7 @@
 import ch.admin.bag.dp3t.networking.models.InfoBoxModel;
 import ch.admin.bag.dp3t.networking.models.InfoBoxModelCollection;
 import ch.admin.bag.dp3t.reports.ReportsFragment;
+import ch.admin.bag.dp3t.reports.ReportsOverviewFragment;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.util.*;
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
@@ -252,11 +254,13 @@ private void showContactsFragment() {
 	}
 
 	private void showReportsFragment() {
-		requireActivity().getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, ReportsFragment.newInstance())
-				.addToBackStack(ReportsFragment.class.getCanonicalName())
-				.commit();
+		int checkinReports = crowdNotifierViewModel.getExposures().getValue().size();
+		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
+		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1)) {
+			FragmentExtensionsKt.showFragment(this, ReportsOverviewFragment.newInstance(), true);
+		} else {
+			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), true);
+		}
 	}
 
 	private void setupNotification() {
@@ -286,8 +290,16 @@ public void onAnimationEnd(Animator animation) {
 		}
 		if (tracingStatusInterface.isReportedAsInfected()) {
 			NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.POSITIVE_TESTED);
-		} else if (tracingStatusInterface.wasContactReportedAsExposed()) {
-			long daysSinceExposure = tracingStatusInterface.getDaysSinceExposure();
+		} else if (tracingStatusInterface.wasContactReportedAsExposed() ||
+				!crowdNotifierViewModel.getExposures().getValue().isEmpty()) {
+			long daysSinceExposureTracing = tracingStatusInterface.getDaysSinceExposure();
+			long daysSinceExposureCheckin = crowdNotifierViewModel.getDaysSinceExposure();
+			long daysSinceExposure;
+			if (daysSinceExposureTracing >= 0 && daysSinceExposureCheckin >= 0) {
+				daysSinceExposure = Math.min(daysSinceExposureTracing, daysSinceExposureCheckin);
+			} else {
+				daysSinceExposure = Math.max(daysSinceExposureTracing, daysSinceExposureCheckin);
+			}
 			NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.EXPOSED, daysSinceExposure);
 		} else {
 			NotificationStateHelper.updateStatusView(reportStatusView, NotificationState.NO_REPORTS);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java b/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
index c34748397..f2471941d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
@@ -60,7 +60,7 @@ public enum NotificationState {
 	@ColorRes public static int getTitleTextColor(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
-				return R.color.green_main;
+				return R.color.blue_main;
 			case EXPOSED:
 				return R.color.white;
 			case POSITIVE_TESTED:
@@ -84,7 +84,7 @@ public enum NotificationState {
 	@ColorRes public static int getBackgroundColor(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
-				return R.color.status_green_bg;
+				return R.color.status_blue_bg;
 			case EXPOSED:
 				return R.color.blue_main;
 			case POSITIVE_TESTED:
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index c66ee74a7..05e403a3a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -19,10 +19,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.TextView
+import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
@@ -33,15 +34,18 @@ import androidx.transition.Transition
 import androidx.transition.TransitionManager
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.contacts.ReactivateTracingReminderDialog
 import ch.admin.bag.dp3t.databinding.FragmentReportsBinding
+import ch.admin.bag.dp3t.databinding.FragmentReportsHeaderPossibleInfectionBinding
+import ch.admin.bag.dp3t.extensions.getDetailsString
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.*
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import ch.admin.bag.dp3t.whattodo.WhereToTestDialogFragment
 import org.dpppt.android.sdk.models.DayDate
-import org.dpppt.android.sdk.models.ExposureDay
 import java.util.*
 import kotlin.math.min
 
@@ -49,18 +53,30 @@ private const val DAYS_TO_STAY_IN_QUARANTINE = 10
 private const val MAX_EXPOSURE_AGE_TO_DO_A_TEST = 10
 private const val MIN_EXPOSURE_AGE_TO_DO_A_TEST = 5
 private const val ONE_DAY_IN_MILLIS = 24L * 60 * 60 * 1000
+private const val ARG_CHECK_IN_ID = "ARG_CHECK_IN_ID"
+private const val ARG_SHOW_TRACING_REPORT_DETAILS = "ARG_SHOW_TRACING_REPORT_DETAILS"
 
 
 class ReportsFragment : Fragment() {
 
 	companion object {
+
 		@JvmStatic
-		fun newInstance() = ReportsFragment()
+		fun newInstance(reportItem: ReportItem? = null): ReportsFragment {
+			return ReportsFragment().apply {
+				when (reportItem) {
+					is ProximityTracingReportItem -> arguments = bundleOf(ARG_SHOW_TRACING_REPORT_DETAILS to true)
+					is CheckinReportItem -> arguments = bundleOf(ARG_CHECK_IN_ID to reportItem.exposure.id)
+				}
+			}
+		}
 	}
 
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
 	private val tracingViewModel: TracingViewModel by activityViewModels()
 	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
+	private val diaryStorage by lazy { DiaryStorage.getInstance(requireContext()) }
+
 
 	private lateinit var binding: FragmentReportsBinding
 
@@ -70,83 +86,91 @@ class ReportsFragment : Fragment() {
 		binding = FragmentReportsBinding.inflate(inflater)
 		return binding.apply {
 			reportsToolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
+			val showTracingReports = arguments?.getBoolean(ARG_SHOW_TRACING_REPORT_DETAILS, false) == true
+			val showCheckinReport = arguments?.getLong(ARG_CHECK_IN_ID) != null
+
+			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { checkinExposures ->
+				val tracingStatusInterface = tracingViewModel.appStatusLiveData.value!!
+				setupState(
+					when {
+						showTracingReports -> State.POSSIBLE_INFECTION_TRACING_REPORTS
+						showCheckinReport -> State.POSSIBLE_INFECTION_CHECKIN_REPORT
+						tracingStatusInterface.isReportedAsInfected -> State.POSITIVE_TESTED
+						tracingStatusInterface.wasContactReportedAsExposed() && checkinExposures.isEmpty() -> State.POSSIBLE_INFECTION_TRACING_REPORTS
+						!tracingStatusInterface.wasContactReportedAsExposed() && checkinExposures.isNotEmpty() -> State.POSSIBLE_INFECTION_CHECKIN_REPORT
+						else -> State.NO_REPORTS
+					}, tracingStatusInterface
+				)
 
-			tracingViewModel.appStatusLiveData.observe(viewLifecycleOwner) {
-				when {
-					it.isReportedAsInfected -> setupState(State.POSITIVE_TESTED, it)
-					it.wasContactReportedAsExposed() -> setupState(State.POSSIBLE_INFECTION, it)
-					else -> setupState(State.NO_REPORTS, it)
-				}
 			}
-
 		}.root
 	}
 
 	private fun setupHeader(state: State) {
 		binding.apply {
-			val isReportsHeaderAnimationPending = secureStorage.isReportsHeaderAnimationPending
+			headerFragmentContainer.removeAllViews()
+			val isReportsHeaderAnimationPending =
+				secureStorage.isReportsHeaderAnimationPending && (state == State.POSSIBLE_INFECTION_TRACING_REPORTS || state == State.POSSIBLE_INFECTION_CHECKIN_REPORT)
 			val exposureDays = tracingViewModel.appStatusLiveData.value?.exposureDays ?: listOf()
-			updateHeaderSize(isReportsHeaderAnimationPending, exposureDays.size)
+			updateHeaderSize(isReportsHeaderAnimationPending, state, exposureDays.size)
 			if (isReportsHeaderAnimationPending) {
 				reportsScrollviewFirstChild.visibility = View.GONE
 			}
 			headerFragmentContainer.post { setupScrollBehavior() }
 
-			headerFragmentContainer.removeAllViews()
-			val layoutResource = when (state) {
-				State.NO_REPORTS -> R.layout.fragment_reports_header_no_reports
-				State.POSSIBLE_INFECTION -> R.layout.fragment_reports_header_possible_infection
-				State.POSITIVE_TESTED -> R.layout.fragment_reports_header_positive_tested
-			}
-			LayoutInflater.from(requireContext()).inflate(layoutResource, headerFragmentContainer, true)
+			val headerView =
+				LayoutInflater.from(requireContext()).inflate(state.headerLayoutResource, headerFragmentContainer, true)
 			if (state == State.NO_REPORTS || state == State.POSITIVE_TESTED) return
 
-			val date = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_date)
-			val info = headerFragmentContainer.findViewById<View>(R.id.fragment_reports_header_info)
-			val image = headerFragmentContainer.findViewById<View>(R.id.fragment_reports_header_image)
-			val continueButton = headerFragmentContainer.findViewById<Button>(R.id.fragment_reports_header_continue_button)
-			val subtitle = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_subtitle)
-			val showAllButton = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_show_all_button)
-			val daysContainer = headerFragmentContainer.findViewById<ViewGroup>(R.id.fragment_reports_dates_container)
-			val daysContainerScrollview = headerFragmentContainer.findViewById<View>(R.id.fragment_reports_dates_scroll_view)
-			val titleTextView = headerFragmentContainer.findViewById<TextView>(R.id.fragment_reports_header_title)
-
-			if (exposureDays.isNotEmpty()) {
-				date.text = getDateString(exposureDays[exposureDays.size - 1], true)
-			}
-
-			daysContainer.removeAllViews()
-			for (exposureDay in exposureDays) {
-				val itemView = LayoutInflater.from(context).inflate(R.layout.item_reports_exposure_day, daysContainer, false)
-				val itemDate = itemView.findViewById<TextView>(R.id.exposure_day_textview)
-				itemDate.text = getDateString(exposureDay, false)
-				daysContainer.addView(itemView, 0)
-			}
+			FragmentReportsHeaderPossibleInfectionBinding.bind(headerView).apply {
 
-			showAllButton.isVisible = exposureDays.size > 1
-
-			showAllButton.setOnClickListener {
-				if (daysContainerScrollview.visibility == View.VISIBLE) {
-					subtitle.setText(R.string.meldung_detail_exposed_subtitle_last_encounter)
-					showAllButton.setText(R.string.meldung_detail_exposed_show_all_button)
-					animateHeaderHeight(false, exposureDays.size, daysContainerScrollview, date!!)
+				if (state == State.POSSIBLE_INFECTION_CHECKIN_REPORT) {
+					headerShowAllButton.isVisible = false
+					headerDate.isVisible = false
+					headerSlogan.isVisible = true
+					datesContainer.isVisible = false
+					headerSubtitle.isVisible = false
 				} else {
-					subtitle.setText(R.string.meldung_detail_exposed_subtitle_all_encounters)
-					showAllButton.setText(R.string.meldung_detail_exposed_show_less_button)
-					animateHeaderHeight(true, exposureDays.size, daysContainerScrollview, date!!)
+					if (exposureDays.isNotEmpty()) {
+						headerDate.text =
+							StringUtil.getReportDateString(exposureDays[exposureDays.size - 1].exposedDate, true, true, context)
+					}
+					datesContainer.removeAllViews()
+					for (exposureDay in exposureDays) {
+						val itemView = LayoutInflater.from(context)
+							.inflate(R.layout.item_reports_exposure_day, datesContainer, false)
+						val itemDate = itemView.findViewById<TextView>(R.id.exposure_day_textview)
+						itemDate.text = StringUtil.getReportDateString(exposureDay.exposedDate, false, true, context)
+						datesContainer.addView(itemView, 0)
+					}
+
+					headerShowAllButton.isVisible = exposureDays.size > 1
+
+					headerShowAllButton.setOnClickListener {
+						if (datesScrollView.visibility == View.VISIBLE) {
+							headerSubtitle.setText(R.string.meldung_detail_exposed_subtitle_last_encounter)
+							headerShowAllButton.setText(R.string.meldung_detail_exposed_show_all_button)
+							animateHeaderHeight(false, exposureDays.size, datesScrollView, headerDate)
+						} else {
+							headerSubtitle.setText(R.string.meldung_detail_exposed_subtitle_all_encounters)
+							headerShowAllButton.setText(R.string.meldung_detail_exposed_show_less_button)
+							animateHeaderHeight(true, exposureDays.size, datesScrollView, headerDate)
+						}
+					}
+					headerShowAllButton.paintFlags = headerShowAllButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 				}
-			}
-			showAllButton.paintFlags = showAllButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 
 
-			if (isReportsHeaderAnimationPending) {
-				info.visibility = View.GONE
-				showAllButton.visibility = View.GONE
-				image.visibility = View.VISIBLE
-				continueButton.visibility = View.VISIBLE
-				titleTextView.setText(R.string.meldung_detail_exposed_title)
-				continueButton.setOnClickListener {
-					doHeaderAnimation(info, image, continueButton, showAllButton, exposureDays.size)
+				if (isReportsHeaderAnimationPending) {
+					headerInfo.isVisible = false
+					headerShowAllButton.isVisible = false
+					headerImage.isVisible = true
+					headerSubtitle.isVisible = false
+					headerSlogan.isVisible = true
+					headerContinueButton.isVisible = true
+					headerDate.isVisible = false
+					headerTitle.setText(R.string.meldung_detail_exposed_title)
+					headerContinueButton.setOnClickListener { doHeaderCollapseAnimation(this, exposureDays.size, state) }
 				}
 			}
 		}
@@ -154,11 +178,11 @@ class ReportsFragment : Fragment() {
 
 	private fun setupState(state: State, tracingStatusInterface: TracingStatusInterface) {
 
-		//TODO: Set up header
 		binding.apply {
 			reportsHealthy.root.isVisible = state == State.NO_REPORTS
 			reportsInfected.root.isVisible = state == State.POSITIVE_TESTED
-			reportsLeitfaden.root.isVisible = state == State.POSSIBLE_INFECTION
+			reportsLeitfaden.root.isVisible = state == State.POSSIBLE_INFECTION_TRACING_REPORTS
+			reportsCheckinReport.root.isVisible = state == State.POSSIBLE_INFECTION_CHECKIN_REPORT
 		}
 		when (state) {
 			State.NO_REPORTS -> {
@@ -167,7 +191,7 @@ class ReportsFragment : Fragment() {
 					faqButton.setOnClickListener { showFaq() }
 				}
 			}
-			State.POSSIBLE_INFECTION -> {
+			State.POSSIBLE_INFECTION_TRACING_REPORTS -> {
 				binding.reportsLeitfaden.apply {
 					itemCallHotlineLayout.setOnClickListener { callHotline() }
 					faqButton.setOnClickListener { showFaq() }
@@ -209,6 +233,22 @@ class ReportsFragment : Fragment() {
 					deleteReports.isVisible = tracingStatusInterface.canInfectedStatusBeReset(requireContext())
 				}
 			}
+			State.POSSIBLE_INFECTION_CHECKIN_REPORT -> {
+				binding.reportsCheckinReport.apply {
+					(crowdNotifierViewModel.getExposureWithId(arguments?.getLong(ARG_CHECK_IN_ID) ?: -1)
+						?: crowdNotifierViewModel.latestExposure)?.let { exposureEvent ->
+						deleteReport.setOnClickListener { deleteNotifications(tracingStatusInterface, exposureEvent.id) }
+						reportDetails.text = exposureEvent.getDetailsString(requireContext())
+
+						val diaryEntry: DiaryEntry? = diaryStorage.getDiaryEntryWithId(exposureEvent.id)
+						place.isVisible = diaryEntry != null
+						place.text = diaryEntry?.venueInfo?.title
+
+					}
+					faqButton.setOnClickListener { showFaq() }
+					testlocationsLink.setOnClickListener { showWhereToTestDialog() }
+				}
+			}
 		}
 		val notificationManager = requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 		notificationManager.cancel(NotificationUtil.NOTIFICATION_ID_CONTACT)
@@ -229,11 +269,15 @@ class ReportsFragment : Fragment() {
 			.show()
 	}
 
-	private fun deleteNotifications(tracingStatusInterface: TracingStatusInterface) {
+	private fun deleteNotifications(tracingStatusInterface: TracingStatusInterface, checkinId: Long? = null) {
 		AlertDialog.Builder(requireActivity(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(R.string.delete_notification_dialog)
 			.setPositiveButton(R.string.delete_reports_button) { _, _ ->
-				tracingStatusInterface.resetExposureDays(context)
+				if (checkinId == null) {
+					tracingStatusInterface.resetExposureDays(context)
+				} else {
+					crowdNotifierViewModel.removeExposure(checkinId)
+				}
 				parentFragmentManager.popBackStack()
 			}
 			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
@@ -319,11 +363,15 @@ class ReportsFragment : Fragment() {
 		super.onResume()
 		if (leitfadenJustOpened) {
 			leitfadenJustOpened = false
-			setupState(State.POSSIBLE_INFECTION, tracingViewModel.tracingStatusInterface)
+			setupState(State.POSSIBLE_INFECTION_TRACING_REPORTS, tracingViewModel.tracingStatusInterface)
 		}
 	}
 
-	private fun doHeaderAnimation(info: View, image: View, button: Button, showAllButton: View, numExposureDays: Int) {
+	private fun doHeaderCollapseAnimation(
+		headerBinding: FragmentReportsHeaderPossibleInfectionBinding,
+		numExposureDays: Int,
+		state: State
+	) {
 		secureStorage.isReportsHeaderAnimationPending = false
 		binding.apply {
 			reportsScrollviewFirstChild.updatePadding(top = root.height)
@@ -342,14 +390,15 @@ class ReportsFragment : Fragment() {
 					override fun onTransitionResume(transition: Transition) {}
 				})
 				TransitionManager.beginDelayedTransition(root, autoTransition)
-				updateHeaderSize(false, numExposureDays)
-				info.visibility = View.VISIBLE
-				image.visibility = View.GONE
-				button.visibility = View.GONE
-				if (numExposureDays <= 1) {
-					showAllButton.visibility = View.GONE
-				} else {
-					showAllButton.visibility = View.VISIBLE
+				updateHeaderSize(false, state, numExposureDays)
+				headerBinding.apply {
+					headerInfo.isVisible = true
+					headerImage.isVisible = false
+					headerContinueButton.isVisible = false
+					headerShowAllButton.isVisible = state == State.POSSIBLE_INFECTION_TRACING_REPORTS && numExposureDays > 1
+					headerDate.isVisible = state == State.POSSIBLE_INFECTION_TRACING_REPORTS
+					headerSlogan.isVisible = state == State.POSSIBLE_INFECTION_CHECKIN_REPORT
+					headerSubtitle.isVisible = state == State.POSSIBLE_INFECTION_TRACING_REPORTS
 				}
 			}
 		}
@@ -430,12 +479,12 @@ class ReportsFragment : Fragment() {
 		}
 	}
 
-	private fun updateHeaderSize(isReportsHeaderAnimationPending: Boolean, numExposureDays: Int) {
+	private fun updateHeaderSize(isReportsHeaderAnimationPending: Boolean, state: State, numExposureDays: Int = 0) {
 		binding.apply {
 			val headerLp = headerFragmentContainer.layoutParams
 			if (isReportsHeaderAnimationPending) {
 				headerLp.height = ViewGroup.LayoutParams.MATCH_PARENT
-			} else if (numExposureDays <= 1) {
+			} else if (numExposureDays <= 1 || state != State.POSSIBLE_INFECTION_TRACING_REPORTS) {
 				headerLp.height = resources.getDimensionPixelSize(R.dimen.header_height_reports)
 				reportsScrollviewFirstChild.setPadding(
 					reportsScrollviewFirstChild.paddingLeft,
@@ -480,26 +529,11 @@ class ReportsFragment : Fragment() {
 		return min(scrollY, scrollRange) / scrollRange.toFloat()
 	}
 
-	private fun getDateString(exposureDay: ExposureDay, withDiff: Boolean): String {
-		val timestamp = exposureDay.exposedDate.getStartOfDay(TimeZone.getDefault())
-		if (!withDiff) {
-			return DateUtils.getFormattedDateWrittenMonth(timestamp)
-		}
-		var dateStr = getString(R.string.date_text_before_date).replace("{DATE}", DateUtils.getFormattedDate(timestamp))
-		dateStr += " / "
-		val daysDiff = DateUtils.getDaysDiff(timestamp)
-		dateStr += if (daysDiff == 0) {
-			getString(R.string.date_today)
-		} else if (daysDiff == 1) {
-			getString(R.string.date_one_day_ago)
-		} else {
-			getString(R.string.date_days_ago).replace("{COUNT}", daysDiff.toString())
-		}
-		return dateStr
-	}
-
-	enum class State {
-		NO_REPORTS, POSSIBLE_INFECTION, POSITIVE_TESTED
+	enum class State(@LayoutRes val headerLayoutResource: Int) {
+		NO_REPORTS(R.layout.fragment_reports_header_no_reports),
+		POSSIBLE_INFECTION_CHECKIN_REPORT(R.layout.fragment_reports_header_possible_infection),
+		POSSIBLE_INFECTION_TRACING_REPORTS(R.layout.fragment_reports_header_possible_infection),
+		POSITIVE_TESTED(R.layout.fragment_reports_header_positive_tested)
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt
new file mode 100644
index 000000000..c0bb1be7f
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt
@@ -0,0 +1,81 @@
+package ch.admin.bag.dp3t.reports
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.transition.AutoTransition
+import androidx.transition.TransitionManager
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.databinding.FragmentReportsOverviewBinding
+import ch.admin.bag.dp3t.extensions.showFragment
+import ch.admin.bag.dp3t.storage.SecureStorage
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+
+class ReportsOverviewFragment : Fragment() {
+
+	companion object {
+		@JvmStatic
+		fun newInstance() = ReportsOverviewFragment()
+	}
+
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
+	private val tracingViewModel: TracingViewModel by activityViewModels()
+	private val diaryStorage by lazy { DiaryStorage.getInstance(requireContext()) }
+	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
+
+	private lateinit var binding: FragmentReportsOverviewBinding
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentReportsOverviewBinding.inflate(inflater)
+		return binding.apply {
+			reportsToolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
+			val adapter = ReportsRecyclerAdapter()
+			reportsRecyclerView.adapter = adapter
+			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { checkinExposures ->
+
+				adapter.setItems(checkinExposures.map {
+					CheckinReportItem(it, diaryStorage.getDiaryEntryWithId(it.id))
+				}.toMutableList<ReportItem>().apply {
+					val tracingExposureDays = tracingViewModel.tracingStatusInterface.exposureDays.reversed()
+					if (tracingExposureDays.isNotEmpty()) {
+						add(0, ProximityTracingReportItem(tracingExposureDays))
+					}
+				})
+			}
+			adapter.setOnClickListener {
+				showFragment(ReportsFragment.newInstance(it))
+			}
+			if (secureStorage.isReportsHeaderAnimationPending) {
+				setupSplashScreen()
+			}
+		}.root
+	}
+
+	private fun setupSplashScreen() {
+		binding.splashReport.apply {
+			root.isVisible = true
+			headerContinueButton.isVisible = true
+			headerShowAllButton.isVisible = false
+			headerSlogan.isVisible = true
+			headerImage.isVisible = true
+			headerInfo.isVisible = false
+			headerSubtitle.isVisible = false
+			headerContinueButton.setOnClickListener { hideSplashScreen() }
+		}
+
+	}
+
+	private fun hideSplashScreen() {
+		secureStorage.isReportsHeaderAnimationPending = false
+		val autoTransition = AutoTransition()
+		autoTransition.duration = 300
+		TransitionManager.beginDelayedTransition(binding.root, autoTransition)
+		binding.splashReport.root.isVisible = false
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt
new file mode 100644
index 000000000..af4aa584b
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt
@@ -0,0 +1,86 @@
+package ch.admin.bag.dp3t.reports
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.databinding.*
+import ch.admin.bag.dp3t.extensions.getDetailsString
+import ch.admin.bag.dp3t.util.StringUtil
+import org.crowdnotifier.android.sdk.model.ExposureEvent
+import org.dpppt.android.sdk.models.ExposureDay
+
+class ReportsRecyclerAdapter : RecyclerView.Adapter<ReportsRecyclerAdapter.ReportViewHolder>() {
+
+	private var items: List<ReportItem> = emptyList()
+	private var onClickListener: ((ReportItem) -> Unit)? = null
+
+	fun setItems(newItems: List<ReportItem>) {
+		this.items = ArrayList<ReportItem>().apply { addAll(newItems) }
+		notifyDataSetChanged()
+	}
+
+
+	fun setOnClickListener(listener: (ReportItem) -> Unit) {
+		this.onClickListener = listener
+	}
+
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+		ReportViewHolder(ItemReportBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+
+	override fun onBindViewHolder(holder: ReportViewHolder, position: Int) = holder.bind(items[position])
+
+	override fun getItemCount() = items.size
+
+
+	/*--------VIEW HOLDERS-------*/
+
+
+	inner class ReportViewHolder(private val binding: ItemReportBinding) : RecyclerView.ViewHolder(binding.root) {
+		fun bind(item: ReportItem) {
+			binding.apply {
+				cardView.setOnClickListener { onClickListener?.invoke(item) }
+				place.isVisible = item is CheckinReportItem && item.diaryEntry != null
+				when (item) {
+					is ProximityTracingReportItem -> {
+						reportType.setText(R.string.meldung_detail_exposed_list_card_title_encounters)
+						reportDetails.text = item.exposures.joinToString("\n") {
+							StringUtil.getReportDateString(it.exposedDate, true, false, root.context)
+						}
+					}
+					is CheckinReportItem -> {
+						reportType.setText(R.string.meldung_detail_exposed_list_card_title_checkin)
+						place.text = item.diaryEntry?.venueInfo?.title
+						reportDetails.text = item.exposure.getDetailsString(root.context)
+					}
+				}
+			}
+		}
+	}
+
+}
+
+/*--------ITEMS-------*/
+
+abstract class ReportItem {
+	companion object {
+		const val TYPE_PROXIMITY_TRACING_REPORT = 0
+		const val TYPE_CHECKIN_REPORT = 1
+
+	}
+
+	abstract val type: Int
+}
+
+class ProximityTracingReportItem(val exposures: List<ExposureDay>) : ReportItem() {
+	override val type = TYPE_PROXIMITY_TRACING_REPORT
+}
+
+class CheckinReportItem(val exposure: ExposureEvent, val diaryEntry: DiaryEntry?) : ReportItem() {
+	override val type = TYPE_CHECKIN_REPORT
+}
+
+
+
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
index 79f3b92cb..f2b416133 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
@@ -7,7 +7,6 @@
  *
  * SPDX-License-Identifier: MPL-2.0
  */
-
 package ch.admin.bag.dp3t.util;
 
 import android.content.Context;
@@ -75,8 +74,8 @@ public static void updateStatusView(View statusView, NotificationState state, lo
 			triangle.setVisibility(View.VISIBLE);
 			triangle.setImageResource(R.drawable.triangle_status_exposed);
 			infoContainer.setVisibility(View.VISIBLE);
-			infoText.setText(R.string.exposed_info_answer_questions_in_leitfaden);
-			infoTel.setText(R.string.exposed_info_swisscovid_leitfaden);
+			infoText.setVisibility(View.GONE);
+			infoTel.setVisibility(View.GONE);
 			infoSince.setVisibility(View.VISIBLE);
 			if (daySinceExposed == 0) {
 				String string = context.getString(R.string.date_today);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index d4b481a0d..fa25adf74 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -25,6 +25,8 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
+import org.dpppt.android.sdk.models.DayDate;
+
 import ch.admin.bag.dp3t.R;
 
 public class StringUtil {
@@ -135,6 +137,30 @@ public static String getDaysAgoString(long timeStamp, Context context) {
 		}
 	}
 
+	public static String getReportDateString(DayDate exposedDate, boolean withDiff, boolean withPrefix, Context context) {
+		long timestamp = exposedDate.getStartOfDayTimestamp();
+		if (!withDiff) {
+			return DateUtils.getFormattedDateWrittenMonth(timestamp);
+		}
+		String dateStr;
+		if (withPrefix) {
+			dateStr = context.getString(R.string.date_text_before_date).replace("{DATE}", DateUtils.getFormattedDate(timestamp));
+		} else {
+			dateStr = DateUtils.getFormattedDate(timestamp);
+		}
+		dateStr += " / ";
+		int daysDiff = DateUtils.getDaysDiff(timestamp);
+
+		if (daysDiff == 0) {
+			dateStr += context.getString(R.string.date_today);
+		} else if (daysDiff == 1) {
+			dateStr += context.getString(R.string.date_one_day_ago);
+		} else {
+			dateStr += context.getString(R.string.date_days_ago).replace("{COUNT}", String.valueOf(daysDiff));
+		}
+		return dateStr;
+	}
+
 	private static Date getStartOfDay() {
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml
index 87f3ebaab..4f714818e 100644
--- a/app/src/main/res/drawable/ic_check_circle.xml
+++ b/app/src/main/res/drawable/ic_check_circle.xml
@@ -1,19 +1,14 @@
-<!--
-  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
-  ~
-  ~ This Source Code Form is subject to the terms of the Mozilla Public
-  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
-  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
-  ~
-  ~ SPDX-License-Identifier: MPL-2.0
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/green_main"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+  <path
+      android:pathData="M15,15m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0"
+      android:fillColor="#5094BF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,15.51L12.479,21 23,10.49 21.49,9 12.479,18 8.49,14.01z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_circle_large.xml b/app/src/main/res/drawable/ic_check_circle_large.xml
deleted file mode 100644
index cf5bb8b06..000000000
--- a/app/src/main/res/drawable/ic_check_circle_large.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
-  ~
-  ~ This Source Code Form is subject to the terms of the Mozilla Public
-  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
-  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
-  ~
-  ~ SPDX-License-Identifier: MPL-2.0
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="30dp"
-    android:height="30dp"
-    android:viewportWidth="30"
-    android:viewportHeight="30">
-  <path
-      android:pathData="M15,15m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0"
-      android:fillColor="#009E89"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M7,15.51L12.479,21 23,10.49 21.49,9 12.479,18 8.49,14.01z"
-      android:fillColor="#FFF"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ill_no_message.xml b/app/src/main/res/drawable/ill_no_message.xml
index 6d2cddf12..9845b7b9c 100644
--- a/app/src/main/res/drawable/ill_no_message.xml
+++ b/app/src/main/res/drawable/ill_no_message.xml
@@ -1,38 +1,26 @@
-<!--
-  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
-  ~
-  ~ This Source Code Form is subject to the terms of the Mozilla Public
-  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
-  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
-  ~
-  ~ SPDX-License-Identifier: MPL-2.0
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="80dp"
-    android:height="110dp"
-    android:viewportWidth="80"
-    android:viewportHeight="110">
-  <path
-      android:pathData="M5.48,98.763a34.215,8.621 0,1 0,68.43 0a34.215,8.621 0,1 0,-68.43 0z"
-      android:strokeAlpha="0.037792288"
-      android:strokeWidth="5.0399999"
-      android:fillColor="#009e89"
+    android:width="91dp"
+    android:height="115dp"
+    android:viewportWidth="91"
+    android:viewportHeight="115">
+  <path
+      android:pathData="M3.48,103a42.139,9.368 0,1 0,84.278 0a42.139,9.368 0,1 0,-84.278 0z"
+      android:strokeAlpha="0.0385"
+      android:strokeWidth="5.04"
+      android:fillColor="#5094BF"
       android:fillType="nonZero"
-      android:strokeColor="#02BFA5"
+      android:strokeColor="#5094BF"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M53.306,25.315C53.232,25.232 53.156,25.149 53.077,25.066C53.679,24.384 54.304,23.683 54.298,22.805C54.292,21.739 53.344,20.92 52.989,19.913C52.508,18.543 53.176,17.071 53.451,15.644C53.882,13.301 53.245,10.887 51.711,9.06C51.433,8.731 51.11,8.414 50.694,8.283C50.063,8.085 49.393,8.36 48.735,8.441C46.565,8.709 44.593,6.844 42.413,7.011C42.268,7.016 42.126,7.047 41.993,7.104C41.711,7.238 41.558,7.536 41.384,7.791C40.707,8.787 39.57,9.285 38.44,9.79C38.297,9.832 38.162,9.894 38.038,9.974C37.698,10.132 37.364,10.296 37.048,10.483C34.912,11.745 35.223,13.51 36.482,14.6C36.232,15.824 34.984,16.901 35.198,18.16C35.367,19.146 36.397,19.817 36.595,20.798C36.71,21.368 36.529,21.911 36.277,22.45C33.887,23.002 31.187,24.019 30.976,25.812C30.609,28.932 29.506,37.551 29.506,37.551C29.506,37.551 28.226,44.454 33.081,41.185L33.019,41.369C32.143,44.013 31.546,46.741 31.236,49.508C31.187,49.92 31.087,50.244 30.908,50.35C30.843,50.389 30.971,50.45 31.252,50.526C31.221,50.641 31.186,50.757 31.156,50.874C30.622,52.892 30.281,54.956 30.138,57.039C30.001,58.883 29.746,60.717 29.374,62.529C28.224,68.304 29.374,75.712 29.374,75.712L31.885,87.506L32.314,89.522C32.597,89.835 32.944,90.084 33.331,90.254C33.499,90.977 33.616,91.71 33.68,92.449C33.687,92.531 33.693,92.615 33.698,92.698C33.392,92.736 33.118,92.906 32.949,93.163C32.054,94.418 33.074,95.423 29.626,97.934C28.734,98.583 28.305,99.173 28.195,99.677L28.195,99.677C28.078,100.216 28.332,100.653 28.788,100.948L28.788,100.948C28.865,100.998 28.946,101.043 29.03,101.083L29.03,101.083C29.072,101.103 29.114,101.122 29.154,101.14L29.154,101.14C29.199,101.159 29.244,101.176 29.29,101.191L29.298,101.191L29.431,101.234L29.441,101.234L29.585,101.271L29.597,101.271L29.732,101.3L29.75,101.3L29.898,101.325L29.914,101.325L30.049,101.341L30.075,101.341L30.226,101.352L30.246,101.352L30.381,101.352L30.412,101.352L30.564,101.352L30.584,101.352L30.719,101.344L30.755,101.344L30.908,101.329L30.925,101.329L31.061,101.31L31.099,101.303L31.25,101.275L31.264,101.275L31.402,101.241L31.44,101.231C31.49,101.217 31.539,101.204 31.589,101.188L31.598,101.188L31.736,101.139L31.774,101.125C31.822,101.107 31.87,101.088 31.917,101.067C34.218,100.062 38.947,97.426 38.947,97.426L38.947,97.341C38.947,97.33 38.947,97.318 38.947,97.305C38.947,97.293 38.947,97.284 38.947,97.273C38.947,97.262 38.947,97.247 38.947,97.232L38.947,97.193C38.947,97.176 38.947,97.158 38.947,97.14L38.947,97.099C38.947,97.079 38.947,97.059 38.947,97.038C38.947,97.016 38.947,96.967 38.947,96.928L38.947,96.928C38.934,95.846 38.821,93.321 38.322,93.419C38.151,93.453 38.035,93.692 37.917,93.967L37.858,93.855C37.371,92.917 36.666,91.309 36.598,89.736C36.991,89.452 37.355,89.13 37.685,88.775C37.685,88.775 37.428,87.695 37.209,86.556C37.019,85.569 36.859,84.538 36.917,84.129C37.042,83.25 35.384,76.47 35.384,76.47C35.384,76.47 35.555,74.976 35.899,72.906C36.568,68.876 37.884,62.651 39.848,60.89C39.894,60.85 39.939,60.81 39.986,60.775C39.986,60.775 41.392,61.025 42.542,68.936L42.876,72.459C42.972,73.434 43.139,74.402 43.375,75.354C43.602,76.291 43.845,77.86 43.695,79.984C43.549,82.061 43.487,84.505 43.461,86.221C43.441,87.515 43.441,88.395 43.441,88.395C43.679,88.596 43.936,88.773 44.208,88.924L44.208,90.076C44.205,90.321 44.109,90.555 43.939,90.731L43.939,90.731C43.757,90.935 43.626,91.177 43.553,91.439C43.33,91.84 43.141,92.492 43.063,93.539C42.813,96.929 42.68,96.552 42.68,96.552C42.533,96.919 42.436,97.303 42.39,97.695L42.39,97.695C42.383,97.768 42.379,97.842 42.376,97.917C42.376,97.928 42.376,97.94 42.376,97.951C42.376,97.985 42.376,98.019 42.376,98.052C42.376,98.069 42.376,98.086 42.376,98.102C42.376,98.119 42.378,98.144 42.383,98.177C42.383,98.199 42.386,98.222 42.391,98.244C42.391,98.26 42.391,98.276 42.399,98.291C42.406,98.306 42.41,98.351 42.418,98.381L42.428,98.42C42.436,98.451 42.445,98.481 42.455,98.511L42.465,98.538C42.475,98.565 42.486,98.592 42.499,98.618L42.51,98.641C42.525,98.671 42.541,98.701 42.56,98.73L42.575,98.753C42.594,98.782 42.614,98.809 42.636,98.835L42.652,98.854C42.676,98.882 42.702,98.908 42.73,98.933L42.738,98.94C42.766,98.965 42.796,98.988 42.827,99.009L42.841,99.019C42.874,99.04 42.909,99.06 42.945,99.078L42.967,99.09C43.007,99.108 43.049,99.124 43.091,99.138L43.113,99.144C43.159,99.16 43.207,99.173 43.255,99.183L43.255,99.183C43.305,99.193 43.357,99.202 43.412,99.207L43.435,99.207C43.489,99.207 43.547,99.215 43.607,99.215L43.64,99.215C43.702,99.215 43.765,99.215 43.83,99.215L43.861,99.215C43.931,99.215 44.005,99.203 44.081,99.192C46.765,98.818 48.044,98.569 47.916,97.057C47.838,96.15 47.622,94.831 47.463,93.926C47.382,93.467 47.233,93.022 47.021,92.606C47.027,92.536 47.034,92.463 47.04,92.388C47.086,91.766 47.083,91.019 46.894,90.529L46.952,89.43C47.616,89.261 48.217,88.902 48.679,88.398C48.679,88.398 48.698,87.583 48.754,86.502C48.839,84.834 49.004,82.532 49.318,81.618C49.83,80.111 49.318,74.838 49.318,74.838C49.318,74.838 47.4,65.798 49.193,61.906C50.772,58.473 50.758,55.038 49.239,51.696C49.269,51.672 49.297,51.646 49.321,51.616C49.321,51.616 48.937,51.367 49.071,48.477C49.168,46.273 48.522,43.995 48.21,43.044C48.698,43.252 49.198,43.432 49.707,43.581C52.641,44.454 52.897,41.185 52.897,41.185L53.536,36.287L54.294,28.995L54.294,28.995C54.502,28.422 54.78,26.99 53.306,25.315ZM40.311,20.478C40.311,20.559 40.303,20.64 40.294,20.72C40.27,20.979 40.215,21.235 40.13,21.482C40.218,21.148 40.271,20.807 40.289,20.463L40.311,20.478ZM48.039,38.302C48.084,38.385 48.128,38.465 48.164,38.551L47.841,38.387C47.96,37.795 48.154,37.22 48.417,36.676C48.735,36.043 48.996,35.383 49.198,34.705C49.189,35.489 49.227,36.273 49.312,37.052C49.573,39.055 48.039,38.302 48.039,38.302Z"
-      android:strokeWidth="1"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000">
+      android:pathData="M62.633,20.558c-0.093,-0.093 -0.189,-0.186 -0.287,-0.28 0.753,-0.765 1.534,-1.552 1.527,-2.538 -0.008,-1.196 -1.194,-2.116 -1.637,-3.246 -0.602,-1.538 0.234,-3.19 0.578,-4.791 0.539,-2.63 -0.258,-5.34 -2.175,-7.39 -0.348,-0.37 -0.752,-0.726 -1.271,-0.873 -0.79,-0.222 -1.627,0.087 -2.449,0.178 -2.712,0.3 -5.178,-1.793 -7.903,-1.606 -0.18,0.006 -0.358,0.041 -0.524,0.105 -0.353,0.15 -0.545,0.485 -0.762,0.771 -0.846,1.118 -2.267,1.677 -3.68,2.243 -0.178,0.047 -0.347,0.117 -0.503,0.207 -0.424,0.178 -0.842,0.362 -1.237,0.572 -2.67,1.416 -2.282,3.397 -0.708,4.62 -0.312,1.374 -1.872,2.583 -1.605,3.996 0.212,1.107 1.499,1.86 1.747,2.961 0.144,0.64 -0.083,1.25 -0.398,1.855 -2.987,0.62 -6.362,1.761 -6.626,3.774 -0.458,3.502 -1.837,13.176 -1.837,13.176s-1.6,7.748 4.469,4.078l-0.078,0.207c-1.095,2.968 -1.842,6.03 -2.23,9.136 -0.06,0.463 -0.185,0.826 -0.41,0.945 -0.08,0.043 0.08,0.112 0.431,0.197 -0.039,0.13 -0.083,0.26 -0.12,0.392 -0.667,2.265 -1.093,4.582 -1.273,6.919 -0.171,2.07 -0.49,4.128 -0.954,6.162 -1.439,6.482 0,14.798 0,14.798l3.138,13.238 0.536,2.263c0.355,0.35 0.788,0.63 1.272,0.821 0.21,0.811 0.356,1.635 0.436,2.464 0.008,0.093 0.016,0.186 0.022,0.28 -0.382,0.042 -0.724,0.233 -0.936,0.521 -1.118,1.409 0.156,2.537 -4.153,5.356 -1.116,0.728 -1.652,1.39 -1.79,1.956 -0.146,0.606 0.172,1.096 0.741,1.427 0.098,0.056 0.199,0.107 0.303,0.151l0.156,0.065c0.055,0.02 0.112,0.04 0.17,0.057h0.01l0.166,0.047h0.013l0.18,0.042h0.015l0.168,0.033h0.022l0.186,0.027h0.02l0.168,0.019h0.033l0.189,0.012L34.23,105.905l0.168,-0.008h0.045l0.19,-0.017h0.022l0.17,-0.022 0.047,-0.007 0.189,-0.032h0.019l0.171,-0.038 0.049,-0.011c0.062,-0.016 0.123,-0.031 0.185,-0.05h0.011l0.173,-0.054 0.047,-0.015c0.06,-0.021 0.12,-0.042 0.18,-0.066 2.876,-1.128 8.787,-4.086 8.787,-4.086v-0.095,-0.041 -0.036,-0.09 -0.106,-0.068 -0.123c-0.017,-1.215 -0.157,-4.05 -0.781,-3.939 -0.214,0.038 -0.359,0.306 -0.507,0.615l-0.073,-0.126c-0.609,-1.052 -1.49,-2.858 -1.576,-4.623 0.491,-0.319 0.947,-0.68 1.359,-1.079 0,0 -0.322,-1.212 -0.595,-2.49 -0.237,-1.109 -0.438,-2.266 -0.365,-2.724 0.156,-0.987 -1.917,-8.597 -1.917,-8.597s0.214,-1.677 0.645,-4.001c0.836,-4.523 2.481,-11.511 4.936,-13.487 0.058,-0.045 0.114,-0.09 0.172,-0.129 0,0 1.758,0.28 3.196,9.16l0.416,3.954c0.121,1.095 0.33,2.181 0.624,3.25 0.284,1.052 0.588,2.813 0.401,5.197 -0.182,2.331 -0.26,5.075 -0.293,7 -0.025,1.453 -0.025,2.44 -0.025,2.44 0.298,0.226 0.619,0.425 0.96,0.595v1.293c-0.004,0.274 -0.125,0.537 -0.338,0.735 -0.226,0.228 -0.391,0.5 -0.482,0.795 -0.279,0.45 -0.514,1.18 -0.613,2.356 -0.312,3.806 -0.478,3.382 -0.478,3.382 -0.184,0.412 -0.305,0.843 -0.362,1.283 -0.01,0.083 -0.014,0.165 -0.018,0.25v0.207c0,0.02 0.003,0.047 0.008,0.084 0,0.025 0.004,0.05 0.011,0.076 0,0.018 0,0.036 0.01,0.053 0.009,0.017 0.014,0.067 0.023,0.1l0.012,0.044c0.011,0.035 0.022,0.068 0.035,0.102l0.012,0.03c0.013,0.031 0.027,0.061 0.042,0.09l0.014,0.027c0.02,0.033 0.04,0.067 0.063,0.099l0.019,0.026c0.023,0.032 0.049,0.063 0.076,0.093l0.02,0.02c0.03,0.032 0.063,0.061 0.097,0.089l0.01,0.008c0.036,0.028 0.073,0.053 0.112,0.077l0.017,0.011c0.042,0.025 0.086,0.047 0.13,0.067l0.027,0.013c0.051,0.02 0.103,0.039 0.156,0.054l0.027,0.007c0.058,0.018 0.117,0.032 0.178,0.044 0.062,0.01 0.127,0.02 0.196,0.026h0.028c0.069,0 0.14,0.01 0.215,0.01L50.827,103.507c0.087,0 0.179,-0.014 0.274,-0.027 3.355,-0.419 4.954,-0.698 4.793,-2.395 -0.096,-1.019 -0.366,-2.499 -0.566,-3.515 -0.101,-0.516 -0.287,-1.015 -0.552,-1.482l0.023,-0.244c0.058,-0.699 0.055,-1.537 -0.182,-2.087l0.073,-1.234c0.83,-0.189 1.581,-0.592 2.159,-1.158 0,0 0.023,-0.914 0.094,-2.128 0.106,-1.872 0.312,-4.457 0.705,-5.482 0.64,-1.691 0,-7.61 0,-7.61s-2.398,-10.147 -0.156,-14.516c1.973,-3.853 1.956,-7.709 0.057,-11.46 0.038,-0.026 0.072,-0.056 0.102,-0.09 0,0 -0.48,-0.279 -0.312,-3.523 0.121,-2.474 -0.687,-5.031 -1.077,-6.099 0.61,0.235 1.235,0.436 1.872,0.604 3.667,0.98 3.987,-2.69 3.987,-2.69l0.799,-5.497 0.948,-8.186c0.259,-0.643 0.607,-2.25 -1.235,-4.13zM46.389,15.128c0,0.091 -0.01,0.182 -0.022,0.271 -0.03,0.292 -0.098,0.579 -0.204,0.856 0.11,-0.374 0.176,-0.757 0.198,-1.143l0.028,0.016zM56.049,35.135c0.056,0.094 0.11,0.183 0.156,0.28l-0.404,-0.185c0.15,-0.665 0.391,-1.31 0.72,-1.92 0.397,-0.71 0.724,-1.451 0.977,-2.213 -0.011,0.88 0.036,1.76 0.142,2.635 0.326,2.249 -1.591,1.403 -1.591,1.403z"
+      android:fillType="nonZero">
     <aapt:attr name="android:fillColor">
       <gradient 
-          android:startY="101.37819"
-          android:startX="41.43219"
-          android:endY="6.840881"
-          android:endX="41.43219"
+          android:startY="105.9347"
+          android:startX="47.790012"
+          android:endY="-0.17818318"
+          android:endX="47.790012"
           android:type="linear">
         <item android:offset="0" android:color="#3F808080"/>
         <item android:offset="0.54" android:color="#1E808080"/>
@@ -41,281 +29,155 @@
     </aapt:attr>
   </path>
   <path
-      android:pathData="M37.199,11.005C36.791,11.283 36.363,11.604 36.218,12.076C35.984,12.837 36.573,13.6 36.63,14.394C36.736,15.837 35.1,17.03 35.341,18.458C35.506,19.437 36.512,20.102 36.705,21.073C36.987,22.493 35.446,23.744 35.567,25.182C35.632,25.95 36.167,26.603 36.774,27.078C37.626,27.744 38.647,28.162 39.722,28.286C39.651,27.052 38.733,25.928 38.891,24.701C39,23.861 39.592,23.172 39.936,22.397C40.538,21.035 40.345,19.458 39.984,18.014C39.624,16.569 39.101,15.141 39.075,13.656C39.058,12.759 39.48,11.443 39.171,10.593C38.795,9.558 37.899,10.528 37.199,11.005Z"
-      android:strokeWidth="1"
+      android:pathData="M42.499,4.495c-0.51,0.312 -1.045,0.673 -1.226,1.202 -0.293,0.854 0.443,1.711 0.515,2.603 0.132,1.62 -1.913,2.958 -1.612,4.561 0.206,1.099 1.464,1.845 1.705,2.935 0.353,1.594 -1.574,2.998 -1.422,4.612 0.08,0.863 0.75,1.595 1.508,2.129 1.066,0.748 2.341,1.217 3.686,1.356 -0.09,-1.385 -1.237,-2.647 -1.039,-4.024 0.136,-0.943 0.877,-1.716 1.306,-2.587 0.753,-1.529 0.511,-3.298 0.06,-4.92 -0.45,-1.62 -1.104,-3.224 -1.137,-4.891 -0.02,-1.006 0.507,-2.484 0.12,-3.438 -0.47,-1.162 -1.589,-0.073 -2.464,0.462z"
       android:fillColor="#F78181"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M37.199,11.005C36.791,11.283 36.363,11.604 36.218,12.076C35.984,12.837 36.573,13.6 36.63,14.394C36.736,15.837 35.1,17.03 35.341,18.458C35.506,19.437 36.512,20.102 36.705,21.073C36.987,22.493 35.446,23.744 35.567,25.182C35.632,25.95 36.167,26.603 36.774,27.078C37.626,27.744 38.647,28.162 39.722,28.286C39.651,27.052 38.733,25.928 38.891,24.701C39,23.861 39.592,23.172 39.936,22.397C40.538,21.035 40.345,19.458 39.984,18.014C39.624,16.569 39.101,15.141 39.075,13.656C39.058,12.759 39.48,11.443 39.171,10.593C38.795,9.558 37.899,10.528 37.199,11.005Z"
-      android:strokeWidth="1"
+      android:pathData="M42.499,4.495c-0.51,0.312 -1.045,0.673 -1.226,1.202 -0.293,0.854 0.443,1.711 0.515,2.603 0.132,1.62 -1.913,2.958 -1.612,4.561 0.206,1.099 1.464,1.845 1.705,2.935 0.353,1.594 -1.574,2.998 -1.422,4.612 0.08,0.863 0.75,1.595 1.508,2.129 1.066,0.748 2.341,1.217 3.686,1.356 -0.09,-1.385 -1.237,-2.647 -1.039,-4.024 0.136,-0.943 0.877,-1.716 1.306,-2.587 0.753,-1.529 0.511,-3.298 0.06,-4.92 -0.45,-1.62 -1.104,-3.224 -1.137,-4.891 -0.02,-1.006 0.507,-2.484 0.12,-3.438 -0.47,-1.162 -1.589,-0.073 -2.464,0.462z"
       android:fillColor="#2F2E41"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M38.396,94.343L37.273,95.464C37.273,95.464 33.28,97.58 33.779,94.717C33.915,93.865 33.944,93 33.865,92.142C33.762,90.943 33.524,89.76 33.155,88.615L36.898,87.868C36.275,89.821 37.301,92.279 37.942,93.53C38.197,94.034 38.396,94.343 38.396,94.343Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFC1C7"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M46.899,92.078C46.87,92.462 46.823,92.844 46.756,93.222C46.756,93.222 43.637,95.339 43.387,92.973C43.225,91.432 43.592,90.732 43.869,90.438L43.869,90.438C44.035,90.263 44.128,90.031 44.131,89.79L44.131,86.997L46.876,87.868L46.751,90.234C46.941,90.726 46.943,91.461 46.899,92.078Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFC1C7"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M43.995,98.038l-1.404,1.258s-4.991,2.376 -4.367,-0.839c0.17,-0.955 0.206,-1.926 0.107,-2.89 -0.129,-1.345 -0.426,-2.673 -0.887,-3.958l4.679,-0.838c-0.78,2.191 0.504,4.95 1.304,6.354 0.32,0.567 0.568,0.913 0.568,0.913zM54.623,95.496c-0.035,0.43 -0.094,0.86 -0.178,1.284 0,0 -3.9,2.376 -4.211,-0.28 -0.203,-1.73 0.256,-2.515 0.602,-2.845 0.208,-0.197 0.325,-0.457 0.328,-0.728v-3.135l3.431,0.979 -0.156,2.655c0.237,0.552 0.24,1.377 0.184,2.07z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M38.396,94.343L37.273,95.464C37.273,95.464 33.28,97.58 33.779,94.717C33.915,93.865 33.944,93 33.865,92.142C34.738,92.017 35.775,92.973 35.775,92.973C37.238,95.033 37.632,94.253 37.942,93.53C38.197,94.034 38.396,94.343 38.396,94.343Z"
+      android:pathData="M43.995,98.038l-1.404,1.258s-4.991,2.376 -4.367,-0.839c0.17,-0.955 0.206,-1.926 0.107,-2.89 1.092,-0.14 2.388,0.934 2.388,0.934 1.828,2.311 2.321,1.436 2.708,0.624 0.32,0.567 0.568,0.913 0.568,0.913z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M35.775,93.222C35.775,93.222 34.028,91.604 33.155,92.849C32.281,94.094 33.28,95.09 29.911,97.58C26.541,100.071 29.911,101.689 32.157,100.693C34.403,99.697 39.02,97.082 39.02,97.082C39.02,97.082 39.02,92.973 38.396,93.098C37.772,93.222 37.897,96.211 35.775,93.222Z"
-      android:strokeWidth="1"
+      android:pathData="M40.72,96.78s-2.184,-1.817 -3.276,-0.419c-1.092,1.398 0.156,2.516 -4.056,5.31 -4.211,2.796 0,4.613 2.808,3.495 2.807,-1.118 8.579,-4.053 8.579,-4.053s0,-4.612 -0.78,-4.472c-0.78,0.14 -0.624,3.494 -3.276,0.14z"
       android:fillColor="#8189A6"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M46.899,92.078C46.87,92.462 46.823,92.844 46.756,93.222C46.756,93.222 43.637,95.339 43.387,92.973C43.225,91.432 43.592,90.732 43.869,90.438C44.09,90.273 44.384,90.242 44.635,90.359C45.134,90.137 45.683,90.507 46.132,90.981C46.442,91.306 46.701,91.676 46.899,92.078Z"
+      android:pathData="M54.623,95.496c-0.035,0.43 -0.094,0.86 -0.178,1.284 0,0 -3.9,2.376 -4.211,-0.28 -0.203,-1.73 0.256,-2.515 0.602,-2.845 0.276,-0.186 0.645,-0.22 0.958,-0.09 0.624,-0.248 1.31,0.167 1.871,0.7 0.388,0.364 0.71,0.78 0.958,1.23z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M44.635,90.608C44.635,90.608 43.262,89.861 43.013,93.222C42.763,96.584 42.638,96.211 42.638,96.211C42.638,96.211 41.391,99.199 44.011,98.826C46.631,98.452 47.879,98.203 47.755,96.709C47.68,95.809 47.468,94.5 47.312,93.603C47.162,92.717 46.754,91.894 46.137,91.238C45.684,90.755 45.134,90.386 44.635,90.608Z"
-      android:strokeWidth="1"
+      android:pathData="M51.794,93.845s-1.716,-0.838 -2.028,2.935c-0.312,3.774 -0.468,3.355 -0.468,3.355s-1.56,3.354 1.716,2.934c3.275,-0.419 4.835,-0.698 4.68,-2.375 -0.094,-1.01 -0.36,-2.48 -0.555,-3.486 -0.186,-0.995 -0.697,-1.92 -1.467,-2.655 -0.567,-0.543 -1.254,-0.956 -1.878,-0.708z"
       android:fillColor="#8189A6"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M49.127,74.67C49.127,74.67 49.626,79.899 49.127,81.394C48.824,82.3 48.659,84.584 48.577,86.238C48.522,87.309 48.503,88.117 48.503,88.117C46.132,90.608 43.387,88.117 43.387,88.117C43.387,88.117 43.387,87.246 43.407,85.961C43.433,84.259 43.494,81.834 43.637,79.775C43.783,77.668 43.546,76.113 43.324,75.183C43.094,74.239 42.933,73.28 42.839,72.313L42.514,68.819C41.391,60.975 40.018,60.726 40.018,60.726C39.973,60.761 39.929,60.799 39.884,60.839C37.967,62.582 36.681,68.759 36.029,72.755C35.693,74.811 35.53,76.29 35.53,76.29C35.53,76.29 37.152,83.014 37.027,83.885C36.97,84.29 37.127,85.313 37.311,86.292C37.525,87.421 37.776,88.492 37.776,88.492C34.656,91.854 32.535,89.239 32.535,89.239L32.116,87.24L29.665,75.543C29.665,75.543 28.542,68.196 29.665,62.469C30.029,60.671 30.279,58.853 30.413,57.024C30.555,54.959 30.889,52.913 31.412,50.91C31.564,50.318 31.733,49.729 31.918,49.146C31.918,49.146 36.604,48.333 41.016,48.333C44.326,48.333 47.48,48.79 48.39,50.391C48.599,50.76 48.79,51.129 48.961,51.499C50.541,54.887 50.583,58.367 49.014,61.846C47.255,65.705 49.127,74.67 49.127,74.67Z"
-      android:strokeWidth="1"
+      android:pathData="M57.409,75.956s0.624,5.87 0,7.547c-0.38,1.018 -0.585,3.58 -0.688,5.438 -0.069,1.202 -0.092,2.11 -0.092,2.11 -2.964,2.794 -6.395,0 -6.395,0s0,-0.98 0.025,-2.422c0.033,-1.91 0.11,-4.631 0.287,-6.943 0.182,-2.365 -0.114,-4.11 -0.392,-5.154 -0.286,-1.06 -0.488,-2.136 -0.605,-3.222l-0.407,-3.921c-1.404,-8.805 -3.12,-9.085 -3.12,-9.085 -0.056,0.04 -0.11,0.083 -0.166,0.128 -2.398,1.956 -4.004,8.89 -4.82,13.375 -0.42,2.307 -0.624,3.967 -0.624,3.967s2.028,7.547 1.872,8.526c-0.072,0.454 0.124,1.603 0.355,2.701 0.267,1.268 0.58,2.47 0.58,2.47 -3.899,3.773 -6.55,0.838 -6.55,0.838l-0.525,-2.244 -3.063,-13.13s-1.404,-8.245 0,-14.674c0.455,-2.018 0.767,-4.059 0.936,-6.112 0.177,-2.317 0.595,-4.614 1.248,-6.862 0.19,-0.665 0.401,-1.325 0.633,-1.98 0,0 5.857,-0.913 11.372,-0.913 4.137,0 8.08,0.513 9.217,2.31 0.262,0.414 0.5,0.829 0.714,1.244 1.975,3.803 2.028,7.71 0.066,11.614 -2.198,4.331 0.142,14.394 0.142,14.394z"
       android:fillColor="#2F2E41"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M38.645,29.472C38.645,29.472 32.032,22.748 37.023,23.246C38.155,23.359 38.921,23.157 39.429,22.779C40.008,22.348 40.251,21.688 40.319,21C40.456,19.63 39.893,18.136 39.893,18.136C39.893,18.136 46.631,12.782 45.259,19.506C45.108,20.189 45.02,20.884 44.997,21.584C44.974,23.011 45.445,23.557 46.105,23.781C47.218,24.161 48.873,23.629 49.626,24.86C50.999,27.106 38.645,29.472 38.645,29.472Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFC1C7"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M44.307,25.223s-8.267,-7.547 -2.028,-6.988c1.415,0.127 2.372,-0.1 3.007,-0.524 0.724,-0.483 1.028,-1.224 1.112,-1.997 0.172,-1.537 -0.531,-3.215 -0.531,-3.215s8.422,-6.01 6.707,1.538c-0.189,0.767 -0.298,1.548 -0.328,2.332 -0.028,1.602 0.56,2.216 1.385,2.467 1.391,0.426 3.46,-0.17 4.402,1.21 1.716,2.522 -13.726,5.177 -13.726,5.177z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M45.259,19.51C45.108,20.194 45.02,20.889 44.997,21.589C44.817,21.651 44.634,21.703 44.449,21.744C43.028,22.064 41.537,21.794 40.319,20.997C40.456,19.628 39.893,18.133 39.893,18.133C39.893,18.133 46.631,12.787 45.259,19.51Z"
+      android:pathData="M52.574,14.042c-0.189,0.767 -0.298,1.548 -0.328,2.333 -0.224,0.07 -0.453,0.128 -0.685,0.175 -1.776,0.359 -3.64,0.056 -5.163,-0.839 0.172,-1.537 -0.531,-3.214 -0.531,-3.214s8.422,-6.002 6.707,1.545z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M48.628,16.273C48.628,19.23 46.226,21.627 43.262,21.627C40.299,21.627 37.897,19.23 37.897,16.273C37.897,16.174 37.897,16.074 37.905,15.976C38.071,13.084 40.51,10.848 43.412,10.929C46.313,11.009 48.624,13.377 48.628,16.273L48.628,16.273Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFC1C7"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M56.785,10.409c0,3.319 -3.003,6.01 -6.707,6.01 -3.704,0 -6.707,-2.691 -6.707,-6.01 0,-0.112 0,-0.224 0.01,-0.334 0.208,-3.246 3.257,-5.755 6.883,-5.665 3.627,0.09 6.516,2.748 6.521,5.999z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M38.645,29.472C38.645,29.472 32.032,22.748 37.023,23.246C38.155,23.359 38.921,23.157 39.429,22.779C38.463,24.378 37.376,27.253 42.264,26.981C46.738,26.732 46.661,24.954 46.105,23.786C47.218,24.166 48.873,23.634 49.626,24.865C50.999,27.106 38.645,29.472 38.645,29.472Z"
+      android:pathData="M44.307,25.223s-8.267,-7.547 -2.028,-6.988c1.415,0.127 2.372,-0.1 3.007,-0.524 -1.207,1.795 -2.566,5.022 3.544,4.717 5.592,-0.28 5.497,-2.275 4.801,-3.586 1.391,0.426 3.46,-0.17 4.402,1.21 1.716,2.516 -13.726,5.171 -13.726,5.171z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M49.127,52.008C47.992,53.481 33.517,51.55 31.401,50.909C31.553,50.316 31.722,49.728 31.907,49.145C31.907,49.145 36.593,48.332 41.005,48.332C44.314,48.332 47.469,48.789 48.378,50.39C48.588,50.758 48.779,51.128 48.95,51.498C49.03,51.944 49.127,52.008 49.127,52.008Z"
+      android:pathData="M57.409,50.52c-1.42,1.653 -19.513,-0.515 -22.158,-1.234 0.19,-0.666 0.401,-1.326 0.633,-1.98 0,0 5.857,-0.913 11.372,-0.913 4.137,0 8.08,0.513 9.217,2.31 0.262,0.414 0.5,0.828 0.714,1.244 0.1,0.5 0.222,0.573 0.222,0.573z"
       android:strokeAlpha="0.1"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M40.018,22.125C40.018,22.125 31.595,22.81 31.221,26.047C30.863,29.143 29.786,37.689 29.786,37.689C29.786,37.689 28.538,44.538 33.28,41.3L33.219,41.482C32.363,44.106 31.78,46.811 31.478,49.554C31.429,49.963 31.333,50.284 31.157,50.39C30.533,50.763 47.878,53.254 49.126,51.635C49.126,51.635 48.752,51.386 48.876,48.522C49.001,45.658 47.878,42.67 47.878,42.67C47.878,42.67 46.88,39.682 48.252,36.818C49.625,33.954 49.126,33.082 49.126,33.082L53.868,29.472C53.868,29.472 54.892,27.72 53.019,25.558C51.884,24.266 50.28,23.478 48.562,23.367L45.293,23.13C45.293,23.13 48.876,26.978 42.138,27.351C35.4,27.725 40.018,22.125 40.018,22.125Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M46.023,16.977s-10.529,0.769 -10.997,4.403c-0.448,3.474 -1.794,13.067 -1.794,13.067s-1.56,7.687 4.368,4.053l-0.077,0.204c-1.069,2.946 -1.798,5.982 -2.176,9.061 -0.06,0.458 -0.18,0.82 -0.4,0.938 -0.78,0.42 20.9,3.214 22.46,1.397 0,0 -0.468,-0.28 -0.312,-3.494 0.156,-3.214 -1.247,-6.568 -1.247,-6.568s-1.248,-3.355 0.468,-6.569c1.715,-3.214 1.091,-4.193 1.091,-4.193l5.928,-4.053s1.28,-1.966 -1.061,-4.392c-1.42,-1.45 -3.424,-2.335 -5.572,-2.46l-4.086,-0.266s4.48,4.319 -3.943,4.738c-8.423,0.42 -2.65,-5.866 -2.65,-5.866z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M34.403,28.974C34.403,28.974 34.652,30.966 34.153,31.588C33.654,32.211 33.529,35.075 34.153,36.818"
+      android:pathData="M39.003,24.664s0.312,2.236 -0.311,2.935c-0.624,0.699 -0.78,3.913 0,5.87"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M39.884,60.838C37.967,62.581 36.681,68.758 36.029,72.754C35.12,67.192 38.899,57.985 38.899,57.985L39.884,60.838Z"
-      android:strokeAlpha="0.1"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M37.772,88.491C34.652,91.853 32.531,89.238 32.531,89.238L32.112,87.238C33.291,87.85 35.284,88.324 37.308,86.291C37.521,87.42 37.772,88.491 37.772,88.491Z"
+      android:pathData="M45.856,60.43c-2.398,1.957 -4.004,8.89 -4.82,13.375 -1.136,-6.243 3.587,-16.577 3.587,-16.577l1.233,3.202zM43.215,91.47c-3.9,3.773 -6.551,0.838 -6.551,0.838l-0.524,-2.245c1.474,0.687 3.965,1.22 6.495,-1.063 0.266,1.267 0.58,2.47 0.58,2.47zM56.721,88.941c-0.069,1.202 -0.092,2.11 -0.092,2.11 -2.964,2.794 -6.395,0 -6.395,0s0,-0.98 0.025,-2.422c1.287,0.733 3.6,1.54 6.462,0.312z"
       android:strokeAlpha="0.1"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M48.577,86.238C48.522,87.309 48.503,88.117 48.503,88.117C46.132,90.608 43.387,88.117 43.387,88.117C43.387,88.117 43.387,87.246 43.407,85.961C44.437,86.613 46.287,87.332 48.577,86.238Z"
-      android:strokeAlpha="0.1"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M38.451,35.91L38.451,31.878A1.743,1.743 0,0 1,40.194 30.135L40.194,30.135A1.743,1.743 0,0 1,41.937 31.878L41.937,35.91A1.743,1.743 0,0 1,40.194 37.653L40.194,37.653A1.743,1.743 0,0 1,38.451 35.91z"
-      android:strokeWidth="1"
+      android:pathData="M44.318,32.961L44.318,27.477A1.957,1.957 89.994,0 1,46.275 25.52L46.275,25.52A1.957,1.957 89.994,0 1,48.231 27.477L48.231,32.961A1.957,1.957 89.994,0 1,46.275 34.918L46.275,34.918A1.957,1.957 89.994,0 1,44.318 32.961z"
       android:fillColor="#CDD0DB"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M38.451,35.91L38.451,31.878A1.743,1.743 0,0 1,40.194 30.135L40.194,30.135A1.743,1.743 0,0 1,41.937 31.878L41.937,35.91A1.743,1.743 0,0 1,40.194 37.653L40.194,37.653A1.743,1.743 0,0 1,38.451 35.91z"
+      android:pathData="M44.318,32.961L44.318,27.477A1.957,1.957 89.994,0 1,46.275 25.52L46.275,25.52A1.957,1.957 89.994,0 1,48.231 27.477L48.231,32.961A1.957,1.957 89.994,0 1,46.275 34.918L46.275,34.918A1.957,1.957 89.994,0 1,44.318 32.961z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M38.451,36.955L38.451,30.397A0.48,0.48 0,0 1,38.931 29.917L41.457,29.917A0.48,0.48 0,0 1,41.937 30.397L41.937,36.955A0.48,0.48 0,0 1,41.457 37.435L38.931,37.435A0.48,0.48 0,0 1,38.451 36.955z"
-      android:strokeWidth="1"
+      android:pathData="M44.318,34.165L44.318,25.727A0.48,0.48 0,0 1,44.798 25.247L47.751,25.247A0.48,0.48 0,0 1,48.231 25.727L48.231,34.165A0.48,0.48 0,0 1,47.751 34.645L44.798,34.645A0.48,0.48 0,0 1,44.318 34.165z"
       android:fillColor="#CDD0DB"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M40.132,32.627a1,1 0,1 0,0 -2a1,1 0,1 0,0 2z"
-      android:strokeWidth="1"
+      android:pathData="M46.205,27.386m0,1a1,1 0,1 1,0 -2a1,1 0,1 1,0 2"
       android:fillColor="#9DA7C0"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M31.415,38.728C31.643,38.051 32.159,37.508 32.826,37.246C33.252,37.069 33.773,36.748 34.036,36.162C34.528,35.075 35.401,33.954 37.647,34.701C39.893,35.448 37.023,35.946 37.023,35.946C37.023,35.946 42.139,35.199 40.143,36.693C38.146,38.187 35.651,39.059 35.651,39.059L34.422,40.358C33.673,41.151 32.373,41.147 31.676,40.303C31.364,39.922 31.2,39.409 31.415,38.728Z"
+      android:pathData="M35.27,35.613c0.284,-0.76 0.93,-1.369 1.762,-1.663 0.533,-0.199 1.184,-0.56 1.513,-1.218 0.614,-1.22 1.706,-2.477 4.514,-1.639 2.808,0.839 -0.78,1.398 -0.78,1.398s6.395,-0.839 3.9,0.838c-2.496,1.677 -5.616,2.656 -5.616,2.656l-1.536,1.457c-0.936,0.89 -2.561,0.886 -3.432,-0.061 -0.39,-0.428 -0.595,-1.004 -0.326,-1.768z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M31.291,38.479C31.519,37.802 32.035,37.259 32.701,36.997C33.128,36.82 33.648,36.499 33.911,35.913C34.403,34.826 35.276,33.705 37.522,34.452C39.768,35.199 36.898,35.697 36.898,35.697C36.898,35.697 42.015,34.95 40.018,36.444C38.021,37.938 35.526,38.81 35.526,38.81L34.297,40.109C33.548,40.902 32.248,40.898 31.551,40.054C31.24,39.673 31.075,39.16 31.291,38.479Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFC1C7"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M35.113,35.333c0.285,-0.76 0.93,-1.368 1.763,-1.663 0.533,-0.198 1.184,-0.559 1.513,-1.217 0.614,-1.22 1.706,-2.478 4.514,-1.64 2.808,0.84 -0.78,1.398 -0.78,1.398s6.395,-0.838 3.9,0.839c-2.496,1.677 -5.616,2.655 -5.616,2.655l-1.536,1.458c-0.936,0.89 -2.561,0.886 -3.432,-0.062 -0.39,-0.427 -0.595,-1.003 -0.326,-1.768z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M48.878,41.051L48.004,43.168L46.881,42.347L43.761,40.055L41.64,38.686C38.645,36.444 41.64,36.071 41.64,36.071C40.517,35.573 41.64,35.075 41.64,35.075C45.633,34.203 44.885,37.44 44.885,37.44L47.414,38.749L48.254,39.184L48.878,41.051Z"
+      android:pathData="M57.097,38.22l-1.092,2.377 -1.404,-0.921 -3.9,-2.573 -2.65,-1.538c-3.744,-2.515 0,-2.935 0,-2.935 -1.405,-0.559 0,-1.118 0,-1.118 4.99,-0.978 4.055,2.656 4.055,2.656l3.161,1.469 1.05,0.487 0.78,2.097z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M49.127,40.802L48.254,42.919L47.131,42.098L44.011,39.806L41.89,38.437C38.895,36.195 41.89,35.822 41.89,35.822C40.767,35.324 41.89,34.826 41.89,34.826C45.883,33.954 45.134,37.191 45.134,37.191L47.663,38.5L48.503,38.935L49.127,40.802Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFC1C7"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M57.409,37.941l-1.092,2.376 -1.404,-0.92 -3.9,-2.574 -2.65,-1.537c-3.744,-2.516 0,-2.935 0,-2.935 -1.405,-0.56 0,-1.118 0,-1.118 4.99,-0.978 4.055,2.655 4.055,2.655l3.161,1.47 1.05,0.487 0.78,2.096z"
+      android:fillColor="#B2858C"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M49.127,40.802L48.254,42.919L47.131,42.098C48.143,42.135 49.338,41.646 47.658,38.5L48.498,38.935L49.127,40.802Z"
+      android:pathData="M57.409,37.941l-1.092,2.376 -1.404,-0.92c1.265,0.04 2.76,-0.508 0.66,-4.04l1.05,0.488 0.786,2.096z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M53.744,28.226L53.985,29.206L53.245,36.444L52.621,41.3C52.621,41.3 52.371,44.538 49.501,43.666C46.631,42.794 46.382,41.923 46.382,41.923C46.382,41.923 50.5,43.293 47.879,38.437C47.879,38.437 49.377,39.184 49.127,37.191C48.878,35.199 49.127,31.713 49.127,31.713L53.744,28.226Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M63.18,23.826l0.301,1.1 -0.925,8.124 -0.78,5.45s-0.312,3.634 -3.9,2.656c-3.587,-0.979 -3.899,-1.957 -3.899,-1.957s5.148,1.538 1.872,-3.913c0,0 1.872,0.838 1.56,-1.398 -0.312,-2.236 0,-6.15 0,-6.15l5.771,-3.912z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M48.628,16.273C48.628,18.774 46.893,20.942 44.449,21.495C44.269,20.977 44.142,20.462 44.273,19.938C44.523,18.92 45.703,18.178 45.572,17.139C45.559,17.021 45.516,16.909 45.447,16.812C45.184,16.466 44.647,16.638 44.221,16.724C43.118,16.943 41.91,16.2 41.61,15.118C40.633,16.077 39.199,16.408 37.899,15.976C38.065,13.084 40.504,10.848 43.405,10.929C46.306,11.009 48.618,13.377 48.622,16.273L48.628,16.273Z"
+      android:pathData="M56.785,10.409c0,2.807 -2.168,5.24 -5.224,5.861 -0.224,-0.581 -0.383,-1.16 -0.22,-1.748 0.312,-1.142 1.788,-1.975 1.624,-3.142 -0.016,-0.132 -0.07,-0.258 -0.156,-0.366 -0.329,-0.389 -1,-0.196 -1.533,-0.1 -1.379,0.247 -2.889,-0.588 -3.263,-1.802 -1.222,1.076 -3.014,1.448 -4.639,0.963 0.207,-3.246 3.256,-5.755 6.883,-5.665 3.626,0.09 6.515,2.748 6.52,5.999h0.008z"
       android:strokeAlpha="0.05"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
+      android:fillColor="#000"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.05"/>
   <path
-      android:pathData="M41.741,14.869C42.039,15.951 43.249,16.694 44.35,16.474C44.777,16.389 45.314,16.217 45.577,16.563C45.644,16.659 45.685,16.771 45.696,16.888C45.828,17.929 44.651,18.67 44.398,19.689C44.137,20.737 44.897,21.749 45.065,22.816C45.154,23.4 45.065,23.995 45.065,24.586C45.065,25.176 45.205,25.811 45.644,26.204C46.084,26.598 46.892,26.605 47.188,26.092C48.592,26.833 48.032,29.128 49.097,30.302C49.685,30.95 50.652,31.105 51.524,31.023C51.728,31.02 51.927,30.956 52.094,30.839C52.239,30.697 52.336,30.514 52.374,30.316C52.594,29.485 52.556,28.606 52.265,27.797C52.126,27.41 51.925,27.019 51.977,26.611C52.017,26.293 52.208,26.015 52.41,25.765C53.08,24.936 53.995,24.134 53.989,23.068C53.982,22.002 53.057,21.2 52.711,20.204C52.24,18.843 52.893,17.385 53.161,15.971C53.586,13.649 52.965,11.258 51.464,9.434C51.192,9.107 50.877,8.792 50.466,8.663C49.851,8.466 49.196,8.74 48.553,8.82C46.432,9.085 44.509,7.235 42.38,7.4C42.239,7.406 42.1,7.437 41.971,7.494C41.695,7.627 41.547,7.922 41.376,8.176C40.436,9.577 38.589,9.976 37.142,10.846C32.92,13.382 38.508,17.974 41.741,14.869Z"
-      android:strokeWidth="1"
+      android:pathData="M48.177,8.832c0.372,1.215 1.884,2.049 3.261,1.802 0.534,-0.095 1.204,-0.288 1.533,0.1 0.084,0.108 0.135,0.234 0.149,0.365 0.165,1.168 -1.306,2 -1.623,3.143 -0.326,1.177 0.624,2.313 0.835,3.511 0.11,0.655 0,1.324 0,1.986 0,0.662 0.175,1.375 0.724,1.817 0.549,0.442 1.56,0.45 1.929,-0.126 1.755,0.832 1.054,3.407 2.386,4.725 0.735,0.727 1.944,0.902 3.034,0.81 0.256,-0.004 0.504,-0.076 0.713,-0.207 0.18,-0.16 0.302,-0.364 0.35,-0.587 0.275,-0.933 0.227,-1.92 -0.136,-2.828 -0.175,-0.434 -0.426,-0.873 -0.36,-1.33 0.05,-0.358 0.288,-0.67 0.54,-0.95 0.838,-0.931 1.982,-1.831 1.974,-3.028 -0.008,-1.196 -1.165,-2.096 -1.597,-3.214 -0.588,-1.528 0.227,-3.164 0.563,-4.752 0.53,-2.606 -0.245,-5.29 -2.122,-7.337 -0.34,-0.367 -0.734,-0.72 -1.247,-0.866 -0.77,-0.22 -1.588,0.087 -2.392,0.177 -2.651,0.297 -5.055,-1.78 -7.716,-1.594 -0.176,0.006 -0.35,0.042 -0.511,0.105 -0.345,0.15 -0.53,0.48 -0.744,0.766 -1.175,1.572 -3.483,2.021 -5.293,2.996 -5.277,2.847 1.708,8.002 5.75,4.516z"
       android:fillColor="#2F2E41"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:fillType="nonZero"/>
   <path
-      android:pathData="M32.157,100.195C30.698,100.841 28.768,100.386 28.514,99.306C28.209,100.733 30.491,101.433 32.157,100.693C34.403,99.697 39.02,97.082 39.02,97.082C39.02,97.082 39.02,96.889 39.014,96.584C38.879,96.664 34.369,99.208 32.157,100.195Z"
+      android:pathData="M36.196,104.607c-1.824,0.725 -4.237,0.214 -4.553,-0.998 -0.382,1.602 2.47,2.387 4.553,1.557 2.807,-1.118 8.579,-4.053 8.579,-4.053s0,-0.217 -0.008,-0.56c-0.169,0.09 -5.806,2.946 -8.571,4.054zM55.685,100.612c-0.179,1.258 -1.736,1.522 -4.671,1.898 -1.493,0.192 -1.98,-0.402 -2.07,-1.104 -0.098,0.899 0.187,1.904 2.07,1.663 3.275,-0.419 4.835,-0.698 4.68,-2.375 -0.004,-0.027 -0.007,-0.055 -0.009,-0.082z"
       android:strokeAlpha="0.3"
-      android:strokeWidth="1"
-      android:fillColor="#FFFFFF"
+      android:fillColor="#FFF"
       android:fillType="nonZero"
-      android:strokeColor="#00000000"
       android:fillAlpha="0.3"/>
   <path
-      android:pathData="M47.748,96.637C47.605,97.757 46.359,97.993 44.011,98.327C42.817,98.498 42.428,97.969 42.355,97.344C42.277,98.144 42.505,99.04 44.011,98.826C46.631,98.452 47.879,98.203 47.755,96.709C47.752,96.685 47.75,96.66 47.748,96.637Z"
-      android:strokeAlpha="0.3"
-      android:strokeWidth="1"
-      android:fillColor="#FFFFFF"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"
-      android:fillAlpha="0.3"/>
-  <path
-      android:pathData="M63.186,98.883C63.186,98.883 61.38,89.745 65.099,83.488C66.677,80.872 67.361,77.816 67.05,74.78C66.889,73.339 66.597,71.916 66.176,70.529"
+      android:pathData="M74.983,103.134s-2.259,-10.257 2.391,-17.28c1.972,-2.936 2.827,-6.366 2.438,-9.775 -0.2,-1.617 -0.566,-3.214 -1.092,-4.771"
       android:strokeWidth="1.056"
       android:fillColor="#00000000"
       android:strokeColor="#535461"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="M68.501,66.569C68.401,67.659 66.13,70.638 66.13,70.638C66.13,70.638 64.443,67.296 64.544,66.206C64.595,65.489 65.03,64.857 65.681,64.552C66.333,64.247 67.098,64.317 67.683,64.735C68.268,65.153 68.58,65.854 68.5,66.568L68.501,66.569Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M71.215,72.907C70.537,73.767 67.01,75.038 67.01,75.038C67.01,75.038 67.414,71.318 68.092,70.458C68.518,69.866 69.235,69.556 69.959,69.649C70.683,69.743 71.298,70.225 71.559,70.905C71.821,71.586 71.687,72.354 71.211,72.907L71.215,72.907Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M70.122,83.212C69.101,83.612 65.414,82.933 65.414,82.933C65.414,82.933 67.645,79.924 68.666,79.523C69.329,79.251 70.088,79.356 70.651,79.798C71.215,80.241 71.496,80.952 71.386,81.659C71.276,82.366 70.793,82.96 70.122,83.212L70.122,83.212Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M67.535,90.822C66.597,91.39 62.847,91.341 62.847,91.341C62.847,91.341 64.538,88.002 65.475,87.433C66.082,87.051 66.848,87.026 67.479,87.367C68.11,87.708 68.508,88.362 68.519,89.078C68.531,89.794 68.155,90.461 67.535,90.822L67.535,90.822Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M62.837,74.868C63.551,75.7 67.128,76.82 67.128,76.82C67.128,76.82 66.567,73.12 65.854,72.289C65.136,71.476 63.897,71.39 63.072,72.095C62.247,72.8 62.142,74.035 62.837,74.868L62.837,74.868Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M59.925,83.808C60.854,84.388 64.605,84.389 64.605,84.389C64.605,84.389 62.961,81.029 62.031,80.446C61.429,80.059 60.665,80.026 60.031,80.358C59.397,80.691 58.991,81.338 58.97,82.053C58.948,82.767 59.313,83.438 59.926,83.808L59.925,83.808Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M58.287,92.884C59.106,93.612 62.802,94.247 62.802,94.247C62.802,94.247 61.75,90.655 60.93,89.927C60.405,89.427 59.649,89.253 58.958,89.472C58.266,89.691 57.749,90.269 57.61,90.98C57.47,91.69 57.73,92.42 58.287,92.884L58.287,92.884Z"
-      android:strokeWidth="1"
-      android:fillColor="#009e89"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+      android:pathData="M81.626,66.863c-0.125,1.223 -2.963,4.568 -2.963,4.568s-2.11,-3.752 -1.983,-4.976c0.064,-0.804 0.608,-1.514 1.422,-1.856 0.814,-0.343 1.77,-0.264 2.502,0.206 0.73,0.47 1.121,1.256 1.02,2.057l0.002,0.001zM85.019,73.977c-0.847,0.966 -5.257,2.393 -5.257,2.393s0.506,-4.176 1.353,-5.142c0.532,-0.664 1.429,-1.012 2.334,-0.907 0.905,0.105 1.673,0.646 2,1.41 0.327,0.763 0.16,1.626 -0.435,2.246h0.005zM83.652,85.544c-1.276,0.45 -5.885,-0.313 -5.885,-0.313s2.79,-3.377 4.065,-3.827c0.829,-0.306 1.777,-0.188 2.482,0.308 0.705,0.497 1.056,1.295 0.919,2.09 -0.138,0.793 -0.742,1.459 -1.58,1.742zM80.419,94.086c-1.173,0.637 -5.86,0.583 -5.86,0.583s2.113,-3.749 3.285,-4.388c0.759,-0.428 1.717,-0.456 2.505,-0.073 0.789,0.383 1.286,1.117 1.3,1.92 0.015,0.804 -0.456,1.552 -1.23,1.958zM74.546,76.178c0.892,0.934 5.364,2.192 5.364,2.192s-0.702,-4.154 -1.592,-5.086c-0.898,-0.913 -2.447,-1.01 -3.478,-0.219 -1.031,0.792 -1.162,2.178 -0.294,3.113zM70.906,86.213c1.162,0.651 5.85,0.653 5.85,0.653s-2.055,-3.772 -3.217,-4.426c-0.753,-0.435 -1.708,-0.472 -2.5,-0.099 -0.793,0.373 -1.3,1.1 -1.327,1.902 -0.027,0.802 0.43,1.554 1.195,1.97h-0.001zM68.86,96.4c1.023,0.818 5.643,1.53 5.643,1.53s-1.315,-4.032 -2.34,-4.85c-0.656,-0.56 -1.602,-0.756 -2.466,-0.51 -0.864,0.247 -1.51,0.896 -1.685,1.693 -0.174,0.798 0.15,1.617 0.847,2.137z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
 </vector>
diff --git a/app/src/main/res/layout/card_what_to_do_checkin_report.xml b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
new file mode 100644
index 000000000..d62e31676
--- /dev/null
+++ b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<androidx.cardview.widget.CardView
+		style="@style/NextStep.Card"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<TextView
+				style="@style/NextStep.Text.Bold.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:text="@string/meldung_detail_exposed_list_card_subtitle" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:text="@string/meldung_detail_exposed_list_card_title_checkin" />
+
+			<TextView
+				android:id="@+id/report_details"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:lineSpacingExtra="@dimen/spacing_very_small"
+				tools:text="20.10.2020 / vor 2 Tagen \n22.10.2020 / vor 4 Tagen" />
+
+			<TextView
+				android:id="@+id/place"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				tools:text="Reuss Ubique" />
+
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/separator_height"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:background="@color/grey_light" />
+
+			<TextView
+				style="@style/NextStep.Text.Bold.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:text="@string/checkin_report_heading" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:text="@string/checkin_report_title1" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:text="@string/checkin_report_subtitle1" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:text="@string/checkin_report_title2" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:text="@string/checkin_report_subtitle2" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:text="@string/checkin_report_title3" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				android:text="@string/checkin_report_subtitle3" />
+
+			<LinearLayout
+				android:id="@+id/testlocations_link"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:background="?selectableItemBackground"
+				android:orientation="horizontal"
+				android:padding="@dimen/spacing_small"
+				app:layout_constrainedWidth="true"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintHorizontal_bias="0"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/info_box_container_layout">
+
+				<ImageView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:src="@drawable/ic_link_internal" />
+
+				<TextView
+					style="@style/NextStep.Text.Bold.Blue"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="@dimen/spacing_medium"
+					android:text="@string/test_location_popup_title" />
+			</LinearLayout>
+
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_marginTop="@dimen/spacing_larger"
+				android:background="@color/grey_light" />
+
+			<TextView
+				android:id="@+id/delete_report"
+				style="@style/NextStep.Button.Transparent"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginVertical="10dp"
+				android:gravity="center"
+				android:paddingTop="15dp"
+				android:paddingBottom="10dp"
+				android:text="@string/delete_reports_button"
+				android:textAllCaps="true"
+				android:textColor="@color/blue_main"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/card_encounters_image" />
+
+		</LinearLayout>
+
+	</androidx.cardview.widget.CardView>
+
+	<Button
+		android:id="@+id/faq_button"
+		style="@style/NextStep.Button.Outlined"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_medium"
+		android:layout_marginVertical="@dimen/spacing_huger"
+		android:drawableEnd="@drawable/ic_launch_blue"
+		android:paddingStart="@dimen/padding_start_icon_button"
+		android:text="@string/faq_button_title" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_what_to_do_save_yourself.xml b/app/src/main/res/layout/card_what_to_do_save_yourself.xml
index 7fddb1f8b..ecf624165 100644
--- a/app/src/main/res/layout/card_what_to_do_save_yourself.xml
+++ b/app/src/main/res/layout/card_what_to_do_save_yourself.xml
@@ -31,7 +31,7 @@
 
 			<TextView
 				android:id="@+id/card_encounters_subtitle"
-				style="@style/NextStep.Text.SubTitle"
+				style="@style/NextStep.Text.SubTitle.Blue"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_medium_large"
@@ -92,10 +92,10 @@
 						android:layout_height="@dimen/icon_size"
 						android:layout_marginRight="@dimen/spacing_small"
 						android:src="@drawable/ic_launch"
-						android:tint="@color/green_main" />
+						android:tint="@color/blue_main" />
 
 					<TextView
-						style="@style/NextStep.Text.Bold.Green"
+						style="@style/NextStep.Text.Bold.Blue"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:text="@string/no_meldungen_box_link" />
diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml
index 28427dd8f..4d122918a 100644
--- a/app/src/main/res/layout/fragment_reports.xml
+++ b/app/src/main/res/layout/fragment_reports.xml
@@ -66,6 +66,15 @@
 				android:visibility="gone"
 				tools:visibility="visible" />
 
+			<include
+				android:id="@+id/reports_checkin_report"
+				layout="@layout/card_what_to_do_checkin_report"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:visibility="gone"
+				tools:visibility="visible" />
+
 			<include
 				android:id="@+id/reports_infected"
 				layout="@layout/card_what_to_do_self_isolation"
diff --git a/app/src/main/res/layout/fragment_reports_header_no_reports.xml b/app/src/main/res/layout/fragment_reports_header_no_reports.xml
index b252c9782..e99c2445b 100644
--- a/app/src/main/res/layout/fragment_reports_header_no_reports.xml
+++ b/app/src/main/res/layout/fragment_reports_header_no_reports.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
   ~
   ~ This Source Code Form is subject to the terms of the Mozilla Public
@@ -11,7 +10,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@color/status_green_bg">
+	android:background="@color/status_blue_bg">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -25,16 +24,15 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:src="@drawable/ic_check_circle_large" />
+			android:src="@drawable/ic_check_circle" />
 
 		<TextView
-			style="@style/NextStep.Text.Title"
+			style="@style/NextStep.Text.Title.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
 			android:layout_marginTop="@dimen/spacing_small"
-			android:text="@string/meldungen_no_meldungen_title"
-			android:textColor="@color/green_main" />
+			android:text="@string/meldungen_no_meldungen_title" />
 
 		<TextView
 			style="@style/NextStep.Text"
diff --git a/app/src/main/res/layout/fragment_reports_header_possible_infection.xml b/app/src/main/res/layout/fragment_reports_header_possible_infection.xml
index 1148e4bea..3385bfba3 100644
--- a/app/src/main/res/layout/fragment_reports_header_possible_infection.xml
+++ b/app/src/main/res/layout/fragment_reports_header_possible_infection.xml
@@ -22,14 +22,14 @@
 		android:padding="@dimen/spacing_medium">
 
 		<ImageView
-			android:id="@+id/fragment_reports_header_info"
+			android:id="@+id/header_info"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
 			android:src="@drawable/ic_info_border" />
 
 		<LinearLayout
-			android:id="@+id/fragment_reports_header_image"
+			android:id="@+id/header_image"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
@@ -59,7 +59,7 @@
 		</LinearLayout>
 
 		<TextView
-			android:id="@+id/fragment_reports_header_title"
+			android:id="@+id/header_title"
 			style="@style/NextStep.Text.Title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -69,7 +69,19 @@
 			android:textColor="@color/white" />
 
 		<TextView
-			android:id="@+id/fragment_reports_header_subtitle"
+			android:id="@+id/header_slogan"
+			style="@style/NextStep.Text.White"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_small"
+			android:layout_marginHorizontal="@dimen/spacing_very_large"
+			android:gravity="center_horizontal"
+			android:text="@string/meldungen_meldung_text"
+			android:visibility="gone"
+			tools:visibility="visible" />
+
+		<TextView
+			android:id="@+id/header_subtitle"
 			style="@style/NextStep.Text.Dark"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -78,7 +90,7 @@
 			android:text="@string/meldung_detail_exposed_subtitle_last_encounter" />
 
 		<TextView
-			android:id="@+id/fragment_reports_header_date"
+			android:id="@+id/header_date"
 			style="@style/NextStep.Text.Bold"
 			android:layout_width="wrap_content"
 			android:layout_height="@dimen/header_reports_exposure_day_height"
@@ -87,20 +99,20 @@
 			tools:text="am 30.04.2020 / Today" />
 
 		<ScrollView
-			android:id="@+id/fragment_reports_dates_scroll_view"
+			android:id="@+id/dates_scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="0dp"
 			android:visibility="gone">
 
 			<LinearLayout
-				android:id="@+id/fragment_reports_dates_container"
+				android:id="@+id/dates_container"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="vertical" />
 		</ScrollView>
 
 		<TextView
-			android:id="@+id/fragment_reports_header_show_all_button"
+			android:id="@+id/header_show_all_button"
 			style="@style/NextStep.Text.Bold"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -114,7 +126,7 @@
 	</LinearLayout>
 
 	<Button
-		android:id="@+id/fragment_reports_header_continue_button"
+		android:id="@+id/header_continue_button"
 		style="@style/NextStep.Button.WhiteBlue"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_reports_overview.xml b/app/src/main/res/layout/fragment_reports_overview.xml
new file mode 100644
index 000000000..7d4b509fb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_reports_overview.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/grey_light"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/reports_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:layout_constraintTop_toTopOf="parent"
+		app:navigationContentDescription="@string/android_accessibility_back_button"
+		app:navigationIcon="@drawable/ic_arrow_back"
+		app:title="@string/reports_title_homescreen" />
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/reports_recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/reports_toolbar" />
+
+	<include
+		android:id="@+id/splash_report"
+		layout="@layout/fragment_reports_header_possible_infection"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/reports_toolbar" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_report.xml b/app/src/main/res/layout/item_report.xml
new file mode 100644
index 000000000..3f4ccc561
--- /dev/null
+++ b/app/src/main/res/layout/item_report.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<androidx.cardview.widget.CardView
+		android:id="@+id/card_view"
+		style="@style/NextStep.Card"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:foreground="?selectableItemBackground"
+		android:layout_marginHorizontal="@dimen/spacing_medium_large"
+		android:layout_marginVertical="@dimen/spacing_small"
+		android:clickable="true"
+		android:focusable="true">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<TextView
+				style="@style/NextStep.Text.Bold.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:text="@string/meldung_detail_exposed_list_card_subtitle" />
+
+			<TextView
+				android:id="@+id/report_type"
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				tools:text="@string/meldung_detail_exposed_list_card_title_checkin" />
+
+			<TextView
+				android:id="@+id/report_details"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:lineSpacingExtra="@dimen/spacing_very_small"
+				tools:text="20.10.2020 / vor 2 Tagen \n22.10.2020 / vor 4 Tagen" />
+
+			<TextView
+				android:id="@+id/place"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_very_small"
+				tools:text="Reuss Ubique" />
+
+			<LinearLayout
+				android:id="@+id/what_to_do_button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:orientation="horizontal"
+				android:padding="@dimen/spacing_small">
+
+				<ImageView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:src="@drawable/ic_link_internal" />
+
+				<TextView
+					style="@style/NextStep.Text.Bold.Blue"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="@dimen/spacing_medium"
+					android:text="@string/meldung_detail_exposed_list_card_whattodo_button" />
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</androidx.cardview.widget.CardView>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index e601cd482..abfc01c37 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1761,4 +1761,17 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b450e4de..e44a21510 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1842,4 +1842,18 @@ Mögliche Einsatzorte:
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code">"Contact Tracing QR Code"</string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed">"Nach einem positiven Test sind die Check-ins automatisch deaktiviert. Sie können nach Beendigung Ihrer Isolation wieder aktiviert werden."</string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle">"Vergeben Sie einen Titel, der den Ort 
+oder Ihren Anlass näher beschreibt."</string>
+    <string name="checkin_report_heading">"Was können Sie tun?"</string>
+    <string name="checkin_report_title1">"Kontakte schützen"</string>
+    <string name="checkin_report_title2">"Auf Symptome achten"</string>
+    <string name="checkin_report_title3">"Testen lassen"</string>
+    <string name="checkin_report_subtitle1">"Sie könnten bereits ansteckend sein, ohne es zu merken. Beachten Sie die geltenden Hygiene- und Schutz-massnahmen und schützen Sie Ihre Familie, Ihre Freunde und Ihr Umfeld."</string>
+    <string name="checkin_report_subtitle2">"Überwachen Sie Ihren Gesundheitszustand und lassen Sie sich beim Auftreten von Symptomen sofort testen."</string>
+    <string name="checkin_report_subtitle3">"Auch wenn keine Symptome auftreten, ist ein Corona-Test sinnvoll und empfohlen (ab dem 5. Tag nach dem angezeigten Kontaktdatum)."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 27d8278f0..cbeb45c1f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1752,4 +1752,17 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index af47a773b..265c0f043 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1787,4 +1787,17 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 8792222ff..14dbac5c1 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1757,4 +1757,17 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5e735e9ec..fd5612a4d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1795,4 +1795,17 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 186647b3e..14c9353d9 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1762,4 +1762,17 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index cf82487ee..e5ccc4cac 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1757,4 +1757,17 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 35520080d..28fda471e 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1762,4 +1762,17 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 96c75b988..28696389f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1757,4 +1757,17 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 947e3be98..cbf131a52 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1737,4 +1737,17 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ef33c6fa3..2cbec156c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1739,4 +1739,17 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77e420c6a..2176c162e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1784,4 +1784,17 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Anzeigename für User QR Codes -->
     <string name="venue_type_contact_tracing_qr_code"></string>
+
+    <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
+    <string name="checkin_ended_text_detailed"></string>
+
+    <!-- Check-Ins: QR-Code erstellen subtitel -->
+    <string name="checkins_create_qr_code_subtitle"></string>
+    <string name="checkin_report_heading"></string>
+    <string name="checkin_report_title1"></string>
+    <string name="checkin_report_title2"></string>
+    <string name="checkin_report_title3"></string>
+    <string name="checkin_report_subtitle1"></string>
+    <string name="checkin_report_subtitle2"></string>
+    <string name="checkin_report_subtitle3"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 543671f7b..a5fe72b13 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -48,6 +48,10 @@
 		<item name="android:textColor">@color/dark_main</item>
 	</style>
 
+	<style name="NextStep.Text.White">
+		<item name="android:textColor">@color/white</item>
+	</style>
+
 	<style name="NextStep.Text.Small">
 		<item name="android:textSize">@dimen/text_size_small</item>
 	</style>

From 6869454e226e7e92c5128f68d393d1c0e6caf4da Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 20 May 2021 17:01:24 +0200
Subject: [PATCH 059/207] Fix timezone issues

---
 .../ch/admin/bag/dp3t/debug/DebugFragment.java  |  9 +++------
 .../dp3t/checkin/CrowdNotifierViewModel.java    |  2 +-
 .../dp3t/extensions/ExposureEventExtensions.kt  |  3 +--
 .../admin/bag/dp3t/reports/ReportsFragment.kt   | 14 ++++++++++++--
 .../bag/dp3t/reports/ReportsRecyclerAdapter.kt  |  9 ++++++++-
 .../java/ch/admin/bag/dp3t/util/DateUtils.java  | 17 +++++++++++++++--
 .../java/ch/admin/bag/dp3t/util/StringUtil.java | 17 ++---------------
 7 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index 511709766..e99157a80 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -37,7 +37,6 @@
 import org.dpppt.android.sdk.models.ExposureDay;
 
 import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
 import ch.admin.bag.dp3t.checkin.models.SwissCovidAssociatedData;
 import ch.admin.bag.dp3t.debug.model.DebugAppState;
 import ch.admin.bag.dp3t.networking.CertificatePinning;
@@ -50,7 +49,6 @@ public class DebugFragment extends Fragment {
 	public static final boolean EXISTS = true;
 
 	private TracingViewModel tracingViewModel;
-	private CrowdNotifierViewModel crowdNotifierViewModel;
 
 	public static void startDebugFragment(FragmentManager parentFragmentManager) {
 		parentFragmentManager.beginTransaction()
@@ -72,7 +70,6 @@ public DebugFragment() {
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
-		crowdNotifierViewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
 	}
 
 	@Override
@@ -163,8 +160,8 @@ private void showInputDialog(String title, String defaultInput, InputDialogCallb
 	}
 
 	private void showExposureDaysInputDialogs() {
-		showInputDialog(getString(R.string.number_of_exposure_days), "0", (tracingExposures) ->
-				showInputDialog("How many Checkin Exposures should be simulated?", "1", (checkinExposures) ->
+		showInputDialog(getString(R.string.number_of_exposure_days), "2", (tracingExposures) ->
+				showInputDialog("How many Checkin Exposures should be simulated?", "2", (checkinExposures) ->
 						exposeMyself(tracingExposures, checkinExposures)));
 	}
 
@@ -182,7 +179,7 @@ private void exposeMyself(int numberOfDays, int numberOfCheckins) {
 		ExposureStorage exposureStorage = ExposureStorage.getInstance(requireContext());
 		exposureStorage.clear();
 		for (int i = 0; i < numberOfCheckins; i++) {
-			long exposureStart = new DayDate().subtractDays(i).getStartOfDay(TimeZone.getDefault()) + 1000L * 60 * 60 * 12;
+			long exposureStart = new DayDate().subtractDays(i).getStartOfDay(TimeZone.getDefault());
 			long exposureEnd = exposureStart + 1000L * 60 * 60;
 			exposureStorage.addEntry(new ExposureEvent(-i, exposureStart, exposureEnd, "debug message",
 					SwissCovidAssociatedData.getDefaultInstance().toByteArray()));
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 9728b55e1..feca7f8db 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -187,7 +187,7 @@ public ExposureEvent getLatestExposure() {
 	public long getDaysSinceExposure() {
 		ExposureEvent latestExposure = getLatestExposure();
 		if (latestExposure == null) return -1;
-		return DateUtils.getDaysDiff(getLatestExposure().getEndTime());
+		return Math.max(0, DateUtils.getDaysDiff(getLatestExposure().getEndTime()));
 	}
 
 	public long getSelectedReminderDelay() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
index d8030afd6..8f0dd2706 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
@@ -3,10 +3,9 @@ package ch.admin.bag.dp3t.extensions
 import android.content.Context
 import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.model.ExposureEvent
-import org.dpppt.android.sdk.models.DayDate
 
 fun ExposureEvent.getDetailsString(context: Context): String {
-	return "${StringUtil.getReportDateString(DayDate(endTime), true, false, context)}\n${
+	return "${StringUtil.getReportDateString(endTime, true, false, context)}\n${
 		StringUtil.getHourMinuteTimeString(startTime, ":")
 	} - ${StringUtil.getHourMinuteTimeString(endTime, ":")}"
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 05e403a3a..0e22730d5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -133,14 +133,24 @@ class ReportsFragment : Fragment() {
 				} else {
 					if (exposureDays.isNotEmpty()) {
 						headerDate.text =
-							StringUtil.getReportDateString(exposureDays[exposureDays.size - 1].exposedDate, true, true, context)
+							StringUtil.getReportDateString(
+								exposureDays[exposureDays.size - 1].exposedDate.getStartOfDay(TimeZone.getDefault()),
+								true,
+								true,
+								context
+							)
 					}
 					datesContainer.removeAllViews()
 					for (exposureDay in exposureDays) {
 						val itemView = LayoutInflater.from(context)
 							.inflate(R.layout.item_reports_exposure_day, datesContainer, false)
 						val itemDate = itemView.findViewById<TextView>(R.id.exposure_day_textview)
-						itemDate.text = StringUtil.getReportDateString(exposureDay.exposedDate, false, true, context)
+						itemDate.text = StringUtil.getReportDateString(
+							exposureDay.exposedDate.getStartOfDay(TimeZone.getDefault()),
+							false,
+							true,
+							context
+						)
 						datesContainer.addView(itemView, 0)
 					}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt
index af4aa584b..c9fcd7c98 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsRecyclerAdapter.kt
@@ -11,6 +11,8 @@ import ch.admin.bag.dp3t.extensions.getDetailsString
 import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.model.ExposureEvent
 import org.dpppt.android.sdk.models.ExposureDay
+import java.util.*
+import kotlin.collections.ArrayList
 
 class ReportsRecyclerAdapter : RecyclerView.Adapter<ReportsRecyclerAdapter.ReportViewHolder>() {
 
@@ -47,7 +49,12 @@ class ReportsRecyclerAdapter : RecyclerView.Adapter<ReportsRecyclerAdapter.Repor
 					is ProximityTracingReportItem -> {
 						reportType.setText(R.string.meldung_detail_exposed_list_card_title_encounters)
 						reportDetails.text = item.exposures.joinToString("\n") {
-							StringUtil.getReportDateString(it.exposedDate, true, false, root.context)
+							StringUtil.getReportDateString(
+								it.exposedDate.getStartOfDay(TimeZone.getDefault()),
+								true,
+								false,
+								root.context
+							)
 						}
 					}
 					is CheckinReportItem -> {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java b/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java
index 0ad6c8dc0..afd7ab5b6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java
@@ -12,6 +12,7 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -24,15 +25,27 @@ public class DateUtils {
 	private static final DateFormat DATE_TIME_FORMAT = SimpleDateFormat.getDateTimeInstance();
 	private static final DateFormat DATE_FORMAT = SimpleDateFormat.getDateInstance();
 
-	public static int getDaysDiff(long date) {
+	public static int getDaysDiff(long timestamp) {
 		try {
-			return (int) TimeUnit.DAYS.convert(System.currentTimeMillis() - date, TimeUnit.MILLISECONDS);
+			return (int) TimeUnit.DAYS.convert(
+					getLocalStartOfDayTimestamp(System.currentTimeMillis()) - getLocalStartOfDayTimestamp(timestamp),
+					TimeUnit.MILLISECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 			return 0;
 		}
 	}
 
+	private static long getLocalStartOfDayTimestamp(long timestamp) {
+		Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
+		calendar.setTime(new Date(timestamp));
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.set(Calendar.MINUTE, 0);
+		calendar.set(Calendar.SECOND, 0);
+		calendar.set(Calendar.MILLISECOND, 0);
+		return calendar.getTime().getTime();
+	}
+
 	public static int getDaysDiffUntil(DayDate from, DayDate to) {
 		try {
 			return (int) TimeUnit.DAYS.convert(to.getStartOfDayTimestamp() - from.getStartOfDayTimestamp(), TimeUnit.MILLISECONDS);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index fa25adf74..89d2946c5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -25,8 +25,6 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import org.dpppt.android.sdk.models.DayDate;
-
 import ch.admin.bag.dp3t.R;
 
 public class StringUtil {
@@ -123,7 +121,7 @@ public static String getCheckOutDateString(Context context, long checkInTime, lo
 	}
 
 	public static String getDaysAgoString(long timeStamp, Context context) {
-		final long diff = getStartOfDay().getTime() - timeStamp;
+		final long diff = DateUtils.getDaysDiff(timeStamp);
 		if (diff < 0) {
 			return context.getResources().getString(R.string.date_today);
 		} else {
@@ -137,8 +135,7 @@ public static String getDaysAgoString(long timeStamp, Context context) {
 		}
 	}
 
-	public static String getReportDateString(DayDate exposedDate, boolean withDiff, boolean withPrefix, Context context) {
-		long timestamp = exposedDate.getStartOfDayTimestamp();
+	public static String getReportDateString(long timestamp, boolean withDiff, boolean withPrefix, Context context) {
 		if (!withDiff) {
 			return DateUtils.getFormattedDateWrittenMonth(timestamp);
 		}
@@ -161,14 +158,4 @@ public static String getReportDateString(DayDate exposedDate, boolean withDiff,
 		return dateStr;
 	}
 
-	private static Date getStartOfDay() {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.set(Calendar.HOUR_OF_DAY, 0);
-		calendar.set(Calendar.MINUTE, 0);
-		calendar.set(Calendar.SECOND, 0);
-		calendar.set(Calendar.MILLISECOND, 0);
-		return calendar.getTime();
-	}
-
 }

From 14283b3ad972b1811053e8cc65c8bdf46eed8ac5 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 20 May 2021 17:10:19 +0200
Subject: [PATCH 060/207] Code cleanups

---
 app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java | 4 ++--
 app/src/main/java/ch/admin/bag/dp3t/MainActivity.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index e99157a80..e577e3ec3 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -160,8 +160,8 @@ private void showInputDialog(String title, String defaultInput, InputDialogCallb
 	}
 
 	private void showExposureDaysInputDialogs() {
-		showInputDialog(getString(R.string.number_of_exposure_days), "2", (tracingExposures) ->
-				showInputDialog("How many Checkin Exposures should be simulated?", "2", (checkinExposures) ->
+		showInputDialog(getString(R.string.number_of_exposure_days), "2", tracingExposures ->
+				showInputDialog("How many Checkin Exposures should be simulated?", "2", checkinExposures ->
 						exposeMyself(tracingExposures, checkinExposures)));
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 6d2c7ab38..3f88dafea 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -191,7 +191,7 @@ private void handleCustomIntents() {
 			showReportsFragment();
 		} else if (ACTION_EXPOSED_GOTO_REPORTS.equals(intentAction)) {
 			if (tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed() ||
-					crowdNotifierViewModel.getExposures().getValue().size() > 0) {
+					!crowdNotifierViewModel.getExposures().getValue().isEmpty()) {
 				showReportsFragment();
 			}
 		} else if (ACTION_ACTIVATE_TRACING.equals(intentAction)) {

From 7378841d6752bc28ca97cb5656b73f36eb74cea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 24 May 2021 09:35:31 +0200
Subject: [PATCH 061/207] log all notifications if devHistory is enabled

---
 app/build.gradle                              |  2 +-
 .../admin/bag/dp3t/networking/ConfigWorker.kt | 12 ++++++++++
 .../admin/bag/dp3t/util/NotificationUtil.java | 22 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dbc046255..719adb4d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,7 +157,7 @@ sonarqube {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
-	def dp3t_sdk_version = '2.2.0'
+	def dp3t_sdk_version = '2.2.1'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
 	teschtImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
index 8ffc7bd2f..1498da606 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
@@ -19,11 +19,15 @@ import androidx.core.app.NotificationCompat
 import androidx.work.*
 import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.debug.DebugFragment
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.NotificationUtil
 import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.backend.SignatureException
+import org.dpppt.android.sdk.internal.history.HistoryDatabase
+import org.dpppt.android.sdk.internal.history.HistoryEntry
+import org.dpppt.android.sdk.internal.history.HistoryEntryType
 import org.dpppt.android.sdk.internal.logger.Logger
 import java.io.IOException
 import java.util.concurrent.TimeUnit
@@ -109,6 +113,14 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine
 				.setAutoCancel(true)
 				.build()
 			val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+			if(DebugFragment.EXISTS){
+				HistoryDatabase.getInstance(context).addEntry(
+					HistoryEntry(
+						HistoryEntryType.NOTIFICATION, "Showing update required notification", false,
+						System.currentTimeMillis()
+					)
+				)
+			}
 			notificationManager.notify(NotificationUtil.NOTIFICATION_ID_UPDATE, notification)
 		}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
index 016918e7f..571970fbc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
@@ -20,8 +20,13 @@
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.TaskStackBuilder;
 
+import org.dpppt.android.sdk.internal.history.HistoryDatabase;
+import org.dpppt.android.sdk.internal.history.HistoryEntry;
+import org.dpppt.android.sdk.internal.history.HistoryEntryType;
+
 import ch.admin.bag.dp3t.MainActivity;
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.debug.DebugFragment;
 
 public class NotificationUtil {
 
@@ -59,6 +64,14 @@ public static void generateContactNotification(Context context) {
 
 		NotificationManager notificationManager =
 				(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+		if(DebugFragment.EXISTS){
+			HistoryDatabase.getInstance(context).addEntry(
+					new HistoryEntry(
+							HistoryEntryType.NOTIFICATION, "Showing new message notification", false,
+							System.currentTimeMillis()
+					)
+			);
+		}
 		notificationManager.notify(NOTIFICATION_ID_CONTACT, notification);
 
 		NotificationRepeatWorker.startWorker(context);
@@ -73,7 +86,14 @@ public static void showReminderNotification(Context context) {
 		String message = context.getString(R.string.tracing_reminder_notification_subtitle);
 
 		Notification notification = createNotification(title, message, pendingIntent, CHANNEL_ID_REMINDER, context);
-		NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+		NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);if(DebugFragment.EXISTS){
+			HistoryDatabase.getInstance(context).addEntry(
+					new HistoryEntry(
+							HistoryEntryType.SYNC, "Showing activate tracing notification", false,
+							System.currentTimeMillis()
+					)
+			);
+		}
 		notificationManager.notify(message.hashCode(), notification);
 	}
 

From 8761aee9223f9be6be24fd897a9fe741bf0741fb Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 10:31:06 +0200
Subject: [PATCH 062/207] Code cleanups

---
 .../admin/bag/dp3t/extensions/ExposureEventExtensions.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
index 8f0dd2706..f551464f0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/ExposureEventExtensions.kt
@@ -5,8 +5,8 @@ import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.model.ExposureEvent
 
 fun ExposureEvent.getDetailsString(context: Context): String {
-	return "${StringUtil.getReportDateString(endTime, true, false, context)}\n${
-		StringUtil.getHourMinuteTimeString(startTime, ":")
-	} - ${StringUtil.getHourMinuteTimeString(endTime, ":")}"
-
+	val dateString = StringUtil.getReportDateString(endTime, true, false, context)
+	val startTimeString = StringUtil.getHourMinuteTimeString(startTime, ":")
+	val endTimeString = StringUtil.getHourMinuteTimeString(endTime, ":")
+	return "$dateString\n$startTimeString - $endTimeString"
 }
\ No newline at end of file

From 91bb7b2c60a777b229fc9fb58a69a127c393d995 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 17:05:39 +0200
Subject: [PATCH 063/207] Fix some Report Screen issues

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  3 +-
 .../dp3t/reports/ReportsOverviewFragment.kt   | 36 ++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index c69feb93b..dafc4dc8e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -256,7 +256,8 @@ private void showContactsFragment() {
 	private void showReportsFragment() {
 		int checkinReports = crowdNotifierViewModel.getExposures().getValue().size();
 		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
-		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1)) {
+		boolean isReportedPositive = tracingViewModel.getTracingStatusInterface().isReportedAsInfected();
+		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1) && !isReportedPositive) {
 			FragmentExtensionsKt.showFragment(this, ReportsOverviewFragment.newInstance(), true);
 		} else {
 			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), true);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt
index c0bb1be7f..b91adc596 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsOverviewFragment.kt
@@ -15,6 +15,8 @@ import ch.admin.bag.dp3t.databinding.FragmentReportsOverviewBinding
 import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import org.crowdnotifier.android.sdk.model.ExposureEvent
+import org.dpppt.android.sdk.models.ExposureDay
 
 class ReportsOverviewFragment : Fragment() {
 
@@ -29,25 +31,21 @@ class ReportsOverviewFragment : Fragment() {
 	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
 
 	private lateinit var binding: FragmentReportsOverviewBinding
+	private val recyclerAdapter = ReportsRecyclerAdapter()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentReportsOverviewBinding.inflate(inflater)
 		return binding.apply {
 			reportsToolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
-			val adapter = ReportsRecyclerAdapter()
-			reportsRecyclerView.adapter = adapter
-			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { checkinExposures ->
+			reportsRecyclerView.adapter = recyclerAdapter
 
-				adapter.setItems(checkinExposures.map {
-					CheckinReportItem(it, diaryStorage.getDiaryEntryWithId(it.id))
-				}.toMutableList<ReportItem>().apply {
-					val tracingExposureDays = tracingViewModel.tracingStatusInterface.exposureDays.reversed()
-					if (tracingExposureDays.isNotEmpty()) {
-						add(0, ProximityTracingReportItem(tracingExposureDays))
-					}
-				})
+			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) {
+				updateRecyclerList(it, tracingViewModel.tracingStatusInterface.exposureDays)
 			}
-			adapter.setOnClickListener {
+			tracingViewModel.tracingStatusLiveData.observe(viewLifecycleOwner) { tracingStatus ->
+				updateRecyclerList(crowdNotifierViewModel.exposures.value ?: listOf(), tracingStatus.exposureDays)
+			}
+			recyclerAdapter.setOnClickListener {
 				showFragment(ReportsFragment.newInstance(it))
 			}
 			if (secureStorage.isReportsHeaderAnimationPending) {
@@ -56,6 +54,20 @@ class ReportsOverviewFragment : Fragment() {
 		}.root
 	}
 
+	private fun updateRecyclerList(checkinExposures: List<ExposureEvent>, tracingExposureDays: List<ExposureDay>) {
+		val items = checkinExposures.map {
+			CheckinReportItem(it, diaryStorage.getDiaryEntryWithId(it.id))
+		}.toMutableList<ReportItem>().apply {
+			if (tracingExposureDays.isNotEmpty()) {
+				add(0, ProximityTracingReportItem(tracingExposureDays))
+			}
+		}
+		if (items.isEmpty()) {
+			parentFragmentManager.popBackStack()
+		}
+		recyclerAdapter.setItems(items)
+	}
+
 	private fun setupSplashScreen() {
 		binding.splashReport.apply {
 			root.isVisible = true

From 6ca8e85e2299b47d08f51b46e774ff14471c200f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 24 May 2021 19:49:22 +0200
Subject: [PATCH 064/207] update to latest sdk version

---
 app/build.gradle                                                | 2 +-
 .../main/java/ch/admin/bag/dp3t/contacts/HistoryViewHolder.java | 2 ++
 app/src/main/res/values/strings_untranslated.xml                | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 719adb4d4..b3ec44195 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,7 +157,7 @@ sonarqube {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
-	def dp3t_sdk_version = '2.2.1'
+	def dp3t_sdk_version = '2.3.0-dev-8'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
 	teschtImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
diff --git a/app/src/main/java/ch/admin/bag/dp3t/contacts/HistoryViewHolder.java b/app/src/main/java/ch/admin/bag/dp3t/contacts/HistoryViewHolder.java
index 54e3c1be3..14683dcb7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/contacts/HistoryViewHolder.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/contacts/HistoryViewHolder.java
@@ -52,6 +52,8 @@ private static int getLabelForType(HistoryEntryType type) {
 				return R.string.synchronizations_view_sync_via_fake_request;
 			case NEXT_DAY_KEY_UPLOAD_REQUEST:
 				return R.string.synchronizations_view_sync_via_next_day_key_upload;
+			case NOTIFICATION:
+				return R.string.synchronizations_view_notification;
 			default:
 				throw new IllegalArgumentException("Unknown HistoryEntryType: " + type);
 		}
diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml
index 72ac552a3..d9e7079a2 100644
--- a/app/src/main/res/values/strings_untranslated.xml
+++ b/app/src/main/res/values/strings_untranslated.xml
@@ -15,4 +15,5 @@
 	<string name="synchronizations_view_sync_via_scheduled" translatable="false">"  • Scheduled"</string>
 	<string name="synchronizations_view_sync_via_fake_request" translatable="false">"  • Fake Report"</string>
 	<string name="synchronizations_view_sync_via_next_day_key_upload" translatable="false">"  • Pending Upload"</string>
+	<string name="synchronizations_view_notification" translatable="false">"  • Notification"</string>
 </resources>
\ No newline at end of file

From abaa25eade37ea066a9b00e15fe22587e2310c89 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 6 May 2021 09:23:32 +0200
Subject: [PATCH 065/207] Implemented Checkin Sharing Fragment

---
 app/build.gradle                              | 14 ++--
 .../networking/UserUploadRepository.kt        | 31 ++++++++
 .../checkin/networking/UserUploadService.kt   | 12 +++
 .../bag/dp3t/extensions/FragmentExtensions.kt | 22 +++++-
 .../admin/bag/dp3t/inform/CheckinAdapter.kt   | 50 ++++++++++++
 .../admin/bag/dp3t/inform/InformActivity.java |  6 +-
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 45 +++++++++++
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  | 63 +++++++++++++++
 .../dp3t/inform/models/NetworkStatusModels.kt | 18 +++++
 .../inform/models/SelectableCheckinItem.kt    |  5 ++
 .../bag/dp3t/util/UserUploadInfoExtensions.kt | 16 ++++
 app/src/main/proto/App.proto                  | 14 ++++
 .../res/layout/fragment_share_checkins.xml    | 79 +++++++++++++++++++
 .../res/layout/item_selectable_checkin.xml    | 55 +++++++++++++
 14 files changed, 416 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/models/SelectableCheckinItem.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt
 create mode 100644 app/src/main/res/layout/fragment_share_checkins.xml
 create mode 100644 app/src/main/res/layout/item_selectable_checkin.xml

diff --git a/app/build.gradle b/app/build.gradle
index 83ea09c2d..7e96f1cd6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,7 +70,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
@@ -84,7 +84,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-t.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-t.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-t.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
@@ -98,7 +98,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
@@ -112,7 +112,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
@@ -125,7 +125,7 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.todo.ch"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
@@ -207,7 +207,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-7'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-8'
 
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -227,7 +227,7 @@ dependencies {
 	implementation 'com.google.android.material:material:1.2.1'
 	implementation 'com.google.android.gms:play-services-base:17.5.0'
 	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
-
+	implementation('com.squareup.retrofit2:converter-protobuf:2.9.0') { transitive = false }
 	implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 	implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
new file mode 100644
index 000000000..9e405ea20
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -0,0 +1,31 @@
+package ch.admin.bag.dp3t.checkin.networking
+
+import ch.admin.bag.dp3t.BuildConfig
+import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
+import okhttp3.OkHttpClient
+import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.backend.UserAgentInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.protobuf.ProtoConverterFactory
+
+class UserUploadRepository {
+
+	private var userUploadService: UserUploadService
+
+	init {
+		val okHttpBuilder = OkHttpClient.Builder()
+
+		okHttpBuilder.addInterceptor(UserAgentInterceptor(DP3T.getUserAgent()))
+
+		val retrofit = Retrofit.Builder()
+			.baseUrl(BuildConfig.PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL)
+			.client(okHttpBuilder.build())
+			.addConverterFactory(ProtoConverterFactory.create())
+			.build()
+		userUploadService = retrofit.create(UserUploadService::class.java)
+	}
+
+	suspend fun userUpload(userUploadPayload: UserUploadPayload) = userUploadService.userUpload(userUploadPayload)
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt
new file mode 100644
index 000000000..272722ab7
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt
@@ -0,0 +1,12 @@
+package ch.admin.bag.dp3t.checkin.networking
+
+import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface UserUploadService {
+
+	@POST("v3/userupload")
+	suspend fun userUpload(@Body userUploadPayload: UserUploadPayload)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
index ce5d4b094..9025583c8 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
@@ -1,12 +1,26 @@
 package ch.admin.bag.dp3t.extensions
 
+import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
 import ch.admin.bag.dp3t.R
 
-fun Fragment.showFragment(fragment: Fragment, addToBackStack: Boolean = true) {
+fun Fragment.showFragment(
+	fragment: Fragment,
+	@IdRes container: Int = R.id.main_fragment_container,
+	addToBackStack: Boolean = true,
+	modalAnimation: Boolean = false
+) {
 	requireActivity().supportFragmentManager.beginTransaction()
-		.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-		.replace(R.id.main_fragment_container, fragment)
-		.apply { if (addToBackStack) addToBackStack(fragment::class.java.canonicalName) }
+		.apply {
+			if (modalAnimation) {
+				this.setCustomAnimations(
+					R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit
+				)
+			} else {
+				this.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			}
+		}
+		.replace(container, fragment)
+		.apply { if (addToBackStack) this.addToBackStack(fragment::class.java.canonicalName) }
 		.commit()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
new file mode 100644
index 000000000..b09b0b84e
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
@@ -0,0 +1,50 @@
+package ch.admin.bag.dp3t.inform
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.databinding.ItemSelectableCheckinBinding
+import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
+
+class CheckinAdapter : RecyclerView.Adapter<CheckinAdapter.CheckinViewHolder>() {
+
+	private var checkins = mutableListOf<SelectableCheckinItem>()
+	private var itemSelectionListener: ((selectedItem: DiaryEntry, selected: Boolean) -> Unit)? = null
+
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CheckinViewHolder {
+		return CheckinViewHolder(ItemSelectableCheckinBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+	}
+
+	override fun onBindViewHolder(holderCheckin: CheckinViewHolder, position: Int) {
+		holderCheckin.bind(checkins[position])
+	}
+
+	override fun getItemCount() = checkins.size
+
+	inner class CheckinViewHolder(private val binding: ItemSelectableCheckinBinding) : RecyclerView.ViewHolder(binding.root) {
+		fun bind(selectableCheckinItem: SelectableCheckinItem) {
+			binding.apply {
+				checkinTitle.text = selectableCheckinItem.diaryEntry.venueInfo.title
+				checkinDetail1.text = "TODO"
+				checkinDetail2.text = "TODO"
+				checkbox.isChecked = selectableCheckinItem.isSelected
+				checkbox.setOnCheckedChangeListener { _, isChecked ->
+					selectableCheckinItem.isSelected = isChecked
+					itemSelectionListener?.invoke(selectableCheckinItem.diaryEntry, isChecked)
+				}
+			}
+		}
+	}
+
+	fun setData(selectableCheckinItems: List<SelectableCheckinItem>) {
+		checkins.clear()
+		checkins.addAll(selectableCheckinItems)
+		notifyDataSetChanged()
+	}
+
+	fun itemSelectionListener(listener: (selectedItem: DiaryEntry, selected: Boolean) -> Unit) {
+		itemSelectionListener = listener
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformActivity.java b/app/src/main/java/ch/admin/bag/dp3t/inform/InformActivity.java
index 241454e21..e0d87bfce 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformActivity.java
@@ -20,7 +20,7 @@
 
 public class InformActivity extends FragmentActivity {
 
-	private boolean allowed = true;
+	private boolean backpressAllowed = true;
 	public static final String EXTRA_COVIDCODE = "EXTRA_COVIDCODE";
 
 	@Override
@@ -38,13 +38,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
 	@Override
 	public void onBackPressed() {
-		if (allowed) {
+		if (backpressAllowed) {
 			super.onBackPressed();
 		}
 	}
 
 	public void allowBackButton(boolean allowed) {
-		this.allowed = allowed;
+		this.backpressAllowed = allowed;
 	}
 
 	@Override
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
new file mode 100644
index 000000000..d335f9ae5
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -0,0 +1,45 @@
+package ch.admin.bag.dp3t.inform
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.liveData
+import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
+import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.inform.models.Resource
+import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
+import ch.admin.bag.dp3t.util.toUploadVenueInfo
+import kotlinx.coroutines.Dispatchers
+import org.crowdnotifier.android.sdk.CrowdNotifier
+
+private const val USER_UPLOAD_VERSION = 3
+
+class InformViewModel(application: Application) : AndroidViewModel(application) {
+
+	private val userUploadRepository = UserUploadRepository()
+	private val diaryStorage = DiaryStorage.getInstance(application)
+
+	val selectableDiaryItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
+
+	fun userUpload() = liveData(Dispatchers.IO) {
+		emit(Resource.loading(data = null))
+		try {
+			emit(Resource.success(data = userUploadRepository.userUpload(getUserUploadPayload())))
+		} catch (exception: Exception) {
+			emit(Resource.error(data = null, message = exception.message ?: "Error Occurred!"))
+		}
+	}
+
+	private fun getUserUploadPayload(): UserUploadPayload {
+		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
+		selectableDiaryItems.filter {
+			it.isSelected
+		}.map {
+			CrowdNotifier.generateUserUploadInfo(it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime)
+		}.flatten().forEach {
+			userUploadPayloadBuilder.addVenueInfos(it.toUploadVenueInfo())
+		}
+		return userUploadPayloadBuilder.build()
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
new file mode 100644
index 000000000..ffa9a0d43
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -0,0 +1,63 @@
+package ch.admin.bag.dp3t.inform
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentShareCheckinsBinding
+import ch.admin.bag.dp3t.inform.models.Status
+import ch.admin.bag.dp3t.util.showFragment
+
+class ShareCheckinsFragment : Fragment() {
+
+	companion object {
+		@JvmStatic
+		fun newInstance() = ShareCheckinsFragment()
+	}
+
+	private val informViewModel: InformViewModel by activityViewModels()
+
+	private lateinit var binding: FragmentShareCheckinsBinding
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		binding = FragmentShareCheckinsBinding.inflate(inflater).apply {
+			val adapter = CheckinAdapter()
+			checkinsRecyclerView.adapter = adapter
+			checkinsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
+			adapter.setData(informViewModel.selectableDiaryItems)
+			adapter.itemSelectionListener { selectedItem, selected ->
+				informViewModel.selectableDiaryItems.find { it.diaryEntry == selectedItem }?.isSelected = selected
+			}
+			selectAllCheckbox.setOnCheckedChangeListener { _, isChecked ->
+				informViewModel.selectableDiaryItems.forEach { it.isSelected = isChecked }
+				adapter.setData(informViewModel.selectableDiaryItems)
+			}
+			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+			dontSendButton.setOnClickListener {
+
+			}
+			sendButton.setOnClickListener {
+				informViewModel.userUpload().observe(viewLifecycleOwner) {
+					when (it.status) {
+						Status.LOADING -> {
+							//TODO: Show loading animation
+						}
+						Status.ERROR -> {
+							//TODO: Handle error
+						}
+						Status.SUCCESS -> {
+							showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+						}
+					}
+				}
+			}
+		}
+		return binding.root
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt
new file mode 100644
index 000000000..a8248dc51
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt
@@ -0,0 +1,18 @@
+package ch.admin.bag.dp3t.inform.models
+
+enum class Status {
+	SUCCESS,
+	ERROR,
+	LOADING
+}
+
+data class Resource<out T>(val status: Status, val data: T?, val message: String?) {
+	companion object {
+		fun <T> success(data: T): Resource<T> = Resource(status = Status.SUCCESS, data = data, message = null)
+
+		fun <T> error(data: T?, message: String): Resource<T> =
+			Resource(status = Status.ERROR, data = data, message = message)
+
+		fun <T> loading(data: T?): Resource<T> = Resource(status = Status.LOADING, data = data, message = null)
+	}
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/models/SelectableCheckinItem.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/models/SelectableCheckinItem.kt
new file mode 100644
index 000000000..a12ae1d14
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/models/SelectableCheckinItem.kt
@@ -0,0 +1,5 @@
+package ch.admin.bag.dp3t.inform.models
+
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+
+data class SelectableCheckinItem(val diaryEntry: DiaryEntry, var isSelected: Boolean)
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt
new file mode 100644
index 000000000..87e708b0f
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt
@@ -0,0 +1,16 @@
+package ch.admin.bag.dp3t.util
+
+import ch.admin.bag.dp3t.checkin.models.UploadVenueInfo
+import com.google.protobuf.ByteString
+import org.crowdnotifier.android.sdk.model.UserUploadInfo
+
+fun UserUploadInfo.toUploadVenueInfo(): UploadVenueInfo {
+	return UploadVenueInfo.newBuilder()
+		.setPreId(ByteString.copyFrom(preId))
+		.setTimeKey(ByteString.copyFrom(timeKey))
+		.setNotificationKey(ByteString.copyFrom(notificationKey))
+		.setIntervalStartMs(intervalStartMs)
+		.setIntervalEndMs(intervalEndMs)
+		.setFake(false)
+		.build()
+}
\ No newline at end of file
diff --git a/app/src/main/proto/App.proto b/app/src/main/proto/App.proto
index 57b19ad8a..995364bd4 100644
--- a/app/src/main/proto/App.proto
+++ b/app/src/main/proto/App.proto
@@ -47,3 +47,17 @@ message AssociatedData {
   int64 endTimestamp = 4;
   bytes countryData = 5;
 }
+
+message UserUploadPayload {
+  int32 version = 1;
+  repeated UploadVenueInfo venueInfos = 2;
+}
+message UploadVenueInfo {
+  bytes preId = 1;
+  bytes timeKey = 2;
+  int64 intervalStartMs = 3;
+  int64 intervalEndMs = 4;
+  bytes notificationKey = 5;
+  bool fake = 6;
+}
+
diff --git a/app/src/main/res/layout/fragment_share_checkins.xml b/app/src/main/res/layout/fragment_share_checkins.xml
new file mode 100644
index 000000000..fd7dfab97
--- /dev/null
+++ b/app/src/main/res/layout/fragment_share_checkins.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/white"
+	android:orientation="vertical">
+
+	<TextView
+		style="@style/NextStep.Text.Title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/spacing_huge"
+		android:gravity="bottom|center_horizontal"
+		android:text="@string/inform_share_checkins_title" />
+
+	<TextView
+		style="@style/NextStep.Text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/spacing_medium_large"
+		android:gravity="center_horizontal"
+		android:paddingStart="@dimen/spacing_huge"
+		android:paddingEnd="@dimen/spacing_huge"
+		android:text="@string/inform_share_checkins_subtitle" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_medium_large"
+		android:layout_marginTop="@dimen/spacing_medium_large"
+		android:background="@color/grey_light">
+
+		<TextView
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/spacing_large"
+			android:layout_weight="1"
+			android:text="@string/inform_share_checkins_select_all" />
+
+		<com.google.android.material.checkbox.MaterialCheckBox
+			android:id="@+id/select_all_checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" />
+
+	</LinearLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/checkins_recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:clipChildren="false"
+		android:clipToPadding="false"
+		android:paddingHorizontal="@dimen/spacing_medium_large"
+		android:paddingBottom="@dimen/spacing_larger" />
+
+	<Button
+		android:id="@+id/send_button"
+		style="@style/NextStep.Button.Purple"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal"
+		android:layout_marginVertical="@dimen/spacing_medium_large"
+		android:text="@string/inform_send_button_title" />
+
+	<TextView
+		android:id="@+id/dont_send_button"
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal"
+		android:layout_marginBottom="@dimen/spacing_medium_large"
+		android:background="?selectableItemBackground"
+		android:padding="@dimen/spacing_small"
+		android:text="@string/inform_dont_send_button_title"
+		android:visibility="visible" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_selectable_checkin.xml b/app/src/main/res/layout/item_selectable_checkin.xml
new file mode 100644
index 000000000..df4f26910
--- /dev/null
+++ b/app/src/main/res/layout/item_selectable_checkin.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/NextStep.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginTop="@dimen/spacing_medium">
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingVertical="@dimen/spacing_medium_large"
+		android:paddingStart="@dimen/spacing_large">
+
+		<TextView
+			android:id="@+id/checkin_title"
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="Checkin 1" />
+
+		<TextView
+			android:id="@+id/checkin_detail1"
+			style="@style/NextStep.Text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_very_small"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/checkin_title"
+			tools:text="Office space" />
+
+		<TextView
+			android:id="@+id/checkin_detail2"
+			style="@style/NextStep.Text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_very_small"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/checkin_detail1"
+			tools:text="Test test" />
+
+		<com.google.android.material.checkbox.MaterialCheckBox
+			android:id="@+id/checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file

From 568b8cc699fa0f92a32bb4884e63a0900e4cbc26 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 6 May 2021 14:27:28 +0200
Subject: [PATCH 066/207] Move Network Requests from Inform Fragment to
 InformViewModel

---
 .../admin/bag/dp3t/inform/InformFragment.java | 301 ------------------
 .../admin/bag/dp3t/inform/InformFragment.kt   | 217 +++++++++++++
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 115 ++++++-
 .../dp3t/inform/models/NetworkStatusModels.kt |  10 +-
 .../bag/dp3t/networking/AuthCodeRepository.kt |  38 +--
 .../bag/dp3t/networking/AuthCodeService.kt    |   8 +-
 .../admin/bag/dp3t/networking/FakeWorker.kt   |   2 +-
 .../AuthenticationCodeResponseModelV2.kt      |   6 +
 .../admin/bag/dp3t/storage/SecureStorage.java |  13 +-
 app/src/main/res/layout/fragment_inform.xml   |   4 +-
 10 files changed, 367 insertions(+), 347 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.java b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.java
deleted file mode 100644
index 2762d1c83..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.inform;
-
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import java.util.Date;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.TimeUnit;
-
-import com.google.android.gms.common.api.ApiException;
-
-import org.dpppt.android.sdk.DP3T;
-import org.dpppt.android.sdk.backend.ResponseCallback;
-import org.dpppt.android.sdk.internal.logger.Logger;
-import org.dpppt.android.sdk.models.DayDate;
-import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.inform.views.ChainedEditText;
-import ch.admin.bag.dp3t.networking.AuthCodeRepository;
-import ch.admin.bag.dp3t.networking.errors.InvalidCodeError;
-import ch.admin.bag.dp3t.networking.errors.ResponseError;
-import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel;
-import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModel;
-import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.util.ENExceptionHelper;
-import ch.admin.bag.dp3t.util.JwtUtil;
-import ch.admin.bag.dp3t.util.PhoneUtil;
-import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
-
-import static ch.admin.bag.dp3t.inform.InformActivity.EXTRA_COVIDCODE;
-
-public class InformFragment extends Fragment {
-
-	private static final String TAG = "InformFragment";
-
-	private static final long TIMEOUT_VALID_CODE = 1000L * 60 * 5;
-	private final long MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L;
-
-	private static final String REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}";
-
-	private ChainedEditText authCodeInput;
-	private AlertDialog progressDialog;
-	private Button buttonSend;
-
-	private SecureStorage secureStorage;
-	private TracingViewModel tracingViewModel;
-
-	public static InformFragment newInstance() {
-		return new InformFragment();
-	}
-
-	public InformFragment() {
-		super(R.layout.fragment_inform);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		secureStorage = SecureStorage.getInstance(getContext());
-		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-
-		((InformActivity) requireActivity()).allowBackButton(true);
-		buttonSend = view.findViewById(R.id.trigger_fragment_button_trigger);
-		authCodeInput = view.findViewById(R.id.trigger_fragment_input);
-		authCodeInput.addTextChangedListener(new ChainedEditText.ChainedEditTextListener() {
-			@Override
-			public void onTextChanged(String input) {
-				buttonSend.setEnabled(input.matches(REGEX_CODE_PATTERN));
-			}
-
-			@Override
-			public void onEditorSendAction() {
-				if (buttonSend.isEnabled()) buttonSend.callOnClick();
-			}
-		});
-
-		long lastRequestTime = secureStorage.getLastInformRequestTime();
-		String lastCode = secureStorage.getLastInformCode();
-		String lastToken = secureStorage.getLastInformToken();
-
-		if (System.currentTimeMillis() - lastRequestTime < TIMEOUT_VALID_CODE) {
-			authCodeInput.setText(lastCode);
-		} else if (lastCode != null || lastToken != null) {
-			secureStorage.clearInformTimeAndCodeAndToken();
-		}
-
-		if (requireActivity().getIntent().getExtras() != null) {
-			String covidCode = requireActivity().getIntent().getExtras().getString(EXTRA_COVIDCODE);
-			if (covidCode != null) {
-				authCodeInput.setText(covidCode);
-			}
-		}
-
-		buttonSend.setOnClickListener(v -> {
-			buttonSend.setEnabled(false);
-			setInvalidCodeErrorVisible(false);
-			String authCode = authCodeInput.getText();
-
-			boolean isTracingEnabled = DP3T.isTracingEnabled(requireContext());
-			if (isTracingEnabled) {
-				authenticateInputOrInformExposed(authCode);
-			} else {
-				askUserToEnableTracing(authCode);
-			}
-		});
-
-		view.findViewById(R.id.cancel_button).setOnClickListener(v -> getActivity().finish());
-
-		view.findViewById(R.id.inform_invalid_code_error).setOnClickListener(v -> PhoneUtil.callAppHotline(v.getContext()));
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		authCodeInput.requestFocus();
-	}
-
-	private void authenticateInputOrInformExposed(String authCode) {
-		long lastTimestamp = secureStorage.getLastInformRequestTime();
-		String lastAuthToken = secureStorage.getLastInformToken();
-
-		progressDialog = createProgressDialog();
-		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && lastAuthToken != null) {
-			Date onsetDate = JwtUtil.getOnsetDate(lastAuthToken);
-			informExposed(onsetDate, getAuthorizationHeader(lastAuthToken));
-		} else {
-			authenticateInput(authCode);
-		}
-	}
-
-	private void askUserToEnableTracing(String authCode) {
-		new AlertDialog.Builder(getContext(), R.style.NextStep_AlertDialogStyle)
-				.setMessage(R.string.android_inform_tracing_enabled_explanation)
-				.setOnCancelListener(dialog -> buttonSend.setEnabled(true))
-				.setNegativeButton(R.string.cancel, (dialog, which) -> buttonSend.setEnabled(true))
-				.setPositiveButton(R.string.activate_tracing_button, (dialog, which) -> enableTracing(authCode))
-				.show();
-	}
-
-	private void enableTracing(String authCode) {
-		tracingViewModel.enableTracing(getActivity(),
-				() -> authenticateInputOrInformExposed(authCode),
-				(e) -> {
-					String message = ENExceptionHelper.getErrorMessage(e, getActivity());
-					Logger.e(TAG, message);
-					new AlertDialog.Builder(getActivity(), R.style.NextStep_AlertDialogStyle)
-							.setTitle(R.string.android_en_start_failure)
-							.setMessage(message)
-							.setOnDismissListener(dialog -> buttonSend.setEnabled(true))
-							.setPositiveButton(R.string.android_button_ok, (dialog, which) -> {})
-							.show();
-				},
-				() -> buttonSend.setEnabled(true));
-	}
-
-	private void authenticateInput(String authCode) {
-		AuthCodeRepository authCodeRepository = new AuthCodeRepository(getContext());
-		authCodeRepository.getAccessToken(new AuthenticationCodeRequestModel(authCode, 0),
-				new ResponseCallback<AuthenticationCodeResponseModel>() {
-					@Override
-					public void onSuccess(AuthenticationCodeResponseModel response) {
-						String accessToken = response.getAccessToken();
-
-						secureStorage.saveInformTimeAndCodeAndToken(authCode, accessToken);
-
-						Date onsetDate = JwtUtil.getOnsetDate(accessToken);
-						if (onsetDate == null) {
-							showErrorDialog(InformRequestError.BLACK_INVALID_AUTH_RESPONSE_FORM);
-							if (progressDialog != null && progressDialog.isShowing()) {
-								progressDialog.dismiss();
-							}
-							buttonSend.setEnabled(true);
-							return;
-						}
-						informExposed(onsetDate, getAuthorizationHeader(accessToken));
-					}
-
-					@Override
-					public void onError(Throwable throwable) {
-						if (progressDialog != null && progressDialog.isShowing()) {
-							progressDialog.dismiss();
-						}
-						if (throwable instanceof InvalidCodeError) {
-							setInvalidCodeErrorVisible(true);
-							return;
-						} else if (throwable instanceof ResponseError) {
-							showErrorDialog(InformRequestError.BLACK_STATUS_ERROR,
-									String.valueOf(((ResponseError) throwable).getStatusCode()));
-						} else {
-							showErrorDialog(InformRequestError.BLACK_MISC_NETWORK_ERROR);
-						}
-						buttonSend.setEnabled(true);
-					}
-				},
-				getViewLifecycleOwner());
-	}
-
-	private void informExposed(Date onsetDate, String authorizationHeader) {
-		DP3T.sendIAmInfected(getActivity(), onsetDate,
-				new ExposeeAuthMethodAuthorization(authorizationHeader), new ResponseCallback<DayDate>() {
-					@Override
-					public void onSuccess(DayDate oldestSharedKeyDayDate) {
-						if (progressDialog != null && progressDialog.isShowing()) {
-							progressDialog.dismiss();
-						}
-						secureStorage.clearInformTimeAndCodeAndToken();
-
-						// Store the oldest shared Key date of this report (but at least now-MAX_EXPOSURE_AGE_MILLIS)
-						long oldestSharedKeyDate = Math.max(oldestSharedKeyDayDate.getStartOfDayTimestamp(),
-								System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS);
-						secureStorage.setPositiveReportOldestSharedKey(oldestSharedKeyDate);
-
-						// Ask if user wants to end isolation after 14 days
-						long isolationEndDialogTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(14);
-						secureStorage.setIsolationEndDialogTimestamp(isolationEndDialogTimestamp);
-
-						getParentFragmentManager().beginTransaction()
-								.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter,
-										R.anim.slide_pop_exit)
-								.replace(R.id.inform_fragment_container, ThankYouFragment.newInstance())
-								.commit();
-					}
-
-					@Override
-					public void onError(Throwable throwable) {
-						if (progressDialog != null && progressDialog.isShowing()) {
-							progressDialog.dismiss();
-						}
-						if (throwable instanceof ResponseError) {
-							showErrorDialog(InformRequestError.RED_STATUS_ERROR,
-									String.valueOf(((ResponseError) throwable).getStatusCode()));
-						} else if (throwable instanceof CancellationException) {
-							showErrorDialog(InformRequestError.RED_USER_CANCELLED_SHARE);
-						} else if (throwable instanceof ApiException) {
-							showErrorDialog(InformRequestError.RED_EXPOSURE_API_ERROR,
-									String.valueOf(((ApiException) throwable).getStatusCode()));
-						} else {
-							showErrorDialog(InformRequestError.RED_MISC_NETWORK_ERROR);
-						}
-						throwable.printStackTrace();
-						buttonSend.setEnabled(true);
-					}
-				});
-	}
-
-	private void setInvalidCodeErrorVisible(boolean visible) {
-		getView().findViewById(R.id.inform_invalid_code_error).setVisibility(visible ? View.VISIBLE : View.GONE);
-		getView().findViewById(R.id.inform_input_text).setVisibility(visible ? View.GONE : View.VISIBLE);
-	}
-
-	private AlertDialog createProgressDialog() {
-		return new AlertDialog.Builder(getContext())
-				.setView(R.layout.dialog_loading)
-				.show();
-	}
-
-	private void showErrorDialog(InformRequestError error) {
-		showErrorDialog(error, null);
-	}
-
-	private void showErrorDialog(InformRequestError error, @Nullable String addErrorCode) {
-		AlertDialog.Builder errorDialogBuilder = new AlertDialog.Builder(getContext(), R.style.NextStep_AlertDialogStyle)
-				.setMessage(error.getErrorMessage())
-				.setPositiveButton(R.string.android_button_ok, (dialog, which) -> {});
-		String errorCode = error.getErrorCode(addErrorCode);
-		TextView errorCodeView =
-				(TextView) getLayoutInflater().inflate(R.layout.view_dialog_error_code, (ViewGroup) getView(), false);
-		errorCodeView.setText(errorCode);
-		errorDialogBuilder.setView(errorCodeView);
-		errorDialogBuilder.show();
-	}
-
-	private String getAuthorizationHeader(String accessToken) {
-		return "Bearer " + accessToken;
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
new file mode 100644
index 000000000..3e1fbc3dc
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.inform
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentInformBinding
+import ch.admin.bag.dp3t.inform.models.Status
+import ch.admin.bag.dp3t.inform.views.ChainedEditText
+import ch.admin.bag.dp3t.inform.views.ChainedEditText.ChainedEditTextListener
+import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
+import ch.admin.bag.dp3t.networking.errors.ResponseError
+import ch.admin.bag.dp3t.util.ENExceptionHelper
+import ch.admin.bag.dp3t.util.PhoneUtil
+import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import com.google.android.gms.common.api.ApiException
+import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.internal.logger.Logger
+import java.util.concurrent.CancellationException
+
+private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}"
+
+class InformFragment : Fragment() {
+
+	private val tracingViewModel: TracingViewModel by activityViewModels()
+	private val informViewModel: InformViewModel by activityViewModels()
+	private lateinit var progressDialog: AlertDialog
+
+	private lateinit var binding: FragmentInformBinding
+
+	companion object {
+		private const val TAG = "InformFragment"
+
+		@JvmStatic
+		fun newInstance() = InformFragment()
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentInformBinding.inflate(inflater).apply {
+			(requireActivity() as InformActivity).allowBackButton(true)
+			progressDialog = AlertDialog.Builder(requireContext()).setView(R.layout.dialog_loading).create()
+			covidcodeInput.addTextChangedListener(object : ChainedEditTextListener {
+				override fun onTextChanged(input: String) {
+					sendButton.isEnabled = input.matches(REGEX_CODE_PATTERN.toRegex())
+				}
+
+				override fun onEditorSendAction() {
+					if (sendButton.isEnabled) sendButton.callOnClick()
+				}
+			})
+
+			informViewModel.getLastAuthCode()?.let {
+				covidcodeInput.text = it
+			}
+
+			if (requireActivity().intent.extras != null) {
+				val covidCode = requireActivity().intent.extras?.getString(InformActivity.EXTRA_COVIDCODE)
+				if (covidCode != null) {
+					covidcodeInput.text = covidCode
+				}
+			}
+			sendButton.setOnClickListener {
+				sendButton.isEnabled = false
+				setInvalidCodeErrorVisible(false)
+				val authCode = covidcodeInput.text
+				val isTracingEnabled = DP3T.isTracingEnabled(requireContext())
+				if (isTracingEnabled) {
+					authenticateInputAndInformExposed(authCode)
+				} else {
+					askUserToEnableTracing(authCode)
+				}
+			}
+			cancelButton.setOnClickListener { requireActivity().finish() }
+			informInvalidCodeError.setOnClickListener { PhoneUtil.callAppHotline(it.context) }
+		}
+
+		return binding.root
+	}
+
+
+	override fun onResume() {
+		super.onResume()
+		binding.covidcodeInput.requestFocus()
+	}
+
+	private fun authenticateInputAndInformExposed(authCode: String) {
+		informViewModel.authenticateInputAndGetDP3TAccessToken(authCode).observe(viewLifecycleOwner) {
+			when (it.status) {
+				Status.LOADING -> {
+					setProgressDialogVisible(true)
+					binding.sendButton.isEnabled = false
+				}
+				Status.ERROR -> {
+					setProgressDialogVisible(false)
+					it.exception?.let { exception ->
+						handleAuthenticateRequestError(exception)
+					}
+					binding.sendButton.isEnabled = true
+				}
+				Status.SUCCESS -> {
+					it.data?.let { accessToken -> informExposed(accessToken) }
+				}
+			}
+		}
+	}
+
+	private fun handleAuthenticateRequestError(throwable: Throwable) {
+		when (throwable) {
+			is InvalidCodeError -> setInvalidCodeErrorVisible(true)
+			is ResponseError -> showErrorDialog(InformRequestError.BLACK_STATUS_ERROR, throwable.statusCode.toString())
+			else -> showErrorDialog(InformRequestError.BLACK_MISC_NETWORK_ERROR)
+		}
+		throwable.printStackTrace()
+	}
+
+	private fun informExposed(accessToken: String) {
+		informViewModel.informExposed(accessToken, requireActivity()).observe(viewLifecycleOwner) {
+			when (it.status) {
+				Status.LOADING -> {
+					setProgressDialogVisible(true)
+					binding.sendButton.isEnabled = false
+				}
+				Status.ERROR -> {
+					setProgressDialogVisible(false)
+					it.exception?.let { exception ->
+						handleInformExposedRequestError(exception)
+					}
+					binding.sendButton.isEnabled = true
+				}
+				Status.SUCCESS -> {
+					setProgressDialogVisible(false)
+					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+					binding.sendButton.isEnabled = true
+				}
+			}
+		}
+	}
+
+	private fun handleInformExposedRequestError(throwable: Throwable) {
+		when (throwable) {
+			is ResponseError -> showErrorDialog(InformRequestError.RED_STATUS_ERROR, throwable.statusCode.toString())
+			is CancellationException -> showErrorDialog(InformRequestError.RED_USER_CANCELLED_SHARE)
+			is ApiException -> showErrorDialog(InformRequestError.RED_EXPOSURE_API_ERROR, throwable.statusCode.toString())
+			else -> showErrorDialog(InformRequestError.RED_MISC_NETWORK_ERROR)
+		}
+		throwable.printStackTrace()
+	}
+
+	private fun setProgressDialogVisible(isVisible: Boolean) {
+		if (isVisible && !progressDialog.isShowing) {
+			progressDialog.show()
+		}
+		if (!isVisible && progressDialog.isShowing) {
+			progressDialog.dismiss()
+		}
+	}
+
+	private fun askUserToEnableTracing(authCode: String) {
+		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.android_inform_tracing_enabled_explanation)
+			.setOnCancelListener { binding.sendButton.isEnabled = true }
+			.setNegativeButton(R.string.cancel) { _, _ -> binding.sendButton.isEnabled = true }
+			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(authCode) }
+			.show()
+	}
+
+	private fun enableTracing(authCode: String) {
+		tracingViewModel.enableTracing(requireActivity(),
+			{ authenticateInputAndInformExposed(authCode) },
+			{ e: Exception? ->
+				val message = ENExceptionHelper.getErrorMessage(e, activity)
+				Logger.e(TAG, message)
+				AlertDialog.Builder(requireActivity(), R.style.NextStep_AlertDialogStyle)
+					.setTitle(R.string.android_en_start_failure)
+					.setMessage(message)
+					.setOnDismissListener { binding.sendButton.isEnabled = true }
+					.setPositiveButton(R.string.android_button_ok) { _, _ -> }
+					.show()
+			}
+		) { binding.sendButton.isEnabled = true }
+	}
+
+	private fun setInvalidCodeErrorVisible(visible: Boolean) {
+		binding.apply {
+			informInvalidCodeError.isVisible = visible
+			informInputText.isVisible = visible
+		}
+	}
+
+	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
+		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(error.errorMessage)
+			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
+		val errorCode = error.getErrorCode(addErrorCode)
+		val errorCodeView = layoutInflater.inflate(R.layout.view_dialog_error_code, view as ViewGroup?, false) as TextView
+		errorCodeView.text = errorCode
+		errorDialogBuilder.setView(errorCodeView)
+		errorDialogBuilder.show()
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index d335f9ae5..61a50d759 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.inform
 
+import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.liveData
@@ -8,17 +9,34 @@ import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
+import ch.admin.bag.dp3t.networking.AuthCodeRepository
+import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
+import ch.admin.bag.dp3t.storage.SecureStorage
+import ch.admin.bag.dp3t.util.JwtUtil
 import ch.admin.bag.dp3t.util.toUploadVenueInfo
 import kotlinx.coroutines.Dispatchers
 import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.backend.ResponseCallback
+import org.dpppt.android.sdk.models.DayDate
+import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
+import java.util.concurrent.TimeUnit
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 private const val USER_UPLOAD_VERSION = 3
+private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
+private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
+private const val ISOLATION_DURATION_DAYS = 14L
 
 class InformViewModel(application: Application) : AndroidViewModel(application) {
 
+	private val authCodeRepository = AuthCodeRepository(application)
 	private val userUploadRepository = UserUploadRepository()
 	private val diaryStorage = DiaryStorage.getInstance(application)
+	private val secureStorage = SecureStorage.getInstance(application)
 
+	//TODO: Persist these Items for DKA cases
 	val selectableDiaryItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
 
 	fun userUpload() = liveData(Dispatchers.IO) {
@@ -26,10 +44,101 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 		try {
 			emit(Resource.success(data = userUploadRepository.userUpload(getUserUploadPayload())))
 		} catch (exception: Exception) {
-			emit(Resource.error(data = null, message = exception.message ?: "Error Occurred!"))
+			emit(Resource.error(data = null, exception = exception))
 		}
 	}
 
+	fun getLastAuthCode(): String? {
+		val lastCode = secureStorage.lastInformCode
+		val lastToken = secureStorage.lastDP3TInformToken
+
+		if (System.currentTimeMillis() - secureStorage.lastInformRequestTime < TIMEOUT_VALID_CODE) {
+			return lastCode
+		} else if (lastCode != null || lastToken != null) {
+			secureStorage.clearInformTimeAndCodeAndToken()
+		}
+		return null
+	}
+
+	fun authenticateInputAndGetDP3TAccessToken(authCode: String) = liveData(Dispatchers.IO) {
+		emit(Resource.loading(data = null))
+		val lastTimestamp = secureStorage.lastInformRequestTime
+		val lastDP3TAuthToken = secureStorage.lastDP3TInformToken
+		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && lastDP3TAuthToken != null) {
+			emit(Resource.success(lastDP3TAuthToken))
+		} else {
+			try {
+				val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(authCode, 0))
+				secureStorage.saveInformTimeAndCodeAndToken(
+					authCode,
+					accessTokens.dp3TAccessToken.accessToken,
+					accessTokens.checkInAccessToken.accessToken
+				)
+				emit(Resource.success(data = accessTokens.dp3TAccessToken.accessToken))
+			} catch (exception: Exception) {
+				emit(Resource.error(data = null, exception = exception))
+			}
+		}
+	}
+
+	fun authenticateInputAndGetCheckinAccessToken(authCode: String) = liveData(Dispatchers.IO) {
+		emit(Resource.loading(data = null))
+		val lastTimestamp = secureStorage.lastInformRequestTime
+		val lastCheckinAuthToken = secureStorage.lastCheckinInformToken
+		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && lastCheckinAuthToken != null) {
+			emit(Resource.success(lastCheckinAuthToken))
+		} else {
+			try {
+				val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(authCode, 0))
+				secureStorage.saveInformTimeAndCodeAndToken(
+					authCode,
+					accessTokens.dp3TAccessToken.accessToken,
+					accessTokens.checkInAccessToken.accessToken
+				)
+				emit(Resource.success(data = accessTokens.checkInAccessToken.accessToken))
+			} catch (exception: Exception) {
+				emit(Resource.error(data = null, exception = exception))
+			}
+		}
+	}
+
+	fun informExposed(accessToken: String, activity: Activity) = liveData(Dispatchers.IO) {
+		emit(Resource.loading(data = null))
+		val authorizationHeader = getAuthorizationHeader(accessToken)
+		val onsetDate = JwtUtil.getOnsetDate(accessToken)
+
+		var result: Resource<Unit>? = null
+
+		// Wrapping traditional callback in a suspendCoroutine
+		suspendCoroutine<Unit> { continuation ->
+			DP3T.sendIAmInfected(activity, onsetDate, ExposeeAuthMethodAuthorization(authorizationHeader),
+				object : ResponseCallback<DayDate> {
+					override fun onSuccess(oldestSharedKeyDayDate: DayDate) {
+
+						// Store the oldest shared Key date of this report (but at least now-MAX_EXPOSURE_AGE_MILLIS)
+						val oldestSharedKeyDate = Math.max(
+							oldestSharedKeyDayDate.startOfDayTimestamp,
+							System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS
+						)
+						secureStorage.positiveReportOldestSharedKey = oldestSharedKeyDate
+
+						// Ask if user wants to end isolation after 14 days
+						val isolationEndDialogTimestamp =
+							System.currentTimeMillis() + TimeUnit.DAYS.toMillis(ISOLATION_DURATION_DAYS)
+						secureStorage.isolationEndDialogTimestamp = isolationEndDialogTimestamp
+						result = Resource.success(Unit)
+						continuation.resume(Unit)
+					}
+
+					override fun onError(throwable: Throwable) {
+						result = Resource.error(null, throwable)
+						continuation.resume(Unit)
+					}
+				})
+		}
+		result?.let { emit(it) }
+	}
+
 	private fun getUserUploadPayload(): UserUploadPayload {
 		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
 		selectableDiaryItems.filter {
@@ -42,4 +151,8 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 		return userUploadPayloadBuilder.build()
 	}
 
+	private fun getAuthorizationHeader(accessToken: String): String {
+		return "Bearer $accessToken"
+	}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt
index a8248dc51..bffb8f1f5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/models/NetworkStatusModels.kt
@@ -6,13 +6,13 @@ enum class Status {
 	LOADING
 }
 
-data class Resource<out T>(val status: Status, val data: T?, val message: String?) {
+data class Resource<out T>(val status: Status, val data: T?, val exception: Throwable?) {
 	companion object {
-		fun <T> success(data: T): Resource<T> = Resource(status = Status.SUCCESS, data = data, message = null)
+		fun <T> success(data: T): Resource<T> = Resource(status = Status.SUCCESS, data = data, exception = null)
 
-		fun <T> error(data: T?, message: String): Resource<T> =
-			Resource(status = Status.ERROR, data = data, message = message)
+		fun <T> error(data: T?, exception: Throwable): Resource<T> =
+			Resource(status = Status.ERROR, data = data, exception = exception)
 
-		fun <T> loading(data: T?): Resource<T> = Resource(status = Status.LOADING, data = data, message = null)
+		fun <T> loading(data: T?): Resource<T> = Resource(status = Status.LOADING, data = data, exception = null)
 	}
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
index 3720e16a8..8976773ce 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
@@ -17,6 +17,7 @@ import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModel
+import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModelV2
 import kotlinx.coroutines.*
 import okhttp3.Cache
 import okhttp3.Interceptor
@@ -61,43 +62,14 @@ class AuthCodeRepository(context: Context) {
 		authCodeService = retrofit.create(AuthCodeService::class.java)
 	}
 
-	fun getAccessToken(
-		authenticationCode: AuthenticationCodeRequestModel,
-		callbackListener: ResponseCallback<AuthenticationCodeResponseModel>,
-		lifecycleOwner: LifecycleOwner
-	) {
-		lifecycleOwner.lifecycleScope.launch {
-			withContext(Dispatchers.IO) {
-				try {
-					val response = authCodeService.getAccessToken(authenticationCode)
-					if (response.isSuccessful) {
-						withContext(Dispatchers.Main) {
-							callbackListener.onSuccess(response.body())
-						}
-					} else {
-						withContext(Dispatchers.Main) {
-							if (response.code() == 404) {
-								callbackListener.onError(InvalidCodeError())
-							} else {
-								callbackListener.onError(ResponseError(response.raw()))
-							}
-						}
-					}
-				} catch (e: Exception) {
-					withContext(Dispatchers.Main) {
-						Logger.e(TAG, "getAccessToken", e)
-						callbackListener.onError(e)
-					}
-				}
-			}
-		}
-	}
 
 	@Throws(IOException::class, ResponseError::class)
-	suspend fun getAccessTokenSync(authenticationCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModel =
+	suspend fun getAccessTokenSyncV1(authenticationCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModel =
 		withContext(Dispatchers.IO) {
-			val response = authCodeService.getAccessToken(authenticationCode)
+			val response = authCodeService.getAccessTokenV1(authenticationCode)
 			if (!response.isSuccessful) throw ResponseError(response.raw())
 			return@withContext response.body() ?: throw ResponseError(response.raw())
 		}
+
+	suspend fun getAccessToken(authCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModelV2 = authCodeService.getAccessToken(authCode)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
index 28fa2af1d..5b206848c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
@@ -11,6 +11,7 @@ package ch.admin.bag.dp3t.networking
 
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModel
+import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModelV2
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.Headers
@@ -19,5 +20,10 @@ import retrofit2.http.POST
 interface AuthCodeService {
 	@Headers("accept: */*", "content-type: application/json")
 	@POST("v1/onset")
-	suspend fun getAccessToken(@Body code: AuthenticationCodeRequestModel): Response<AuthenticationCodeResponseModel>
+	suspend fun getAccessTokenV1(@Body code: AuthenticationCodeRequestModel): Response<AuthenticationCodeResponseModel>
+
+	@Headers("accept: */*", "content-type: application/json")
+	@POST("v2/onset")
+	suspend fun getAccessToken(@Body code: AuthenticationCodeRequestModel): AuthenticationCodeResponseModelV2
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
index 475c05488..f8321b80a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
@@ -145,7 +145,7 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 	private suspend fun executeFakeRequest(context: Context): Boolean {
 		return try {
 			val authCodeRepository = AuthCodeRepository(context)
-			val accessTokenResponse = authCodeRepository.getAccessTokenSync(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
+			val accessTokenResponse = authCodeRepository.getAccessTokenSyncV1(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
 			val accessToken = accessTokenResponse.accessToken
 			DP3TKotlin.sendFakeInfectedRequest(context, ExposeeAuthMethodAuthorization(getAuthorizationHeader(accessToken)))
 			true
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt
new file mode 100644
index 000000000..331276821
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt
@@ -0,0 +1,6 @@
+package ch.admin.bag.dp3t.networking.models
+
+data class AuthenticationCodeResponseModelV2(
+	val checkInAccessToken: AuthenticationCodeResponseModel,
+	val dp3TAccessToken: AuthenticationCodeResponseModel
+)
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 6739426d4..090ab0fb0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -48,6 +48,7 @@ public class SecureStorage {
 	private static final String KEY_INFORM_TIME_REQ = "inform_time_req";
 	private static final String KEY_INFORM_CODE_REQ = "inform_code_req";
 	private static final String KEY_INFORM_TOKEN_REQ = "inform_token_req";
+	private static final String KEY_INFORM_TOKEN_CHECKIN_REQ = "inform_token_chekin_req";
 	private static final String KEY_ONBOARDING_COMPLETED = "onboarding_completed";
 	private static final String KEY_UPDATE_BOARDING_VERSION = "update_boarding_version";
 	private static final String KEY_LAST_SHOWN_CONTACT_ID = "last_shown_contact_id";
@@ -117,10 +118,11 @@ public void setInfectedDate(long date) {
 		prefs.edit().putLong(KEY_INFECTED_DATE, date).apply();
 	}
 
-	public void saveInformTimeAndCodeAndToken(String informCode, String informToken) {
+	public void saveInformTimeAndCodeAndToken(String informCode, String dp3tInformToken, String checkinInformToken) {
 		prefs.edit().putLong(KEY_INFORM_TIME_REQ, System.currentTimeMillis())
 				.putString(KEY_INFORM_CODE_REQ, informCode)
-				.putString(KEY_INFORM_TOKEN_REQ, informToken)
+				.putString(KEY_INFORM_TOKEN_REQ, dp3tInformToken)
+				.putString(KEY_INFORM_TOKEN_CHECKIN_REQ, checkinInformToken)
 				.apply();
 	}
 
@@ -128,6 +130,7 @@ public void clearInformTimeAndCodeAndToken() {
 		prefs.edit().remove(KEY_INFORM_TIME_REQ)
 				.remove(KEY_INFORM_CODE_REQ)
 				.remove(KEY_INFORM_TOKEN_REQ)
+				.remove(KEY_INFORM_TOKEN_CHECKIN_REQ)
 				.apply();
 	}
 
@@ -139,10 +142,14 @@ public String getLastInformCode() {
 		return prefs.getString(KEY_INFORM_CODE_REQ, null);
 	}
 
-	public String getLastInformToken() {
+	public String getLastDP3TInformToken() {
 		return prefs.getString(KEY_INFORM_TOKEN_REQ, null);
 	}
 
+	public String getLastCheckinInformToken() {
+		return prefs.getString(KEY_INFORM_TOKEN_CHECKIN_REQ, null);
+	}
+
 	public boolean getOnboardingCompleted() {
 		return prefs.getBoolean(KEY_ONBOARDING_COMPLETED, false);
 	}
diff --git a/app/src/main/res/layout/fragment_inform.xml b/app/src/main/res/layout/fragment_inform.xml
index f1bfdc45e..31dafed18 100644
--- a/app/src/main/res/layout/fragment_inform.xml
+++ b/app/src/main/res/layout/fragment_inform.xml
@@ -83,13 +83,13 @@
 				android:text="@string/inform_code_text" />
 
 			<ch.admin.bag.dp3t.inform.views.ChainedEditText
-				android:id="@+id/trigger_fragment_input"
+				android:id="@+id/covidcode_input"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="@dimen/spacing_huge" />
 
 			<Button
-				android:id="@+id/trigger_fragment_button_trigger"
+				android:id="@+id/send_button"
 				style="@style/NextStep.Button.Purple"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"

From c605ce210b1cc8534599840174ba746ccbe35e51 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 6 May 2021 15:54:39 +0200
Subject: [PATCH 067/207] Implement ReallyNotShareFragment

---
 .../checkin/generateqrcode/QRCodeViewModel.kt |  5 +-
 .../admin/bag/dp3t/inform/InformFragment.kt   |  2 +-
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 67 +++++++++----------
 .../bag/dp3t/inform/ReallyNotShareFragment.kt | 29 ++++++++
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  | 11 +--
 .../fragment_inform_really_not_share.xml      | 53 +++++++++++++++
 6 files changed, 126 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_inform_really_not_share.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 1a8c94918..cef97bebe 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.model.VenueInfo
+import org.crowdnotifier.android.sdk.utils.Base64Util
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -27,7 +28,7 @@ import kotlin.math.max
 
 
 private const val MASTER_PUBLIC_KEY_BASE64 =
-	"TqRYigTM6YVO7/UJQuu3199mRqj0cSTp4DXCFlxbz9UqDLrASr07C9HJVWYtl08V7xGEGSSXWbQSRfRt/bqqDK0HQQGnZ/VWZxToo88txtgQ1ij7pYJwaBHAGGndLICL"
+	"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"
 private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
 private const val ONE_HOUR_IN_MILLIS = 60 * ONE_MINUTE_IN_MILLIS
 private const val AUTOMATIC_CHECKOUT_DELAY_MS = 12 * ONE_HOUR_IN_MILLIS
@@ -89,7 +90,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 			swissCovidLocationData.toByteArray(),
 			System.currentTimeMillis() / 1000,
 			(System.currentTimeMillis() + QR_CODE_VALIDITY_DURATION_MS) / 1000,
-			Base64.decode(MASTER_PUBLIC_KEY_BASE64, Base64.DEFAULT)
+			Base64Util.fromBase64(MASTER_PUBLIC_KEY_BASE64)
 		)
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 3e1fbc3dc..6274005a5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -155,7 +155,7 @@ class InformFragment : Fragment() {
 	private fun handleInformExposedRequestError(throwable: Throwable) {
 		when (throwable) {
 			is ResponseError -> showErrorDialog(InformRequestError.RED_STATUS_ERROR, throwable.statusCode.toString())
-			is CancellationException -> showErrorDialog(InformRequestError.RED_USER_CANCELLED_SHARE)
+			is CancellationException -> showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 			is ApiException -> showErrorDialog(InformRequestError.RED_EXPOSURE_API_ERROR, throwable.statusCode.toString())
 			else -> showErrorDialog(InformRequestError.RED_MISC_NETWORK_ERROR)
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 61a50d759..5e7a1a7a8 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -3,6 +3,7 @@ package ch.admin.bag.dp3t.inform
 import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.liveData
 import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
 import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
@@ -20,6 +21,7 @@ import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.models.DayDate
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
+import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -37,7 +39,7 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 	private val secureStorage = SecureStorage.getInstance(application)
 
 	//TODO: Persist these Items for DKA cases
-	val selectableDiaryItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
+	var selectableCheckinItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
 
 	fun userUpload() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
@@ -62,43 +64,19 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 
 	fun authenticateInputAndGetDP3TAccessToken(authCode: String) = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
-		val lastTimestamp = secureStorage.lastInformRequestTime
-		val lastDP3TAuthToken = secureStorage.lastDP3TInformToken
-		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && lastDP3TAuthToken != null) {
-			emit(Resource.success(lastDP3TAuthToken))
-		} else {
-			try {
-				val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(authCode, 0))
-				secureStorage.saveInformTimeAndCodeAndToken(
-					authCode,
-					accessTokens.dp3TAccessToken.accessToken,
-					accessTokens.checkInAccessToken.accessToken
-				)
-				emit(Resource.success(data = accessTokens.dp3TAccessToken.accessToken))
-			} catch (exception: Exception) {
-				emit(Resource.error(data = null, exception = exception))
-			}
+		try {
+			emit(Resource.success(loadAccessToken(authCode, isCheckin = false)))
+		} catch (exception: Exception) {
+			emit(Resource.error(data = null, exception = exception))
 		}
 	}
 
 	fun authenticateInputAndGetCheckinAccessToken(authCode: String) = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
-		val lastTimestamp = secureStorage.lastInformRequestTime
-		val lastCheckinAuthToken = secureStorage.lastCheckinInformToken
-		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && lastCheckinAuthToken != null) {
-			emit(Resource.success(lastCheckinAuthToken))
-		} else {
-			try {
-				val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(authCode, 0))
-				secureStorage.saveInformTimeAndCodeAndToken(
-					authCode,
-					accessTokens.dp3TAccessToken.accessToken,
-					accessTokens.checkInAccessToken.accessToken
-				)
-				emit(Resource.success(data = accessTokens.checkInAccessToken.accessToken))
-			} catch (exception: Exception) {
-				emit(Resource.error(data = null, exception = exception))
-			}
+		try {
+			emit(Resource.success(loadAccessToken(authCode, isCheckin = true)))
+		} catch (exception: Exception) {
+			emit(Resource.error(data = null, exception = exception))
 		}
 	}
 
@@ -139,9 +117,30 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 		result?.let { emit(it) }
 	}
 
+	private suspend fun loadAccessToken(authCode: String, isCheckin: Boolean): String {
+		val lastTimestamp = secureStorage.lastInformRequestTime
+		val authToken = if (isCheckin) secureStorage.lastCheckinInformToken else secureStorage.lastDP3TInformToken
+		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && authToken != null) {
+			return authToken
+		} else {
+			val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(authCode, 0))
+			secureStorage.saveInformTimeAndCodeAndToken(
+				authCode, accessTokens.dp3TAccessToken.accessToken, accessTokens.checkInAccessToken.accessToken
+			)
+			return if (isCheckin) accessTokens.checkInAccessToken.accessToken else accessTokens.dp3TAccessToken.accessToken
+		}
+	}
+
+	fun filterSelectableDiaryItems() {
+		selectableCheckinItems = selectableCheckinItems.filter {
+			Date(it.diaryEntry.departureTime).after(JwtUtil.getOnsetDate(secureStorage.lastCheckinInformToken))
+		}
+	}
+
+
 	private fun getUserUploadPayload(): UserUploadPayload {
 		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
-		selectableDiaryItems.filter {
+		selectableCheckinItems.filter {
 			it.isSelected
 		}.map {
 			CrowdNotifier.generateUserUploadInfo(it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
new file mode 100644
index 000000000..14ae6e3e3
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -0,0 +1,29 @@
+package ch.admin.bag.dp3t.inform
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentInformReallyNotShareBinding
+import ch.admin.bag.dp3t.util.showFragment
+
+class ReallyNotShareFragment : Fragment() {
+
+	companion object {
+		fun newInstance() = ReallyNotShareFragment()
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return FragmentInformReallyNotShareBinding.inflate(inflater).apply {
+			tryAgainButton.setOnClickListener {
+				//TODO: Implement sharing
+			}
+			dontSendButton.setOnClickListener {
+				showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+			}
+		}.root
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index ffa9a0d43..07658f960 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -26,22 +26,24 @@ class ShareCheckinsFragment : Fragment() {
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		binding = FragmentShareCheckinsBinding.inflate(inflater).apply {
+			informViewModel.filterSelectableDiaryItems()
 			val adapter = CheckinAdapter()
 			checkinsRecyclerView.adapter = adapter
 			checkinsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
-			adapter.setData(informViewModel.selectableDiaryItems)
+			adapter.setData(informViewModel.selectableCheckinItems)
 			adapter.itemSelectionListener { selectedItem, selected ->
-				informViewModel.selectableDiaryItems.find { it.diaryEntry == selectedItem }?.isSelected = selected
+				informViewModel.selectableCheckinItems.find { it.diaryEntry == selectedItem }?.isSelected = selected
 			}
 			selectAllCheckbox.setOnCheckedChangeListener { _, isChecked ->
-				informViewModel.selectableDiaryItems.forEach { it.isSelected = isChecked }
-				adapter.setData(informViewModel.selectableDiaryItems)
+				informViewModel.selectableCheckinItems.forEach { it.isSelected = isChecked }
+				adapter.setData(informViewModel.selectableCheckinItems)
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
 
 			}
 			sendButton.setOnClickListener {
+				//TODO Use auth Token for user upload
 				informViewModel.userUpload().observe(viewLifecycleOwner) {
 					when (it.status) {
 						Status.LOADING -> {
@@ -60,4 +62,5 @@ class ShareCheckinsFragment : Fragment() {
 		return binding.root
 	}
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_inform_really_not_share.xml b/app/src/main/res/layout/fragment_inform_really_not_share.xml
new file mode 100644
index 000000000..bdb027fb2
--- /dev/null
+++ b/app/src/main/res/layout/fragment_inform_really_not_share.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<TextView
+			style="@style/NextStep.Text.Title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_huge"
+			android:gravity="bottom|center_horizontal"
+			android:text="@string/inform_really_not_share_title" />
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_medium_large"
+			android:gravity="center_horizontal"
+			android:paddingStart="@dimen/spacing_huge"
+			android:paddingEnd="@dimen/spacing_huge"
+			android:text="@string/inform_really_not_share_subtitle" />
+
+		<Button
+			android:id="@+id/try_again_button"
+			style="@style/NextStep.Button.Purple"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginTop="@dimen/spacing_huge"
+			android:layout_marginBottom="@dimen/spacing_medium_large"
+			android:text="@string/inform_try_again_button_title" />
+
+		<TextView
+			android:id="@+id/dont_send_button"
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/spacing_medium_large"
+			android:background="?selectableItemBackground"
+			android:padding="@dimen/spacing_small"
+			android:text="@string/inform_dont_send_button_title"
+			android:visibility="visible" />
+
+	</LinearLayout>
+</ScrollView>

From d3cfc52ca25610b609e243c5220d5784a7b1368d Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 10 May 2021 14:40:29 +0200
Subject: [PATCH 068/207] Update SDK and make some changes on Inform Flow

---
 app/build.gradle                              |   2 +-
 .../networking/TraceKeysRepository.java       |   2 +-
 .../admin/bag/dp3t/inform/InformFragment.kt   |  23 ++--
 .../admin/bag/dp3t/inform/InformViewModel.kt  |   3 +-
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  |   2 +-
 .../bag/dp3t/networking/AuthCodeRepository.kt |  18 ++-
 .../bag/dp3t/networking/AuthCodeService.kt    |   2 +-
 app/src/main/proto/Crowdnotifier.proto        |   2 +-
 app/src/main/res/layout/fragment_inform.xml   | 128 ++++++++++--------
 9 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7e96f1cd6..b31c06d3a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,7 +207,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-8'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-9'
 
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index f502b3d02..61aaad22f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -88,7 +88,7 @@ private List<ProblematicEventInfo> handleSuccessfulResponse(Response<ResponseBod
 				problematicEventInfos.add(new ProblematicEventInfo(event.getIdentity().toByteArray(),
 						event.getSecretKeyForIdentity().toByteArray(),
 						event.getEncryptedAssociatedData().toByteArray(), event.getCipherTextNonce().toByteArray(),
-						new DayDate(event.getDay()))
+						new DayDate(event.getDay() * 1000L))
 				);
 			}
 			return problematicEventInfos;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 6274005a5..1da02e6cf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -40,7 +40,6 @@ class InformFragment : Fragment() {
 
 	private val tracingViewModel: TracingViewModel by activityViewModels()
 	private val informViewModel: InformViewModel by activityViewModels()
-	private lateinit var progressDialog: AlertDialog
 
 	private lateinit var binding: FragmentInformBinding
 
@@ -54,7 +53,6 @@ class InformFragment : Fragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentInformBinding.inflate(inflater).apply {
 			(requireActivity() as InformActivity).allowBackButton(true)
-			progressDialog = AlertDialog.Builder(requireContext()).setView(R.layout.dialog_loading).create()
 			covidcodeInput.addTextChangedListener(object : ChainedEditTextListener {
 				override fun onTextChanged(input: String) {
 					sendButton.isEnabled = input.matches(REGEX_CODE_PATTERN.toRegex())
@@ -103,11 +101,11 @@ class InformFragment : Fragment() {
 		informViewModel.authenticateInputAndGetDP3TAccessToken(authCode).observe(viewLifecycleOwner) {
 			when (it.status) {
 				Status.LOADING -> {
-					setProgressDialogVisible(true)
+					setLoadingViewVisible(true)
 					binding.sendButton.isEnabled = false
 				}
 				Status.ERROR -> {
-					setProgressDialogVisible(false)
+					setLoadingViewVisible(false)
 					it.exception?.let { exception ->
 						handleAuthenticateRequestError(exception)
 					}
@@ -133,18 +131,18 @@ class InformFragment : Fragment() {
 		informViewModel.informExposed(accessToken, requireActivity()).observe(viewLifecycleOwner) {
 			when (it.status) {
 				Status.LOADING -> {
-					setProgressDialogVisible(true)
+					setLoadingViewVisible(true)
 					binding.sendButton.isEnabled = false
 				}
 				Status.ERROR -> {
-					setProgressDialogVisible(false)
+					setLoadingViewVisible(false)
 					it.exception?.let { exception ->
 						handleInformExposedRequestError(exception)
 					}
 					binding.sendButton.isEnabled = true
 				}
 				Status.SUCCESS -> {
-					setProgressDialogVisible(false)
+					setLoadingViewVisible(false)
 					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
 					binding.sendButton.isEnabled = true
 				}
@@ -162,13 +160,8 @@ class InformFragment : Fragment() {
 		throwable.printStackTrace()
 	}
 
-	private fun setProgressDialogVisible(isVisible: Boolean) {
-		if (isVisible && !progressDialog.isShowing) {
-			progressDialog.show()
-		}
-		if (!isVisible && progressDialog.isShowing) {
-			progressDialog.dismiss()
-		}
+	private fun setLoadingViewVisible(isVisible: Boolean) {
+		binding.loadingView.isVisible = isVisible
 	}
 
 	private fun askUserToEnableTracing(authCode: String) {
@@ -199,7 +192,7 @@ class InformFragment : Fragment() {
 	private fun setInvalidCodeErrorVisible(visible: Boolean) {
 		binding.apply {
 			informInvalidCodeError.isVisible = visible
-			informInputText.isVisible = visible
+			informInputText.isVisible = !visible
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 5e7a1a7a8..47fbf47e7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -3,7 +3,6 @@ package ch.admin.bag.dp3t.inform
 import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.liveData
 import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
 import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
@@ -66,7 +65,7 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 		emit(Resource.loading(data = null))
 		try {
 			emit(Resource.success(loadAccessToken(authCode, isCheckin = false)))
-		} catch (exception: Exception) {
+		} catch (exception: Throwable) {
 			emit(Resource.error(data = null, exception = exception))
 		}
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index 07658f960..a3e6480bf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -40,7 +40,7 @@ class ShareCheckinsFragment : Fragment() {
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
-
+				//TODO: Implement
 			}
 			sendButton.setOnClickListener {
 				//TODO Use auth Token for user upload
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
index 8976773ce..ce4156d39 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
@@ -10,8 +10,6 @@
 package ch.admin.bag.dp3t.networking
 
 import android.content.Context
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
 import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
@@ -23,9 +21,7 @@ import okhttp3.Cache
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import org.dpppt.android.sdk.DP3T
-import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.backend.UserAgentInterceptor
-import org.dpppt.android.sdk.internal.logger.Logger
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.io.IOException
@@ -71,5 +67,17 @@ class AuthCodeRepository(context: Context) {
 			return@withContext response.body() ?: throw ResponseError(response.raw())
 		}
 
-	suspend fun getAccessToken(authCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModelV2 = authCodeService.getAccessToken(authCode)
+	suspend fun getAccessToken(authCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModelV2 =
+		withContext(Dispatchers.IO) {
+			val response = authCodeService.getAccessTokenV2(authCode)
+			if (!response.isSuccessful) {
+				if (response.code() == 404) {
+					throw InvalidCodeError()
+				} else {
+					throw ResponseError(response.raw())
+				}
+			}
+			return@withContext response.body() ?: throw ResponseError(response.raw())
+		}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
index 5b206848c..24308fea0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
@@ -24,6 +24,6 @@ interface AuthCodeService {
 
 	@Headers("accept: */*", "content-type: application/json")
 	@POST("v2/onset")
-	suspend fun getAccessToken(@Body code: AuthenticationCodeRequestModel): AuthenticationCodeResponseModelV2
+	suspend fun getAccessTokenV2(@Body code: AuthenticationCodeRequestModel): Response<AuthenticationCodeResponseModelV2>
 
 }
\ No newline at end of file
diff --git a/app/src/main/proto/Crowdnotifier.proto b/app/src/main/proto/Crowdnotifier.proto
index 393460e66..bc37f7852 100644
--- a/app/src/main/proto/Crowdnotifier.proto
+++ b/app/src/main/proto/Crowdnotifier.proto
@@ -12,7 +12,7 @@ message ProblematicEvent {
   int32 version = 1;
   bytes identity = 2;
   bytes secretKeyForIdentity = 3;
-  int64 day = 4;
+  int64 day = 4; // in seconds
   bytes encryptedAssociatedData = 5;
   bytes cipherTextNonce = 6;
 }
diff --git a/app/src/main/res/layout/fragment_inform.xml b/app/src/main/res/layout/fragment_inform.xml
index 31dafed18..29ef7ee8e 100644
--- a/app/src/main/res/layout/fragment_inform.xml
+++ b/app/src/main/res/layout/fragment_inform.xml
@@ -11,8 +11,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:background="@color/white"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="@color/white">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -29,75 +29,95 @@
 			android:layout_gravity="end"
 			android:text="@string/cancel" />
 
-		<LinearLayout
+		<FrameLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_huge"
-			android:orientation="vertical">
-
-			<TextView
-				style="@style/NextStep.Text.Title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="bottom|center_horizontal"
-				android:text="@string/inform_code_title" />
+			android:layout_height="wrap_content">
 
 			<LinearLayout
-				android:id="@+id/inform_invalid_code_error"
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"
-				android:layout_marginTop="@dimen/spacing_very_small"
-				android:padding="@dimen/spacing_medium"
-				android:gravity="center_horizontal"
-				android:orientation="vertical"
-				android:background="?selectableItemBackground"
-				android:visibility="gone"
-				tools:visibility="visible">
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:orientation="vertical">
 
 				<TextView
-					style="@style/NextStep.Text.Bold.Red"
+					style="@style/NextStep.Text.Title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="bottom|center_horizontal"
+					android:text="@string/inform_code_title" />
+
+				<LinearLayout
+					android:id="@+id/inform_invalid_code_error"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="@string/inform_code_invalid_title" />
+					android:layout_gravity="center_horizontal"
+					android:layout_marginTop="@dimen/spacing_very_small"
+					android:background="?selectableItemBackground"
+					android:gravity="center_horizontal"
+					android:orientation="vertical"
+					android:padding="@dimen/spacing_medium"
+					android:visibility="gone"
+					tools:visibility="visible">
+
+					<TextView
+						style="@style/NextStep.Text.Bold.Red"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="@string/inform_code_invalid_title" />
+
+					<TextView
+						style="@style/NextStep.Text.Red"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:gravity="center_horizontal"
+						android:text="@string/inform_code_invalid_subtitle" />
+
+				</LinearLayout>
 
 				<TextView
-					style="@style/NextStep.Text.Red"
-					android:layout_width="wrap_content"
+					android:id="@+id/inform_input_text"
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_medium_large"
+					android:layout_marginBottom="@dimen/spacing_medium"
 					android:gravity="center_horizontal"
-					android:text="@string/inform_code_invalid_subtitle" />
+					android:paddingStart="@dimen/spacing_huge"
+					android:paddingEnd="@dimen/spacing_huge"
+					android:text="@string/inform_code_text" />
+
+				<ch.admin.bag.dp3t.inform.views.ChainedEditText
+					android:id="@+id/covidcode_input"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/spacing_huge" />
+
+				<Button
+					android:id="@+id/send_button"
+					style="@style/NextStep.Button.Purple"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:layout_marginBottom="@dimen/spacing_large"
+					android:enabled="false"
+					android:text="@string/inform_send_button_title" />
 
 			</LinearLayout>
 
-			<TextView
-				android:id="@+id/inform_input_text"
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_medium_large"
-				android:layout_marginBottom="@dimen/spacing_medium"
-				android:gravity="center_horizontal"
-				android:paddingStart="@dimen/spacing_huge"
-				android:paddingEnd="@dimen/spacing_huge"
-				android:text="@string/inform_code_text" />
-
-			<ch.admin.bag.dp3t.inform.views.ChainedEditText
-				android:id="@+id/covidcode_input"
+			<FrameLayout
+				android:id="@+id/loading_view"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/spacing_huge" />
+				android:layout_height="match_parent"
+				android:background="@color/transparent_milk"
+				android:visibility="gone">
 
-			<Button
-				android:id="@+id/send_button"
-				style="@style/NextStep.Button.Purple"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"
-				android:layout_marginBottom="@dimen/spacing_large"
-				android:enabled="false"
-				android:text="@string/inform_send_button_title" />
+				<ProgressBar
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center" />
+
+			</FrameLayout>
 
-		</LinearLayout>
+		</FrameLayout>
 	</LinearLayout>
 </ScrollView>
\ No newline at end of file

From 97b0113268f969213867658987d9341198133a72 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 10 May 2021 15:28:56 +0200
Subject: [PATCH 069/207] Implement ReallyNotShareFragment

---
 .../admin/bag/dp3t/inform/InformFragment.kt   | 127 +---------------
 .../bag/dp3t/inform/ReallyNotShareFragment.kt |  30 +++-
 .../dp3t/inform/TraceKeyShareBaseFragment.kt  | 140 ++++++++++++++++++
 .../fragment_inform_really_not_share.xml      | 102 ++++++++-----
 4 files changed, 235 insertions(+), 164 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 1da02e6cf..491ab0cbc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -13,33 +13,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentInformBinding
-import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.inform.views.ChainedEditText
 import ch.admin.bag.dp3t.inform.views.ChainedEditText.ChainedEditTextListener
-import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
-import ch.admin.bag.dp3t.networking.errors.ResponseError
-import ch.admin.bag.dp3t.util.ENExceptionHelper
 import ch.admin.bag.dp3t.util.PhoneUtil
 import ch.admin.bag.dp3t.util.showFragment
-import ch.admin.bag.dp3t.viewmodel.TracingViewModel
-import com.google.android.gms.common.api.ApiException
-import org.dpppt.android.sdk.DP3T
-import org.dpppt.android.sdk.internal.logger.Logger
-import java.util.concurrent.CancellationException
 
 private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}"
 
-class InformFragment : Fragment() {
-
-	private val tracingViewModel: TracingViewModel by activityViewModels()
-	private val informViewModel: InformViewModel by activityViewModels()
+class InformFragment : TraceKeyShareBaseFragment() {
 
 	private lateinit var binding: FragmentInformBinding
 
@@ -77,12 +61,7 @@ class InformFragment : Fragment() {
 				sendButton.isEnabled = false
 				setInvalidCodeErrorVisible(false)
 				val authCode = covidcodeInput.text
-				val isTracingEnabled = DP3T.isTracingEnabled(requireContext())
-				if (isTracingEnabled) {
-					authenticateInputAndInformExposed(authCode)
-				} else {
-					askUserToEnableTracing(authCode)
-				}
+				authenticateInputAndInformExposed(authCode)
 			}
 			cancelButton.setOnClickListener { requireActivity().finish() }
 			informInvalidCodeError.setOnClickListener { PhoneUtil.callAppHotline(it.context) }
@@ -97,114 +76,24 @@ class InformFragment : Fragment() {
 		binding.covidcodeInput.requestFocus()
 	}
 
-	private fun authenticateInputAndInformExposed(authCode: String) {
-		informViewModel.authenticateInputAndGetDP3TAccessToken(authCode).observe(viewLifecycleOwner) {
-			when (it.status) {
-				Status.LOADING -> {
-					setLoadingViewVisible(true)
-					binding.sendButton.isEnabled = false
-				}
-				Status.ERROR -> {
-					setLoadingViewVisible(false)
-					it.exception?.let { exception ->
-						handleAuthenticateRequestError(exception)
-					}
-					binding.sendButton.isEnabled = true
-				}
-				Status.SUCCESS -> {
-					it.data?.let { accessToken -> informExposed(accessToken) }
-				}
-			}
-		}
-	}
-
-	private fun handleAuthenticateRequestError(throwable: Throwable) {
-		when (throwable) {
-			is InvalidCodeError -> setInvalidCodeErrorVisible(true)
-			is ResponseError -> showErrorDialog(InformRequestError.BLACK_STATUS_ERROR, throwable.statusCode.toString())
-			else -> showErrorDialog(InformRequestError.BLACK_MISC_NETWORK_ERROR)
-		}
-		throwable.printStackTrace()
-	}
-
-	private fun informExposed(accessToken: String) {
-		informViewModel.informExposed(accessToken, requireActivity()).observe(viewLifecycleOwner) {
-			when (it.status) {
-				Status.LOADING -> {
-					setLoadingViewVisible(true)
-					binding.sendButton.isEnabled = false
-				}
-				Status.ERROR -> {
-					setLoadingViewVisible(false)
-					it.exception?.let { exception ->
-						handleInformExposedRequestError(exception)
-					}
-					binding.sendButton.isEnabled = true
-				}
-				Status.SUCCESS -> {
-					setLoadingViewVisible(false)
-					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
-					binding.sendButton.isEnabled = true
-				}
-			}
-		}
-	}
 
-	private fun handleInformExposedRequestError(throwable: Throwable) {
-		when (throwable) {
-			is ResponseError -> showErrorDialog(InformRequestError.RED_STATUS_ERROR, throwable.statusCode.toString())
-			is CancellationException -> showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
-			is ApiException -> showErrorDialog(InformRequestError.RED_EXPOSURE_API_ERROR, throwable.statusCode.toString())
-			else -> showErrorDialog(InformRequestError.RED_MISC_NETWORK_ERROR)
-		}
-		throwable.printStackTrace()
-	}
-
-	private fun setLoadingViewVisible(isVisible: Boolean) {
+	override fun setLoadingViewVisible(isVisible: Boolean) {
 		binding.loadingView.isVisible = isVisible
 	}
 
-	private fun askUserToEnableTracing(authCode: String) {
-		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
-			.setMessage(R.string.android_inform_tracing_enabled_explanation)
-			.setOnCancelListener { binding.sendButton.isEnabled = true }
-			.setNegativeButton(R.string.cancel) { _, _ -> binding.sendButton.isEnabled = true }
-			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(authCode) }
-			.show()
-	}
-
-	private fun enableTracing(authCode: String) {
-		tracingViewModel.enableTracing(requireActivity(),
-			{ authenticateInputAndInformExposed(authCode) },
-			{ e: Exception? ->
-				val message = ENExceptionHelper.getErrorMessage(e, activity)
-				Logger.e(TAG, message)
-				AlertDialog.Builder(requireActivity(), R.style.NextStep_AlertDialogStyle)
-					.setTitle(R.string.android_en_start_failure)
-					.setMessage(message)
-					.setOnDismissListener { binding.sendButton.isEnabled = true }
-					.setPositiveButton(R.string.android_button_ok) { _, _ -> }
-					.show()
-			}
-		) { binding.sendButton.isEnabled = true }
+	override fun setSendButtonEnabled(isEnabled: Boolean) {
+		binding.sendButton.isEnabled = isEnabled
 	}
 
-	private fun setInvalidCodeErrorVisible(visible: Boolean) {
+	override fun setInvalidCodeErrorVisible(visible: Boolean) {
 		binding.apply {
 			informInvalidCodeError.isVisible = visible
 			informInputText.isVisible = !visible
 		}
 	}
 
-	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
-		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
-			.setMessage(error.errorMessage)
-			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
-		val errorCode = error.getErrorCode(addErrorCode)
-		val errorCodeView = layoutInflater.inflate(R.layout.view_dialog_error_code, view as ViewGroup?, false) as TextView
-		errorCodeView.text = errorCode
-		errorDialogBuilder.setView(errorCodeView)
-		errorDialogBuilder.show()
+	override fun performNotShareAction() {
+		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index 14ae6e3e3..f633496ae 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -4,26 +4,46 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentInformReallyNotShareBinding
 import ch.admin.bag.dp3t.util.showFragment
 
-class ReallyNotShareFragment : Fragment() {
+class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 
 	companion object {
 		fun newInstance() = ReallyNotShareFragment()
 	}
 
+	private lateinit var binding: FragmentInformReallyNotShareBinding
+
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return FragmentInformReallyNotShareBinding.inflate(inflater).apply {
+		binding = FragmentInformReallyNotShareBinding.inflate(inflater).apply {
+			(requireActivity() as InformActivity).allowBackButton(false)
 			tryAgainButton.setOnClickListener {
-				//TODO: Implement sharing
+				informViewModel.getLastAuthCode()?.let { authenticateInputAndInformExposed(it) }
 			}
 			dontSendButton.setOnClickListener {
 				showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
 			}
-		}.root
+		}
+		return binding.root
+	}
+
+	override fun setLoadingViewVisible(isVisible: Boolean) {
+		binding.loadingView.isVisible = isVisible
+	}
+
+	override fun setSendButtonEnabled(isEnabled: Boolean) {
+		binding.tryAgainButton.isEnabled = isEnabled
+	}
+
+	override fun setInvalidCodeErrorVisible(isVisible: Boolean) {
+		// The Code must be valid in this fragment otherwise we cannot get here
+	}
+
+	override fun performNotShareAction() {
+		// stay on this screen
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
new file mode 100644
index 000000000..c6153c94e
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -0,0 +1,140 @@
+package ch.admin.bag.dp3t.inform
+
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.inform.models.Status
+import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
+import ch.admin.bag.dp3t.networking.errors.ResponseError
+import ch.admin.bag.dp3t.util.ENExceptionHelper
+import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import com.google.android.gms.common.api.ApiException
+import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.internal.logger.Logger
+import java.util.concurrent.CancellationException
+
+abstract class TraceKeyShareBaseFragment : Fragment() {
+
+
+	companion object {
+		private const val TAG = "TraceKeyShareBaseFragment"
+	}
+
+	protected val informViewModel: InformViewModel by activityViewModels()
+	private val tracingViewModel: TracingViewModel by activityViewModels()
+
+	abstract fun setLoadingViewVisible(isVisible: Boolean)
+	abstract fun setSendButtonEnabled(isEnabled: Boolean)
+	abstract fun setInvalidCodeErrorVisible(isVisible: Boolean)
+	abstract fun performNotShareAction()
+
+	protected fun authenticateInputAndInformExposed(authCode: String) {
+		val isTracingEnabled = DP3T.isTracingEnabled(requireContext())
+		if (!isTracingEnabled) {
+			askUserToEnableTracing(authCode)
+			return
+		}
+
+		informViewModel.authenticateInputAndGetDP3TAccessToken(authCode).observe(viewLifecycleOwner) {
+			when (it.status) {
+				Status.LOADING -> {
+					setLoadingViewVisible(true)
+					setSendButtonEnabled(false)
+				}
+				Status.ERROR -> {
+					setLoadingViewVisible(false)
+					it.exception?.let { exception ->
+						handleAuthenticateRequestError(exception)
+					}
+					setSendButtonEnabled(true)
+				}
+				Status.SUCCESS -> {
+					it.data?.let { accessToken -> informExposed(accessToken) }
+				}
+			}
+		}
+	}
+
+	private fun handleAuthenticateRequestError(throwable: Throwable) {
+		when (throwable) {
+			is InvalidCodeError -> setInvalidCodeErrorVisible(true)
+			is ResponseError -> showErrorDialog(InformRequestError.BLACK_STATUS_ERROR, throwable.statusCode.toString())
+			else -> showErrorDialog(InformRequestError.BLACK_MISC_NETWORK_ERROR)
+		}
+		throwable.printStackTrace()
+	}
+
+	private fun informExposed(accessToken: String) {
+		informViewModel.informExposed(accessToken, requireActivity()).observe(viewLifecycleOwner) {
+			when (it.status) {
+				Status.LOADING -> {
+					setLoadingViewVisible(true)
+					setSendButtonEnabled(false)
+				}
+				Status.ERROR -> {
+					setLoadingViewVisible(false)
+					it.exception?.let { exception ->
+						handleInformExposedRequestError(exception)
+					}
+					setSendButtonEnabled(true)
+				}
+				Status.SUCCESS -> {
+					setLoadingViewVisible(false)
+					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+					setSendButtonEnabled(true)
+				}
+			}
+		}
+	}
+
+	private fun handleInformExposedRequestError(throwable: Throwable) {
+		when (throwable) {
+			is ResponseError -> showErrorDialog(InformRequestError.RED_STATUS_ERROR, throwable.statusCode.toString())
+			is CancellationException -> performNotShareAction()
+			is ApiException -> showErrorDialog(InformRequestError.RED_EXPOSURE_API_ERROR, throwable.statusCode.toString())
+			else -> showErrorDialog(InformRequestError.RED_MISC_NETWORK_ERROR)
+		}
+		throwable.printStackTrace()
+	}
+
+	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
+		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(error.errorMessage)
+			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
+		val errorCode = error.getErrorCode(addErrorCode)
+		val errorCodeView = layoutInflater.inflate(R.layout.view_dialog_error_code, view as ViewGroup?, false) as TextView
+		errorCodeView.text = errorCode
+		errorDialogBuilder.setView(errorCodeView)
+		errorDialogBuilder.show()
+	}
+
+	private fun askUserToEnableTracing(authCode: String) {
+		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.android_inform_tracing_enabled_explanation)
+			.setOnCancelListener { setSendButtonEnabled(true) }
+			.setNegativeButton(R.string.cancel) { _, _ -> setSendButtonEnabled(true) }
+			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(authCode) }
+			.show()
+	}
+
+	private fun enableTracing(authCode: String) {
+		tracingViewModel.enableTracing(requireActivity(),
+			{ authenticateInputAndInformExposed(authCode) },
+			{ e: Exception? ->
+				val message = ENExceptionHelper.getErrorMessage(e, activity)
+				Logger.e(TAG, message)
+				AlertDialog.Builder(requireActivity(), R.style.NextStep_AlertDialogStyle)
+					.setTitle(R.string.android_en_start_failure)
+					.setMessage(message)
+					.setOnDismissListener { setSendButtonEnabled(true) }
+					.setPositiveButton(R.string.android_button_ok) { _, _ -> }
+					.show()
+			}
+		) { setSendButtonEnabled(true) }
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_inform_really_not_share.xml b/app/src/main/res/layout/fragment_inform_really_not_share.xml
index bdb027fb2..8ae2804a1 100644
--- a/app/src/main/res/layout/fragment_inform_really_not_share.xml
+++ b/app/src/main/res/layout/fragment_inform_really_not_share.xml
@@ -1,53 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<LinearLayout
+	<FrameLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:layout_height="wrap_content">
 
-		<TextView
-			style="@style/NextStep.Text.Title"
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_huge"
-			android:gravity="bottom|center_horizontal"
-			android:text="@string/inform_really_not_share_title" />
+			android:orientation="vertical">
 
-		<TextView
-			style="@style/NextStep.Text"
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:gravity="bottom|center_horizontal"
+				android:text="@string/inform_really_not_share_title" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:gravity="center_horizontal"
+				android:paddingStart="@dimen/spacing_huge"
+				android:paddingEnd="@dimen/spacing_huge"
+				android:text="@string/inform_really_not_share_subtitle" />
+
+			<Button
+				android:id="@+id/try_again_button"
+				style="@style/NextStep.Button.Purple"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:text="@string/inform_try_again_button_title" />
+
+			<TextView
+				android:id="@+id/dont_send_button"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:background="?selectableItemBackground"
+				android:padding="@dimen/spacing_small"
+				android:text="@string/inform_dont_send_button_title"
+				android:visibility="visible" />
+
+		</LinearLayout>
+
+		<FrameLayout
+			android:id="@+id/loading_view"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_medium_large"
-			android:gravity="center_horizontal"
-			android:paddingStart="@dimen/spacing_huge"
-			android:paddingEnd="@dimen/spacing_huge"
-			android:text="@string/inform_really_not_share_subtitle" />
-
-		<Button
-			android:id="@+id/try_again_button"
-			style="@style/NextStep.Button.Purple"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_huge"
-			android:layout_marginBottom="@dimen/spacing_medium_large"
-			android:text="@string/inform_try_again_button_title" />
-
-		<TextView
-			android:id="@+id/dont_send_button"
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginBottom="@dimen/spacing_medium_large"
-			android:background="?selectableItemBackground"
-			android:padding="@dimen/spacing_small"
-			android:text="@string/inform_dont_send_button_title"
-			android:visibility="visible" />
-
-	</LinearLayout>
+			android:layout_height="match_parent"
+			android:background="@color/transparent_milk"
+			android:visibility="gone">
+
+			<ProgressBar
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center" />
+
+		</FrameLayout>
+
+	</FrameLayout>
+
 </ScrollView>

From edff132a894d82544760c81989845003d727fcff Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 11 May 2021 13:38:54 +0200
Subject: [PATCH 070/207] Add Loading Animation and Error Handling to
 ShareCheckinsFragment

---
 .../networking/UserUploadRepository.kt        |   3 +-
 .../checkin/networking/UserUploadService.kt   |   5 +-
 .../admin/bag/dp3t/inform/InformFragment.kt   |   2 +-
 .../bag/dp3t/inform/InformRequestError.java   |   5 +-
 .../admin/bag/dp3t/inform/InformViewModel.kt  |  59 ++++----
 .../bag/dp3t/inform/ReallyNotShareFragment.kt |   9 +-
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  |  62 ++++++--
 .../dp3t/inform/TraceKeyShareBaseFragment.kt  |  20 ++-
 .../res/layout/fragment_share_checkins.xml    | 142 ++++++++++--------
 9 files changed, 184 insertions(+), 123 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
index 9e405ea20..373947cdc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -25,7 +25,8 @@ class UserUploadRepository {
 		userUploadService = retrofit.create(UserUploadService::class.java)
 	}
 
-	suspend fun userUpload(userUploadPayload: UserUploadPayload) = userUploadService.userUpload(userUploadPayload)
+	suspend fun userUpload(userUploadPayload: UserUploadPayload, authorizationHeader: String) =
+		userUploadService.userUpload(userUploadPayload, authorizationHeader)
 
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt
index 272722ab7..810c4cf08 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadService.kt
@@ -2,11 +2,14 @@ package ch.admin.bag.dp3t.checkin.networking
 
 import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
 import retrofit2.http.Body
+import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface UserUploadService {
 
 	@POST("v3/userupload")
-	suspend fun userUpload(@Body userUploadPayload: UserUploadPayload)
+	suspend fun userUpload(
+		@Body userUploadPayload: UserUploadPayload, @Header("Authorization") authorizationHeader: String?
+	)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 491ab0cbc..9fee26a5d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -47,7 +47,7 @@ class InformFragment : TraceKeyShareBaseFragment() {
 				}
 			})
 
-			informViewModel.getLastAuthCode()?.let {
+			informViewModel.getLastCovidcode()?.let {
 				covidcodeInput.text = it
 			}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformRequestError.java b/app/src/main/java/ch/admin/bag/dp3t/inform/InformRequestError.java
index eaf41f6aa..2e79b2e21 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformRequestError.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformRequestError.java
@@ -7,7 +7,6 @@
  *
  * SPDX-License-Identifier: MPL-2.0
  */
-
 package ch.admin.bag.dp3t.inform;
 
 import ch.admin.bag.dp3t.R;
@@ -19,7 +18,9 @@ public enum InformRequestError {
 	RED_STATUS_ERROR(R.string.unexpected_error_with_retry, "ARST"),
 	RED_USER_CANCELLED_SHARE(R.string.user_cancelled_key_sharing_error, "ARUSCCD"),
 	RED_EXPOSURE_API_ERROR(R.string.unexpected_error_title, "AREA"),
-	RED_MISC_NETWORK_ERROR(R.string.network_error, "ARNETWE");
+	RED_MISC_NETWORK_ERROR(R.string.network_error, "ARNETWE"),
+	USER_UPLOAD_NETWORK_ERROR(R.string.network_error, "AUANETWE"),
+	USER_UPLOAD_UNKONWN_ERROR(R.string.network_error, "AUAUKWE");
 
 
 	private final int errorMessage;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 47fbf47e7..00b114aca 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -3,6 +3,7 @@ package ch.admin.bag.dp3t.inform
 import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.liveData
 import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
 import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
@@ -29,60 +30,53 @@ private const val USER_UPLOAD_VERSION = 3
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
+private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
 
-class InformViewModel(application: Application) : AndroidViewModel(application) {
+class InformViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
 
 	private val authCodeRepository = AuthCodeRepository(application)
 	private val userUploadRepository = UserUploadRepository()
 	private val diaryStorage = DiaryStorage.getInstance(application)
 	private val secureStorage = SecureStorage.getInstance(application)
 
-	//TODO: Persist these Items for DKA cases
 	var selectableCheckinItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
+	var hasSharedDP3TKeys: Boolean
+		get() = state.get<Boolean>(KEY_HAS_SHARED_DP3T_KEYS) ?: false
+		set(value) = state.set(KEY_HAS_SHARED_DP3T_KEYS, value)
 
 	fun userUpload() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
-			emit(Resource.success(data = userUploadRepository.userUpload(getUserUploadPayload())))
+			val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
+			emit(Resource.success(data = userUploadRepository.userUpload(getUserUploadPayload(), authorizationHeader)))
 		} catch (exception: Exception) {
 			emit(Resource.error(data = null, exception = exception))
 		}
 	}
 
-	fun getLastAuthCode(): String? {
-		val lastCode = secureStorage.lastInformCode
-		val lastToken = secureStorage.lastDP3TInformToken
+	fun getLastCovidcode(): String? {
+		val lastCovidcode = secureStorage.lastInformCode
 
-		if (System.currentTimeMillis() - secureStorage.lastInformRequestTime < TIMEOUT_VALID_CODE) {
-			return lastCode
-		} else if (lastCode != null || lastToken != null) {
-			secureStorage.clearInformTimeAndCodeAndToken()
+		return if (System.currentTimeMillis() - secureStorage.lastInformRequestTime < TIMEOUT_VALID_CODE) {
+			lastCovidcode
+		} else {
+			null
 		}
-		return null
 	}
 
-	fun authenticateInputAndGetDP3TAccessToken(authCode: String) = liveData(Dispatchers.IO) {
+	fun authenticateCovidcode(covidcode: String) = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
-			emit(Resource.success(loadAccessToken(authCode, isCheckin = false)))
+			emit(Resource.success(loadAccessTokens(covidcode)))
 		} catch (exception: Throwable) {
 			emit(Resource.error(data = null, exception = exception))
 		}
 	}
 
-	fun authenticateInputAndGetCheckinAccessToken(authCode: String) = liveData(Dispatchers.IO) {
+	fun informExposed(activity: Activity) = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
-		try {
-			emit(Resource.success(loadAccessToken(authCode, isCheckin = true)))
-		} catch (exception: Exception) {
-			emit(Resource.error(data = null, exception = exception))
-		}
-	}
-
-	fun informExposed(accessToken: String, activity: Activity) = liveData(Dispatchers.IO) {
-		emit(Resource.loading(data = null))
-		val authorizationHeader = getAuthorizationHeader(accessToken)
-		val onsetDate = JwtUtil.getOnsetDate(accessToken)
+		val authorizationHeader = getAuthorizationHeader(secureStorage.lastDP3TInformToken)
+		val onsetDate = JwtUtil.getOnsetDate(secureStorage.lastDP3TInformToken)
 
 		var result: Resource<Unit>? = null
 
@@ -104,6 +98,7 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 							System.currentTimeMillis() + TimeUnit.DAYS.toMillis(ISOLATION_DURATION_DAYS)
 						secureStorage.isolationEndDialogTimestamp = isolationEndDialogTimestamp
 						result = Resource.success(Unit)
+						hasSharedDP3TKeys = true
 						continuation.resume(Unit)
 					}
 
@@ -116,17 +111,15 @@ class InformViewModel(application: Application) : AndroidViewModel(application)
 		result?.let { emit(it) }
 	}
 
-	private suspend fun loadAccessToken(authCode: String, isCheckin: Boolean): String {
+	private suspend fun loadAccessTokens(covidcode: String) {
 		val lastTimestamp = secureStorage.lastInformRequestTime
-		val authToken = if (isCheckin) secureStorage.lastCheckinInformToken else secureStorage.lastDP3TInformToken
-		if (System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && authToken != null) {
-			return authToken
-		} else {
-			val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(authCode, 0))
+		val accessToken = secureStorage.lastDP3TInformToken
+		val lastCovidcode = secureStorage.lastInformCode
+		if (!(System.currentTimeMillis() - lastTimestamp < TIMEOUT_VALID_CODE && accessToken != null) || covidcode != lastCovidcode) {
+			val accessTokens = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(covidcode, 0))
 			secureStorage.saveInformTimeAndCodeAndToken(
-				authCode, accessTokens.dp3TAccessToken.accessToken, accessTokens.checkInAccessToken.accessToken
+				covidcode, accessTokens.dp3TAccessToken.accessToken, accessTokens.checkInAccessToken.accessToken
 			)
-			return if (isCheckin) accessTokens.checkInAccessToken.accessToken else accessTokens.dp3TAccessToken.accessToken
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index f633496ae..2f82167d3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentInformReallyNotShareBinding
 import ch.admin.bag.dp3t.util.showFragment
 
@@ -21,10 +22,14 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 		binding = FragmentInformReallyNotShareBinding.inflate(inflater).apply {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			tryAgainButton.setOnClickListener {
-				informViewModel.getLastAuthCode()?.let { authenticateInputAndInformExposed(it) }
+				informViewModel.getLastCovidcode()?.let { authenticateInputAndInformExposed(it) }
 			}
 			dontSendButton.setOnClickListener {
-				showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+				if (DiaryStorage.getInstance(requireContext()).entries.isNotEmpty()) {
+					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+				} else {
+					//TODO: Show "Thanks for nothing" Fragment
+				}
 			}
 		}
 		return binding.root
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index a3e6480bf..7dbf3af42 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -5,6 +5,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,6 +15,7 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentShareCheckinsBinding
 import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.util.showFragment
+import retrofit2.HttpException
 
 class ShareCheckinsFragment : Fragment() {
 
@@ -40,27 +44,55 @@ class ShareCheckinsFragment : Fragment() {
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
-				//TODO: Implement
+				if (informViewModel.hasSharedDP3TKeys) {
+					showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+				} else {
+					//TODO: Show "Thanks for nothing" Fragment
+				}
 			}
-			sendButton.setOnClickListener {
-				//TODO Use auth Token for user upload
-				informViewModel.userUpload().observe(viewLifecycleOwner) {
-					when (it.status) {
-						Status.LOADING -> {
-							//TODO: Show loading animation
-						}
-						Status.ERROR -> {
-							//TODO: Handle error
-						}
-						Status.SUCCESS -> {
-							showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
-						}
+			sendButton.setOnClickListener { performUserUpload() }
+		}
+		return binding.root
+	}
+
+	private fun performUserUpload() {
+
+		informViewModel.userUpload().observe(viewLifecycleOwner) {
+			binding.loadingView.isVisible = it.status == Status.LOADING
+			when (it.status) {
+				Status.LOADING -> showLoadingView(true)
+				Status.ERROR -> {
+					showLoadingView(false)
+					if (it.exception is HttpException) {
+						showErrorDialog(InformRequestError.USER_UPLOAD_NETWORK_ERROR, it.exception.code().toString())
+					} else {
+						showErrorDialog(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, it.exception?.message)
 					}
 				}
+				Status.SUCCESS -> {
+					showLoadingView(false)
+					showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+				}
 			}
 		}
-		return binding.root
 	}
 
+	private fun showLoadingView(isVisible: Boolean) {
+		with(binding) {
+			loadingView.isVisible = isVisible
+			sendButton.isEnabled = !isVisible
+		}
+	}
+
+	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
+		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(error.errorMessage)
+			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
+		val errorCode = error.getErrorCode(addErrorCode)
+		val errorCodeView = layoutInflater.inflate(R.layout.view_dialog_error_code, view as ViewGroup?, false) as TextView
+		errorCodeView.text = errorCode
+		errorDialogBuilder.setView(errorCodeView)
+		errorDialogBuilder.show()
+	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index c6153c94e..5eab4b8e0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -6,6 +6,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
@@ -39,7 +41,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 			return
 		}
 
-		informViewModel.authenticateInputAndGetDP3TAccessToken(authCode).observe(viewLifecycleOwner) {
+		informViewModel.authenticateCovidcode(authCode).observe(viewLifecycleOwner) {
 			when (it.status) {
 				Status.LOADING -> {
 					setLoadingViewVisible(true)
@@ -52,9 +54,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 					}
 					setSendButtonEnabled(true)
 				}
-				Status.SUCCESS -> {
-					it.data?.let { accessToken -> informExposed(accessToken) }
-				}
+				Status.SUCCESS -> informExposed()
 			}
 		}
 	}
@@ -68,8 +68,8 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 		throwable.printStackTrace()
 	}
 
-	private fun informExposed(accessToken: String) {
-		informViewModel.informExposed(accessToken, requireActivity()).observe(viewLifecycleOwner) {
+	private fun informExposed() {
+		informViewModel.informExposed(requireActivity()).observe(viewLifecycleOwner) {
 			when (it.status) {
 				Status.LOADING -> {
 					setLoadingViewVisible(true)
@@ -84,7 +84,13 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 				}
 				Status.SUCCESS -> {
 					setLoadingViewVisible(false)
-					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+					context?.let { context ->
+						if (DiaryStorage.getInstance(context).entries.isEmpty()) {
+							showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+						} else {
+							showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+						}
+					}
 					setSendButtonEnabled(true)
 				}
 			}
diff --git a/app/src/main/res/layout/fragment_share_checkins.xml b/app/src/main/res/layout/fragment_share_checkins.xml
index fd7dfab97..c0548f06d 100644
--- a/app/src/main/res/layout/fragment_share_checkins.xml
+++ b/app/src/main/res/layout/fragment_share_checkins.xml
@@ -1,79 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="@color/white"
-	android:orientation="vertical">
-
-	<TextView
-		style="@style/NextStep.Text.Title"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/spacing_huge"
-		android:gravity="bottom|center_horizontal"
-		android:text="@string/inform_share_checkins_title" />
-
-	<TextView
-		style="@style/NextStep.Text"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/spacing_medium_large"
-		android:gravity="center_horizontal"
-		android:paddingStart="@dimen/spacing_huge"
-		android:paddingEnd="@dimen/spacing_huge"
-		android:text="@string/inform_share_checkins_subtitle" />
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginHorizontal="@dimen/spacing_medium_large"
-		android:layout_marginTop="@dimen/spacing_medium_large"
-		android:background="@color/grey_light">
+		android:layout_height="match_parent"
+		android:background="@color/white"
+		android:orientation="vertical">
 
 		<TextView
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="0dp"
+			style="@style/NextStep.Text.Title"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="@dimen/spacing_large"
+			android:layout_marginTop="@dimen/spacing_huge"
+			android:gravity="bottom|center_horizontal"
+			android:text="@string/inform_share_checkins_title" />
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_medium_large"
+			android:gravity="center_horizontal"
+			android:paddingStart="@dimen/spacing_huge"
+			android:paddingEnd="@dimen/spacing_huge"
+			android:text="@string/inform_share_checkins_subtitle" />
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_medium_large"
+			android:layout_marginTop="@dimen/spacing_medium_large"
+			android:background="@color/grey_light">
+
+			<TextView
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="@dimen/spacing_large"
+				android:layout_weight="1"
+				android:text="@string/inform_share_checkins_select_all" />
+
+			<com.google.android.material.checkbox.MaterialCheckBox
+				android:id="@+id/select_all_checkbox"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+
+		</LinearLayout>
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/checkins_recycler_view"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
 			android:layout_weight="1"
-			android:text="@string/inform_share_checkins_select_all" />
+			android:clipChildren="false"
+			android:clipToPadding="false"
+			android:paddingHorizontal="@dimen/spacing_medium_large"
+			android:paddingBottom="@dimen/spacing_larger" />
 
-		<com.google.android.material.checkbox.MaterialCheckBox
-			android:id="@+id/select_all_checkbox"
+		<Button
+			android:id="@+id/send_button"
+			style="@style/NextStep.Button.Purple"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginVertical="@dimen/spacing_medium_large"
+			android:text="@string/inform_send_button_title" />
+
+		<TextView
+			android:id="@+id/dont_send_button"
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/spacing_medium_large"
+			android:background="?selectableItemBackground"
+			android:padding="@dimen/spacing_small"
+			android:text="@string/inform_dont_send_button_title"
+			android:visibility="visible" />
 
 	</LinearLayout>
 
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/checkins_recycler_view"
+	<FrameLayout
+		android:id="@+id/loading_view"
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:clipChildren="false"
-		android:clipToPadding="false"
-		android:paddingHorizontal="@dimen/spacing_medium_large"
-		android:paddingBottom="@dimen/spacing_larger" />
+		android:layout_height="match_parent"
+		android:background="@color/transparent_milk"
+		android:visibility="gone">
 
-	<Button
-		android:id="@+id/send_button"
-		style="@style/NextStep.Button.Purple"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:layout_marginVertical="@dimen/spacing_medium_large"
-		android:text="@string/inform_send_button_title" />
+		<ProgressBar
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center" />
 
-	<TextView
-		android:id="@+id/dont_send_button"
-		style="@style/NextStep.Text.Bold"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:layout_marginBottom="@dimen/spacing_medium_large"
-		android:background="?selectableItemBackground"
-		android:padding="@dimen/spacing_small"
-		android:text="@string/inform_dont_send_button_title"
-		android:visibility="visible" />
+	</FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>

From 43c5e81256d74b3f38558975e0907e6b66e3c612 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 14 May 2021 00:08:00 +0200
Subject: [PATCH 071/207] Implemented first version of Upload at the end of
 Inform flow

---
 .../admin/bag/dp3t/inform/InformFragment.kt   |  71 +++++++++----
 .../admin/bag/dp3t/inform/InformViewModel.kt  |  86 ++++++++++-----
 .../bag/dp3t/inform/ReallyNotShareFragment.kt |  30 ++++--
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  |  52 +++------
 .../dp3t/inform/TraceKeyShareBaseFragment.kt  | 100 +++++++-----------
 .../ch/admin/bag/dp3t/util/AssetUtil.java     |   2 +-
 app/src/main/res/layout/fragment_inform.xml   |  70 ++++++------
 7 files changed, 213 insertions(+), 198 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 9fee26a5d..d57b5e800 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -25,8 +25,6 @@ private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS +
 
 class InformFragment : TraceKeyShareBaseFragment() {
 
-	private lateinit var binding: FragmentInformBinding
-
 	companion object {
 		private const val TAG = "InformFragment"
 
@@ -34,12 +32,23 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		fun newInstance() = InformFragment()
 	}
 
+	private lateinit var binding: FragmentInformBinding
+
+	override fun onResume() {
+		super.onResume()
+		binding.covidcodeInput.requestFocus()
+	}
+
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentInformBinding.inflate(inflater).apply {
 			(requireActivity() as InformActivity).allowBackButton(true)
 			covidcodeInput.addTextChangedListener(object : ChainedEditTextListener {
 				override fun onTextChanged(input: String) {
-					sendButton.isEnabled = input.matches(REGEX_CODE_PATTERN.toRegex())
+					val matchesRegex = input.matches(REGEX_CODE_PATTERN.toRegex())
+					val matchesChecksum = input.matchesChecksum()
+
+					sendButton.isEnabled = matchesRegex && matchesChecksum
+					setInvalidCovidcodeErrorVisible(matchesRegex && !matchesChecksum)
 				}
 
 				override fun onEditorSendAction() {
@@ -57,12 +66,7 @@ class InformFragment : TraceKeyShareBaseFragment() {
 					covidcodeInput.text = covidCode
 				}
 			}
-			sendButton.setOnClickListener {
-				sendButton.isEnabled = false
-				setInvalidCodeErrorVisible(false)
-				val authCode = covidcodeInput.text
-				authenticateInputAndInformExposed(authCode)
-			}
+			sendButton.setOnClickListener { performContinueAction() }
 			cancelButton.setOnClickListener { requireActivity().finish() }
 			informInvalidCodeError.setOnClickListener { PhoneUtil.callAppHotline(it.context) }
 		}
@@ -70,30 +74,51 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		return binding.root
 	}
 
+	private fun performContinueAction() {
+		binding.sendButton.isEnabled = false
+		setInvalidCovidcodeErrorVisible(false)
+		informViewModel.covidCode = binding.covidcodeInput.text
+		askUserToEnableTracingIfNecessary { tracingEnabled ->
+			if (tracingEnabled) {
+				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+			} else {
+				binding.sendButton.isEnabled = true
+			}
+		}
+	}
+
+	private fun onUserGrantedTEKSharing() {
+		informViewModel.hasSharedDP3TKeys = true
+		if (informViewModel.selectableCheckinItems.isEmpty()) {
+			performUpload(onSuccess = {
+				showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+			}, onInvalidCovidCode = {
+				setInvalidCovidcodeErrorVisible(true)
+			})
+		} else {
+			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+		}
+	}
 
-	override fun onResume() {
-		super.onResume()
-		binding.covidcodeInput.requestFocus()
+	private fun onUserDidNotGrantTEKSharing() {
+		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 	}
 
+	private fun String.matchesChecksum(): Boolean {
+		//TODO: Implement checksum check
+		return true
+	}
 
 	override fun setLoadingViewVisible(isVisible: Boolean) {
 		binding.loadingView.isVisible = isVisible
+		binding.sendButton.isEnabled = !isVisible
 	}
 
-	override fun setSendButtonEnabled(isEnabled: Boolean) {
-		binding.sendButton.isEnabled = isEnabled
-	}
-
-	override fun setInvalidCodeErrorVisible(visible: Boolean) {
+	private fun setInvalidCovidcodeErrorVisible(isVisible: Boolean) {
 		binding.apply {
-			informInvalidCodeError.isVisible = visible
-			informInputText.isVisible = !visible
+			informInvalidCodeError.visibility = if (isVisible) View.VISIBLE else View.INVISIBLE
+			informInputText.visibility = if (!isVisible) View.VISIBLE else View.INVISIBLE
 		}
 	}
 
-	override fun performNotShareAction() {
-		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
-	}
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 00b114aca..3a4cae663 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -1,6 +1,5 @@
 package ch.admin.bag.dp3t.inform
 
-import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
@@ -11,17 +10,22 @@ import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
 import ch.admin.bag.dp3t.networking.AuthCodeRepository
+import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
+import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.JwtUtil
 import ch.admin.bag.dp3t.util.toUploadVenueInfo
+import com.google.android.gms.common.api.ApiException
 import kotlinx.coroutines.Dispatchers
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.models.DayDate
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
+import retrofit2.HttpException
 import java.util.*
+import java.util.concurrent.CancellationException
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -30,7 +34,9 @@ private const val USER_UPLOAD_VERSION = 3
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
+private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
+private const val KEY_HAS_SHARED_CHECKINS = "KEY_HAS_SHARED_CHECKINS"
 
 class InformViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
 
@@ -40,18 +46,57 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	private val secureStorage = SecureStorage.getInstance(application)
 
 	var selectableCheckinItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
+
+	var covidCode: String
+		get() = state.get<String>(KEY_COVIDCODE) ?: ""
+		set(value) = state.set(KEY_COVIDCODE, value)
+
 	var hasSharedDP3TKeys: Boolean
 		get() = state.get<Boolean>(KEY_HAS_SHARED_DP3T_KEYS) ?: false
 		set(value) = state.set(KEY_HAS_SHARED_DP3T_KEYS, value)
 
-	fun userUpload() = liveData(Dispatchers.IO) {
+	var hasSharedCheckins: Boolean
+		get() = state.get<Boolean>(KEY_HAS_SHARED_CHECKINS) ?: false
+		set(value) = state.set(KEY_HAS_SHARED_CHECKINS, value)
+
+	fun performUpload() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
-			val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
-			emit(Resource.success(data = userUploadRepository.userUpload(getUserUploadPayload(), authorizationHeader)))
-		} catch (exception: Exception) {
-			emit(Resource.error(data = null, exception = exception))
+			loadAccessTokens(covidCode)
+		} catch (exception: Throwable) {
+			when (exception) {
+				is InvalidCodeError -> emit(Resource.error(InformRequestError.BLACK_INVALID_AUTH_RESPONSE_FORM, exception))
+				is ResponseError -> emit(Resource.error(InformRequestError.BLACK_STATUS_ERROR, exception))
+				else -> emit(Resource.error(InformRequestError.BLACK_MISC_NETWORK_ERROR, exception))
+			}
+			return@liveData
 		}
+		try {
+			if (hasSharedDP3TKeys) {
+				uploadTEKs()
+			}
+		} catch (exception: Throwable) {
+			when (exception) {
+				is ResponseError -> emit(Resource.error(InformRequestError.RED_STATUS_ERROR, exception))
+				is CancellationException -> emit(Resource.error(InformRequestError.RED_USER_CANCELLED_SHARE, exception))
+				is ApiException -> emit(Resource.error(InformRequestError.RED_EXPOSURE_API_ERROR, exception))
+				else -> emit(Resource.error(InformRequestError.RED_MISC_NETWORK_ERROR, exception))
+			}
+			return@liveData
+		}
+		try {
+			if (hasSharedCheckins) {
+				val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
+				userUploadRepository.userUpload(getUserUploadPayload(), authorizationHeader)
+			}
+		} catch (exception: Throwable) {
+			when (exception) {
+				is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
+				else -> emit(Resource.error(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, exception))
+			}
+			return@liveData
+		}
+		emit(Resource.success(data = null))
 	}
 
 	fun getLastCovidcode(): String? {
@@ -64,25 +109,15 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 	}
 
-	fun authenticateCovidcode(covidcode: String) = liveData(Dispatchers.IO) {
-		emit(Resource.loading(data = null))
-		try {
-			emit(Resource.success(loadAccessTokens(covidcode)))
-		} catch (exception: Throwable) {
-			emit(Resource.error(data = null, exception = exception))
-		}
-	}
-
-	fun informExposed(activity: Activity) = liveData(Dispatchers.IO) {
-		emit(Resource.loading(data = null))
+	private suspend fun uploadTEKs() {
 		val authorizationHeader = getAuthorizationHeader(secureStorage.lastDP3TInformToken)
 		val onsetDate = JwtUtil.getOnsetDate(secureStorage.lastDP3TInformToken)
 
-		var result: Resource<Unit>? = null
+		var error: Throwable? = null
 
 		// Wrapping traditional callback in a suspendCoroutine
 		suspendCoroutine<Unit> { continuation ->
-			DP3T.sendIAmInfected(activity, onsetDate, ExposeeAuthMethodAuthorization(authorizationHeader),
+			DP3T.uploadTEKs(getApplication(), onsetDate, ExposeeAuthMethodAuthorization(authorizationHeader),
 				object : ResponseCallback<DayDate> {
 					override fun onSuccess(oldestSharedKeyDayDate: DayDate) {
 
@@ -97,18 +132,17 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 						val isolationEndDialogTimestamp =
 							System.currentTimeMillis() + TimeUnit.DAYS.toMillis(ISOLATION_DURATION_DAYS)
 						secureStorage.isolationEndDialogTimestamp = isolationEndDialogTimestamp
-						result = Resource.success(Unit)
 						hasSharedDP3TKeys = true
 						continuation.resume(Unit)
 					}
 
 					override fun onError(throwable: Throwable) {
-						result = Resource.error(null, throwable)
+						error = throwable
 						continuation.resume(Unit)
 					}
 				})
 		}
-		result?.let { emit(it) }
+		error?.let { throw(it) }
 	}
 
 	private suspend fun loadAccessTokens(covidcode: String) {
@@ -123,14 +157,8 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 	}
 
-	fun filterSelectableDiaryItems() {
-		selectableCheckinItems = selectableCheckinItems.filter {
-			Date(it.diaryEntry.departureTime).after(JwtUtil.getOnsetDate(secureStorage.lastCheckinInformToken))
-		}
-	}
-
-
 	private fun getUserUploadPayload(): UserUploadPayload {
+		//TODO: Pad with fake Payloads
 		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
 		selectableCheckinItems.filter {
 			it.isSelected
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index 2f82167d3..2931340ee 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -22,7 +22,8 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 		binding = FragmentInformReallyNotShareBinding.inflate(inflater).apply {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			tryAgainButton.setOnClickListener {
-				informViewModel.getLastCovidcode()?.let { authenticateInputAndInformExposed(it) }
+				tryAgainButton.isEnabled = false
+				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
 			}
 			dontSendButton.setOnClickListener {
 				if (DiaryStorage.getInstance(requireContext()).entries.isNotEmpty()) {
@@ -35,20 +36,27 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 		return binding.root
 	}
 
-	override fun setLoadingViewVisible(isVisible: Boolean) {
-		binding.loadingView.isVisible = isVisible
-	}
-
-	override fun setSendButtonEnabled(isEnabled: Boolean) {
-		binding.tryAgainButton.isEnabled = isEnabled
+	private fun onUserGrantedTEKSharing() {
+		informViewModel.hasSharedDP3TKeys = true
+		if (informViewModel.selectableCheckinItems.isEmpty()) {
+			performUpload(
+				onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) },
+				onInvalidCovidCode = {
+					//TODO: Handle Invalid Covidcode
+				})
+		} else {
+			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
+		}
 	}
 
-	override fun setInvalidCodeErrorVisible(isVisible: Boolean) {
-		// The Code must be valid in this fragment otherwise we cannot get here
+	private fun onUserDidNotGrantTEKSharing() {
+		binding.tryAgainButton.isEnabled = true
+		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 	}
 
-	override fun performNotShareAction() {
-		// stay on this screen
+	override fun setLoadingViewVisible(isVisible: Boolean) {
+		binding.loadingView.isVisible = isVisible
+		binding.tryAgainButton.isEnabled = !isVisible
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index 7dbf3af42..57dce354e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -17,20 +17,17 @@ import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.util.showFragment
 import retrofit2.HttpException
 
-class ShareCheckinsFragment : Fragment() {
+class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 
 	companion object {
 		@JvmStatic
 		fun newInstance() = ShareCheckinsFragment()
 	}
 
-	private val informViewModel: InformViewModel by activityViewModels()
-
 	private lateinit var binding: FragmentShareCheckinsBinding
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		binding = FragmentShareCheckinsBinding.inflate(inflater).apply {
-			informViewModel.filterSelectableDiaryItems()
 			val adapter = CheckinAdapter()
 			checkinsRecyclerView.adapter = adapter
 			checkinsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
@@ -45,54 +42,33 @@ class ShareCheckinsFragment : Fragment() {
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
 				if (informViewModel.hasSharedDP3TKeys) {
-					showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+					upload()
 				} else {
 					//TODO: Show "Thanks for nothing" Fragment
 				}
 			}
-			sendButton.setOnClickListener { performUserUpload() }
+			sendButton.setOnClickListener {
+				informViewModel.hasSharedCheckins = true
+				upload()
+			}
 		}
 		return binding.root
 	}
 
-	private fun performUserUpload() {
-
-		informViewModel.userUpload().observe(viewLifecycleOwner) {
-			binding.loadingView.isVisible = it.status == Status.LOADING
-			when (it.status) {
-				Status.LOADING -> showLoadingView(true)
-				Status.ERROR -> {
-					showLoadingView(false)
-					if (it.exception is HttpException) {
-						showErrorDialog(InformRequestError.USER_UPLOAD_NETWORK_ERROR, it.exception.code().toString())
-					} else {
-						showErrorDialog(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, it.exception?.message)
-					}
-				}
-				Status.SUCCESS -> {
-					showLoadingView(false)
-					showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
-				}
-			}
-		}
+	private fun upload() {
+		performUpload(onSuccess = {
+			showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+		}, onInvalidCovidCode = {
+			//TODO: Handle invalid covidcode
+		})
 	}
 
-	private fun showLoadingView(isVisible: Boolean) {
+	override fun setLoadingViewVisible(isVisible: Boolean) {
 		with(binding) {
 			loadingView.isVisible = isVisible
 			sendButton.isEnabled = !isVisible
+			dontSendButton.isEnabled = !isVisible
 		}
 	}
 
-	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
-		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
-			.setMessage(error.errorMessage)
-			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
-		val errorCode = error.getErrorCode(addErrorCode)
-		val errorCodeView = layoutInflater.inflate(R.layout.view_dialog_error_code, view as ViewGroup?, false) as TextView
-		errorCodeView.text = errorCode
-		errorDialogBuilder.setView(errorCodeView)
-		errorDialogBuilder.show()
-	}
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index 5eab4b8e0..286b03d83 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -6,18 +6,16 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
-import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.util.ENExceptionHelper
-import ch.admin.bag.dp3t.util.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import com.google.android.gms.common.api.ApiException
 import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.internal.logger.Logger
-import java.util.concurrent.CancellationException
 
 abstract class TraceKeyShareBaseFragment : Fragment() {
 
@@ -30,81 +28,55 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 	private val tracingViewModel: TracingViewModel by activityViewModels()
 
 	abstract fun setLoadingViewVisible(isVisible: Boolean)
-	abstract fun setSendButtonEnabled(isEnabled: Boolean)
-	abstract fun setInvalidCodeErrorVisible(isVisible: Boolean)
-	abstract fun performNotShareAction()
 
-	protected fun authenticateInputAndInformExposed(authCode: String) {
-		val isTracingEnabled = DP3T.isTracingEnabled(requireContext())
-		if (!isTracingEnabled) {
-			askUserToEnableTracing(authCode)
-			return
-		}
+	protected fun showShareTEKsPopup(onSuccess: () -> Unit, onError: () -> Unit) {
+		DP3T.showShareTEKsPopup(requireActivity(), object : ResponseCallback<Void> {
+			override fun onSuccess(p0: Void?) {
+				onSuccess()
+			}
 
-		informViewModel.authenticateCovidcode(authCode).observe(viewLifecycleOwner) {
-			when (it.status) {
-				Status.LOADING -> {
-					setLoadingViewVisible(true)
-					setSendButtonEnabled(false)
-				}
-				Status.ERROR -> {
-					setLoadingViewVisible(false)
-					it.exception?.let { exception ->
-						handleAuthenticateRequestError(exception)
-					}
-					setSendButtonEnabled(true)
-				}
-				Status.SUCCESS -> informExposed()
+			override fun onError(p0: Throwable?) {
+				onError()
 			}
-		}
+		})
 	}
 
-	private fun handleAuthenticateRequestError(throwable: Throwable) {
-		when (throwable) {
-			is InvalidCodeError -> setInvalidCodeErrorVisible(true)
-			is ResponseError -> showErrorDialog(InformRequestError.BLACK_STATUS_ERROR, throwable.statusCode.toString())
-			else -> showErrorDialog(InformRequestError.BLACK_MISC_NETWORK_ERROR)
+	protected fun askUserToEnableTracingIfNecessary(continuation: (isEnabled: Boolean) -> Unit) {
+		val isTracingEnabled = DP3T.isTracingEnabled(requireContext())
+		if (!isTracingEnabled) {
+			showEnableTracingDialog(continuation)
+		} else {
+			continuation(true)
 		}
-		throwable.printStackTrace()
 	}
 
-	private fun informExposed() {
-		informViewModel.informExposed(requireActivity()).observe(viewLifecycleOwner) {
+	protected fun performUpload(onSuccess: () -> Unit, onInvalidCovidCode: () -> Unit) {
+		informViewModel.performUpload().observe(viewLifecycleOwner) {
 			when (it.status) {
 				Status.LOADING -> {
 					setLoadingViewVisible(true)
-					setSendButtonEnabled(false)
 				}
 				Status.ERROR -> {
 					setLoadingViewVisible(false)
-					it.exception?.let { exception ->
-						handleInformExposedRequestError(exception)
-					}
-					setSendButtonEnabled(true)
+					handleUploadException(it, onInvalidCovidCode)
 				}
 				Status.SUCCESS -> {
 					setLoadingViewVisible(false)
-					context?.let { context ->
-						if (DiaryStorage.getInstance(context).entries.isEmpty()) {
-							showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
-						} else {
-							showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
-						}
-					}
-					setSendButtonEnabled(true)
+					onSuccess()
 				}
 			}
 		}
 	}
 
-	private fun handleInformExposedRequestError(throwable: Throwable) {
-		when (throwable) {
-			is ResponseError -> showErrorDialog(InformRequestError.RED_STATUS_ERROR, throwable.statusCode.toString())
-			is CancellationException -> performNotShareAction()
-			is ApiException -> showErrorDialog(InformRequestError.RED_EXPOSURE_API_ERROR, throwable.statusCode.toString())
-			else -> showErrorDialog(InformRequestError.RED_MISC_NETWORK_ERROR)
+	private fun handleUploadException(error: Resource<InformRequestError?>, onInvalidCovidCode: () -> Unit) {
+		if (error.data == null) return
+		when (error.exception) {
+			is InvalidCodeError -> onInvalidCovidCode()
+			is ResponseError -> showErrorDialog(error.data, error.exception.statusCode.toString())
+			is ApiException -> showErrorDialog(error.data, error.exception.statusCode.toString())
+			else -> showErrorDialog(error.data)
 		}
-		throwable.printStackTrace()
+		error.exception?.printStackTrace()
 	}
 
 	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
@@ -118,29 +90,29 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 		errorDialogBuilder.show()
 	}
 
-	private fun askUserToEnableTracing(authCode: String) {
+	private fun showEnableTracingDialog(continuation: (isEnabled: Boolean) -> Unit) {
 		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(R.string.android_inform_tracing_enabled_explanation)
-			.setOnCancelListener { setSendButtonEnabled(true) }
-			.setNegativeButton(R.string.cancel) { _, _ -> setSendButtonEnabled(true) }
-			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(authCode) }
+			.setOnCancelListener { continuation(false) }
+			.setNegativeButton(R.string.cancel) { _, _ -> continuation(false) }
+			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(continuation) }
 			.show()
 	}
 
-	private fun enableTracing(authCode: String) {
+	private fun enableTracing(continuation: (isEnabled: Boolean) -> Unit) {
 		tracingViewModel.enableTracing(requireActivity(),
-			{ authenticateInputAndInformExposed(authCode) },
+			{ continuation(true) },
 			{ e: Exception? ->
 				val message = ENExceptionHelper.getErrorMessage(e, activity)
 				Logger.e(TAG, message)
 				AlertDialog.Builder(requireActivity(), R.style.NextStep_AlertDialogStyle)
 					.setTitle(R.string.android_en_start_failure)
 					.setMessage(message)
-					.setOnDismissListener { setSendButtonEnabled(true) }
+					.setOnDismissListener { continuation(false) }
 					.setPositiveButton(R.string.android_button_ok) { _, _ -> }
 					.show()
 			}
-		) { setSendButtonEnabled(true) }
+		) { continuation(false) }
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java
index 550e904cd..1c2383cc0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java
@@ -91,7 +91,7 @@ public static String loadImpressumHtmlFile(Context context, String filename) {
 			String impressum = html.toString();
 			StringBuilder versionString = new StringBuilder(BuildConfig.VERSION_NAME)
 					.append(", ")
-					.append(org.dpppt.android.sdk.BuildConfig.VERSION_NAME);
+					.append(org.dpppt.android.sdk.BuildConfig.LIBRARY_VERSION_NAME);
 			StringBuilder buildString =
 					new StringBuilder(String.valueOf(BuildConfig.BUILD_TIME))
 							.append(" / ")
diff --git a/app/src/main/res/layout/fragment_inform.xml b/app/src/main/res/layout/fragment_inform.xml
index 29ef7ee8e..618ea4086 100644
--- a/app/src/main/res/layout/fragment_inform.xml
+++ b/app/src/main/res/layout/fragment_inform.xml
@@ -46,45 +46,51 @@
 					android:gravity="bottom|center_horizontal"
 					android:text="@string/inform_code_title" />
 
-				<LinearLayout
-					android:id="@+id/inform_invalid_code_error"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center_horizontal"
-					android:layout_marginTop="@dimen/spacing_very_small"
-					android:background="?selectableItemBackground"
-					android:gravity="center_horizontal"
-					android:orientation="vertical"
-					android:padding="@dimen/spacing_medium"
-					android:visibility="gone"
-					tools:visibility="visible">
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
 
-					<TextView
-						style="@style/NextStep.Text.Bold.Red"
+					<LinearLayout
+						android:id="@+id/inform_invalid_code_error"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:text="@string/inform_code_invalid_title" />
+						android:layout_gravity="center_horizontal"
+						android:layout_marginTop="@dimen/spacing_very_small"
+						android:background="?selectableItemBackground"
+						android:gravity="center_horizontal"
+						android:orientation="vertical"
+						android:padding="@dimen/spacing_medium"
+						android:visibility="invisible"
+						tools:visibility="visible">
+
+						<TextView
+							style="@style/NextStep.Text.Bold.Red"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="@string/inform_code_invalid_title" />
+
+						<TextView
+							style="@style/NextStep.Text.Red"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:gravity="center_horizontal"
+							android:text="@string/inform_code_invalid_subtitle" />
+
+					</LinearLayout>
 
 					<TextView
-						style="@style/NextStep.Text.Red"
-						android:layout_width="wrap_content"
+						android:id="@+id/inform_input_text"
+						style="@style/NextStep.Text"
+						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
+						android:layout_marginTop="@dimen/spacing_medium_large"
+						android:layout_marginBottom="@dimen/spacing_medium"
 						android:gravity="center_horizontal"
-						android:text="@string/inform_code_invalid_subtitle" />
-
-				</LinearLayout>
+						android:paddingStart="@dimen/spacing_huge"
+						android:paddingEnd="@dimen/spacing_huge"
+						android:text="@string/inform_code_text" />
 
-				<TextView
-					android:id="@+id/inform_input_text"
-					style="@style/NextStep.Text"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_medium_large"
-					android:layout_marginBottom="@dimen/spacing_medium"
-					android:gravity="center_horizontal"
-					android:paddingStart="@dimen/spacing_huge"
-					android:paddingEnd="@dimen/spacing_huge"
-					android:text="@string/inform_code_text" />
+				</FrameLayout>
 
 				<ch.admin.bag.dp3t.inform.views.ChainedEditText
 					android:id="@+id/covidcode_input"
@@ -100,7 +106,7 @@
 					android:layout_gravity="center_horizontal"
 					android:layout_marginBottom="@dimen/spacing_large"
 					android:enabled="false"
-					android:text="@string/inform_send_button_title" />
+					android:text="@string/inform_continue_button" />
 
 			</LinearLayout>
 

From 49c372cc70029d823b4546819d7538b3c3aa898d Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 17 May 2021 09:31:22 +0200
Subject: [PATCH 072/207] Implemented Wrong Covidcode with correct checksum
 case

---
 .../admin/bag/dp3t/inform/InformFragment.kt   | 43 +++++++++++++------
 .../bag/dp3t/inform/InformIntroFragment.java  |  2 +-
 .../admin/bag/dp3t/inform/InformViewModel.kt  |  8 ++--
 .../bag/dp3t/inform/ReallyNotShareFragment.kt |  5 ++-
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  |  9 +---
 5 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index d57b5e800..368b7dbf6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -13,6 +13,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentInformBinding
@@ -22,6 +23,7 @@ import ch.admin.bag.dp3t.util.PhoneUtil
 import ch.admin.bag.dp3t.util.showFragment
 
 private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}"
+private const val ARG_IS_COVID_CODE_INVALID_CASE = "ARG_IS_COVID_CODE_INVALID_CASE"
 
 class InformFragment : TraceKeyShareBaseFragment() {
 
@@ -29,7 +31,9 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		private const val TAG = "InformFragment"
 
 		@JvmStatic
-		fun newInstance() = InformFragment()
+		fun newInstance(isCovidCodeInvalidCase: Boolean = false) = InformFragment().apply {
+			arguments = bundleOf(ARG_IS_COVID_CODE_INVALID_CASE to isCovidCodeInvalidCase)
+		}
 	}
 
 	private lateinit var binding: FragmentInformBinding
@@ -40,7 +44,8 @@ class InformFragment : TraceKeyShareBaseFragment() {
 	}
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-		binding = FragmentInformBinding.inflate(inflater).apply {
+		binding = FragmentInformBinding.inflate(inflater)
+		return binding.apply {
 			(requireActivity() as InformActivity).allowBackButton(true)
 			covidcodeInput.addTextChangedListener(object : ChainedEditTextListener {
 				override fun onTextChanged(input: String) {
@@ -56,9 +61,7 @@ class InformFragment : TraceKeyShareBaseFragment() {
 				}
 			})
 
-			informViewModel.getLastCovidcode()?.let {
-				covidcodeInput.text = it
-			}
+			covidcodeInput.text = informViewModel.covidCode
 
 			if (requireActivity().intent.extras != null) {
 				val covidCode = requireActivity().intent.extras?.getString(InformActivity.EXTRA_COVIDCODE)
@@ -66,12 +69,16 @@ class InformFragment : TraceKeyShareBaseFragment() {
 					covidcodeInput.text = covidCode
 				}
 			}
+
+			if (arguments?.getBoolean(ARG_IS_COVID_CODE_INVALID_CASE) == true) {
+				binding.sendButton.setText(R.string.inform_send_button_title)
+				setInvalidCovidcodeErrorVisible(true)
+			}
+
 			sendButton.setOnClickListener { performContinueAction() }
 			cancelButton.setOnClickListener { requireActivity().finish() }
 			informInvalidCodeError.setOnClickListener { PhoneUtil.callAppHotline(it.context) }
-		}
-
-		return binding.root
+		}.root
 	}
 
 	private fun performContinueAction() {
@@ -80,7 +87,11 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		informViewModel.covidCode = binding.covidcodeInput.text
 		askUserToEnableTracingIfNecessary { tracingEnabled ->
 			if (tracingEnabled) {
-				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+				if (arguments?.getBoolean(ARG_IS_COVID_CODE_INVALID_CASE) == true) {
+					performUpload()
+				} else {
+					showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+				}
 			} else {
 				binding.sendButton.isEnabled = true
 			}
@@ -90,16 +101,20 @@ class InformFragment : TraceKeyShareBaseFragment() {
 	private fun onUserGrantedTEKSharing() {
 		informViewModel.hasSharedDP3TKeys = true
 		if (informViewModel.selectableCheckinItems.isEmpty()) {
-			performUpload(onSuccess = {
-				showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
-			}, onInvalidCovidCode = {
-				setInvalidCovidcodeErrorVisible(true)
-			})
+			performUpload()
 		} else {
 			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
 		}
 	}
 
+	private fun performUpload() {
+		performUpload(onSuccess = {
+			showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
+		}, onInvalidCovidCode = {
+			setInvalidCovidcodeErrorVisible(true)
+		})
+	}
+
 	private fun onUserDidNotGrantTEKSharing() {
 		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java b/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
index 58ad7293b..d843dc6ed 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
@@ -58,7 +58,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			getParentFragmentManager()
 					.beginTransaction()
 					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-					.replace(R.id.inform_fragment_container, InformFragment.newInstance())
+					.replace(R.id.inform_fragment_container, InformFragment.newInstance(false))
 					.addToBackStack(InformFragment.class.getCanonicalName())
 					.commit();
 		});
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 3a4cae663..92e6fffae 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -48,7 +48,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	var selectableCheckinItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
 
 	var covidCode: String
-		get() = state.get<String>(KEY_COVIDCODE) ?: ""
+		get() = state.get<String>(KEY_COVIDCODE) ?: getLastCovidcode()
 		set(value) = state.set(KEY_COVIDCODE, value)
 
 	var hasSharedDP3TKeys: Boolean
@@ -99,13 +99,13 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		emit(Resource.success(data = null))
 	}
 
-	fun getLastCovidcode(): String? {
+	private fun getLastCovidcode(): String {
 		val lastCovidcode = secureStorage.lastInformCode
 
 		return if (System.currentTimeMillis() - secureStorage.lastInformRequestTime < TIMEOUT_VALID_CODE) {
-			lastCovidcode
+			lastCovidcode ?: ""
 		} else {
-			null
+			""
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index 2931340ee..64757168b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.inform
 
+import android.graphics.Paint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -25,6 +26,7 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 				tryAgainButton.isEnabled = false
 				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
 			}
+			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
 				if (DiaryStorage.getInstance(requireContext()).entries.isNotEmpty()) {
 					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
@@ -42,7 +44,7 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 			performUpload(
 				onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) },
 				onInvalidCovidCode = {
-					//TODO: Handle Invalid Covidcode
+					showFragment(InformFragment.newInstance(isCovidCodeInvalidCase = true), R.id.inform_fragment_container)
 				})
 		} else {
 			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
@@ -51,7 +53,6 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 
 	private fun onUserDidNotGrantTEKSharing() {
 		binding.tryAgainButton.isEnabled = true
-		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 	}
 
 	override fun setLoadingViewVisible(isVisible: Boolean) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index 57dce354e..e6b06b087 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -5,17 +5,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentShareCheckinsBinding
-import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.util.showFragment
-import retrofit2.HttpException
 
 class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 
@@ -28,6 +22,7 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		binding = FragmentShareCheckinsBinding.inflate(inflater).apply {
+			(requireActivity() as InformActivity).allowBackButton(false)
 			val adapter = CheckinAdapter()
 			checkinsRecyclerView.adapter = adapter
 			checkinsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
@@ -59,7 +54,7 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 		performUpload(onSuccess = {
 			showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
 		}, onInvalidCovidCode = {
-			//TODO: Handle invalid covidcode
+			showFragment(InformFragment.newInstance(isCovidCodeInvalidCase = true), R.id.inform_fragment_container)
 		})
 	}
 

From d76ca27fe6ff0246d4ff3236aa9be30b7c0a5ac6 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 17 May 2021 09:47:02 +0200
Subject: [PATCH 073/207] Added Checkin part to ThankYou fragment

---
 .../bag/dp3t/inform/ThankYouFragment.java     | 77 -------------------
 .../admin/bag/dp3t/inform/ThankYouFragment.kt | 63 +++++++++++++++
 .../main/res/layout/fragment_thank_you.xml    | 16 +++-
 3 files changed, 76 insertions(+), 80 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.java b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.java
deleted file mode 100644
index 53daa1500..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.inform;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import java.util.TimeZone;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.util.DateUtils;
-
-public class ThankYouFragment extends Fragment {
-
-	private SecureStorage secureStorage;
-
-	public static ThankYouFragment newInstance() {
-		return new ThankYouFragment();
-	}
-
-	public ThankYouFragment() {
-		super(R.layout.fragment_thank_you);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		secureStorage = SecureStorage.getInstance(getContext());
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-
-		((InformActivity) requireActivity()).allowBackButton(false);
-
-		// Show the onset date in the thank you message
-		TextView thankYouInfoTextView = view.findViewById(R.id.inform_thank_you_text_info);
-		TextView onsetDateTextView = view.findViewById(R.id.inform_thank_you_text_onsetdate);
-		TextView stopInfectionChainsTextView = view.findViewById(R.id.inform_thank_you_text_stop_infection_chains);
-
-		long oldestSharedKeyDateMillis = secureStorage.getPositiveReportOldestSharedKey();
-		if (oldestSharedKeyDateMillis > 0L) {
-			String formattedDate = DateUtils.getFormattedDateWrittenMonth(oldestSharedKeyDateMillis, TimeZone.getTimeZone("UTC"));
-			String formattedOnsetDateText =
-					getString(R.string.inform_send_thankyou_text_onsetdate).replace("{ONSET_DATE}", formattedDate);
-
-			thankYouInfoTextView.setText(R.string.inform_send_thankyou_text_onsetdate_info);
-			onsetDateTextView.setText(formattedOnsetDateText);
-			stopInfectionChainsTextView.setText(R.string.inform_send_thankyou_text_stop_infection_chains);
-		} else {
-			thankYouInfoTextView.setText(R.string.inform_send_thankyou_text);
-			onsetDateTextView.setVisibility(View.GONE);
-			stopInfectionChainsTextView.setVisibility(View.GONE);
-		}
-
-		view.findViewById(R.id.inform_thank_you_button_continue).setOnClickListener(v -> {
-			getParentFragmentManager().beginTransaction()
-					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-					.replace(R.id.inform_fragment_container, TracingStoppedFragment.newInstance())
-					.commit();
-		});
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
new file mode 100644
index 000000000..815447238
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.inform
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentThankYouBinding
+import ch.admin.bag.dp3t.storage.SecureStorage
+import ch.admin.bag.dp3t.util.DateUtils
+import ch.admin.bag.dp3t.util.showFragment
+import java.util.*
+
+class ThankYouFragment : Fragment() {
+
+	companion object {
+		fun newInstance() = ThankYouFragment()
+	}
+
+	private val informViewModel: InformViewModel by activityViewModels()
+
+	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentThankYouBinding.inflate(inflater).apply {
+			(requireActivity() as InformActivity).allowBackButton(false)
+
+			// Show the onset date in the thank you message
+			val oldestSharedKeyDateMillis = secureStorage.positiveReportOldestSharedKey
+			if (oldestSharedKeyDateMillis > 0L) {
+				val formattedDate = DateUtils.getFormattedDateWrittenMonth(oldestSharedKeyDateMillis, TimeZone.getTimeZone("UTC"))
+				val formattedOnsetDateText =
+					getString(R.string.inform_send_thankyou_text_onsetdate).replace("{ONSET_DATE}", formattedDate)
+				informThankYouTextInfo.setText(R.string.inform_send_thankyou_text_onsetdate_info)
+				informThankYouTextOnsetdate.text = formattedOnsetDateText
+				informThankYouTextStopInfectionChains.setText(R.string.inform_send_thankyou_text_stop_infection_chains)
+			} else {
+				informThankYouTextInfo.setText(R.string.inform_send_thankyou_text)
+				informThankYouTextOnsetdate.visibility = View.GONE
+				informThankYouTextStopInfectionChains.visibility = View.GONE
+			}
+
+			informThankYouTextCheckins.isVisible = informViewModel.hasSharedCheckins
+
+			informThankYouButtonContinue.setOnClickListener {
+				showFragment(TracingStoppedFragment.newInstance(), R.id.inform_fragment_container)
+			}
+		}.root
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_thank_you.xml b/app/src/main/res/layout/fragment_thank_you.xml
index 20e34c343..aea5e8bd1 100644
--- a/app/src/main/res/layout/fragment_thank_you.xml
+++ b/app/src/main/res/layout/fragment_thank_you.xml
@@ -8,10 +8,10 @@
   ~ SPDX-License-Identifier: MPL-2.0
   -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:background="@color/white"
-	android:layout_height="match_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/white">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -55,6 +55,16 @@
 			android:paddingEnd="@dimen/spacing_huge"
 			android:text="@string/inform_send_thankyou_text_onsetdate" />
 
+		<TextView
+			android:id="@+id/inform_thank_you_text_checkins"
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_very_large"
+			android:gravity="center_horizontal"
+			android:paddingHorizontal="@dimen/spacing_huge"
+			android:text="@string/inform_send_thankyou_text_checkins" />
+
 		<TextView
 			android:id="@+id/inform_thank_you_text_stop_infection_chains"
 			style="@style/NextStep.Text"

From 3d27d41b8e892c604b9c0ce94789465667868b4b Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 20 May 2021 21:23:41 +0200
Subject: [PATCH 074/207] Added NotThankYou Fragment

---
 app/build.gradle                              |   2 +-
 .../bag/dp3t/extensions/FragmentExtensions.kt |  13 +--
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |   4 +-
 .../admin/bag/dp3t/inform/CheckinAdapter.kt   |   7 +-
 .../admin/bag/dp3t/inform/InformFragment.kt   |  37 ++-----
 .../bag/dp3t/inform/InformIntroFragment.java  |   2 +-
 .../admin/bag/dp3t/inform/InformViewModel.kt  |  73 +++++++++----
 .../bag/dp3t/inform/NotThankYouFragment.kt    |  27 +++++
 .../bag/dp3t/inform/ReallyNotShareFragment.kt |  10 +-
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  |  11 +-
 .../admin/bag/dp3t/inform/ThankYouFragment.kt |   2 +-
 .../dp3t/inform/TraceKeyShareBaseFragment.kt  |  14 +--
 .../main/res/drawable/illu_not_thank_you.xml  |  80 ++++++++++++++
 .../res/layout/fragment_not_thank_you.xml     | 100 ++++++++++++++++++
 .../res/layout/fragment_share_checkins.xml    |  49 +++++----
 app/src/main/res/values-bs/strings.xml        |  11 ++
 app/src/main/res/values-de/strings.xml        |  16 +++
 app/src/main/res/values-es/strings.xml        |  11 ++
 app/src/main/res/values-fr/strings.xml        |  11 ++
 app/src/main/res/values-hr/strings.xml        |  11 ++
 app/src/main/res/values-it/strings.xml        |  11 ++
 app/src/main/res/values-pt/strings.xml        |  11 ++
 app/src/main/res/values-rm/strings.xml        |  11 ++
 app/src/main/res/values-sq/strings.xml        |  11 ++
 app/src/main/res/values-sr/strings.xml        |  11 ++
 app/src/main/res/values-ti/strings.xml        |  11 ++
 app/src/main/res/values-tr/strings.xml        |  11 ++
 app/src/main/res/values/strings.xml           |  11 ++
 28 files changed, 470 insertions(+), 109 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
 create mode 100644 app/src/main/res/drawable/illu_not_thank_you.xml
 create mode 100644 app/src/main/res/layout/fragment_not_thank_you.xml

diff --git a/app/build.gradle b/app/build.gradle
index b31c06d3a..c3302c1b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -200,7 +200,7 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 	implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
-	def dp3t_sdk_version = '2.2.0'
+	def dp3t_sdk_version = '2.3.0-dev-6'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
 	teschtImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
index 9025583c8..64218cc0e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
@@ -7,19 +7,10 @@ import ch.admin.bag.dp3t.R
 fun Fragment.showFragment(
 	fragment: Fragment,
 	@IdRes container: Int = R.id.main_fragment_container,
-	addToBackStack: Boolean = true,
-	modalAnimation: Boolean = false
+	addToBackStack: Boolean = true
 ) {
 	requireActivity().supportFragmentManager.beginTransaction()
-		.apply {
-			if (modalAnimation) {
-				this.setCustomAnimations(
-					R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit
-				)
-			} else {
-				this.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-			}
-		}
+		.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 		.replace(container, fragment)
 		.apply { if (addToBackStack) this.addToBackStack(fragment::class.java.canonicalName) }
 		.commit()
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index dafc4dc8e..06f9fe725 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -258,9 +258,9 @@ private void showReportsFragment() {
 		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
 		boolean isReportedPositive = tracingViewModel.getTracingStatusInterface().isReportedAsInfected();
 		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1) && !isReportedPositive) {
-			FragmentExtensionsKt.showFragment(this, ReportsOverviewFragment.newInstance(), true);
+			FragmentExtensionsKt.showFragment(this, ReportsOverviewFragment.newInstance(), R.id.main_fragment_container, true);
 		} else {
-			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), true);
+			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), R.id.main_fragment_container, true);
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
index b09b0b84e..02e024a73 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
@@ -5,7 +5,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.databinding.ItemSelectableCheckinBinding
+import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
+import ch.admin.bag.dp3t.util.StringUtil
 
 class CheckinAdapter : RecyclerView.Adapter<CheckinAdapter.CheckinViewHolder>() {
 
@@ -26,8 +28,9 @@ class CheckinAdapter : RecyclerView.Adapter<CheckinAdapter.CheckinViewHolder>()
 		fun bind(selectableCheckinItem: SelectableCheckinItem) {
 			binding.apply {
 				checkinTitle.text = selectableCheckinItem.diaryEntry.venueInfo.title
-				checkinDetail1.text = "TODO"
-				checkinDetail2.text = "TODO"
+				checkinDetail1.setText(selectableCheckinItem.diaryEntry.venueInfo.getSubtitle())
+				checkinDetail2.text =
+					StringUtil.getReportDateString(selectableCheckinItem.diaryEntry.departureTime, true, true, root.context)
 				checkbox.isChecked = selectableCheckinItem.isSelected
 				checkbox.setOnCheckedChangeListener { _, isChecked ->
 					selectableCheckinItem.isSelected = isChecked
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 368b7dbf6..2836a7a6f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -13,17 +13,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentInformBinding
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.inform.views.ChainedEditText
 import ch.admin.bag.dp3t.inform.views.ChainedEditText.ChainedEditTextListener
 import ch.admin.bag.dp3t.util.PhoneUtil
-import ch.admin.bag.dp3t.util.showFragment
 
 private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}"
-private const val ARG_IS_COVID_CODE_INVALID_CASE = "ARG_IS_COVID_CODE_INVALID_CASE"
 
 class InformFragment : TraceKeyShareBaseFragment() {
 
@@ -31,9 +29,7 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		private const val TAG = "InformFragment"
 
 		@JvmStatic
-		fun newInstance(isCovidCodeInvalidCase: Boolean = false) = InformFragment().apply {
-			arguments = bundleOf(ARG_IS_COVID_CODE_INVALID_CASE to isCovidCodeInvalidCase)
-		}
+		fun newInstance() = InformFragment()
 	}
 
 	private lateinit var binding: FragmentInformBinding
@@ -50,10 +46,8 @@ class InformFragment : TraceKeyShareBaseFragment() {
 			covidcodeInput.addTextChangedListener(object : ChainedEditTextListener {
 				override fun onTextChanged(input: String) {
 					val matchesRegex = input.matches(REGEX_CODE_PATTERN.toRegex())
-					val matchesChecksum = input.matchesChecksum()
-
-					sendButton.isEnabled = matchesRegex && matchesChecksum
-					setInvalidCovidcodeErrorVisible(matchesRegex && !matchesChecksum)
+					sendButton.isEnabled = matchesRegex
+					setInvalidCovidcodeErrorVisible(false)
 				}
 
 				override fun onEditorSendAction() {
@@ -70,11 +64,6 @@ class InformFragment : TraceKeyShareBaseFragment() {
 				}
 			}
 
-			if (arguments?.getBoolean(ARG_IS_COVID_CODE_INVALID_CASE) == true) {
-				binding.sendButton.setText(R.string.inform_send_button_title)
-				setInvalidCovidcodeErrorVisible(true)
-			}
-
 			sendButton.setOnClickListener { performContinueAction() }
 			cancelButton.setOnClickListener { requireActivity().finish() }
 			informInvalidCodeError.setOnClickListener { PhoneUtil.callAppHotline(it.context) }
@@ -87,11 +76,8 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		informViewModel.covidCode = binding.covidcodeInput.text
 		askUserToEnableTracingIfNecessary { tracingEnabled ->
 			if (tracingEnabled) {
-				if (arguments?.getBoolean(ARG_IS_COVID_CODE_INVALID_CASE) == true) {
-					performUpload()
-				} else {
-					showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
-				}
+				//TODO: Do onsetDate Request here
+				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
 			} else {
 				binding.sendButton.isEnabled = true
 			}
@@ -108,22 +94,13 @@ class InformFragment : TraceKeyShareBaseFragment() {
 	}
 
 	private fun performUpload() {
-		performUpload(onSuccess = {
-			showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
-		}, onInvalidCovidCode = {
-			setInvalidCovidcodeErrorVisible(true)
-		})
+		performUpload(onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) })
 	}
 
 	private fun onUserDidNotGrantTEKSharing() {
 		showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
 	}
 
-	private fun String.matchesChecksum(): Boolean {
-		//TODO: Implement checksum check
-		return true
-	}
-
 	override fun setLoadingViewVisible(isVisible: Boolean) {
 		binding.loadingView.isVisible = isVisible
 		binding.sendButton.isEnabled = !isVisible
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java b/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
index d843dc6ed..58ad7293b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
@@ -58,7 +58,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			getParentFragmentManager()
 					.beginTransaction()
 					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-					.replace(R.id.inform_fragment_container, InformFragment.newInstance(false))
+					.replace(R.id.inform_fragment_container, InformFragment.newInstance())
 					.addToBackStack(InformFragment.class.getCanonicalName())
 					.commit();
 		});
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 92e6fffae..1479b188a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.liveData
+import ch.admin.bag.dp3t.checkin.models.UploadVenueInfo
 import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
 import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
@@ -17,9 +18,10 @@ import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.JwtUtil
 import ch.admin.bag.dp3t.util.toUploadVenueInfo
 import com.google.android.gms.common.api.ApiException
+import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
 import org.crowdnotifier.android.sdk.CrowdNotifier
-import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.PendingUploadTask
 import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.models.DayDate
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
@@ -37,6 +39,8 @@ private const val ISOLATION_DURATION_DAYS = 14L
 private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
 private const val KEY_HAS_SHARED_CHECKINS = "KEY_HAS_SHARED_CHECKINS"
+private const val KEY_PENDING_UPLOAD_TASK = "KEY_PENDING_UPLOAD_TASK"
+private const val USER_UPLOAD_SIZE = 1000
 
 class InformViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
 
@@ -44,6 +48,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	private val userUploadRepository = UserUploadRepository()
 	private val diaryStorage = DiaryStorage.getInstance(application)
 	private val secureStorage = SecureStorage.getInstance(application)
+	private val random = Random()
 
 	var selectableCheckinItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
 
@@ -59,6 +64,10 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		get() = state.get<Boolean>(KEY_HAS_SHARED_CHECKINS) ?: false
 		set(value) = state.set(KEY_HAS_SHARED_CHECKINS, value)
 
+	var pendingUploadTask: PendingUploadTask?
+		get() = state.get<PendingUploadTask?>(KEY_PENDING_UPLOAD_TASK)
+		set(value) = state.set(KEY_PENDING_UPLOAD_TASK, value)
+
 	fun performUpload() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
@@ -71,30 +80,31 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 			}
 			return@liveData
 		}
-		try {
-			if (hasSharedDP3TKeys) {
+		if (hasSharedDP3TKeys) {
+			try {
 				uploadTEKs()
+			} catch (exception: Throwable) {
+				when (exception) {
+					is ResponseError -> emit(Resource.error(InformRequestError.RED_STATUS_ERROR, exception))
+					is CancellationException -> emit(Resource.error(InformRequestError.RED_USER_CANCELLED_SHARE, exception))
+					is ApiException -> emit(Resource.error(InformRequestError.RED_EXPOSURE_API_ERROR, exception))
+					else -> emit(Resource.error(InformRequestError.RED_MISC_NETWORK_ERROR, exception))
+				}
+				return@liveData
 			}
-		} catch (exception: Throwable) {
-			when (exception) {
-				is ResponseError -> emit(Resource.error(InformRequestError.RED_STATUS_ERROR, exception))
-				is CancellationException -> emit(Resource.error(InformRequestError.RED_USER_CANCELLED_SHARE, exception))
-				is ApiException -> emit(Resource.error(InformRequestError.RED_EXPOSURE_API_ERROR, exception))
-				else -> emit(Resource.error(InformRequestError.RED_MISC_NETWORK_ERROR, exception))
-			}
-			return@liveData
 		}
-		try {
-			if (hasSharedCheckins) {
+		if (hasSharedCheckins) {
+			try {
 				val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
 				userUploadRepository.userUpload(getUserUploadPayload(), authorizationHeader)
+
+			} catch (exception: Throwable) {
+				when (exception) {
+					is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
+					else -> emit(Resource.error(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, exception))
+				}
+				return@liveData
 			}
-		} catch (exception: Throwable) {
-			when (exception) {
-				is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
-				else -> emit(Resource.error(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, exception))
-			}
-			return@liveData
 		}
 		emit(Resource.success(data = null))
 	}
@@ -117,7 +127,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 		// Wrapping traditional callback in a suspendCoroutine
 		suspendCoroutine<Unit> { continuation ->
-			DP3T.uploadTEKs(getApplication(), onsetDate, ExposeeAuthMethodAuthorization(authorizationHeader),
+			pendingUploadTask?.performUpload(getApplication(), onsetDate, ExposeeAuthMethodAuthorization(authorizationHeader),
 				object : ResponseCallback<DayDate> {
 					override fun onSuccess(oldestSharedKeyDayDate: DayDate) {
 
@@ -158,7 +168,6 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	}
 
 	private fun getUserUploadPayload(): UserUploadPayload {
-		//TODO: Pad with fake Payloads
 		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
 		selectableCheckinItems.filter {
 			it.isSelected
@@ -167,9 +176,31 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}.flatten().forEach {
 			userUploadPayloadBuilder.addVenueInfos(it.toUploadVenueInfo())
 		}
+
+		for (i in userUploadPayloadBuilder.venueInfosCount until USER_UPLOAD_SIZE) {
+			userUploadPayloadBuilder.addVenueInfos(getRandomFakeVenueInfo())
+		}
 		return userUploadPayloadBuilder.build()
 	}
 
+	private fun getRandomFakeVenueInfo(): UploadVenueInfo {
+		return UploadVenueInfo.newBuilder()
+			.setPreId(ByteString.copyFrom(getRandomByteArray(32)))
+			.setTimeKey(ByteString.copyFrom(getRandomByteArray(32)))
+			.setNotificationKey(ByteString.copyFrom(getRandomByteArray(32)))
+			.setIntervalStartMs(random.nextLong())
+			.setIntervalEndMs(random.nextLong())
+			.setFake(true)
+			.build()
+
+	}
+
+	private fun getRandomByteArray(size: Int): ByteArray {
+		return ByteArray(size).apply {
+			random.nextBytes(this)
+		}
+	}
+
 	private fun getAuthorizationHeader(accessToken: String): String {
 		return "Bearer $accessToken"
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
new file mode 100644
index 000000000..6633ba0e5
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
@@ -0,0 +1,27 @@
+package ch.admin.bag.dp3t.inform
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentNotThankYouBinding
+import ch.admin.bag.dp3t.extensions.showFragment
+
+class NotThankYouFragment : Fragment() {
+
+	companion object {
+		fun newInstance() = NotThankYouFragment()
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentNotThankYouBinding.inflate(inflater).apply {
+			(requireActivity() as InformActivity).allowBackButton(false)
+			dontSendButton.setOnClickListener { requireActivity().finish() }
+			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+			backButton.setOnClickListener { showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container) }
+		}.root
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index 64757168b..4499d4c0f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -9,7 +9,7 @@ import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentInformReallyNotShareBinding
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.showFragment
 
 class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 
@@ -31,7 +31,7 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 				if (DiaryStorage.getInstance(requireContext()).entries.isNotEmpty()) {
 					showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
 				} else {
-					//TODO: Show "Thanks for nothing" Fragment
+					showFragment(NotThankYouFragment.newInstance(), R.id.inform_fragment_container)
 				}
 			}
 		}
@@ -41,11 +41,7 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 	private fun onUserGrantedTEKSharing() {
 		informViewModel.hasSharedDP3TKeys = true
 		if (informViewModel.selectableCheckinItems.isEmpty()) {
-			performUpload(
-				onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) },
-				onInvalidCovidCode = {
-					showFragment(InformFragment.newInstance(isCovidCodeInvalidCase = true), R.id.inform_fragment_container)
-				})
+			performUpload(onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) })
 		} else {
 			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index e6b06b087..df9d8cf3b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -9,7 +9,7 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentShareCheckinsBinding
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.showFragment
 
 class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 
@@ -25,7 +25,6 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			val adapter = CheckinAdapter()
 			checkinsRecyclerView.adapter = adapter
-			checkinsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
 			adapter.setData(informViewModel.selectableCheckinItems)
 			adapter.itemSelectionListener { selectedItem, selected ->
 				informViewModel.selectableCheckinItems.find { it.diaryEntry == selectedItem }?.isSelected = selected
@@ -39,7 +38,7 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 				if (informViewModel.hasSharedDP3TKeys) {
 					upload()
 				} else {
-					//TODO: Show "Thanks for nothing" Fragment
+					showFragment(NotThankYouFragment.newInstance(), R.id.inform_fragment_container)
 				}
 			}
 			sendButton.setOnClickListener {
@@ -51,11 +50,7 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 	}
 
 	private fun upload() {
-		performUpload(onSuccess = {
-			showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container)
-		}, onInvalidCovidCode = {
-			showFragment(InformFragment.newInstance(isCovidCodeInvalidCase = true), R.id.inform_fragment_container)
-		})
+		performUpload(onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) })
 	}
 
 	override fun setLoadingViewVisible(isVisible: Boolean) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
index 815447238..24106b790 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
@@ -20,7 +20,7 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentThankYouBinding
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.DateUtils
-import ch.admin.bag.dp3t.util.showFragment
+import ch.admin.bag.dp3t.extensions.showFragment
 import java.util.*
 
 class ThankYouFragment : Fragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index 286b03d83..ff1295d4c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -14,6 +14,7 @@ import ch.admin.bag.dp3t.util.ENExceptionHelper
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import com.google.android.gms.common.api.ApiException
 import org.dpppt.android.sdk.DP3T
+import org.dpppt.android.sdk.PendingUploadTask
 import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.internal.logger.Logger
 
@@ -30,8 +31,9 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 	abstract fun setLoadingViewVisible(isVisible: Boolean)
 
 	protected fun showShareTEKsPopup(onSuccess: () -> Unit, onError: () -> Unit) {
-		DP3T.showShareTEKsPopup(requireActivity(), object : ResponseCallback<Void> {
-			override fun onSuccess(p0: Void?) {
+		DP3T.showShareTEKsPopup(requireActivity(), object : ResponseCallback<PendingUploadTask> {
+			override fun onSuccess(pendingUploadTask: PendingUploadTask) {
+				informViewModel.pendingUploadTask = pendingUploadTask
 				onSuccess()
 			}
 
@@ -50,7 +52,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 		}
 	}
 
-	protected fun performUpload(onSuccess: () -> Unit, onInvalidCovidCode: () -> Unit) {
+	protected fun performUpload(onSuccess: () -> Unit) {
 		informViewModel.performUpload().observe(viewLifecycleOwner) {
 			when (it.status) {
 				Status.LOADING -> {
@@ -58,7 +60,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 				}
 				Status.ERROR -> {
 					setLoadingViewVisible(false)
-					handleUploadException(it, onInvalidCovidCode)
+					handleUploadException(it)
 				}
 				Status.SUCCESS -> {
 					setLoadingViewVisible(false)
@@ -68,12 +70,12 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 		}
 	}
 
-	private fun handleUploadException(error: Resource<InformRequestError?>, onInvalidCovidCode: () -> Unit) {
+	private fun handleUploadException(error: Resource<InformRequestError?>) {
 		if (error.data == null) return
 		when (error.exception) {
-			is InvalidCodeError -> onInvalidCovidCode()
 			is ResponseError -> showErrorDialog(error.data, error.exception.statusCode.toString())
 			is ApiException -> showErrorDialog(error.data, error.exception.statusCode.toString())
+			is InvalidCodeError -> showErrorDialog(error.data)
 			else -> showErrorDialog(error.data)
 		}
 		error.exception?.printStackTrace()
diff --git a/app/src/main/res/drawable/illu_not_thank_you.xml b/app/src/main/res/drawable/illu_not_thank_you.xml
new file mode 100644
index 000000000..22a6cae2c
--- /dev/null
+++ b/app/src/main/res/drawable/illu_not_thank_you.xml
@@ -0,0 +1,80 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="326dp"
+    android:height="180dp"
+    android:viewportWidth="326"
+    android:viewportHeight="180">
+  <path
+      android:pathData="M155.235,34.456c-7.285,-0.039 -14.308,-1.915 -21.346,-3.37 -7.83,-1.616 -15.754,-2.726 -23.726,-3.323 -8.49,-0.638 -17.176,-0.69 -25.422,1.003 -8.245,1.695 -16.068,5.283 -20.815,10.765C55.87,48.819 58.062,61.242 62.3,71.939c5.028,12.685 12.614,24.925 23.87,34.93 8.004,7.11 17.686,12.952 27.302,18.745 5.433,3.271 10.908,6.566 17.077,8.926 5.742,2.187 11.958,3.509 18.13,4.817 6.599,1.397 13.197,2.798 19.936,3.668 21.51,2.778 43.51,0.089 64.987,-2.832 7.568,-1.028 15.449,-2.198 21.467,-5.886 4.688,-2.874 7.793,-7.034 10.005,-11.335 2.9,-5.627 4.394,-12.14 1.239,-17.694 -4.658,-8.193 -17.786,-11.822 -22.938,-19.835 -6.598,-10.271 2.482,-22.97 -1.758,-33.96 -1.764,-4.574 -5.704,-8.44 -9.82,-11.993 -9.81,-8.486 -22.4,-15.787 -37.851,-12.74 -13.078,2.58 -24.68,7.782 -38.71,7.706z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M122.067,166.906c0,2.464 -8.974,4.46 -20.062,4.472h-0.1c-5.413,0 -10.327,-0.473 -13.949,-1.24 -0.155,-0.036 -0.308,-0.069 -0.457,-0.104 -0.616,-0.138 -1.192,-0.287 -1.722,-0.442 -2.533,-0.75 -4.034,-1.679 -4.034,-2.686 0,-0.816 0.982,-1.578 2.698,-2.237 1.073,-0.396 2.175,-0.712 3.295,-0.945 0.235,-0.053 0.477,-0.103 0.724,-0.15 3.567,-0.71 8.28,-1.14 13.445,-1.14 1.003,0 1.99,0.016 2.956,0.047 9.733,0.317 17.206,2.177 17.206,4.425z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M82.155,162.994l-0.198,-0.074c-0.043,-0.016 -4.365,-1.672 -6.39,-5.427 -2.025,-3.755 -1.033,-8.275 -1.023,-8.32l0.047,-0.206 0.197,0.074c0.044,0.016 4.365,1.672 6.39,5.427 2.025,3.754 1.033,8.275 1.023,8.32l-0.046,0.206zM75.891,157.318c1.712,3.175 5.127,4.802 5.993,5.174 0.164,-0.928 0.68,-4.678 -1.03,-7.85 -1.71,-3.17 -5.127,-4.8 -5.992,-5.173 -0.165,0.928 -0.68,4.678 1.03,7.85z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M77.114,156.176c3.639,2.19 5.04,6.537 5.04,6.537s-4.498,0.8 -8.136,-1.39C70.378,159.134 68.978,154.786 68.978,154.786s4.498,-0.799 8.136,1.39z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M215.604,23.953v132.455c0.002,1.74 -0.76,3.395 -2.083,4.526 -1.068,0.92 -2.432,1.425 -3.842,1.422L156.162,162.356c-1.18,0.002 -2.333,-0.35 -3.31,-1.011 -1.636,-1.112 -2.614,-2.96 -2.614,-4.937L150.238,23.953c-0.004,-1.575 0.618,-3.087 1.73,-4.204C153.078,18.633 154.588,18.004 156.161,18h8.01v1.032c-0.008,2.7 2.176,4.895 4.876,4.902h27.22c1.041,0.002 2.056,-0.333 2.891,-0.956 0.17,-0.124 0.33,-0.259 0.48,-0.405 0.964,-0.926 1.507,-2.205 1.505,-3.541L201.143,18h8.535c1.575,0.003 3.085,0.632 4.196,1.749 1.11,1.116 1.733,2.628 1.729,4.204z"
+      android:fillColor="#54526B"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M88.934,43.985s2.595,7.387 0.998,8.523c-1.597,1.136 5.39,10.417 5.39,10.417l8.385,-2.273 -4.592,-7.765s-0.598,-7.765 -0.598,-8.902c-0,-1.136 -9.583,0 -9.583,0z"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M88.934,43.985s2.595,7.387 0.998,8.523c-1.597,1.136 5.39,10.417 5.39,10.417l8.385,-2.273 -4.592,-7.765s-0.598,-7.765 -0.598,-8.902c-0,-1.136 -9.583,0 -9.583,0z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M84.578,96.638s-0.758,9.47 -0,14.394c0.757,4.924 1.894,18.561 1.894,18.561s-0,25.758 4.167,26.137c4.166,0.379 7.197,0.758 7.576,-0.757 0.378,-1.516 -1.894,-2.273 -0.758,-3.03 1.136,-0.758 1.515,-3.41 -0,-6.44 -1.515,-3.03 -0,-33.713 -0,-33.713l7.197,19.318s0.758,15.91 1.515,18.183c0.758,2.272 -0.757,6.44 1.894,6.818 2.652,0.379 5.682,-1.894 7.197,-2.652 1.516,-0.757 -2.272,-0.757 -1.515,-1.136 0.758,-0.379 3.03,-1.515 2.273,-1.894 -0.758,-0.379 -1.515,-18.561 -1.515,-18.561s-2.084,-38.827 -4.735,-40.342c-2.652,-1.515 -4.356,1.095 -4.356,1.095l-20.834,4.019z"
+      android:fillColor="#54526B"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M94.237,42.659m6.818,0a6.818,6.818 0,1 0,-13.636 0a6.818,6.818 0,1 0,13.636 0"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M92.154,55.349s1.894,5.682 4.924,4.546l3.03,-1.137 5.304,36.365s-4.167,6.06 -10.228,2.272c-6.06,-3.788 -3.03,-42.046 -3.03,-42.046z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M97.457,54.213l1.705,-3.599S109.2,55.349 110.715,56.864C112.23,58.38 112.23,60.652 112.23,60.652l-2.652,9.47s0.758,20.834 0.758,21.591c-0,0.758 2.652,4.925 0.758,3.41 -1.894,-1.516 -2.273,-3.03 -3.788,-0.758 -1.516,2.273 -4.925,4.924 -4.925,4.924l-4.924,-45.076z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M110.715,81.486l-1.137,10.606s-6.818,6.061 -5.303,6.44c1.515,0.379 2.273,-1.137 2.273,-1.137S109.2,100.047 110.715,98.532C112.23,97.017 116.018,82.622 116.018,82.622l-5.303,-1.136z"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M94.048,53.076s-3.084,-3.022 -4.194,-2.836c-1.11,0.185 -2.625,2.836 -2.625,2.836s-9.09,3.03 -8.712,6.061c0.379,3.03 4.546,17.803 4.546,17.803s3.409,17.804 0.378,19.698c-3.03,1.894 14.395,6.818 14.774,4.545 0.378,-2.272 1.136,-25 -0,-28.41 -1.137,-3.409 -4.167,-19.697 -4.167,-19.697zM107.306,59.137L111.989,59.137S115.26,73.531 115.64,75.047c0.379,1.515 1.137,8.712 0.758,8.712s-7.955,-1.515 -7.955,-0.379l-1.136,-24.243z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M81.926,84.895l5.303,2.273s10.228,1.515 10.228,-2.652c-0,-4.166 -10.228,-1.894 -10.228,-1.894l-3.409,-1.09 -1.894,3.363z"
+      android:fillColor="#FFB8B8"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M83.063,56.864l-4.546,1.137 -3.41,20.076s-1.135,5.303 0.759,5.682c1.893,0.379 7.197,3.409 7.197,3.409s0.757,-5.682 2.272,-5.682l-3.788,-3.03 2.273,-13.258 -0.757,-8.334z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M91.396,154.419l-0,3.03s-3.409,8.237 -0,8.237c3.41,0 6.06,0.854 6.06,-0.282l-0,-10.228l-6.06,-0.757zM113.745,154.21l-0,3.03s3.41,8.237 -0,8.237c-3.409,0 -6.06,0.854 -6.06,-0.282l-0,-10.228l6.06,-0.757z"
+      android:fillColor="#292838"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M94.382,33.023c-1.511,-0.054 -3.129,-0.08 -4.403,0.734 -0.587,0.409 -1.1,0.912 -1.522,1.49 -1.241,1.569 -2.314,3.543 -1.853,5.49l0.536,-0.209c-0,0.52 -0.116,1.033 -0.338,1.502 0.075,-0.219 0.328,0.136 0.26,0.357l-0.59,1.936c0.97,-0.356 2.176,0.364 2.324,1.386 0.067,-2.248 0.3,-4.825 2.124,-6.141 0.92,-0.664 2.083,-0.867 3.203,-1.047 1.033,-0.166 2.115,-0.324 3.105,0.016 0.99,0.34 1.832,1.352 1.607,2.374 0.457,-0.157 0.967,0.16 1.192,0.587 0.226,0.427 0.238,0.93 0.244,1.413 0.487,0.343 1.04,-0.34 1.238,-0.9 0.465,-1.319 0.879,-2.722 0.628,-4.097 -0.25,-1.375 -1.37,-2.69 -2.769,-2.694 0.17,-0.186 0.26,-0.431 0.253,-0.683l-1.152,-0.097c0.292,-0.042 0.561,-0.184 0.76,-0.402 -0.462,0.51 -4.099,-0.988 -4.847,-1.015z"
+      android:fillColor="#403F54"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_not_thank_you.xml b/app/src/main/res/layout/fragment_not_thank_you.xml
new file mode 100644
index 000000000..f2f14ded7
--- /dev/null
+++ b/app/src/main/res/layout/fragment_not_thank_you.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/white"
+	android:orientation="vertical">
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:fillViewport="true">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1" />
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:src="@drawable/illu_not_thank_you" />
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal"
+				android:text="@string/not_thank_you_screen_title" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:gravity="center_horizontal"
+				android:paddingHorizontal="@dimen/spacing_huge"
+				android:text="@string/not_thank_you_screen_text1" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:gravity="center_horizontal"
+				android:paddingHorizontal="@dimen/spacing_huge"
+				android:text="@string/not_thank_you_screen_text2" />
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="4" />
+
+		</LinearLayout>
+
+	</ScrollView>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/white"
+		android:elevation="@dimen/spacing_small"
+		android:gravity="center_horizontal"
+		android:orientation="vertical"
+		android:padding="@dimen/spacing_medium_large">
+
+		<Button
+			android:id="@+id/back_button"
+			style="@style/NextStep.Button.Purple"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/not_thank_you_screen_back_button" />
+
+		<TextView
+			android:id="@+id/dont_send_button"
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginTop="@dimen/spacing_medium"
+			android:layout_marginBottom="@dimen/spacing_medium_large"
+			android:background="@drawable/ripple_button"
+			android:padding="@dimen/spacing_small"
+			android:text="@string/not_thank_you_screen_dont_send_button"
+			android:visibility="visible" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_share_checkins.xml b/app/src/main/res/layout/fragment_share_checkins.xml
index c0548f06d..9f9204a8d 100644
--- a/app/src/main/res/layout/fragment_share_checkins.xml
+++ b/app/src/main/res/layout/fragment_share_checkins.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -57,28 +58,38 @@
 			android:clipChildren="false"
 			android:clipToPadding="false"
 			android:paddingHorizontal="@dimen/spacing_medium_large"
-			android:paddingBottom="@dimen/spacing_larger" />
+			android:paddingBottom="@dimen/spacing_larger"
+			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-		<Button
-			android:id="@+id/send_button"
-			style="@style/NextStep.Button.Purple"
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginVertical="@dimen/spacing_medium_large"
-			android:text="@string/inform_send_button_title" />
+			android:background="@color/white"
+			android:elevation="@dimen/spacing_small"
+			android:orientation="vertical">
 
-		<TextView
-			android:id="@+id/dont_send_button"
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginBottom="@dimen/spacing_medium_large"
-			android:background="?selectableItemBackground"
-			android:padding="@dimen/spacing_small"
-			android:text="@string/inform_dont_send_button_title"
-			android:visibility="visible" />
+			<Button
+				android:id="@+id/send_button"
+				style="@style/NextStep.Button.Purple"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginVertical="@dimen/spacing_medium_large"
+				android:text="@string/inform_send_button_title" />
+
+			<TextView
+				android:id="@+id/dont_send_button"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:background="?selectableItemBackground"
+				android:padding="@dimen/spacing_small"
+				android:text="@string/inform_dont_send_button_title"
+				android:visibility="visible" />
+
+		</LinearLayout>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index abfc01c37..f03163b26 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1774,4 +1774,15 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e44a21510..02e9971a3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1856,4 +1856,20 @@ oder Ihren Anlass näher beschreibt."</string>
     <string name="checkin_report_subtitle1">"Sie könnten bereits ansteckend sein, ohne es zu merken. Beachten Sie die geltenden Hygiene- und Schutz-massnahmen und schützen Sie Ihre Familie, Ihre Freunde und Ihr Umfeld."</string>
     <string name="checkin_report_subtitle2">"Überwachen Sie Ihren Gesundheitszustand und lassen Sie sich beim Auftreten von Symptomen sofort testen."</string>
     <string name="checkin_report_subtitle3">"Auch wenn keine Symptome auftreten, ist ein Corona-Test sinnvoll und empfohlen (ab dem 5. Tag nach dem angezeigten Kontaktdatum)."</string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <!-- Fuzzy -->
+    <string name="meldung_detail_checkin_title">"Check-In"</string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title">"Keine Daten gesendet"</string>
+
+    <!-- Fuzzy -->
+    <string name="not_thank_you_screen_text1">"Es wurden keine privaten Schlüssel gesendet."</string>
+    <string name="not_thank_you_screen_back_button">"Zurück"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Keine Daten senden"</string>
+
+    <!-- Fuzzy -->
+    <string name="not_thank_you_screen_text2">"Es wurden keine Check-In-Einträge gesendet. Es wird niemand benachrichtigt."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cbeb45c1f..1ed406f44 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1765,4 +1765,15 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 265c0f043..2955d7196 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1800,4 +1800,15 @@ Contactez l'infoline coronavirus :"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 14dbac5c1..385000dd6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1770,4 +1770,15 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fd5612a4d..03980f0ba 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1808,4 +1808,15 @@ Contatta la Infoline coronavirus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 14c9353d9..953cd7d04 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1775,4 +1775,15 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index e5ccc4cac..9a4397cde 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1770,4 +1770,15 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 28fda471e..519ff2817 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1775,4 +1775,15 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 28696389f..f770d7e5d 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1770,4 +1770,15 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index cbf131a52..b313f803a 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1750,4 +1750,15 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2cbec156c..26791cbb6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1752,4 +1752,15 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2176c162e..edde8e916 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1797,4 +1797,15 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="checkin_report_subtitle1"></string>
     <string name="checkin_report_subtitle2"></string>
     <string name="checkin_report_subtitle3"></string>
+
+    <!-- Titel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_title"></string>
+
+    <!-- SubTitel von CheckIn Meldungen Screen. -->
+    <string name="meldung_detail_checkin_subtitle"></string>
+    <string name="not_thank_you_screen_title"></string>
+    <string name="not_thank_you_screen_text1"></string>
+    <string name="not_thank_you_screen_back_button"></string>
+    <string name="not_thank_you_screen_dont_send_button"></string>
+    <string name="not_thank_you_screen_text2"></string>
 </resources>
\ No newline at end of file

From 4e364c8808db0cf87ff0af20ef70de4095ba0f4f Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 21 May 2021 10:22:08 +0200
Subject: [PATCH 075/207] Clean up all Inform Screens

---
 .../admin/bag/dp3t/inform/CheckinAdapter.kt   |  16 ++
 .../main/res/drawable/ill_tracing_beenden.xml | 118 +++++++++----
 app/src/main/res/layout/fragment_get_well.xml |  78 +++++----
 app/src/main/res/layout/fragment_inform.xml   |   2 +-
 .../main/res/layout/fragment_inform_intro.xml |  16 +-
 .../fragment_inform_really_not_share.xml      |   4 +-
 .../res/layout/fragment_share_checkins.xml    |   7 +-
 .../main/res/layout/fragment_thank_you.xml    | 155 +++++++++++-------
 .../res/layout/fragment_tracing_stopped.xml   |  47 ++++--
 .../res/layout/item_selectable_checkin.xml    |  14 +-
 app/src/main/res/values-bs/strings.xml        |   8 +-
 app/src/main/res/values-de/strings.xml        |  24 +--
 app/src/main/res/values-es/strings.xml        |   8 +-
 app/src/main/res/values-fr/strings.xml        |   8 +-
 app/src/main/res/values-hr/strings.xml        |   8 +-
 app/src/main/res/values-it/strings.xml        |   8 +-
 app/src/main/res/values-pt/strings.xml        |   8 +-
 app/src/main/res/values-rm/strings.xml        |   8 +-
 app/src/main/res/values-sq/strings.xml        |   8 +-
 app/src/main/res/values-sr/strings.xml        |   8 +-
 app/src/main/res/values-ti/strings.xml        |   8 +-
 app/src/main/res/values-tr/strings.xml        |   8 +-
 app/src/main/res/values/strings.xml           |   8 +-
 23 files changed, 389 insertions(+), 188 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
index 02e024a73..561141758 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
@@ -3,6 +3,7 @@ package ch.admin.bag.dp3t.inform
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.databinding.ItemSelectableCheckinBinding
 import ch.admin.bag.dp3t.extensions.getSubtitle
@@ -32,10 +33,25 @@ class CheckinAdapter : RecyclerView.Adapter<CheckinAdapter.CheckinViewHolder>()
 				checkinDetail2.text =
 					StringUtil.getReportDateString(selectableCheckinItem.diaryEntry.departureTime, true, true, root.context)
 				checkbox.isChecked = selectableCheckinItem.isSelected
+				setStroke(selectableCheckinItem.isSelected)
+
 				checkbox.setOnCheckedChangeListener { _, isChecked ->
 					selectableCheckinItem.isSelected = isChecked
+					setStroke(isChecked)
 					itemSelectionListener?.invoke(selectableCheckinItem.diaryEntry, isChecked)
 				}
+				root.setOnClickListener { checkbox.isChecked = !checkbox.isChecked }
+			}
+		}
+
+		private fun setStroke(isSelected: Boolean) {
+			binding.apply {
+				if (isSelected) {
+					root.strokeWidth = root.context.resources.getDimensionPixelSize(R.dimen.stroke_width_default)
+				} else {
+					root.strokeWidth = 0
+				}
+				root.requestLayout()
 			}
 		}
 	}
diff --git a/app/src/main/res/drawable/ill_tracing_beenden.xml b/app/src/main/res/drawable/ill_tracing_beenden.xml
index 156850241..3b1871b91 100644
--- a/app/src/main/res/drawable/ill_tracing_beenden.xml
+++ b/app/src/main/res/drawable/ill_tracing_beenden.xml
@@ -1,26 +1,10 @@
-<!--
-  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
-  ~
-  ~ This Source Code Form is subject to the terms of the Mozilla Public
-  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
-  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
-  ~
-  ~ SPDX-License-Identifier: MPL-2.0
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="325dp"
     android:height="180dp"
     android:viewportWidth="325"
     android:viewportHeight="180">
   <path
-      android:pathData="M130.096,168.874a30.782,2.168 0,1 0,61.564 0a30.782,2.168 0,1 0,-61.564 0z"
-      android:strokeAlpha="0.1"
-      android:fillColor="#8D6A9F"
-      android:fillType="nonZero"
-      android:fillAlpha="0.1"/>
-  <path
-      android:pathData="M286.358,102.437c-0.01,17.012 -7.475,33.166 -20.425,44.198 -12.95,11.033 -30.083,15.836 -46.881,13.143L126.986,159.778c-3.556,0.488 -7.141,0.733 -10.73,0.733 -2.577,0 -5.123,-0.123 -7.637,-0.369C68.529,156.25 37.959,122.534 38,82.255 38,39.035 73.037,4 116.255,4c34.808,0 64.302,22.727 74.467,54.15 10.485,-8.92 23.807,-13.808 37.573,-13.787 32.063,0 58.063,26 58.063,58.074z"
+      android:pathData="M286.358,102.437c-0.01,17.012 -7.475,33.166 -20.424,44.198 -12.95,11.033 -30.084,15.836 -46.882,13.143L126.986,159.778c-3.556,0.488 -7.141,0.733 -10.73,0.733 -2.577,0 -5.123,-0.123 -7.637,-0.369C68.529,156.25 37.959,122.534 38,82.255 38,39.035 73.037,4 116.256,4c34.807,0 64.301,22.727 74.466,54.15 10.485,-8.92 23.807,-13.808 37.573,-13.787 32.063,0 58.063,26 58.063,58.074z"
       android:strokeAlpha="0.1"
       android:fillColor="#8D6A9F"
       android:fillType="nonZero"
@@ -32,27 +16,27 @@
       android:fillType="nonZero"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M114.24,149.939c0,5.554 -2.131,8.569 -5.621,10.203 -13.147,-1.269 -25.754,-5.863 -36.635,-13.348 0.279,-1.889 0.813,-3.73 1.589,-5.474l9.926,3.087 -8.84,-5.203c1.195,-2.04 2.723,-3.868 4.52,-5.406l16.676,5.185 -13.065,-7.674c5.444,-2.983 11.921,-3.436 17.728,-1.239 5.806,2.198 10.361,6.825 12.466,12.665l0.046,0.13c0.035,0.098 0.07,0.196 0.102,0.295 0.117,0.346 0.224,0.695 0.323,1.047 0.037,0.126 0.071,0.252 0.102,0.38 0.03,0.128 0.063,0.243 0.09,0.364 0.029,0.121 0.053,0.217 0.074,0.316 0.016,0.065 0.03,0.13 0.044,0.196 0.024,0.104 0.045,0.216 0.065,0.314 0.03,0.152 0.06,0.305 0.086,0.457 0.027,0.152 0.055,0.317 0.079,0.475 0.023,0.158 0.052,0.351 0.073,0.529 0.022,0.178 0.04,0.316 0.054,0.475 0,0.05 0.011,0.097 0.016,0.147 0.015,0.139 0.026,0.278 0.036,0.416 0.002,0.018 0.002,0.036 0,0.054 0.013,0.174 0.024,0.347 0.033,0.52 0.009,0.174 0.015,0.343 0.02,0.508v0.05c0.01,0.173 0.012,0.351 0.012,0.53z"
+      android:pathData="M114.24,149.939c0,5.554 -2.131,8.569 -5.621,10.203 -13.147,-1.269 -25.754,-5.863 -36.635,-13.348 0.279,-1.889 0.813,-3.73 1.589,-5.474l9.926,3.087 -8.84,-5.203c1.195,-2.04 2.723,-3.868 4.52,-5.406l16.676,5.185 -13.065,-7.674c5.444,-2.983 11.921,-3.436 17.728,-1.239 5.806,2.198 10.361,6.825 12.466,12.665l0.046,0.13c0.035,0.098 0.07,0.196 0.102,0.295 0.117,0.346 0.225,0.695 0.323,1.047 0.037,0.126 0.071,0.252 0.102,0.38 0.03,0.128 0.063,0.243 0.09,0.364 0.029,0.121 0.053,0.217 0.074,0.316 0.016,0.065 0.03,0.13 0.044,0.196 0.024,0.104 0.045,0.216 0.065,0.314 0.03,0.152 0.06,0.305 0.087,0.457 0.026,0.152 0.054,0.317 0.078,0.475 0.023,0.158 0.052,0.351 0.073,0.529 0.022,0.178 0.04,0.316 0.054,0.475 0,0.05 0.011,0.097 0.016,0.147 0.015,0.139 0.026,0.278 0.036,0.416 0.002,0.018 0.002,0.036 0,0.054 0.014,0.174 0.024,0.347 0.033,0.52 0.009,0.174 0.015,0.343 0.02,0.508v0.05c0.01,0.173 0.013,0.351 0.013,0.53z"
       android:fillColor="#8D6A9F"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M114.24,149.939c0,5.554 -2.131,8.569 -5.621,10.203 -8.502,-0.818 -16.81,-3.033 -24.591,-6.555l0.355,-0.236c1.606,-1.064 3.267,-2.153 5.157,-2.515 1.663,-0.318 3.378,-0.05 5.066,-0.145 2.94,-0.18 5.707,-1.448 7.763,-3.557 1.207,-1.249 2.168,-2.781 3.61,-3.735 1.564,-1.028 3.55,-1.249 5.406,-0.993 0.539,0.079 1.073,0.188 1.6,0.327l0.045,0.13c0.035,0.098 0.07,0.195 0.102,0.295 0.117,0.346 0.224,0.695 0.323,1.047 0.037,0.126 0.071,0.252 0.102,0.38 0.03,0.127 0.063,0.242 0.09,0.364 0.029,0.121 0.053,0.217 0.074,0.316 0.016,0.065 0.03,0.13 0.044,0.195 0.024,0.104 0.045,0.217 0.065,0.315 0.03,0.151 0.06,0.305 0.086,0.457 0.027,0.152 0.055,0.317 0.079,0.475 0.023,0.158 0.052,0.351 0.073,0.529 0.022,0.177 0.04,0.316 0.054,0.474 0,0.05 0.011,0.098 0.016,0.148 0.015,0.139 0.026,0.277 0.036,0.416 0.002,0.018 0.002,0.036 0,0.054 0.013,0.174 0.024,0.347 0.033,0.52 0.009,0.174 0.015,0.343 0.02,0.508v0.05c0.01,0.175 0.012,0.353 0.012,0.533z"
+      android:pathData="M114.24,149.939c0,5.554 -2.131,8.569 -5.621,10.203 -8.502,-0.818 -16.81,-3.033 -24.591,-6.555l0.355,-0.236c1.607,-1.064 3.267,-2.153 5.157,-2.515 1.663,-0.318 3.378,-0.05 5.066,-0.145 2.94,-0.18 5.707,-1.448 7.763,-3.557 1.207,-1.249 2.168,-2.781 3.61,-3.735 1.564,-1.028 3.55,-1.249 5.406,-0.993 0.539,0.079 1.073,0.188 1.6,0.327l0.045,0.13c0.035,0.098 0.07,0.195 0.102,0.295 0.117,0.346 0.225,0.695 0.323,1.047 0.037,0.126 0.071,0.252 0.102,0.38 0.03,0.127 0.063,0.242 0.09,0.364 0.029,0.121 0.053,0.217 0.074,0.316 0.016,0.065 0.03,0.13 0.044,0.195 0.024,0.104 0.045,0.217 0.065,0.315 0.03,0.151 0.06,0.305 0.087,0.457 0.026,0.152 0.054,0.317 0.078,0.475 0.023,0.158 0.052,0.351 0.073,0.529 0.022,0.177 0.04,0.316 0.054,0.474 0,0.05 0.011,0.098 0.016,0.148 0.015,0.139 0.026,0.277 0.036,0.416 0.002,0.018 0.002,0.036 0,0.054 0.014,0.174 0.024,0.347 0.033,0.52 0.009,0.174 0.015,0.343 0.02,0.508v0.05c0.01,0.175 0.013,0.353 0.013,0.533z"
       android:strokeAlpha="0.1"
       android:fillColor="#000"
       android:fillType="nonZero"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M240.792,153.544c0.002,0.565 -0.056,1.129 -0.173,1.682 -0.022,0.104 -0.046,0.206 -0.07,0.306 -0.615,2.469 -2.352,4.274 -4.424,4.39h-0.217c-2.191,0 -4.045,-1.89 -4.656,-4.494 -0.017,-0.07 -0.032,-0.14 -0.048,-0.217 -0.117,-0.553 -0.175,-1.117 -0.173,-1.682 0,-3.527 2.183,-6.384 4.877,-6.384 2.695,0 4.884,2.872 4.884,6.399z"
+      android:pathData="M240.792,153.544c0.002,0.565 -0.056,1.129 -0.173,1.682 -0.022,0.104 -0.046,0.206 -0.07,0.306 -0.615,2.469 -2.351,4.274 -4.424,4.39h-0.217c-2.191,0 -4.045,-1.89 -4.656,-4.494 -0.017,-0.07 -0.032,-0.14 -0.048,-0.217 -0.117,-0.553 -0.175,-1.117 -0.173,-1.682 0,-3.527 2.183,-6.384 4.877,-6.384 2.695,0 4.884,2.872 4.884,6.399z"
       android:fillColor="#3F3D56"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M240.792,153.544c0.002,0.565 -0.056,1.129 -0.173,1.682 -0.022,0.104 -0.046,0.206 -0.07,0.306h-0.216c-0.537,-0.03 -1.07,-0.102 -1.596,-0.217 -0.465,0.144 -0.94,0.252 -1.422,0.325 -0.369,0.056 -0.74,0.09 -1.114,0.104h-0.377c-0.447,0 -0.893,-0.03 -1.336,-0.089 -0.715,-0.095 -1.418,-0.27 -2.096,-0.52 -0.37,0.123 -0.748,0.225 -1.131,0.303 -0.018,-0.069 -0.033,-0.138 -0.048,-0.216 -0.117,-0.553 -0.175,-1.117 -0.173,-1.682 0,-3.527 2.183,-6.384 4.877,-6.384 2.695,0 4.875,2.86 4.875,6.388z"
+      android:pathData="M240.792,153.544c0.002,0.565 -0.056,1.129 -0.173,1.682 -0.022,0.104 -0.046,0.206 -0.07,0.306h-0.216c-0.537,-0.03 -1.07,-0.102 -1.596,-0.217 -0.465,0.144 -0.94,0.252 -1.422,0.325 -0.369,0.056 -0.74,0.09 -1.114,0.104h-0.377c-0.447,0 -0.893,-0.03 -1.335,-0.089 -0.716,-0.095 -1.42,-0.27 -2.097,-0.52 -0.37,0.123 -0.748,0.225 -1.131,0.303 -0.018,-0.069 -0.033,-0.138 -0.048,-0.216 -0.117,-0.553 -0.175,-1.117 -0.173,-1.682 0,-3.527 2.183,-6.384 4.877,-6.384 2.695,0 4.875,2.86 4.875,6.388z"
       android:strokeAlpha="0.1"
       android:fillColor="#000"
       android:fillType="nonZero"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M251.197,141.652c0.002,-1.552 -0.361,-3.083 -1.062,-4.468l-5.736,1.784 5.036,-2.959c-1.71,-2.472 -4.45,-4.034 -7.448,-4.247 -0.236,-0.357 -0.494,-0.699 -0.774,-1.023l-8.238,2.565 6.757,-3.974c-2.625,-2.014 -6.082,-2.586 -9.216,-1.525 -3.134,1.062 -5.531,3.617 -6.391,6.812l7.056,8.123 -7.655,-5.537c-4.007,2.843 -5.329,8.191 -3.107,12.573 2.223,4.382 7.319,6.475 11.98,4.921 2.04,0.75 4.269,0.812 6.347,0.176 2.934,0.642 6.002,-0.08 8.342,-1.962 2.34,-1.883 3.703,-4.724 3.704,-7.728 0,-0.217 0,-0.434 -0.022,-0.65 0.284,-0.934 0.428,-1.905 0.427,-2.881z"
+      android:pathData="M251.197,141.652c0.003,-1.552 -0.361,-3.083 -1.062,-4.468l-5.736,1.784 5.036,-2.959c-1.71,-2.472 -4.45,-4.034 -7.448,-4.247 -0.236,-0.357 -0.494,-0.699 -0.774,-1.023l-8.238,2.565 6.757,-3.974c-2.625,-2.014 -6.082,-2.586 -9.216,-1.525 -3.134,1.062 -5.531,3.617 -6.391,6.812l7.056,8.123 -7.655,-5.537c-4.007,2.843 -5.329,8.191 -3.106,12.573 2.222,4.382 7.318,6.475 11.979,4.921 2.04,0.75 4.269,0.812 6.347,0.176 2.934,0.642 6.002,-0.08 8.342,-1.962 2.34,-1.883 3.703,-4.724 3.704,-7.728 0,-0.217 0,-0.434 -0.022,-0.65 0.284,-0.934 0.428,-1.905 0.427,-2.881z"
       android:fillColor="#8D6A9F"
       android:fillType="nonZero"/>
   <path
@@ -62,53 +46,119 @@
       android:fillType="nonZero"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M191.745,58.284L192.674,58.284A0.496,0.496 0,0 1,193.17 58.78L193.17,73.617A0.496,0.496 0,0 1,192.674 74.113L191.745,74.113A0.496,0.496 0,0 1,191.249 73.617L191.249,58.78A0.496,0.496 0,0 1,191.745 58.284z"
+      android:pathData="M173.951,65.805L174.882,65.805A0.498,0.498 0,0 1,175.38 66.303L175.38,81.186A0.498,0.498 0,0 1,174.882 81.684L173.951,81.684A0.498,0.498 0,0 1,173.453 81.186L173.453,66.303A0.498,0.498 0,0 1,173.951 65.805z"
+      android:fillColor="#4A4969"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M109.917,53.364L110.002,53.364A0.498,0.498 0,0 1,110.5 53.862L110.5,58.094A0.498,0.498 0,0 1,110.002 58.592L109.917,58.592A0.498,0.498 0,0 1,109.419 58.094L109.419,53.862A0.498,0.498 0,0 1,109.917 53.364z"
       android:fillColor="#3A3768"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M127.918,45.883L128.003,45.883A0.496,0.496 0,0 1,128.499 46.379L128.499,50.598A0.496,0.496 0,0 1,128.003 51.094L127.918,51.094A0.496,0.496 0,0 1,127.422 50.598L127.422,46.379A0.496,0.496 0,0 1,127.918 45.883z"
+      android:pathData="M109.878,62.936L110.1,62.936A0.498,0.498 0,0 1,110.598 63.434L110.598,71.537A0.498,0.498 0,0 1,110.1 72.035L109.878,72.035A0.498,0.498 0,0 1,109.38 71.537L109.38,63.434A0.498,0.498 0,0 1,109.878 62.936z"
       android:fillColor="#3A3768"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M127.879,55.425L128.101,55.425A0.496,0.496 0,0 1,128.597 55.921L128.597,63.999A0.496,0.496 0,0 1,128.101 64.495L127.879,64.495A0.496,0.496 0,0 1,127.383 63.999L127.383,55.921A0.496,0.496 0,0 1,127.879 55.425z"
+      android:pathData="M109.898,75.219L110.061,75.219A0.498,0.498 0,0 1,110.559 75.717L110.559,83.898A0.498,0.498 0,0 1,110.061 84.396L109.898,84.396A0.498,0.498 0,0 1,109.4 83.898L109.4,75.717A0.498,0.498 0,0 1,109.898 75.219z"
       android:fillColor="#3A3768"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M127.899,67.668L128.062,67.668A0.496,0.496 0,0 1,128.558 68.164L128.558,76.32A0.496,0.496 0,0 1,128.062 76.816L127.899,76.816A0.496,0.496 0,0 1,127.403 76.32L127.403,68.164A0.496,0.496 0,0 1,127.899 67.668z"
+      android:pathData="M118.511,36.088L166.013,36.088A8.479,8.479 0,0 1,174.492 44.567L174.492,158.609A8.479,8.479 0,0 1,166.013 167.088L118.511,167.088A8.479,8.479 0,0 1,110.032 158.609L110.032,44.567A8.479,8.479 0,0 1,118.511 36.088z"
+      android:fillColor="#3F3D56"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M136.887,40L144.204,40A0.842,0.842 0,0 1,145.046 40.842L145.046,40.985A0.842,0.842 0,0 1,144.204 41.827L136.887,41.827A0.842,0.842 0,0 1,136.045 40.985L136.045,40.842A0.842,0.842 0,0 1,136.887 40z"
+      android:fillColor="#E6E8EC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M147.443,40.914m-1.037,0a1.037,1.037 0,1 1,2.074 0a1.037,1.037 0,1 1,-2.074 0"
+      android:fillColor="#E6E8EC"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M165.68,39.618h-7.372v0.889c0,2.328 -1.887,4.214 -4.215,4.214L130.567,44.721c-2.328,0 -4.215,-1.886 -4.215,-4.214v-0.89h-6.925c-1.357,0 -2.659,0.54 -3.619,1.5 -0.96,0.96 -1.498,2.262 -1.498,3.62v113.937c0,1.358 0.539,2.66 1.498,3.62 0.96,0.96 2.262,1.5 3.62,1.5L165.68,163.794c2.827,0 5.119,-2.293 5.119,-5.12L170.799,44.738c0,-2.828 -2.292,-5.12 -5.12,-5.12z"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M119.029,102.136a23.576,23.575 0,1 0,47.152 0a23.576,23.575 0,1 0,-47.152 0z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M140.352,85.275c2.183,-0.544 4.387,0.781 4.931,2.963 0.222,0.891 0.135,1.78 -0.197,2.563l8.595,5.164c0.536,-0.659 1.278,-1.156 2.171,-1.378 2.181,-0.544 4.386,0.782 4.931,2.964 0.544,2.182 -0.781,4.387 -2.963,4.931 -0.861,0.215 -1.723,0.141 -2.486,-0.169l-5.006,8.775c0.543,0.513 0.947,1.182 1.142,1.962 0.544,2.181 -0.781,4.386 -2.963,4.93 -2.183,0.544 -4.387,-0.781 -4.931,-2.963 -0.062,-0.249 -0.099,-0.498 -0.113,-0.744l-5.952,-1.331c-0.457,1.198 -1.478,2.159 -2.816,2.492 -2.183,0.544 -4.388,-0.782 -4.933,-2.964 -0.544,-2.182 0.782,-4.387 2.964,-4.932 0.589,-0.147 1.176,-0.158 1.731,-0.053l1.378,-4.01 -3.352,-3.386c-0.418,0.312 -0.905,0.548 -1.444,0.683 -2.183,0.544 -4.388,-0.781 -4.932,-2.963 -0.544,-2.182 0.782,-4.387 2.964,-4.932 1.51,-0.376 3.028,0.144 4.003,1.221l4.601,-3.101c-0.12,-0.248 -0.217,-0.514 -0.286,-0.792 -0.544,-2.183 0.781,-4.387 2.963,-4.931zM136.746,104.397l-1.19,3.465c1.015,0.516 1.804,1.45 2.101,2.641 0.11,0.441 0.145,0.879 0.111,1.305l5.791,1.298c0.106,-0.457 0.291,-0.889 0.544,-1.279l-7.357,-7.43zM145.545,103.703l1.566,6.283c0.8,-0.082 1.582,0.076 2.262,0.428l4.952,-8.681c-0.684,-0.53 -1.201,-1.289 -1.433,-2.193l-4.821,0.523c-0.044,1.587 -1.025,3.031 -2.526,3.641zM138.493,99.308l-1.326,3.863 7.7,7.775c0.326,-0.281 0.701,-0.512 1.117,-0.68L144.418,103.984c-1.983,0.205 -3.861,-1.073 -4.358,-3.064 -0.108,-0.434 -0.144,-0.867 -0.112,-1.287l-1.455,-0.325zM142.32,93.17c-0.59,0.147 -1.178,0.158 -1.735,0.052L138.873,98.203l1.327,0.295c0.454,-1.206 1.478,-2.174 2.823,-2.509 2.168,-0.54 4.357,0.763 4.92,2.918l4.827,-0.523c0.017,-0.496 0.125,-0.976 0.312,-1.422l-8.596,-5.165c-0.536,0.657 -1.278,1.15 -2.166,1.372zM133.305,99.27l2.949,2.979 1.098,-3.195 -3.496,-0.779c-0.136,0.356 -0.322,0.692 -0.55,0.996zM138.326,91.961l-4.604,3.104c0.117,0.244 0.211,0.504 0.279,0.777 0.109,0.439 0.145,0.876 0.111,1.301l3.62,0.806 1.754,-5.103c-0.348,-0.177 -0.67,-0.404 -0.954,-0.674l-0.206,-0.21z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M121.158,83.578L160.173,122.593 158.045,124.721 119.03,85.706z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M128.399,85.35L158.504,115.455 155.666,118.292 125.561,88.187z"
+      android:fillColor="#7E5F8E"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M111.38,177.256a30.782,2.168 0,1 0,61.564 0a30.782,2.168 0,1 0,-61.564 0z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M231.362,65.622L232.291,65.622A0.496,0.496 0,0 1,232.787 66.118L232.787,80.955A0.496,0.496 0,0 1,232.291 81.451L231.362,81.451A0.496,0.496 0,0 1,230.866 80.955L230.866,66.118A0.496,0.496 0,0 1,231.362 65.622z"
       android:fillColor="#3A3768"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M136.485,28.662L183.833,28.662A8.452,8.452 0,0 1,192.285 37.114L192.285,150.793A8.452,8.452 0,0 1,183.833 159.245L136.485,159.245A8.452,8.452 0,0 1,128.033 150.793L128.033,37.114A8.452,8.452 0,0 1,136.485 28.662z"
+      android:pathData="M167.535,53.221L167.62,53.221A0.496,0.496 0,0 1,168.116 53.717L168.116,57.936A0.496,0.496 0,0 1,167.62 58.432L167.535,58.432A0.496,0.496 0,0 1,167.039 57.936L167.039,53.717A0.496,0.496 0,0 1,167.535 53.221z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M167.496,62.763L167.718,62.763A0.496,0.496 0,0 1,168.214 63.259L168.214,71.337A0.496,0.496 0,0 1,167.718 71.833L167.496,71.833A0.496,0.496 0,0 1,167 71.337L167,63.259A0.496,0.496 0,0 1,167.496 62.763z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M167.516,75.006L167.679,75.006A0.496,0.496 0,0 1,168.175 75.502L168.175,83.658A0.496,0.496 0,0 1,167.679 84.154L167.516,84.154A0.496,0.496 0,0 1,167.02 83.658L167.02,75.502A0.496,0.496 0,0 1,167.516 75.006z"
+      android:fillColor="#3A3768"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M176.102,36L223.45,36A8.452,8.452 0,0 1,231.902 44.452L231.902,158.131A8.452,8.452 0,0 1,223.45 166.583L176.102,166.583A8.452,8.452 0,0 1,167.65 158.131L167.65,44.452A8.452,8.452 0,0 1,176.102 36z"
       android:fillColor="#3F3D56"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M154.801,32.562L162.095,32.562A0.839,0.839 0,0 1,162.934 33.401L162.934,33.544A0.839,0.839 0,0 1,162.095 34.383L154.801,34.383A0.839,0.839 0,0 1,153.962 33.544L153.962,33.401A0.839,0.839 0,0 1,154.801 32.562z"
+      android:pathData="M194.418,39.9L201.712,39.9A0.839,0.839 0,0 1,202.551 40.739L202.551,40.882A0.839,0.839 0,0 1,201.712 41.721L194.418,41.721A0.839,0.839 0,0 1,193.579 40.882L193.579,40.739A0.839,0.839 0,0 1,194.418 39.9z"
       android:fillColor="#E6E8EC"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M165.323,33.472m-1.034,0a1.034,1.034 0,1 1,2.068 0a1.034,1.034 0,1 1,-2.068 0"
+      android:pathData="M204.94,40.81m-1.034,0a1.034,1.034 0,1 1,2.068 0a1.034,1.034 0,1 1,-2.068 0"
       android:fillColor="#E6E8EC"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M183.502,32.18h-7.35v0.887c0,2.32 -1.88,4.2 -4.2,4.2h-23.45c-2.321,0 -4.202,-1.88 -4.202,-4.2v-0.887h-6.902c-1.353,0 -2.65,0.538 -3.608,1.495 -0.956,0.957 -1.493,2.255 -1.493,3.608v113.575c0,1.353 0.537,2.65 1.493,3.608 0.957,0.957 2.255,1.494 3.608,1.494h46.104c2.818,0 5.102,-2.284 5.102,-5.102L188.604,37.282c0,-2.818 -2.284,-5.103 -5.102,-5.103z"
+      android:pathData="M223.204,40h-7.348v0.887c0,2.32 -1.881,4.2 -4.201,4.2L188.204,45.087c-2.32,0 -4.201,-1.88 -4.201,-4.2L184.003,40L177.1,40c-1.353,0 -2.651,0.538 -3.608,1.495C172.537,42.452 172,43.75 172,45.103v113.574c0,1.354 0.537,2.651 1.493,3.609 0.957,0.957 2.255,1.494 3.608,1.494h46.103c2.818,0 5.103,-2.284 5.103,-5.103L228.307,45.103C228.307,42.285 226.022,40 223.204,40z"
       android:fillColor="#8D6A9F"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M160.501,94.5m-23.5,0a23.5,23.5 0,1 1,47 0a23.5,23.5 0,1 1,-47 0"
+      android:pathData="M199.5,101.5m-23.5,0a23.5,23.5 0,1 1,47 0a23.5,23.5 0,1 1,-47 0"
       android:strokeAlpha="0.1"
       android:fillColor="#000"
       android:fillType="evenOdd"
       android:fillAlpha="0.1"/>
   <path
-      android:pathData="M158.254,77.692c2.176,-0.542 4.374,0.778 4.916,2.954 0.222,0.888 0.134,1.774 -0.196,2.554l8.567,5.148c0.533,-0.658 1.275,-1.152 2.163,-1.373 2.175,-0.542 4.373,0.778 4.916,2.954 0.542,2.175 -0.779,4.373 -2.954,4.915 -0.858,0.214 -1.718,0.141 -2.478,-0.168l-4.99,8.747c0.542,0.511 0.945,1.179 1.139,1.955 0.542,2.175 -0.779,4.374 -2.954,4.916 -2.175,0.542 -4.373,-0.778 -4.916,-2.954 -0.062,-0.248 -0.098,-0.496 -0.113,-0.74l-5.932,-1.328c-0.455,1.194 -1.473,2.151 -2.807,2.484 -2.175,0.542 -4.373,-0.778 -4.915,-2.954 -0.543,-2.175 0.778,-4.373 2.953,-4.915 0.587,-0.147 1.172,-0.158 1.725,-0.054l1.373,-3.998 -3.34,-3.374c-0.417,0.311 -0.903,0.547 -1.44,0.68 -2.175,0.543 -4.373,-0.778 -4.915,-2.953 -0.543,-2.176 0.778,-4.374 2.953,-4.916 1.506,-0.375 3.019,0.143 3.99,1.217l4.588,-3.092c-0.12,-0.248 -0.217,-0.512 -0.286,-0.79 -0.543,-2.175 0.778,-4.373 2.953,-4.915zM154.66,96.754L153.475,100.206c1.01,0.515 1.798,1.445 2.094,2.633 0.11,0.439 0.144,0.876 0.11,1.3l5.773,1.293c0.105,-0.455 0.29,-0.884 0.541,-1.273l-7.333,-7.406zM163.431,96.061l1.562,6.263c0.797,-0.082 1.578,0.077 2.254,0.426l4.936,-8.653c-0.682,-0.529 -1.198,-1.284 -1.428,-2.186l-4.805,0.521c-0.045,1.581 -1.022,3.02 -2.519,3.63zM156.403,91.681l-1.323,3.85 7.676,7.75c0.324,-0.28 0.698,-0.51 1.113,-0.677l-1.562,-6.262c-1.976,0.203 -3.849,-1.07 -4.343,-3.054 -0.108,-0.433 -0.144,-0.864 -0.112,-1.284l-1.45,-0.323zM160.217,85.561c-0.589,0.147 -1.175,0.158 -1.729,0.054l-1.706,4.964 1.322,0.295c0.452,-1.203 1.472,-2.168 2.813,-2.502 2.16,-0.539 4.344,0.76 4.905,2.91l4.81,-0.522c0.017,-0.494 0.125,-0.973 0.312,-1.418l-8.568,-5.148c-0.534,0.655 -1.274,1.146 -2.16,1.367zM151.231,91.643l2.94,2.97 1.094,-3.185 -3.486,-0.778c-0.135,0.356 -0.32,0.69 -0.548,0.993zM156.235,84.357l-4.589,3.094c0.117,0.244 0.211,0.503 0.28,0.775 0.108,0.437 0.143,0.872 0.11,1.296l3.608,0.803 1.747,-5.086c-0.347,-0.176 -0.667,-0.402 -0.95,-0.672l-0.206,-0.21z"
+      android:pathData="M197.722,103.045v12.778L184.944,115.823L184.944,103.045h12.778zM203.53,111.177v2.322l9.293,0.001v2.323L201.207,115.823v-4.646h2.323zM195.398,105.368h-8.13v8.13h8.13v-8.13zM203.53,103.045v3.485h2.323v-3.485h6.97v8.132L210.5,111.177l-0.001,-5.809h-2.323v3.486h-6.969v-5.809h2.323zM193.076,107.692v3.485L189.59,111.177v-3.485h3.485zM197.722,87.944v12.778L184.944,100.722L184.944,87.944h12.778zM212.823,87.944v12.778L200.045,100.722L200.045,87.944h12.778zM195.398,90.268h-8.13v8.13h8.13v-8.13zM210.498,90.268h-8.13v8.13h8.13v-8.13zM193.077,92.59v3.485L189.59,96.075L189.59,92.59h3.485zM208.177,92.59v3.485h-3.484L204.693,92.59h3.485z"
       android:fillColor="#FFF"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="M139.122,76L178.013,114.891 175.892,117.012 137.001,78.121z"
+      android:pathData="M178.121,83L217.012,121.891 214.891,124.012 176,85.121z"
       android:fillColor="#FFF"
       android:fillType="nonZero"/>
   <path
-      android:pathData="M146.34,77.768L176.349,107.777 173.521,110.605 143.512,80.596z"
+      android:pathData="M185.339,84.768L215.348,114.777 212.52,117.605 182.511,87.596z"
       android:fillColor="#7E5F8E"
       android:fillType="nonZero"/>
+  <path
+      android:pathData="M168.38,177.168a30.782,2.168 0,1 0,61.564 0a30.782,2.168 0,1 0,-61.564 0z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#8D6A9F"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M72,171H278V180H72z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_get_well.xml b/app/src/main/res/layout/fragment_get_well.xml
index b628aee5f..27a9c66e6 100644
--- a/app/src/main/res/layout/fragment_get_well.xml
+++ b/app/src/main/res/layout/fragment_get_well.xml
@@ -7,41 +7,58 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
+	android:layout_height="match_parent"
 	android:background="@color/white"
-	android:layout_height="match_parent">
+	android:orientation="vertical">
 
-	<LinearLayout
+	<ScrollView
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:orientation="vertical">
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:fillViewport="true">
 
-		<ImageView
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_enormous"
-			android:src="@drawable/ill_gute_besserung" />
+			android:orientation="vertical">
 
-		<TextView
-			style="@style/NextStep.Text.Title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_huge"
-			android:gravity="bottom|center_horizontal"
-			android:text="@string/inform_send_getwell_title" />
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="@dimen/spacing_enormous"
+				android:src="@drawable/ill_gute_besserung" />
 
-		<TextView
-			style="@style/NextStep.Text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_medium_large"
-			android:gravity="center_horizontal"
-			android:paddingStart="@dimen/spacing_huge"
-			android:paddingEnd="@dimen/spacing_huge"
-			android:text="@string/inform_send_getwell_text" />
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:gravity="bottom|center_horizontal"
+				android:text="@string/inform_send_getwell_title" />
+
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:gravity="center_horizontal"
+				android:paddingStart="@dimen/spacing_huge"
+				android:paddingEnd="@dimen/spacing_huge"
+				android:text="@string/inform_send_getwell_text" />
+
+		</LinearLayout>
+	</ScrollView>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/white"
+		android:elevation="@dimen/spacing_small">
 
 		<Button
 			android:id="@+id/inform_get_well_button_continue"
@@ -49,9 +66,10 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_enormous"
-			android:layout_marginBottom="@dimen/spacing_huger"
+			android:layout_marginVertical="@dimen/spacing_medium_large"
 			android:text="@string/inform_fertig_button_title" />
 
-	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+	</FrameLayout>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/fragment_inform.xml b/app/src/main/res/layout/fragment_inform.xml
index 618ea4086..9022b1244 100644
--- a/app/src/main/res/layout/fragment_inform.xml
+++ b/app/src/main/res/layout/fragment_inform.xml
@@ -26,7 +26,7 @@
 			style="@style/NextStep.Button.Transparent"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="end"
+			android:layout_gravity="start"
 			android:text="@string/cancel" />
 
 		<FrameLayout
diff --git a/app/src/main/res/layout/fragment_inform_intro.xml b/app/src/main/res/layout/fragment_inform_intro.xml
index be3134094..3a7dc740b 100644
--- a/app/src/main/res/layout/fragment_inform_intro.xml
+++ b/app/src/main/res/layout/fragment_inform_intro.xml
@@ -37,6 +37,14 @@
 					android:layout_height="wrap_content"
 					android:src="@drawable/ill_wichtiger_hinweis" />
 
+				<TextView
+					style="@style/NextStep.Text.Bold.Purple"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_large"
+					android:gravity="center_horizontal"
+					android:text="@string/inform_code_title" />
+
 				<TextView
 					style="@style/NextStep.Text.Title"
 					android:layout_width="wrap_content"
@@ -70,8 +78,8 @@
 					<androidx.constraintlayout.widget.ConstraintLayout
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_huge"
-						android:layout_marginTop="@dimen/spacing_large">
+						android:layout_marginTop="@dimen/spacing_large"
+						android:layout_marginBottom="@dimen/spacing_huge">
 
 						<androidx.constraintlayout.helper.widget.Flow
 							android:id="@+id/inform_intro_travel_flags_flow"
@@ -96,9 +104,9 @@
 				style="@style/NextStep.Button.Transparent"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="end"
+				android:layout_gravity="start"
+				android:layout_marginStart="@dimen/spacing_medium_large"
 				android:layout_marginTop="@dimen/spacing_medium_large"
-				android:layout_marginEnd="@dimen/spacing_medium_large"
 				android:text="@string/cancel" />
 
 		</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_inform_really_not_share.xml b/app/src/main/res/layout/fragment_inform_really_not_share.xml
index 8ae2804a1..c9391e928 100644
--- a/app/src/main/res/layout/fragment_inform_really_not_share.xml
+++ b/app/src/main/res/layout/fragment_inform_really_not_share.xml
@@ -40,7 +40,7 @@
 				android:layout_gravity="center_horizontal"
 				android:layout_marginTop="@dimen/spacing_huge"
 				android:layout_marginBottom="@dimen/spacing_medium_large"
-				android:text="@string/inform_try_again_button_title" />
+				android:text="@string/share_button_title" />
 
 			<TextView
 				android:id="@+id/dont_send_button"
@@ -51,7 +51,7 @@
 				android:layout_marginBottom="@dimen/spacing_medium_large"
 				android:background="?selectableItemBackground"
 				android:padding="@dimen/spacing_small"
-				android:text="@string/inform_dont_send_button_title"
+				android:text="@string/inform_dont_share_button_title"
 				android:visibility="visible" />
 
 		</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_share_checkins.xml b/app/src/main/res/layout/fragment_share_checkins.xml
index 9f9204a8d..dba5940fe 100644
--- a/app/src/main/res/layout/fragment_share_checkins.xml
+++ b/app/src/main/res/layout/fragment_share_checkins.xml
@@ -46,7 +46,8 @@
 			<com.google.android.material.checkbox.MaterialCheckBox
 				android:id="@+id/select_all_checkbox"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" />
+				android:layout_height="wrap_content"
+				android:buttonTint="@color/purple_main" />
 
 		</LinearLayout>
 
@@ -75,7 +76,7 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_horizontal"
 				android:layout_marginVertical="@dimen/spacing_medium_large"
-				android:text="@string/inform_send_button_title" />
+				android:text="@string/inform_share_checkins_send_button_title" />
 
 			<TextView
 				android:id="@+id/dont_send_button"
@@ -86,7 +87,7 @@
 				android:layout_marginBottom="@dimen/spacing_medium_large"
 				android:background="?selectableItemBackground"
 				android:padding="@dimen/spacing_small"
-				android:text="@string/inform_dont_send_button_title"
+				android:text="@string/inform_share_checkins_not_send_button"
 				android:visibility="visible" />
 
 		</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_thank_you.xml b/app/src/main/res/layout/fragment_thank_you.xml
index aea5e8bd1..f4c671a7f 100644
--- a/app/src/main/res/layout/fragment_thank_you.xml
+++ b/app/src/main/res/layout/fragment_thank_you.xml
@@ -7,74 +7,102 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@color/white">
+	android:orientation="vertical">
 
-	<LinearLayout
+	<ScrollView xmlns:tools="http://schemas.android.com/tools"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:orientation="vertical">
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:background="@color/white"
+		android:fillViewport="true">
 
-		<ImageView
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_enormous"
-			android:src="@drawable/ill_danke" />
+			android:orientation="vertical">
 
-		<TextView
-			style="@style/NextStep.Text.Title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_huge"
-			android:gravity="bottom|center_horizontal"
-			android:text="@string/inform_send_thankyou" />
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="2" />
 
-		<TextView
-			android:id="@+id/inform_thank_you_text_info"
-			style="@style/NextStep.Text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_medium_large"
-			android:gravity="center_horizontal"
-			android:paddingStart="@dimen/spacing_huge"
-			android:paddingEnd="@dimen/spacing_huge"
-			tools:text="@string/inform_send_thankyou_text_onsetdate_info" />
-
-		<TextView
-			android:id="@+id/inform_thank_you_text_onsetdate"
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:paddingStart="@dimen/spacing_huge"
-			android:paddingEnd="@dimen/spacing_huge"
-			android:text="@string/inform_send_thankyou_text_onsetdate" />
-
-		<TextView
-			android:id="@+id/inform_thank_you_text_checkins"
-			style="@style/NextStep.Text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_very_large"
-			android:gravity="center_horizontal"
-			android:paddingHorizontal="@dimen/spacing_huge"
-			android:text="@string/inform_send_thankyou_text_checkins" />
-
-		<TextView
-			android:id="@+id/inform_thank_you_text_stop_infection_chains"
-			style="@style/NextStep.Text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_very_large"
-			android:gravity="center_horizontal"
-			android:paddingStart="@dimen/spacing_huge"
-			android:paddingEnd="@dimen/spacing_huge"
-			android:text="@string/inform_send_thankyou_text_stop_infection_chains" />
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:src="@drawable/ill_danke" />
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1" />
+
+			<TextView
+				style="@style/NextStep.Text.Title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:gravity="bottom|center_horizontal"
+				android:text="@string/inform_send_thankyou" />
+
+			<TextView
+				android:id="@+id/inform_thank_you_text_info"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium_large"
+				android:gravity="center_horizontal"
+				android:paddingStart="@dimen/spacing_huge"
+				android:paddingEnd="@dimen/spacing_huge"
+				tools:text="@string/inform_send_thankyou_text_onsetdate_info" />
+
+			<TextView
+				android:id="@+id/inform_thank_you_text_onsetdate"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal"
+				android:paddingHorizontal="@dimen/spacing_huge"
+				android:text="@string/inform_send_thankyou_text_onsetdate" />
+
+			<TextView
+				android:id="@+id/inform_thank_you_text_checkins"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:gravity="center_horizontal"
+				android:paddingHorizontal="@dimen/spacing_huge"
+				android:text="@string/inform_send_thankyou_text_checkins" />
+
+			<TextView
+				android:id="@+id/inform_thank_you_text_stop_infection_chains"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:gravity="center_horizontal"
+				android:paddingHorizontal="@dimen/spacing_huge"
+				android:text="@string/inform_send_thankyou_text_stop_infection_chains" />
+
+			<Space
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="3" />
+
+		</LinearLayout>
+	</ScrollView>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/white"
+		android:elevation="@dimen/spacing_small">
 
 		<Button
 			android:id="@+id/inform_thank_you_button_continue"
@@ -82,9 +110,10 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_enormous"
-			android:layout_marginBottom="@dimen/spacing_huger"
+			android:layout_marginVertical="@dimen/spacing_medium_large"
 			android:text="@string/inform_continue_button" />
+	</FrameLayout>
+
+</LinearLayout>
+
 
-	</LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tracing_stopped.xml b/app/src/main/res/layout/fragment_tracing_stopped.xml
index 0457f8abb..dd6f39bd3 100644
--- a/app/src/main/res/layout/fragment_tracing_stopped.xml
+++ b/app/src/main/res/layout/fragment_tracing_stopped.xml
@@ -9,8 +9,9 @@
   -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
+	android:layout_height="match_parent"
 	android:background="@color/white"
-	android:layout_height="match_parent">
+	android:fillViewport="true">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -18,19 +19,28 @@
 		android:layout_gravity="center_horizontal"
 		android:orientation="vertical">
 
+		<Space
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="3" />
+
 		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_enormous"
 			android:src="@drawable/ill_tracing_beenden" />
 
+		<Space
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="2" />
+
 		<TextView
 			style="@style/NextStep.Text.Title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_huge"
 			android:gravity="bottom|center_horizontal"
+			android:paddingHorizontal="@dimen/spacing_huge"
 			android:text="@string/tracing_ended_title" />
 
 		<TextView
@@ -39,19 +49,30 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/spacing_medium_large"
 			android:gravity="center_horizontal"
-			android:paddingStart="@dimen/spacing_huge"
-			android:paddingEnd="@dimen/spacing_huge"
+			android:paddingHorizontal="@dimen/spacing_huge"
 			android:text="@string/tracing_ended_info" />
 
-		<Button
-			android:id="@+id/inform_end_tracing_button_continue"
-			style="@style/NextStep.Button.Purple"
-			android:layout_width="wrap_content"
+		<Space
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="5" />
+
+		<FrameLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_enormous"
-			android:layout_marginBottom="@dimen/spacing_huger"
-			android:text="@string/inform_continue_button" />
+			android:background="@color/white"
+			android:elevation="@dimen/spacing_small">
+
+			<Button
+				android:id="@+id/inform_end_tracing_button_continue"
+				style="@style/NextStep.Button.Purple"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginVertical="@dimen/spacing_medium_large"
+				android:text="@string/inform_continue_button" />
+
+		</FrameLayout>
 
 	</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_selectable_checkin.xml b/app/src/main/res/layout/item_selectable_checkin.xml
index df4f26910..6606806de 100644
--- a/app/src/main/res/layout/item_selectable_checkin.xml
+++ b/app/src/main/res/layout/item_selectable_checkin.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginTop="@dimen/spacing_medium">
+	app:cardBackgroundColor="@color/white"
+	app:cardForegroundColor="@color/transparent"
+	android:layout_marginTop="@dimen/spacing_medium"
+	app:strokeColor="@color/purple_main"
+	app:strokeWidth="2dp">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
@@ -46,10 +50,12 @@
 			android:id="@+id/checkbox"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:buttonTint="@color/purple_main"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
+			app:layout_constraintTop_toTopOf="parent"
+			tools:checked="true" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index f03163b26..edcb81e6a 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1630,7 +1630,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1683,7 +1683,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1785,4 +1785,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 02e9971a3..d492b6f05 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -260,7 +260,7 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Befolgen Sie die erhaltenen Anweisungen zur Isolation"</string>
-    <string name="tracing_ended_title">"Tracing deaktiviert"</string>
+    <string name="tracing_ended_title">"Tracing und Check-ins deaktiviert"</string>
     <string name="tracing_ended_text">"Es werden keine Begegnungen mehr gespeichert."</string>
     <string name="exposed_info_contact_hotline">"Kontaktieren Sie die"</string>
     <string name="meldung_homescreen_positive_info_line1">"Befolgen Sie die"</string>
@@ -658,7 +658,7 @@ Damit erfahren andere SwissCovid App Nutzer, dass die Möglichkeit einer Ansteck
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Wichtiger Hinweis"</string>
+    <string name="inform_code_intro_title">"Information zur Eingabe"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Obwohl keine Daten zu Ihrer Person gesendet werden, kann es sein, dass sich jemand anhand des Datums an die Begegnung erinnern kann."</string>
@@ -1298,9 +1298,9 @@ Damit auch Reisende aus dem Ausland gewarnt werden können, geschieht das unabh
     <string name="delete_infection_dialog_finish_button">"Beenden"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Es werden keine Begegnungen mehr gespeichert.
+    <string name="tracing_ended_info">"Es werden keine neuen Begegnungen mehr gespeichert und neue Check-ins sind derzeit nicht möglich.
 
-Das Tracing kann nach der Isolation wieder aktiviert werden."</string>
+Beide Funktionen können nach der Isolation wieder aktiviert werden."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1435,7 +1435,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – heute"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Auf diese Weise helfen Sie, Infektionsketten zu durchbrechen."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Die privaten Schlüssel Ihrer App wurden für den folgenden Zeitraum gesendet:"</string>
@@ -1692,18 +1692,18 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="module_checkins_description">"Scannen Sie einen SwissCovid-QR-Code, um sich vor Ort einzuchecken."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Check-Ins teilen"</string>
+    <string name="inform_share_checkins_title">"Check-in-Einträge teilen"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"Sie können Events teilen um andere zu warnen, welche mit Ihnen am selben Event waren."</string>
+    <string name="inform_share_checkins_subtitle">"Wenn Sie Ihre Check-in-Einträge teilen, kann die App Personen benachrichtigen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all">"Alle wählen"</string>
     <string name="inform_dont_send_button_title">"Nicht senden"</string>
     <string name="inform_try_again_button_title">"Erneut versuchen"</string>
     <string name="inform_dont_share_button_title">"Nicht teilen"</string>
-    <string name="inform_really_not_share_title">"Sind Sie sicher?"</string>
-    <string name="inform_really_not_share_subtitle">"[TBT] Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified."</string>
+    <string name="inform_really_not_share_title">"Wirklich nicht teilen?"</string>
+    <string name="inform_really_not_share_subtitle">"Das Teilen Ihrer privaten Schlüssel hilft «SwissCovid», andere potenziell infizierte Personen zu benachrichtigen und die weitere Ausbreitung des Virus zu verhindern. Wenn Sie Ihre privaten Schlüssel nicht teilen, werden keine potenziell infizierten Personen benachrichtigt."</string>
 
     <!-- Remove from Diary Warning view title -->
     <string name="remove_diary_warning_title">"Achtung"</string>
@@ -1749,7 +1749,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="checkout_overlapping_alert_description">"Ihre gewählten Zeiten überschneiden sich mit anderen Check-Ins aus ihrem Tagebuch. Bitte überprüfen Sie nochmals Ihre Angabe."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Ihre ausgewählten Check-Ins wurden gesendet. Andere Leute, welche zur gleichen Zeit an den selben Events eingecheckt waren werden benachrichtigt."</string>
+    <string name="inform_send_thankyou_text_checkins">"Ihre ausgewählten Check-In-Einträge wurden gesendet. Alle Personen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben, werden benachrichtigt."</string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1872,4 +1872,8 @@ oder Ihren Anlass näher beschreibt."</string>
 
     <!-- Fuzzy -->
     <string name="not_thank_you_screen_text2">"Es wurden keine Check-In-Einträge gesendet. Es wird niemand benachrichtigt."</string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title">"Auswahl teilen"</string>
+    <string name="inform_share_checkins_not_send_button">"Nichts teilen"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1ed406f44..b043dfcb0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1621,7 +1621,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1674,7 +1674,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1776,4 +1776,8 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2955d7196..ab506dc42 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1656,7 +1656,7 @@ Contactez l'infoline coronavirus :"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1709,7 +1709,7 @@ Contactez l'infoline coronavirus :"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1811,4 +1811,8 @@ Contactez l'infoline coronavirus :"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 385000dd6..16d803b2b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1626,7 +1626,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1679,7 +1679,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1781,4 +1781,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 03980f0ba..5b14459a4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1664,7 +1664,7 @@ Contatta la Infoline coronavirus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1717,7 +1717,7 @@ Contatta la Infoline coronavirus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1819,4 +1819,8 @@ Contatta la Infoline coronavirus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 953cd7d04..0f7f59809 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1631,7 +1631,7 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1684,7 +1684,7 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1786,4 +1786,8 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 9a4397cde..622d10270 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1626,7 +1626,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1679,7 +1679,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1781,4 +1781,8 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 519ff2817..22641f8e9 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1631,7 +1631,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1684,7 +1684,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1786,4 +1786,8 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index f770d7e5d..48a0dbf3f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1626,7 +1626,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1679,7 +1679,7 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1781,4 +1781,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index b313f803a..cfc557ac7 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1606,7 +1606,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1659,7 +1659,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1761,4 +1761,8 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 26791cbb6..938b5d160 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1608,7 +1608,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1661,7 +1661,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1763,4 +1763,8 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index edde8e916..24c33d04f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1653,7 +1653,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="inform_share_checkins_title"></string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"You can choose to share your check-ins to warn others who were with you at the same events."</string>
+    <string name="inform_share_checkins_subtitle"></string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all"></string>
@@ -1706,7 +1706,7 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="checkout_overlapping_alert_description"></string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Your selected check-in entries were sent. Other people who checked into the same  events and during the same period of time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins"></string>
 
     <!-- Covidcode eingabe, are your sure not to share, titel -->
     <string name="inform_are_you_sure_title">"Are you sure?"</string>
@@ -1808,4 +1808,8 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="not_thank_you_screen_back_button"></string>
     <string name="not_thank_you_screen_dont_send_button"></string>
     <string name="not_thank_you_screen_text2"></string>
+
+    <!-- Button text, um ausgewählte Checkins zu senden -->
+    <string name="inform_share_checkins_send_button_title"></string>
+    <string name="inform_share_checkins_not_send_button"></string>
 </resources>
\ No newline at end of file

From 05f70d2612d841b5e1a3dc1b9f48588e15e16f35 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 14:19:11 +0200
Subject: [PATCH 076/207] Add OnsetDate Request

---
 .../admin/bag/dp3t/inform/InformFragment.kt   | 21 +++++++---
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 42 ++++++++++++++++++-
 .../bag/dp3t/inform/ReallyNotShareFragment.kt |  2 +-
 .../bag/dp3t/inform/ShareCheckinsFragment.kt  | 11 ++---
 .../bag/dp3t/networking/AuthCodeRepository.kt |  1 +
 .../bag/dp3t/networking/AuthCodeService.kt    |  5 +++
 .../dp3t/networking/models/AuthCodeModels.kt  | 12 ++++++
 .../AuthenticationCodeRequestModel.java       | 26 ------------
 .../AuthenticationCodeResponseModelV2.kt      |  6 ---
 9 files changed, 81 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeRequestModel.java
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 2836a7a6f..7f453fe51 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -17,6 +17,7 @@ import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentInformBinding
 import ch.admin.bag.dp3t.extensions.showFragment
+import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.inform.views.ChainedEditText
 import ch.admin.bag.dp3t.inform.views.ChainedEditText.ChainedEditTextListener
 import ch.admin.bag.dp3t.util.PhoneUtil
@@ -64,29 +65,39 @@ class InformFragment : TraceKeyShareBaseFragment() {
 				}
 			}
 
-			sendButton.setOnClickListener { performContinueAction() }
+			sendButton.setOnClickListener { onContinueClicked() }
 			cancelButton.setOnClickListener { requireActivity().finish() }
 			informInvalidCodeError.setOnClickListener { PhoneUtil.callAppHotline(it.context) }
 		}.root
 	}
 
-	private fun performContinueAction() {
+	private fun onContinueClicked() {
 		binding.sendButton.isEnabled = false
 		setInvalidCovidcodeErrorVisible(false)
 		informViewModel.covidCode = binding.covidcodeInput.text
 		askUserToEnableTracingIfNecessary { tracingEnabled ->
 			if (tracingEnabled) {
-				//TODO: Do onsetDate Request here
-				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+				loadOnsetDate()
 			} else {
 				binding.sendButton.isEnabled = true
 			}
 		}
 	}
 
+	private fun loadOnsetDate() {
+		informViewModel.loadOnsetDate().observe(viewLifecycleOwner) {
+			setLoadingViewVisible(it.status == Status.LOADING)
+			if (it.status == Status.SUCCESS) {
+				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+			} else if (it.status == Status.ERROR) {
+				setInvalidCovidcodeErrorVisible(true)
+			}
+		}
+	}
+
 	private fun onUserGrantedTEKSharing() {
 		informViewModel.hasSharedDP3TKeys = true
-		if (informViewModel.selectableCheckinItems.isEmpty()) {
+		if (informViewModel.getSelectableCheckinItems().isEmpty()) {
 			performUpload()
 		} else {
 			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 1479b188a..7a78a0572 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -26,6 +26,7 @@ import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.models.DayDate
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
 import retrofit2.HttpException
+import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.CancellationException
 import java.util.concurrent.TimeUnit
@@ -40,6 +41,8 @@ private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
 private const val KEY_HAS_SHARED_CHECKINS = "KEY_HAS_SHARED_CHECKINS"
 private const val KEY_PENDING_UPLOAD_TASK = "KEY_PENDING_UPLOAD_TASK"
+private const val KEY_SELECTED_DIARY_ENTRIES = "KEY_SELECTED_DIARY_ENTRIES"
+private const val KEY_ONSET_DATE = "KEY_ONSET_DATE"
 private const val USER_UPLOAD_SIZE = 1000
 
 class InformViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
@@ -50,7 +53,9 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	private val secureStorage = SecureStorage.getInstance(application)
 	private val random = Random()
 
-	var selectableCheckinItems = diaryStorage.entries.map { SelectableCheckinItem(it, isSelected = false) }
+	private var selectedDiaryEntryIds: LongArray
+		get() = state.get<LongArray>(KEY_SELECTED_DIARY_ENTRIES) ?: longArrayOf()
+		set(value) = state.set(KEY_SELECTED_DIARY_ENTRIES, value)
 
 	var covidCode: String
 		get() = state.get<String>(KEY_COVIDCODE) ?: getLastCovidcode()
@@ -68,6 +73,19 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		get() = state.get<PendingUploadTask?>(KEY_PENDING_UPLOAD_TASK)
 		set(value) = state.set(KEY_PENDING_UPLOAD_TASK, value)
 
+	private var onsetDate: Long?
+		get() = state.get<Long>(KEY_ONSET_DATE)
+		set(value) = state.set(KEY_ONSET_DATE, value)
+
+	fun loadOnsetDate() = liveData(Dispatchers.IO) {
+		emit(Resource.loading(data = null))
+		try {
+			emit(Resource.success(loadOnsetDate(covidCode)))
+		} catch (exception: Throwable) {
+			emit(Resource.error(data = null, exception = exception))
+		}
+	}
+
 	fun performUpload() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
@@ -109,6 +127,20 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		emit(Resource.success(data = null))
 	}
 
+	fun getSelectableCheckinItems(): List<SelectableCheckinItem> {
+		return diaryStorage.entries.filter {
+			it.departureTime >= onsetDate ?: 0
+		}.map {
+			SelectableCheckinItem(it, isSelected = selectedDiaryEntryIds.contains(it.id))
+		}
+	}
+
+	fun setDiaryItemSelected(itemId: Long, isSelected: Boolean) {
+		selectedDiaryEntryIds = selectedDiaryEntryIds.toMutableList().apply {
+			if (isSelected) add(itemId) else remove(itemId)
+		}.distinct().toLongArray()
+	}
+
 	private fun getLastCovidcode(): String {
 		val lastCovidcode = secureStorage.lastInformCode
 
@@ -155,6 +187,12 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		error?.let { throw(it) }
 	}
 
+	private suspend fun loadOnsetDate(covidcode: String) {
+		val onsetResponse = authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(covidcode, 0))
+		if (onsetResponse.onset == null) throw InvalidCodeError()
+		onsetDate = SimpleDateFormat("yyyy-MM-dd").parse(onsetResponse.onset)?.time
+	}
+
 	private suspend fun loadAccessTokens(covidcode: String) {
 		val lastTimestamp = secureStorage.lastInformRequestTime
 		val accessToken = secureStorage.lastDP3TInformToken
@@ -169,7 +207,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 	private fun getUserUploadPayload(): UserUploadPayload {
 		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
-		selectableCheckinItems.filter {
+		getSelectableCheckinItems().filter {
 			it.isSelected
 		}.map {
 			CrowdNotifier.generateUserUploadInfo(it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index 4499d4c0f..fb37d464a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -40,7 +40,7 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 
 	private fun onUserGrantedTEKSharing() {
 		informViewModel.hasSharedDP3TKeys = true
-		if (informViewModel.selectableCheckinItems.isEmpty()) {
+		if (informViewModel.getSelectableCheckinItems().isEmpty()) {
 			performUpload(onSuccess = { showFragment(ThankYouFragment.newInstance(), R.id.inform_fragment_container) })
 		} else {
 			showFragment(ShareCheckinsFragment.newInstance(), R.id.inform_fragment_container)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index df9d8cf3b..3a870f0fa 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.LinearLayoutManager
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentShareCheckinsBinding
 import ch.admin.bag.dp3t.extensions.showFragment
@@ -25,13 +24,15 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			val adapter = CheckinAdapter()
 			checkinsRecyclerView.adapter = adapter
-			adapter.setData(informViewModel.selectableCheckinItems)
+			adapter.setData(informViewModel.getSelectableCheckinItems())
 			adapter.itemSelectionListener { selectedItem, selected ->
-				informViewModel.selectableCheckinItems.find { it.diaryEntry == selectedItem }?.isSelected = selected
+				informViewModel.setDiaryItemSelected(selectedItem.id, selected)
 			}
 			selectAllCheckbox.setOnCheckedChangeListener { _, isChecked ->
-				informViewModel.selectableCheckinItems.forEach { it.isSelected = isChecked }
-				adapter.setData(informViewModel.selectableCheckinItems)
+				informViewModel.getSelectableCheckinItems().forEach {
+					informViewModel.setDiaryItemSelected(it.diaryEntry.id, isChecked)
+				}
+				adapter.setData(informViewModel.getSelectableCheckinItems())
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
index ce4156d39..4b1de98bd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
@@ -80,4 +80,5 @@ class AuthCodeRepository(context: Context) {
 			return@withContext response.body() ?: throw ResponseError(response.raw())
 		}
 
+	suspend fun getOnsetDate(authCode: AuthenticationCodeRequestModel) = authCodeService.getOnsetDate(authCode)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
index 24308fea0..2d7c69330 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
@@ -12,6 +12,7 @@ package ch.admin.bag.dp3t.networking
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModel
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModelV2
+import ch.admin.bag.dp3t.networking.models.OnsetResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.Headers
@@ -26,4 +27,8 @@ interface AuthCodeService {
 	@POST("v2/onset")
 	suspend fun getAccessTokenV2(@Body code: AuthenticationCodeRequestModel): Response<AuthenticationCodeResponseModelV2>
 
+	@Headers("accept: */*", "content-type: application/json")
+	@POST("v2/onset/date")
+	suspend fun getOnsetDate(@Body code: AuthenticationCodeRequestModel): OnsetResponse
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
new file mode 100644
index 000000000..26a9956f0
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
@@ -0,0 +1,12 @@
+package ch.admin.bag.dp3t.networking.models
+
+import androidx.annotation.Keep
+
+class AuthenticationCodeRequestModel(@field:Keep private val authorizationCode: String, @field:Keep private val fake: Int)
+
+data class AuthenticationCodeResponseModelV2(
+	val checkInAccessToken: AuthenticationCodeResponseModel,
+	val dp3TAccessToken: AuthenticationCodeResponseModel
+)
+
+data class OnsetResponse(val onset: String?)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeRequestModel.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeRequestModel.java
deleted file mode 100644
index 4435beba4..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeRequestModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.networking.models;
-
-import androidx.annotation.Keep;
-
-public class AuthenticationCodeRequestModel {
-
-	@Keep
-	private String authorizationCode;
-	@Keep
-	private int fake;
-
-	public AuthenticationCodeRequestModel(String authorizationCode, int fake) {
-		this.authorizationCode = authorizationCode;
-		this.fake = fake;
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt
deleted file mode 100644
index 331276821..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModelV2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package ch.admin.bag.dp3t.networking.models
-
-data class AuthenticationCodeResponseModelV2(
-	val checkInAccessToken: AuthenticationCodeResponseModel,
-	val dp3TAccessToken: AuthenticationCodeResponseModel
-)
\ No newline at end of file

From 2cace1879bcb89a7082e33fd4a6a9e9c3172e42f Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 14:46:00 +0200
Subject: [PATCH 077/207] Implemented Fake request Logic for Inform Flow

---
 .../admin/bag/dp3t/inform/InformViewModel.kt  |  72 +++++---
 .../bag/dp3t/inform/NotThankYouFragment.kt    |  21 ++-
 .../res/layout/fragment_not_thank_you.xml     | 172 ++++++++++--------
 3 files changed, 156 insertions(+), 109 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 7a78a0572..dcdbe3e8a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -21,6 +21,7 @@ import com.google.android.gms.common.api.ApiException
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
 import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.dpppt.android.sdk.DP3TKotlin
 import org.dpppt.android.sdk.PendingUploadTask
 import org.dpppt.android.sdk.backend.ResponseCallback
 import org.dpppt.android.sdk.models.DayDate
@@ -98,32 +99,32 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 			}
 			return@liveData
 		}
-		if (hasSharedDP3TKeys) {
-			try {
+		try {
+			if (hasSharedDP3TKeys) {
 				uploadTEKs()
-			} catch (exception: Throwable) {
-				when (exception) {
-					is ResponseError -> emit(Resource.error(InformRequestError.RED_STATUS_ERROR, exception))
-					is CancellationException -> emit(Resource.error(InformRequestError.RED_USER_CANCELLED_SHARE, exception))
-					is ApiException -> emit(Resource.error(InformRequestError.RED_EXPOSURE_API_ERROR, exception))
-					else -> emit(Resource.error(InformRequestError.RED_MISC_NETWORK_ERROR, exception))
-				}
-				return@liveData
+			} else {
+				performFakeTEKUpload()
 			}
+		} catch (exception: Throwable) {
+			when (exception) {
+				is ResponseError -> emit(Resource.error(InformRequestError.RED_STATUS_ERROR, exception))
+				is CancellationException -> emit(Resource.error(InformRequestError.RED_USER_CANCELLED_SHARE, exception))
+				is ApiException -> emit(Resource.error(InformRequestError.RED_EXPOSURE_API_ERROR, exception))
+				else -> emit(Resource.error(InformRequestError.RED_MISC_NETWORK_ERROR, exception))
+			}
+			return@liveData
 		}
-		if (hasSharedCheckins) {
-			try {
-				val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
-				userUploadRepository.userUpload(getUserUploadPayload(), authorizationHeader)
-
-			} catch (exception: Throwable) {
-				when (exception) {
-					is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
-					else -> emit(Resource.error(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, exception))
-				}
-				return@liveData
+
+		try {
+			performCheckinsUpload(isFake = !hasSharedCheckins)
+		} catch (exception: Throwable) {
+			when (exception) {
+				is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
+				else -> emit(Resource.error(InformRequestError.USER_UPLOAD_UNKONWN_ERROR, exception))
 			}
+			return@liveData
 		}
+
 		emit(Resource.success(data = null))
 	}
 
@@ -151,6 +152,11 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 	}
 
+	private suspend fun performFakeTEKUpload() {
+		val authorizationHeader = ExposeeAuthMethodAuthorization(getAuthorizationHeader(secureStorage.lastDP3TInformToken))
+		DP3TKotlin.sendFakeInfectedRequest(getApplication(), authorizationHeader)
+	}
+
 	private suspend fun uploadTEKs() {
 		val authorizationHeader = getAuthorizationHeader(secureStorage.lastDP3TInformToken)
 		val onsetDate = JwtUtil.getOnsetDate(secureStorage.lastDP3TInformToken)
@@ -187,6 +193,11 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		error?.let { throw(it) }
 	}
 
+	private suspend fun performCheckinsUpload(isFake: Boolean) {
+		val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
+		userUploadRepository.userUpload(getUserUploadPayload(isFake), authorizationHeader)
+	}
+
 	private suspend fun loadOnsetDate(covidcode: String) {
 		val onsetResponse = authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(covidcode, 0))
 		if (onsetResponse.onset == null) throw InvalidCodeError()
@@ -205,16 +216,19 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 	}
 
-	private fun getUserUploadPayload(): UserUploadPayload {
+	private fun getUserUploadPayload(isFake: Boolean): UserUploadPayload {
 		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
-		getSelectableCheckinItems().filter {
-			it.isSelected
-		}.map {
-			CrowdNotifier.generateUserUploadInfo(it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime)
-		}.flatten().forEach {
-			userUploadPayloadBuilder.addVenueInfos(it.toUploadVenueInfo())
+		if (!isFake) {
+			getSelectableCheckinItems().filter {
+				it.isSelected
+			}.map {
+				CrowdNotifier.generateUserUploadInfo(
+					it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime
+				)
+			}.flatten().forEach {
+				userUploadPayloadBuilder.addVenueInfos(it.toUploadVenueInfo())
+			}
 		}
-
 		for (i in userUploadPayloadBuilder.venueInfosCount until USER_UPLOAD_SIZE) {
 			userUploadPayloadBuilder.addVenueInfos(getRandomFakeVenueInfo())
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
index 6633ba0e5..171ab7617 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
@@ -5,23 +5,36 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import androidx.core.view.isVisible
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentNotThankYouBinding
 import ch.admin.bag.dp3t.extensions.showFragment
 
-class NotThankYouFragment : Fragment() {
+class NotThankYouFragment : TraceKeyShareBaseFragment() {
 
 	companion object {
 		fun newInstance() = NotThankYouFragment()
 	}
 
+	private lateinit var binding: FragmentNotThankYouBinding
+
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-		return FragmentNotThankYouBinding.inflate(inflater).apply {
+		binding = FragmentNotThankYouBinding.inflate(inflater)
+		return binding.apply {
 			(requireActivity() as InformActivity).allowBackButton(false)
-			dontSendButton.setOnClickListener { requireActivity().finish() }
+			dontSendButton.setOnClickListener {
+				performUpload(onSuccess = { requireActivity().finish() })
+			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			backButton.setOnClickListener { showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container) }
 		}.root
 	}
+
+	override fun setLoadingViewVisible(isVisible: Boolean) {
+		binding.apply {
+			loadingView.isVisible = isVisible
+			dontSendButton.isEnabled = !isVisible
+			backButton.isEnabled = !isVisible
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_not_thank_you.xml b/app/src/main/res/layout/fragment_not_thank_you.xml
index f2f14ded7..aef45eb70 100644
--- a/app/src/main/res/layout/fragment_not_thank_you.xml
+++ b/app/src/main/res/layout/fragment_not_thank_you.xml
@@ -1,100 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="@color/white"
-	android:orientation="vertical">
+	android:layout_height="match_parent">
 
-	<ScrollView
+	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:fillViewport="true">
+		android:layout_height="match_parent"
+		android:background="@color/white"
+		android:orientation="vertical">
 
-		<LinearLayout
+		<ScrollView
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical">
+			android:layout_height="0dp"
+			android:layout_weight="1"
+			android:fillViewport="true">
 
-			<Space
+			<LinearLayout
 				android:layout_width="match_parent"
-				android:layout_height="0dp"
-				android:layout_weight="1" />
-
-			<ImageView
-				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"
-				android:src="@drawable/illu_not_thank_you" />
+				android:orientation="vertical">
+
+				<Space
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:layout_weight="1" />
+
+				<ImageView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:src="@drawable/illu_not_thank_you" />
+
+				<Space
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:layout_weight="1" />
+
+				<TextView
+					style="@style/NextStep.Text.Title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center_horizontal"
+					android:text="@string/not_thank_you_screen_title" />
+
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_large"
+					android:gravity="center_horizontal"
+					android:paddingHorizontal="@dimen/spacing_huge"
+					android:text="@string/not_thank_you_screen_text1" />
+
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_large"
+					android:gravity="center_horizontal"
+					android:paddingHorizontal="@dimen/spacing_huge"
+					android:text="@string/not_thank_you_screen_text2" />
+
+				<Space
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:layout_weight="4" />
+
+			</LinearLayout>
+
+		</ScrollView>
 
-			<Space
-				android:layout_width="match_parent"
-				android:layout_height="0dp"
-				android:layout_weight="1" />
-
-			<TextView
-				style="@style/NextStep.Text.Title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_horizontal"
-				android:text="@string/not_thank_you_screen_title" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="@color/white"
+			android:elevation="@dimen/spacing_small"
+			android:gravity="center_horizontal"
+			android:orientation="vertical"
+			android:padding="@dimen/spacing_medium_large">
+
+			<Button
+				android:id="@+id/back_button"
+				style="@style/NextStep.Button.Purple"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:gravity="center_horizontal"
-				android:paddingHorizontal="@dimen/spacing_huge"
-				android:text="@string/not_thank_you_screen_text1" />
+				android:text="@string/not_thank_you_screen_back_button" />
 
 			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
+				android:id="@+id/dont_send_button"
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:gravity="center_horizontal"
-				android:paddingHorizontal="@dimen/spacing_huge"
-				android:text="@string/not_thank_you_screen_text2" />
-
-			<Space
-				android:layout_width="match_parent"
-				android:layout_height="0dp"
-				android:layout_weight="4" />
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="@dimen/spacing_medium"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:background="@drawable/ripple_button"
+				android:padding="@dimen/spacing_small"
+				android:text="@string/not_thank_you_screen_dont_send_button"
+				android:visibility="visible" />
 
 		</LinearLayout>
 
-	</ScrollView>
+	</LinearLayout>
 
-	<LinearLayout
+	<FrameLayout
+		android:id="@+id/loading_view"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="@color/white"
-		android:elevation="@dimen/spacing_small"
-		android:gravity="center_horizontal"
-		android:orientation="vertical"
-		android:padding="@dimen/spacing_medium_large">
-
-		<Button
-			android:id="@+id/back_button"
-			style="@style/NextStep.Button.Purple"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/not_thank_you_screen_back_button" />
+		android:layout_height="match_parent"
+		android:background="@color/transparent_milk"
+		android:visibility="gone">
 
-		<TextView
-			android:id="@+id/dont_send_button"
-			style="@style/NextStep.Text.Bold"
+		<ProgressBar
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/spacing_medium"
-			android:layout_marginBottom="@dimen/spacing_medium_large"
-			android:background="@drawable/ripple_button"
-			android:padding="@dimen/spacing_small"
-			android:text="@string/not_thank_you_screen_dont_send_button"
-			android:visibility="visible" />
+			android:layout_gravity="center" />
 
-	</LinearLayout>
+	</FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>

From ce3e71ce63ed6bdf3405fe43d0177f15de16fad4 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 15:25:20 +0200
Subject: [PATCH 078/207] Adjusted FakeWorker Logic

---
 .../networking/UserUploadRepository.kt        | 38 ++++++++++++-
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 54 +++++--------------
 .../bag/dp3t/networking/AuthCodeRepository.kt | 11 ----
 .../bag/dp3t/networking/AuthCodeService.kt    |  4 --
 .../admin/bag/dp3t/networking/FakeWorker.kt   | 20 +++++--
 .../dp3t/networking/models/AuthCodeModels.kt  |  3 ++
 .../AuthenticationCodeResponseModel.java      | 20 -------
 7 files changed, 69 insertions(+), 81 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModel.java

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
index 373947cdc..caf8bb6d9 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -1,16 +1,23 @@
 package ch.admin.bag.dp3t.checkin.networking
 
 import ch.admin.bag.dp3t.BuildConfig
+import ch.admin.bag.dp3t.checkin.models.UploadVenueInfo
 import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
+import com.google.protobuf.ByteString
 import okhttp3.OkHttpClient
 import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.backend.UserAgentInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.protobuf.ProtoConverterFactory
+import java.util.*
+
+private const val USER_UPLOAD_SIZE = 1000
+private const val USER_UPLOAD_VERSION = 3
 
 class UserUploadRepository {
 
 	private var userUploadService: UserUploadService
+	private val random = Random()
 
 	init {
 		val okHttpBuilder = OkHttpClient.Builder()
@@ -25,8 +32,35 @@ class UserUploadRepository {
 		userUploadService = retrofit.create(UserUploadService::class.java)
 	}
 
-	suspend fun userUpload(userUploadPayload: UserUploadPayload, authorizationHeader: String) =
-		userUploadService.userUpload(userUploadPayload, authorizationHeader)
+	suspend fun userUpload(uploadVenueInfos: List<UploadVenueInfo>, authorizationHeader: String) =
+		userUploadService.userUpload(getUserUploadPayload(uploadVenueInfos), authorizationHeader)
+
+	suspend fun fakeUserUpload(authorizationHeader: String) =
+		userUploadService.userUpload(getUserUploadPayload(listOf()), authorizationHeader)
 
+	private fun getUserUploadPayload(uploadVenueInfos: List<UploadVenueInfo>): UserUploadPayload {
+		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
+		userUploadPayloadBuilder.addAllVenueInfos(uploadVenueInfos)
+		for (i in userUploadPayloadBuilder.venueInfosCount until USER_UPLOAD_SIZE) {
+			userUploadPayloadBuilder.addVenueInfos(getRandomFakeVenueInfo())
+		}
+		return userUploadPayloadBuilder.build()
+	}
 
+	private fun getRandomFakeVenueInfo(): UploadVenueInfo {
+		return UploadVenueInfo.newBuilder()
+			.setPreId(ByteString.copyFrom(getRandomByteArray(32)))
+			.setTimeKey(ByteString.copyFrom(getRandomByteArray(32)))
+			.setNotificationKey(ByteString.copyFrom(getRandomByteArray(32)))
+			.setIntervalStartMs(random.nextLong())
+			.setIntervalEndMs(random.nextLong())
+			.setFake(true)
+			.build()
+	}
+
+	private fun getRandomByteArray(size: Int): ByteArray {
+		return ByteArray(size).apply {
+			random.nextBytes(this)
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index dcdbe3e8a..490d48d79 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.liveData
 import ch.admin.bag.dp3t.checkin.models.UploadVenueInfo
-import ch.admin.bag.dp3t.checkin.models.UserUploadPayload
 import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.inform.models.Resource
@@ -18,7 +17,6 @@ import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.JwtUtil
 import ch.admin.bag.dp3t.util.toUploadVenueInfo
 import com.google.android.gms.common.api.ApiException
-import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.dpppt.android.sdk.DP3TKotlin
@@ -34,7 +32,6 @@ import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-private const val USER_UPLOAD_VERSION = 3
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
@@ -44,7 +41,6 @@ private const val KEY_HAS_SHARED_CHECKINS = "KEY_HAS_SHARED_CHECKINS"
 private const val KEY_PENDING_UPLOAD_TASK = "KEY_PENDING_UPLOAD_TASK"
 private const val KEY_SELECTED_DIARY_ENTRIES = "KEY_SELECTED_DIARY_ENTRIES"
 private const val KEY_ONSET_DATE = "KEY_ONSET_DATE"
-private const val USER_UPLOAD_SIZE = 1000
 
 class InformViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
 
@@ -52,7 +48,6 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	private val userUploadRepository = UserUploadRepository()
 	private val diaryStorage = DiaryStorage.getInstance(application)
 	private val secureStorage = SecureStorage.getInstance(application)
-	private val random = Random()
 
 	private var selectedDiaryEntryIds: LongArray
 		get() = state.get<LongArray>(KEY_SELECTED_DIARY_ENTRIES) ?: longArrayOf()
@@ -195,7 +190,11 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 	private suspend fun performCheckinsUpload(isFake: Boolean) {
 		val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
-		userUploadRepository.userUpload(getUserUploadPayload(isFake), authorizationHeader)
+		if (isFake) {
+			userUploadRepository.fakeUserUpload(authorizationHeader)
+		} else {
+			userUploadRepository.userUpload(getUploadVenueInfos(), authorizationHeader)
+		}
 	}
 
 	private suspend fun loadOnsetDate(covidcode: String) {
@@ -216,40 +215,15 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 	}
 
-	private fun getUserUploadPayload(isFake: Boolean): UserUploadPayload {
-		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
-		if (!isFake) {
-			getSelectableCheckinItems().filter {
-				it.isSelected
-			}.map {
-				CrowdNotifier.generateUserUploadInfo(
-					it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime
-				)
-			}.flatten().forEach {
-				userUploadPayloadBuilder.addVenueInfos(it.toUploadVenueInfo())
-			}
-		}
-		for (i in userUploadPayloadBuilder.venueInfosCount until USER_UPLOAD_SIZE) {
-			userUploadPayloadBuilder.addVenueInfos(getRandomFakeVenueInfo())
-		}
-		return userUploadPayloadBuilder.build()
-	}
-
-	private fun getRandomFakeVenueInfo(): UploadVenueInfo {
-		return UploadVenueInfo.newBuilder()
-			.setPreId(ByteString.copyFrom(getRandomByteArray(32)))
-			.setTimeKey(ByteString.copyFrom(getRandomByteArray(32)))
-			.setNotificationKey(ByteString.copyFrom(getRandomByteArray(32)))
-			.setIntervalStartMs(random.nextLong())
-			.setIntervalEndMs(random.nextLong())
-			.setFake(true)
-			.build()
-
-	}
-
-	private fun getRandomByteArray(size: Int): ByteArray {
-		return ByteArray(size).apply {
-			random.nextBytes(this)
+	private fun getUploadVenueInfos(): List<UploadVenueInfo> {
+		return getSelectableCheckinItems().filter {
+			it.isSelected
+		}.map {
+			CrowdNotifier.generateUserUploadInfo(
+				it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime
+			)
+		}.flatten().map {
+			it.toUploadVenueInfo()
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
index 4b1de98bd..93d046613 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
@@ -14,7 +14,6 @@ import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
-import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModel
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModelV2
 import kotlinx.coroutines.*
 import okhttp3.Cache
@@ -24,7 +23,6 @@ import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.backend.UserAgentInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import java.io.IOException
 
 class AuthCodeRepository(context: Context) {
 
@@ -58,15 +56,6 @@ class AuthCodeRepository(context: Context) {
 		authCodeService = retrofit.create(AuthCodeService::class.java)
 	}
 
-
-	@Throws(IOException::class, ResponseError::class)
-	suspend fun getAccessTokenSyncV1(authenticationCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModel =
-		withContext(Dispatchers.IO) {
-			val response = authCodeService.getAccessTokenV1(authenticationCode)
-			if (!response.isSuccessful) throw ResponseError(response.raw())
-			return@withContext response.body() ?: throw ResponseError(response.raw())
-		}
-
 	suspend fun getAccessToken(authCode: AuthenticationCodeRequestModel): AuthenticationCodeResponseModelV2 =
 		withContext(Dispatchers.IO) {
 			val response = authCodeService.getAccessTokenV2(authCode)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
index 2d7c69330..cc1322c97 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
@@ -19,10 +19,6 @@ import retrofit2.http.Headers
 import retrofit2.http.POST
 
 interface AuthCodeService {
-	@Headers("accept: */*", "content-type: application/json")
-	@POST("v1/onset")
-	suspend fun getAccessTokenV1(@Body code: AuthenticationCodeRequestModel): Response<AuthenticationCodeResponseModel>
-
 	@Headers("accept: */*", "content-type: application/json")
 	@POST("v2/onset")
 	suspend fun getAccessTokenV2(@Body code: AuthenticationCodeRequestModel): Response<AuthenticationCodeResponseModelV2>
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
index f8321b80a..da5a80c3b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
@@ -12,6 +12,7 @@ package ch.admin.bag.dp3t.networking
 import android.content.Context
 import androidx.work.*
 import ch.admin.bag.dp3t.BuildConfig
+import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.ExponentialDistribution
@@ -145,11 +146,22 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 	private suspend fun executeFakeRequest(context: Context): Boolean {
 		return try {
 			val authCodeRepository = AuthCodeRepository(context)
-			val accessTokenResponse = authCodeRepository.getAccessTokenSyncV1(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
-			val accessToken = accessTokenResponse.accessToken
-			DP3TKotlin.sendFakeInfectedRequest(context, ExposeeAuthMethodAuthorization(getAuthorizationHeader(accessToken)))
+
+			//Execute Onset Date Request
+			authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
+
+			//TODO: Insert Delay
+
+			//Execute Access Token Request
+			val accessTokenResponse = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
+			val dp3tAccessToken = accessTokenResponse.dp3TAccessToken.accessToken
+			//Execute DP3T Infected Request
+			DP3TKotlin.sendFakeInfectedRequest(context, ExposeeAuthMethodAuthorization(getAuthorizationHeader(dp3tAccessToken)))
+			//Execute Checkin UserUpload Request
+			val checkinAccessToken = accessTokenResponse.checkInAccessToken.accessToken
+			UserUploadRepository().fakeUserUpload(getAuthorizationHeader(checkinAccessToken))
 			true
-		} catch (e: Exception) {
+		} catch (e: Throwable) {
 			Logger.e(TAG, "fake request failed", e)
 			false
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
index 26a9956f0..83b9e9a28 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
@@ -9,4 +9,7 @@ data class AuthenticationCodeResponseModelV2(
 	val dp3TAccessToken: AuthenticationCodeResponseModel
 )
 
+class AuthenticationCodeResponseModel(val accessToken: String)
+
+
 data class OnsetResponse(val onset: String?)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModel.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModel.java
deleted file mode 100644
index ddcd7570e..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthenticationCodeResponseModel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.networking.models;
-
-public class AuthenticationCodeResponseModel {
-
-	private String accessToken;
-
-	public String getAccessToken() {
-		return accessToken;
-	}
-
-}

From 45e50b6a1fa19536c3c2b08d21387c8997b3173d Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 16:30:13 +0200
Subject: [PATCH 079/207] Minor NothThankYou screen fix

---
 .../res/layout/fragment_not_thank_you.xml     |   9 +
 app/src/main/res/values-bs/strings.xml        |  69 +++-----
 app/src/main/res/values-de/strings.xml        | 161 ++++++++----------
 app/src/main/res/values-es/strings.xml        |  69 +++-----
 app/src/main/res/values-fr/strings.xml        |  69 +++-----
 app/src/main/res/values-hr/strings.xml        |  69 +++-----
 app/src/main/res/values-it/strings.xml        |  69 +++-----
 app/src/main/res/values-pt/strings.xml        |  69 +++-----
 app/src/main/res/values-rm/strings.xml        |  69 +++-----
 app/src/main/res/values-sq/strings.xml        |  69 +++-----
 app/src/main/res/values-sr/strings.xml        |  69 +++-----
 app/src/main/res/values-ti/strings.xml        |  69 +++-----
 app/src/main/res/values-tr/strings.xml        |  69 +++-----
 app/src/main/res/values/strings.xml           |  69 +++-----
 14 files changed, 379 insertions(+), 619 deletions(-)

diff --git a/app/src/main/res/layout/fragment_not_thank_you.xml b/app/src/main/res/layout/fragment_not_thank_you.xml
index aef45eb70..f9c12b340 100644
--- a/app/src/main/res/layout/fragment_not_thank_you.xml
+++ b/app/src/main/res/layout/fragment_not_thank_you.xml
@@ -61,6 +61,15 @@
 					android:paddingHorizontal="@dimen/spacing_huge"
 					android:text="@string/not_thank_you_screen_text2" />
 
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_large"
+					android:gravity="center_horizontal"
+					android:paddingHorizontal="@dimen/spacing_huge"
+					android:text="@string/not_thank_you_screen_text3" />
+
 				<Space
 					android:layout_width="match_parent"
 					android:layout_height="0dp"
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index edcb81e6a..41031419f 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1525,47 +1525,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1582,7 +1543,6 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1649,8 +1609,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1733,10 +1693,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1789,4 +1747,27 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d492b6f05..1cc226dbb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -104,7 +104,7 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
     <string name="meldungen_meldung_title">"Mögliche Ansteckung"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Es besteht die Möglichkeit einer Ansteckung."</string>
+    <string name="meldungen_meldung_text">"Sie könnten sich angesteckt haben"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"App aktiv"</string>
@@ -260,13 +260,13 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Befolgen Sie die erhaltenen Anweisungen zur Isolation"</string>
-    <string name="tracing_ended_title">"Tracing und Check-ins deaktiviert"</string>
-    <string name="tracing_ended_text">"Es werden keine Begegnungen mehr gespeichert."</string>
+    <string name="tracing_ended_title">"Tracing deaktiviert"</string>
+    <string name="tracing_ended_text">"Es werden keine Begegnungen gespeichert"</string>
     <string name="exposed_info_contact_hotline">"Kontaktieren Sie die"</string>
     <string name="meldung_homescreen_positive_info_line1">"Befolgen Sie die"</string>
 
     <!-- CFL: Selbst-Isolation -->
-    <string name="meldung_homescreen_positive_info_line2">"Anweisungen zur Selbstisolation"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Anweisungen zur Isolation"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Neue Meldung"</string>
@@ -276,7 +276,7 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
     <string name="meldung_homescreen_positiv_title">"Positiv getestet"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Es besteht die Möglichkeit einer Ansteckung."</string>
+    <string name="meldung_detail_exposed_subtitle">"Sie könnten sich angesteckt haben"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Sie wurden positiv auf das Coronavirus getestet."</string>
@@ -335,7 +335,7 @@ Schritt voraus"</string>
     <string name="onboarding_prinzip_text1">"Mit der SwissCovid App können alle dazu beitragen, die Verbreitung des Coronavirus einzudämmen."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"Die App informiert Sie, wenn Sie potenziell dem Coronavirus ausgesetzt waren."</string>
+    <string name="onboarding_prinzip_text2">"Die App warnt Sie, wenn Sie potenziell dem Coronavirus ausgesetzt waren."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -350,7 +350,7 @@ Schritt voraus"</string>
     <string name="onboarding_privacy_text2">"Die gespeicherten zufälligen IDs bleiben auf Ihrem Mobiltelefon und werden nach 14 Tagen gelöscht."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Wie funktioniert die App?"</string>
+    <string name="onboarding_begegnungen_heading">"Begegnungen"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Begegnungen erkennen
@@ -370,7 +370,7 @@ dank Bluetooth"</string>
 möglichen Ansteckung"</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"Die App informiert Sie, wenn Sie potenziell dem Coronavirus ausgesetzt waren."</string>
+    <string name="onboarding_meldung_text1">"Die App warnt Sie, wenn Sie potenziell dem Coronavirus ausgesetzt waren."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"Mit dem richtigen Verhalten können Sie Infektionsketten unterbrechen und andere schützen."</string>
@@ -407,7 +407,7 @@ möglichen Ansteckung"</string>
     <string name="onboarding_push_title">"Mitteilungen erlauben"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Damit Sie von der App informiert werden, müssen Sie Mitteilungen erlauben."</string>
+    <string name="onboarding_push_text">"Damit die App Sie warnen kann, müssen Sie Mitteilungen erlauben."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Mitteilungen erlauben"</string>
@@ -430,7 +430,7 @@ Halten Sie sich an die erhaltenen Anweisungen zur Isolation."</string>
     <string name="onboarding_go_title">"Die App ist eingerichtet"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Vielen Dank, dass Sie mithelfen, Infektionsketten zu unterbrechen."</string>
+    <string name="onboarding_go_text">"Vielen Dank, dass Sie mithelfen, die Verbreitung des Coronavirus einzudämmen."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Starten"</string>
@@ -457,7 +457,7 @@ Halten Sie sich an die erhaltenen Anweisungen zur Isolation."</string>
     <string name="meldung_detail_new_contact_title">"Erneuter Verdacht"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Es besteht die Möglichkeit einer Ansteckung."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Sie könnten sich angesteckt haben"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Uhrzeit Fehler"</string>
@@ -692,7 +692,7 @@ Zudem sind folgende Symptome möglich:
     <string name="meldungen_positive_tested_faq1_title">"Warum ist das Tracing deaktiviert?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"Nach einem positiven Test wird das Tracing in der App automatisch deaktiviert. Das Tracing kann wieder aktiviert werden, sobald Sie die Isolation beendet haben."</string>
+    <string name="meldungen_positive_tested_faq1_text">"Nach einem positiven Testergebnis wird das Tracing in der App automatisch deaktiviert. Das Tracing kann wieder aktiviert werden, sobald Sie die Isolation beendet haben."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"de"</string>
@@ -736,7 +736,7 @@ Zudem sind folgende Symptome möglich:
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
     <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Um die App nutzen zu können, müssen {TRACING_SETTING_TEXT} aktiviert werden."</string>
+    <string name="onboarding_gaen_text_ios">"Die Tracing-Funktion muss aktiviert sein, damit Begegnungen erkannt werden."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Aktivieren"</string>
@@ -772,7 +772,7 @@ Zudem sind folgende Symptome möglich:
     <!-- Fuzzy -->
     <string name="delete_infection_dialog">"Möchten Sie die Isolation wirklich beenden?"</string>
     <string name="android_onboarding_battery_permission_title">"Akku-Optimierung ignorieren"</string>
-    <string name="android_onboarding_battery_permission_text">"Um Begegnungen immer erkennen zu können, muss die Akku-Optimierung für diese App ausgeschaltet sein."</string>
+    <string name="android_onboarding_battery_permission_text">"Damit die App funktioniert, muss die Akku-Optimierung für diese App ausgeschaltet sein."</string>
     <string name="android_onboarding_battery_permission_button">"Zulassen"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Nur für diese App"</string>
@@ -840,9 +840,8 @@ Falls auf Ihrem Mobiltelefon zurzeit kein Update verfügbar ist, versuchen Sie e
     <string name="tracing_active_tracking_always_info">"SwissCovid bleibt aktiv, auch wenn die App geschlossen wird."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-stoppt 
-Infektionsketten."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid –
+bei einem Ansteckungsrisiko schnell informiert."</string>
     <string name="inform_detail_faq3_text">"Obwohl keine Daten zu Ihrer Person gesendet werden, kann es sein, dass sich jemand anhand des Datums an die Begegnung erinnern kann."</string>
     <string name="inform_detail_faq3_title">"Bleibe ich anonym?"</string>
 
@@ -854,7 +853,7 @@ Infektionsketten."</string>
     <string name="tracing_setting_text_android">"COVID-19-Benachrichtigungen"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Um die App nutzen zu können, müssen COVID-19 Benachrichtigungen aktiviert werden."</string>
+    <string name="onboarding_gaen_text_android">"Die Tracing-Funktion muss aktiviert sein, damit Begegnungen erkannt werden."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -1544,7 +1543,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="checkout_button_title">"Check out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-ins"</string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
     <string name="checkin_title">"Check-In"</string>
@@ -1571,10 +1570,10 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="edit_controller_title">"Bearbeiten"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"Noch keine Tagebucheinträge vorhanden"</string>
+    <string name="empty_diary_title">"Noch keine Einträge vorhanden"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"Wenn Sie einen Swiss-Covid-QR-Code scannen, um sich vor Ort einzuchecken, wird hier automatisch ein Eintrag angelegt."</string>
+    <string name="empty_diary_text">"Wenn Sie einen SwissCovid-QR-Code scannen, um sich vor Ort einzuchecken, wird hier automatisch ein Eintrag angelegt."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
     <string name="camera_permission_dialog_text">"SwissCovid benötigt Zugriff auf die Kamera Ihres Gerätes. Die Kamera wird nur verwendet, um QR Codes zu scannen."</string>
@@ -1586,48 +1585,8 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <!-- Fuzzy -->
     <string name="web_generator_title_placeholder">"z.B. Raum oder Anlassname"</string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <!-- Fuzzy -->
-    <string name="web_generator_category_label">"Kategorie"</string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other">"Andere"</string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room">"Sitzungsraum"</string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria">"Kafeteria"</string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event">"Privater Event"</string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label">"Titel"</string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button">"PDF drucken"</string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen">"Kantine"</string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library">"Bibliothek"</string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room">"Vorlesungssaal"</string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop">"Laden"</string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym">"Fitnesscenter"</string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area">"Küchenbereich"</string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space">"Büroräume"</string>
     <string name="bottom_nav_tab_info">"Info"</string>
     <string name="error_network_title">"Netzwerk Fehler"</string>
     <string name="error_network_text">"Überprüfen Sie Ihre Internet Verbindung."</string>
@@ -1644,7 +1603,6 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="error_update_text">"Dieser QR Code ist nicht kompatibel mit der installierten App Version. Führen Sie ein Update der App durch, um den QR Code zu scannen."</string>
     <string name="error_update_title">"Update benötigt"</string>
     <string name="error_action_update">"Jetzt updaten"</string>
-    <string name="android_crowdnotifier_notification_channel_name">"CrowdNotifier Meldungen"</string>
     <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
     <string name="android_ongoing_checkin_notification_channel_name">"Permanente Checkin Meldung"</string>
@@ -1658,10 +1616,10 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="scan_qr_code_button_title">"QR-Code scannen"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-Ins deaktiviert"</string>
+    <string name="checkin_ended_title">"Check-In deaktiviert"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Neue Check-Ins sind nicht möglich."</string>
+    <string name="checkin_ended_text">"Derzeit ist kein Check-in möglich"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
     <string name="checkin_detail_checked_out_text">"Scannen Sie einen SwissCovid-QR-Code, um sich vor Ort einzuchecken."</string>
@@ -1676,7 +1634,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="inform_detail_covidcode_info_button">"Mehr zum Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Entfernen"</string>
+    <string name="remove_from_diary_button">"Eintrag entfernen"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
     <string name="delete_button_title">"Löschen"</string>
@@ -1706,23 +1664,24 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="inform_really_not_share_subtitle">"Das Teilen Ihrer privaten Schlüssel hilft «SwissCovid», andere potenziell infizierte Personen zu benachrichtigen und die weitere Ausbreitung des Virus zu verhindern. Wenn Sie Ihre privaten Schlüssel nicht teilen, werden keine potenziell infizierten Personen benachrichtigt."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Achtung"</string>
+    <string name="remove_diary_warning_title">"Eintrag entfernen"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Sind Sie sicher, dass Sie “{LOCATION_INFO}” in Ihrem Tagebuch nicht mehr anzeigen möchten? Diese Aktion kann nicht rückgängig gemacht werden."</string>
+    <string name="remove_diary_warning_text">"Ihr Eintrag wird unwiderruflich aus der Liste entfernt."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Nicht mehr anzeigen"</string>
+    <string name="remove_diary_remove_now_button">"Vollständig entfernen"</string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text">"Die App speichert diesen Eintrag noch für 14 Tage verschlüsselt im Hintergrund, damit Sie bei einer möglichen Ansteckung trotzdem gewarnt werden können."</string>
+    <!-- Hide from diary warning title -->
+    <!-- Fuzzy -->
+    <string name="remove_diary_warning_hide_title">"Nur ausblenden und weiterhin benachrichtigt werden?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title">"Positiv getestet?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <!-- Fuzzy -->
-    <string name="home_end_isolation_card_text">"Begegnungen und Check-ins wieder aktivieren."</string>
+    <string name="home_end_isolation_card_text">"Begegnungen und Check-in wieder aktivieren."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
@@ -1737,10 +1696,10 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Selbst einchecken"</string>
+    <string name="self_checkin_button_title">"Self Check-In"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Schützen Sie sich und andere indem Sie bei Events ein- und auschecken."</string>
+    <string name="checkin_overview_checkins_explanation">"Scannen Sie einen SwissCovid-QR-Code, um sich vor Ort einzuchecken."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
     <string name="checkout_overlapping_alert_title">"Sichern nicht möglich"</string>
@@ -1783,7 +1742,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
 zu hinterlassen"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Geben Sie hier ihren CovidCode ein"</string>
+    <string name="home_covidcode_card_text">"Geben Sie hier Ihren Covidcode ein, um andere zu warnen."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"Isolation beenden?"</string>
@@ -1801,26 +1760,23 @@ zu hinterlassen"</string>
     <string name="checkin_footer_title2">"Keine zentrale Datenspeicherung"</string>
 
     <!-- Fuzzy -->
-    <string name="checkin_footer_subtitle2">"Für die SwissCovid-Check-ins müssen keine persönlichen Daten wie Name, Adresse oder Telefonnummer angegeben werden und es werden auch keine GPS-Standortdaten erfasst. Die Liste der Check-ins ist nur lokal auf Ihrem Smartphone gespeichert und wird an keinen zentralen Server gesendet. Nach 14 Tagen werden die lokalen Daten wieder gelöscht."</string>
+    <string name="checkin_footer_subtitle2">"Für die SwissCovid-Check-ins müssen keine persönlichen Daten wie Name, Adresse oder Telefonnummer angegeben werden und es werden auch keine GPS-Standortdaten erfasst. Die Liste der Check-ins wird lokal auf Ihrem Smartphone gespeichert. Nach 14 Tagen werden die lokalen Daten wieder gelöscht."</string>
     <string name="events_empty_state_title">"Erstellen Sie einen QR-Code"</string>
-    <string name="events_empty_state_subtitle">"Mit einem SwissCovid-QR-Code, können sich Personen vor Ort einchecken, ohne Ihre Daten zu hinterlassen."</string>
+    <string name="events_empty_state_subtitle">"Mit einem SwissCovid-QR-Code können sich Personen vor Ort einchecken, ohne ihre Daten zu hinterlassen."</string>
     <string name="events_info_box_title">"Kein Ersatz für die obligatorische Kontaktdatenerfassung"</string>
-    <string name="events_info_box_text">"SwissCovid-Check-ins sind kein Ersatz für die in der Covid-19-Verordnung vorgeschriebene Kontaktdatenerfassungspflicht."</string>
+    <string name="events_info_box_text">"SwissCovid-Check-ins sind kein Ersatz für die in der «Covid-19-Verordnung besondere Lage» vorgeschriebene Kontaktdatenerfassungspflicht."</string>
     <string name="events_footer_title1">"Wo können Check-ins eingesetzt werden?"</string>
     <string name="events_footer_title2">"Warum eine Check-in-Funktion?"</string>
-    <string name="events_footer_title3">"Ersetzen SwissCovid-Check-ins die Pflicht zur Kontaktdatenerfassung?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid-Check-ins können dort eingesetzt werden, wo Menschen 
-sich treffen aber keine Pflicht zur Kontaktdatenerfassung besteht. 
+    <string name="events_footer_subtitle1">"SwissCovid-Check-ins können dort eingesetzt werden, wo sich Menschen treffen, aber keine Pflicht zur Kontaktdatenerfassung besteht.
 
 Mögliche Einsatzorte:
 – Private Anlässe
-– Vereinsanlässe 
+– Vereinsanlässe
 – Zusammenkünfte im professionellen Umfeld wie z.B. Sitzungszimmer, Büroräume, Kantinen, etc."</string>
-    <string name="events_footer_subtitle2">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand."</string>
-    <string name="events_footer_subtitle3">"Nein, SwissCovid-Check-ins ersetzen die Pflicht zur Kontaktdatenerfassung, wie sie in der Covid-19-Verordnung festgehalten ist, nicht. Sie dienen lediglich als Ergänzung, um Teilnehmende rasch über eine mögliche Ansteckung zu informieren."</string>
+    <string name="events_footer_subtitle2">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand. "</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Mögliche Risikosituation:"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risikosituation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
     <string name="meldung_detail_exposed_list_card_title_encounters">"Begegnungen"</string>
@@ -1844,18 +1800,18 @@ Mögliche Einsatzorte:
     <string name="venue_type_contact_tracing_qr_code">"Contact Tracing QR Code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"Nach einem positiven Test sind die Check-ins automatisch deaktiviert. Sie können nach Beendigung Ihrer Isolation wieder aktiviert werden."</string>
+    <string name="checkin_ended_text_detailed">"Nach einem positiven Testergebnis ist die Check-in-Funktion automatisch deaktiviert. Sie kann nach Beendigung Ihrer Isolation wieder aktiviert werden."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Vergeben Sie einen Titel, der den Ort 
-oder Ihren Anlass näher beschreibt."</string>
+    <string name="checkins_create_qr_code_subtitle">"Vergeben Sie einen Titel, der den Ort oder Ihren Anlass näher beschreibt.
+Dieser Titel wird beim Check-in angezeigt."</string>
     <string name="checkin_report_heading">"Was können Sie tun?"</string>
     <string name="checkin_report_title1">"Kontakte schützen"</string>
     <string name="checkin_report_title2">"Auf Symptome achten"</string>
     <string name="checkin_report_title3">"Testen lassen"</string>
-    <string name="checkin_report_subtitle1">"Sie könnten bereits ansteckend sein, ohne es zu merken. Beachten Sie die geltenden Hygiene- und Schutz-massnahmen und schützen Sie Ihre Familie, Ihre Freunde und Ihr Umfeld."</string>
-    <string name="checkin_report_subtitle2">"Überwachen Sie Ihren Gesundheitszustand und lassen Sie sich beim Auftreten von Symptomen sofort testen."</string>
-    <string name="checkin_report_subtitle3">"Auch wenn keine Symptome auftreten, ist ein Corona-Test sinnvoll und empfohlen (ab dem 5. Tag nach dem angezeigten Kontaktdatum)."</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Überwachen Sie Ihren Gesundheitszustand."</string>
+    <string name="checkin_report_subtitle3">"Lassen Sie sich beim Auftreten von Symptomen sofort testen. Auch wenn keine Symptome auftreten, ist ein Corona-Test sinnvoll und empfohlen."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <!-- Fuzzy -->
@@ -1871,9 +1827,32 @@ oder Ihren Anlass näher beschreibt."</string>
     <string name="not_thank_you_screen_dont_send_button">"Keine Daten senden"</string>
 
     <!-- Fuzzy -->
-    <string name="not_thank_you_screen_text2">"Es wurden keine Check-In-Einträge gesendet. Es wird niemand benachrichtigt."</string>
+    <string name="not_thank_you_screen_text2">"Es wurden keine Check-In-Einträge gesendet."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title">"Auswahl teilen"</string>
     <string name="inform_share_checkins_not_send_button">"Nichts teilen"</string>
+    <string name="onboarding_checkin_title">"Einchecken ohne Daten zu hinterlassen"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"Mit SwissCovid-Check-ins können Sie sich mit der App an einem Ort oder bei einem Treffen einchecken."</string>
+    <string name="onboarding_checkin_text2">"Ihre Anwesenheit wird nur in der App gespeichert. Sie müssen keine persönlichen Daten in der App hinterlassen."</string>
+    <string name="checkin_updateboarding_text">"Mit SwissCovid-Check-ins können Sie sich mit der App vor Ort einchecken. Ihre Anwesenheit wird nur in der App gespeichert. Sie müssen keine persönlichen Daten in der App hinterlassen. Dazu wurden die Nutzungsbedingungen und Datenschutzerklärung aktualisiert."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Überspringen"</string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text">"Der Eintrag wird 14 Tage verschlüsselt im Hintergrund der App gespeichert. Bei einer möglichen Ansteckung können Sie so trotzdem benachrichtigt werden."</string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button">"Nur ausblenden"</string>
+    <string name="checkin_set_reminder_explanation">"Die App kann Sie erinnern, zum richtigen Zeitpunkt wieder auszuchecken."</string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title">"Oder vollständig entfernen?"</string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text">"Der Eintrag wird vollständig entfernt. Sie können nicht mehr gewarnt werden."</string>
+    <string name="not_thank_you_screen_text3">"Es wird niemand benachrichtigt."</string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link">"Was muss ich übers Testen wissen?"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b043dfcb0..0bfb0c2a4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1516,47 +1516,8 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1573,7 +1534,6 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1640,8 +1600,8 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1724,10 +1684,8 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1780,4 +1738,27 @@ Contacte con la Infoline del coronavirus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ab506dc42..4b57fddd2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1551,47 +1551,8 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1608,7 +1569,6 @@ Contactez l'infoline coronavirus :"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1675,8 +1635,8 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1759,10 +1719,8 @@ Contactez l'infoline coronavirus :"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1815,4 +1773,27 @@ Contactez l'infoline coronavirus :"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 16d803b2b..00458a0ff 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1521,47 +1521,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1578,7 +1539,6 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1645,8 +1605,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1729,10 +1689,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1785,4 +1743,27 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5b14459a4..8d2c5c9cb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1559,47 +1559,8 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1616,7 +1577,6 @@ Contatta la Infoline coronavirus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1683,8 +1643,8 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1767,10 +1727,8 @@ Contatta la Infoline coronavirus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1823,4 +1781,27 @@ Contatta la Infoline coronavirus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0f7f59809..a07b8e182 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1526,47 +1526,8 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1583,7 +1544,6 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1650,8 +1610,8 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1734,10 +1694,8 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1790,4 +1748,27 @@ Contacte a linha de informação coronavírus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 622d10270..2ca22c683 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1521,47 +1521,8 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1578,7 +1539,6 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1645,8 +1605,8 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1729,10 +1689,8 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1785,4 +1743,27 @@ Alura contactai la Infoline coronavirus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 22641f8e9..f422d6820 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1526,47 +1526,8 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1583,7 +1544,6 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1650,8 +1610,8 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1734,10 +1694,8 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1790,4 +1748,27 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 48a0dbf3f..09df5bb84 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1521,47 +1521,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1578,7 +1539,6 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1645,8 +1605,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1729,10 +1689,8 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1785,4 +1743,27 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index cfc557ac7..01316aaea 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1501,47 +1501,8 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1558,7 +1519,6 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1625,8 +1585,8 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1709,10 +1669,8 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1765,4 +1723,27 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 938b5d160..72797e67e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1503,47 +1503,8 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1560,7 +1521,6 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1627,8 +1587,8 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1711,10 +1671,8 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1767,4 +1725,27 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 24c33d04f..ba0b5a3f2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1548,47 +1548,8 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
     <string name="web_generator_title_placeholder"></string>
 
-    <!-- Check-Ins: Veranstaltungen Titel Kategorie -->
-    <string name="web_generator_category_label"></string>
-
-    <!-- Check-Ins: Kategorie Andere -->
-    <string name="web_generator_category_other"></string>
-
-    <!-- Check-Ins: Kategorie Sitzungsraum -->
-    <string name="web_generator_category_meeting_room"></string>
-
-    <!-- Check-Ins: Kategorie Kafeteria -->
-    <string name="web_generator_category_cafeteria"></string>
-
-    <!-- Check-Ins: Kategorie Privater Event -->
-    <string name="web_generator_category_private_event"></string>
-
-    <!-- Check-Ins: Veranstaltungen Titel Titel -->
-    <string name="web_generator_title_label"></string>
-
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
     <string name="show_pdf_button"></string>
-
-    <!-- Check-Ins: Kategorie Kantine -->
-    <string name="web_generator_category_canteen"></string>
-
-    <!-- Check-Ins: Kategorie Bibliothek -->
-    <string name="web_generator_category_library"></string>
-
-    <!-- Check-Ins: Kategorie Vorlesungssaal -->
-    <string name="web_generator_category_lecture_room"></string>
-
-    <!-- Check-Ins: Kategorie Laden -->
-    <string name="web_generator_category_shop"></string>
-
-    <!-- Check-Ins: Kategorie Fitnesscenter -->
-    <string name="web_generator_category_gym"></string>
-
-    <!-- Check-Ins: Kategorie Küchenbereich -->
-    <string name="web_generator_category_kitchen_area"></string>
-
-    <!-- Check-Ins: Kategorie Büroräume -->
-    <string name="web_generator_category_office_space"></string>
     <string name="bottom_nav_tab_info"></string>
     <string name="error_network_title"></string>
     <string name="error_network_text"></string>
@@ -1605,7 +1566,6 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="error_update_text"></string>
     <string name="error_update_title"></string>
     <string name="error_action_update"></string>
-    <string name="android_crowdnotifier_notification_channel_name"></string>
     <string name="ongoing_notification_checkout_quick_action"></string>
     <string name="reminder_notification_snooze_action"></string>
     <string name="android_ongoing_checkin_notification_channel_name"></string>
@@ -1672,8 +1632,8 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Remove from diary warning view remove button title -->
     <string name="remove_diary_remove_now_button"></string>
 
-    <!-- Remove from diary warning start text -->
-    <string name="remove_diary_warning_star_text"></string>
+    <!-- Hide from diary warning title -->
+    <string name="remove_diary_warning_hide_title"></string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
     <string name="home_covidcode_card_title"></string>
@@ -1756,10 +1716,8 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="events_info_box_text"></string>
     <string name="events_footer_title1"></string>
     <string name="events_footer_title2"></string>
-    <string name="events_footer_title3"></string>
     <string name="events_footer_subtitle1"></string>
     <string name="events_footer_subtitle2"></string>
-    <string name="events_footer_subtitle3"></string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle"></string>
@@ -1812,4 +1770,27 @@ If so, contact the Coronavirus Infoline:"</string>
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title"></string>
     <string name="inform_share_checkins_not_send_button"></string>
+    <string name="onboarding_checkin_title"></string>
+    <string name="onboarding_checkin_heading"></string>
+    <string name="onboarding_checkin_text1"></string>
+    <string name="onboarding_checkin_text2"></string>
+    <string name="checkin_updateboarding_text"></string>
+    <string name="onboarding_gaen_button_dont_activate"></string>
+
+    <!-- Hide from diary warning text -->
+    <string name="remove_diary_warning_hide_text"></string>
+
+    <!-- CheckIn ausblenden -->
+    <string name="remove_diary_warning_hide_button"></string>
+    <string name="checkin_set_reminder_explanation"></string>
+
+    <!-- Remove from diary warning title -->
+    <string name="remove_diary_remove_now_title"></string>
+
+    <!-- Remove from diary warning text -->
+    <string name="remove_diary_remove_now_text"></string>
+    <string name="not_thank_you_screen_text3"></string>
+
+    <!-- Link Text zu Informationen übers Testen -->
+    <string name="checkin_report_link"></string>
 </resources>
\ No newline at end of file

From e5e6a3b4afbb224ef4530009fbdbd5d80b81d298 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 12:06:12 +0200
Subject: [PATCH 080/207] Fix string issues

---
 .../java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt  | 2 +-
 app/src/main/res/layout/dialog_fragment_hide_in_diary.xml     | 2 +-
 app/src/main/res/layout/fragment_generate_qr_code.xml         | 2 +-
 app/src/main/res/layout/item_events_footer.xml                | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
index 9706fe1f8..da561ca51 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
@@ -9,6 +9,6 @@ fun VenueType.getNameRes(): Int {
 	return when (this) {
 		VenueType.USER_QR_CODE -> R.string.venue_type_user_qr_code
 		VenueType.CONTACT_TRACING_QR_CODE -> R.string.venue_type_contact_tracing_qr_code
-		else -> R.string.web_generator_category_other
+		else -> 0
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
index 0b9d12d44..fe5bd3b60 100644
--- a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
+++ b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
@@ -56,7 +56,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_large"
-					android:text="@string/remove_diary_warning_star_text" />
+					android:text="@string/remove_diary_warning_text" />
 
 				<Button
 					android:id="@+id/hide_diary_entry_dialog_hide_button"
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index dd32ec44e..00b464a76 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -59,7 +59,7 @@
 				style="@style/NextStep.Text.Bold.Dark"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/web_generator_title_label"
+				android:text="TODO"
 				android:textAllCaps="true" />
 
 			<com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/item_events_footer.xml b/app/src/main/res/layout/item_events_footer.xml
index 58adb3b17..77247e744 100644
--- a/app/src/main/res/layout/item_events_footer.xml
+++ b/app/src/main/res/layout/item_events_footer.xml
@@ -69,7 +69,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/spacing_medium_large"
 		android:layout_marginBottom="@dimen/spacing_small"
-		android:text="@string/events_footer_title3" />
+		android:text="TODO" />
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -88,7 +88,7 @@
 			style="@style/NextStep.Text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/events_footer_subtitle3" />
+			android:text="TODO" />
 
 	</LinearLayout>
 

From db9ab2c95263b3711551ca31500dbc609c123b1e Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 21 May 2021 11:44:28 +0200
Subject: [PATCH 081/207] Implemented new Onboarding

---
 .../onboarding/OnboardingContentFragment.java | 91 ------------------
 .../onboarding/OnboardingContentFragment.kt   | 70 ++++++++++++++
 .../OnboardingSlidePageAdapter.java           | 86 -----------------
 .../onboarding/OnboardingSlidePageAdapter.kt  | 60 ++++++++++++
 app/src/main/res/drawable/ill_checkins.xml    | 96 +++++++++++++++++++
 .../layout/fragment_onboarding_content.xml    | 50 +---------
 .../main/res/layout/item_icon_with_text.xml   | 26 +++++
 7 files changed, 255 insertions(+), 224 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
 create mode 100644 app/src/main/res/drawable/ill_checkins.xml
 create mode 100644 app/src/main/res/layout/item_icon_with_text.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.java
deleted file mode 100644
index da3d194d2..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.onboarding;
-
-import android.content.res.ColorStateList;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-
-import ch.admin.bag.dp3t.R;
-
-public class OnboardingContentFragment extends Fragment {
-
-	private static final String ARG_RES_TITLE = "RES_TITLE";
-	private static final String ARG_RES_SUBTITLE = "RES_SUBTITLE";
-	private static final String ARG_RES_DESCRIPTION_1 = "RES_DESCRIPTION_1";
-	private static final String ARG_RES_DESCRIPTION_2 = "RES_DESCRIPTION_2";
-	private static final String ARG_RES_DESCR_ICON_1 = "ARG_RES_DESCR_ICON_1";
-	private static final String ARG_RES_DESCR_ICON_2 = "ARG_RES_DESCR_ICON_2";
-	private static final String ARG_RES_ILLUSTRATION = "RES_ILLUSTRATION";
-	private static final String ARG_STYLE_GREEN = "ARG_STYLE_GREEN";
-
-	public static OnboardingContentFragment newInstance(@StringRes int title, @StringRes int subtitle,
-			@DrawableRes int illustration, @StringRes int description1, @DrawableRes int iconDescription1,
-			@StringRes int description2, @DrawableRes int iconDescription2, boolean greenStyle) {
-		Bundle args = new Bundle();
-		args.putInt(ARG_RES_TITLE, title);
-		args.putInt(ARG_RES_SUBTITLE, subtitle);
-		args.putInt(ARG_RES_ILLUSTRATION, illustration);
-		args.putInt(ARG_RES_DESCR_ICON_1, iconDescription1);
-		args.putInt(ARG_RES_DESCRIPTION_1, description1);
-		args.putInt(ARG_RES_DESCR_ICON_2, iconDescription2);
-		args.putInt(ARG_RES_DESCRIPTION_2, description2);
-		args.putBoolean(ARG_STYLE_GREEN, greenStyle);
-		OnboardingContentFragment fragment = new OnboardingContentFragment();
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	public OnboardingContentFragment() {
-		super(R.layout.fragment_onboarding_content);
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-
-		Bundle args = requireArguments();
-
-		((TextView) view.findViewById(R.id.onboarding_title)).setText(args.getInt(ARG_RES_TITLE));
-
-		TextView subtitle = view.findViewById(R.id.onboarding_subtitle);
-		subtitle.setText(args.getInt(ARG_RES_SUBTITLE));
-		if (args.getBoolean(ARG_STYLE_GREEN))
-			subtitle.setTextColor(getResources().getColor(R.color.green_main, null));
-
-		((ImageView) view.findViewById(R.id.onboarding_illustration)).setImageResource(args.getInt(ARG_RES_ILLUSTRATION));
-
-		ImageView icon1 = view.findViewById(R.id.onboarding_description_1_icon);
-		icon1.setImageResource(args.getInt(ARG_RES_DESCR_ICON_1));
-		if (args.getBoolean(ARG_STYLE_GREEN))
-			icon1.setImageTintList(ColorStateList.valueOf(getResources().getColor(R.color.green_main, null)));
-		((TextView) view.findViewById(R.id.onboarding_description_1)).setText(args.getInt(ARG_RES_DESCRIPTION_1));
-
-		ImageView icon2 = view.findViewById(R.id.onboarding_description_2_icon);
-		icon2.setImageResource(args.getInt(ARG_RES_DESCR_ICON_2));
-		if (args.getBoolean(ARG_STYLE_GREEN))
-			icon2.setImageTintList(ColorStateList.valueOf(getResources().getColor(R.color.green_main, null)));
-		((TextView) view.findViewById(R.id.onboarding_description_2)).setText(args.getInt(ARG_RES_DESCRIPTION_2));
-
-		Button continueButton = view.findViewById(R.id.onboarding_continue_button);
-		continueButton.setOnClickListener(v -> {
-			((OnboardingActivity) getActivity()).continueToNextPage();
-		});
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.kt
new file mode 100644
index 000000000..227ca308b
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingContentFragment.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.onboarding
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.databinding.FragmentOnboardingContentBinding
+import ch.admin.bag.dp3t.databinding.ItemIconWithTextBinding
+
+private const val ARG_RES_TITLE = "ARG_RES_TITLE"
+private const val ARG_RES_SUBTITLE = "ARG_RES_SUBTITLE"
+private const val ARG_RES_DESCRIPTIONS = "ARG_RES_DESCRIPTIONS"
+private const val ARG_RES_DESCR_ICONS = "ARG_RES_DESCR_ICONS"
+private const val ARG_RES_ILLUSTRATION = "ARG_RES_ILLUSTRATION"
+
+class OnboardingContentFragment : Fragment() {
+
+	companion object {
+
+		fun newInstance(
+			@StringRes title: Int,
+			@StringRes subtitle: Int,
+			@DrawableRes illustration: Int,
+			@StringRes descriptions: IntArray,
+			@DrawableRes icons: IntArray
+		) = OnboardingContentFragment().apply {
+			arguments = bundleOf(
+				ARG_RES_TITLE to title,
+				ARG_RES_SUBTITLE to subtitle,
+				ARG_RES_ILLUSTRATION to illustration,
+				ARG_RES_DESCRIPTIONS to descriptions,
+				ARG_RES_DESCR_ICONS to icons
+			)
+		}
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return FragmentOnboardingContentBinding.inflate(inflater).apply {
+			val args = requireArguments()
+			onboardingTitle.setText(args.getInt(ARG_RES_TITLE))
+			onboardingSubtitle.setText(args.getInt(ARG_RES_SUBTITLE))
+			onboardingIllustration.setImageResource(args.getInt(ARG_RES_ILLUSTRATION))
+
+			val descriptions = args.getIntArray(ARG_RES_DESCRIPTIONS) ?: intArrayOf()
+			val icons = args.getIntArray(ARG_RES_DESCR_ICONS) ?: intArrayOf()
+			for ((description, icon) in descriptions.zip(icons)) {
+				ItemIconWithTextBinding.inflate(inflater, descriptionContainer, true).apply {
+					this.icon.setImageResource(icon)
+					this.text.setText(description)
+				}
+			}
+
+			onboardingContinueButton.setOnClickListener { (activity as OnboardingActivity?)!!.continueToNextPage() }
+		}.root
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.java
deleted file mode 100644
index d1ca78f23..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.onboarding;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
-
-import ch.admin.bag.dp3t.R;
-
-public class OnboardingSlidePageAdapter extends FragmentStateAdapter {
-
-	public OnboardingSlidePageAdapter(FragmentActivity fragmentActivity) {
-		super(fragmentActivity);
-	}
-
-	@NonNull
-	@Override
-	public Fragment createFragment(int position) {
-		switch (position) {
-			case 0:
-				return OnboardingContentFragment.newInstance(
-						R.string.onboarding_prinzip_title,
-						R.string.onboarding_prinzip_heading,
-						R.drawable.ill_prinzip,
-						R.string.onboarding_prinzip_text1,
-						R.drawable.ic_begegnungen,
-						R.string.onboarding_prinzip_text2,
-						R.drawable.ic_message_alert,
-						false);
-			case 1:
-				return OnboardingContentFragment.newInstance(
-						R.string.onboarding_privacy_title,
-						R.string.onboarding_privacy_heading,
-						R.drawable.ill_privacy,
-						R.string.onboarding_privacy_text1,
-						R.drawable.ic_key,
-						R.string.onboarding_privacy_text2,
-						R.drawable.ic_lock,
-						true);
-			case 2:
-				return OnboardingContentFragment.newInstance(
-						R.string.onboarding_begegnungen_title,
-						R.string.onboarding_begegnungen_heading,
-						R.drawable.ill_bluetooth,
-						R.string.onboarding_begegnungen_text1,
-						R.drawable.ic_begegnungen,
-						R.string.onboarding_begegnungen_text2,
-						R.drawable.ic_bluetooth,
-						false);
-			case 3:
-				return OnboardingContentFragment.newInstance(
-						R.string.onboarding_meldung_title,
-						R.string.onboarding_meldung_heading,
-						R.drawable.ill_meldung,
-						R.string.onboarding_meldung_text1,
-						R.drawable.ic_message_alert,
-						R.string.onboarding_meldung_text2,
-						R.drawable.ic_home,
-						false);
-			case 4:
-				return OnboardingDisclaimerFragment.newInstance();
-			case 5:
-				return OnboardingBatteryPermissionFragment.newInstance();
-			case 6:
-				return OnboardingGaenPermissionFragment.newInstance();
-			case 7:
-				return OnboardingFinishedFragment.newInstance();
-		}
-		throw new IllegalArgumentException("There is no fragment for view pager position " + position);
-	}
-
-	@Override
-	public int getItemCount() {
-		return 8;
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
new file mode 100644
index 000000000..73fdfd751
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.onboarding
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import ch.admin.bag.dp3t.R
+
+class OnboardingSlidePageAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) {
+
+
+	private val onboardingScreens = listOf<Fragment>(
+		OnboardingContentFragment.newInstance(
+			R.string.onboarding_prinzip_title,
+			R.string.onboarding_prinzip_heading,
+			R.drawable.ill_prinzip,
+			intArrayOf(R.string.onboarding_prinzip_text1, R.string.onboarding_prinzip_text2),
+			intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_message_alert)
+		),
+		OnboardingContentFragment.newInstance(
+			R.string.onboarding_checkin_title,
+			R.string.onboarding_checkin_heading,
+			R.drawable.ill_checkins,
+			intArrayOf(R.string.onboarding_checkin_text1, R.string.onboarding_checkin_text2),
+			intArrayOf(R.drawable.ic_qr, R.drawable.ic_info)
+		),
+		OnboardingContentFragment.newInstance(
+			R.string.onboarding_begegnungen_title,
+			R.string.onboarding_begegnungen_heading,
+			R.drawable.ill_bluetooth,
+			intArrayOf(
+				R.string.onboarding_begegnungen_text1,
+				R.string.onboarding_begegnungen_text2,
+				R.string.onboarding_privacy_text1
+			),
+			intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_bluetooth, R.drawable.ic_key)
+		),
+		OnboardingDisclaimerFragment.newInstance(),
+		OnboardingBatteryPermissionFragment.newInstance(),
+		OnboardingGaenPermissionFragment.newInstance(),
+		OnboardingFinishedFragment.newInstance()
+	)
+
+
+	override fun createFragment(position: Int): Fragment {
+		return onboardingScreens[position]
+	}
+
+	override fun getItemCount(): Int {
+		return onboardingScreens.size
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ill_checkins.xml b/app/src/main/res/drawable/ill_checkins.xml
new file mode 100644
index 000000000..2d3075b92
--- /dev/null
+++ b/app/src/main/res/drawable/ill_checkins.xml
@@ -0,0 +1,96 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="289dp"
+    android:height="131dp"
+    android:viewportWidth="289"
+    android:viewportHeight="131">
+  <path
+      android:pathData="M83,130H207V131H83z"
+      android:strokeAlpha="0.6"
+      android:fillColor="#C9C8D2"
+      android:fillType="nonZero"
+      android:fillAlpha="0.6"/>
+  <path
+      android:pathData="M145,1.605L99.275,29.775s0,58.101 45.725,89.793C190.726,87.876 190.726,29.775 190.726,29.775L145,1.605z"
+      android:fillColor="#CAEBE7"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M145.782,1.605l-0.782,0.482v116.931c0.26,0.184 0.52,0.368 0.782,0.55C191.528,87.876 191.528,29.775 191.528,29.775L145.782,1.605z"
+      android:strokeAlpha="0.04"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"
+      android:fillAlpha="0.04"/>
+  <path
+      android:pathData="M142.854,68.124L152.741,55.358 156.231,58.224 142.854,75.42 133.468,64.586 136.819,61.707z"
+      android:strokeAlpha="0.12"
+      android:fillColor="#48465C"
+      android:fillType="nonZero"
+      android:fillAlpha="0.12"/>
+  <path
+      android:pathData="M142.854,64.124L152.741,51.358 156.231,54.224 142.854,71.42 133.468,60.586 136.819,57.707z"
+      android:fillColor="#5C5B78"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M172.102,40.659L175.873,40.513 176.06,45.352 172.29,45.497z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M159.306,57.49s-5.57,-2.7 -5.48,-0.368c0.089,2.332 5.614,3.866 5.614,3.866l-0.134,-3.498z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M176.48,123.285s-0.173,2.808 -0.696,3.949c-0.523,1.14 -0.457,2.819 0.96,2.765 1.417,-0.054 5.08,-0.755 5.08,-0.755s0.218,-1.69 -0.077,-1.958c-0.294,-0.269 -1.549,-3.303 -1.015,-4.164 0.534,-0.86 -4.252,0.163 -4.252,0.163z"
+      android:fillColor="#9A9A9A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M161.795,75.904s-2.47,6.02 -3.382,10.365c-0.912,4.344 -2.3,10.323 -0.514,14.563 1.787,4.24 6.867,16.703 6.92,18.047 0.051,1.345 -0.436,2.71 0.644,2.669 1.08,-0.042 6.954,-1.885 7.193,-2.702 0.238,-0.817 -2.005,-2.885 -2.005,-2.885l-5.538,-17.293 5.778,-11.265 4.168,16.806 0.817,20.976s4.006,-1.232 4.588,-0.177c0,0 1.795,-2.493 2.023,-3.58 0.228,-1.086 -0.848,-21.782 -0.848,-21.782s3.678,-23.574 0.709,-23.459c-2.969,0.115 -14.597,-6.977 -20.554,-0.283z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M165.33,119.83s-2.8,6.074 -3.065,6.356c-0.265,0.281 -2.09,3.063 -0.71,3.01 1.38,-0.052 4.637,-1.532 7.034,-3.794 2.398,-2.261 5.559,-6.18 5.272,-6.44 -0.286,-0.26 -2.25,-0.999 -2.25,-0.999l-6.281,1.867z"
+      android:fillColor="#9A9A9A"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M178.534,36.111s2.83,4.496 3.932,5.537c1.103,1.04 -2,3.331 -2,3.331l-5.554,0.762s0.07,-5.153 -0.216,-5.684c-0.286,-0.53 3.838,-3.946 3.838,-3.946z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M173.411,42.149s1.153,2.096 2.223,2.055c1.07,-0.042 6.604,-2.397 6.84,-3.21 0.237,-0.811 1.834,5.817 1.834,5.817L170.765,70.617l-3.303,-2.28 1.6,-13.978 1.315,-7.543 3.034,-4.667z"
+      android:fillColor="#F3F0F5"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M182.715,63.569c-0.544,1.134 -0.883,2.317 -0.836,3.527 0.002,0.054 0.004,0.108 0.009,0.161 0.129,2.485 1.047,5.358 1.377,7.448 0.239,1.499 0.17,2.593 -0.71,2.85 -2.134,0.62 0.312,1.063 -7.946,3.802 -8.257,2.738 -9.698,0.375 -9.72,-0.162 -0.02,-0.537 1.17,-4.616 0.89,-4.874 -0.28,-0.258 -3.915,3.378 -5.014,2.882 -1.098,-0.495 -0.125,-3.22 -0.125,-3.22s2.474,-5.742 2.422,-7.084c-0.052,-1.343 3.749,-7.673 3.749,-7.673l2.585,-16.768s0.994,-2.189 2.33,-2.51c1.337,-0.32 2.446,0.444 2.446,0.444l-2.237,4.925 -2.36,8.694 0.395,3.211s2.744,-5.751 4.547,-7.972c1.802,-2.22 5.645,-7.476 5.645,-7.476s0.897,-3.017 0.22,-3.918c-0.678,-0.904 2.824,-1.04 4.318,2.667 0.791,1.964 2.076,4.893 2.881,7.62 0.717,2.416 1.056,4.675 0.346,5.966 -1.087,1.972 -3.819,4.565 -5.212,7.46z"
+      android:fillColor="#114540"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M187.942,55.749c-1.042,2.021 -3.663,4.678 -5,7.646 -0.349,-1.338 -0.775,-2.723 -0.775,-2.723s-1.633,-9.302 3.198,-11.705c0.8,-0.083 1.601,0.155 2.246,0.667 0.688,2.477 1.013,4.792 0.331,6.115z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M167.846,55.37L163.575,56.598l-5.932,0.226 -0.61,5.077 9.748,0.692s2.434,-6.743 1.065,-7.223z"
+      android:fillColor="#114540"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M174.175,72.222s-5.591,0.893 -4.315,2.512c1.276,1.618 6.228,-0.083 6.228,-0.083L174.175,72.222z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M182.15,66.605c0.127,2.565 1.031,5.532 1.356,7.69 -1.791,1.771 -3.495,3.333 -4.137,3.36 -1.326,0.053 -3.458,-0.138 -4.243,0.171 -0.786,0.31 -1.247,-4.946 -1.247,-4.946s0.47,-1.684 2.56,-2.602c1.412,-0.62 4.117,-2.304 5.71,-3.673z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M185.609,47.364s4.55,-0.72 4.305,6.877c-0.246,7.596 0.48,12.444 -1.35,13.87 -1.83,1.427 -7.775,7.89 -9.12,7.943 -1.344,0.052 -3.505,-0.134 -4.301,0.168 -0.797,0.302 -1.264,-4.828 -1.264,-4.828s0.476,-1.644 2.595,-2.54c2.12,-0.895 7.114,-4.07 7.072,-5.153 -0.041,-1.082 -1.263,-4.827 -1.263,-4.827s-1.699,-9.146 3.326,-11.51z"
+      android:fillColor="#114540"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M168.264,36.512a6.016,6.019 0,1 0,12.032 0a6.016,6.019 0,1 0,-12.032 0z"
+      android:fillColor="#D1AFAF"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="M170.554,27.707c-0.14,0.126 -0.308,0.214 -0.489,0.256 -0.188,0.035 -0.369,-0.096 -0.404,-0.293 -0.133,0.288 -0.282,0.595 -0.554,0.743 -0.271,0.147 -0.69,0.024 -0.73,-0.293 -0.04,0.24 -0.141,0.465 -0.295,0.65 -0.168,0.167 -0.473,0.21 -0.62,0.021 0.119,0.678 0.045,1.376 0.083,2.064 0.037,0.688 0.213,1.418 0.71,1.87 0.727,0.661 1.819,0.498 2.774,0.373 0.145,-0.032 0.295,-0.023 0.435,0.025 0.358,0.159 0.341,0.679 0.346,1.085 0.06,1.471 1.13,2.682 2.528,2.863 0.38,0.061 0.766,-0.037 1.076,-0.274 0.271,-0.24 0.41,-0.631 0.72,-0.812 0.506,-0.293 1.12,0.135 1.489,0.6 0.37,0.464 0.734,1.036 1.306,1.12 0.758,0.113 1.334,-0.693 1.617,-1.435 0.79,-2.102 0.732,-4.447 -0.159,-6.504 -1.581,-3.6 -6.983,-4.169 -9.833,-2.06z"
+      android:fillColor="#2F2E41"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_onboarding_content.xml b/app/src/main/res/layout/fragment_onboarding_content.xml
index 4d046550a..cdb38a338 100644
--- a/app/src/main/res/layout/fragment_onboarding_content.xml
+++ b/app/src/main/res/layout/fragment_onboarding_content.xml
@@ -56,54 +56,10 @@
 				tools:text="Title" />
 
 			<LinearLayout
+				android:id="@+id/description_container"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_huge"
-				android:orientation="horizontal">
-
-				<ImageView
-					android:id="@+id/onboarding_description_1_icon"
-					android:layout_width="@dimen/icon_size"
-					android:layout_height="@dimen/icon_size"
-					android:layout_marginRight="@dimen/spacing_medium_large"
-					android:tint="@color/blue_main"
-					tools:src="@drawable/ic_begegnungen" />
-
-				<TextView
-					android:id="@+id/onboarding_description_1"
-					style="@style/NextStep.Text"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:breakStrategy="high_quality"
-					android:hyphenationFrequency="full"
-					tools:text="This is a description text over multiple lines to explain something" />
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_larger"
-				android:orientation="horizontal">
-
-				<ImageView
-					android:id="@+id/onboarding_description_2_icon"
-					android:layout_width="@dimen/icon_size"
-					android:layout_height="@dimen/icon_size"
-					android:layout_marginRight="@dimen/spacing_medium_large"
-					android:tint="@color/blue_main"
-					tools:src="@drawable/ic_message_alert" />
-
-				<TextView
-					android:id="@+id/onboarding_description_2"
-					style="@style/NextStep.Text"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:breakStrategy="high_quality"
-					android:hyphenationFrequency="full"
-					tools:text="This is a description text over multiple lines to explain something" />
-
-			</LinearLayout>
+				android:orientation="vertical" />
 		</LinearLayout>
 	</ScrollView>
 
@@ -112,10 +68,10 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom"
 		android:background="@color/white"
+		android:elevation="@dimen/onboarding_button_container_elevation"
 		android:gravity="center"
 		android:orientation="vertical"
 		android:outlineProvider="bounds"
-		android:elevation="@dimen/onboarding_button_container_elevation"
 		android:padding="@dimen/spacing_medium">
 
 		<Button
diff --git a/app/src/main/res/layout/item_icon_with_text.xml b/app/src/main/res/layout/item_icon_with_text.xml
new file mode 100644
index 000000000..0360446da
--- /dev/null
+++ b/app/src/main/res/layout/item_icon_with_text.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginTop="@dimen/spacing_large"
+	android:orientation="horizontal">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/icon_size"
+		android:layout_height="@dimen/icon_size"
+		android:layout_marginRight="@dimen/spacing_medium_large"
+		android:tint="@color/blue_main"
+		tools:src="@drawable/ic_begegnungen" />
+
+	<TextView
+		android:id="@+id/text"
+		style="@style/NextStep.Text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:breakStrategy="high_quality"
+		android:hyphenationFrequency="full"
+		tools:text="This is a description text over multiple lines to explain something" />
+
+</LinearLayout>

From c3ba4298db5eab8586796dd406df5ca4b35e3fe9 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 21 May 2021 12:51:09 +0200
Subject: [PATCH 082/207] Implemented Update Boarding

---
 ...nteroperabilityUpdateBoardingFragment.java | 87 -------------------
 .../UpdateBoardingActivity.java               | 46 ----------
 .../updateboarding/UpdateBoardingActivity.kt  | 44 ++++++++++
 .../updateboarding/UpdateBoardingFragment.kt  | 66 ++++++++++++++
 ...ility.xml => fragment_update_boarding.xml} | 33 ++++---
 5 files changed, 126 insertions(+), 150 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/updateboarding/InteroperabilityUpdateBoardingFragment.java
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt
 rename app/src/main/res/layout/{fragment_update_boarding_interoperability.xml => fragment_update_boarding.xml} (90%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/InteroperabilityUpdateBoardingFragment.java b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/InteroperabilityUpdateBoardingFragment.java
deleted file mode 100644
index a0250d26e..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/InteroperabilityUpdateBoardingFragment.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package ch.admin.bag.dp3t.updateboarding;
-
-import android.os.Bundle;
-import android.text.Html;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.util.AssetUtil;
-import ch.admin.bag.dp3t.util.UlTagHandler;
-import ch.admin.bag.dp3t.util.UrlUtil;
-
-public class InteroperabilityUpdateBoardingFragment extends Fragment {
-
-	public static InteroperabilityUpdateBoardingFragment newInstance() {
-		return new InteroperabilityUpdateBoardingFragment();
-	}
-
-	public InteroperabilityUpdateBoardingFragment() {
-		super(R.layout.fragment_update_boarding_interoperability);
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-
-		TextView termsOfUseTextview = view.findViewById(R.id.terms_of_use_textview);
-		TextView dataProtectionTextView = view.findViewById(R.id.data_protection_textview);
-		termsOfUseTextview.setText(Html.fromHtml(AssetUtil.getTermsOfUse(getContext()), null, new UlTagHandler()));
-		dataProtectionTextView.setText(Html.fromHtml(AssetUtil.getDataProtection(getContext()), null, new UlTagHandler()));
-
-		ImageView termsOfUseChevron = view.findViewById(R.id.terms_of_use_chevron_imageview);
-		ImageView dataProtectionChevron = view.findViewById(R.id.data_protection_chevron_imageview);
-
-		View dataProtectionToOnlineVersionButton =
-				view.findViewById(R.id.onboarding_disclaimer_data_protection_to_online_version_button);
-		View termsOfUseToOnlineVersionButton = view.findViewById(R.id.onboarding_disclaimer_terms_of_use_to_online_version_button);
-
-		View termsOfUseContainer = view.findViewById(R.id.onboarding_disclaimer_terms_of_use_container);
-		View dataProtectionContainer = view.findViewById(R.id.onboarding_disclaimer_data_protection_container);
-
-		view.findViewById(R.id.data_protection_header_container).setOnClickListener(v -> {
-			if (dataProtectionContainer.getVisibility() == View.VISIBLE) {
-				dataProtectionContainer.setVisibility(View.GONE);
-				v.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.white));
-			} else {
-				dataProtectionContainer.setVisibility(View.VISIBLE);
-				v.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.grey_light));
-			}
-			dataProtectionChevron.animate()
-					.rotation(dataProtectionChevron.getRotation() + 180)
-					.setDuration(getResources().getInteger(android.R.integer.config_shortAnimTime))
-					.start();
-		});
-
-		view.findViewById(R.id.conditions_of_use_header_container).setOnClickListener(v -> {
-			if (termsOfUseContainer.getVisibility() == View.VISIBLE) {
-				termsOfUseContainer.setVisibility(View.GONE);
-				v.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.white));
-			} else {
-				termsOfUseContainer.setVisibility(View.VISIBLE);
-				v.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.grey_light));
-			}
-			termsOfUseChevron.animate()
-					.rotation(termsOfUseChevron.getRotation() + 180)
-					.setDuration(getResources().getInteger(android.R.integer.config_shortAnimTime))
-					.start();
-		});
-
-		dataProtectionToOnlineVersionButton.setOnClickListener(v -> openOnlineVersion());
-		termsOfUseToOnlineVersionButton.setOnClickListener(v -> openOnlineVersion());
-
-		Button okButton = view.findViewById(R.id.updateboarding_ok_button);
-		okButton.setOnClickListener(v -> ((UpdateBoardingActivity) getActivity()).finishUpdateBoarding());
-	}
-
-	private void openOnlineVersion() {
-		UrlUtil.openUrl(getContext(), getString(R.string.onboarding_disclaimer_legal_button_url));
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.java b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.java
deleted file mode 100644
index 9c74d1a32..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package ch.admin.bag.dp3t.updateboarding;
-
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
-
-import org.dpppt.android.sdk.DP3T;
-
-import ch.admin.bag.dp3t.R;
-
-public class UpdateBoardingActivity extends FragmentActivity {
-
-	// Increment this number for each new Update Boarding
-	public static final int UPDATE_BOARDING_VERSION = 1;
-
-	@Override
-	protected void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_update_boarding);
-		if (savedInstanceState == null) {
-			showFirstUpdateBoardingFragment();
-		}
-	}
-
-	private void showFirstUpdateBoardingFragment() {
-		// Replace with new UpdateBoarding Fragment
-		getSupportFragmentManager()
-				.beginTransaction()
-				.add(R.id.main_fragment_container, InteroperabilityUpdateBoardingFragment.newInstance())
-				.commit();
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		DP3T.onActivityResult(this, requestCode, resultCode, data);
-	}
-
-	public void finishUpdateBoarding() {
-		setResult(RESULT_OK);
-		finish();
-		overridePendingTransition(R.anim.fragment_open_enter, R.anim.fragment_open_exit);
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt
new file mode 100644
index 000000000..efad26818
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt
@@ -0,0 +1,44 @@
+package ch.admin.bag.dp3t.updateboarding
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+import ch.admin.bag.dp3t.R
+import org.dpppt.android.sdk.DP3T
+
+class UpdateBoardingActivity : FragmentActivity() {
+
+
+	companion object {
+		// Increment this number for each new Update Boarding
+		const val UPDATE_BOARDING_VERSION = 2
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_update_boarding)
+		if (savedInstanceState == null) {
+			showFirstUpdateBoardingFragment()
+		}
+	}
+
+	private fun showFirstUpdateBoardingFragment() {
+		// Replace with new UpdateBoarding Fragment
+		supportFragmentManager
+			.beginTransaction()
+			.add(R.id.main_fragment_container, UpdateBoardingFragment.newInstance())
+			.commit()
+	}
+
+	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+		super.onActivityResult(requestCode, resultCode, data)
+		DP3T.onActivityResult(this, requestCode, resultCode, data)
+	}
+
+	fun finishUpdateBoarding() {
+		setResult(RESULT_OK)
+		finish()
+		overridePendingTransition(R.anim.fragment_open_enter, R.anim.fragment_open_exit)
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt
new file mode 100644
index 000000000..dc036dccc
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt
@@ -0,0 +1,66 @@
+package ch.admin.bag.dp3t.updateboarding
+
+import android.os.Bundle
+import android.text.Html
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentUpdateBoardingBinding
+import ch.admin.bag.dp3t.util.AssetUtil
+import ch.admin.bag.dp3t.util.UlTagHandler
+import ch.admin.bag.dp3t.util.UrlUtil
+
+class UpdateBoardingFragment : Fragment(R.layout.fragment_update_boarding) {
+
+
+	companion object {
+		fun newInstance() = UpdateBoardingFragment()
+	}
+
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return FragmentUpdateBoardingBinding.inflate(inflater).apply {
+			termsOfUseTextview.text = Html.fromHtml(AssetUtil.getTermsOfUse(context), null, UlTagHandler())
+			dataProtectionTextview.text = Html.fromHtml(AssetUtil.getDataProtection(context), null, UlTagHandler())
+
+			dataProtectionHeaderContainer.setOnClickListener { v ->
+
+				dataProtectionContainer.isVisible = !dataProtectionContainer.isVisible
+				v.setBackgroundColor(
+					ContextCompat.getColor(v.context, if (dataProtectionContainer.isVisible) R.color.grey_light else R.color.white)
+				)
+
+				dataProtectionChevronImageview.animate()
+					.rotation(dataProtectionChevronImageview.rotation + 180)
+					.setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+					.start()
+			}
+
+
+			conditionsOfUseHeaderContainer.setOnClickListener { v: View ->
+				termsOfUseContainer.isVisible = !termsOfUseContainer.isVisible
+				v.setBackgroundColor(
+					ContextCompat.getColor(v.context, if (termsOfUseContainer.isVisible) R.color.grey_light else R.color.white)
+				)
+
+				termsOfUseChevronImageview.animate()
+					.rotation(termsOfUseChevronImageview.rotation + 180)
+					.setDuration(resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+					.start()
+			}
+			dataProtectionToOnlineVersionButton.setOnClickListener { openOnlineVersion() }
+			termsOfUseToOnlineVersionButton.setOnClickListener { openOnlineVersion() }
+			updateboardingOkButton.setOnClickListener { (activity as UpdateBoardingActivity).finishUpdateBoarding() }
+
+		}.root
+	}
+
+	private fun openOnlineVersion() {
+		UrlUtil.openUrl(context, getString(R.string.onboarding_disclaimer_legal_button_url))
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_update_boarding_interoperability.xml b/app/src/main/res/layout/fragment_update_boarding.xml
similarity index 90%
rename from app/src/main/res/layout/fragment_update_boarding_interoperability.xml
rename to app/src/main/res/layout/fragment_update_boarding.xml
index 4b1268f6b..61d2e172b 100644
--- a/app/src/main/res/layout/fragment_update_boarding_interoperability.xml
+++ b/app/src/main/res/layout/fragment_update_boarding.xml
@@ -22,9 +22,8 @@
 				android:background="@color/white"
 				android:gravity="center_horizontal"
 				android:orientation="vertical"
-				android:paddingStart="@dimen/spacing_large"
+				android:paddingHorizontal="@dimen/spacing_large"
 				android:paddingTop="@dimen/spacing_huge"
-				android:paddingEnd="@dimen/spacing_large"
 				android:paddingBottom="@dimen/spacing_large">
 
 				<TextView
@@ -37,21 +36,23 @@
 				<ImageView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginVertical="@dimen/spacing_medium"
-					android:src="@drawable/ic_interoperability_update" />
+					android:layout_marginVertical="@dimen/spacing_medium_large"
+					android:layout_marginTop="@dimen/spacing_medium_large"
+					android:src="@drawable/ill_checkins" />
 
 				<TextView
 					style="@style/NextStep.Text.Title"
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:text="@string/germany_update_boarding_title" />
+					android:gravity="center_horizontal"
+					android:text="@string/onboarding_checkin_title" />
 
 				<TextView
 					style="@style/NextStep.Text"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_medium"
-					android:text="@string/germany_update_boarding_text" />
+					android:text="@string/checkin_updateboarding_text" />
 
 			</LinearLayout>
 
@@ -95,7 +96,7 @@
 			</androidx.constraintlayout.widget.ConstraintLayout>
 
 			<LinearLayout
-				android:id="@+id/onboarding_disclaimer_data_protection_container"
+				android:id="@+id/data_protection_container"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="vertical"
@@ -110,7 +111,7 @@
 					android:paddingBottom="@dimen/spacing_large" />
 
 				<LinearLayout
-					android:id="@+id/onboarding_disclaimer_data_protection_to_online_version_button"
+					android:id="@+id/data_protection_to_online_version_button"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center"
@@ -181,7 +182,7 @@
 			</androidx.constraintlayout.widget.ConstraintLayout>
 
 			<LinearLayout
-				android:id="@+id/onboarding_disclaimer_terms_of_use_container"
+				android:id="@+id/terms_of_use_container"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="vertical"
@@ -196,7 +197,7 @@
 					android:paddingBottom="@dimen/spacing_large" />
 
 				<LinearLayout
-					android:id="@+id/onboarding_disclaimer_terms_of_use_to_online_version_button"
+					android:id="@+id/terms_of_use_to_online_version_button"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center"
@@ -236,14 +237,11 @@
 		</LinearLayout>
 	</ScrollView>
 
-	<LinearLayout
+	<FrameLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
 		android:background="@color/white"
 		android:elevation="@dimen/onboarding_button_container_elevation"
-		android:gravity="center"
-		android:orientation="vertical"
 		android:outlineProvider="bounds"
 		android:padding="@dimen/spacing_medium">
 
@@ -252,8 +250,9 @@
 			style="@style/NextStep.Button"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/android_button_ok" />
+			android:layout_gravity="center_horizontal"
+			android:text="@string/onboarding_continue_button" />
 
-	</LinearLayout>
+	</FrameLayout>
 
 </LinearLayout>
\ No newline at end of file

From bbe9cb24f015fadc099e09d1147f70cb4703cec1 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 21 May 2021 13:22:02 +0200
Subject: [PATCH 083/207] Add don't activate button to Onboarding

---
 .../onboarding/OnboardingGaenPermissionFragment.java |  7 +++++++
 .../layout/fragment_onboarding_permission_gaen.xml   | 12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java
index ef2916008..3a66fd967 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java
@@ -10,9 +10,11 @@
 package ch.admin.bag.dp3t.onboarding;
 
 import android.content.Context;
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -35,6 +37,7 @@ public class OnboardingGaenPermissionFragment extends Fragment {
 
 	private Button activateButton;
 	private Button continueButton;
+	private TextView dontActivateButton;
 
 	private AlertDialog playServicesUpdateDialog;
 
@@ -68,6 +71,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		continueButton.setOnClickListener(v -> {
 			((OnboardingActivity) requireActivity()).continueToNextPage();
 		});
+		dontActivateButton = view.findViewById(R.id.dont_activate_button);
+		dontActivateButton.setPaintFlags(dontActivateButton.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+		dontActivateButton.setOnClickListener(v -> ((OnboardingActivity) requireActivity()).continueToNextPage());
 	}
 
 	@Override
@@ -153,6 +159,7 @@ private void updateFragmentState(boolean activated) {
 			PermissionButtonUtil.setButtonDefault(activateButton, R.string.onboarding_gaen_button_activate);
 		}
 		continueButton.setVisibility(activated || wasUserActive ? View.VISIBLE : View.GONE);
+		dontActivateButton.setVisibility(activated || wasUserActive ? View.GONE : View.VISIBLE);
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml b/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml
index af54c90b2..2b9adb140 100644
--- a/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml
+++ b/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml
@@ -65,6 +65,17 @@
 			android:layout_marginTop="@dimen/spacing_small"
 			android:text="@string/onboarding_gaen_button_activate" />
 
+		<TextView
+			android:id="@+id/dont_activate_button"
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginVertical="@dimen/spacing_medium_large"
+			android:background="?selectableItemBackground"
+			android:padding="@dimen/spacing_small"
+			android:text="@string/onboarding_gaen_button_dont_activate" />
+
 		<Button
 			android:id="@+id/onboarding_gaen_continue_button"
 			style="@style/NextStep.Button.Transparent.Blue.Light"
@@ -78,7 +89,6 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_huge"
 			android:background="@color/grey_light"
 			android:orientation="vertical"
 			android:paddingStart="@dimen/spacing_large"

From e5706bc832e9628809912d22d61427ba34b4832c Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 21 May 2021 14:17:34 +0200
Subject: [PATCH 084/207] Update gradle

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 29b62a76a..b551d429e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.1.3'
+		classpath 'com.android.tools.build:gradle:4.2.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
 	}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index feba0ac39..4bf1d4004 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -13,4 +13,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

From ec710a1b70d456b411ef83be78d039950fcc365e Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 21 May 2021 14:47:46 +0200
Subject: [PATCH 085/207] Various UI cleanups

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  1 -
 .../generateqrcode/GenerateQrCodeFragment.kt  |  6 +-
 .../checkin/generateqrcode/QRCodeViewModel.kt |  3 +-
 app/src/main/res/layout/card_checkin.xml      |  2 +-
 .../main/res/layout/card_generate_qr_code.xml |  3 +-
 .../layout/dialog_fragment_hide_in_diary.xml  |  2 +-
 app/src/main/res/layout/fragment_check_in.xml |  8 +++
 .../res/layout/fragment_checkin_overview.xml  | 72 ++++++++++++-------
 app/src/main/res/layout/fragment_qr_code.xml  |  2 +-
 .../main/res/layout/layout_splashboarding.xml |  4 +-
 app/src/main/res/values/styles.xml            |  4 ++
 11 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 87e78dfba..514c0a35d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -51,7 +51,6 @@ class CheckinOverviewFragment : Fragment() {
 					val venueInfo = crowdNotifierViewModel.checkInState.venueInfo
 					crowdNotifierViewModel.startCheckInTimer()
 					checkinTitle.text = venueInfo.description
-					checkinSubtitle.setText(venueInfo.getSubtitle())
 				}
 			})
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 9ff66d7c6..c65f7563d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -10,6 +10,7 @@ import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.databinding.FragmentGenerateQrCodeBinding
+import ch.admin.bag.dp3t.extensions.showFragment
 
 class GenerateQrCodeFragment : Fragment() {
 
@@ -32,8 +33,9 @@ class GenerateQrCodeFragment : Fragment() {
 	}
 
 	private fun generateQrCode(title: String) {
-		qrCodeViewModel.generateAndSaveQrCode(title)
-		popFragmentAndHideKeyboard()
+		qrCodeViewModel.generateAndSaveQrCode(title).observe(viewLifecycleOwner) {
+			showFragment(QrCodeFragment.newInstance(it), addToBackStack = false)
+		}
 	}
 
 	private fun popFragmentAndHideKeyboard() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index cef97bebe..e7b2d5bc9 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -74,7 +74,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 		saveGeneratedQrCode(builder.build())
 	}
 
-	fun generateAndSaveQrCode(description: String) = viewModelScope.launch(Dispatchers.IO) {
+	fun generateAndSaveQrCode(description: String) = liveData(Dispatchers.IO) {
 
 		val swissCovidLocationData = SwissCovidLocationData.newBuilder()
 			.setVersion(SWISSCOVID_LOCATION_DATA_VERSION)
@@ -99,6 +99,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 			.addGeneratedQrCodes(generatedVenueInfo.toQrCodePayload())
 			.build()
 		saveGeneratedQrCode(newWrapper)
+		emit(generatedVenueInfo)
 	}
 
 	fun generateQrCodeBitmapAndPdf(venueInfo: VenueInfo, qrCodeSize: Int) = viewModelScope.launch(Dispatchers.IO) {
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
index 1378cd75d..5a8850838 100644
--- a/app/src/main/res/layout/card_checkin.xml
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -92,7 +92,7 @@
 
 			<TextView
 				android:id="@+id/checkin_time"
-				style="@style/NextStep.Text.SplashTitle.Dark"
+				style="@style/NextStep.Text.SplashTitle"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_very_small"
diff --git a/app/src/main/res/layout/card_generate_qr_code.xml b/app/src/main/res/layout/card_generate_qr_code.xml
index 3845d029a..55ff88dd2 100644
--- a/app/src/main/res/layout/card_generate_qr_code.xml
+++ b/app/src/main/res/layout/card_generate_qr_code.xml
@@ -24,7 +24,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:layout_marginTop="5dp"
-			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingBottom="5dp">
 
@@ -34,7 +33,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginStart="@dimen/spacing_medium"
 				android:layout_weight="1"
-				android:text="@string/events_title" />
+				android:text="@string/events_card_title" />
 
 			<ImageView
 				android:layout_width="@dimen/chevron_size_title"
diff --git a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
index fe5bd3b60..4042c59d4 100644
--- a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
+++ b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
@@ -56,7 +56,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_large"
-					android:text="@string/remove_diary_warning_text" />
+					android:text="@string/remove_diary_warning_hide_text" />
 
 				<Button
 					android:id="@+id/hide_diary_entry_dialog_hide_button"
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index a4bc061ca..c96248a07 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -80,6 +80,14 @@
 					android:gravity="center"
 					android:text="@string/checkin_set_reminder" />
 
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="@dimen/spacing_small"
+					android:gravity="center"
+					android:text="@string/checkin_set_reminder_explanation" />
+
 				<com.google.android.material.button.MaterialButtonToggleGroup
 					android:id="@+id/reminder_toggle_group"
 					android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 0606a8b3f..7f44d4506 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -63,16 +63,28 @@
 						android:id="@+id/checkin_view"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginHorizontal="@dimen/spacing_small"
+						android:layout_marginHorizontal="@dimen/spacing_medium_large"
 						android:orientation="vertical"
-						android:visibility="gone">
+						android:visibility="gone"
+						tools:visibility="visible">
+
+						<TextView
+							style="@style/NextStep.Text.Bold.Blue"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:text="@string/module_checkins_title" />
+
+						<TextView
+							style="@style/NextStep.Text.Title"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:text="@string/pdf_slogan" />
 
 						<TextView
 							style="@style/NextStep.Text"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_marginTop="@dimen/spacing_small"
-							android:gravity="center_horizontal"
+							android:layout_marginTop="@dimen/spacing_medium_large"
 							android:text="@string/checkin_overview_checkins_explanation" />
 
 						<Button
@@ -81,7 +93,7 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:layout_marginVertical="@dimen/spacing_medium_large"
-							android:drawableStart="@drawable/ic_qr"
+							android:drawableEnd="@drawable/ic_qr"
 							android:text="@string/scan_qr_code_button_title" />
 
 					</LinearLayout>
@@ -92,7 +104,8 @@
 						android:layout_height="wrap_content"
 						android:layout_marginHorizontal="@dimen/spacing_small"
 						android:orientation="vertical"
-						android:visibility="visible">
+						android:visibility="visible"
+						tools:visibility="gone">
 
 						<TextView
 							style="@style/NextStep.Text"
@@ -102,15 +115,6 @@
 							android:gravity="center_horizontal"
 							android:text="@string/checkin_checked_in" />
 
-						<TextView
-							android:id="@+id/checkin_time"
-							style="@style/NextStep.Text.SplashTitle.Dark"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_marginTop="@dimen/spacing_small"
-							android:gravity="center_horizontal"
-							tools:text="20:32" />
-
 						<TextView
 							android:id="@+id/checkin_title"
 							style="@style/NextStep.Text.Bold"
@@ -121,13 +125,13 @@
 							tools:text="Reuss, Ubique" />
 
 						<TextView
-							android:id="@+id/checkin_subtitle"
-							style="@style/NextStep.Text"
+							android:id="@+id/checkin_time"
+							style="@style/NextStep.Text.SplashTitle"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_marginTop="@dimen/spacing_tiny_small"
+							android:layout_marginTop="@dimen/spacing_small"
 							android:gravity="center_horizontal"
-							tools:text="Büroräumlichkeiten" />
+							tools:text="20:32" />
 
 						<Button
 							android:id="@+id/checkout_button"
@@ -149,14 +153,16 @@
 				style="@style/NextStep.Card"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginStart="@dimen/spacing_medium_large"
-				android:layout_marginEnd="@dimen/spacing_medium_large"
+				android:layout_marginHorizontal="@dimen/spacing_medium_large"
 				android:layout_marginBottom="@dimen/spacing_medium_large"
-				android:visibility="gone">
+				android:visibility="gone"
+				tools:visibility="visible">
 
 				<LinearLayout
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:layout_marginHorizontal="@dimen/spacing_medium_large"
+					android:layout_marginBottom="@dimen/spacing_medium_large"
 					android:foreground="?selectableItemBackground"
 					android:orientation="vertical">
 
@@ -167,14 +173,24 @@
 						android:layout_marginVertical="@dimen/spacing_large"
 						android:src="@drawable/ic_illu_checkin_ended" />
 
+					<TextView
+						style="@style/NextStep.Text.Bold.Purple"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/module_checkins_title" />
+
+					<TextView
+						style="@style/NextStep.Text.Title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/checkin_ended_title" />
+
 					<TextView
 						style="@style/NextStep.Text"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginHorizontal="@dimen/spacing_larger"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:gravity="center_horizontal"
-						android:text="@string/checkin_overview_isolation_text" />
+						android:layout_marginTop="@dimen/spacing_medium_large"
+						android:text="@string/checkin_ended_text_detailed" />
 
 				</LinearLayout>
 
@@ -225,7 +241,9 @@
 					<LinearLayout
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_margin="@dimen/spacing_medium"
+						android:layout_marginHorizontal="@dimen/spacing_medium_large"
+						android:layout_marginTop="@dimen/spacing_small"
+						android:layout_marginBottom="@dimen/spacing_medium_large"
 						android:orientation="horizontal">
 
 						<TextView
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index f73f4193d..35a21b0c6 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -27,7 +27,7 @@
 
 			<TextView
 				android:id="@+id/title_textview"
-				style="@style/NextStep.Text.SplashTitle.Dark"
+				style="@style/NextStep.Text.SplashTitle"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/layout_splashboarding.xml b/app/src/main/res/layout/layout_splashboarding.xml
index 60814c8a0..4061411d9 100644
--- a/app/src/main/res/layout/layout_splashboarding.xml
+++ b/app/src/main/res/layout/layout_splashboarding.xml
@@ -48,13 +48,13 @@
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:orientation="vertical"
 		android:gravity="center"
+		android:orientation="vertical"
 		app:layout_constraintBottom_toTopOf="@id/bottomImage"
 		app:layout_constraintTop_toBottomOf="@id/linearLayout">
 
 		<TextView
-			style="@style/NextStep.Text.SplashTitle"
+			style="@style/NextStep.Text.SplashTitle.White"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5fe72b13..47da8f4e6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -161,6 +161,10 @@
 		<item name="android:textSize">@dimen/text_size_splash_title</item>
 		<item name="android:fontFamily">@font/inter_bold</item>
 		<item name="android:textStyle">bold</item>
+		<item name="android:textColor">@color/dark_main</item>
+	</style>
+
+	<style name="NextStep.Text.SplashTitle.White">
 		<item name="android:textColor">@color/white</item>
 	</style>
 

From 5cab8e9fd0626c0fedb8c1e406469446e1a42303 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 11:47:01 +0200
Subject: [PATCH 086/207] Remove some CrowdNotifier Styles

---
 .../bag/dp3t/checkin/utils/ErrorDialog.java   |  1 +
 .../dialog_camera_permission_explanation.xml  |  9 +--
 app/src/main/res/layout/dialog_error.xml      | 65 ++++++++-----------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java
index 1be5a623f..704658b0a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorDialog.java
@@ -24,6 +24,7 @@ public ErrorDialog(@NonNull Context context, CrowdNotifierErrorState errorState)
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dialog_error);
+		findViewById(R.id.dialog_error_container).setBackgroundResource(R.color.white);
 		View closeButton = findViewById(R.id.dialog_error_close_button);
 
 		closeButton.setOnClickListener(v -> dismiss());
diff --git a/app/src/main/res/layout/dialog_camera_permission_explanation.xml b/app/src/main/res/layout/dialog_camera_permission_explanation.xml
index 6a85f4136..44981bcd6 100644
--- a/app/src/main/res/layout/dialog_camera_permission_explanation.xml
+++ b/app/src/main/res/layout/dialog_camera_permission_explanation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-	style="@style/CrowdNotifier.Card"
+	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_margin="@dimen/spacing_medium"
@@ -23,11 +23,12 @@
 			android:clickable="true"
 			android:focusable="true"
 			android:padding="@dimen/spacing_medium_large"
-			android:src="@drawable/ic_close" />
+			android:src="@drawable/ic_close"
+			android:tint="@color/blue_main" />
 
 		<TextView
 			android:id="@+id/camera_permission_dialog_text"
-			style="@style/CrowdNotifier.Text"
+			style="@style/NextStep.Text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="@dimen/spacing_large"
@@ -37,7 +38,7 @@
 
 		<TextView
 			android:id="@+id/camera_permission_dialog_ok_button"
-			style="@style/CrowdNotifier.Text.Subtitle"
+			style="@style/NextStep.Text.Bold"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index 047853805..4d30a7dba 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -1,51 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	style="@style/CrowdNotifier.Card"
+	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_margin="@dimen/spacing_medium"
 	android:clickable="false"
 	android:focusable="false">
 
-	<androidx.cardview.widget.CardView
-		style="@style/CrowdNotifier.Card.Grey"
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/spacing_very_small"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintTop_toTopOf="parent">
+		android:layout_height="wrap_content">
 
-		<androidx.constraintlayout.widget.ConstraintLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<ImageButton
-				android:id="@+id/dialog_error_close_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="end"
-				android:layout_marginTop="@dimen/spacing_small"
-				android:layout_marginEnd="@dimen/spacing_small"
-				android:background="@drawable/ripple_rounded"
-				android:clickable="true"
-				android:focusable="true"
-				android:padding="@dimen/spacing_medium_large"
-				android:src="@drawable/ic_close"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintTop_toTopOf="parent" />
+		<ImageButton
+			android:id="@+id/dialog_error_close_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:layout_marginTop="@dimen/spacing_small"
+			android:layout_marginEnd="@dimen/spacing_small"
+			android:background="@drawable/ripple_rounded"
+			android:clickable="true"
+			android:focusable="true"
+			android:padding="@dimen/spacing_medium_large"
+			android:src="@drawable/ic_close"
+			android:tint="@color/blue_main"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
 
-			<include
-				android:id="@+id/dialog_error_container"
-				layout="@layout/item_error_status"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_very_small"
-				android:layout_marginBottom="@dimen/spacing_very_small"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/dialog_error_close_button" />
-
-		</androidx.constraintlayout.widget.ConstraintLayout>
-	</androidx.cardview.widget.CardView>
+		<include
+			android:id="@+id/dialog_error_container"
+			layout="@layout/item_error_status"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginBottom="@dimen/spacing_very_small"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/dialog_error_close_button" />
 
+	</androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From c6be11d9b83705c8ecb35ae4d63fd4a09f9767a1 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 15:58:16 +0200
Subject: [PATCH 087/207] Fix Homescreen Error Combo

---
 .../main/java/ch/admin/bag/dp3t/home/HomeFragment.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 06f9fe725..3d311989e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -52,6 +52,7 @@
 import ch.admin.bag.dp3t.extensions.FragmentExtensionsKt;
 import ch.admin.bag.dp3t.home.model.NotificationState;
 import ch.admin.bag.dp3t.home.model.NotificationStateError;
+import ch.admin.bag.dp3t.home.model.TracingState;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
 import ch.admin.bag.dp3t.home.views.HeaderView;
 import ch.admin.bag.dp3t.inform.InformActivity;
@@ -273,7 +274,7 @@ private void setupNotification() {
 				updateNotification(tracingViewModel.getAppStatusLiveData().getValue(), hasTraceKeyLoadingError));
 	}
 
-	private void updateNotification(TracingStatusInterface tracingStatusInterface, boolean hasTraceKeyLoadingError) {
+	private void updateNotification(TracingStatusInterface tracingStatusInterface, boolean hasCheckinKeyLoadingError) {
 		//update status view
 		if (loadingView.getVisibility() == VISIBLE) {
 			loadingView.animate()
@@ -307,7 +308,8 @@ public void onAnimationEnd(Animator animation) {
 		}
 
 		TracingStatus.ErrorState errorState = tracingStatusInterface.getReportErrorState();
-		if (errorState != null) {
+
+		if (errorState != null && tracingStatusInterface.getTracingState().equals(TracingState.ACTIVE)) {
 			TracingErrorStateHelper.updateErrorView(reportErrorView, errorState);
 			reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
 				loadingView.setVisibility(VISIBLE);
@@ -319,7 +321,7 @@ public void onAnimationEnd(Animator animation) {
 							public void onAnimationEnd(Animator animation) { tracingViewModel.sync(); }
 						});
 			});
-		} else if (hasTraceKeyLoadingError) {
+		} else if (hasCheckinKeyLoadingError) {
 			TracingErrorStateHelper.updateErrorView(reportErrorView, CrowdNotifierErrorState.NETWORK);
 			reportErrorView.findViewById(R.id.error_status_button).setOnClickListener(v -> {
 				loadingView.setVisibility(VISIBLE);

From a51e066aee3896a4e40a4a48a6416016223d76e1 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 17:43:16 +0200
Subject: [PATCH 088/207] Change Notification Icon on Homescreen

---
 .../dp3t/home/model/NotificationState.java    | 21 ++++++++++++-------
 .../main/res/drawable/ic_warning_round.xml    | 10 +++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_warning_round.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java b/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
index f2471941d..ef321ad8c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
@@ -7,7 +7,6 @@
  *
  * SPDX-License-Identifier: MPL-2.0
  */
-
 package ch.admin.bag.dp3t.home.model;
 
 import androidx.annotation.ColorRes;
@@ -21,7 +20,8 @@ public enum NotificationState {
 	EXPOSED,
 	POSITIVE_TESTED;
 
-	@StringRes public static int getTitle(NotificationState notificationState) {
+	@StringRes
+	public static int getTitle(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.string.meldungen_no_meldungen_title;
@@ -33,7 +33,8 @@ public enum NotificationState {
 		return -1;
 	}
 
-	@StringRes public static int getText(NotificationState notificationState) {
+	@StringRes
+	public static int getText(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.string.meldungen_no_meldungen_subtitle;
@@ -45,19 +46,21 @@ public enum NotificationState {
 		return -1;
 	}
 
-	@DrawableRes public static int getIcon(NotificationState notificationState) {
+	@DrawableRes
+	public static int getIcon(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.drawable.ic_check;
 			case EXPOSED:
-				return R.drawable.ic_info;
+				return R.drawable.ic_warning_round;
 			case POSITIVE_TESTED:
 				return R.drawable.ic_info;
 		}
 		return -1;
 	}
 
-	@ColorRes public static int getTitleTextColor(NotificationState notificationState) {
+	@ColorRes
+	public static int getTitleTextColor(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.color.blue_main;
@@ -69,7 +72,8 @@ public enum NotificationState {
 		return -1;
 	}
 
-	@ColorRes public static int geTextColor(NotificationState notificationState) {
+	@ColorRes
+	public static int geTextColor(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.color.dark_main;
@@ -81,7 +85,8 @@ public enum NotificationState {
 		return -1;
 	}
 
-	@ColorRes public static int getBackgroundColor(NotificationState notificationState) {
+	@ColorRes
+	public static int getBackgroundColor(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.color.status_blue_bg;
diff --git a/app/src/main/res/drawable/ic_warning_round.xml b/app/src/main/res/drawable/ic_warning_round.xml
new file mode 100644
index 000000000..4db6c0736
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning_round.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1c6.075,0 11,4.925 11,11s-4.925,11 -11,11S1,18.075 1,12 5.925,1 12,1zM12,15.5c-0.69,0 -1.25,0.56 -1.25,1.25S11.31,18 12,18s1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM13,6h-2v7h2L13,6z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>

From 18436572a198673f433dd75ef887d5bb6b063d80 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 18:33:35 +0200
Subject: [PATCH 089/207] Pop to CheckinOverviewFragment after self Checkin

---
 .../bag/dp3t/checkin/checkinflow/CheckInFragment.kt    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index ff5fe5c68..7b918d99d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -11,7 +11,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.generateqrcode.QrCodeFragment
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.utils.*
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
@@ -99,7 +101,13 @@ class CheckInFragment : Fragment() {
 	}
 
 	private fun popBackToHomeFragment() {
-		requireActivity().supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+		val fm = requireActivity().supportFragmentManager
+		val backStackEntry = if (fm.backStackEntryCount >= 2) fm.getBackStackEntryAt(fm.backStackEntryCount - 2) else null
+		if (backStackEntry?.name == QrCodeFragment::class.java.canonicalName) {
+			fm.popBackStack(CheckinOverviewFragment::class.java.canonicalName, 0)
+		} else {
+			fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+		}
 	}
 
 }
\ No newline at end of file

From 0637e95d83c8eb252a5cf402514a5feaae95beb6 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 24 May 2021 18:44:09 +0200
Subject: [PATCH 090/207] Fix Ongoing Notification text format bug

---
 .../ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index b0c2f54d3..1b86a19c5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -132,7 +132,7 @@ public void startOngoingNotification(long startTime, VenueInfo venueInfo) {
 				.setSmallIcon(R.drawable.ic_notification)
 				.setContentTitle(context.getString(R.string.ongoing_notification_title)
 						.replace("{TIME}", StringUtil.getHourMinuteTimeString(startTime, ":")))
-				.setContentText(venueInfo.getTitle() + "\n" + VenueInfoExtensionsKt.getSubtitle(venueInfo))
+				.setContentText(venueInfo.getTitle())
 				.setPriority(NotificationCompat.PRIORITY_LOW)
 				.setOngoing(true)
 				.addAction(R.drawable.ic_close,

From 2d1d564e79c67c8114aacf268a4c86aeac9fe0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 24 May 2021 14:51:33 +0200
Subject: [PATCH 091/207] updated translations

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  7 +++--
 .../whattodo/WtdPositiveTestFragment.java     |  7 -----
 .../main/res/layout/card_enter_covidcode.xml  |  9 +++++-
 .../layout/card_what_to_do_checkin_report.xml |  2 +-
 .../layout/card_what_to_do_save_yourself.xml  | 28 ------------------
 app/src/main/res/layout/fragment_check_in.xml |  2 +-
 .../res/layout/fragment_generate_qr_code.xml  | 12 ++++----
 .../res/layout/fragment_what_to_do_test.xml   | 28 ------------------
 .../main/res/layout/item_events_footer.xml    | 29 -------------------
 .../main/res/layout/layout_splashboarding.xml |  1 +
 10 files changed, 23 insertions(+), 102 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 3d311989e..f539c0417 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -443,12 +443,14 @@ private void setupCheckinCardNonIsolationMode() {
 
 	private void setupCovidCodeCard() {
 		Button covidCodeButton = covidCodeCard.findViewById(R.id.enter_covidcode_button);
+		TextView covidCodeTitle = covidCodeCard.findViewById(R.id.enter_covidcode_title);
 		TextView covidCodeText = covidCodeCard.findViewById(R.id.enter_covidcode_text);
 
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
 			if (tracingStatusInterface.isReportedAsInfected()) {
 				covidCodeButton.setText(R.string.delete_infection_button);
-				covidCodeText.setText(R.string.home_end_isolation_card_title);
+				covidCodeTitle.setText(R.string.home_end_isolation_card_title);
+				covidCodeText.setText(R.string.home_end_isolation_card_text);
 				covidCodeButton.setOnClickListener(v -> {
 					AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle);
 					builder.setMessage(R.string.delete_infection_dialog)
@@ -465,7 +467,8 @@ private void setupCovidCodeCard() {
 				});
 			} else {
 				covidCodeButton.setText(R.string.inform_code_title);
-				covidCodeText.setText(R.string.home_covidcode_card_title);
+				covidCodeTitle.setText(R.string.home_covidcode_card_title);
+				covidCodeText.setText(R.string.home_covidcode_card_text);
 				covidCodeButton.setOnClickListener(v -> {
 					Intent intent = new Intent(getActivity(), InformActivity.class);
 					startActivity(intent);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java b/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java
index 101376c17..b91f77cb3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/whattodo/WtdPositiveTestFragment.java
@@ -47,13 +47,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		view.findViewById(R.id.wtd_inform_faq_button).setOnClickListener(v -> {
 			UrlUtil.openUrl(getContext(), getString(R.string.faq_button_url));
 		});
-
-		View oldCallButton = view.findViewById(R.id.wtd_inform_call_infoline_coronavirus);
-		if (oldCallButton != null) {
-			oldCallButton.setOnClickListener(v -> {
-				PhoneUtil.callInfolineCoronavirus(v.getContext());
-			});
-		}
 	}
 
 	private void fillContentFromConfigServer(View view) {
diff --git a/app/src/main/res/layout/card_enter_covidcode.xml b/app/src/main/res/layout/card_enter_covidcode.xml
index 79b210a4b..5c138548e 100644
--- a/app/src/main/res/layout/card_enter_covidcode.xml
+++ b/app/src/main/res/layout/card_enter_covidcode.xml
@@ -11,12 +11,19 @@
 		android:layout_margin="@dimen/spacing_medium_large"
 		android:orientation="vertical">
 
+		<TextView
+			android:id="@+id/enter_covidcode_title"
+			style="@style/NextStep.Text.Title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/home_covidcode_card_title" />
+
 		<TextView
 			android:id="@+id/enter_covidcode_text"
 			style="@style/NextStep.Text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/home_covidcode_card_title" />
+			android:text="@string/home_covidcode_card_text" />
 
 		<Button
 			android:id="@+id/enter_covidcode_button"
diff --git a/app/src/main/res/layout/card_what_to_do_checkin_report.xml b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
index d62e31676..69e14550b 100644
--- a/app/src/main/res/layout/card_what_to_do_checkin_report.xml
+++ b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
@@ -137,7 +137,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginStart="@dimen/spacing_medium"
-					android:text="@string/test_location_popup_title" />
+					android:text="@string/checkin_report_link" />
 			</LinearLayout>
 
 			<View
diff --git a/app/src/main/res/layout/card_what_to_do_save_yourself.xml b/app/src/main/res/layout/card_what_to_do_save_yourself.xml
index ecf624165..0f738a563 100644
--- a/app/src/main/res/layout/card_what_to_do_save_yourself.xml
+++ b/app/src/main/res/layout/card_what_to_do_save_yourself.xml
@@ -142,34 +142,6 @@
 
 		</LinearLayout>
 
-		<TextView
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/spacing_small"
-			android:layout_marginTop="@dimen/spacing_very_large"
-			android:text="@string/meldungen_nomeldungen_faq2_titel" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
-
-			<ImageView
-				android:layout_width="@dimen/icon_size"
-				android:layout_height="@dimen/icon_size"
-				android:layout_marginRight="@dimen/spacing_medium_large"
-				android:src="@drawable/ic_begegnungen"
-				android:tint="@color/blue_main" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/meldungen_nomeldungen_faq2_text" />
-
-		</LinearLayout>
-
 		<Button
 			android:id="@+id/faq_button"
 			style="@style/NextStep.Button.Outlined"
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index c96248a07..fc9da5ef6 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -119,6 +119,6 @@
 		android:layout_marginHorizontal="@dimen/spacing_larger"
 		android:layout_marginVertical="@dimen/spacing_larger"
 		android:drawableEnd="@drawable/ic_check_in"
-		android:text="@string/check_in_now_button_title" />
+		android:text="@string/checkin_button_title" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index 00b464a76..54f5d1484 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -52,15 +52,17 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_horizontal"
-				android:layout_marginVertical="@dimen/spacing_very_large"
+				android:layout_marginTop="@dimen/spacing_very_large"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
 				android:text="@string/checkins_create_qr_code" />
 
 			<TextView
-				style="@style/NextStep.Text.Bold.Dark"
-				android:layout_width="wrap_content"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="TODO"
-				android:textAllCaps="true" />
+				android:layout_marginBottom="@dimen/spacing_very_large"
+				android:text="@string/checkins_create_qr_code_subtitle"
+				android:textAlignment="center" />
 
 			<com.google.android.material.textfield.TextInputLayout
 				style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
diff --git a/app/src/main/res/layout/fragment_what_to_do_test.xml b/app/src/main/res/layout/fragment_what_to_do_test.xml
index 0dd97415e..4bf6634b4 100644
--- a/app/src/main/res/layout/fragment_what_to_do_test.xml
+++ b/app/src/main/res/layout/fragment_what_to_do_test.xml
@@ -70,34 +70,6 @@
 
 				</LinearLayout>
 
-				<LinearLayout
-					android:id="@+id/wtd_inform_call_infoline_coronavirus"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/spacing_larger"
-					android:layout_marginTop="@dimen/spacing_very_small"
-					android:background="@drawable/ripple_button"
-					android:orientation="horizontal"
-					android:paddingStart="@dimen/spacing_medium"
-					android:paddingTop="@dimen/spacing_small"
-					android:paddingEnd="@dimen/spacing_medium"
-					android:paddingBottom="@dimen/spacing_small">
-
-					<ImageView
-						android:layout_width="@dimen/icon_size"
-						android:layout_height="@dimen/icon_size"
-						android:src="@drawable/ic_launch"
-						android:tint="@color/purple_main" />
-
-					<TextView
-						style="@style/NextStep.Text.Bold.Purple"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/spacing_small"
-						android:text="@string/infoline_coronavirus_number" />
-
-				</LinearLayout>
-
 				<TextView
 					style="@style/NextStep.Text.Bold"
 					android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_events_footer.xml b/app/src/main/res/layout/item_events_footer.xml
index 77247e744..5aa4e6e20 100644
--- a/app/src/main/res/layout/item_events_footer.xml
+++ b/app/src/main/res/layout/item_events_footer.xml
@@ -63,33 +63,4 @@
 
 	</LinearLayout>
 
-	<TextView
-		style="@style/NextStep.Text.Bold"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/spacing_medium_large"
-		android:layout_marginBottom="@dimen/spacing_small"
-		android:text="TODO" />
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/spacing_large"
-		android:orientation="horizontal">
-
-		<ImageView
-			android:layout_width="@dimen/icon_size"
-			android:layout_height="@dimen/icon_size"
-			android:layout_marginEnd="@dimen/spacing_medium_large"
-			android:src="@drawable/ic_shield_checkmark"
-			android:tint="@color/blue_main" />
-
-		<TextView
-			style="@style/NextStep.Text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="TODO" />
-
-	</LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_splashboarding.xml b/app/src/main/res/layout/layout_splashboarding.xml
index 4061411d9..33ccfb797 100644
--- a/app/src/main/res/layout/layout_splashboarding.xml
+++ b/app/src/main/res/layout/layout_splashboarding.xml
@@ -57,6 +57,7 @@
 			style="@style/NextStep.Text.SplashTitle.White"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_large"
 			android:gravity="center"
 			android:text="@string/oboarding_splashscreen_title" />
 

From 1b467785ba29fc0a8a2c0ca7be2106a774754612 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 13:41:28 +0200
Subject: [PATCH 092/207] Reset gradle again

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b551d429e..29b62a76a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.2.1'
+		classpath 'com.android.tools.build:gradle:4.1.3'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
 	}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4bf1d4004..feba0ac39 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -13,4 +13,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

From 66223f927e0298d93a672908d9db0d0769568ceb Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Wed, 19 May 2021 22:00:22 +0200
Subject: [PATCH 093/207] removed checkin comment field

---
 .../checkin/checkinflow/CheckOutFragment.java   |  6 +-----
 .../checkin/diary/EditDiaryEntryFragment.java   |  6 ------
 .../bag/dp3t/checkin/models/DiaryEntry.java     | 15 ++++-----------
 .../utils/CrowdNotifierReminderHelper.java      |  2 +-
 .../res/layout/fragment_check_out_and_edit.xml  | 17 +----------------
 5 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index 38d8c3446..9ff6ca08e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -4,7 +4,6 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -41,7 +40,6 @@ public class CheckOutFragment extends Fragment {
 	private TextView subtitleTextView;
 	private View doneButton;
 	private View cancelButton;
-	private EditText commentEditText;
 	private TextView fromTime;
 	private TextView toTime;
 	private TextView dateTextView;
@@ -82,7 +80,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		subtitleTextView = view.findViewById(R.id.check_out_fragment_subtitle);
 		doneButton = view.findViewById(R.id.check_out_fragment_done_button);
 		cancelButton = view.findViewById(R.id.check_out_fragment_cancel_button);
-		commentEditText = view.findViewById(R.id.check_out_fragment_comment_edit_text);
 		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
 		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
@@ -149,9 +146,8 @@ private void showTimePicker(boolean isFromTime) {
 	private void saveEntry() {
 		long checkIn = checkInState.getCheckInTime();
 		long checkOut = checkInState.getCheckOutTime();
-		String comment = commentEditText.getText().toString();
 		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, venueInfo, getContext());
-		DiaryStorage.getInstance(getContext()).addEntry(new DiaryEntry(id, checkIn, checkOut, venueInfo, comment));
+		DiaryStorage.getInstance(getContext()).addEntry(new DiaryEntry(id, checkIn, checkOut, venueInfo));
 		viewModel.setCheckInState(null);
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
index ae6575726..a28a0a8fd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
@@ -3,7 +3,6 @@
 import android.app.TimePickerDialog;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -33,7 +32,6 @@ public class EditDiaryEntryFragment extends Fragment {
 	private TextView subtitleTextView;
 	private View doneButton;
 	private View cancelButton;
-	private EditText commentEditText;
 	private TextView fromTime;
 	private TextView toTime;
 	private TextView dateTextView;
@@ -64,7 +62,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		subtitleTextView = view.findViewById(R.id.check_out_fragment_subtitle);
 		doneButton = view.findViewById(R.id.check_out_fragment_done_button);
 		cancelButton = view.findViewById(R.id.check_out_fragment_cancel_button);
-		commentEditText = view.findViewById(R.id.check_out_fragment_comment_edit_text);
 		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
 		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
@@ -77,7 +74,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 		fromTime.setOnClickListener(v -> showTimePicker(true));
 		toTime.setOnClickListener(v -> showTimePicker(false));
-		commentEditText.setText(diaryEntry.getComment());
 
 		hideInDiaryButton.setVisibility(View.VISIBLE);
 		hideInDiaryButton.setOnClickListener(v -> hideInDiary());
@@ -128,8 +124,6 @@ private void showTimePicker(boolean isFromTime) {
 	}
 
 	private void saveEntry() {
-		String comment = commentEditText.getText().toString();
-		diaryEntry.setComment(comment);
 		CrowdNotifier.updateCheckIn(diaryEntry.getId(), diaryEntry.getArrivalTime(), diaryEntry.getDepartureTime(),
 				diaryEntry.getVenueInfo(), getContext());
 		diaryStorage.updateEntry(diaryEntry);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
index b5567bd27..c180564a2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
@@ -1,20 +1,21 @@
 package ch.admin.bag.dp3t.checkin.models;
 
+import androidx.annotation.Keep;
+
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
+@Keep
 public class DiaryEntry {
 	private long id;
 	private long arrivalTime;
 	private long departureTime;
 	private VenueInfo venueInfo;
-	private String comment;
 
-	public DiaryEntry(long id, long arrivalTime, long departureTime, VenueInfo venueInfo, String comment) {
+	public DiaryEntry(long id, long arrivalTime, long departureTime, VenueInfo venueInfo) {
 		this.id = id;
 		this.arrivalTime = arrivalTime;
 		this.departureTime = departureTime;
 		this.venueInfo = venueInfo;
-		this.comment = comment;
 	}
 
 	public long getId() {
@@ -33,10 +34,6 @@ public VenueInfo getVenueInfo() {
 		return venueInfo;
 	}
 
-	public String getComment() {
-		return comment;
-	}
-
 	public void setArrivalTime(long arrivalTime) {
 		this.arrivalTime = arrivalTime;
 	}
@@ -45,8 +42,4 @@ public void setDepartureTime(long departureTime) {
 		this.departureTime = departureTime;
 	}
 
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
index 3d1fe54ff..b5e5cf3b6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
@@ -121,7 +121,7 @@ public static boolean autoCheckoutIfNecessary(Context context, CheckInState chec
 		long checkIn = checkInState.getCheckInTime();
 		long checkOut = checkIn + autoCheckoutDelay;
 		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, checkInState.getVenueInfo(), context);
-		DiaryStorage.getInstance(context).addEntry(new DiaryEntry(id, checkIn, checkOut, checkInState.getVenueInfo(), ""));
+		DiaryStorage.getInstance(context).addEntry(new DiaryEntry(id, checkIn, checkOut, checkInState.getVenueInfo()));
 		SecureStorage storage = SecureStorage.getInstance(context);
 		storage.setCheckInState(null);
 		LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(ACTION_DID_AUTO_CHECKOUT));
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index c6b61575a..008e75622 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -144,24 +144,9 @@
 
 			</LinearLayout>
 
-			<TextView
-				style="@style/CrowdNotifier.Text.Status.Small"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_medium"
-				android:text="@string/edit_mode_addcomment" />
-
-			<EditText
-				android:id="@+id/check_out_fragment_comment_edit_text"
-				style="@style/CrowdNotifier.EditText"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_small"
-				android:hint="@string/edit_mode_comment_placeholder" />
-
 			<Button
 				android:id="@+id/edit_diary_entry_hide_from_diary_button"
-				style="@style/CrowdNotifier.Button"
+				style="@style/NextStep.Button.Blue"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"

From 31dc5199dc4b0c08c094416c3f21c8860fae3691 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Thu, 20 May 2021 20:43:16 +0200
Subject: [PATCH 094/207] checkout screen design

---
 .../checkin/checkinflow/CheckOutFragment.java | 27 ++++++------
 .../checkin/diary/EditDiaryEntryFragment.java | 11 ++---
 .../layout/fragment_check_out_and_edit.xml    | 41 +++++++------------
 3 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
index 9ff6ca08e..c41733181 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
@@ -43,7 +43,7 @@ public class CheckOutFragment extends Fragment {
 	private TextView fromTime;
 	private TextView toTime;
 	private TextView dateTextView;
-	private Button hideInDiaryButton;
+	private Button actionButton;
 
 	public CheckOutFragment() { super(R.layout.fragment_check_out_and_edit); }
 
@@ -83,7 +83,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
 		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
-		hideInDiaryButton = view.findViewById(R.id.edit_diary_entry_hide_from_diary_button);
+		actionButton = view.findViewById(R.id.check_out_fragment_primary_button);
 
 		titleTextView.setText(venueInfo.getTitle());
 		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
@@ -94,17 +94,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime.setOnClickListener(v -> showTimePicker(true));
 		toTime.setOnClickListener(v -> showTimePicker(false));
 
-		hideInDiaryButton.setVisibility(View.GONE);
-
-		doneButton.setOnClickListener(v -> {
-			CrowdNotifierReminderHelper.removeAllReminders(getContext());
-			saveEntry();
-			NotificationHelper notificationHelper = NotificationHelper.getInstance(getContext());
-			notificationHelper.stopOngoingNotification();
-			notificationHelper.removeReminderNotification();
-			popBackToHomeFragment();
-		});
+		doneButton.setOnClickListener(v -> performCheckout());
 		cancelButton.setOnClickListener(v -> requireActivity().getSupportFragmentManager().popBackStack());
+
+		actionButton.setText(R.string.checkout_button_title);
+		actionButton.setOnClickListener(v -> performCheckout());
 	}
 
 	private void refreshTimeTextViews() {
@@ -143,6 +137,15 @@ private void showTimePicker(boolean isFromTime) {
 		timePicker.show();
 	}
 
+	private void performCheckout() {
+		CrowdNotifierReminderHelper.removeAllReminders(getContext());
+		saveEntry();
+		NotificationHelper notificationHelper = NotificationHelper.getInstance(getContext());
+		notificationHelper.stopOngoingNotification();
+		notificationHelper.removeReminderNotification();
+		popBackToHomeFragment();
+	}
+
 	private void saveEntry() {
 		long checkIn = checkInState.getCheckInTime();
 		long checkOut = checkInState.getCheckOutTime();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
index a28a0a8fd..7ee621aa9 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
@@ -3,6 +3,7 @@
 import android.app.TimePickerDialog;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -35,7 +36,7 @@ public class EditDiaryEntryFragment extends Fragment {
 	private TextView fromTime;
 	private TextView toTime;
 	private TextView dateTextView;
-	private View hideInDiaryButton;
+	private Button actionButton;
 
 
 	public EditDiaryEntryFragment() { super(R.layout.fragment_check_out_and_edit); }
@@ -65,7 +66,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
 		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
 		dateTextView = view.findViewById(R.id.check_out_fragment_date);
-		hideInDiaryButton = view.findViewById(R.id.edit_diary_entry_hide_from_diary_button);
+		actionButton = view.findViewById(R.id.check_out_fragment_primary_button);
 
 		titleTextView.setText(diaryEntry.getVenueInfo().getTitle());
 		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(diaryEntry.getVenueInfo()));
@@ -75,9 +76,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		fromTime.setOnClickListener(v -> showTimePicker(true));
 		toTime.setOnClickListener(v -> showTimePicker(false));
 
-		hideInDiaryButton.setVisibility(View.VISIBLE);
-		hideInDiaryButton.setOnClickListener(v -> hideInDiary());
-
 		doneButton.setOnClickListener(v -> {
 			saveEntry();
 			requireActivity().getSupportFragmentManager().popBackStack();
@@ -85,6 +83,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		cancelButton.setOnClickListener(v -> {
 			requireActivity().getSupportFragmentManager().popBackStack();
 		});
+
+		actionButton.setText(R.string.remove_from_diary_button);
+		actionButton.setOnClickListener(v -> hideInDiary());
 	}
 
 	private void refreshTimeTextViews() {
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index 008e75622..866e8f399 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -11,39 +11,25 @@
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="@color/light_grey">
+		android:paddingHorizontal="@dimen/spacing_medium_large">
 
 		<TextView
 			android:id="@+id/check_out_fragment_cancel_button"
-			style="@style/CrowdNotifier.Text.Status.Primary.Small.Thin"
+			style="@style/NextStep.Button.Transparent.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
-			android:background="?selectableItemBackground"
-			android:padding="@dimen/spacing_large"
 			android:text="@string/cancel"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent" />
 
-		<TextView
-			style="@style/CrowdNotifier.Text.Status.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/checkout_button_title"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
-
 		<TextView
 			android:id="@+id/check_out_fragment_done_button"
-			style="@style/CrowdNotifier.Text.Status.Primary.Small"
+			style="@style/NextStep.Button.Transparent.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
-			android:background="?selectableItemBackground"
-			android:padding="@dimen/spacing_large"
-			android:text="@string/done_button"
+			android:text="@string/checkout_save_button_title"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintTop_toTopOf="parent" />
 
@@ -51,14 +37,14 @@
 
 	<ScrollView
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="match_parent"
+		android:fillViewport="true">
 
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			android:paddingHorizontal="@dimen/spacing_very_large"
-			android:paddingBottom="@dimen/spacing_large">
+			android:paddingHorizontal="@dimen/spacing_very_large">
 
 			<TextView
 				android:id="@+id/check_out_fragment_title"
@@ -144,16 +130,19 @@
 
 			</LinearLayout>
 
+			<Space
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				android:layout_weight="1" />
+
 			<Button
-				android:id="@+id/edit_diary_entry_hide_from_diary_button"
+				android:id="@+id/check_out_fragment_primary_button"
 				style="@style/NextStep.Button.Blue"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:layout_marginTop="@dimen/spacing_huge"
-				android:visibility="gone"
-				tools:visibility="visible"
-				android:text="@string/remove_from_diary_button" />
+				android:layout_margin="@dimen/spacing_huge"
+				tools:text="@string/remove_from_diary_button" />
 
 		</LinearLayout>
 

From 95c9c124b831fb43a49fcbd29bfbd23b02026e40 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Fri, 21 May 2021 15:57:59 +0200
Subject: [PATCH 095/207] converted checkout and edit fragment to kotlin

---
 .../checkin/checkinflow/CheckOutFragment.java | 161 ------------------
 .../checkin/checkinflow/CheckOutFragment.kt   |  91 ++++++++++
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |  15 +-
 .../checkin/diary/EditDiaryEntryFragment.java | 139 ---------------
 .../checkin/diary/EditDiaryEntryFragment.kt   |  72 ++++++++
 .../bag/dp3t/checkin/models/CheckInState.java |   2 +-
 .../layout/fragment_check_out_and_edit.xml    |  74 ++------
 7 files changed, 184 insertions(+), 370 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
deleted file mode 100644
index c41733181..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package ch.admin.bag.dp3t.checkin.checkinflow;
-
-import android.app.TimePickerDialog;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.ViewModelProvider;
-
-import java.util.Calendar;
-
-import org.crowdnotifier.android.sdk.CrowdNotifier;
-import org.crowdnotifier.android.sdk.model.VenueInfo;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
-import ch.admin.bag.dp3t.checkin.models.CheckInState;
-import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
-import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
-import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
-import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
-import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
-import ch.admin.bag.dp3t.util.StringUtil;
-
-public class CheckOutFragment extends Fragment {
-
-	public static final String TAG = CheckOutFragment.class.getCanonicalName();
-
-	private static final long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
-
-	private CrowdNotifierViewModel viewModel;
-	private VenueInfo venueInfo;
-	private CheckInState checkInState;
-
-	private TextView titleTextView;
-	private TextView subtitleTextView;
-	private View doneButton;
-	private View cancelButton;
-	private TextView fromTime;
-	private TextView toTime;
-	private TextView dateTextView;
-	private Button actionButton;
-
-	public CheckOutFragment() { super(R.layout.fragment_check_out_and_edit); }
-
-	public static CheckOutFragment newInstance() {
-		return new CheckOutFragment();
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		viewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
-		checkInState = viewModel.getCheckInState();
-		if (checkInState != null) {
-			venueInfo = checkInState.getVenueInfo();
-		}
-		checkIfAutoCheckoutHappened();
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		checkIfAutoCheckoutHappened();
-	}
-
-	private void checkIfAutoCheckoutHappened() {
-		if (viewModel.getCheckInState() == null) {
-			popBackToHomeFragment();
-		}
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		titleTextView = view.findViewById(R.id.check_out_fragment_title);
-		subtitleTextView = view.findViewById(R.id.check_out_fragment_subtitle);
-		doneButton = view.findViewById(R.id.check_out_fragment_done_button);
-		cancelButton = view.findViewById(R.id.check_out_fragment_cancel_button);
-		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
-		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
-		dateTextView = view.findViewById(R.id.check_out_fragment_date);
-		actionButton = view.findViewById(R.id.check_out_fragment_primary_button);
-
-		titleTextView.setText(venueInfo.getTitle());
-		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
-
-		checkInState.setCheckOutTime(System.currentTimeMillis());
-		refreshTimeTextViews();
-
-		fromTime.setOnClickListener(v -> showTimePicker(true));
-		toTime.setOnClickListener(v -> showTimePicker(false));
-
-		doneButton.setOnClickListener(v -> performCheckout());
-		cancelButton.setOnClickListener(v -> requireActivity().getSupportFragmentManager().popBackStack());
-
-		actionButton.setText(R.string.checkout_button_title);
-		actionButton.setOnClickListener(v -> performCheckout());
-	}
-
-	private void refreshTimeTextViews() {
-		fromTime.setText(StringUtil.getHourMinuteTimeString(checkInState.getCheckInTime(), "  :  "));
-		toTime.setText(StringUtil.getHourMinuteTimeString(checkInState.getCheckOutTime(), "  :  "));
-		dateTextView.setText(StringUtil.getCheckOutDateString(getContext(), checkInState.getCheckInTime(),
-				checkInState.getCheckOutTime()));
-	}
-
-	private void showTimePicker(boolean isFromTime) {
-		Calendar time = Calendar.getInstance();
-		if (isFromTime) {
-			time.setTimeInMillis(checkInState.getCheckInTime());
-		} else {
-			time.setTimeInMillis(checkInState.getCheckOutTime());
-		}
-		int hour = time.get(Calendar.HOUR_OF_DAY);
-		int minute = time.get(Calendar.MINUTE);
-		TimePickerDialog timePicker;
-		timePicker = new TimePickerDialog(getContext(), (picker, selectedHour, selectedMinute) -> {
-			time.set(Calendar.HOUR_OF_DAY, selectedHour);
-			time.set(Calendar.MINUTE, selectedMinute);
-			if (isFromTime) {
-				checkInState.setCheckInTime(time.getTimeInMillis());
-			} else {
-				checkInState.setCheckOutTime(time.getTimeInMillis());
-			}
-			if (checkInState.getCheckOutTime() < checkInState.getCheckInTime()) {
-				checkInState.setCheckOutTime(checkInState.getCheckOutTime() + ONE_DAY_IN_MILLIS);
-			} else if (checkInState.getCheckInTime() + ONE_DAY_IN_MILLIS < checkInState.getCheckOutTime()) {
-				checkInState.setCheckOutTime(checkInState.getCheckOutTime() - ONE_DAY_IN_MILLIS);
-			}
-			refreshTimeTextViews();
-		}, hour, minute, true);
-
-		timePicker.show();
-	}
-
-	private void performCheckout() {
-		CrowdNotifierReminderHelper.removeAllReminders(getContext());
-		saveEntry();
-		NotificationHelper notificationHelper = NotificationHelper.getInstance(getContext());
-		notificationHelper.stopOngoingNotification();
-		notificationHelper.removeReminderNotification();
-		popBackToHomeFragment();
-	}
-
-	private void saveEntry() {
-		long checkIn = checkInState.getCheckInTime();
-		long checkOut = checkInState.getCheckOutTime();
-		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, venueInfo, getContext());
-		DiaryStorage.getInstance(getContext()).addEntry(new DiaryEntry(id, checkIn, checkOut, venueInfo));
-		viewModel.setCheckInState(null);
-	}
-
-	private void popBackToHomeFragment() {
-		requireActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
new file mode 100644
index 000000000..1a802e91a
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -0,0 +1,91 @@
+package ch.admin.bag.dp3t.checkin.checkinflow
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.ViewModelProvider
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.models.CheckInState
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
+import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
+import ch.admin.bag.dp3t.extensions.getSubtitle
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+class CheckOutFragment : Fragment() {
+
+	companion object {
+		private val TAG = CheckOutFragment::class.java.canonicalName
+
+		@JvmStatic
+		fun newInstance(): CheckOutFragment {
+			return CheckOutFragment()
+		}
+	}
+
+	private lateinit var viewModel: CrowdNotifierViewModel
+
+	private lateinit var venueInfo: VenueInfo
+	private lateinit var checkInState: CheckInState
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		viewModel = ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel::class.java)
+		checkIfAutoCheckoutHappened()
+		checkInState = viewModel.checkInState ?: return
+		checkInState.checkOutTime = System.currentTimeMillis()
+		venueInfo = checkInState.venueInfo
+	}
+
+	override fun onStart() {
+		super.onStart()
+		checkIfAutoCheckoutHappened()
+	}
+
+	private fun checkIfAutoCheckoutHappened() {
+		if (viewModel.checkInState == null) {
+			popBackToHomeFragment()
+		}
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
+			checkoutTitle.text = venueInfo.title
+			checkoutSubtitle.setText(venueInfo.getSubtitle())
+
+			toolbarDoneButton.setOnClickListener { performCheckout() }
+			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+			checkoutPrimaryButton.setText(R.string.checkout_button_title)
+			checkoutPrimaryButton.setOnClickListener { performCheckout() }
+		}.root
+	}
+
+	private fun performCheckout() {
+		CrowdNotifierReminderHelper.removeAllReminders(context)
+		saveEntry()
+		val notificationHelper = NotificationHelper.getInstance(context)
+		notificationHelper.stopOngoingNotification()
+		notificationHelper.removeReminderNotification()
+		popBackToHomeFragment()
+	}
+
+	private fun saveEntry() {
+		val checkIn = checkInState.checkInTime
+		val checkOut = checkInState.checkOutTime
+		val id = CrowdNotifier.addCheckIn(checkIn, checkOut, venueInfo, context)
+		DiaryStorage.getInstance(context).addEntry(DiaryEntry(id, checkIn, checkOut, venueInfo))
+		viewModel.checkInState = null
+	}
+
+	private fun popBackToHomeFragment() {
+		requireActivity().supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 6ac630f8a..616a158e3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader
@@ -15,6 +14,7 @@ import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentCheckinDiaryBinding
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.reports.ReportsFragment
 import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.model.ExposureEvent
@@ -62,24 +62,15 @@ class DiaryFragment : Fragment() {
 		}.root
 	}
 
-
 	private fun getExposureWithId(exposures: List<ExposureEvent>, id: Long): ExposureEvent? {
 		return exposures.firstOrNull { it.id == id }
 	}
 
 	private fun onDiaryEntryClicked(diaryEntry: DiaryEntry, exposureEvent: ExposureEvent?) {
 		if (exposureEvent != null) {
-			requireActivity().supportFragmentManager.beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, ReportsFragment.newInstance())
-				.addToBackStack(ReportsFragment::class.java.canonicalName)
-				.commit()
+			showFragment(ReportsFragment.newInstance())
 		} else {
-			requireActivity().supportFragmentManager.beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, EditDiaryEntryFragment.newInstance(diaryEntry.id))
-				.addToBackStack(EditDiaryEntryFragment.TAG)
-				.commit()
+			showFragment(EditDiaryEntryFragment.newInstance(diaryEntry.id))
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
deleted file mode 100644
index 7ee621aa9..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package ch.admin.bag.dp3t.checkin.diary;
-
-import android.app.TimePickerDialog;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import java.util.Calendar;
-
-import org.crowdnotifier.android.sdk.CrowdNotifier;
-
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
-import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
-import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
-import ch.admin.bag.dp3t.util.StringUtil;
-
-public class EditDiaryEntryFragment extends Fragment {
-
-	public static final String TAG = EditDiaryEntryFragment.class.getCanonicalName();
-
-	private static final long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;
-	private static final String ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID";
-
-	private DiaryStorage diaryStorage;
-	private DiaryEntry diaryEntry;
-
-	private TextView titleTextView;
-	private TextView subtitleTextView;
-	private View doneButton;
-	private View cancelButton;
-	private TextView fromTime;
-	private TextView toTime;
-	private TextView dateTextView;
-	private Button actionButton;
-
-
-	public EditDiaryEntryFragment() { super(R.layout.fragment_check_out_and_edit); }
-
-	public static EditDiaryEntryFragment newInstance(long diaryEntryId) {
-		EditDiaryEntryFragment fragment = new EditDiaryEntryFragment();
-		Bundle args = new Bundle();
-		args.putLong(ARG_DIARY_ENTRY_ID, diaryEntryId);
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		diaryStorage = DiaryStorage.getInstance(requireContext());
-		long diaryEntryId = getArguments().getLong(ARG_DIARY_ENTRY_ID);
-		diaryEntry = diaryStorage.getDiaryEntryWithId(diaryEntryId);
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		titleTextView = view.findViewById(R.id.check_out_fragment_title);
-		subtitleTextView = view.findViewById(R.id.check_out_fragment_subtitle);
-		doneButton = view.findViewById(R.id.check_out_fragment_done_button);
-		cancelButton = view.findViewById(R.id.check_out_fragment_cancel_button);
-		fromTime = view.findViewById(R.id.check_out_fragment_from_text_view);
-		toTime = view.findViewById(R.id.check_out_fragment_to_text_view);
-		dateTextView = view.findViewById(R.id.check_out_fragment_date);
-		actionButton = view.findViewById(R.id.check_out_fragment_primary_button);
-
-		titleTextView.setText(diaryEntry.getVenueInfo().getTitle());
-		subtitleTextView.setText(VenueInfoExtensionsKt.getSubtitle(diaryEntry.getVenueInfo()));
-
-		refreshTimeTextViews();
-
-		fromTime.setOnClickListener(v -> showTimePicker(true));
-		toTime.setOnClickListener(v -> showTimePicker(false));
-
-		doneButton.setOnClickListener(v -> {
-			saveEntry();
-			requireActivity().getSupportFragmentManager().popBackStack();
-		});
-		cancelButton.setOnClickListener(v -> {
-			requireActivity().getSupportFragmentManager().popBackStack();
-		});
-
-		actionButton.setText(R.string.remove_from_diary_button);
-		actionButton.setOnClickListener(v -> hideInDiary());
-	}
-
-	private void refreshTimeTextViews() {
-		fromTime.setText(StringUtil.getHourMinuteTimeString(diaryEntry.getArrivalTime(), "  :  "));
-		toTime.setText(StringUtil.getHourMinuteTimeString(diaryEntry.getDepartureTime(), "  :  "));
-		dateTextView.setText(StringUtil.getCheckOutDateString(getContext(), diaryEntry.getArrivalTime(),
-				diaryEntry.getDepartureTime()));
-	}
-
-	private void showTimePicker(boolean isFromTime) {
-		Calendar time = Calendar.getInstance();
-		if (isFromTime) {
-			time.setTimeInMillis(diaryEntry.getArrivalTime());
-		} else {
-			time.setTimeInMillis(diaryEntry.getDepartureTime());
-		}
-		int hour = time.get(Calendar.HOUR_OF_DAY);
-		int minute = time.get(Calendar.MINUTE);
-		TimePickerDialog timePicker;
-		timePicker = new TimePickerDialog(getContext(), (picker, selectedHour, selectedMinute) -> {
-			time.set(Calendar.HOUR_OF_DAY, selectedHour);
-			time.set(Calendar.MINUTE, selectedMinute);
-			if (isFromTime) {
-				diaryEntry.setArrivalTime(time.getTimeInMillis());
-			} else {
-				diaryEntry.setDepartureTime(time.getTimeInMillis());
-			}
-			if (diaryEntry.getDepartureTime() < diaryEntry.getArrivalTime()) {
-				diaryEntry.setDepartureTime(diaryEntry.getDepartureTime() + ONE_DAY_IN_MILLIS);
-			} else if (diaryEntry.getArrivalTime() + ONE_DAY_IN_MILLIS < diaryEntry.getDepartureTime()) {
-				diaryEntry.setDepartureTime(diaryEntry.getDepartureTime() - ONE_DAY_IN_MILLIS);
-			}
-			refreshTimeTextViews();
-		}, hour, minute, true);
-
-		timePicker.show();
-	}
-
-	private void saveEntry() {
-		CrowdNotifier.updateCheckIn(diaryEntry.getId(), diaryEntry.getArrivalTime(), diaryEntry.getDepartureTime(),
-				diaryEntry.getVenueInfo(), getContext());
-		diaryStorage.updateEntry(diaryEntry);
-	}
-
-	private void hideInDiary() {
-		requireActivity().getSupportFragmentManager().beginTransaction()
-				.add(HideInDiaryDialogFragment.newInstance(diaryEntry.getId()), HideInDiaryDialogFragment.TAG)
-				.commit();
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
new file mode 100644
index 000000000..c54e51c53
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -0,0 +1,72 @@
+package ch.admin.bag.dp3t.checkin.diary
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
+import ch.admin.bag.dp3t.extensions.getSubtitle
+import org.crowdnotifier.android.sdk.CrowdNotifier
+
+class EditDiaryEntryFragment : Fragment() {
+
+	companion object {
+		private val TAG = EditDiaryEntryFragment::class.java.canonicalName
+
+		private const val ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID"
+
+		@JvmStatic
+		fun newInstance(diaryEntryId: Long): EditDiaryEntryFragment {
+			val fragment = EditDiaryEntryFragment()
+			val args = Bundle()
+			args.putLong(ARG_DIARY_ENTRY_ID, diaryEntryId)
+			fragment.arguments = args
+			return fragment
+		}
+	}
+
+	private lateinit var diaryStorage: DiaryStorage
+	private lateinit var diaryEntry: DiaryEntry
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		diaryStorage = DiaryStorage.getInstance(requireContext())
+		val diaryEntryId = requireArguments().getLong(ARG_DIARY_ENTRY_ID)
+		diaryEntry = diaryStorage.getDiaryEntryWithId(diaryEntryId)
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
+			checkoutTitle.text = diaryEntry.venueInfo.title
+			checkoutSubtitle.setText(diaryEntry.venueInfo.getSubtitle())
+
+			toolbarDoneButton.setOnClickListener { performSave() }
+			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+			checkoutPrimaryButton.setText(R.string.remove_from_diary_button)
+			checkoutPrimaryButton.setOnClickListener { hideInDiary() }
+		}.root
+	}
+
+	private fun performSave() {
+		saveEntry()
+		requireActivity().supportFragmentManager.popBackStack()
+	}
+
+	private fun saveEntry() {
+		diaryEntry.run {
+			CrowdNotifier.updateCheckIn(id, arrivalTime, departureTime, venueInfo, context)
+		}
+		diaryStorage.updateEntry(diaryEntry)
+	}
+
+	private fun hideInDiary() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.add(HideInDiaryDialogFragment.newInstance(diaryEntry.id), HideInDiaryDialogFragment.TAG)
+			.commit()
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
index bb7709af4..f1072f36d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
@@ -7,7 +7,7 @@ public class CheckInState {
 	private VenueInfo venueInfo;
 	private long checkInTime;
 	private long checkOutTime;
-	long selectedReminderDelay;
+	private long selectedReminderDelay;
 
 	public CheckInState(boolean isCheckedIn, VenueInfo venueInfo, long checkInTime, long checkOutTime,
 			long selectedReminderDelay) {
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index 866e8f399..bc833c305 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -14,7 +14,7 @@
 		android:paddingHorizontal="@dimen/spacing_medium_large">
 
 		<TextView
-			android:id="@+id/check_out_fragment_cancel_button"
+			android:id="@+id/toolbar_cancel_button"
 			style="@style/NextStep.Button.Transparent.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
 			app:layout_constraintTop_toTopOf="parent" />
 
 		<TextView
-			android:id="@+id/check_out_fragment_done_button"
+			android:id="@+id/toolbar_done_button"
 			style="@style/NextStep.Button.Transparent.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
 			android:paddingHorizontal="@dimen/spacing_very_large">
 
 			<TextView
-				android:id="@+id/check_out_fragment_title"
+				android:id="@+id/checkout_title"
 				style="@style/CrowdNotifier.Text.Title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
 				tools:text="Cyber Cafe SV" />
 
 			<TextView
-				android:id="@+id/check_out_fragment_subtitle"
+				android:id="@+id/checkout_subtitle"
 				style="@style/CrowdNotifier.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
 				tools:text="Lausanne" />
 
 			<TextView
-				android:id="@+id/check_out_fragment_date"
+				android:id="@+id/checkout_date"
 				style="@style/CrowdNotifier.Text.Subtitle"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -74,61 +74,21 @@
 				android:gravity="center"
 				tools:text="Thursday, October 22" />
 
-			<LinearLayout
+			<TextView
+				style="@style/CrowdNotifier.Text.Status.Small"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:orientation="horizontal">
-
-				<TextView
-					style="@style/CrowdNotifier.Text.Status.Small"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:text="@string/datepicker_from" />
-
-				<TextView
-					style="@style/CrowdNotifier.Text.Status.Small"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:text="@string/datepicker_to" />
-
-			</LinearLayout>
-
-			<LinearLayout
+				android:text="@string/datepicker_from" />
+
+
+
+			<TextView
+				style="@style/CrowdNotifier.Text.Status.Small"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_small"
-				android:orientation="horizontal">
-
-				<TextView
-					android:id="@+id/check_out_fragment_from_text_view"
-					style="@style/CrowdNotifier.Text.Status.Primary"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginEnd="@dimen/spacing_tiny_small"
-					android:layout_weight="1"
-					android:background="@color/light_grey"
-					android:foreground="?android:selectableItemBackground"
-					android:gravity="center"
-					android:paddingVertical="@dimen/spacing_medium"
-					tools:text="07  :  56" />
-
-				<TextView
-					android:id="@+id/check_out_fragment_to_text_view"
-					style="@style/CrowdNotifier.Text.Status.Primary"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/spacing_tiny_small"
-					android:layout_weight="1"
-					android:background="@color/light_grey"
-					android:foreground="?android:selectableItemBackground"
-					android:gravity="center"
-					android:paddingVertical="@dimen/spacing_medium"
-					tools:text="08  :  13" />
-
-			</LinearLayout>
+				android:text="@string/datepicker_to" />
+
+
 
 			<Space
 				android:layout_width="0dp"
@@ -136,7 +96,7 @@
 				android:layout_weight="1" />
 
 			<Button
-				android:id="@+id/check_out_fragment_primary_button"
+				android:id="@+id/checkout_primary_button"
 				style="@style/NextStep.Button.Blue"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"

From 632f18c15092159b9150840471b3e52a28745cb4 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 25 May 2021 13:48:05 +0200
Subject: [PATCH 096/207] hide and delete event in diary

---
 .../diary/HideInDiaryDialogFragment.java      |  21 ++-
 .../main/res/drawable/ic_visibility_off.xml   |  10 ++
 .../layout/dialog_fragment_hide_in_diary.xml  | 140 ++++++++++--------
 app/src/main/res/values-de/strings.xml        |  10 +-
 app/src/main/res/values/strings.xml           |   6 +
 app/src/main/res/values/styles.xml            |   4 +
 6 files changed, 124 insertions(+), 67 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_visibility_off.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
index 7b8a85d91..fa29f5223 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.checkin.diary;
 
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -45,21 +46,20 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
 	@Override
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		View closeButton = view.findViewById(R.id.remove_diary_entry_dialog_close_button);
-		View hideButton = view.findViewById(R.id.hide_diary_entry_dialog_hide_button);
-		TextView explanationText = view.findViewById(R.id.hide_diary_entry_dialog_text);
+		View closeButton = view.findViewById(R.id.checkin_remove_close_button);
+		View hideButton = view.findViewById(R.id.checkin_remove_hide_button);
+		TextView nukeButton = view.findViewById(R.id.checkin_remove_nuke_button);
+
+		nukeButton.setPaintFlags(nukeButton.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 
-		String locationInfo = diaryEntry.getVenueInfo().getDescription() + ", " + diaryEntry.getVenueInfo().getAddress();
-		explanationText.setText(getString(R.string.remove_diary_warning_text).replace("{LOCATION_INFO}", locationInfo));
 		closeButton.setOnClickListener(v -> dismiss());
 		hideButton.setOnClickListener(v -> hideNow());
+		nukeButton.setOnClickListener(v -> nukeNow());
 	}
 
 	@Override
 	public void onResume() {
 		getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		getDialog().getWindow().setBackgroundDrawableResource(R.drawable.dialog_background);
-
 		super.onResume();
 	}
 
@@ -69,4 +69,11 @@ private void hideNow() {
 		requireActivity().getSupportFragmentManager().popBackStack();
 	}
 
+	private void nukeNow() {
+		// TODO: use correct delete function
+		diaryStorage.removeEntry(diaryEntry.getId());
+		dismiss();
+		requireActivity().getSupportFragmentManager().popBackStack();
+	}
+
 }
diff --git a/app/src/main/res/drawable/ic_visibility_off.xml b/app/src/main/res/drawable/ic_visibility_off.xml
new file mode 100644
index 000000000..eb696841d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_visibility_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
index 4042c59d4..ab9aee7d1 100644
--- a/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
+++ b/app/src/main/res/layout/dialog_fragment_hide_in_diary.xml
@@ -1,75 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	style="@style/CrowdNotifier.Card"
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_margin="@dimen/spacing_medium"
-	android:clickable="false"
-	android:focusable="false">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-	<LinearLayout
+	<ImageView
+		android:id="@+id/checkin_remove_close_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="end"
+		android:foreground="?android:selectableItemBackground"
+		android:padding="@dimen/spacing_medium_large"
+		android:src="@drawable/ic_close"
+		android:tint="@color/blue_main" />
+
+	<TextView
+		style="@style/NextStep.Text.Title.Dark.Huge"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:layout_marginTop="@dimen/spacing_very_small"
+		android:layout_marginBottom="@dimen/spacing_medium_large"
+		android:gravity="start"
+		android:paddingHorizontal="@dimen/spacing_larger"
+		android:text="@string/remove_diary_warning_title" />
 
-		<ImageButton
-			android:id="@+id/remove_diary_entry_dialog_close_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="end"
-			android:layout_marginTop="@dimen/spacing_small"
-			android:layout_marginEnd="@dimen/spacing_small"
-			android:background="@drawable/ripple_rounded"
-			android:clickable="true"
-			android:focusable="true"
-			android:padding="@dimen/spacing_medium_large"
-			android:src="@drawable/ic_close" />
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-		<ScrollView
+		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingHorizontal="@dimen/spacing_larger"
+			android:paddingVertical="@dimen/spacing_large">
 
-			<LinearLayout
+			<TextView
+				style="@style/NextStep.Text.Bold.Blue"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:paddingHorizontal="@dimen/spacing_very_large"
-				android:paddingBottom="@dimen/spacing_huge">
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:text="@string/remove_diary_warning_hide_title" />
 
-				<TextView
-					style="@style/CrowdNotifier.Text.Title"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/remove_diary_warning_title" />
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/spacing_larger"
+				android:text="@string/remove_diary_warning_hide_text" />
 
-				<TextView
-					android:id="@+id/hide_diary_entry_dialog_text"
-					style="@style/CrowdNotifier.Text"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_large"
-					tools:text="@string/remove_diary_warning_text" />
+			<Button
+				android:id="@+id/checkin_remove_hide_button"
+				style="@style/NextStep.Button.Blue"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/spacing_huge"
+				android:drawableEnd="@drawable/ic_visibility_off"
+				android:text="@string/remove_diary_warning_hide_button" />
 
-				<TextView
-					style="@style/CrowdNotifier.Text"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_large"
-					android:text="@string/remove_diary_warning_hide_text" />
+			<TextView
+				style="@style/NextStep.Text.Bold"
+				android:layout_width="match_parent"
+				android:layout_marginBottom="@dimen/spacing_medium_large"
+				android:layout_height="wrap_content"
+				android:text="@string/remove_diary_remove_now_title" />
 
-				<Button
-					android:id="@+id/hide_diary_entry_dialog_hide_button"
-					style="@style/CrowdNotifier.Button"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center"
-					android:layout_marginTop="@dimen/spacing_very_large"
-					android:text="@string/remove_diary_remove_now_button" />
+			<TextView
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/spacing_large"
+				android:text="@string/remove_diary_remove_now_text" />
+
+			<TextView
+				android:id="@+id/checkin_remove_nuke_button"
+				style="@style/NextStep.Text.Bold"
+				android:layout_gravity="center_horizontal"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/spacing_larger"
+				android:background="?selectableItemBackground"
+				android:gravity="center"
+				android:padding="@dimen/spacing_small"
+				android:text="@string/remove_diary_remove_now_button" />
 
-			</LinearLayout>
+		</LinearLayout>
 
-		</ScrollView>
-	</LinearLayout>
+	</ScrollView>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1cc226dbb..b9db76ed5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1723,13 +1723,13 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid Check-Ins"</string>
+    <string name="pdf_headline">"SwissCovid-Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
     <string name="pdf_slogan">"Einchecken ohne Daten zu hinterlassen"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"Mit der SwissCovid App können Sie sich bei uns einfach einchecken ohne Ihre Daten zu hinterlassen. Bei einer Risikosituation werden Sie in der App schnell informiert."</string>
+    <string name="pdf_explanation">"Mit der SwissCovid App können Sie sich bei uns einfach einchecken, ohne Ihre Daten zu hinterlassen. Bei einer Risikosituation werden Sie in der App schnell informiert."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
     <string name="pdf_swisscovid_app">"SwissCovid App"</string>
@@ -1855,4 +1855,10 @@ Dieser Titel wird beim Check-in angezeigt."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link">"Was muss ich übers Testen wissen?"</string>
+    <string name="instant_app_install_action">"App installieren und einchecken"</string>
+    <string name="partial_onboarding_box_text">"Schliessen Sie die App-Konfiguration ab, um die Tracing-Funktion verwenden zu können."</string>
+    <string name="partial_onboarding_box_action">"Jetzt abschliessen"</string>
+    <string name="partial_onboarding_done_title">"Konfiguration abgeschlossen"</string>
+    <string name="partial_onboarding_done_text">"Vielen Dank, dass Sie mithelfen, die Verbreitung des Coronavirus einzudämmen."</string>
+    <string name="web_slogan">"Bei einem Ansteckungsrisiko schnell informiert."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba0b5a3f2..31b3899ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1793,4 +1793,10 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 47da8f4e6..47c8ab8ff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -134,6 +134,10 @@
 		<item name="android:textColor">@color/blue_main</item>
 	</style>
 
+	<style name="NextStep.Text.Title.Dark.Huge">
+		<item name="android:textSize">@dimen/text_size_splash_title</item>
+	</style>
+
 	<style name="NextStep.Text.Title.Dark.Mega">
 		<item name="android:textSize">@dimen/text_size_title_mega</item>
 	</style>

From 13d761e20733e20aab721f3259ede15dbdd3abbd Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Mon, 24 May 2021 23:57:51 +0200
Subject: [PATCH 097/207] highlight notifications in diary

---
 .../java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt   | 6 +++---
 app/src/main/res/layout/item_checkin_venue_visit.xml        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 616a158e3..d46ff2373 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -40,15 +40,15 @@ class DiaryFragment : Fragment() {
 			checkinDiaryRecyclerView.adapter = recyclerAdapter
 
 			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { exposures ->
-				val items: ArrayList<VenueVisitRecyclerItem> = ArrayList<VenueVisitRecyclerItem>()
-				val diaryEntries: List<DiaryEntry> = DiaryStorage.getInstance(context).entries.sortedByDescending {
+				val items = ArrayList<VenueVisitRecyclerItem>()
+				val diaryEntries = DiaryStorage.getInstance(context).entries.sortedByDescending {
 					it.arrivalTime
 				}
 				val isEmpty = diaryEntries.isEmpty()
 				checkinDiaryEmptyView.isVisible = isEmpty
 				var daysAgoString = ""
 				for (diaryEntry in diaryEntries) {
-					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.getArrivalTime(), context)
+					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.arrivalTime, context)
 					if (newDaysAgoString != daysAgoString) {
 						daysAgoString = newDaysAgoString
 						items.add(ItemVenueVisitDayHeader(daysAgoString))
diff --git a/app/src/main/res/layout/item_checkin_venue_visit.xml b/app/src/main/res/layout/item_checkin_venue_visit.xml
index 29585483b..6c1304510 100644
--- a/app/src/main/res/layout/item_checkin_venue_visit.xml
+++ b/app/src/main/res/layout/item_checkin_venue_visit.xml
@@ -5,7 +5,7 @@
 	style="@style/CrowdNotifier.Card.Small"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginVertical="@dimen/spacing_tiny_small">
+	android:layout_marginVertical="@dimen/spacing_very_small">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
@@ -26,8 +26,8 @@
 			android:id="@+id/item_diary_entry_status_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@drawable/ic_info"
-			android:tint="@color/red_main"
+			android:src="@drawable/ic_warning_round"
+			android:tint="@color/blue_main"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintTop_toTopOf="parent" />
 

From 248f6b1e0bffea726520350f99ae8c485eaf2e0f Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 25 May 2021 00:01:52 +0200
Subject: [PATCH 098/207] fixed 'x days ago' logic

---
 .../java/ch/admin/bag/dp3t/util/StringUtil.java   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
index 89d2946c5..95c0cf8d6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
@@ -121,17 +121,14 @@ public static String getCheckOutDateString(Context context, long checkInTime, lo
 	}
 
 	public static String getDaysAgoString(long timeStamp, Context context) {
-		final long diff = DateUtils.getDaysDiff(timeStamp);
-		if (diff < 0) {
+		final long daysAgo = DateUtils.getDaysDiff(timeStamp);
+		if (daysAgo <= 0) {
 			return context.getResources().getString(R.string.date_today);
+		} else if (daysAgo == 1) {
+			return context.getResources().getString(R.string.date_one_day_ago);
 		} else {
-			long daysAgo = TimeUnit.MILLISECONDS.toDays(diff) + 1;
-			if (daysAgo == 1) {
-				return context.getResources().getString(R.string.date_one_day_ago);
-			} else {
-				return context.getResources().getString(R.string.date_days_ago)
-						.replace("{COUNT}", String.valueOf(daysAgo));
-			}
+			return context.getResources().getString(R.string.date_days_ago)
+					.replace("{COUNT}", String.valueOf(daysAgo));
 		}
 	}
 

From e66c96bfd28b93f429ec64557a00ce7441675007 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 25 May 2021 14:51:42 +0200
Subject: [PATCH 099/207] delete checkin for good

---
 app/build.gradle                                              | 3 +--
 .../bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java     | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c3302c1b5..e224a8ca4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,8 +207,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-9'
-
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-10'
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
index fa29f5223..0c2b2f15c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/HideInDiaryDialogFragment.java
@@ -10,6 +10,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
+import org.crowdnotifier.android.sdk.CrowdNotifier;
+
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
@@ -70,8 +72,8 @@ private void hideNow() {
 	}
 
 	private void nukeNow() {
-		// TODO: use correct delete function
 		diaryStorage.removeEntry(diaryEntry.getId());
+		CrowdNotifier.deleteCheckIn(diaryEntry.getId(), requireContext());
 		dismiss();
 		requireActivity().getSupportFragmentManager().popBackStack();
 	}

From b285aba16f226e82412728723e80c0637ef40e5e Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 15:29:47 +0200
Subject: [PATCH 100/207] Update Report Screen UI

---
 .../admin/bag/dp3t/reports/ReportsFragment.kt |  62 +------
 .../layout/card_what_to_do_checkin_report.xml |  97 ++--------
 .../res/layout/card_what_to_do_leitfaden.xml  | 172 +-----------------
 .../main/res/layout/view_report_details.xml   | 127 +++++++++++++
 app/src/main/res/values-bs/strings.xml        |  14 +-
 app/src/main/res/values-de/strings.xml        |  70 ++++---
 app/src/main/res/values-es/strings.xml        |  14 +-
 app/src/main/res/values-fr/strings.xml        |  14 +-
 app/src/main/res/values-hr/strings.xml        |  14 +-
 app/src/main/res/values-it/strings.xml        |  14 +-
 app/src/main/res/values-pt/strings.xml        |  14 +-
 app/src/main/res/values-rm/strings.xml        |  14 +-
 app/src/main/res/values-sq/strings.xml        |  14 +-
 app/src/main/res/values-sr/strings.xml        |  14 +-
 app/src/main/res/values-ti/strings.xml        |  12 +-
 app/src/main/res/values-tr/strings.xml        |  14 +-
 app/src/main/res/values/strings.xml           |  14 +-
 17 files changed, 261 insertions(+), 433 deletions(-)
 create mode 100644 app/src/main/res/layout/view_report_details.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 0e22730d5..1b5fbdffa 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -45,16 +45,13 @@ import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.*
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import ch.admin.bag.dp3t.whattodo.WhereToTestDialogFragment
-import org.dpppt.android.sdk.models.DayDate
 import java.util.*
 import kotlin.math.min
 
-private const val DAYS_TO_STAY_IN_QUARANTINE = 10
-private const val MAX_EXPOSURE_AGE_TO_DO_A_TEST = 10
-private const val MIN_EXPOSURE_AGE_TO_DO_A_TEST = 5
-private const val ONE_DAY_IN_MILLIS = 24L * 60 * 60 * 1000
 private const val ARG_CHECK_IN_ID = "ARG_CHECK_IN_ID"
 private const val ARG_SHOW_TRACING_REPORT_DETAILS = "ARG_SHOW_TRACING_REPORT_DETAILS"
+private const val TESTING_EXTERNAL_LINK =
+	"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"
 
 
 class ReportsFragment : Fragment() {
@@ -203,13 +200,12 @@ class ReportsFragment : Fragment() {
 			}
 			State.POSSIBLE_INFECTION_TRACING_REPORTS -> {
 				binding.reportsLeitfaden.apply {
-					itemCallHotlineLayout.setOnClickListener { callHotline() }
+					reportFurtherInformation.itemCallHotlineLayout.setOnClickListener { callHotline() }
+					reportFurtherInformation.testsExternalLink.setOnClickListener { showTestInformation() }
 					faqButton.setOnClickListener { showFaq() }
 					val isOpenLeitfadenPending = secureStorage.isOpenLeitfadenPending
 					fillLeitfadenNowButton.isVisible = isOpenLeitfadenPending
 					zumLeitfadenButton.isVisible = !isOpenLeitfadenPending
-					xDaysLeftTextview.isVisible = !isOpenLeitfadenPending
-					setupFreeTestInfoBox(tracingStatusInterface)
 					if (isOpenLeitfadenPending) {
 						fillLeitfadenNowButton.setOnClickListener { openSwissCovidLeitfaden() }
 						leitfadenInfoButton.setOnClickListener { showLeitfadenInfo(fillLeitfadenNowButton.text.toString()) }
@@ -217,15 +213,6 @@ class ReportsFragment : Fragment() {
 						zumLeitfadenButton.setOnClickListener { openSwissCovidLeitfaden() }
 						leitfadenInfoButton.setOnClickListener { showLeitfadenInfo(zumLeitfadenButton.text.toString()) }
 					}
-
-					val daysLeft = DAYS_TO_STAY_IN_QUARANTINE - tracingStatusInterface.daysSinceExposure.toInt()
-					if (daysLeft > DAYS_TO_STAY_IN_QUARANTINE || daysLeft <= 0) {
-						xDaysLeftTextview.isVisible = false
-					} else if (daysLeft == 1) {
-						xDaysLeftTextview.setText(R.string.date_in_one_day)
-					} else {
-						xDaysLeftTextview.text = getString(R.string.date_in_days).replace("{COUNT}", daysLeft.toString())
-					}
 					deleteReports.setOnClickListener { deleteNotifications(tracingStatusInterface) }
 				}
 			}
@@ -256,7 +243,8 @@ class ReportsFragment : Fragment() {
 
 					}
 					faqButton.setOnClickListener { showFaq() }
-					testlocationsLink.setOnClickListener { showWhereToTestDialog() }
+					reportFurtherInformation.testsExternalLink.setOnClickListener { showTestInformation() }
+					reportFurtherInformation.phoneSection.isVisible = false
 				}
 			}
 		}
@@ -295,40 +283,6 @@ class ReportsFragment : Fragment() {
 			.show()
 	}
 
-	private fun setupFreeTestInfoBox(tracingStatusInterface: TracingStatusInterface) {
-		binding.reportsLeitfaden.viewFreeTestInfoBox.apply {
-			testlocationsLink.setOnClickListener { showWhereToTestDialog() }
-			val today = DayDate()
-			if (tracingStatusInterface.exposureDays.filter {
-					it.exposedDate.addDays(MIN_EXPOSURE_AGE_TO_DO_A_TEST).isBeforeOrEquals(today)
-				}.find {
-					!it.exposedDate.addDays(MAX_EXPOSURE_AGE_TO_DO_A_TEST).isBefore(today)
-				} != null) {
-				testCountdownTextview.setText(R.string.meldungen_detail_free_test_now)
-				return
-			}
-
-			// This oldest exposure that is newer than MIN_EXPOSURE_AGE_TO_DO_A_TEST
-			val oldestExposure = tracingStatusInterface.exposureDays.filter {
-				!it.exposedDate.addDays(MIN_EXPOSURE_AGE_TO_DO_A_TEST).isBeforeOrEquals(today)
-			}.minOf { it.exposedDate }
-
-			testCountdownTextview.isVisible = oldestExposure != null
-
-			if (oldestExposure != null) {
-				val daysSinceFirstExposure =
-					((today.startOfDayTimestamp - oldestExposure.startOfDayTimestamp) / ONE_DAY_IN_MILLIS).toInt()
-				val daysUntilTest = MIN_EXPOSURE_AGE_TO_DO_A_TEST - daysSinceFirstExposure
-				if (daysUntilTest == 1) {
-					testCountdownTextview.setText(R.string.meldungen_detail_free_test_tomorrow)
-				} else {
-					testCountdownTextview.text = getString(R.string.meldungen_detail_free_test_in_x_tagen)
-						.replace("{COUNT}", daysUntilTest.toString())
-				}
-			}
-		}
-	}
-
 	private fun showWhereToTestDialog() {
 		requireActivity().supportFragmentManager.beginTransaction()
 			.add(WhereToTestDialogFragment.newInstance(), WhereToTestDialogFragment::class.java.canonicalName)
@@ -365,6 +319,10 @@ class ReportsFragment : Fragment() {
 		).commit()
 	}
 
+	private fun showTestInformation() {
+		UrlUtil.openUrl(context, TESTING_EXTERNAL_LINK)
+	}
+
 	private fun callHotline() {
 		PhoneUtil.callHelpline(context)
 	}
diff --git a/app/src/main/res/layout/card_what_to_do_checkin_report.xml b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
index 69e14550b..ce890d778 100644
--- a/app/src/main/res/layout/card_what_to_do_checkin_report.xml
+++ b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
@@ -20,7 +20,7 @@
 				style="@style/NextStep.Text.Bold.Blue"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
 				android:layout_marginTop="@dimen/spacing_large"
 				android:text="@string/meldung_detail_exposed_list_card_subtitle" />
 
@@ -28,7 +28,7 @@
 				style="@style/NextStep.Text.Title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
 				android:layout_marginTop="@dimen/spacing_very_small"
 				android:text="@string/meldung_detail_exposed_list_card_title_checkin" />
 
@@ -37,7 +37,7 @@
 				style="@style/NextStep.Text.Bold"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
 				android:lineSpacingExtra="@dimen/spacing_very_small"
 				tools:text="20.10.2020 / vor 2 Tagen \n22.10.2020 / vor 4 Tagen" />
 
@@ -46,7 +46,7 @@
 				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
 				android:layout_marginTop="@dimen/spacing_very_small"
 				tools:text="Reuss Ubique" />
 
@@ -60,90 +60,19 @@
 				style="@style/NextStep.Text.Bold.Blue"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginHorizontal="@dimen/spacing_larger"
 				android:layout_marginTop="@dimen/spacing_large"
+				android:layout_marginBottom="@dimen/spacing_small"
 				android:text="@string/checkin_report_heading" />
 
-			<TextView
-				style="@style/NextStep.Text.Title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:text="@string/checkin_report_title1" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_very_small"
-				android:text="@string/checkin_report_subtitle1" />
-
-			<TextView
-				style="@style/NextStep.Text.Title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:text="@string/checkin_report_title2" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_very_small"
-				android:text="@string/checkin_report_subtitle2" />
-
-			<TextView
-				style="@style/NextStep.Text.Title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:text="@string/checkin_report_title3" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_large"
-				android:layout_marginTop="@dimen/spacing_very_small"
-				android:text="@string/checkin_report_subtitle3" />
-
-			<LinearLayout
-				android:id="@+id/testlocations_link"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginHorizontal="@dimen/spacing_medium_large"
-				android:layout_marginTop="@dimen/spacing_medium"
-				android:background="?selectableItemBackground"
-				android:orientation="horizontal"
-				android:padding="@dimen/spacing_small"
-				app:layout_constrainedWidth="true"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintHorizontal_bias="0"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/info_box_container_layout">
-
-				<ImageView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/ic_link_internal" />
-
-				<TextView
-					style="@style/NextStep.Text.Bold.Blue"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/spacing_medium"
-					android:text="@string/checkin_report_link" />
-			</LinearLayout>
+			<include
+				android:id="@+id/report_further_information"
+				layout="@layout/view_report_details" />
 
 			<View
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
-				android:layout_marginTop="@dimen/spacing_larger"
+				android:layout_marginTop="@dimen/spacing_large"
 				android:background="@color/grey_light" />
 
 			<TextView
@@ -157,11 +86,7 @@
 				android:paddingBottom="10dp"
 				android:text="@string/delete_reports_button"
 				android:textAllCaps="true"
-				android:textColor="@color/blue_main"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/card_encounters_image" />
+				android:textColor="@color/blue_main" />
 
 		</LinearLayout>
 
diff --git a/app/src/main/res/layout/card_what_to_do_leitfaden.xml b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
index 8c71e9e11..2819461fa 100644
--- a/app/src/main/res/layout/card_what_to_do_leitfaden.xml
+++ b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
@@ -9,7 +9,6 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
@@ -32,8 +31,7 @@
 				android:clipToPadding="false"
 				android:foreground="?selectableItemBackground"
 				android:orientation="vertical"
-				android:paddingLeft="@dimen/spacing_larger"
-				android:paddingRight="@dimen/spacing_larger">
+				android:paddingHorizontal="@dimen/spacing_larger">
 
 				<TextView
 					android:id="@+id/card_encounters_subtitle"
@@ -141,175 +139,19 @@
 					app:layout_constraintEnd_toEndOf="parent"
 					app:layout_constraintTop_toTopOf="@id/card_encounters_button_container" />
 
-				<TextView
-					android:id="@+id/card_encounters_last_call"
-					style="@style/NextStep.Text"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_small"
-					android:textColor="@color/grey_dark"
-					android:textSize="@dimen/text_size_small"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_button_container"
-					tools:text="@string/meldungen_detail_call_last_call" />
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_large"
-					android:clipChildren="false"
-					android:clipToPadding="false"
-					android:orientation="vertical"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_last_call">
-
-					<include
-						android:id="@+id/view_free_test_info_box"
-						layout="@layout/view_free_test_info_box"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginStart="-15dp"
-						android:layout_marginEnd="-15dp"
-						android:layout_marginBottom="@dimen/spacing_medium_large" />
-
-					<TextView
-						style="@style/NextStep.Text.Bold"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:text="@string/meldungen_detail_explanation_title" />
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:orientation="horizontal">
-
-						<include layout="@layout/view_text_bullet" />
-
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/meldungen_detail_explanation_text1" />
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:orientation="horizontal">
-
-						<include layout="@layout/view_text_bullet" />
-
-						<LinearLayout
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:orientation="vertical">
-
-							<TextView
-								style="@style/NextStep.Text"
-								android:layout_width="match_parent"
-								android:layout_height="wrap_content"
-								android:text="@string/meldungen_detail_explanation_text2" />
-
-							<TextView
-								android:id="@+id/x_days_left_textview"
-								style="@style/NextStep.Text.Bold"
-								android:layout_width="match_parent"
-								android:layout_height="wrap_content"
-								android:text="@string/date_in_one_day" />
-
-						</LinearLayout>
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_large"
-						android:orientation="horizontal">
-
-						<include layout="@layout/view_text_bullet" />
-
-						<TextView
-							style="@style/NextStep.Text"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:text="@string/meldungen_detail_explanation_text4" />
-
-					</LinearLayout>
-
-				</LinearLayout>
-
 			</androidx.constraintlayout.widget.ConstraintLayout>
 
-			<LinearLayout
+			<include
+				android:id="@+id/report_further_information"
+				layout="@layout/view_report_details"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:paddingLeft="@dimen/spacing_medium"
-				android:paddingTop="@dimen/spacing_larger"
-				android:paddingRight="@dimen/spacing_medium"
-				android:paddingBottom="@dimen/spacing_larger">
-
-				<ImageView
-					android:layout_width="@dimen/icon_size"
-					android:layout_height="@dimen/icon_size"
-					android:layout_marginLeft="@dimen/spacing_very_small"
-					android:layout_marginRight="@dimen/spacing_small"
-					android:src="@drawable/ic_infoline" />
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical">
-
-					<TextView
-						style="@style/NextStep.Text.Bold"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/spacing_small"
-						android:text="@string/meldungen_tel_information_title" />
-
-					<TextView
-						style="@style/NextStep.Text"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:text="@string/meldungen_tel_information_text" />
-
-					<LinearLayout
-						android:id="@+id/item_call_hotline_layout"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginTop="@dimen/spacing_very_small"
-						android:background="@drawable/ripple_button"
-						android:orientation="horizontal"
-						android:paddingTop="@dimen/spacing_small"
-						android:paddingBottom="@dimen/spacing_small">
-
-						<ImageView
-							android:layout_width="@dimen/icon_size"
-							android:layout_height="@dimen/icon_size"
-							android:src="@drawable/ic_call"
-							android:tint="@color/blue_main" />
-
-						<TextView
-							android:id="@+id/item_call_hotline_text"
-							style="@style/NextStep.Text.Bold.Blue"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginLeft="@dimen/spacing_small"
-							android:text="@string/infoline_tel_number" />
-
-					</LinearLayout>
-
-				</LinearLayout>
-
-			</LinearLayout>
+				android:layout_marginTop="@dimen/spacing_larger" />
 
 			<View
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
+				android:layout_marginTop="@dimen/spacing_large"
 				android:background="@color/grey_light" />
 
 			<TextView
@@ -317,7 +159,7 @@
 				style="@style/NextStep.Button.Transparent"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginBottom="10dp"
+				android:layout_marginVertical="10dp"
 				android:gravity="center"
 				android:paddingTop="15dp"
 				android:paddingBottom="10dp"
diff --git a/app/src/main/res/layout/view_report_details.xml b/app/src/main/res/layout/view_report_details.xml
new file mode 100644
index 000000000..6adef66a3
--- /dev/null
+++ b/app/src/main/res/layout/view_report_details.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<TextView
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
+		android:text="@string/checkin_report_title1" />
+
+	<TextView
+		style="@style/NextStep.Text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
+		android:layout_marginTop="@dimen/spacing_very_small"
+		android:text="@string/checkin_report_subtitle1" />
+
+	<TextView
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
+		android:layout_marginTop="@dimen/spacing_large"
+		android:text="@string/checkin_report_title2" />
+
+	<TextView
+		style="@style/NextStep.Text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
+		android:layout_marginTop="@dimen/spacing_very_small"
+		android:text="@string/checkin_report_subtitle2" />
+
+	<TextView
+		style="@style/NextStep.Text.Bold"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
+		android:layout_marginTop="@dimen/spacing_large"
+		android:text="@string/checkin_report_title3" />
+
+	<TextView
+		style="@style/NextStep.Text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_larger"
+		android:layout_marginTop="@dimen/spacing_very_small"
+		android:text="@string/checkin_report_subtitle3" />
+
+	<LinearLayout
+		android:id="@+id/tests_external_link"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_medium_large"
+		android:layout_marginTop="@dimen/spacing_medium"
+		android:background="@drawable/ripple_button"
+		android:orientation="horizontal"
+		android:padding="@dimen/spacing_small">
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/ic_launch_blue" />
+
+		<TextView
+			style="@style/NextStep.Text.Bold.Blue"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/spacing_medium"
+			android:text="@string/checkin_report_link" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/phone_section"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<TextView
+			style="@style/NextStep.Text.Bold"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_larger"
+			android:layout_marginTop="@dimen/spacing_large"
+			android:text="@string/meldungen_tel_information_title" />
+
+		<TextView
+			style="@style/NextStep.Text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_larger"
+			android:layout_marginTop="@dimen/spacing_very_small"
+			android:text="@string/meldungen_tel_information_text" />
+
+		<LinearLayout
+			android:id="@+id/item_call_hotline_layout"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_medium_large"
+			android:layout_marginTop="@dimen/spacing_medium"
+			android:background="@drawable/ripple_button"
+			android:orientation="horizontal"
+			android:padding="@dimen/spacing_small">
+
+			<ImageView
+				android:layout_width="@dimen/icon_size"
+				android:layout_height="@dimen/icon_size"
+				android:src="@drawable/ic_call"
+				android:tint="@color/blue_main" />
+
+			<TextView
+				android:id="@+id/item_call_hotline_text"
+				style="@style/NextStep.Text.Bold.Blue"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="@dimen/spacing_small"
+				android:text="@string/infoline_tel_number" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 41031419f..4c661df6b 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -589,14 +589,6 @@ Time se potrošnja baterije samo neznatno povećava."</string>
 
 U slučaju moguće infekcije, dobićete obaveštenje na zaključanom ekranu."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Šta je moguća infekcija?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"Aplikacija ne samo da proverava da li ste imali kontakte sa inficiranim osobama, već i koliko dugo su oni trajali i koliko bliski su bili.
-
-Bićete obavešteni samo ako postoji dovoljno velika mogućnost infekcije."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"Preko info linije aplikacije SwissCovid možete da dobijete savete o mogućnosti besplatnog testiranja."</string>
 
@@ -1770,4 +1762,10 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1cc226dbb..6ae4055ef 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -194,7 +194,7 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
     <string name="inform_detail_box_subtitle">"Mit dem Covidcode..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Infektionsketten stoppen"</string>
+    <string name="inform_detail_box_title">"Vor möglichen Ansteckungen warnen"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Covidcode eingeben"</string>
@@ -227,8 +227,8 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
     <string name="symptom_detail_navigation_title">"Symptome"</string>
     <string name="tracing_turned_off_title">"Tracing deaktiviert"</string>
     <string name="tracing_turned_off_text">"Aktivieren Sie das Tracing, damit die App funktioniert."</string>
-    <string name="bluetooth_turned_off_title">"Bluetooth Off"</string>
-    <string name="bluetooth_turned_off_text">"Schalten Sie Bluetooth auf Ihrem Mobiltelefon ein, damit das Tracing funktioniert."</string>
+    <string name="bluetooth_turned_off_title">"Bluetooth aus"</string>
+    <string name="bluetooth_turned_off_text">"Schalten Sie Bluetooth auf Ihrem Gerät ein, damit das anonyme Tracing funktioniert."</string>
     <string name="bluetooth_turn_on_button_title">"Bluetooth einschalten"</string>
     <string name="bluetooth_permission_error_title">"Bluetooth Verwendung abgelehnt"</string>
     <string name="bluetooth_permission_error_text">"Erlauben Sie die Verwendung von Bluetooth, damit das Tracing funktioniert."</string>
@@ -260,7 +260,7 @@ Damit helfen Sie mit, Infektionsketten zu stoppen."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Befolgen Sie die erhaltenen Anweisungen zur Isolation"</string>
-    <string name="tracing_ended_title">"Tracing deaktiviert"</string>
+    <string name="tracing_ended_title">"Begegnungen und Check-in deaktiviert"</string>
     <string name="tracing_ended_text">"Es werden keine Begegnungen gespeichert"</string>
     <string name="exposed_info_contact_hotline">"Kontaktieren Sie die"</string>
     <string name="meldung_homescreen_positive_info_line1">"Befolgen Sie die"</string>
@@ -597,18 +597,10 @@ Die Batterienutzung erhöht sich dadurch nur leicht."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Was sind Meldungen?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"Die App prüft regelmässig, ob andere Nutzer, denen Sie begegnet sind, einen positiven Test gemeldet haben.
+    <string name="meldungen_nomeldungen_faq1_text">"Die App prüft regelmässig, ob andere Nutzer, denen Sie begegnet sind oder die am gleichen Ort eingecheckt waren, ein positives Testergebnis gemeldet haben.
 
 Bei einer möglichen Ansteckung werden Sie mit einer Mitteilung im Sperrbildschirm informiert."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Was bedeutet mögliche Ansteckung?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"Die App prüft nicht nur, ob Begegnungen mit infizierten Personen stattfanden, sondern auch wie lange und wie nahe diese waren.
-
-Nur wenn die Möglichkeit einer Ansteckung gross genug ist, werden Sie informiert."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"Die Infoline SwissCovid berät Sie über die Möglichkeit eines kostenlosen Tests."</string>
 
@@ -647,9 +639,9 @@ Damit wird sichergestellt, dass nur bestätigte Fälle über die App gemeldet we
     <string name="inform_detail_faq2_title">"Was wird gesendet?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Es werden nur die privaten Schlüssel Ihrer App gesendet, keine persönlichen Daten.
+    <string name="inform_detail_faq2_text">"Es werden nur die privaten Schlüssel Ihrer App und die verschlüsselten IDs Ihrer Check-ins gesendet, keine persönlichen Daten.
 
-Damit erfahren andere SwissCovid App Nutzer, dass die Möglichkeit einer Ansteckung besteht."</string>
+Damit erfahren andere Nutzerinnen und Nutzer der SwissCovid-App, dass die Möglichkeit einer Ansteckung besteht."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -661,7 +653,7 @@ Damit erfahren andere SwissCovid App Nutzer, dass die Möglichkeit einer Ansteck
     <string name="inform_code_intro_title">"Information zur Eingabe"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"Obwohl keine Daten zu Ihrer Person gesendet werden, kann es sein, dass sich jemand anhand des Datums an die Begegnung erinnern kann."</string>
+    <string name="inform_code_intro_text">"Obwohl keine Daten zu Ihrer Person gesendet werden, könnte es sein, dass sich jemand anhand des Datums an die Begegnung mit Ihnen erinnern kann."</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
     <string name="inform_code_intro_button">"Einverstanden"</string>
@@ -772,7 +764,7 @@ Zudem sind folgende Symptome möglich:
     <!-- Fuzzy -->
     <string name="delete_infection_dialog">"Möchten Sie die Isolation wirklich beenden?"</string>
     <string name="android_onboarding_battery_permission_title">"Akku-Optimierung ignorieren"</string>
-    <string name="android_onboarding_battery_permission_text">"Damit die App funktioniert, muss die Akku-Optimierung für diese App ausgeschaltet sein."</string>
+    <string name="android_onboarding_battery_permission_text">"Damit die App funktioniert, muss die Akku-Optimierung ausgeschaltet sein."</string>
     <string name="android_onboarding_battery_permission_button">"Zulassen"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Nur für diese App"</string>
@@ -796,7 +788,7 @@ Zudem sind folgende Symptome möglich:
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
     <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Aktivieren Sie {TRACING_SETTING_TEXT}, damit das Tracing funktioniert."</string>
+    <string name="tracing_permission_error_text_ios">"Aktivieren Sie {TRACING_SETTING_TEXT}, damit das anonyme Tracing funktioniert."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Die Meldung konnte nicht gesendet werden. Bitte erlauben Sie das Teilen Ihrer zufälligen IDs mit der SwissCovid App."</string>
@@ -842,7 +834,7 @@ Falls auf Ihrem Mobiltelefon zurzeit kein Update verfügbar ist, versuchen Sie e
     <!-- title in splash screen of onboarding -->
     <string name="oboarding_splashscreen_title">"SwissCovid –
 bei einem Ansteckungsrisiko schnell informiert."</string>
-    <string name="inform_detail_faq3_text">"Obwohl keine Daten zu Ihrer Person gesendet werden, kann es sein, dass sich jemand anhand des Datums an die Begegnung erinnern kann."</string>
+    <string name="inform_detail_faq3_text">"Ja, aber obwohl keine Daten zu Ihrer Person gesendet werden, könnte es sein, dass sich jemand anhand des Datums an die Begegnung mit Ihnen erinnern kann."</string>
     <string name="inform_detail_faq3_title">"Bleibe ich anonym?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -946,7 +938,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Reisen"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid funktioniert in den folgenden Ländern:"</string>
+    <string name="travel_home_description">"SwissCovid-Begegnungen funktioniert in den folgenden Ländern:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <!-- Fuzzy -->
@@ -1297,9 +1289,9 @@ Damit auch Reisende aus dem Ausland gewarnt werden können, geschieht das unabh
     <string name="delete_infection_dialog_finish_button">"Beenden"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Es werden keine neuen Begegnungen mehr gespeichert und neue Check-ins sind derzeit nicht möglich.
+    <string name="tracing_ended_info">"Es werden keine neuen Begegnungen mehr gespeichert und neue Check-ins sind auch nicht mehr möglich.
 
-Beide Funktionen können nach der Isolation wieder aktiviert werden."</string>
+Beide Funktionen können wieder aktiviert werden, nachdem die Isolation beendet wurde."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1332,7 +1324,7 @@ Beide Funktionen können nach der Isolation wieder aktiviert werden."</string>
 
     <!-- text for info box pop up for the hearing impaired -->
     <!-- Fuzzy -->
-    <string name="hearing_impaired_info">"Sind Sie gehörlos oder hörbehindert und können die Infoline Coronavirus nicht anrufen?
+    <string name="hearing_impaired_info">"Sind Sie gehörlos oder hörbehindert und können nicht anrufen?
 
 Dann senden Sie eine E-Mail an covid-support@medgate.ch"</string>
 
@@ -1388,7 +1380,7 @@ Die Zeit ist bei der Bekämpfung des Coronavirus ein entscheidender Faktor: je k
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"Sie wurden positiv getestet (PCR-Test oder Antigen-Schnelltest) und haben nach 4h noch keinen Covidcode erhalten?
-Dann kontaktieren Sie die Infoline Coronavirus:"</string>
+Dann rufen Sie hier an:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Noch keinen Covidcode?"</string>
@@ -1413,7 +1405,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="travel_screen_compatible_countries">"Kompatible Länder:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Damit auch Reisende aus dem Ausland gewarnt werden können, werden die privaten Schlüssel mit den Corona-Apps der kompatiblen Länder geteilt."</string>
+    <string name="inform_code_travel_text">"Damit auch Reisende aus dem Ausland nach einer Begegnung gewarnt werden können, werden die privaten Schlüssel mit den Corona-Apps der kompatiblen Länder geteilt."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Total"</string>
@@ -1428,13 +1420,13 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Wer wird benachrichtigt?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Es werden alle Kontakte im Zeitraum Ihrer Ansteckungsphase vom {ONSET_DATE} bis zur Eingabe des Covidcodes benachrichtigt, wenn auf Grund der Distanz und der Dauer die Möglichkeit einer Ansteckung bestand. "</string>
+    <string name="meldungen_positive_tested_faq2_text">"Es werden alle Kontakte im Zeitraum Ihrer Ansteckungsphase vom {ONSET_DATE} bis zur Eingabe des Covidcodes benachrichtigt, wenn das Risiko einer Ansteckung bestand – auf Grund der Distanz und Dauer oder wenn Sie am gleichen Ort eingecheckt waren."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – heute"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Auf diese Weise helfen Sie, Infektionsketten zu durchbrechen."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Auf diese Weise helfen Sie, andere vor einer möglichen Ansteckung zu warnen."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Die privaten Schlüssel Ihrer App wurden für den folgenden Zeitraum gesendet:"</string>
@@ -1600,9 +1592,9 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="qr_scanner_error_code_not_yet_valid">"QR-Code noch nicht gültig"</string>
     <string name="qr_scanner_error_code_not_valid_anymore">"QR-Code nicht mehr gültig"</string>
     <string name="error_already_checked_in">"Sie sind bereits eingecheckt."</string>
-    <string name="error_update_text">"Dieser QR Code ist nicht kompatibel mit der installierten App Version. Führen Sie ein Update der App durch, um den QR Code zu scannen."</string>
-    <string name="error_update_title">"Update benötigt"</string>
-    <string name="error_action_update">"Jetzt updaten"</string>
+    <string name="error_update_text">"Dieser QR-Code ist nicht mit der installierten App-Version kompatibel. Bitte aktualisieren Sie die App, um fortzufahren."</string>
+    <string name="error_update_title">"Update erforderlich"</string>
+    <string name="error_action_update">"Jetzt aktualisieren"</string>
     <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
     <string name="android_ongoing_checkin_notification_channel_name">"Permanente Checkin Meldung"</string>
@@ -1656,7 +1648,7 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="inform_share_checkins_subtitle">"Wenn Sie Ihre Check-in-Einträge teilen, kann die App Personen benachrichtigen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Alle wählen"</string>
+    <string name="inform_share_checkins_select_all">"Alle auswählen"</string>
     <string name="inform_dont_send_button_title">"Nicht senden"</string>
     <string name="inform_try_again_button_title">"Erneut versuchen"</string>
     <string name="inform_dont_share_button_title">"Nicht teilen"</string>
@@ -1723,13 +1715,13 @@ Dann kontaktieren Sie die Infoline Coronavirus:"</string>
     <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid Check-Ins"</string>
+    <string name="pdf_headline">"SwissCovid-Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
     <string name="pdf_slogan">"Einchecken ohne Daten zu hinterlassen"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"Mit der SwissCovid App können Sie sich bei uns einfach einchecken ohne Ihre Daten zu hinterlassen. Bei einer Risikosituation werden Sie in der App schnell informiert."</string>
+    <string name="pdf_explanation">"Mit der SwissCovid App können Sie sich bei uns einfach einchecken, ohne Ihre Daten zu hinterlassen. Bei einer Risikosituation werden Sie in der App schnell informiert."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
     <string name="pdf_swisscovid_app">"SwissCovid App"</string>
@@ -1754,7 +1746,7 @@ zu hinterlassen"</string>
     <string name="checkin_footer_title1">"Warum eine Check-in-Funktion?"</string>
 
     <!-- Fuzzy -->
-    <string name="checkin_footer_subtitle1">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand."</string>
+    <string name="checkin_footer_subtitle1">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Mit dieser Funktion können Sie im Falle eines positiven Tests nicht nur enge Kontakte, sondern auch Personen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben, warnen."</string>
 
     <!-- Fuzzy -->
     <string name="checkin_footer_title2">"Keine zentrale Datenspeicherung"</string>
@@ -1773,7 +1765,7 @@ Mögliche Einsatzorte:
 – Private Anlässe
 – Vereinsanlässe
 – Zusammenkünfte im professionellen Umfeld wie z.B. Sitzungszimmer, Büroräume, Kantinen, etc."</string>
-    <string name="events_footer_subtitle2">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Sie berücksichtigt nicht nur enge Kontakte, sondern auch solche, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben – unabhängig vom Abstand. "</string>
+    <string name="events_footer_subtitle2">"Die Check-in-Funktion ohne Erfassung der Kontaktdaten erweitert die SwissCovid App. Mit dieser Funktion können Sie im Falle eines positiven Tests nicht nur enge Kontakte, sondern auch Personen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben, warnen."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle">"Risikosituation"</string>
@@ -1836,7 +1828,7 @@ Dieser Titel wird beim Check-in angezeigt."</string>
     <string name="onboarding_checkin_heading">"Check-ins"</string>
     <string name="onboarding_checkin_text1">"Mit SwissCovid-Check-ins können Sie sich mit der App an einem Ort oder bei einem Treffen einchecken."</string>
     <string name="onboarding_checkin_text2">"Ihre Anwesenheit wird nur in der App gespeichert. Sie müssen keine persönlichen Daten in der App hinterlassen."</string>
-    <string name="checkin_updateboarding_text">"Mit SwissCovid-Check-ins können Sie sich mit der App vor Ort einchecken. Ihre Anwesenheit wird nur in der App gespeichert. Sie müssen keine persönlichen Daten in der App hinterlassen. Dazu wurden die Nutzungsbedingungen und Datenschutzerklärung aktualisiert."</string>
+    <string name="checkin_updateboarding_text">"Mit SwissCovid-Check-ins können Sie sich mit der App an einem Ort oder bei einem Treffen einchecken. Ihre Anwesenheit wird nur in der App gespeichert. Sie müssen keine persönlichen Daten in der App hinterlassen. Dazu wurden die Nutzungsbedingungen und Datenschutzerklärung aktualisiert."</string>
     <string name="onboarding_gaen_button_dont_activate">"Überspringen"</string>
 
     <!-- Hide from diary warning text -->
@@ -1855,4 +1847,10 @@ Dieser Titel wird beim Check-in angezeigt."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link">"Was muss ich übers Testen wissen?"</string>
+    <string name="instant_app_install_action">"App installieren und einchecken"</string>
+    <string name="partial_onboarding_box_text">"Schliessen Sie die App-Konfiguration ab, um die Tracing-Funktion verwenden zu können."</string>
+    <string name="partial_onboarding_box_action">"Jetzt abschliessen"</string>
+    <string name="partial_onboarding_done_title">"Konfiguration abgeschlossen"</string>
+    <string name="partial_onboarding_done_text">"Vielen Dank, dass Sie mithelfen, die Verbreitung des Coronavirus einzudämmen."</string>
+    <string name="web_slogan">"Bei einem Ansteckungsrisiko schnell informiert."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0bfb0c2a4..3bddafd99 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -582,14 +582,6 @@ Siga las instrucciones de aislamiento recibidas."</string>
 
 En caso de un posible contacto, será informado con un mensaje en la pantalla de bloqueo."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"¿Qué es un posible contagio?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"La aplicación no solo detecta si ha habido contacto con una persona contagiada, sino también a qué distancia y durante cuánto tiempo. 
-
-La aplicación le informará solo si la posibilidad de un contagio es  lo suficientemente grande."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"La Infoline SwissCovid le asesora sobre la posibilidad de realizar un test gratuito."</string>
 
@@ -1761,4 +1753,10 @@ Contacte con la Infoline del coronavirus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4b57fddd2..0f5c72a0b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -587,14 +587,6 @@ Ces identifiants sont enregistrés localement dans les appareils et effacés apr
 
 En cas de possible infection, vous serez informé par message sur l'écran de verrouillage."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Que signifie possible infection ?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"L'application ne détecte pas seulement si des contacts avec des personnes infectées ont eu lieu, mais aussi la durée et la proximité de ces contacts.
-
-Vous ne serez informé que si le risque d'infection est suffisamment important."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"L'infoline SwissCovid vous conseille sur la possibilité d'effectuer un test gratuit."</string>
 
@@ -1796,4 +1788,10 @@ Contactez l'infoline coronavirus :"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 00458a0ff..41c864c31 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -588,14 +588,6 @@ Time se potrošnja baterije samo neznatno povećava."</string>
 
 U slučaju moguće infekcije, dobićete obaveštenje na zaključanom ekranu."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Šta je moguća infekcija?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"Aplikacija ne samo da proverava da li ste imali kontakte sa inficiranim osobama, već i koliko dugo su oni trajali i koliko bliski su bili.
-
-Bićete obavešteni samo ako postoji dovoljno velika mogućnost infekcije."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"Preko info linije aplikacije SwissCovid možete da dobijete savete o mogućnosti besplatnog testiranja."</string>
 
@@ -1766,4 +1758,10 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8d2c5c9cb..7c27d5c1e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -592,14 +592,6 @@ Il consumo della batteria aumenta soltanto leggermente."</string>
 
 In caso di possibile contagio viene visualizzato un messaggio sulla schermata di blocco."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Cosa significa possibile contagio?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"L'app non controlla solo se ci sono stati incontri con persone infette, ma anche a quale distanza e per quanto tempo.
-
-L'utente viene informato soltanto se la possibilità di un contagio è sufficientemente fondata."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"La Infoline SwissCovid ti offre consulenza sulla possibilità di fare un test gratuito."</string>
 
@@ -1804,4 +1796,10 @@ Contatta la Infoline coronavirus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a07b8e182..6ee0bfebe 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -590,14 +590,6 @@ Isto aumenta muito pouco o consumo da bateria."</string>
 
 Em caso de possível contágio, receberá uma notificação no ecrã de bloqueio."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"O que significa um possível contágio?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"A app não só verifica se houve contactos com pessoas infetadas, mas também quanto tempo e quão perto esteve dessas pessoas. 
-
-Só será notificado se houver uma probabilidade razoável de contágio."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"A linha informativa SwissCovid aconselha-o sobre um possível teste gratuito."</string>
 
@@ -1771,4 +1763,10 @@ Contacte a linha de informação coronavírus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 2ca22c683..9b116c6e1 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -586,14 +586,6 @@ ll diever da la battaria s'augmenta qua tras mo levamain."</string>
 
 En cas d'ina eventuala infecziun vegnis Vus orientada/orientà cun ina communicaziun sin il visur bloccà."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Tge vul dir eventuala infecziun?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"L'app n'examinescha betg sulettamain, sch'i ha dà inscunters cun persunas infectadas, mabain er quant ditg ch'els han durà e quant damanaivel che Vus essas stada/stà a questas persunas.
-
-Vus vegnis infurmada/infurmà mo, sche la pussaivladad d'esser infectada/infectà è gronda avunda."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"L'infoline SwissCovid As cusseglia davart la pussaivladad d'in test gratuit."</string>
 
@@ -1766,4 +1758,10 @@ Alura contactai la Infoline coronavirus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index f422d6820..4af0a8abe 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -589,14 +589,6 @@ Nga kjo, konsumi i baterisë rritet vetëm pak."</string>
 
 Në rast infeksioni të mundshëm informoheni me një mesazh në ekranin e mbyllur."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Çfarë do të thotë infeksion i mundshëm?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"Aplikacioni nuk kontrollon vetëm nëse ka pasur kontakt me persona të infektuar, por edhe se për sa kohë dhe në çfarë distance ishin këta persona.
-
-Përdoruesi informohet vetëm nëse dyshimi për një infeksion të mundshëm është mjaft i madh."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"Infoline SwissCovid ju këshillon për mundësinë e një testi falas."</string>
 
@@ -1771,4 +1763,10 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 09df5bb84..112e8d072 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -588,14 +588,6 @@ Time se potrošnja baterije samo neznatno povećava."</string>
 
 U slučaju moguće infekcije, dobićete obaveštenje na zaključanom ekranu."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Šta je moguća infekcija?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"Aplikacija ne samo da proverava da li ste imali kontakte sa inficiranim osobama, već i koliko dugo su oni trajali i koliko bliski su bili.
-
-Bićete obavešteni samo ako postoji dovoljno velika mogućnost infekcije."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"Preko info linije aplikacije SwissCovid možete da dobijete savete o mogućnosti besplatnog testiranja."</string>
 
@@ -1766,4 +1758,10 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 01316aaea..561dbb8bf 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -576,12 +576,6 @@
     <string name="meldungen_nomeldungen_faq1_text">"እቲ ኣፕ ክልኦት ዝተራኸብኩሞም ተጠቀምቲ  ብመርመራ ፖዚቲቭ ከምዝኾኑ ሓቢሮም እንተኾይኖም ቀጻሊ ይምርምር። 
 ተኽእሎ ምልካፍ ብሕማም ምስዝህሉ ብመነግዲ መልእኽቲ ኣብ ዕጹው ስክሪን ሞባይል ክትሕበሩ ኢኹም።  "</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"ተኽእሎ ምልካፍ ብሕማም እንታይ ማለት እዩ፧"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"እቲ ኣፕ ርክብ ምስ ዝተለኸፉ ሰባት ኣጓኒፉ እንተኾይኑ ጥራይ ዘይኮነስ ንውሒ ግዜን  ዓቐን ናይቲ ቅርበትን እዩ ዝምርምር።  ቡቑዕ ተኽእሎ ናይ መልከፍቲ ምስዝህሉ ጥራይ ኢኹም ትሕበሩ።"</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"መስመር ሓበሬታ ስዊስኮቪድ ብዛዕባ  ተኽእሎ ካብ ክፍሊት ነጻ ናይ ዝኾነ መርመራ የማኽረኩም።  "</string>
 
@@ -1746,4 +1740,10 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 72797e67e..deb5dcc17 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -576,14 +576,6 @@ Bunlar cep telefonunda kaydedilmekte ve 14 gün sonra silinmektedir."</string>
     <string name="meldungen_nomeldungen_faq1_text">"Uygulama düzenli olarak temas ettiğiniz kişilerin pozitif bir test sonucu bildirip bildirmediğini kontrol eder.
 Olası bir enfeksiyon riskinde kilit ekranında bir mesaj ile bilgilendirileceksiniz."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"Enfeksiyon riski ne anlama gelmektedir?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"Uygulama yalnızca enfekte kişiler temaz olup olmadığını değil, temasların ne kadar sürdüğünü ve ne kadar yakın olduklarını da takip eder.
-
-Yalnızca bulaşma riski yeterince büyük ise bilgilendirilirsiniz."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"SwissCovid Bilgi Hattı sizi ücretsiz testler konusunda bilgilendirir."</string>
 
@@ -1748,4 +1740,10 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba0b5a3f2..18eaafde7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -588,14 +588,6 @@ They are saved locally on the smartphones and then deleted 14 days later."</stri
 
 If it is possible that you have been infected, you will receive a message on your lock screen."</string>
 
-    <!-- Meldungen: Keine Meldungen FAQ Titel -->
-    <string name="meldungen_nomeldungen_faq2_titel">"What is a potential infection?"</string>
-
-    <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq2_text">"The app not only checks whether you have had encounters with infected persons, but how long and how close these were. 
-
-You will only be notified if there is sufficient likelihood that you have been infected."</string>
-
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"The infoline SwissCovid will advise you on getting a free test."</string>
 
@@ -1793,4 +1785,10 @@ If so, contact the Coronavirus Infoline:"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
     <string name="checkin_report_link"></string>
+    <string name="instant_app_install_action"></string>
+    <string name="partial_onboarding_box_text"></string>
+    <string name="partial_onboarding_box_action"></string>
+    <string name="partial_onboarding_done_title"></string>
+    <string name="partial_onboarding_done_text"></string>
+    <string name="web_slogan"></string>
 </resources>
\ No newline at end of file

From 0f81b4fca7fba64f99fe19040e953af56f8c7ae6 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 15:33:47 +0200
Subject: [PATCH 101/207] Update Icons

---
 app/src/main/res/drawable/ic_location_pin.xml         | 10 ++++++++++
 app/src/main/res/drawable/ic_smartphone.xml           | 10 ++++++++++
 app/src/main/res/drawable/ic_stopwatch.xml            | 10 ++++++++++
 app/src/main/res/layout/fragment_checkin_overview.xml |  6 ++----
 app/src/main/res/layout/item_events_footer.xml        |  6 ++----
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_location_pin.xml
 create mode 100644 app/src/main/res/drawable/ic_smartphone.xml
 create mode 100644 app/src/main/res/drawable/ic_stopwatch.xml

diff --git a/app/src/main/res/drawable/ic_location_pin.xml b/app/src/main/res/drawable/ic_location_pin.xml
new file mode 100644
index 000000000..5069074de
--- /dev/null
+++ b/app/src/main/res/drawable/ic_location_pin.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.5,1C7.814,1 4,4.727 4,9.31c0,6.51 7.701,13.234 8.029,13.516 0.135,0.116 0.303,0.174 0.471,0.174 0.168,0 0.336,-0.058 0.471,-0.173C13.3,22.543 21,15.82 21,9.31 21,4.727 17.186,1 12.5,1zM12.5,12.25c-1.704,0 -3.09,-1.346 -3.09,-3s1.386,-3 3.09,-3 3.09,1.346 3.09,3 -1.386,3 -3.09,3z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_smartphone.xml b/app/src/main/res/drawable/ic_smartphone.xml
new file mode 100644
index 000000000..576481770
--- /dev/null
+++ b/app/src/main/res/drawable/ic_smartphone.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.857,0.01L7.143,0C5.964,0 5,0.982 5,2.182v19.636C5,23.018 5.964,24 7.143,24h10.714C19.036,24 20,23.018 20,21.818L20,2.182C20,0.982 19.036,0.01 17.857,0.01zM17.857,19.636L7.143,19.636L7.143,4.364h10.714v15.272z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stopwatch.xml b/app/src/main/res/drawable/ic_stopwatch.xml
new file mode 100644
index 000000000..893353f26
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stopwatch.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.71,2.302l3,3.003 -1.4,1.402 -0.8,-0.801 -0.7,0.7c3.5,3.204 4.2,8.41 1.7,12.513 -2.8,4.805 -9,6.307 -13.701,3.404 -4.701,-2.903 -6.201,-8.91 -3.4,-13.714 2.8,-4.805 9,-6.306 13.8,-3.403l0.9,-0.901 -0.8,-0.801 1.401,-1.402zM12.01,6.907c-3.901,0 -7.002,3.103 -7.002,7.007 0,3.904 3.1,7.007 7.001,7.007 3.9,0 7.001,-3.103 7.001,-7.007h-7zM15.01,0v2.002h-2v1.001c-0.7,-0.1 -1.3,-0.1 -2,0v-1L9.008,2.003L9.008,0h6z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 7f44d4506..91675ff6d 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -293,8 +293,7 @@
 					android:layout_width="@dimen/icon_size"
 					android:layout_height="@dimen/icon_size"
 					android:layout_marginRight="@dimen/spacing_medium_large"
-					android:src="@drawable/ic_shield_checkmark"
-					android:tint="@color/blue_main" />
+					android:src="@drawable/ic_stopwatch" />
 
 				<TextView
 					style="@style/NextStep.Text"
@@ -324,8 +323,7 @@
 					android:layout_width="@dimen/icon_size"
 					android:layout_height="@dimen/icon_size"
 					android:layout_marginRight="@dimen/spacing_medium_large"
-					android:src="@drawable/ic_shield_checkmark"
-					android:tint="@color/blue_main" />
+					android:src="@drawable/ic_smartphone" />
 
 				<TextView
 					style="@style/NextStep.Text"
diff --git a/app/src/main/res/layout/item_events_footer.xml b/app/src/main/res/layout/item_events_footer.xml
index 5aa4e6e20..693f5b41c 100644
--- a/app/src/main/res/layout/item_events_footer.xml
+++ b/app/src/main/res/layout/item_events_footer.xml
@@ -23,8 +23,7 @@
 			android:layout_width="@dimen/icon_size"
 			android:layout_height="@dimen/icon_size"
 			android:layout_marginEnd="@dimen/spacing_medium_large"
-			android:src="@drawable/ic_shield_checkmark"
-			android:tint="@color/blue_main" />
+			android:src="@drawable/ic_location_pin" />
 
 		<TextView
 			style="@style/NextStep.Text"
@@ -52,8 +51,7 @@
 			android:layout_width="@dimen/icon_size"
 			android:layout_height="@dimen/icon_size"
 			android:layout_marginEnd="@dimen/spacing_medium_large"
-			android:src="@drawable/ic_shield_checkmark"
-			android:tint="@color/blue_main" />
+			android:src="@drawable/ic_stopwatch" />
 
 		<TextView
 			style="@style/NextStep.Text"

From 93d919528b0b75ccb0b491809fcb6179b5c759cb Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 20:03:08 +0200
Subject: [PATCH 102/207] Implemented Modal transitions and screens

---
 .../java/ch/admin/bag/dp3t/MainActivity.java  |  2 +-
 .../checkin/checkinflow/CheckInFragment.kt    | 24 ++++++++++++-------
 .../checkinflow/QrCodeScannerFragment.java    |  2 +-
 .../generateqrcode/EventsOverviewFragment.kt  |  6 ++---
 .../checkin/generateqrcode/QrCodeFragment.kt  | 19 +++++++++------
 .../bag/dp3t/extensions/FragmentExtensions.kt | 17 ++++++++++---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  5 ++--
 app/src/main/res/anim/modal_pop_enter.xml     |  8 +++----
 app/src/main/res/anim/modal_pop_exit.xml      |  1 +
 app/src/main/res/anim/modal_slide_enter.xml   |  2 ++
 app/src/main/res/anim/modal_slide_exit.xml    | 14 +++--------
 app/src/main/res/layout/fragment_check_in.xml | 23 ++++++++++++++++++
 app/src/main/res/layout/fragment_qr_code.xml  | 24 +++++++++++++++----
 13 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 3f88dafea..1752ce63b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -307,7 +307,7 @@ private void showCheckOutFragment() {
 
 	private void showCheckInScreen() {
 		getSupportFragmentManager().beginTransaction()
-				.replace(R.id.main_fragment_container, CheckInFragment.newInstance())
+				.replace(R.id.main_fragment_container, CheckInFragment.newInstance(false))
 				.addToBackStack(CheckInFragment.class.getCanonicalName())
 				.commit();
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 7b918d99d..2d8017db6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -7,13 +7,15 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
+import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
-import ch.admin.bag.dp3t.checkin.generateqrcode.QrCodeFragment
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.checkin.utils.*
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
@@ -24,15 +26,18 @@ import ch.admin.bag.dp3t.extensions.getSubtitle
 import com.google.android.material.button.MaterialButton
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
+private const val ARG_IS_SELF_CHECKIN = "ARG_IS_SELF_CHECKIN"
+
 class CheckInFragment : Fragment() {
 
 	companion object {
 		val TAG = CheckInFragment::class.java.canonicalName
 
 		@JvmStatic
-		fun newInstance(): CheckInFragment {
-			return CheckInFragment()
+		fun newInstance(isSelfCheckin: Boolean = false) = CheckInFragment().apply {
+			arguments = bundleOf(ARG_IS_SELF_CHECKIN to isSelfCheckin)
 		}
+
 	}
 
 	private val viewModel: CrowdNotifierViewModel by activityViewModels()
@@ -85,6 +90,11 @@ class CheckInFragment : Fragment() {
 			}
 
 			toolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+			cancelButton.setOnClickListener {
+				requireActivity().supportFragmentManager.popBackStack(EventsOverviewFragment::class.java.canonicalName, 0)
+			}
+			selfCheckinToolbar.isVisible = requireArguments().getBoolean(ARG_IS_SELF_CHECKIN)
+			toolbar.isVisible = !requireArguments().getBoolean(ARG_IS_SELF_CHECKIN)
 		}.root
 	}
 
@@ -101,12 +111,10 @@ class CheckInFragment : Fragment() {
 	}
 
 	private fun popBackToHomeFragment() {
-		val fm = requireActivity().supportFragmentManager
-		val backStackEntry = if (fm.backStackEntryCount >= 2) fm.getBackStackEntryAt(fm.backStackEntryCount - 2) else null
-		if (backStackEntry?.name == QrCodeFragment::class.java.canonicalName) {
-			fm.popBackStack(CheckinOverviewFragment::class.java.canonicalName, 0)
+		if (requireArguments().getBoolean(ARG_IS_SELF_CHECKIN)) {
+			requireActivity().supportFragmentManager.popBackStack(CheckinOverviewFragment::class.java.canonicalName, 0)
 		} else {
-			fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+			requireActivity().supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 5d3b95240..48c7b10f6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -260,7 +260,7 @@ private void setIndicatorColor(View indicator, @ColorRes int color) {
 	private void showCheckInFragment() {
 		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, CheckInFragment.newInstance())
+				.replace(R.id.main_fragment_container, CheckInFragment.newInstance(false))
 				.addToBackStack(CheckInFragment.class.getCanonicalName())
 				.commitAllowingStateLoss();
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index a51ff45ed..8487526e6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -20,17 +20,17 @@ class EventsOverviewFragment : Fragment() {
 
 	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		return FragmentEventsOverviewBinding.inflate(layoutInflater).apply {
 			eventsToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
 			val adapter = QrCodeAdapter(object : OnClickListener {
 				override fun generateQrCode() {
-					showFragment(GenerateQrCodeFragment.newInstance())
+					showFragment(GenerateQrCodeFragment.newInstance(), modalAnimation = true)
 				}
 
 				override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
-					showFragment(QrCodeFragment.newInstance(qrCodeItem))
+					showFragment(QrCodeFragment.newInstance(qrCodeItem), modalAnimation = true)
 				}
 
 				override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 21b0cbee1..f76f7d62d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -25,7 +25,6 @@ import ch.admin.bag.dp3t.extensions.toQrCodePayload
 import ch.admin.bag.dp3t.extensions.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
 import ch.admin.bag.dp3t.extensions.combineWith
-import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import com.google.protobuf.ByteString
 import org.crowdnotifier.android.sdk.model.VenueInfo
@@ -48,7 +47,7 @@ class QrCodeFragment : Fragment() {
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
-			toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
+			cancelButton.setOnClickListener { parentFragmentManager.popBackStack() }
 			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
 			titleTextview.text = venueInfo.title
 			subtitleTextview.setText(venueInfo.getSubtitle())
@@ -79,14 +78,20 @@ class QrCodeFragment : Fragment() {
 			}.observe(viewLifecycleOwner) { showCheckinButton ->
 				checkinButton.isVisible = showCheckinButton
 			}
-			checkinButton.setOnClickListener {
-				crowdNotifierViewModel.checkInState =
-					CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
-				showFragment(CheckInFragment.newInstance())
-			}
+			checkinButton.setOnClickListener { showCheckInFragment(venueInfo) }
 		}.root
 	}
 
+	private fun showCheckInFragment(venueInfo: VenueInfo) {
+		crowdNotifierViewModel.checkInState =
+			CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit)
+			.replace(R.id.main_fragment_container, CheckInFragment.newInstance(isSelfCheckin = true))
+			.addToBackStack(CheckInFragment::class.java.canonicalName)
+			.commit()
+	}
+
 	private fun printPdf(file: File) {
 		context?.let {
 			val manager = it.getSystemService(Context.PRINT_SERVICE) as PrintManager
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
index 64218cc0e..b0aacf6e0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
@@ -7,11 +7,22 @@ import ch.admin.bag.dp3t.R
 fun Fragment.showFragment(
 	fragment: Fragment,
 	@IdRes container: Int = R.id.main_fragment_container,
-	addToBackStack: Boolean = true
+	addToBackStack: Boolean = true,
+	modalAnimation: Boolean = false
 ) {
 	requireActivity().supportFragmentManager.beginTransaction()
-		.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+		.apply {
+			if (modalAnimation) {
+				this.setCustomAnimations(
+					R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit
+				)
+			} else {
+				this.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+			}
+			if (addToBackStack) {
+				this.addToBackStack(fragment::class.java.canonicalName)
+			}
+		}
 		.replace(container, fragment)
-		.apply { if (addToBackStack) this.addToBackStack(fragment::class.java.canonicalName) }
 		.commit()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index f539c0417..901fbda56 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -259,9 +259,10 @@ private void showReportsFragment() {
 		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
 		boolean isReportedPositive = tracingViewModel.getTracingStatusInterface().isReportedAsInfected();
 		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1) && !isReportedPositive) {
-			FragmentExtensionsKt.showFragment(this, ReportsOverviewFragment.newInstance(), R.id.main_fragment_container, true);
+			FragmentExtensionsKt
+					.showFragment(this, ReportsOverviewFragment.newInstance(), R.id.main_fragment_container, true, false);
 		} else {
-			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), R.id.main_fragment_container, true);
+			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), R.id.main_fragment_container, true, false);
 		}
 	}
 
diff --git a/app/src/main/res/anim/modal_pop_enter.xml b/app/src/main/res/anim/modal_pop_enter.xml
index e6d7ff503..3fcf950f1 100644
--- a/app/src/main/res/anim/modal_pop_enter.xml
+++ b/app/src/main/res/anim/modal_pop_enter.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<objectAnimator
+	<alpha
 		android:duration="200"
-		android:propertyName="alpha"
-		android:valueFrom="0"
-		android:valueTo="1"
-		android:valueType="floatType" />
+		android:fromAlpha="0"
+		android:toAlpha="1" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/modal_pop_exit.xml b/app/src/main/res/anim/modal_pop_exit.xml
index 53a435703..a9dd3d1be 100644
--- a/app/src/main/res/anim/modal_pop_exit.xml
+++ b/app/src/main/res/anim/modal_pop_exit.xml
@@ -5,6 +5,7 @@
 		android:duration="200"
 		android:fillAfter="true"
 		android:fromYDelta="0%p"
+		android:interpolator="@android:anim/accelerate_interpolator"
 		android:toYDelta="100%p" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/modal_slide_enter.xml b/app/src/main/res/anim/modal_slide_enter.xml
index 900ed44de..57b4fa014 100644
--- a/app/src/main/res/anim/modal_slide_enter.xml
+++ b/app/src/main/res/anim/modal_slide_enter.xml
@@ -3,6 +3,8 @@
 	<translate
 		android:duration="200"
 		android:fillAfter="true"
+		android:interpolator="@android:anim/decelerate_interpolator"
 		android:fromYDelta="100%p"
 		android:toYDelta="0%p" />
+
 </set>
diff --git a/app/src/main/res/anim/modal_slide_exit.xml b/app/src/main/res/anim/modal_slide_exit.xml
index e97f753a3..1a9bf5c7e 100644
--- a/app/src/main/res/anim/modal_slide_exit.xml
+++ b/app/src/main/res/anim/modal_slide_exit.xml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<objectAnimator
+	<alpha
 		android:duration="200"
-		android:propertyName="alpha"
-		android:valueFrom="1"
-		android:valueTo="0"
-		android:valueType="floatType" />
-	<objectAnimator
-		android:duration="1000"
-		android:propertyName="elevation"
-		android:valueFrom="1"
-		android:valueTo="0"
-		android:valueType="floatType" />
+		android:fromAlpha="1"
+		android:toAlpha="0" />
 
 </set>
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index fc9da5ef6..dd324fc5f 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -8,6 +8,29 @@
 	android:background="@color/white"
 	android:orientation="vertical">
 
+	<FrameLayout
+		android:id="@+id/self_checkin_toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/white"
+		android:elevation="@dimen/card_elevation"
+		android:visibility="gone">
+
+		<TextView
+			android:id="@+id/cancel_button"
+			style="@style/NextStep.Text.Blue"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/cancel" />
+
+	</FrameLayout>
+
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index 35a21b0c6..19d706e61 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -7,13 +7,27 @@
 	android:background="@color/white"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
+	<FrameLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		app:layout_constraintTop_toTopOf="parent"
-		app:navigationContentDescription="@string/android_accessibility_back_button"
-		app:navigationIcon="@drawable/ic_arrow_back" />
+		android:background="@color/white"
+		android:elevation="@dimen/card_elevation">
+
+		<TextView
+			android:id="@+id/cancel_button"
+			style="@style/NextStep.Text.Blue"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/cancel" />
+
+	</FrameLayout>
+
 
 	<ScrollView
 		android:layout_width="match_parent"

From 0f7f9787fc470a7f799fc5badae9cc602d4d132e Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 22:18:29 +0200
Subject: [PATCH 103/207] Use TestInformationUrl from Config Response

---
 .../admin/bag/dp3t/networking/ConfigWorker.kt |  2 ++
 .../models/ConfigResponseModel.java           |  5 +++++
 .../admin/bag/dp3t/reports/ReportsFragment.kt |  5 +----
 .../admin/bag/dp3t/storage/SecureStorage.java | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
index 8ffc7bd2f..6e11b2025 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
@@ -79,6 +79,8 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine
 				secureStorage.hasInfobox = false
 			}
 
+			secureStorage.setTestInformationUrls(config.testInformationUrls)
+
 			secureStorage.testLocations = config.testLocations
 			secureStorage.interopCountries = config.interOpsCountries
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java
index 9a2938ca1..07eaf0c80 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java
@@ -20,6 +20,7 @@ public class ConfigResponseModel {
 	private SdkConfigModel androidGaenSdkConfig;
 	private Map<String, List<TestLocationModel>> testLocations;
 	private List<String> interOpsCountries;
+	private Map<String, String> testInformationUrls;
 
 	public boolean getDoForceUpdate() {
 		return forceUpdate;
@@ -50,4 +51,8 @@ public List<String> getInterOpsCountries() {
 		return interOpsCountries;
 	}
 
+	public Map<String, String> getTestInformationUrls() {
+		return testInformationUrls;
+	}
+
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 1b5fbdffa..041a435f2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -50,9 +50,6 @@ import kotlin.math.min
 
 private const val ARG_CHECK_IN_ID = "ARG_CHECK_IN_ID"
 private const val ARG_SHOW_TRACING_REPORT_DETAILS = "ARG_SHOW_TRACING_REPORT_DETAILS"
-private const val TESTING_EXTERNAL_LINK =
-	"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"
-
 
 class ReportsFragment : Fragment() {
 
@@ -320,7 +317,7 @@ class ReportsFragment : Fragment() {
 	}
 
 	private fun showTestInformation() {
-		UrlUtil.openUrl(context, TESTING_EXTERNAL_LINK)
+		UrlUtil.openUrl(context, secureStorage.getTestInformationUrl(getString(R.string.language_key)))
 	}
 
 	private fun callHotline() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 090ab0fb0..31a8200d5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -76,6 +76,7 @@ public class SecureStorage {
 	private static final String KEY_CURRENT_CHECK_IN = "KEY_CURRENT_CHECK_IN";
 	private static final String KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG = "KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG";
 	private static final String KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD = "KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD";
+	private static final String KEY_CONFIG_TEST_INFORMATION_URLS = "testinformation_urls";
 
 	private static SecureStorage instance;
 
@@ -228,6 +229,24 @@ public InfoBoxModelCollection getInfoBoxCollection() {
 		return gson.fromJson(prefs.getString(KEY_CONFIG_INFOBOX_COLLECTION, "null"), InfoBoxModelCollection.class);
 	}
 
+	public void setTestInformationUrls(Map<String, String> testInformationUrls) {
+		prefs.edit().putString(KEY_CONFIG_TEST_INFORMATION_URLS, gson.toJson(testInformationUrls)).apply();
+	}
+
+	public String getTestInformationUrl(String languageKey) {
+		String defaultUrl = "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/" +
+				"aktuelle-ausbrueche-epidemien/novel-cov/testen.html";
+
+		Type testInformationsType = new TypeToken<Map<String, String>>() { }.getType();
+		Map<String, String> testInfoMap =
+				gson.fromJson(prefs.getString(KEY_CONFIG_TEST_INFORMATION_URLS, "null"), testInformationsType);
+		if (testInfoMap == null || !testInfoMap.containsKey(languageKey)) {
+			return defaultUrl;
+		} else {
+			return testInfoMap.get(languageKey);
+		}
+	}
+
 	public boolean isUserNotInPilotGroup() {
 		return prefs.getBoolean(KEY_ONBOARDING_USER_NOT_IN_PILOT_GROUP, false);
 	}

From 5b664e590933092b89dcf1b6d37feb37663b4abd Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 25 May 2021 23:08:21 +0200
Subject: [PATCH 104/207] Fix inform flow issues

---
 .../java/ch/admin/bag/dp3t/MainActivity.java     |  3 ++-
 .../ch/admin/bag/dp3t/inform/InformFragment.kt   | 16 ++++++++--------
 .../ch/admin/bag/dp3t/inform/InformViewModel.kt  |  6 ++++++
 .../bag/dp3t/inform/ShareCheckinsFragment.kt     | 13 ++++++++++---
 .../ch/admin/bag/dp3t/inform/ThankYouFragment.kt |  7 ++++---
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 1752ce63b..d6b00752d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -275,8 +275,9 @@ private void showHomeFragment() {
 	private void showReportsFragment() {
 		int checkinReports = crowdNotifierViewModel.getExposures().getValue().size();
 		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
+		boolean isReportedPositive = tracingViewModel.getTracingStatusInterface().isReportedAsInfected();
 		Fragment reportsFragment;
-		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1)) {
+		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1) && !isReportedPositive) {
 			reportsFragment = ReportsOverviewFragment.newInstance();
 		} else {
 			reportsFragment = ReportsFragment.newInstance(null);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 7f453fe51..593aec185 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -75,20 +75,20 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		binding.sendButton.isEnabled = false
 		setInvalidCovidcodeErrorVisible(false)
 		informViewModel.covidCode = binding.covidcodeInput.text
-		askUserToEnableTracingIfNecessary { tracingEnabled ->
-			if (tracingEnabled) {
-				loadOnsetDate()
-			} else {
-				binding.sendButton.isEnabled = true
-			}
-		}
+		loadOnsetDate()
 	}
 
 	private fun loadOnsetDate() {
 		informViewModel.loadOnsetDate().observe(viewLifecycleOwner) {
 			setLoadingViewVisible(it.status == Status.LOADING)
 			if (it.status == Status.SUCCESS) {
-				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+				askUserToEnableTracingIfNecessary { tracingEnabled ->
+					if (tracingEnabled) {
+						showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+					} else {
+						showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container)
+					}
+				}
 			} else if (it.status == Status.ERROR) {
 				setInvalidCovidcodeErrorVisible(true)
 			}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 490d48d79..6615b5697 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -19,9 +19,11 @@ import ch.admin.bag.dp3t.util.toUploadVenueInfo
 import com.google.android.gms.common.api.ApiException
 import kotlinx.coroutines.Dispatchers
 import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.DP3TKotlin
 import org.dpppt.android.sdk.PendingUploadTask
 import org.dpppt.android.sdk.backend.ResponseCallback
+import org.dpppt.android.sdk.internal.AppConfigManager
 import org.dpppt.android.sdk.models.DayDate
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
 import retrofit2.HttpException
@@ -120,6 +122,10 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 			return@liveData
 		}
 
+		val appConfigManager = AppConfigManager.getInstance(getApplication())
+		appConfigManager.iAmInfected = true
+		appConfigManager.iAmInfectedIsResettable = true
+		DP3T.stop(getApplication())
 		emit(Resource.success(data = null))
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index 3a870f0fa..1b8265a42 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -20,19 +20,22 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 	private lateinit var binding: FragmentShareCheckinsBinding
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		binding = FragmentShareCheckinsBinding.inflate(inflater).apply {
+		binding = FragmentShareCheckinsBinding.inflate(inflater)
+		return binding.apply {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			val adapter = CheckinAdapter()
 			checkinsRecyclerView.adapter = adapter
 			adapter.setData(informViewModel.getSelectableCheckinItems())
 			adapter.itemSelectionListener { selectedItem, selected ->
 				informViewModel.setDiaryItemSelected(selectedItem.id, selected)
+				refreshSendButtonEnabled()
 			}
 			selectAllCheckbox.setOnCheckedChangeListener { _, isChecked ->
 				informViewModel.getSelectableCheckinItems().forEach {
 					informViewModel.setDiaryItemSelected(it.diaryEntry.id, isChecked)
 				}
 				adapter.setData(informViewModel.getSelectableCheckinItems())
+				refreshSendButtonEnabled()
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
@@ -46,8 +49,12 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 				informViewModel.hasSharedCheckins = true
 				upload()
 			}
-		}
-		return binding.root
+			refreshSendButtonEnabled()
+		}.root
+	}
+
+	private fun refreshSendButtonEnabled() {
+		binding.sendButton.isEnabled = informViewModel.getSelectableCheckinItems().find { it.isSelected } != null
 	}
 
 	private fun upload() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
index 24106b790..c154e0818 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ThankYouFragment.kt
@@ -37,6 +37,10 @@ class ThankYouFragment : Fragment() {
 		return FragmentThankYouBinding.inflate(inflater).apply {
 			(requireActivity() as InformActivity).allowBackButton(false)
 
+			informThankYouTextCheckins.isVisible = informViewModel.hasSharedCheckins
+			informThankYouTextInfo.isVisible = informViewModel.hasSharedDP3TKeys
+			informThankYouTextOnsetdate.isVisible = informViewModel.hasSharedDP3TKeys
+
 			// Show the onset date in the thank you message
 			val oldestSharedKeyDateMillis = secureStorage.positiveReportOldestSharedKey
 			if (oldestSharedKeyDateMillis > 0L) {
@@ -45,15 +49,12 @@ class ThankYouFragment : Fragment() {
 					getString(R.string.inform_send_thankyou_text_onsetdate).replace("{ONSET_DATE}", formattedDate)
 				informThankYouTextInfo.setText(R.string.inform_send_thankyou_text_onsetdate_info)
 				informThankYouTextOnsetdate.text = formattedOnsetDateText
-				informThankYouTextStopInfectionChains.setText(R.string.inform_send_thankyou_text_stop_infection_chains)
 			} else {
 				informThankYouTextInfo.setText(R.string.inform_send_thankyou_text)
 				informThankYouTextOnsetdate.visibility = View.GONE
 				informThankYouTextStopInfectionChains.visibility = View.GONE
 			}
 
-			informThankYouTextCheckins.isVisible = informViewModel.hasSharedCheckins
-
 			informThankYouButtonContinue.setOnClickListener {
 				showFragment(TracingStoppedFragment.newInstance(), R.id.inform_fragment_container)
 			}

From 40973f8eee24166006752cb65c7f56c4313f5739 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Wed, 26 May 2021 00:09:00 +0200
Subject: [PATCH 105/207] checkout datetime picker and overlap check

---
 app/build.gradle                              |   5 +
 .../checkin/checkinflow/CheckOutFragment.kt   |   7 +
 .../dp3t/checkin/diary/CheckinTimeHelper.kt   |  34 +++++
 .../checkin/diary/EditDiaryEntryFragment.kt   |   6 +
 .../ch/admin/bag/dp3t/view/DateTimePicker.kt  | 131 ++++++++++++++++++
 .../layout/fragment_check_out_and_edit.xml    |  22 ++-
 .../main/res/layout/view_datetime_picker.xml  |  59 ++++++++
 app/src/main/res/values/styles.xml            |  12 ++
 8 files changed, 264 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt
 create mode 100644 app/src/main/res/layout/view_datetime_picker.xml

diff --git a/app/build.gradle b/app/build.gradle
index e224a8ca4..699d31e01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,6 +154,7 @@ android {
 	compileOptions {
 		sourceCompatibility = 1.8
 		targetCompatibility = 1.8
+		coreLibraryDesugaringEnabled true
 	}
 
 	kotlinOptions {
@@ -240,6 +241,10 @@ dependencies {
 
 	implementation 'androidx.biometric:biometric:1.1.0'
 
+	implementation 'io.github.ShawnLin013:number-picker:2.4.13'
+
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	androidTestImplementation 'androidx.test:runner:1.3.0'
 	androidTestImplementation 'androidx.test:core:1.3.0'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index 1a802e91a..4b5d6e5c0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.ViewModelProvider
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.diary.CheckinTimeHelper
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
@@ -68,6 +69,12 @@ class CheckOutFragment : Fragment() {
 	}
 
 	private fun performCheckout() {
+		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(checkInState.checkInTime, checkInState.checkOutTime, requireContext())
+		if (hasOverlapWithOtherCheckin) {
+			CheckinTimeHelper.showOverlapDialog(requireContext())
+			return
+		}
+
 		CrowdNotifierReminderHelper.removeAllReminders(context)
 		saveEntry()
 		val notificationHelper = NotificationHelper.getInstance(context)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
new file mode 100644
index 000000000..e828b9652
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
@@ -0,0 +1,34 @@
+package ch.admin.bag.dp3t.checkin.diary
+
+import android.content.Context
+import androidx.appcompat.app.AlertDialog
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+
+object CheckinTimeHelper {
+
+	fun checkForOverlap(diaryEntry: DiaryEntry, context: Context): Boolean {
+		val otherCheckins = DiaryStorage.getInstance(context).entries.filter { it.id != diaryEntry.id }
+		return checkForOverlap(otherCheckins, diaryEntry.arrivalTime, diaryEntry.departureTime)
+	}
+
+	fun checkForOverlap(arrivalTime: Long, departureTime: Long, context: Context): Boolean {
+		val otherCheckins = DiaryStorage.getInstance(context).entries
+		return checkForOverlap(otherCheckins, arrivalTime, departureTime)
+	}
+
+	private fun checkForOverlap(checkins: List<DiaryEntry>, arrivalTime: Long, departureTime: Long): Boolean {
+		return checkins.any { it.departureTime > arrivalTime && departureTime > it.arrivalTime }
+	}
+
+	fun showOverlapDialog(context: Context) {
+		AlertDialog.Builder(context, R.style.NextStep_AlertDialogStyle)
+			.setTitle(R.string.checkout_overlapping_alert_title)
+			.setMessage(R.string.checkout_overlapping_alert_description)
+			.setNegativeButton(R.string.android_button_ok) { dialog, _ -> dialog.dismiss() }
+			.show()
+	}
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index c54e51c53..43287ea07 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -52,6 +52,12 @@ class EditDiaryEntryFragment : Fragment() {
 	}
 
 	private fun performSave() {
+		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(diaryEntry, requireContext())
+		if (hasOverlapWithOtherCheckin) {
+			CheckinTimeHelper.showOverlapDialog(requireContext())
+			return
+		}
+
 		saveEntry()
 		requireActivity().supportFragmentManager.popBackStack()
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt b/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt
new file mode 100644
index 000000000..53fb83afc
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt
@@ -0,0 +1,131 @@
+package ch.admin.bag.dp3t.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.ViewDatetimePickerBinding
+import ch.admin.bag.dp3t.util.DateUtils
+import com.shawnlin.numberpicker.NumberPicker
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.temporal.ChronoUnit
+import java.util.*
+
+class DateTimePicker @JvmOverloads constructor(
+	context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0,
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+	private val binding = ViewDatetimePickerBinding.inflate(LayoutInflater.from(context), this)
+
+	private val zoneId = ZoneId.systemDefault()
+	private val now = LocalDateTime.now()
+	private var previousDateTime = now
+
+	private val daysInPast = 7
+	private val daysInFuture = 0
+
+	private lateinit var dateFormatter: NumberPicker.Formatter
+	private lateinit var hourFormatter: NumberPicker.Formatter
+	private lateinit var minuteFormatter: NumberPicker.Formatter
+
+	private var changeListener: OnDateTimeChangedListener? = null
+
+	init {
+		initializeFormatters()
+		initializePickers()
+		updatePickerValues()
+	}
+
+	private fun initializeFormatters() {
+		val baseDate = now.toLocalDate()
+
+		dateFormatter = NumberPicker.Formatter { value ->
+			val date = baseDate.plusDays((value - daysInPast).toLong())
+			if (value != daysInPast) {
+				DateUtils.getFormattedDate(date.atStartOfDay(zoneId).toEpochSecond() * 1000L)
+			} else {
+				context.getString(R.string.date_today)
+			}
+		}
+
+		hourFormatter = NumberPicker.Formatter { value ->
+			String.format(Locale(context.getString(R.string.language_key)), "%02d", value)
+		}
+		minuteFormatter = NumberPicker.Formatter { value ->
+			String.format(Locale(context.getString(R.string.language_key)), "%02d", value)
+		}
+	}
+
+	private fun initializePickers() {
+		val font = ResourcesCompat.getFont(context, R.font.inter_regular)
+
+		binding.datePicker.apply {
+			minValue = 0
+			maxValue = daysInPast + daysInFuture
+			wrapSelectorWheel = false
+			formatter = dateFormatter
+			typeface = font
+			setSelectedTypeface(font)
+			setOnValueChangedListener { _, _, _ ->
+				changeListener?.onDateTimeChanged(getSelectedDateTime())
+			}
+		}
+
+		binding.hourPicker.apply {
+			minValue = 0
+			maxValue = 23
+			wrapSelectorWheel = true
+			formatter = hourFormatter
+			typeface = font
+			setSelectedTypeface(font)
+			setOnValueChangedListener { _, _, _ ->
+				changeListener?.onDateTimeChanged(getSelectedDateTime())
+			}
+		}
+
+		binding.minutePicker.apply {
+			minValue = 0
+			maxValue = 59
+			wrapSelectorWheel = true
+			formatter = minuteFormatter
+			typeface = font
+			setSelectedTypeface(font)
+			setOnValueChangedListener { _, _, _ ->
+				changeListener?.onDateTimeChanged(getSelectedDateTime())
+			}
+		}
+	}
+
+	fun setPreviousDateTime(previousDateTime: LocalDateTime) {
+		this.previousDateTime = previousDateTime
+		updatePickerValues()
+	}
+
+	fun setOnDateTimeChangedListener(changeListener: OnDateTimeChangedListener) {
+		this.changeListener = changeListener
+	}
+
+	fun getSelectedDateTime(): LocalDateTime {
+		val dateValue = binding.datePicker.value - daysInPast
+		val hourValue = binding.hourPicker.value
+		val minuteValue = binding.minutePicker.value
+		return now.plusDays(dateValue.toLong()).withHour(hourValue).withMinute(minuteValue)
+	}
+
+	private fun updatePickerValues() {
+		val dayDifference = ChronoUnit.DAYS.between(now.toLocalDate(), previousDateTime.toLocalDate())
+		val preSelectedValue = daysInPast + dayDifference
+		binding.datePicker.value = preSelectedValue.toInt()
+		binding.hourPicker.value = previousDateTime.hour
+		val minuteSelectionValue = previousDateTime.minute
+		binding.minutePicker.value = minuteSelectionValue
+	}
+
+	fun interface OnDateTimeChangedListener {
+		fun onDateTimeChanged(newDateTime: LocalDateTime)
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index bc833c305..9fe515527 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -64,31 +64,29 @@
 				android:gravity="center"
 				tools:text="Lausanne" />
 
-			<TextView
-				android:id="@+id/checkout_date"
-				style="@style/CrowdNotifier.Text.Subtitle"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:layout_marginTop="@dimen/spacing_huge"
-				android:gravity="center"
-				tools:text="Thursday, October 22" />
-
 			<TextView
 				style="@style/CrowdNotifier.Text.Status.Small"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
 				android:text="@string/datepicker_from" />
 
-
+			<ch.admin.bag.dp3t.view.DateTimePicker
+				android:id="@+id/checkout_time_arrival"
+				android:layout_width="match_parent"
+				android:layout_height="132dp" />
 
 			<TextView
 				style="@style/CrowdNotifier.Text.Status.Small"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_medium"
 				android:text="@string/datepicker_to" />
 
-
+			<ch.admin.bag.dp3t.view.DateTimePicker
+				android:id="@+id/checkout_time_departure"
+				android:layout_width="match_parent"
+				android:layout_height="132dp" />
 
 			<Space
 				android:layout_width="0dp"
diff --git a/app/src/main/res/layout/view_datetime_picker.xml b/app/src/main/res/layout/view_datetime_picker.xml
new file mode 100644
index 000000000..ea88b97ff
--- /dev/null
+++ b/app/src/main/res/layout/view_datetime_picker.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+	<com.shawnlin.numberpicker.NumberPicker
+		android:id="@+id/datePicker"
+		style="@style/NextStep.DateTimePicker"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:descendantFocusability="blocksDescendants"
+		app:layout_constraintEnd_toStartOf="@+id/hourPicker"
+		app:layout_constraintHorizontal_chainStyle="packed"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintWidth_percent="0.5" />
+
+	<com.shawnlin.numberpicker.NumberPicker
+		android:id="@+id/hourPicker"
+		style="@style/NextStep.DateTimePicker"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_marginStart="@dimen/spacing_larger"
+		android:descendantFocusability="blocksDescendants"
+		app:layout_constraintBottom_toBottomOf="@id/datePicker"
+		app:layout_constraintEnd_toStartOf="@+id/timeSeperator"
+		app:layout_constraintStart_toEndOf="@+id/datePicker"
+		app:layout_constraintTop_toTopOf="@+id/datePicker" />
+
+	<TextView
+		android:id="@+id/timeSeperator"
+		style="@style/NextStep.Text"
+		android:layout_width="@dimen/spacing_small"
+		android:layout_height="match_parent"
+		android:contentDescription=""
+		android:gravity="center"
+		android:importantForAccessibility="no"
+		android:text=":"
+		app:layout_constraintBottom_toBottomOf="@id/datePicker"
+		app:layout_constraintEnd_toStartOf="@+id/minutePicker"
+		app:layout_constraintStart_toEndOf="@+id/hourPicker"
+		app:layout_constraintTop_toTopOf="@+id/datePicker"
+		tools:ignore="HardcodedText" />
+
+	<com.shawnlin.numberpicker.NumberPicker
+		android:id="@+id/minutePicker"
+		style="@style/NextStep.DateTimePicker"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:descendantFocusability="blocksDescendants"
+		app:layout_constraintBottom_toBottomOf="@id/datePicker"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/timeSeperator"
+		app:layout_constraintTop_toTopOf="@+id/datePicker" />
+
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 47c8ab8ff..447b02d96 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -363,4 +363,16 @@
 		<item name="android:textColor">@color/primary</item>
 	</style>
 
+	<style name="NextStep.DateTimePicker" parent="android:Widget">
+		<item name="android:textSize">@dimen/text_size_normal</item>
+		<item name="colorControlNormal">@color/red_main</item>
+		<item name="android:textColorPrimary">@color/dark_main</item>
+		<item name="np_textSize">@dimen/text_size_normal</item>
+		<item name="np_selectedTextSize">@dimen/text_size_normal</item>
+		<item name="np_textColor">@color/dark_main</item>
+		<item name="np_selectedTextColor">@color/dark_main</item>
+		<item name="np_dividerColor">@color/blue_main</item>
+		<item name="np_wheelItemCount">3</item>
+	</style>
+
 </resources>

From 2023bd161f77fde97f004bfa54ab99a2a6643fe2 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 26 May 2021 10:07:31 +0200
Subject: [PATCH 106/207] Added QR Code Intent filter

---
 app/build.gradle                 |  5 +++++
 app/src/main/AndroidManifest.xml | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index c3302c1b5..3c2aa148c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,6 +76,7 @@ android {
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.dev'
+			manifestPlaceholders = [qrCodeHostName: "qr-d.swisscovid.ch"]
 		}
 		tescht {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
@@ -90,6 +91,7 @@ android {
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.test.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.test'
+			manifestPlaceholders = [qrCodeHostName: "qr-t.swisscovid.ch"]
 		}
 		abnahme {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
@@ -104,6 +106,7 @@ android {
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.abnahme'
+			manifestPlaceholders = [qrCodeHostName: "qr-a.swisscovid.ch"]
 		}
 		prod {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'false'
@@ -117,6 +120,7 @@ android {
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
+			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
 		}
 		log {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
@@ -130,6 +134,7 @@ android {
 			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
+			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
 		}
 	}
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ab7b259d9..e3f43bfa3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,22 @@
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 
+			<intent-filter
+				android:autoVerify="true"
+				android:order="1">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data
+					android:host="${qrCodeHostName}"
+					android:scheme="https" />
+				<data
+					android:host="${qrCodeHostName}"
+					android:scheme="http" />
+			</intent-filter>
+
 			<intent-filter android:autoVerify="true">
 				<action android:name="android.intent.action.VIEW" />
 

From 1f09b5ed4fe579ac3e89da80da6ab2bccaf430d1 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Wed, 26 May 2021 11:31:36 +0200
Subject: [PATCH 107/207] functional date time picker

---
 .../checkin/checkinflow/CheckOutFragment.kt   | 20 ++++++-
 .../checkin/diary/EditDiaryEntryFragment.kt   | 17 ++++++
 .../bag/dp3t/checkin/models/CheckInState.java | 57 -------------------
 .../bag/dp3t/checkin/models/CheckInState.kt   | 11 ++++
 .../ch/admin/bag/dp3t/view/DateTimePicker.kt  | 17 +++++-
 .../layout/fragment_check_out_and_edit.xml    |  4 +-
 app/src/main/res/values/styles.xml            |  1 +
 7 files changed, 64 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index 4b5d6e5c0..75768dafa 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -40,8 +40,7 @@ class CheckOutFragment : Fragment() {
 		super.onCreate(savedInstanceState)
 		viewModel = ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel::class.java)
 		checkIfAutoCheckoutHappened()
-		checkInState = viewModel.checkInState ?: return
-		checkInState.checkOutTime = System.currentTimeMillis()
+		checkInState = viewModel.checkInState?.copy(checkOutTime = System.currentTimeMillis()) ?: return
 		venueInfo = checkInState.venueInfo
 	}
 
@@ -65,10 +64,27 @@ class CheckOutFragment : Fragment() {
 			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			checkoutPrimaryButton.setText(R.string.checkout_button_title)
 			checkoutPrimaryButton.setOnClickListener { performCheckout() }
+
+			checkoutTimeArrival.setDateTime(checkInState.checkInTime)
+			checkoutTimeArrival.setOnDateTimeChangedListener {
+				checkInState.checkInTime = checkoutTimeArrival.getSelectedUnixTimestamp()
+			}
+
+			checkoutTimeDeparture.setDateTime(checkInState.checkOutTime)
+			checkoutTimeDeparture.setOnDateTimeChangedListener {
+				checkInState.checkOutTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
+			}
 		}.root
 	}
 
 	private fun performCheckout() {
+		checkInState.run {
+			if (checkInTime > checkOutTime) {
+				// swap arrival and departure time
+				checkInTime = checkOutTime.also { checkOutTime = checkInTime }
+			}
+		}
+
 		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(checkInState.checkInTime, checkInState.checkOutTime, requireContext())
 		if (hasOverlapWithOtherCheckin) {
 			CheckinTimeHelper.showOverlapDialog(requireContext())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 43287ea07..50fc11ba5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -48,10 +48,27 @@ class EditDiaryEntryFragment : Fragment() {
 			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			checkoutPrimaryButton.setText(R.string.remove_from_diary_button)
 			checkoutPrimaryButton.setOnClickListener { hideInDiary() }
+
+			checkoutTimeArrival.setDateTime(diaryEntry.arrivalTime)
+			checkoutTimeArrival.setOnDateTimeChangedListener {
+				diaryEntry.arrivalTime = checkoutTimeArrival.getSelectedUnixTimestamp()
+			}
+
+			checkoutTimeDeparture.setDateTime(diaryEntry.departureTime)
+			checkoutTimeDeparture.setOnDateTimeChangedListener {
+				diaryEntry.departureTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
+			}
 		}.root
 	}
 
 	private fun performSave() {
+		diaryEntry.run {
+			if (arrivalTime > departureTime) {
+				// swap arrival and departure time
+				arrivalTime = departureTime.also { departureTime = arrivalTime }
+			}
+		}
+
 		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(diaryEntry, requireContext())
 		if (hasOverlapWithOtherCheckin) {
 			CheckinTimeHelper.showOverlapDialog(requireContext())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
deleted file mode 100644
index f1072f36d..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package ch.admin.bag.dp3t.checkin.models;
-
-import org.crowdnotifier.android.sdk.model.VenueInfo;
-
-public class CheckInState {
-	private boolean isCheckedIn;
-	private VenueInfo venueInfo;
-	private long checkInTime;
-	private long checkOutTime;
-	private long selectedReminderDelay;
-
-	public CheckInState(boolean isCheckedIn, VenueInfo venueInfo, long checkInTime, long checkOutTime,
-			long selectedReminderDelay) {
-		this.isCheckedIn = isCheckedIn;
-		this.venueInfo = venueInfo;
-		this.checkInTime = checkInTime;
-		this.checkOutTime = checkOutTime;
-		this.selectedReminderDelay = selectedReminderDelay;
-	}
-
-	public boolean isCheckedIn() {
-		return isCheckedIn;
-	}
-
-	public VenueInfo getVenueInfo() {
-		return venueInfo;
-	}
-
-	public long getCheckInTime() {
-		return checkInTime;
-	}
-
-	public long getCheckOutTime() {
-		return checkOutTime;
-	}
-
-	public long getSelectedReminderDelay() {
-		return selectedReminderDelay;
-	}
-
-	public void setCheckedIn(boolean checkedIn) {
-		isCheckedIn = checkedIn;
-	}
-
-	public void setCheckInTime(long checkInTime) {
-		this.checkInTime = checkInTime;
-	}
-
-	public void setCheckOutTime(long checkOutTime) {
-		this.checkOutTime = checkOutTime;
-	}
-
-	public void setSelectedReminderDelay(long selectedReminderDelay) {
-		this.selectedReminderDelay = selectedReminderDelay;
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
new file mode 100644
index 000000000..3c9536242
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
@@ -0,0 +1,11 @@
+package ch.admin.bag.dp3t.checkin.models
+
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+data class CheckInState(
+	var isCheckedIn: Boolean,
+	val venueInfo: VenueInfo,
+	var checkInTime: Long,
+	var checkOutTime: Long,
+	var selectedReminderDelay: Long
+)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt b/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt
index 53fb83afc..4c5568e9a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/view/DateTimePicker.kt
@@ -9,6 +9,7 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.ViewDatetimePickerBinding
 import ch.admin.bag.dp3t.util.DateUtils
 import com.shawnlin.numberpicker.NumberPicker
+import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.temporal.ChronoUnit
@@ -24,7 +25,7 @@ class DateTimePicker @JvmOverloads constructor(
 	private val now = LocalDateTime.now()
 	private var previousDateTime = now
 
-	private val daysInPast = 7
+	private val daysInPast = 180
 	private val daysInFuture = 0
 
 	private lateinit var dateFormatter: NumberPicker.Formatter
@@ -99,7 +100,15 @@ class DateTimePicker @JvmOverloads constructor(
 		}
 	}
 
-	fun setPreviousDateTime(previousDateTime: LocalDateTime) {
+	fun setDateTime(unixTimestamp: Long) {
+		setDateTime(
+			Instant.ofEpochMilli(unixTimestamp)
+				.atZone(zoneId)
+				.toLocalDateTime()
+		)
+	}
+
+	fun setDateTime(previousDateTime: LocalDateTime) {
 		this.previousDateTime = previousDateTime
 		updatePickerValues()
 	}
@@ -115,6 +124,10 @@ class DateTimePicker @JvmOverloads constructor(
 		return now.plusDays(dateValue.toLong()).withHour(hourValue).withMinute(minuteValue)
 	}
 
+	fun getSelectedUnixTimestamp(): Long {
+		return getSelectedDateTime().atZone(zoneId).toEpochSecond() * 1000L
+	}
+
 	private fun updatePickerValues() {
 		val dayDifference = ChronoUnit.DAYS.between(now.toLocalDate(), previousDateTime.toLocalDate())
 		val preSelectedValue = daysInPast + dayDifference
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index 9fe515527..1ca8be42d 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -74,7 +74,7 @@
 			<ch.admin.bag.dp3t.view.DateTimePicker
 				android:id="@+id/checkout_time_arrival"
 				android:layout_width="match_parent"
-				android:layout_height="132dp" />
+				android:layout_height="108dp" />
 
 			<TextView
 				style="@style/CrowdNotifier.Text.Status.Small"
@@ -86,7 +86,7 @@
 			<ch.admin.bag.dp3t.view.DateTimePicker
 				android:id="@+id/checkout_time_departure"
 				android:layout_width="match_parent"
-				android:layout_height="132dp" />
+				android:layout_height="108dp" />
 
 			<Space
 				android:layout_width="0dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 447b02d96..6622726b3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -372,6 +372,7 @@
 		<item name="np_textColor">@color/dark_main</item>
 		<item name="np_selectedTextColor">@color/dark_main</item>
 		<item name="np_dividerColor">@color/blue_main</item>
+		<item name="np_dividerDistance">36sp</item>
 		<item name="np_wheelItemCount">3</item>
 	</style>
 

From 73b82d8fa87791815221b0f6c957e440a898a9ae Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 26 May 2021 13:27:02 +0200
Subject: [PATCH 108/207] Fix minor diary bug

---
 .../bag/dp3t/checkin/checkinflow/CheckOutFragment.kt | 12 +++++-------
 .../ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt |  7 +++----
 .../bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt |  9 +++------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index 75768dafa..ed8775516 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.diary.CheckinTimeHelper
@@ -26,19 +26,16 @@ class CheckOutFragment : Fragment() {
 		private val TAG = CheckOutFragment::class.java.canonicalName
 
 		@JvmStatic
-		fun newInstance(): CheckOutFragment {
-			return CheckOutFragment()
-		}
+		fun newInstance() = CheckOutFragment()
 	}
 
-	private lateinit var viewModel: CrowdNotifierViewModel
+	private val viewModel: CrowdNotifierViewModel by activityViewModels()
 
 	private lateinit var venueInfo: VenueInfo
 	private lateinit var checkInState: CheckInState
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		viewModel = ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel::class.java)
 		checkIfAutoCheckoutHappened()
 		checkInState = viewModel.checkInState?.copy(checkOutTime = System.currentTimeMillis()) ?: return
 		venueInfo = checkInState.venueInfo
@@ -85,7 +82,8 @@ class CheckOutFragment : Fragment() {
 			}
 		}
 
-		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(checkInState.checkInTime, checkInState.checkOutTime, requireContext())
+		val hasOverlapWithOtherCheckin =
+			CheckinTimeHelper.checkForOverlap(checkInState.checkInTime, checkInState.checkOutTime, requireContext())
 		if (hasOverlapWithOtherCheckin) {
 			CheckinTimeHelper.showOverlapDialog(requireContext())
 			return
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index d46ff2373..a43d330da 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -15,6 +15,7 @@ import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentCheckinDiaryBinding
 import ch.admin.bag.dp3t.extensions.showFragment
+import ch.admin.bag.dp3t.reports.CheckinReportItem
 import ch.admin.bag.dp3t.reports.ReportsFragment
 import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.model.ExposureEvent
@@ -25,9 +26,7 @@ class DiaryFragment : Fragment() {
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
 
 	companion object {
-		fun newInstance(): DiaryFragment {
-			return DiaryFragment()
-		}
+		fun newInstance() = DiaryFragment()
 	}
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -68,7 +67,7 @@ class DiaryFragment : Fragment() {
 
 	private fun onDiaryEntryClicked(diaryEntry: DiaryEntry, exposureEvent: ExposureEvent?) {
 		if (exposureEvent != null) {
-			showFragment(ReportsFragment.newInstance())
+			showFragment(ReportsFragment.newInstance(reportItem = CheckinReportItem(exposureEvent, diaryEntry)))
 		} else {
 			showFragment(EditDiaryEntryFragment.newInstance(diaryEntry.id))
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 50fc11ba5..4d3ec90e0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
@@ -20,12 +21,8 @@ class EditDiaryEntryFragment : Fragment() {
 		private const val ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID"
 
 		@JvmStatic
-		fun newInstance(diaryEntryId: Long): EditDiaryEntryFragment {
-			val fragment = EditDiaryEntryFragment()
-			val args = Bundle()
-			args.putLong(ARG_DIARY_ENTRY_ID, diaryEntryId)
-			fragment.arguments = args
-			return fragment
+		fun newInstance(diaryEntryId: Long) = EditDiaryEntryFragment().apply {
+			arguments = bundleOf(ARG_DIARY_ENTRY_ID to diaryEntryId)
 		}
 	}
 

From 29cebe2502ba20002def876f78e69194a6b492cb Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 26 May 2021 13:43:10 +0200
Subject: [PATCH 109/207] Use modal animation for Checkout Fragment

---
 .../dp3t/checkin/CheckinOverviewFragment.kt   |  2 +-
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |  2 +-
 .../networking/UserUploadRepository.kt        |  2 +-
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  3 +-
 .../layout/fragment_check_out_and_edit.xml    | 34 +++++++++++--------
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index 514c0a35d..eaba7d920 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -55,7 +55,7 @@ class CheckinOverviewFragment : Fragment() {
 			})
 
 			checkinButton.setOnClickListener { showFragment(QrCodeScannerFragment.newInstance()) }
-			checkoutButton.setOnClickListener { showFragment(CheckOutFragment.newInstance()) }
+			checkoutButton.setOnClickListener { showFragment(CheckOutFragment.newInstance(), modalAnimation = true) }
 
 			crowdNotifierViewModel.timeSinceCheckIn.observe(viewLifecycleOwner) { duration ->
 				checkinTime.text = StringUtil.getShortDurationString(duration)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index a43d330da..bcccbd259 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -69,7 +69,7 @@ class DiaryFragment : Fragment() {
 		if (exposureEvent != null) {
 			showFragment(ReportsFragment.newInstance(reportItem = CheckinReportItem(exposureEvent, diaryEntry)))
 		} else {
-			showFragment(EditDiaryEntryFragment.newInstance(diaryEntry.id))
+			showFragment(EditDiaryEntryFragment.newInstance(diaryEntry.id), modalAnimation = true)
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
index caf8bb6d9..1d454fb5c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -11,7 +11,7 @@ import retrofit2.Retrofit
 import retrofit2.converter.protobuf.ProtoConverterFactory
 import java.util.*
 
-private const val USER_UPLOAD_SIZE = 1000
+private const val USER_UPLOAD_SIZE = 1024
 private const val USER_UPLOAD_VERSION = 3
 
 class UserUploadRepository {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 901fbda56..7a0dffcd3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -480,7 +480,8 @@ private void setupCovidCodeCard() {
 
 	private void showCheckOutFragment() {
 		requireActivity().getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter,
+						R.anim.modal_pop_exit)
 				.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
 				.addToBackStack(CheckOutFragment.class.getCanonicalName())
 				.commit();
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index 1ca8be42d..8f8915480 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -8,32 +7,39 @@
 	android:elevation="@dimen/modal_elevation"
 	android:orientation="vertical">
 
-	<androidx.constraintlayout.widget.ConstraintLayout
+	<FrameLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingHorizontal="@dimen/spacing_medium_large">
+		android:background="@color/white"
+		android:elevation="@dimen/card_elevation">
 
 		<TextView
 			android:id="@+id/toolbar_cancel_button"
-			style="@style/NextStep.Button.Transparent.Blue"
+			style="@style/NextStep.Text.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="end"
-			android:text="@string/cancel"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
+			android:layout_gravity="start"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/cancel" />
 
 		<TextView
 			android:id="@+id/toolbar_done_button"
-			style="@style/NextStep.Button.Transparent.Blue"
+			style="@style/NextStep.Text.Bold.Blue"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="end"
-			android:text="@string/checkout_save_button_title"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/checkout_save_button_title" />
 
-	</androidx.constraintlayout.widget.ConstraintLayout>
+	</FrameLayout>
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -80,7 +86,7 @@
 				style="@style/CrowdNotifier.Text.Status.Small"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_medium"
+				android:layout_marginTop="@dimen/spacing_large"
 				android:text="@string/datepicker_to" />
 
 			<ch.admin.bag.dp3t.view.DateTimePicker

From 14cd068f66f996db43bd2a3182a50f771e76d21a Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 26 May 2021 13:46:53 +0200
Subject: [PATCH 110/207] show TracingStoppedFragment after sharing nothing

---
 .../main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
index 171ab7617..9a72049de 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/NotThankYouFragment.kt
@@ -23,7 +23,7 @@ class NotThankYouFragment : TraceKeyShareBaseFragment() {
 		return binding.apply {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			dontSendButton.setOnClickListener {
-				performUpload(onSuccess = { requireActivity().finish() })
+				performUpload(onSuccess = { showFragment(TracingStoppedFragment.newInstance(), R.id.inform_fragment_container) })
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			backButton.setOnClickListener { showFragment(ReallyNotShareFragment.newInstance(), R.id.inform_fragment_container) }

From 0e2c7c7fd9821c6da40628e5ffe4e7a5ef1fc155 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 26 May 2021 13:49:01 +0200
Subject: [PATCH 111/207] Update version to 2.0.0

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9967c8a58..3050d55b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,8 +43,8 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 15000
-		versionName "1.5.0"
+		versionCode 20000
+		versionName "2.0.0"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 
 		buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'

From abd73bade6d65521e1c93da1e69e46cd982eb961 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 16:26:40 +0200
Subject: [PATCH 112/207] Implemented Instant App

---
 app/build.gradle                              |  28 +-
 .../java/ch/admin/bag/dp3t/MainActivity.java  | 328 -----------------
 .../java/ch/admin/bag/dp3t/MainActivity.kt    | 330 ++++++++++++++++++
 .../dp3t/checkin/CheckinOverviewFragment.kt   |   1 -
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  16 +
 .../checkin/checkinflow/CheckInFragment.kt    |  16 +-
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |   2 +-
 .../diary/DiaryRecyclerViewAdapter.java       |  14 +-
 .../checkin/utils/NotificationHelper.java     |   1 -
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |   2 +-
 .../bag/dp3t/home/TracingBoxFragment.java     |  14 +-
 .../dp3t/onboarding/OnboardingActivity.java   |  87 -----
 .../bag/dp3t/onboarding/OnboardingActivity.kt |  79 +++++
 .../OnboardingFinishedFragment.java           |  38 --
 .../onboarding/OnboardingFinishedFragment.kt  |  43 +++
 .../OnboardingGaenPermissionFragment.java     |  17 +-
 .../onboarding/OnboardingSlidePageAdapter.kt  |  87 +++--
 .../bag/dp3t/onboarding/OnboardingType.kt     |   5 +
 .../UpdateBoardingFragment.kt                 |   8 +-
 .../admin/bag/dp3t/reports/ReportsFragment.kt |   6 -
 .../admin/bag/dp3t/storage/SecureStorage.java |  11 +-
 .../updateboarding/UpdateBoardingActivity.kt  |  44 ---
 .../bag/dp3t/util/BetterActivityResult.kt     |  71 ++++
 .../bag/dp3t/util/TracingStatusHelper.java    |  11 +
 .../java/ch/admin/bag/dp3t/util/UiUtils.java  |   1 -
 .../bg_button_default_crowdnotifier.xml       |  17 -
 app/src/main/res/layout/fragment_check_in.xml |   9 +-
 .../layout/fragment_check_out_and_edit.xml    |  14 +-
 .../layout/fragment_onboarding_finished.xml   |  11 +-
 .../fragment_onboarding_permission_gaen.xml   |   3 +-
 .../res/layout/fragment_qr_code_scanner.xml   |   5 +-
 .../res/layout/item_checkin_venue_visit.xml   |  41 +--
 .../item_checkin_venue_visits_day_header.xml  |   9 +-
 app/src/main/res/values/app_styles.xml        |  86 +++++
 .../main/res/values/crowdnotifier_styles.xml  | 114 ------
 common/.gitignore                             |   1 +
 common/build.gradle                           |  72 ++++
 common/consumer-rules.pro                     |   0
 common/proguard-rules.pro                     |  21 ++
 common/src/main/AndroidManifest.xml           |   5 +
 .../models/CrowdNotifierErrorState.java       |   7 +-
 .../bag/dp3t/checkin/models/ReminderOption.kt |   0
 .../bag/dp3t/checkin/utils/ErrorHelper.java   |  11 +-
 .../dp3t/extensions/VenueInfoExtensions.kt    |   0
 .../dp3t/extensions/VenueTypeExtensions.kt    |   0
 {app => common}/src/main/proto/App.proto      |   0
 .../src/main/proto/Crowdnotifier.proto        |   0
 .../src/main/res/anim/fragment_open_enter.xml |   0
 .../src/main/res/anim/fragment_open_exit.xml  |   0
 .../src/main/res/anim/modal_pop_enter.xml     |   0
 .../src/main/res/anim/modal_pop_exit.xml      |   0
 .../src/main/res/anim/modal_slide_enter.xml   |   0
 .../src/main/res/anim/modal_slide_exit.xml    |   0
 .../src/main/res/anim/slide_enter.xml         |   0
 .../src/main/res/anim/slide_exit.xml          |   0
 .../src/main/res/anim/slide_pop_enter.xml     |   0
 .../src/main/res/anim/slide_pop_exit.xml      |   0
 .../color/selector_bottom_navigation_item.xml |   0
 .../main/res/color/switch_tint_selector.xml   |   0
 .../src/main/res/drawable/bg_button_blue.xml  |   0
 .../main/res/drawable/bg_button_default.xml   |   0
 .../main/res/drawable/bg_button_outlined.xml  |   0
 .../drawable/bg_button_outlined_purple.xml    |   0
 .../res/drawable/bg_button_outlined_red.xml   |   0
 .../main/res/drawable/bg_button_purple.xml    |   0
 .../src/main/res/drawable/bg_button_white.xml |   0
 .../res/drawable/bg_chained_edit_text.xml     |   0
 .../src/main/res/drawable/bg_toolbar.xml      |   0
 .../src/main/res/drawable/ic_cam_off.xml      |   0
 .../src/main/res/drawable/ic_error.xml        |   0
 .../main/res/drawable/ic_illu_check_in.xml    |   0
 .../src/main/res/drawable/ic_info.xml         |   0
 .../src/main/res/drawable/ic_qr.xml           |   0
 .../main/res/drawable/ic_radio_checked.xml    |   0
 .../main/res/drawable/ic_radio_unchecked.xml  |   0
 .../drawable/outlined_button_text_color.xml   |   0
 .../src/main/res/drawable/ripple_button.xml   |   0
 .../src/main/res/font/inter_bold.ttf          | Bin
 .../src/main/res/font/inter_light.ttf         | Bin
 .../src/main/res/font/inter_regular.ttf       | Bin
 .../src/main/res/layout/item_error_status.xml |   2 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   0
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../mipmap-hdpi/ic_launcher_background.png    | Bin
 .../mipmap-hdpi/ic_launcher_foreground.png    | Bin
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../mipmap-mdpi/ic_launcher_background.png    | Bin
 .../mipmap-mdpi/ic_launcher_foreground.png    | Bin
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../mipmap-xhdpi/ic_launcher_background.png   | Bin
 .../mipmap-xhdpi/ic_launcher_foreground.png   | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../mipmap-xxhdpi/ic_launcher_background.png  | Bin
 .../mipmap-xxhdpi/ic_launcher_foreground.png  | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin
 .../mipmap-xxxhdpi/ic_launcher_background.png | Bin
 .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin
 .../src/main/res/values-bs/strings.xml        |   0
 .../src/main/res/values-de/strings.xml        |   0
 .../src/main/res/values-es/strings.xml        |   0
 .../src/main/res/values-fr/strings.xml        |   0
 .../src/main/res/values-hr/strings.xml        |   0
 .../src/main/res/values-it/strings.xml        |   0
 .../src/main/res/values-pt/strings.xml        |   0
 .../src/main/res/values-rm/strings.xml        |   0
 .../src/main/res/values-sq/strings.xml        |   0
 .../src/main/res/values-sr/strings.xml        |   0
 .../src/main/res/values-ti/strings.xml        |   0
 .../src/main/res/values-tr/strings.xml        |   0
 .../src/main/res/values/colors.xml            |   0
 .../src/main/res/values/developer_strings.xml |   0
 .../src/main/res/values/dimens.xml            |   0
 .../src/main/res/values/sdk_string_config.xml |   0
 .../src/main/res/values/strings.xml           |   0
 .../main/res/values/strings_untranslated.xml  |   0
 .../src/main/res/values/styles.xml            |  86 -----
 instant/.gitignore                            |   1 +
 instant/build.gradle                          |  73 ++++
 instant/proguard-rules.pro                    |  21 ++
 instant/src/main/AndroidManifest.xml          |  55 +++
 .../java/ch/admin/bag/dp3t/InstantActivity.kt |  19 +
 .../java/ch/admin/bag/dp3t/InstantFragment.kt | 109 ++++++
 .../src/main/res/layout/activity_instant.xml  |   4 +-
 .../src/main/res/layout/fragment_instant.xml  | 135 +++++++
 settings.gradle                               |   4 +-
 131 files changed, 1310 insertions(+), 885 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingType.kt
 rename app/src/main/java/ch/admin/bag/dp3t/{updateboarding => onboarding}/UpdateBoardingFragment.kt (88%)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt
 delete mode 100644 app/src/main/res/drawable/bg_button_default_crowdnotifier.xml
 create mode 100644 app/src/main/res/values/app_styles.xml
 delete mode 100644 app/src/main/res/values/crowdnotifier_styles.xml
 create mode 100644 common/.gitignore
 create mode 100644 common/build.gradle
 create mode 100644 common/consumer-rules.pro
 create mode 100644 common/proguard-rules.pro
 create mode 100644 common/src/main/AndroidManifest.xml
 rename {app => common}/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java (86%)
 rename {app => common}/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt (100%)
 rename {app => common}/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java (86%)
 rename {app => common}/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt (100%)
 rename {app => common}/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt (100%)
 rename {app => common}/src/main/proto/App.proto (100%)
 rename {app => common}/src/main/proto/Crowdnotifier.proto (100%)
 rename {app => common}/src/main/res/anim/fragment_open_enter.xml (100%)
 rename {app => common}/src/main/res/anim/fragment_open_exit.xml (100%)
 rename {app => common}/src/main/res/anim/modal_pop_enter.xml (100%)
 rename {app => common}/src/main/res/anim/modal_pop_exit.xml (100%)
 rename {app => common}/src/main/res/anim/modal_slide_enter.xml (100%)
 rename {app => common}/src/main/res/anim/modal_slide_exit.xml (100%)
 rename {app => common}/src/main/res/anim/slide_enter.xml (100%)
 rename {app => common}/src/main/res/anim/slide_exit.xml (100%)
 rename {app => common}/src/main/res/anim/slide_pop_enter.xml (100%)
 rename {app => common}/src/main/res/anim/slide_pop_exit.xml (100%)
 rename {app => common}/src/main/res/color/selector_bottom_navigation_item.xml (100%)
 rename {app => common}/src/main/res/color/switch_tint_selector.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_blue.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_default.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_outlined.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_outlined_purple.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_outlined_red.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_purple.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_button_white.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_chained_edit_text.xml (100%)
 rename {app => common}/src/main/res/drawable/bg_toolbar.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_cam_off.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_error.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_illu_check_in.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_info.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_qr.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_radio_checked.xml (100%)
 rename {app => common}/src/main/res/drawable/ic_radio_unchecked.xml (100%)
 rename {app => common}/src/main/res/drawable/outlined_button_text_color.xml (100%)
 rename {app => common}/src/main/res/drawable/ripple_button.xml (100%)
 rename {app => common}/src/main/res/font/inter_bold.ttf (100%)
 rename {app => common}/src/main/res/font/inter_light.ttf (100%)
 rename {app => common}/src/main/res/font/inter_regular.ttf (100%)
 rename {app => common}/src/main/res/layout/item_error_status.xml (97%)
 rename {app => common}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
 rename {app => common}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
 rename {app => common}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename {app => common}/src/main/res/mipmap-hdpi/ic_launcher_background.png (100%)
 rename {app => common}/src/main/res/mipmap-hdpi/ic_launcher_foreground.png (100%)
 rename {app => common}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%)
 rename {app => common}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename {app => common}/src/main/res/mipmap-mdpi/ic_launcher_background.png (100%)
 rename {app => common}/src/main/res/mipmap-mdpi/ic_launcher_foreground.png (100%)
 rename {app => common}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%)
 rename {app => common}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename {app => common}/src/main/res/mipmap-xhdpi/ic_launcher_background.png (100%)
 rename {app => common}/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png (100%)
 rename {app => common}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%)
 rename {app => common}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename {app => common}/src/main/res/mipmap-xxhdpi/ic_launcher_background.png (100%)
 rename {app => common}/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png (100%)
 rename {app => common}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%)
 rename {app => common}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename {app => common}/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png (100%)
 rename {app => common}/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png (100%)
 rename {app => common}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%)
 rename {app => common}/src/main/res/values-bs/strings.xml (100%)
 rename {app => common}/src/main/res/values-de/strings.xml (100%)
 rename {app => common}/src/main/res/values-es/strings.xml (100%)
 rename {app => common}/src/main/res/values-fr/strings.xml (100%)
 rename {app => common}/src/main/res/values-hr/strings.xml (100%)
 rename {app => common}/src/main/res/values-it/strings.xml (100%)
 rename {app => common}/src/main/res/values-pt/strings.xml (100%)
 rename {app => common}/src/main/res/values-rm/strings.xml (100%)
 rename {app => common}/src/main/res/values-sq/strings.xml (100%)
 rename {app => common}/src/main/res/values-sr/strings.xml (100%)
 rename {app => common}/src/main/res/values-ti/strings.xml (100%)
 rename {app => common}/src/main/res/values-tr/strings.xml (100%)
 rename {app => common}/src/main/res/values/colors.xml (100%)
 rename {app => common}/src/main/res/values/developer_strings.xml (100%)
 rename {app => common}/src/main/res/values/dimens.xml (100%)
 rename {app => common}/src/main/res/values/sdk_string_config.xml (100%)
 rename {app => common}/src/main/res/values/strings.xml (100%)
 rename {app => common}/src/main/res/values/strings_untranslated.xml (100%)
 rename {app => common}/src/main/res/values/styles.xml (69%)
 create mode 100644 instant/.gitignore
 create mode 100644 instant/build.gradle
 create mode 100644 instant/proguard-rules.pro
 create mode 100644 instant/src/main/AndroidManifest.xml
 create mode 100644 instant/src/main/java/ch/admin/bag/dp3t/InstantActivity.kt
 create mode 100644 instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
 rename app/src/main/res/layout/activity_update_boarding.xml => instant/src/main/res/layout/activity_instant.xml (67%)
 create mode 100644 instant/src/main/res/layout/fragment_instant.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3050d55b2..a8565e081 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,6 @@ plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
 	id 'org.sonarqube' version '2.8'
-	id 'com.google.protobuf'
 
 }
 
@@ -169,30 +168,8 @@ android {
 	buildFeatures {
 		viewBinding true
 	}
-
-	protobuf {
-		protoc {
-			artifact = 'com.google.protobuf:protoc:3.0.0'
-		}
-		plugins {
-			javalite {
-				artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
-			}
-		}
-		generateProtoTasks {
-			all().each { task ->
-				task.builtins {
-					remove java
-				}
-				task.plugins {
-					javalite {}
-				}
-			}
-		}
-	}
 }
 
-
 sonarqube {
 	properties {
 		property "sonar.projectKey", "DP-3T_dp3t-app-android-ch"
@@ -202,7 +179,11 @@ sonarqube {
 	}
 }
 
+
 dependencies {
+
+	implementation project(":common")
+
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 	implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
@@ -218,6 +199,7 @@ dependencies {
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 	implementation 'androidx.fragment:fragment-ktx:1.3.3'
+	implementation "androidx.activity:activity-ktx:1.2.3"
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
deleted file mode 100644
index d6b00752d..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.crowdnotifier.android.sdk.CrowdNotifier;
-import org.crowdnotifier.android.sdk.model.VenueInfo;
-import org.crowdnotifier.android.sdk.utils.QrUtils;
-import org.dpppt.android.sdk.DP3T;
-
-import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment;
-import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
-import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment;
-import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment;
-import ch.admin.bag.dp3t.checkin.models.CheckInState;
-import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker;
-import ch.admin.bag.dp3t.checkin.utils.ErrorDialog;
-import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
-import ch.admin.bag.dp3t.inform.InformActivity;
-import ch.admin.bag.dp3t.networking.ConfigWorker;
-import ch.admin.bag.dp3t.onboarding.OnboardingActivity;
-import ch.admin.bag.dp3t.reports.ReportsFragment;
-import ch.admin.bag.dp3t.reports.ReportsOverviewFragment;
-import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.updateboarding.UpdateBoardingActivity;
-import ch.admin.bag.dp3t.util.UrlUtil;
-import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
-import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment;
-
-import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT;
-import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
-import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CHECK_OUT_NOW;
-import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION;
-import static ch.admin.bag.dp3t.checkin.utils.NotificationHelper.ACTION_ONGOING_NOTIFICATION;
-import static ch.admin.bag.dp3t.inform.InformActivity.EXTRA_COVIDCODE;
-import static ch.admin.bag.dp3t.updateboarding.UpdateBoardingActivity.UPDATE_BOARDING_VERSION;
-import static ch.admin.bag.dp3t.util.NotificationUtil.ACTION_ACTIVATE_TRACING;
-
-public class MainActivity extends FragmentActivity {
-
-	public static final String ACTION_EXPOSED_GOTO_REPORTS = "ACTION_EXPOSED_GOTO_REPORTS";
-	public static final String ACTION_INFORMED_GOTO_REPORTS = "ACTION_INFORMED_GOTO_REPORTS";
-
-	private static final String KEY_IS_INTENT_CONSUMED = "KEY_IS_INTENT_CONSUMED";
-	private boolean isIntentConsumed = false;
-
-	private SecureStorage secureStorage;
-	private TracingViewModel tracingViewModel;
-	private CrowdNotifierViewModel crowdNotifierViewModel;
-
-	private AlertDialog forceUpdateDialog;
-
-
-	private final ActivityResultLauncher<Intent> onAndUpdateBoardingLauncher =
-			registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
-				if (activityResult.getResultCode() == RESULT_OK) {
-					secureStorage.setLastShownUpdateBoardingVersion(UPDATE_BOARDING_VERSION);
-					secureStorage.setOnboardingCompleted(true);
-					showHomeFragment();
-				} else {
-					finish();
-				}
-			});
-
-	private BroadcastReceiver autoCheckoutBroadcastReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			showHomeFragment();
-		}
-	};
-
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_main);
-
-		secureStorage = SecureStorage.getInstance(this);
-
-		secureStorage.getForceUpdateLiveData().observe(this, forceUpdate -> {
-			forceUpdate = forceUpdate && secureStorage.getDoForceUpdate();
-			if (forceUpdate && forceUpdateDialog == null) {
-				forceUpdateDialog = new AlertDialog.Builder(this, R.style.NextStep_AlertDialogStyle)
-						.setTitle(R.string.force_update_title)
-						.setMessage(R.string.force_update_text)
-						.setPositiveButton(R.string.playservices_update, null)
-						.setCancelable(false)
-						.create();
-				forceUpdateDialog.setOnShowListener(dialog ->
-						forceUpdateDialog.getButton(DialogInterface.BUTTON_POSITIVE)
-								.setOnClickListener(v -> {
-									String packageName = getPackageName();
-									UrlUtil.openUrl(MainActivity.this, "market://details?id=" + packageName);
-								}));
-				forceUpdateDialog.show();
-			} else if (!forceUpdate && forceUpdateDialog != null) {
-				forceUpdateDialog.dismiss();
-				forceUpdateDialog = null;
-			}
-		});
-
-		ConfigWorker.scheduleConfigWorkerIfOutdated(this);
-		CrowdNotifierKeyLoadWorker.startKeyLoadWorker(this);
-		CrowdNotifierKeyLoadWorker.cleanUpOldData(this);
-
-		if (savedInstanceState == null) {
-			boolean onboardingCompleted = secureStorage.getOnboardingCompleted();
-			int lastShownUpdateBoardingVersion = secureStorage.getLastShownUpdateBoardingVersion();
-			if (!onboardingCompleted) {
-				onAndUpdateBoardingLauncher.launch(new Intent(this, OnboardingActivity.class));
-			} else if (lastShownUpdateBoardingVersion < UPDATE_BOARDING_VERSION) {
-				onAndUpdateBoardingLauncher.launch(new Intent(this, UpdateBoardingActivity.class));
-			} else {
-				showHomeFragment();
-			}
-		} else {
-			isIntentConsumed = savedInstanceState.getBoolean(KEY_IS_INTENT_CONSUMED);
-		}
-
-		tracingViewModel = new ViewModelProvider(this).get(TracingViewModel.class);
-		crowdNotifierViewModel = new ViewModelProvider(this).get(CrowdNotifierViewModel.class);
-		tracingViewModel.sync();
-	}
-
-	@Override
-	public void onSaveInstanceState(@NonNull Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putBoolean(KEY_IS_INTENT_CONSUMED, isIntentConsumed);
-	}
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		super.onNewIntent(intent);
-		setIntent(intent);
-		isIntentConsumed = false;
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		secureStorage.setAppOpenAfterNotificationPending(false);
-		autoCheckoutIfNecessary(this, crowdNotifierViewModel.getCheckInState());
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		if (secureStorage.getOnboardingCompleted()) checkIntentForActions();
-		LocalBroadcastManager.getInstance(this)
-				.registerReceiver(autoCheckoutBroadcastReceiver, new IntentFilter(ACTION_DID_AUTO_CHECKOUT));
-	}
-
-	private void checkIntentForActions() {
-		Intent intent = getIntent();
-		boolean launchedFromHistory = (intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0;
-		if (!launchedFromHistory && !isIntentConsumed) {
-			isIntentConsumed = true;
-			handleCustomIntents();
-		}
-	}
-
-	private void handleCustomIntents() {
-		String intentAction = getIntent().getAction();
-		if (ACTION_INFORMED_GOTO_REPORTS.equals(intentAction)) {
-			secureStorage.setLeitfadenOpenPending(false);
-			secureStorage.setReportsHeaderAnimationPending(false);
-			showReportsFragment();
-		} else if (ACTION_EXPOSED_GOTO_REPORTS.equals(intentAction)) {
-			if (tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed() ||
-					!crowdNotifierViewModel.getExposures().getValue().isEmpty()) {
-				showReportsFragment();
-			}
-		} else if (ACTION_ACTIVATE_TRACING.equals(intentAction)) {
-			tracingViewModel.enableTracing(this, () -> {}, e -> {}, () -> {});
-		} else if ((ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION.equals(intentAction) ||
-				ACTION_ONGOING_NOTIFICATION.equals(intentAction)) && crowdNotifierViewModel.isCheckedIn().getValue()) {
-			showCheckinOverviewFragment();
-		} else if (ACTION_CHECK_OUT_NOW.equals(intentAction) && crowdNotifierViewModel.isCheckedIn().getValue()) {
-			showCheckOutFragment();
-		} else if (getIntent().getData() != null) {
-			checkValidCovidcodeIntent();
-			checkValidCheckInIntent();
-		}
-	}
-
-	private void checkValidCheckInIntent() {
-		String qrCodeData = getIntent().getDataString();
-		try {
-			VenueInfo venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX);
-			if (crowdNotifierViewModel.isCheckedIn().getValue()) {
-				new ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show();
-			} else {
-				crowdNotifierViewModel.setCheckInState(new CheckInState(false, venueInfo, System.currentTimeMillis(),
-						System.currentTimeMillis(), 0));
-				showCheckInScreen();
-			}
-		} catch (QrUtils.QRException e) {
-			handleInvalidQRCodeExceptions(qrCodeData, e);
-		}
-	}
-
-	private void handleInvalidQRCodeExceptions(String qrCodeData, QrUtils.QRException e) {
-		if (e instanceof QrUtils.InvalidQRCodeVersionException) {
-			new ErrorDialog(this, CrowdNotifierErrorState.UPDATE_REQUIRED).show();
-		} else if (e instanceof QrUtils.NotYetValidException) {
-			new ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_YET_VALID).show();
-		} else if (e instanceof QrUtils.NotValidAnymoreException) {
-			new ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_VALID_ANYMORE).show();
-		} else {
-			if (qrCodeData.startsWith(BuildConfig.TRACE_QR_CODE_PREFIX)) {
-				Intent openBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeData));
-				startActivity(openBrowserIntent);
-			} else {
-				new ErrorDialog(this, CrowdNotifierErrorState.NO_VALID_QR_CODE).show();
-			}
-		}
-	}
-
-
-	private void checkValidCovidcodeIntent() {
-		TracingStatusInterface tracingStatus = tracingViewModel.getAppStatusLiveData().getValue();
-		if (tracingStatus == null || tracingStatus.isReportedAsInfected()) {
-			return;
-		}
-		Uri uri = Uri.parse(getIntent().getData().toString());
-		if (!uri.getHost().equals("cc.admin.ch")) return;
-		if (!uri.getPath().equals("") && !uri.getPath().equals("/")) return;
-		String covidCode = uri.getFragment();
-		if (covidCode == null || covidCode.length() != 12) return;
-		startInformFlow(covidCode);
-	}
-
-	private void startInformFlow(String covidCode) {
-		getSupportFragmentManager()
-				.beginTransaction()
-				.replace(R.id.main_fragment_container, WtdPositiveTestFragment.newInstance())
-				.addToBackStack(WtdPositiveTestFragment.class.getCanonicalName())
-				.commit();
-		Intent intent = new Intent(this, InformActivity.class);
-		intent.putExtra(EXTRA_COVIDCODE, covidCode);
-		startActivity(intent);
-	}
-
-	private void showHomeFragment() {
-		getSupportFragmentManager()
-				.beginTransaction()
-				.add(R.id.main_fragment_container, TabbarHostFragment.newInstance())
-				.commit();
-	}
-
-	private void showReportsFragment() {
-		int checkinReports = crowdNotifierViewModel.getExposures().getValue().size();
-		int tracingReports = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays().size();
-		boolean isReportedPositive = tracingViewModel.getTracingStatusInterface().isReportedAsInfected();
-		Fragment reportsFragment;
-		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1) && !isReportedPositive) {
-			reportsFragment = ReportsOverviewFragment.newInstance();
-		} else {
-			reportsFragment = ReportsFragment.newInstance(null);
-		}
-
-		getSupportFragmentManager()
-				.beginTransaction()
-				.replace(R.id.main_fragment_container, reportsFragment)
-				.addToBackStack(reportsFragment.getClass().getCanonicalName())
-				.commit();
-	}
-
-	private void showCheckinOverviewFragment() {
-		getSupportFragmentManager().beginTransaction()
-				.replace(R.id.main_fragment_container, CheckinOverviewFragment.newInstance())
-				.addToBackStack(CheckinOverviewFragment.class.getCanonicalName())
-				.commit();
-	}
-
-	private void showCheckOutFragment() {
-		getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter,
-						R.anim.modal_pop_exit)
-				.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
-				.addToBackStack(CheckOutFragment.class.getCanonicalName())
-				.commit();
-	}
-
-	private void showCheckInScreen() {
-		getSupportFragmentManager().beginTransaction()
-				.replace(R.id.main_fragment_container, CheckInFragment.newInstance(false))
-				.addToBackStack(CheckInFragment.class.getCanonicalName())
-				.commit();
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		DP3T.onActivityResult(this, requestCode, resultCode, data);
-	}
-
-	@Override
-	protected void onPause() {
-		LocalBroadcastManager.getInstance(this).unregisterReceiver(autoCheckoutBroadcastReceiver);
-		super.onPause();
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
new file mode 100644
index 000000000..c04bd9157
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t
+
+import android.content.*
+import android.net.Uri
+import android.os.Bundle
+import androidx.activity.result.ActivityResult
+import androidx.activity.viewModels
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
+import ch.admin.bag.dp3t.checkin.models.CheckInState
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState
+import ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
+import ch.admin.bag.dp3t.checkin.utils.ErrorDialog
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
+import ch.admin.bag.dp3t.inform.InformActivity
+import ch.admin.bag.dp3t.networking.ConfigWorker.Companion.scheduleConfigWorkerIfOutdated
+import ch.admin.bag.dp3t.onboarding.OnboardingActivity
+import ch.admin.bag.dp3t.onboarding.OnboardingSlidePageAdapter.Companion.UPDATE_BOARDING_VERSION
+import ch.admin.bag.dp3t.onboarding.OnboardingType
+import ch.admin.bag.dp3t.reports.ReportsFragment
+import ch.admin.bag.dp3t.reports.ReportsOverviewFragment
+import ch.admin.bag.dp3t.storage.SecureStorage
+import ch.admin.bag.dp3t.util.BetterActivityResult
+import ch.admin.bag.dp3t.util.NotificationUtil
+import ch.admin.bag.dp3t.util.UrlUtil
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel
+import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment
+import com.google.android.gms.instantapps.InstantApps
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.utils.QrUtils.*
+import org.dpppt.android.sdk.DP3T
+import java.nio.charset.StandardCharsets
+
+
+class MainActivity : FragmentActivity() {
+
+
+	companion object {
+		const val ACTION_EXPOSED_GOTO_REPORTS = "ACTION_EXPOSED_GOTO_REPORTS"
+		const val ACTION_INFORMED_GOTO_REPORTS = "ACTION_INFORMED_GOTO_REPORTS"
+		private const val KEY_IS_INTENT_CONSUMED = "KEY_IS_INTENT_CONSUMED"
+	}
+
+	private var isIntentConsumed = false
+	private val secureStorage: SecureStorage by lazy { SecureStorage.getInstance(this) }
+	private val tracingViewModel: TracingViewModel by viewModels()
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by viewModels()
+
+	private val activityLauncher = BetterActivityResult.registerActivityForResult(this)
+
+	private val autoCheckoutBroadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+		override fun onReceive(context: Context, intent: Intent) {
+			showHomeFragment()
+		}
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_main)
+		secureStorage.forceUpdateLiveData.observe(this, {
+
+			val forceUpdate = it && secureStorage.doForceUpdate
+
+			if (forceUpdate) {
+				val forceUpdateDialog = AlertDialog.Builder(this, R.style.NextStep_AlertDialogStyle)
+					.setTitle(R.string.force_update_title)
+					.setMessage(R.string.force_update_text)
+					.setPositiveButton(R.string.playservices_update, null)
+					.setCancelable(false)
+					.create()
+				forceUpdateDialog.setOnShowListener {
+					forceUpdateDialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener {
+						UrlUtil.openUrl(this@MainActivity, "market://details?id=$packageName")
+					}
+				}
+				forceUpdateDialog.show()
+			}
+		})
+		scheduleConfigWorkerIfOutdated(this)
+		CrowdNotifierKeyLoadWorker.startKeyLoadWorker(this)
+		CrowdNotifierKeyLoadWorker.cleanUpOldData(this)
+		if (savedInstanceState == null) {
+			val onboardingCompleted = secureStorage.onboardingCompleted
+			val lastShownUpdateBoardingVersion = secureStorage.lastShownUpdateBoardingVersion
+			val instantAppQrCodeUrl = checkForInstantAppUrl()
+
+			val onboardingType = when {
+				instantAppQrCodeUrl != null -> OnboardingType.INSTANT_PART
+				!onboardingCompleted -> OnboardingType.NORMAL
+				lastShownUpdateBoardingVersion < UPDATE_BOARDING_VERSION -> OnboardingType.UPDATE_BOARDING
+				else -> null
+			}
+
+			if (onboardingType == null) {
+				showHomeFragment()
+			} else {
+				launchOnboarding(onboardingType, instantAppQrCodeUrl)
+			}
+		} else {
+			isIntentConsumed = savedInstanceState.getBoolean(KEY_IS_INTENT_CONSUMED)
+		}
+		tracingViewModel.sync()
+	}
+
+	public fun launchOnboarding(onboardingType: OnboardingType, instantAppQrCodeUrl: String? = null) {
+		val intent = Intent(this, OnboardingActivity::class.java).apply {
+			putExtra(OnboardingActivity.ARG_ONBOARDING_TYPE, onboardingType)
+		}
+		activityLauncher.launch(intent) { activityResult ->
+			onOnboardingFinished(onboardingType, activityResult, instantAppQrCodeUrl)
+		}
+	}
+
+	private fun onOnboardingFinished(onboardingType: OnboardingType, activityResult: ActivityResult, qrCodeUrl: String? = null) {
+
+		if (activityResult.resultCode == RESULT_OK) {
+			secureStorage.lastShownUpdateBoardingVersion = UPDATE_BOARDING_VERSION
+			secureStorage.onboardingCompleted = true
+			if (onboardingType == OnboardingType.INSTANT_PART) {
+				secureStorage.onlyPartialOnboardingCompleted = true
+				qrCodeUrl?.let { checkIn(it) }
+			} else {
+				secureStorage.onlyPartialOnboardingCompleted = false
+			}
+			showHomeFragment()
+		} else {
+			finish()
+		}
+	}
+
+	// If there is an url in the instant app cookies, show the instant app onboarding
+	private fun checkForInstantAppUrl(): String? {
+		val pmc = InstantApps.getPackageManagerCompat(this)
+		val instantAppCookie = pmc.instantAppCookie
+		if (instantAppCookie != null && instantAppCookie.size > 0) {
+			// If there is an url in the instant app cookies, show the instant app onboarding
+			val url = String(instantAppCookie, StandardCharsets.UTF_8)
+			pmc.instantAppCookie = null
+			return url
+		}
+		return null
+	}
+
+	public override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		outState.putBoolean(KEY_IS_INTENT_CONSUMED, isIntentConsumed)
+	}
+
+	override fun onNewIntent(intent: Intent) {
+		super.onNewIntent(intent)
+		setIntent(intent)
+		isIntentConsumed = false
+	}
+
+	override fun onStart() {
+		super.onStart()
+		secureStorage.appOpenAfterNotificationPending = false
+		CrowdNotifierReminderHelper.autoCheckoutIfNecessary(this, crowdNotifierViewModel.checkInState)
+	}
+
+	override fun onResume() {
+		super.onResume()
+		if (secureStorage.onboardingCompleted) checkIntentForActions()
+		LocalBroadcastManager.getInstance(this)
+			.registerReceiver(autoCheckoutBroadcastReceiver, IntentFilter(CrowdNotifierReminderHelper.ACTION_DID_AUTO_CHECKOUT))
+	}
+
+	private fun checkIntentForActions() {
+		val intent = intent
+		val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
+		if (!launchedFromHistory && !isIntentConsumed) {
+			isIntentConsumed = true
+			handleCustomIntents()
+		}
+	}
+
+	private fun handleCustomIntents() {
+		val intentAction = intent.action
+		val isCheckedIn = crowdNotifierViewModel.isCheckedIn.value ?: false
+		val hasCheckinExposures = crowdNotifierViewModel.exposures.value?.isNotEmpty() == true
+		if (ACTION_INFORMED_GOTO_REPORTS == intentAction) {
+			secureStorage.setLeitfadenOpenPending(false)
+			secureStorage.isReportsHeaderAnimationPending = false
+			showReportsFragment()
+		} else if (ACTION_EXPOSED_GOTO_REPORTS == intentAction) {
+			if (tracingViewModel.tracingStatusInterface.wasContactReportedAsExposed() || hasCheckinExposures) {
+				showReportsFragment()
+			}
+		} else if (NotificationUtil.ACTION_ACTIVATE_TRACING == intentAction) {
+			tracingViewModel.enableTracing(this, {}, { }) {}
+		} else if ((NotificationHelper.ACTION_CROWDNOTIFIER_REMINDER_NOTIFICATION == intentAction || NotificationHelper.ACTION_ONGOING_NOTIFICATION == intentAction) && isCheckedIn) {
+			showFragmentWithoutAnimation(CheckinOverviewFragment.newInstance())
+		} else if (NotificationHelper.ACTION_CHECK_OUT_NOW == intentAction && isCheckedIn) {
+			showCheckOutFragment()
+		} else if (intent.data != null) {
+			checkValidCovidcodeIntent()
+			checkValidCheckInIntent()
+		}
+	}
+
+	private fun checkValidCheckInIntent() {
+		val qrCodeData = intent.dataString ?: return
+		if (!qrCodeData.startsWith(BuildConfig.ENTRY_QR_CODE_PREFIX)) return
+		try {
+			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX)
+			if (crowdNotifierViewModel.isCheckedIn.value == true) {
+				ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
+			} else {
+				crowdNotifierViewModel.checkInState = CheckInState(
+					false, venueInfo, System.currentTimeMillis(),
+					System.currentTimeMillis(), 0
+				)
+				showFragmentWithoutAnimation(CheckInFragment.newInstance(false))
+			}
+		} catch (e: QRException) {
+			handleInvalidQRCodeExceptions(qrCodeData, e)
+		}
+	}
+
+	private fun checkIn(qrCodeUrl: String) {
+		try {
+			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, BuildConfig.ENTRY_QR_CODE_PREFIX)
+			if (crowdNotifierViewModel.isCheckedIn.value == true) {
+				ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
+			} else {
+				crowdNotifierViewModel.performCheckinAndSetReminders(venueInfo, 0)
+			}
+		} catch (e: QRException) {
+			handleInvalidQRCodeExceptions(qrCodeUrl, e)
+		}
+	}
+
+	private fun handleInvalidQRCodeExceptions(qrCodeData: String, e: QRException) {
+		if (e is InvalidQRCodeVersionException) {
+			ErrorDialog(this, CrowdNotifierErrorState.UPDATE_REQUIRED).show()
+		} else if (e is NotYetValidException) {
+			ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_YET_VALID).show()
+		} else if (e is NotValidAnymoreException) {
+			ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_VALID_ANYMORE).show()
+		} else {
+			if (qrCodeData.startsWith(BuildConfig.TRACE_QR_CODE_PREFIX)) {
+				val openBrowserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeData))
+				startActivity(openBrowserIntent)
+			} else {
+				ErrorDialog(this, CrowdNotifierErrorState.NO_VALID_QR_CODE).show()
+			}
+		}
+	}
+
+	private fun checkValidCovidcodeIntent() {
+		val tracingStatus = tracingViewModel.appStatusLiveData.value
+		if (tracingStatus == null || tracingStatus.isReportedAsInfected) {
+			return
+		}
+		val uri = Uri.parse(intent.data.toString())
+		if (uri.host != "cc.admin.ch") return
+		if (uri.path != "" && uri.path != "/") return
+		val covidCode = uri.fragment
+		if (covidCode == null || covidCode.length != 12) return
+		startInformFlow(covidCode)
+	}
+
+	private fun startInformFlow(covidCode: String) {
+		showFragmentWithoutAnimation(WtdPositiveTestFragment.newInstance())
+		val intent = Intent(this, InformActivity::class.java)
+		intent.putExtra(InformActivity.EXTRA_COVIDCODE, covidCode)
+		startActivity(intent)
+	}
+
+	private fun showHomeFragment() {
+		supportFragmentManager.beginTransaction()
+			.add(R.id.main_fragment_container, TabbarHostFragment.newInstance())
+			.commit()
+	}
+
+	private fun showReportsFragment() {
+		val checkinReports = crowdNotifierViewModel.exposures.value?.size ?: 0
+		val tracingReports = tracingViewModel.appStatusLiveData.value?.exposureDays?.size ?: 0
+		val isReportedPositive = tracingViewModel.tracingStatusInterface.isReportedAsInfected
+		val reportsFragment: Fragment =
+			if ((checkinReports > 0 && tracingReports > 0 || checkinReports > 1) && !isReportedPositive) {
+				ReportsOverviewFragment.newInstance()
+			} else {
+				ReportsFragment.newInstance(null)
+			}
+		showFragmentWithoutAnimation(reportsFragment)
+	}
+
+	private fun showCheckOutFragment() {
+		supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit)
+			.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
+			.addToBackStack(CheckOutFragment::class.java.canonicalName)
+			.commit()
+	}
+
+	private fun showFragmentWithoutAnimation(fragment: Fragment) {
+		supportFragmentManager.beginTransaction()
+			.replace(R.id.main_fragment_container, fragment)
+			.addToBackStack(fragment::class.java.canonicalName)
+			.commit()
+	}
+
+	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+		super.onActivityResult(requestCode, resultCode, data)
+		DP3T.onActivityResult(this, requestCode, resultCode, data)
+	}
+
+	override fun onPause() {
+		LocalBroadcastManager.getInstance(this).unregisterReceiver(autoCheckoutBroadcastReceiver)
+		super.onPause()
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index eaba7d920..efcec4d52 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -15,7 +15,6 @@ import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
 import ch.admin.bag.dp3t.util.StringUtil
 import ch.admin.bag.dp3t.extensions.showFragment
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index feca7f8db..eeccb4f1f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -18,8 +18,12 @@
 
 import org.crowdnotifier.android.sdk.CrowdNotifier;
 import org.crowdnotifier.android.sdk.model.ExposureEvent;
+import org.crowdnotifier.android.sdk.model.VenueInfo;
 
 import ch.admin.bag.dp3t.checkin.networking.TraceKeysRepository;
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
+import ch.admin.bag.dp3t.checkin.utils.NotificationHelper;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.checkin.models.CheckInState;
 import ch.admin.bag.dp3t.util.DateUtils;
@@ -199,6 +203,18 @@ public void setSelectedReminderDelay(long selectedReminderDelay) {
 		storage.setCheckInState(checkInState);
 	}
 
+	public void performCheckinAndSetReminders(VenueInfo venueInfo, long selectedReminderDelay) {
+		long currentTime = System.currentTimeMillis();
+		setCheckInState(new CheckInState(true, venueInfo, currentTime, currentTime, selectedReminderDelay));
+		startCheckInTimer();
+		NotificationHelper.getInstance(getApplication()).startOngoingNotification(currentTime, venueInfo);
+		CrowdNotifierReminderHelper
+				.setCheckoutWarning(currentTime, VenueInfoExtensionsKt.getCheckoutWarningDelay(venueInfo), getApplication());
+		CrowdNotifierReminderHelper
+				.setAutoCheckOut(currentTime, VenueInfoExtensionsKt.getAutoCheckoutDelay(venueInfo), getApplication());
+		CrowdNotifierReminderHelper.setReminder(currentTime + selectedReminderDelay, getApplication());
+	}
+
 	@Override
 	public void onCleared() {
 		super.onCleared();
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 2d8017db6..e98afaaa2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -65,7 +65,7 @@ class CheckInFragment : Fragment() {
 			titleTextview.text = venueInfo.title
 			subtitleTextview.setText(venueInfo.getSubtitle())
 			checkInButton.setOnClickListener {
-				performCheckIn(venueInfo)
+				viewModel.performCheckinAndSetReminders(venueInfo, viewModel.selectedReminderDelay)
 				popBackToHomeFragment()
 			}
 
@@ -74,7 +74,7 @@ class CheckInFragment : Fragment() {
 			reminderOptions.add(0, ReminderOption(0L))
 			for (option in reminderOptions) {
 				val toggleButton =
-					MaterialButton(ContextThemeWrapper(requireContext(), R.style.CrowdNotifier_ToggleButton), null, 0)
+					MaterialButton(ContextThemeWrapper(requireContext(), R.style.NextStep_ToggleButton), null, 0)
 				toggleButton.text = option.getDisplayString(requireContext())
 				toggleButton.tag = option.delayMillis
 				reminderToggleGroup.addView(toggleButton, LinearLayout.LayoutParams(0, WRAP_CONTENT, 1f))
@@ -98,18 +98,6 @@ class CheckInFragment : Fragment() {
 		}.root
 	}
 
-	private fun performCheckIn(venueInfo: VenueInfo) {
-		val checkInTime = System.currentTimeMillis()
-		viewModel.startCheckInTimer()
-		viewModel.setCheckedIn(true)
-		viewModel.checkInState.checkInTime = checkInTime
-		NotificationHelper.getInstance(context).startOngoingNotification(checkInTime, venueInfo)
-		CrowdNotifierReminderHelper.setCheckoutWarning(checkInTime, venueInfo.getCheckoutWarningDelay(), context)
-		CrowdNotifierReminderHelper.setAutoCheckOut(checkInTime, venueInfo.getAutoCheckoutDelay(), context)
-		CrowdNotifierReminderHelper.setReminder(checkInTime + viewModel.selectedReminderDelay, context)
-
-	}
-
 	private fun popBackToHomeFragment() {
 		if (requireArguments().getBoolean(ARG_IS_SELF_CHECKIN)) {
 			requireActivity().supportFragmentManager.popBackStack(CheckinOverviewFragment::class.java.canonicalName, 0)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index bcccbd259..c81caa9bd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -52,7 +52,7 @@ class DiaryFragment : Fragment() {
 						daysAgoString = newDaysAgoString
 						items.add(ItemVenueVisitDayHeader(daysAgoString))
 					}
-					items.add(ItemVenueVisit(getExposureWithId(exposures, diaryEntry.id), diaryEntry) { v ->
+					items.add(ItemVenueVisit(getExposureWithId(exposures, diaryEntry.id), diaryEntry) {
 						onDiaryEntryClicked(diaryEntry, getExposureWithId(exposures, diaryEntry.id))
 					})
 				}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index 986cc45bd..a3a05a988 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -35,7 +35,8 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 		switch (type) {
 			case DAY_HEADER:
 				return new DayHeaderViewHolder(
-						LayoutInflater.from(parent.getContext()).inflate(R.layout.item_checkin_venue_visits_day_header, parent, false));
+						LayoutInflater.from(parent.getContext())
+								.inflate(R.layout.item_checkin_venue_visits_day_header, parent, false));
 			case VENUE:
 				return new VenueVisitViewHolder(
 						LayoutInflater.from(parent.getContext()).inflate(R.layout.item_checkin_venue_visit, parent, false));
@@ -92,8 +93,6 @@ public static class VenueVisitViewHolder extends RecyclerView.ViewHolder {
 		private final TextView nameTextView;
 		private final TextView locationTextView;
 		private final ImageView statusIcon;
-		private final View infoBox;
-		private final TextView infoBoxText;
 
 		public VenueVisitViewHolder(View itemView) {
 			super(itemView);
@@ -101,8 +100,6 @@ public VenueVisitViewHolder(View itemView) {
 			this.nameTextView = itemView.findViewById(R.id.item_diary_entry_name);
 			this.locationTextView = itemView.findViewById(R.id.item_diary_entry_location);
 			this.statusIcon = itemView.findViewById(R.id.item_diary_entry_status_icon);
-			this.infoBox = itemView.findViewById(R.id.item_diary_entry_infobox);
-			this.infoBoxText = itemView.findViewById(R.id.item_diary_entry_infobox_text);
 		}
 
 		public void bind(ItemVenueVisit item) {
@@ -113,15 +110,8 @@ public void bind(ItemVenueVisit item) {
 			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getDepartureTime(), ":");
 			timeTextView.setText(start + " — " + end);
 			if (item.getExposure() == null) {
-				infoBox.setVisibility(View.GONE);
 				statusIcon.setVisibility(View.GONE);
 			} else {
-				if (item.getExposure().getMessage() != null && !item.getExposure().getMessage().isEmpty()) {
-					infoBox.setVisibility(View.VISIBLE);
-					infoBoxText.setText(item.getExposure().getMessage());
-				} else {
-					infoBox.setVisibility(View.GONE);
-				}
 				statusIcon.setVisibility(View.VISIBLE);
 			}
 			itemView.setOnClickListener(item.getOnClickListener());
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 1b86a19c5..6e3e14fe1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -15,7 +15,6 @@
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.MainActivity;
 import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 7a0dffcd3..3edae7802 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -235,7 +235,7 @@ private void setupTracingView() {
 		tracingCard.setForeground(requireContext().getDrawable(outValue.resourceId));
 
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
-			if (tracingStatusInterface.isReportedAsInfected()) {
+			if (tracingStatusInterface.isReportedAsInfected() || secureStorage.getOnlyPartialOnboardingCompleted()) {
 				tracingCard.findViewById(R.id.contacs_chevron).setVisibility(View.GONE);
 				tracingCard.setOnClickListener(null);
 				tracingCard.setForeground(null);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java
index 9a35a8c1a..1abd4b82d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/TracingBoxFragment.java
@@ -27,8 +27,11 @@
 import org.dpppt.android.sdk.TracingStatus;
 import org.dpppt.android.sdk.internal.logger.Logger;
 
+import ch.admin.bag.dp3t.MainActivity;
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.home.model.TracingState;
+import ch.admin.bag.dp3t.onboarding.OnboardingType;
+import ch.admin.bag.dp3t.storage.SecureStorage;
 import ch.admin.bag.dp3t.util.DeviceFeatureHelper;
 import ch.admin.bag.dp3t.util.ENExceptionHelper;
 import ch.admin.bag.dp3t.util.TracingErrorStateHelper;
@@ -49,7 +52,6 @@ public class TracingBoxFragment extends Fragment {
 
 	private View tracingErrorView;
 	private boolean isHomeFragment;
-	private View tracingLoadingView;
 
 	public TracingBoxFragment() {
 		super(R.layout.fragment_tracing_box);
@@ -76,17 +78,23 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 		tracingStatusView = view.findViewById(R.id.tracing_status);
 		tracingErrorView = view.findViewById(R.id.tracing_error);
-		tracingLoadingView = view.findViewById(R.id.tracing_loading_view);
 
 		showStatus();
 	}
 
 	private void showStatus() {
+
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
 			boolean isTracing = tracingStatusInterface.getTracingState().equals(TracingState.ACTIVE);
 
 			TracingStatus.ErrorState errorState = tracingStatusInterface.getTracingErrorState();
-			if (isTracing && errorState != null) {
+			if (SecureStorage.getInstance(requireContext()).getOnlyPartialOnboardingCompleted()) {
+				tracingStatusView.setVisibility(View.GONE);
+				tracingErrorView.setVisibility(View.VISIBLE);
+				TracingStatusHelper.showFinishPartialOnboarding(tracingErrorView);
+				tracingErrorView.findViewById(R.id.error_status_button).setOnClickListener(
+						v -> ((MainActivity) requireActivity()).launchOnboarding(OnboardingType.NON_INSTANT_PART, null));
+			} else if (isTracing && errorState != null) {
 				handleErrorState(errorState);
 			} else if (tracingStatusInterface.isReportedAsInfected()) {
 				tracingStatusView.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.java
deleted file mode 100644
index 530ef75ac..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.onboarding;
-
-import android.animation.Animator;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
-import androidx.viewpager2.widget.ViewPager2;
-
-import org.dpppt.android.sdk.DP3T;
-
-import ch.admin.bag.dp3t.R;
-
-public class OnboardingActivity extends FragmentActivity {
-
-	private static final int SHOW_SPLASHBOARDING_MILLIS = 3000;
-
-	private View splashboarding;
-	private ViewPager2 viewPager;
-	private FragmentStateAdapter pagerAdapter;
-
-	@Override
-	protected void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_onboarding);
-
-		splashboarding = findViewById(R.id.splashboarding);
-		viewPager = findViewById(R.id.pager);
-		viewPager.setUserInputEnabled(false);
-		pagerAdapter = new OnboardingSlidePageAdapter(this);
-		viewPager.setAdapter(pagerAdapter);
-
-		splashboarding
-				.postDelayed(() -> {
-					splashboarding.setAlpha(1);
-					splashboarding.animate().alpha(0).setDuration(200).withLayer().setListener(new Animator.AnimatorListener() {
-						@Override
-						public void onAnimationStart(Animator animator) {}
-
-						@Override
-						public void onAnimationEnd(Animator animator) {
-							splashboarding.setVisibility(View.GONE);
-						}
-
-						@Override
-						public void onAnimationCancel(Animator animator) {}
-
-						@Override
-						public void onAnimationRepeat(Animator animator) {}
-					}).start();
-				}, SHOW_SPLASHBOARDING_MILLIS);
-	}
-
-	public void continueToNextPage() {
-		int currentItem = viewPager.getCurrentItem();
-		if (currentItem < pagerAdapter.getItemCount() - 1) {
-			viewPager.setCurrentItem(currentItem + 1, true);
-		} else {
-			setResult(RESULT_OK);
-			finish();
-			overridePendingTransition(R.anim.fragment_open_enter, R.anim.fragment_open_exit);
-		}
-	}
-
-	public void abortOnboarding() {
-		setResult(RESULT_CANCELED);
-		finish();
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		DP3T.onActivityResult(this, requestCode, resultCode, data);
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt
new file mode 100644
index 000000000..f17e46d2a
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.onboarding
+
+import android.animation.Animator
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import ch.admin.bag.dp3t.R
+import org.dpppt.android.sdk.DP3T
+
+private const val SHOW_SPLASHBOARDING_MILLIS = 3000
+
+class OnboardingActivity : FragmentActivity() {
+
+	companion object {
+		const val ARG_ONBOARDING_TYPE = "ARG_ONBOARDING_TYPE"
+	}
+
+	private lateinit var splashboarding: View
+	private lateinit var viewPager: ViewPager2
+	private lateinit var pagerAdapter: FragmentStateAdapter
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_onboarding)
+
+		splashboarding = findViewById(R.id.splashboarding)
+		viewPager = findViewById(R.id.pager)
+
+		viewPager.isUserInputEnabled = false
+		val onboardingType = intent.getSerializableExtra(ARG_ONBOARDING_TYPE) as OnboardingType
+		pagerAdapter = OnboardingSlidePageAdapter(this, onboardingType)
+		viewPager.adapter = pagerAdapter
+		if (onboardingType == OnboardingType.NORMAL) {
+			splashboarding.postDelayed({
+				splashboarding.alpha = 1f
+				splashboarding.animate().alpha(0f).setDuration(200).withLayer().setListener(object : Animator.AnimatorListener {
+					override fun onAnimationStart(animator: Animator) {}
+					override fun onAnimationEnd(animator: Animator) {
+						splashboarding.visibility = View.GONE
+					}
+
+					override fun onAnimationCancel(animator: Animator) {}
+					override fun onAnimationRepeat(animator: Animator) {}
+				}).start()
+			}, SHOW_SPLASHBOARDING_MILLIS.toLong())
+		} else {
+			splashboarding.alpha = 0f
+		}
+	}
+
+	fun continueToNextPage() {
+		val currentItem = viewPager.currentItem
+		if (currentItem < pagerAdapter.itemCount - 1) {
+			viewPager.setCurrentItem(currentItem + 1, true)
+		} else {
+			setResult(RESULT_OK, Intent().putExtra(ARG_ONBOARDING_TYPE, intent.getSerializableExtra(ARG_ONBOARDING_TYPE)))
+			finish()
+			overridePendingTransition(R.anim.fragment_open_enter, R.anim.fragment_open_exit)
+		}
+	}
+
+	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+		super.onActivityResult(requestCode, resultCode, data)
+		DP3T.onActivityResult(this, requestCode, resultCode, data)
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.java
deleted file mode 100644
index b2cb2d622..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.onboarding;
-
-import android.os.Bundle;
-import android.view.View;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import ch.admin.bag.dp3t.R;
-
-public class OnboardingFinishedFragment extends Fragment {
-
-	public static OnboardingFinishedFragment newInstance() {
-		return new OnboardingFinishedFragment();
-	}
-
-	public OnboardingFinishedFragment() {
-		super(R.layout.fragment_onboarding_finished);
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		view.findViewById(R.id.onboarding_continue_button)
-				.setOnClickListener(v -> {
-					((OnboardingActivity) getActivity()).continueToNextPage();
-				});
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.kt
new file mode 100644
index 000000000..46408d634
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingFinishedFragment.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.onboarding
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.databinding.FragmentOnboardingFinishedBinding
+
+private const val ARG_ONBOARDING_TYPE = "ARG_ONBOARDING_TYPE"
+
+class OnboardingFinishedFragment : Fragment() {
+
+	companion object {
+		fun newInstance(onboardingType: OnboardingType) = OnboardingFinishedFragment().apply {
+			arguments = bundleOf(ARG_ONBOARDING_TYPE to onboardingType)
+		}
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentOnboardingFinishedBinding.inflate(inflater).apply {
+			val onboardingType = requireArguments().getSerializable(ARG_ONBOARDING_TYPE) as OnboardingType
+			if (onboardingType == OnboardingType.NON_INSTANT_PART) {
+				onboardingTitle.setText(R.string.partial_onboarding_done_title)
+				onboardingText.setText(R.string.partial_onboarding_done_text)
+				onboardingContinueButton.setText(R.string.partial_onboarding_box_action)
+			}
+			onboardingContinueButton.setOnClickListener { (activity as OnboardingActivity).continueToNextPage() }
+		}.root
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java
index 3a66fd967..aad980d4d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingGaenPermissionFragment.java
@@ -34,6 +34,7 @@ public class OnboardingGaenPermissionFragment extends Fragment {
 	private static final String TAG = "OnboardingGaen";
 
 	private static final String STATE_USER_ACTIVE = "STATE_USER_ACTIVE";
+	private static final String ARG_ONBOARDING_TYPE = "ARG_ONBOARDING_TYPE";
 
 	private Button activateButton;
 	private Button continueButton;
@@ -44,8 +45,12 @@ public class OnboardingGaenPermissionFragment extends Fragment {
 	private boolean wasUserActive = false;
 	private boolean startedService = false;
 
-	public static OnboardingGaenPermissionFragment newInstance() {
-		return new OnboardingGaenPermissionFragment();
+	public static OnboardingGaenPermissionFragment newInstance(OnboardingType onboardingType) {
+		OnboardingGaenPermissionFragment fragment = new OnboardingGaenPermissionFragment();
+		Bundle arguments = new Bundle();
+		arguments.putSerializable(ARG_ONBOARDING_TYPE, onboardingType);
+		fragment.setArguments(arguments);
+		return fragment;
 	}
 
 	public OnboardingGaenPermissionFragment() {
@@ -68,10 +73,12 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			wasUserActive = true;
 		});
 		continueButton = view.findViewById(R.id.onboarding_gaen_continue_button);
-		continueButton.setOnClickListener(v -> {
-			((OnboardingActivity) requireActivity()).continueToNextPage();
-		});
+		continueButton.setOnClickListener(v -> ((OnboardingActivity) requireActivity()).continueToNextPage());
+		OnboardingType onboardingType = (OnboardingType) requireArguments().getSerializable(ARG_ONBOARDING_TYPE);
 		dontActivateButton = view.findViewById(R.id.dont_activate_button);
+		if (onboardingType == OnboardingType.NON_INSTANT_PART) {
+			dontActivateButton.setVisibility(View.GONE);
+		}
 		dontActivateButton.setPaintFlags(dontActivateButton.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 		dontActivateButton.setOnClickListener(v -> ((OnboardingActivity) requireActivity()).continueToNextPage());
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
index 73fdfd751..4943b8199 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
@@ -14,40 +14,65 @@ import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import ch.admin.bag.dp3t.R
 
-class OnboardingSlidePageAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) {
+class OnboardingSlidePageAdapter(fragmentActivity: FragmentActivity, onboardingType: OnboardingType) :
+	FragmentStateAdapter(fragmentActivity) {
 
+	companion object {
+		// Increment this number for each new Update Boarding
+		const val UPDATE_BOARDING_VERSION = 2
+	}
 
-	private val onboardingScreens = listOf<Fragment>(
-		OnboardingContentFragment.newInstance(
-			R.string.onboarding_prinzip_title,
-			R.string.onboarding_prinzip_heading,
-			R.drawable.ill_prinzip,
-			intArrayOf(R.string.onboarding_prinzip_text1, R.string.onboarding_prinzip_text2),
-			intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_message_alert)
-		),
-		OnboardingContentFragment.newInstance(
-			R.string.onboarding_checkin_title,
-			R.string.onboarding_checkin_heading,
-			R.drawable.ill_checkins,
-			intArrayOf(R.string.onboarding_checkin_text1, R.string.onboarding_checkin_text2),
-			intArrayOf(R.drawable.ic_qr, R.drawable.ic_info)
-		),
-		OnboardingContentFragment.newInstance(
-			R.string.onboarding_begegnungen_title,
-			R.string.onboarding_begegnungen_heading,
-			R.drawable.ill_bluetooth,
-			intArrayOf(
-				R.string.onboarding_begegnungen_text1,
-				R.string.onboarding_begegnungen_text2,
-				R.string.onboarding_privacy_text1
+	private val onboardingScreens = when (onboardingType) {
+		OnboardingType.UPDATE_BOARDING -> listOf<Fragment>(UpdateBoardingFragment.newInstance())
+		OnboardingType.INSTANT_PART -> listOf<Fragment>(OnboardingDisclaimerFragment.newInstance())
+		OnboardingType.NON_INSTANT_PART -> listOf<Fragment>(
+			OnboardingContentFragment.newInstance(
+				R.string.onboarding_begegnungen_title,
+				R.string.onboarding_begegnungen_heading,
+				R.drawable.ill_bluetooth,
+				intArrayOf(
+					R.string.onboarding_begegnungen_text1,
+					R.string.onboarding_begegnungen_text2,
+					R.string.onboarding_privacy_text1
+				),
+				intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_bluetooth, R.drawable.ic_key)
+			),
+			OnboardingBatteryPermissionFragment.newInstance(),
+			OnboardingGaenPermissionFragment.newInstance(onboardingType),
+			OnboardingFinishedFragment.newInstance(onboardingType)
+		)
+		OnboardingType.NORMAL -> listOf<Fragment>(
+			OnboardingContentFragment.newInstance(
+				R.string.onboarding_prinzip_title,
+				R.string.onboarding_prinzip_heading,
+				R.drawable.ill_prinzip,
+				intArrayOf(R.string.onboarding_prinzip_text1, R.string.onboarding_prinzip_text2),
+				intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_message_alert)
+			),
+			OnboardingContentFragment.newInstance(
+				R.string.onboarding_checkin_title,
+				R.string.onboarding_checkin_heading,
+				R.drawable.ill_checkins,
+				intArrayOf(R.string.onboarding_checkin_text1, R.string.onboarding_checkin_text2),
+				intArrayOf(R.drawable.ic_qr, R.drawable.ic_info)
 			),
-			intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_bluetooth, R.drawable.ic_key)
-		),
-		OnboardingDisclaimerFragment.newInstance(),
-		OnboardingBatteryPermissionFragment.newInstance(),
-		OnboardingGaenPermissionFragment.newInstance(),
-		OnboardingFinishedFragment.newInstance()
-	)
+			OnboardingContentFragment.newInstance(
+				R.string.onboarding_begegnungen_title,
+				R.string.onboarding_begegnungen_heading,
+				R.drawable.ill_bluetooth,
+				intArrayOf(
+					R.string.onboarding_begegnungen_text1,
+					R.string.onboarding_begegnungen_text2,
+					R.string.onboarding_privacy_text1
+				),
+				intArrayOf(R.drawable.ic_begegnungen, R.drawable.ic_bluetooth, R.drawable.ic_key)
+			),
+			OnboardingDisclaimerFragment.newInstance(),
+			OnboardingBatteryPermissionFragment.newInstance(),
+			OnboardingGaenPermissionFragment.newInstance(onboardingType),
+			OnboardingFinishedFragment.newInstance(onboardingType)
+		)
+	}
 
 
 	override fun createFragment(position: Int): Fragment {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingType.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingType.kt
new file mode 100644
index 000000000..1d3aa8314
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingType.kt
@@ -0,0 +1,5 @@
+package ch.admin.bag.dp3t.onboarding
+
+enum class OnboardingType {
+	NORMAL, INSTANT_PART, NON_INSTANT_PART, UPDATE_BOARDING
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/UpdateBoardingFragment.kt
similarity index 88%
rename from app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt
rename to app/src/main/java/ch/admin/bag/dp3t/onboarding/UpdateBoardingFragment.kt
index dc036dccc..b4c15b3c0 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/UpdateBoardingFragment.kt
@@ -1,4 +1,4 @@
-package ch.admin.bag.dp3t.updateboarding
+package ch.admin.bag.dp3t.onboarding
 
 import android.os.Bundle
 import android.text.Html
@@ -14,7 +14,7 @@ import ch.admin.bag.dp3t.util.AssetUtil
 import ch.admin.bag.dp3t.util.UlTagHandler
 import ch.admin.bag.dp3t.util.UrlUtil
 
-class UpdateBoardingFragment : Fragment(R.layout.fragment_update_boarding) {
+class UpdateBoardingFragment : Fragment() {
 
 
 	companion object {
@@ -22,7 +22,7 @@ class UpdateBoardingFragment : Fragment(R.layout.fragment_update_boarding) {
 	}
 
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		return FragmentUpdateBoardingBinding.inflate(inflater).apply {
 			termsOfUseTextview.text = Html.fromHtml(AssetUtil.getTermsOfUse(context), null, UlTagHandler())
 			dataProtectionTextview.text = Html.fromHtml(AssetUtil.getDataProtection(context), null, UlTagHandler())
@@ -54,7 +54,7 @@ class UpdateBoardingFragment : Fragment(R.layout.fragment_update_boarding) {
 			}
 			dataProtectionToOnlineVersionButton.setOnClickListener { openOnlineVersion() }
 			termsOfUseToOnlineVersionButton.setOnClickListener { openOnlineVersion() }
-			updateboardingOkButton.setOnClickListener { (activity as UpdateBoardingActivity).finishUpdateBoarding() }
+			updateboardingOkButton.setOnClickListener { (activity as OnboardingActivity).continueToNextPage() }
 
 		}.root
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 041a435f2..8138ecef1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -280,12 +280,6 @@ class ReportsFragment : Fragment() {
 			.show()
 	}
 
-	private fun showWhereToTestDialog() {
-		requireActivity().supportFragmentManager.beginTransaction()
-			.add(WhereToTestDialogFragment.newInstance(), WhereToTestDialogFragment::class.java.canonicalName)
-			.commit()
-	}
-
 	private fun openLink(@StringRes stringRes: Int) {
 		UrlUtil.openUrl(context, getString(stringRes))
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 31a8200d5..91d27eef4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -60,6 +60,7 @@ public class SecureStorage {
 	private static final String KEY_CONFIG_FORCE_UPDATE = "config_do_force_update";
 	private static final String KEY_CONFIG_HAS_INFOBOX = "has_ghettobox_v2";
 	private static final String KEY_CONFIG_INFOBOX_COLLECTION = "ghettobox_collection";
+	private static final String KEY_CONFIG_TEST_INFORMATION_URLS = "testinformation_urls";
 	private static final String KEY_ONBOARDING_USER_NOT_IN_PILOT_GROUP = "user_is_not_in_pilot_group";
 	private static final String KEY_LAST_CONFIG_LOAD_SUCCESS = "last_config_load_success";
 	private static final String KEY_LAST_CONFIG_LOAD_SUCCESS_APP_VERSION = "last_config_load_success_app_version";
@@ -76,7 +77,7 @@ public class SecureStorage {
 	private static final String KEY_CURRENT_CHECK_IN = "KEY_CURRENT_CHECK_IN";
 	private static final String KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG = "KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG";
 	private static final String KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD = "KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD";
-	private static final String KEY_CONFIG_TEST_INFORMATION_URLS = "testinformation_urls";
+	private static final String KEY_ONLY_PARTIAL_ONBOARDING_DONE = "KEY_ONLY_PARTIAL_ONBOARDING_DONE";
 
 	private static SecureStorage instance;
 
@@ -159,6 +160,14 @@ public void setOnboardingCompleted(boolean completed) {
 		prefs.edit().putBoolean(KEY_ONBOARDING_COMPLETED, completed).apply();
 	}
 
+	public boolean getOnlyPartialOnboardingCompleted() {
+		return prefs.getBoolean(KEY_ONLY_PARTIAL_ONBOARDING_DONE, false);
+	}
+
+	public void setOnlyPartialOnboardingCompleted(boolean completed) {
+		prefs.edit().putBoolean(KEY_ONLY_PARTIAL_ONBOARDING_DONE, completed).apply();
+	}
+
 	public int getLastShownUpdateBoardingVersion() {
 		return prefs.getInt(KEY_UPDATE_BOARDING_VERSION, 0);
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt
deleted file mode 100644
index efad26818..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/updateboarding/UpdateBoardingActivity.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package ch.admin.bag.dp3t.updateboarding
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.fragment.app.FragmentActivity
-import ch.admin.bag.dp3t.R
-import org.dpppt.android.sdk.DP3T
-
-class UpdateBoardingActivity : FragmentActivity() {
-
-
-	companion object {
-		// Increment this number for each new Update Boarding
-		const val UPDATE_BOARDING_VERSION = 2
-	}
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(R.layout.activity_update_boarding)
-		if (savedInstanceState == null) {
-			showFirstUpdateBoardingFragment()
-		}
-	}
-
-	private fun showFirstUpdateBoardingFragment() {
-		// Replace with new UpdateBoarding Fragment
-		supportFragmentManager
-			.beginTransaction()
-			.add(R.id.main_fragment_container, UpdateBoardingFragment.newInstance())
-			.commit()
-	}
-
-	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-		super.onActivityResult(requestCode, resultCode, data)
-		DP3T.onActivityResult(this, requestCode, resultCode, data)
-	}
-
-	fun finishUpdateBoarding() {
-		setResult(RESULT_OK)
-		finish()
-		overridePendingTransition(R.anim.fragment_open_enter, R.anim.fragment_open_exit)
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt b/app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt
new file mode 100644
index 000000000..03b16b1bc
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt
@@ -0,0 +1,71 @@
+package ch.admin.bag.dp3t.util
+
+import android.content.Intent
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultCaller
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+
+
+class BetterActivityResult<Input, Result> private constructor(
+	caller : ActivityResultCaller,
+	contract : ActivityResultContract<Input, Result>,
+	var onActivityResult : ((Result) -> Unit)?,
+) {
+
+	private val launcher : ActivityResultLauncher<Input> =
+		caller.registerForActivityResult(contract) { onActivityResult?.invoke(it) }
+
+	/**
+	 * Launch activity, same as [ActivityResultLauncher.launch] except that it
+	 * allows a callback
+	 * executed after receiving a result from the target activity.
+	 */
+	/**
+	 * Same as [.launch] with last parameter set to `null`.
+	 */
+	@JvmOverloads
+	fun launch(
+		input : Input,
+		onActivityResult : ((Result) -> Unit)? = this.onActivityResult,
+	) {
+		this.onActivityResult = onActivityResult
+		launcher.launch(input)
+	}
+
+	companion object {
+		/**
+		 * Register activity result using a [ActivityResultContract] and an in-place
+		 * activity result callback like
+		 * the default approach. You can still customise callback using [.launch].
+		 */
+		fun <Input, Result> registerForActivityResult(
+			caller : ActivityResultCaller,
+			contract : ActivityResultContract<Input, Result>,
+			onActivityResult : ((Result) -> Unit)?,
+		) : BetterActivityResult<Input, Result> {
+			return BetterActivityResult(caller, contract, onActivityResult)
+		}
+
+		/**
+		 * Same as [.registerForActivityResult] except
+		 * the last argument is set to `null`.
+		 */
+		fun <Input, Result> registerForActivityResult(
+			caller : ActivityResultCaller,
+			contract : ActivityResultContract<Input, Result>,
+		) : BetterActivityResult<Input, Result> {
+			return registerForActivityResult(caller, contract, null)
+		}
+
+		/**
+		 * Specialised method for launching new activities.
+		 */
+		fun registerActivityForResult(
+			caller : ActivityResultCaller,
+		) : BetterActivityResult<Intent, ActivityResult> {
+			return registerForActivityResult(caller, StartActivityForResult())
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
index 3f7661048..9e1ef9885 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
@@ -20,6 +20,7 @@
 import androidx.core.widget.ImageViewCompat;
 
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
 import ch.admin.bag.dp3t.home.model.TracingState;
 
 public class TracingStatusHelper {
@@ -76,6 +77,16 @@ public static void updateStatusView(View statusView, TracingState state, boolean
 		}
 	}
 
+	public static void showFinishPartialOnboarding(View tracingErrorView) {
+		tracingErrorView.setBackgroundResource(R.color.dark_main);
+		TracingErrorStateHelper.updateErrorView(tracingErrorView, CrowdNotifierErrorState.ONLY_INSTANT_ONBOARDING_DONE);
+		int white = ContextCompat.getColor(tracingErrorView.getContext(), R.color.white);
+		((TextView) tracingErrorView.findViewById(R.id.error_status_title)).setTextColor(white);
+		((TextView) tracingErrorView.findViewById(R.id.error_status_text)).setTextColor(white);
+		((TextView) tracingErrorView.findViewById(R.id.error_status_button)).setTextColor(white);
+		tracingErrorView.findViewById(R.id.error_status_code).setVisibility(View.GONE);
+	}
+
 	public static void showTracingDeactivated(View tracingErrorView, boolean isHomeFragment) {
 		int darkMainColor = ContextCompat.getColor(tracingErrorView.getContext(), R.color.dark_main);
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/UiUtils.java b/app/src/main/java/ch/admin/bag/dp3t/util/UiUtils.java
index e2715ecde..ef6a2d71d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/UiUtils.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/UiUtils.java
@@ -7,7 +7,6 @@
  *
  * SPDX-License-Identifier: MPL-2.0
  */
-
 package ch.admin.bag.dp3t.util;
 
 import android.content.Context;
diff --git a/app/src/main/res/drawable/bg_button_default_crowdnotifier.xml b/app/src/main/res/drawable/bg_button_default_crowdnotifier.xml
deleted file mode 100644
index 58e1811b8..000000000
--- a/app/src/main/res/drawable/bg_button_default_crowdnotifier.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="@color/primary_dark">
-	<item android:id="@android:id/mask">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/primary_dark" />
-			<corners android:radius="@dimen/button_radius" />
-		</shape>
-	</item>
-
-	<item android:id="@android:id/background">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/primary" />
-			<corners android:radius="@dimen/button_radius" />
-		</shape>
-	</item>
-</ripple>
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index dd324fc5f..74b66b9a2 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -66,7 +66,7 @@
 
 			<TextView
 				android:id="@+id/title_textview"
-				style="@style/CrowdNotifier.Text.Title"
+				style="@style/NextStep.Text.SplashTitle"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_medium"
@@ -75,7 +75,7 @@
 
 			<TextView
 				android:id="@+id/subtitle_textview"
-				style="@style/CrowdNotifier.Text"
+				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_very_small"
@@ -97,11 +97,12 @@
 				android:paddingBottom="@dimen/button_radius">
 
 				<TextView
-					style="@style/CrowdNotifier.Text.Status.Primary.Small"
+					style="@style/NextStep.Text.Bold"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:gravity="center"
-					android:text="@string/checkin_set_reminder" />
+					android:text="@string/checkin_set_reminder"
+					android:textAllCaps="true" />
 
 				<TextView
 					style="@style/NextStep.Text"
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index 8f8915480..e96ab9c75 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -54,7 +54,7 @@
 
 			<TextView
 				android:id="@+id/checkout_title"
-				style="@style/CrowdNotifier.Text.Title"
+				style="@style/NextStep.Text.SplashTitle"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_larger"
@@ -63,7 +63,7 @@
 
 			<TextView
 				android:id="@+id/checkout_subtitle"
-				style="@style/CrowdNotifier.Text"
+				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_very_small"
@@ -71,11 +71,12 @@
 				tools:text="Lausanne" />
 
 			<TextView
-				style="@style/CrowdNotifier.Text.Status.Small"
+				style="@style/NextStep.Text.Bold"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_huge"
-				android:text="@string/datepicker_from" />
+				android:text="@string/datepicker_from"
+				android:textAllCaps="true" />
 
 			<ch.admin.bag.dp3t.view.DateTimePicker
 				android:id="@+id/checkout_time_arrival"
@@ -83,11 +84,12 @@
 				android:layout_height="108dp" />
 
 			<TextView
-				style="@style/CrowdNotifier.Text.Status.Small"
+				style="@style/NextStep.Text.Bold"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_large"
-				android:text="@string/datepicker_to" />
+				android:text="@string/datepicker_to"
+				android:textAllCaps="true" />
 
 			<ch.admin.bag.dp3t.view.DateTimePicker
 				android:id="@+id/checkout_time_departure"
diff --git a/app/src/main/res/layout/fragment_onboarding_finished.xml b/app/src/main/res/layout/fragment_onboarding_finished.xml
index 121f1f3c3..14a4e4424 100644
--- a/app/src/main/res/layout/fragment_onboarding_finished.xml
+++ b/app/src/main/res/layout/fragment_onboarding_finished.xml
@@ -19,14 +19,14 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:clipChildren="false"
+			android:clipToPadding="false"
 			android:gravity="center_horizontal"
 			android:orientation="vertical"
 			android:paddingStart="@dimen/spacing_huge"
 			android:paddingTop="@dimen/spacing_huge"
 			android:paddingEnd="@dimen/spacing_huge"
-			android:paddingBottom="@dimen/spacing_large"
-			android:clipChildren="false"
-			android:clipToPadding="false">
+			android:paddingBottom="@dimen/spacing_large">
 
 			<ImageView
 				android:id="@+id/onboarding_illustration"
@@ -48,13 +48,14 @@
 				android:text="@string/onboarding_go_title" />
 
 			<TextView
+				android:id="@+id/onboarding_text"
 				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:breakStrategy="high_quality"
-				android:hyphenationFrequency="full"
 				android:layout_marginBottom="@dimen/spacing_very_large"
+				android:breakStrategy="high_quality"
 				android:gravity="center_horizontal"
+				android:hyphenationFrequency="full"
 				android:text="@string/onboarding_go_text" />
 
 			<Button
diff --git a/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml b/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml
index 2b9adb140..6d123bf59 100644
--- a/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml
+++ b/app/src/main/res/layout/fragment_onboarding_permission_gaen.xml
@@ -63,6 +63,7 @@
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:layout_marginTop="@dimen/spacing_small"
+			android:layout_marginBottom="@dimen/spacing_medium_large"
 			android:text="@string/onboarding_gaen_button_activate" />
 
 		<TextView
@@ -71,7 +72,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal"
-			android:layout_marginVertical="@dimen/spacing_medium_large"
+			android:layout_marginBottom="@dimen/spacing_medium_large"
 			android:background="?selectableItemBackground"
 			android:padding="@dimen/spacing_small"
 			android:text="@string/onboarding_gaen_button_dont_activate" />
diff --git a/app/src/main/res/layout/fragment_qr_code_scanner.xml b/app/src/main/res/layout/fragment_qr_code_scanner.xml
index 934d8102b..49123747c 100644
--- a/app/src/main/res/layout/fragment_qr_code_scanner.xml
+++ b/app/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -88,7 +88,7 @@
 
 		<TextView
 			android:id="@+id/qr_code_scanner_explanation"
-			style="@style/CrowdNotifier.Text"
+			style="@style/NextStep.Text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center"
@@ -159,12 +159,13 @@
 
 		<TextView
 			android:id="@+id/qr_code_scanner_invalid_code_text"
-			style="@style/CrowdNotifier.Text.Status.Tertiary.Small"
+			style="@style/NextStep.Text.Bold.Red"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/spacing_small"
 			android:gravity="center"
 			android:text="@string/qrscanner_error"
+			android:textAllCaps="true"
 			android:visibility="invisible"
 			app:layout_constraintBottom_toTopOf="@id/space3"
 			app:layout_constraintTop_toBottomOf="@id/camera_preview_container" />
diff --git a/app/src/main/res/layout/item_checkin_venue_visit.xml b/app/src/main/res/layout/item_checkin_venue_visit.xml
index 6c1304510..be587e508 100644
--- a/app/src/main/res/layout/item_checkin_venue_visit.xml
+++ b/app/src/main/res/layout/item_checkin_venue_visit.xml
@@ -2,7 +2,7 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	style="@style/CrowdNotifier.Card.Small"
+	style="@style/NextStep.Card"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_marginVertical="@dimen/spacing_very_small">
@@ -43,14 +43,14 @@
 
 			<TextView
 				android:id="@+id/item_diary_entry_name"
-				style="@style/CrowdNotifier.Text.Subtitle"
+				style="@style/NextStep.Text.Bold"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				tools:text="Meeting Room IP32" />
 
 			<TextView
 				android:id="@+id/item_diary_entry_location"
-				style="@style/CrowdNotifier.Text"
+				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_tiny_small"
@@ -58,7 +58,7 @@
 
 			<TextView
 				android:id="@+id/item_diary_entry_time"
-				style="@style/CrowdNotifier.Text"
+				style="@style/NextStep.Text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/spacing_tiny_small"
@@ -66,39 +66,6 @@
 
 		</LinearLayout>
 
-		<androidx.cardview.widget.CardView
-			android:id="@+id/item_diary_entry_infobox"
-			style="@style/CrowdNotifier.Card.Tertiary"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_large"
-			app:layout_constraintTop_toBottomOf="@id/item_diary_entry_info_container">
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/spacing_medium"
-				android:orientation="vertical">
-
-				<TextView
-					android:id="@+id/item_diary_entry_infobox_header"
-					style="@style/CrowdNotifier.Text.Status.Tertiary"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="[TBT] report_information_button_title" />
-
-				<TextView
-					android:id="@+id/item_diary_entry_infobox_text"
-					style="@style/CrowdNotifier.Text"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_very_small"
-					tools:text="Please call the EPFL-Infoline to receive further instructions." />
-
-			</LinearLayout>
-
-		</androidx.cardview.widget.CardView>
-
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml b/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml
index aac69e378..224d86cc2 100644
--- a/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml
+++ b/app/src/main/res/layout/item_checkin_venue_visits_day_header.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_marginTop="@dimen/spacing_very_large"
 	android:layout_marginBottom="@dimen/spacing_small">
 
 	<TextView
 		android:id="@+id/item_diary_day_header_text_view"
-		style="@style/CrowdNotifier.Text.Status.Small"
-		tools:text="4 days ago"
+		style="@style/NextStep.Text.Bold"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content" />
+		android:layout_height="wrap_content"
+		android:textAllCaps="true"
+		tools:text="4 days ago" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/app_styles.xml b/app/src/main/res/values/app_styles.xml
new file mode 100644
index 000000000..dea786d64
--- /dev/null
+++ b/app/src/main/res/values/app_styles.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="NextStep.DateTimePicker" parent="android:Widget">
+		<item name="android:textSize">@dimen/text_size_normal</item>
+		<item name="colorControlNormal">@color/red_main</item>
+		<item name="android:textColorPrimary">@color/dark_main</item>
+		<item name="np_textSize">@dimen/text_size_normal</item>
+		<item name="np_selectedTextSize">@dimen/text_size_normal</item>
+		<item name="np_textColor">@color/dark_main</item>
+		<item name="np_selectedTextColor">@color/dark_main</item>
+		<item name="np_dividerColor">@color/blue_main</item>
+		<item name="np_dividerDistance">36sp</item>
+		<item name="np_wheelItemCount">3</item>
+	</style>
+
+	<style name="NextStep.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
+		<item name="background">@color/bottom_navigation_background</item>
+		<item name="itemIconTint">@color/selector_bottom_navigation_item</item>
+		<item name="itemTextColor">@color/selector_bottom_navigation_item</item>
+		<item name="itemRippleColor">?android:attr/colorControlHighlight</item>
+		<item name="itemTextAppearanceActive">@style/NextStep.Text.BottomNavigationViewTextStyle</item>
+		<item name="itemTextAppearanceInactive">@style/NextStep.Text.BottomNavigationViewTextStyle</item>
+	</style>
+
+	<style name="NextStep.Card" parent="CardView">
+		<item name="cardBackgroundColor">@color/white</item>
+		<item name="cardCornerRadius">@dimen/card_border_radius</item>
+	</style>
+
+	<style name="NextStep.ToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:textAllCaps">false</item>
+		<item name="android:backgroundTint">@drawable/reminder_toggle_background_color</item>
+		<item name="strokeColor">@drawable/reminder_toggle_text_color</item>
+		<item name="android:textColor">@drawable/reminder_toggle_text_color</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:minWidth">0dp</item>
+	</style>
+
+	<style name="NextStep.RadioButton.Reminder" parent="Widget.MaterialComponents.CompoundButton.RadioButton">
+		<item name="android:textSize">@dimen/text_size_normal</item>
+		<item name="android:textColor">@color/dark_main</item>
+		<item name="android:layout_height">48dp</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:paddingStart">@dimen/spacing_small</item>
+		<item name="android:paddingEnd">@dimen/spacing_small</item>
+		<item name="android:drawablePadding">@dimen/spacing_medium</item>
+		<item name="android:background">@null</item>
+		<item name="android:foreground">?android:selectableItemBackground</item>
+		<item name="android:button">@null</item>
+		<item name="android:drawableStart">@drawable/ic_radio_button</item>
+	</style>
+
+	<style name="NextStep.AlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+		<item name="android:colorAccent">@color/blue_main</item>
+		<item name="android:textColor">@color/dark_main</item>
+		<item name="android:textColorPrimary">@color/dark_main</item>
+		<item name="buttonBarPositiveButtonStyle">@style/NextStep.Button.AlertDialog</item>
+		<item name="buttonBarNegativeButtonStyle">@style/NextStep.Button.AlertDialog</item>
+		<item name="android:fontFamily">@font/inter_light</item>
+		<item name="fontFamily">@font/inter_light</item>
+	</style>
+
+	<style name="NextStep.Switch" parent="Widget.AppCompat.CompoundButton.Switch">
+		<item name="android:thumbTint">@color/switch_tint_selector</item>
+		<item name="android:trackTint">@color/switch_tint_selector</item>
+	</style>
+
+	<style name="NextStep.RadioButton" parent="Widget.MaterialComponents.CompoundButton.RadioButton">
+		<item name="android:textAppearance">@style/NextStep.Text</item>
+		<item name="android:textColor">@color/dark_main</item>
+		<item name="android:paddingStart">@dimen/spacing_medium</item>
+	</style>
+
+	<style name="NextStep.Button.AlertDialog" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+		<item name="android:textSize">@dimen/text_size_button</item>
+		<item name="android:textColor">@color/blue_main</item>
+		<item name="android:fontFamily">@font/inter_bold</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textAllCaps">false</item>
+		<item name="rippleColor">@color/grey_dark</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/crowdnotifier_styles.xml b/app/src/main/res/values/crowdnotifier_styles.xml
deleted file mode 100644
index 6601099ea..000000000
--- a/app/src/main/res/values/crowdnotifier_styles.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-	<style name="CrowdNotifier.Card" parent="Widget.MaterialComponents.CardView">
-		<item name="android:focusable">true</item>
-		<item name="android:clickable">true</item>
-		<item name="android:foreground">?android:attr/selectableItemBackground</item>
-		<item name="cardElevation">@dimen/card_elevation</item>
-		<item name="android:minHeight">@dimen/button_height</item>
-		<item name="cardCornerRadius">@dimen/button_radius</item>
-	</style>
-
-	<style name="CrowdNotifier.Card.Grey">
-		<item name="android:minHeight">0dp</item>
-		<item name="android:focusable">false</item>
-		<item name="android:clickable">false</item>
-		<item name="cardElevation">0dp</item>
-		<item name="cardBackgroundColor">@color/light_grey</item>
-	</style>
-
-	<style name="CrowdNotifier.Card.Small">
-		<item name="android:minHeight">0dp</item>
-		<item name="cardCornerRadius">@dimen/checkin_diary_entry_corner_radius</item>
-	</style>
-
-	<style name="CrowdNotifier.Card.Tertiary">
-		<item name="android:minHeight">0dp</item>
-		<item name="cardCornerRadius">@dimen/checkin_diary_entry_corner_radius</item>
-		<item name="cardBackgroundColor">@color/tertiary_light</item>
-	</style>
-
-	<style name="CrowdNotifier.Text" parent="TextAppearance.AppCompat">
-		<item name="android:textSize">@dimen/text_size_normal</item>
-		<item name="android:textColor">@color/main</item>
-		<item name="android:lineSpacingMultiplier">1.1</item>
-		<item name="android:fontFamily">@font/inter_light</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Title">
-		<item name="android:textSize">@dimen/text_size_splash_title</item>
-		<item name="android:fontFamily">@font/inter_bold</item>
-		<item name="android:textStyle">bold</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Subtitle">
-		<item name="android:fontFamily">@font/inter_bold</item>
-		<item name="android:textStyle">bold</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status">
-		<item name="android:letterSpacing">0.075</item>
-		<item name="android:fontFamily">@font/inter_bold</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textAllCaps">true</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status.Small">
-		<item name="android:textSize">@dimen/text_size_small</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status.Primary">
-		<item name="android:textColor">@color/primary</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status.Primary.Small">
-		<item name="android:textSize">@dimen/text_size_small</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status.Primary.Small.Thin">
-		<item name="android:fontFamily">@font/inter_regular</item>
-		<item name="android:textStyle">normal</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status.Tertiary">
-		<item name="android:textColor">@color/tertiary</item>
-	</style>
-
-	<style name="CrowdNotifier.Text.Status.Tertiary.Small">
-		<item name="android:textSize">@dimen/text_size_small</item>
-	</style>
-
-	<style name="CrowdNotifier.ToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:textAllCaps">false</item>
-		<item name="android:backgroundTint">@drawable/reminder_toggle_background_color</item>
-		<item name="strokeColor">@drawable/reminder_toggle_text_color</item>
-		<item name="android:textColor">@drawable/reminder_toggle_text_color</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:minWidth">0dp</item>
-	</style>
-
-	<style name="CrowdNotifier.Button" parent="Widget.MaterialComponents.Button">
-		<item name="backgroundTint">@null</item>
-		<item name="android:textColor">@color/white</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:fontFamily">@font/inter_bold</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">@dimen/text_size_normal</item>
-		<item name="android:background">@drawable/bg_button_default_crowdnotifier</item>
-		<item name="android:stateListAnimator">@null</item>
-		<item name="android:height">@dimen/button_height</item>
-		<item name="android:paddingStart">@dimen/spacing_huge</item>
-		<item name="android:paddingEnd">@dimen/spacing_huge</item>
-	</style>
-
-	<style name="CrowdNotifier.EditText" parent="Widget.AppCompat.EditText">
-		<item name="android:background">@drawable/bg_edit_text</item>
-		<item name="android:textSize">@dimen/text_size_normal</item>
-		<item name="android:textColor">@color/main</item>
-		<item name="android:padding">@dimen/spacing_medium</item>
-	</style>
-
-</resources>
\ No newline at end of file
diff --git a/common/.gitignore b/common/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 000000000..740c7df98
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,72 @@
+plugins {
+	id 'com.android.library'
+	id 'kotlin-android'
+	id 'com.google.protobuf'
+
+}
+
+android {
+	compileSdkVersion 30
+
+	defaultConfig {
+		minSdkVersion 23
+		targetSdkVersion 30
+		versionCode 1
+		versionName "1.0"
+
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+		consumerProguardFiles "consumer-rules.pro"
+	}
+
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+		}
+	}
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+	kotlinOptions {
+		jvmTarget = '1.8'
+	}
+	buildFeatures {
+		buildConfig = false
+	}
+}
+
+protobuf {
+	protoc {
+		artifact = 'com.google.protobuf:protoc:3.0.0'
+	}
+	plugins {
+		javalite {
+			artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+		}
+	}
+	generateProtoTasks {
+		all().each { task ->
+			task.builtins {
+				remove java
+			}
+			task.plugins {
+				javalite {}
+			}
+		}
+	}
+}
+
+dependencies {
+
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+	implementation 'androidx.core:core-ktx:1.5.0'
+	testImplementation 'junit:junit:4.+'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-10'
+	api 'com.google.android.gms:play-services-instantapps:17.0.0'
+
+}
\ No newline at end of file
diff --git a/common/consumer-rules.pro b/common/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/proguard-rules.pro b/common/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/common/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..4b7787102
--- /dev/null
+++ b/common/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="ch.admin.bag.dp3t">
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java b/common/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
similarity index 86%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
rename to common/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
index 3ea8044cc..cf57c31e7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
+++ b/common/src/main/java/ch/admin/bag/dp3t/checkin/models/CrowdNotifierErrorState.java
@@ -16,7 +16,9 @@ public enum CrowdNotifierErrorState {
 			R.drawable.ic_error),
 	ALREADY_CHECKED_IN(R.string.error_title, R.string.error_already_checked_in, R.string.android_button_ok, R.drawable.ic_error),
 	UPDATE_REQUIRED(R.string.error_update_title, R.string.error_update_text, R.string.error_action_update,
-			R.drawable.ic_error);
+			R.drawable.ic_error),
+	ONLY_INSTANT_ONBOARDING_DONE(R.string.tracing_turned_off_title, R.string.partial_onboarding_box_text,
+			R.string.partial_onboarding_box_action, R.drawable.ic_info);
 
 
 	@StringRes private int titleResId;
@@ -24,7 +26,8 @@ public enum CrowdNotifierErrorState {
 	@StringRes private int actionResId;
 	@DrawableRes private int imageResId;
 
-	CrowdNotifierErrorState(@StringRes int titleResId, @StringRes int textResId, @StringRes int actionResId, @DrawableRes int imageResId) {
+	CrowdNotifierErrorState(@StringRes int titleResId, @StringRes int textResId, @StringRes int actionResId,
+			@DrawableRes int imageResId) {
 		this.titleResId = titleResId;
 		this.textResId = textResId;
 		this.actionResId = actionResId;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt b/common/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
similarity index 100%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
rename to common/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java b/common/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
similarity index 86%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
rename to common/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
index 1b1c8025e..532bd851e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
+++ b/common/src/main/java/ch/admin/bag/dp3t/checkin/utils/ErrorHelper.java
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.checkin.utils;
 
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Paint;
@@ -8,11 +9,11 @@
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 import androidx.core.content.ContextCompat;
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.util.UrlUtil;
 
 public class ErrorHelper {
 
@@ -52,7 +53,13 @@ private static void executeErrorAction(CrowdNotifierErrorState errorState, Runna
 	}
 
 	private static void updateApp(Context context) {
-		UrlUtil.openUrl(context, "market://details?id=" + context.getPackageName());
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		intent.setData(Uri.parse("market://details?id=" + context.getPackageName()));
+		try {
+			context.startActivity(intent);
+		} catch (ActivityNotFoundException e) {
+			Toast.makeText(context, "No browser installed", Toast.LENGTH_LONG).show();
+		}
 	}
 
 	private static void openApplicationSettings(Context context) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt b/common/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
similarity index 100%
rename from app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
rename to common/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt b/common/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
similarity index 100%
rename from app/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
rename to common/src/main/java/ch/admin/bag/dp3t/extensions/VenueTypeExtensions.kt
diff --git a/app/src/main/proto/App.proto b/common/src/main/proto/App.proto
similarity index 100%
rename from app/src/main/proto/App.proto
rename to common/src/main/proto/App.proto
diff --git a/app/src/main/proto/Crowdnotifier.proto b/common/src/main/proto/Crowdnotifier.proto
similarity index 100%
rename from app/src/main/proto/Crowdnotifier.proto
rename to common/src/main/proto/Crowdnotifier.proto
diff --git a/app/src/main/res/anim/fragment_open_enter.xml b/common/src/main/res/anim/fragment_open_enter.xml
similarity index 100%
rename from app/src/main/res/anim/fragment_open_enter.xml
rename to common/src/main/res/anim/fragment_open_enter.xml
diff --git a/app/src/main/res/anim/fragment_open_exit.xml b/common/src/main/res/anim/fragment_open_exit.xml
similarity index 100%
rename from app/src/main/res/anim/fragment_open_exit.xml
rename to common/src/main/res/anim/fragment_open_exit.xml
diff --git a/app/src/main/res/anim/modal_pop_enter.xml b/common/src/main/res/anim/modal_pop_enter.xml
similarity index 100%
rename from app/src/main/res/anim/modal_pop_enter.xml
rename to common/src/main/res/anim/modal_pop_enter.xml
diff --git a/app/src/main/res/anim/modal_pop_exit.xml b/common/src/main/res/anim/modal_pop_exit.xml
similarity index 100%
rename from app/src/main/res/anim/modal_pop_exit.xml
rename to common/src/main/res/anim/modal_pop_exit.xml
diff --git a/app/src/main/res/anim/modal_slide_enter.xml b/common/src/main/res/anim/modal_slide_enter.xml
similarity index 100%
rename from app/src/main/res/anim/modal_slide_enter.xml
rename to common/src/main/res/anim/modal_slide_enter.xml
diff --git a/app/src/main/res/anim/modal_slide_exit.xml b/common/src/main/res/anim/modal_slide_exit.xml
similarity index 100%
rename from app/src/main/res/anim/modal_slide_exit.xml
rename to common/src/main/res/anim/modal_slide_exit.xml
diff --git a/app/src/main/res/anim/slide_enter.xml b/common/src/main/res/anim/slide_enter.xml
similarity index 100%
rename from app/src/main/res/anim/slide_enter.xml
rename to common/src/main/res/anim/slide_enter.xml
diff --git a/app/src/main/res/anim/slide_exit.xml b/common/src/main/res/anim/slide_exit.xml
similarity index 100%
rename from app/src/main/res/anim/slide_exit.xml
rename to common/src/main/res/anim/slide_exit.xml
diff --git a/app/src/main/res/anim/slide_pop_enter.xml b/common/src/main/res/anim/slide_pop_enter.xml
similarity index 100%
rename from app/src/main/res/anim/slide_pop_enter.xml
rename to common/src/main/res/anim/slide_pop_enter.xml
diff --git a/app/src/main/res/anim/slide_pop_exit.xml b/common/src/main/res/anim/slide_pop_exit.xml
similarity index 100%
rename from app/src/main/res/anim/slide_pop_exit.xml
rename to common/src/main/res/anim/slide_pop_exit.xml
diff --git a/app/src/main/res/color/selector_bottom_navigation_item.xml b/common/src/main/res/color/selector_bottom_navigation_item.xml
similarity index 100%
rename from app/src/main/res/color/selector_bottom_navigation_item.xml
rename to common/src/main/res/color/selector_bottom_navigation_item.xml
diff --git a/app/src/main/res/color/switch_tint_selector.xml b/common/src/main/res/color/switch_tint_selector.xml
similarity index 100%
rename from app/src/main/res/color/switch_tint_selector.xml
rename to common/src/main/res/color/switch_tint_selector.xml
diff --git a/app/src/main/res/drawable/bg_button_blue.xml b/common/src/main/res/drawable/bg_button_blue.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_blue.xml
rename to common/src/main/res/drawable/bg_button_blue.xml
diff --git a/app/src/main/res/drawable/bg_button_default.xml b/common/src/main/res/drawable/bg_button_default.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_default.xml
rename to common/src/main/res/drawable/bg_button_default.xml
diff --git a/app/src/main/res/drawable/bg_button_outlined.xml b/common/src/main/res/drawable/bg_button_outlined.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_outlined.xml
rename to common/src/main/res/drawable/bg_button_outlined.xml
diff --git a/app/src/main/res/drawable/bg_button_outlined_purple.xml b/common/src/main/res/drawable/bg_button_outlined_purple.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_outlined_purple.xml
rename to common/src/main/res/drawable/bg_button_outlined_purple.xml
diff --git a/app/src/main/res/drawable/bg_button_outlined_red.xml b/common/src/main/res/drawable/bg_button_outlined_red.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_outlined_red.xml
rename to common/src/main/res/drawable/bg_button_outlined_red.xml
diff --git a/app/src/main/res/drawable/bg_button_purple.xml b/common/src/main/res/drawable/bg_button_purple.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_purple.xml
rename to common/src/main/res/drawable/bg_button_purple.xml
diff --git a/app/src/main/res/drawable/bg_button_white.xml b/common/src/main/res/drawable/bg_button_white.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_button_white.xml
rename to common/src/main/res/drawable/bg_button_white.xml
diff --git a/app/src/main/res/drawable/bg_chained_edit_text.xml b/common/src/main/res/drawable/bg_chained_edit_text.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_chained_edit_text.xml
rename to common/src/main/res/drawable/bg_chained_edit_text.xml
diff --git a/app/src/main/res/drawable/bg_toolbar.xml b/common/src/main/res/drawable/bg_toolbar.xml
similarity index 100%
rename from app/src/main/res/drawable/bg_toolbar.xml
rename to common/src/main/res/drawable/bg_toolbar.xml
diff --git a/app/src/main/res/drawable/ic_cam_off.xml b/common/src/main/res/drawable/ic_cam_off.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cam_off.xml
rename to common/src/main/res/drawable/ic_cam_off.xml
diff --git a/app/src/main/res/drawable/ic_error.xml b/common/src/main/res/drawable/ic_error.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_error.xml
rename to common/src/main/res/drawable/ic_error.xml
diff --git a/app/src/main/res/drawable/ic_illu_check_in.xml b/common/src/main/res/drawable/ic_illu_check_in.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_illu_check_in.xml
rename to common/src/main/res/drawable/ic_illu_check_in.xml
diff --git a/app/src/main/res/drawable/ic_info.xml b/common/src/main/res/drawable/ic_info.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info.xml
rename to common/src/main/res/drawable/ic_info.xml
diff --git a/app/src/main/res/drawable/ic_qr.xml b/common/src/main/res/drawable/ic_qr.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_qr.xml
rename to common/src/main/res/drawable/ic_qr.xml
diff --git a/app/src/main/res/drawable/ic_radio_checked.xml b/common/src/main/res/drawable/ic_radio_checked.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_radio_checked.xml
rename to common/src/main/res/drawable/ic_radio_checked.xml
diff --git a/app/src/main/res/drawable/ic_radio_unchecked.xml b/common/src/main/res/drawable/ic_radio_unchecked.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_radio_unchecked.xml
rename to common/src/main/res/drawable/ic_radio_unchecked.xml
diff --git a/app/src/main/res/drawable/outlined_button_text_color.xml b/common/src/main/res/drawable/outlined_button_text_color.xml
similarity index 100%
rename from app/src/main/res/drawable/outlined_button_text_color.xml
rename to common/src/main/res/drawable/outlined_button_text_color.xml
diff --git a/app/src/main/res/drawable/ripple_button.xml b/common/src/main/res/drawable/ripple_button.xml
similarity index 100%
rename from app/src/main/res/drawable/ripple_button.xml
rename to common/src/main/res/drawable/ripple_button.xml
diff --git a/app/src/main/res/font/inter_bold.ttf b/common/src/main/res/font/inter_bold.ttf
similarity index 100%
rename from app/src/main/res/font/inter_bold.ttf
rename to common/src/main/res/font/inter_bold.ttf
diff --git a/app/src/main/res/font/inter_light.ttf b/common/src/main/res/font/inter_light.ttf
similarity index 100%
rename from app/src/main/res/font/inter_light.ttf
rename to common/src/main/res/font/inter_light.ttf
diff --git a/app/src/main/res/font/inter_regular.ttf b/common/src/main/res/font/inter_regular.ttf
similarity index 100%
rename from app/src/main/res/font/inter_regular.ttf
rename to common/src/main/res/font/inter_regular.ttf
diff --git a/app/src/main/res/layout/item_error_status.xml b/common/src/main/res/layout/item_error_status.xml
similarity index 97%
rename from app/src/main/res/layout/item_error_status.xml
rename to common/src/main/res/layout/item_error_status.xml
index 188177d80..5ccef76e0 100644
--- a/app/src/main/res/layout/item_error_status.xml
+++ b/common/src/main/res/layout/item_error_status.xml
@@ -23,7 +23,7 @@
 		android:id="@+id/error_status_image"
 		android:layout_width="@dimen/icon_size"
 		android:layout_height="@dimen/icon_size"
-		android:src="@drawable/ic_ic_bluetooth_disabled" />
+		android:src="@drawable/ic_error" />
 
 	<TextView
 		android:id="@+id/error_status_title"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/common/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to common/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/common/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to common/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/common/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to common/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/common/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to common/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/common/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to common/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/common/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to common/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/common/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to common/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/common/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to common/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/common/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to common/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/common/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to common/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/common/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to common/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/common/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to common/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/common/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to common/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/common/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to common/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/common/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to common/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/common/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to common/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/common/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to common/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/common/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to common/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/common/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to common/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/common/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to common/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
similarity index 100%
rename from app/src/main/res/values-bs/strings.xml
rename to common/src/main/res/values-bs/strings.xml
diff --git a/app/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to common/src/main/res/values-de/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/strings.xml
rename to common/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to common/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
similarity index 100%
rename from app/src/main/res/values-hr/strings.xml
rename to common/src/main/res/values-hr/strings.xml
diff --git a/app/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
similarity index 100%
rename from app/src/main/res/values-it/strings.xml
rename to common/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt/strings.xml
rename to common/src/main/res/values-pt/strings.xml
diff --git a/app/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
similarity index 100%
rename from app/src/main/res/values-rm/strings.xml
rename to common/src/main/res/values-rm/strings.xml
diff --git a/app/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
similarity index 100%
rename from app/src/main/res/values-sq/strings.xml
rename to common/src/main/res/values-sq/strings.xml
diff --git a/app/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
similarity index 100%
rename from app/src/main/res/values-sr/strings.xml
rename to common/src/main/res/values-sr/strings.xml
diff --git a/app/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
similarity index 100%
rename from app/src/main/res/values-ti/strings.xml
rename to common/src/main/res/values-ti/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
similarity index 100%
rename from app/src/main/res/values-tr/strings.xml
rename to common/src/main/res/values-tr/strings.xml
diff --git a/app/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to common/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/developer_strings.xml b/common/src/main/res/values/developer_strings.xml
similarity index 100%
rename from app/src/main/res/values/developer_strings.xml
rename to common/src/main/res/values/developer_strings.xml
diff --git a/app/src/main/res/values/dimens.xml b/common/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to common/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/sdk_string_config.xml b/common/src/main/res/values/sdk_string_config.xml
similarity index 100%
rename from app/src/main/res/values/sdk_string_config.xml
rename to common/src/main/res/values/sdk_string_config.xml
diff --git a/app/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to common/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/strings_untranslated.xml b/common/src/main/res/values/strings_untranslated.xml
similarity index 100%
rename from app/src/main/res/values/strings_untranslated.xml
rename to common/src/main/res/values/strings_untranslated.xml
diff --git a/app/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
similarity index 69%
rename from app/src/main/res/values/styles.xml
rename to common/src/main/res/values/styles.xml
index 6622726b3..6d36b6355 100644
--- a/app/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -20,7 +20,6 @@
 		<item name="android:statusBarColor">@color/white</item>
 		<item name="toolbarStyle">@style/NextStep.Toolbar</item>
 		<item name="toolbarNavigationButtonStyle">@style/NextStep.Toolbar.Button.Navigation</item>
-		<item name="android:timePickerDialogTheme">@style/NextStep.TimePicker</item>
 	</style>
 
 	<!-- Text -->
@@ -278,31 +277,6 @@
 		<item name="android:background">@drawable/bg_button_outlined_purple</item>
 	</style>
 
-	<style name="NextStep.Button.AlertDialog" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-		<item name="android:textSize">@dimen/text_size_button</item>
-		<item name="android:textColor">@color/blue_main</item>
-		<item name="android:fontFamily">@font/inter_bold</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textAllCaps">false</item>
-		<item name="rippleColor">@color/grey_dark</item>
-	</style>
-
-	<!-- Other -->
-
-	<style name="NextStep.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
-		<item name="background">@color/bottom_navigation_background</item>
-		<item name="itemIconTint">@color/selector_bottom_navigation_item</item>
-		<item name="itemTextColor">@color/selector_bottom_navigation_item</item>
-		<item name="itemRippleColor">?android:attr/colorControlHighlight</item>
-		<item name="itemTextAppearanceActive">@style/NextStep.Text.BottomNavigationViewTextStyle</item>
-		<item name="itemTextAppearanceInactive">@style/NextStep.Text.BottomNavigationViewTextStyle</item>
-	</style>
-
-	<style name="NextStep.Card" parent="CardView">
-		<item name="cardBackgroundColor">@color/white</item>
-		<item name="cardCornerRadius">@dimen/card_border_radius</item>
-	</style>
-
 	<style name="NextStep.Toolbar" parent="Widget.AppCompat.Toolbar">
 		<item name="android:background">@drawable/bg_toolbar</item>
 		<item name="android:elevation">@dimen/toolbar_elevation</item>
@@ -315,65 +289,5 @@
 		<item name="android:tint">@color/navigation_icon_toolbar</item>
 	</style>
 
-	<style name="NextStep.Switch" parent="Widget.AppCompat.CompoundButton.Switch">
-		<item name="android:thumbTint">@color/switch_tint_selector</item>
-		<item name="android:trackTint">@color/switch_tint_selector</item>
-	</style>
-
-	<style name="NextStep.RadioButton" parent="Widget.MaterialComponents.CompoundButton.RadioButton">
-		<item name="android:textAppearance">@style/NextStep.Text</item>
-		<item name="android:textColor">@color/dark_main</item>
-		<item name="android:paddingStart">@dimen/spacing_medium</item>
-	</style>
-
-	<style name="NextStep.RadioButton.Reminder" parent="Widget.MaterialComponents.CompoundButton.RadioButton">
-		<item name="android:textSize">@dimen/text_size_normal</item>
-		<item name="android:textColor">@color/dark_main</item>
-		<item name="android:layout_height">48dp</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:paddingStart">@dimen/spacing_small</item>
-		<item name="android:paddingEnd">@dimen/spacing_small</item>
-		<item name="android:drawablePadding">@dimen/spacing_medium</item>
-		<item name="android:background">@null</item>
-		<item name="android:foreground">?android:selectableItemBackground</item>
-		<item name="android:button">@null</item>
-		<item name="android:drawableStart">@drawable/ic_radio_button</item>
-	</style>
-
-	<style name="NextStep.AlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-		<item name="android:colorAccent">@color/blue_main</item>
-		<item name="android:textColor">@color/dark_main</item>
-		<item name="android:textColorPrimary">@color/dark_main</item>
-		<item name="buttonBarPositiveButtonStyle">@style/NextStep.Button.AlertDialog</item>
-		<item name="buttonBarNegativeButtonStyle">@style/NextStep.Button.AlertDialog</item>
-		<item name="android:fontFamily">@font/inter_light</item>
-		<item name="fontFamily">@font/inter_light</item>
-	</style>
-
-	<style name="NextStep.TimePicker" parent="Theme.AppCompat.Light.Dialog">
-		<item name="colorAccent">@color/primary</item>
-		<item name="android:colorAccent">@color/primary</item>
-		<item name="colorPrimary">@color/primary</item>
-		<item name="colorPrimaryDark">@color/primary</item>
-		<item name="buttonBarButtonStyle">@color/primary</item>
-		<item name="android:buttonBarButtonStyle">@style/NextStep.TimePicker.Button</item>
-	</style>
-
-	<style name="NextStep.TimePicker.Button" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-		<item name="android:textColor">@color/primary</item>
-	</style>
-
-	<style name="NextStep.DateTimePicker" parent="android:Widget">
-		<item name="android:textSize">@dimen/text_size_normal</item>
-		<item name="colorControlNormal">@color/red_main</item>
-		<item name="android:textColorPrimary">@color/dark_main</item>
-		<item name="np_textSize">@dimen/text_size_normal</item>
-		<item name="np_selectedTextSize">@dimen/text_size_normal</item>
-		<item name="np_textColor">@color/dark_main</item>
-		<item name="np_selectedTextColor">@color/dark_main</item>
-		<item name="np_dividerColor">@color/blue_main</item>
-		<item name="np_dividerDistance">36sp</item>
-		<item name="np_wheelItemCount">3</item>
-	</style>
 
 </resources>
diff --git a/instant/.gitignore b/instant/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/instant/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/instant/build.gradle b/instant/build.gradle
new file mode 100644
index 000000000..cbb1b73e7
--- /dev/null
+++ b/instant/build.gradle
@@ -0,0 +1,73 @@
+plugins {
+	id 'com.android.application'
+	id 'kotlin-android'
+}
+
+android {
+	compileSdkVersion 30
+
+	defaultConfig {
+		applicationId "ch.admin.bag.dp3t"
+		minSdkVersion 23
+		targetSdkVersion 30
+		versionCode 1
+		versionName "2.0.0"
+		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
+
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+	}
+
+	productFlavors {
+		dev {
+			manifestPlaceholders = [qrCodeHostName: "qr-d.swisscovid.ch"]
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
+			applicationIdSuffix '.dev'
+		}
+		abnahme {
+			manifestPlaceholders = [qrCodeHostName: "qr-a.swisscovid.ch"]
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
+			applicationIdSuffix '.abnahme'
+		}
+		prod {
+			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+		}
+		log {
+			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
+			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+		}
+	}
+
+	flavorDimensions "version"
+
+	compileOptions {
+		sourceCompatibility = 1.8
+		targetCompatibility = 1.8
+	}
+
+
+	kotlinOptions {
+		jvmTarget = "1.8"
+	}
+
+	buildFeatures {
+		viewBinding true
+	}
+
+}
+
+dependencies {
+
+	implementation project(path: ':common')
+
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+	implementation 'androidx.core:core-ktx:1.5.0'
+	implementation 'androidx.appcompat:appcompat:1.3.0'
+	implementation 'com.google.android.material:material:1.3.0'
+	testImplementation 'junit:junit:4.+'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-10'
+
+}
\ No newline at end of file
diff --git a/instant/proguard-rules.pro b/instant/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/instant/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/instant/src/main/AndroidManifest.xml b/instant/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..5c548c288
--- /dev/null
+++ b/instant/src/main/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:dist="http://schemas.android.com/apk/distribution"
+	xmlns:tools="http://schemas.android.com/tools"
+	package="ch.admin.bag.dp3t"
+	android:targetSandboxVersion="2">
+
+	<dist:module dist:instant="true" />
+
+	<application
+		android:allowBackup="false"
+		android:fullBackupContent="false"
+		android:icon="@mipmap/ic_launcher"
+		android:label="@string/app_name"
+		android:roundIcon="@mipmap/ic_launcher_round"
+		android:supportsRtl="true"
+		android:theme="@style/NextStepTheme"
+		tools:ignore="UnusedAttribute"
+		tools:replace="android:fullBackupContent">
+
+		<activity
+			android:name=".InstantActivity"
+			android:screenOrientation="portrait">
+
+			<intent-filter
+				android:autoVerify="true"
+				android:order="1">
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data
+					android:host="${qrCodeHostName}"
+					android:scheme="https" />
+				<data
+					android:host="${qrCodeHostName}"
+					android:scheme="http" />
+			</intent-filter>
+
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+			</intent-filter>
+
+			<!--When clicking on "try now" in the Playstore, the instant app will be started with this Url. Unfortunately, the value
+			can not be set to something dynamic such as ${qrCodeHostName}, otherwise the Play Console upload will fail.-->
+			<meta-data
+				android:name="default-url"
+				android:value="https://qr.swisscovid.ch/" />
+
+		</activity>
+
+	</application>
+
+</manifest>
\ No newline at end of file
diff --git a/instant/src/main/java/ch/admin/bag/dp3t/InstantActivity.kt b/instant/src/main/java/ch/admin/bag/dp3t/InstantActivity.kt
new file mode 100644
index 000000000..862ef7679
--- /dev/null
+++ b/instant/src/main/java/ch/admin/bag/dp3t/InstantActivity.kt
@@ -0,0 +1,19 @@
+package ch.admin.bag.dp3t
+
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+
+class InstantActivity : FragmentActivity() {
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_instant)
+
+		if (savedInstanceState == null) {
+			supportFragmentManager.beginTransaction()
+				.replace(R.id.instant_fragment_container, InstantFragment.newInstance())
+				.commit()
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
new file mode 100644
index 000000000..bce2e4f3d
--- /dev/null
+++ b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
@@ -0,0 +1,109 @@
+package ch.admin.bag.dp3t
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.checkin.utils.ErrorHelper
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState
+import ch.admin.bag.dp3t.databinding.FragmentInstantBinding
+import ch.admin.bag.dp3t.extensions.getSubtitle
+import com.google.android.gms.instantapps.InstantApps
+import com.google.android.gms.instantapps.PackageManagerCompat
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.model.VenueInfo
+import org.crowdnotifier.android.sdk.utils.QrUtils.*
+import java.nio.charset.StandardCharsets
+
+
+private const val REQUEST_CODE_INSTALL = 1
+private const val QR_URL_PREFIX = BuildConfig.ENTRY_QR_CODE_PREFIX
+private const val QR_URL_PREFIX_WITH_VERSION = "$QR_URL_PREFIX?v="
+
+class InstantFragment : Fragment() {
+
+	companion object {
+		val TAG: String = InstantFragment::class.java.canonicalName!!
+		fun newInstance() = InstantFragment()
+	}
+
+	private lateinit var binding: FragmentInstantBinding
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentInstantBinding.inflate(inflater)
+		return binding.apply {
+			val qrCodeUrl = requireActivity().intent?.data?.toString()
+			Log.d(TAG, "QR Code Url: $qrCodeUrl")
+
+			installButton.setOnClickListener { showInstallPrompt(qrCodeUrl) }
+
+			showVenueInfo(qrCodeUrl)
+
+		}.root
+	}
+
+	private fun showVenueInfo(qrCodeUrl: String?) {
+		// If the instant app is started without a url (should never happen) or with the default url, don't show any QR Code
+		// information nor error.
+		// Note: https://qr.swisscovid.ch is defined as the default url in the Manifest. When clicking on "Try now" in the Playstore
+		// the Instant App is started with this url and some parameters, e.g.:
+		// https://qr.swisscovid.ch/?referrer=utm_source%3D(not%2520set)%26utm_medium%3D(not%2520set)
+
+		binding.apply {
+			if (qrCodeUrl == null || !qrCodeUrl.startsWith(QR_URL_PREFIX_WITH_VERSION)) {
+				title.setText(R.string.app_name)
+				installButton.setText(R.string.playservices_install)
+				return
+			}
+			try {
+				val venueInfo: VenueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, QR_URL_PREFIX)
+				title.text = venueInfo.title
+				subtitle.setText(venueInfo.getSubtitle())
+			} catch (e: QRException) {
+				handleInvalidQRCodeExceptions(e)
+			}
+		}
+	}
+
+	private fun handleInvalidQRCodeExceptions(e: QRException) {
+		binding.apply {
+			errorView.isVisible = true
+			illu.isVisible = false
+			title.setText(R.string.app_name)
+			installButton.setText(R.string.playservices_install)
+			when (e) {
+				is NotYetValidException ->
+					ErrorHelper.updateErrorView(errorView, CrowdNotifierErrorState.QR_CODE_NOT_YET_VALID, null, context, false)
+				is NotValidAnymoreException ->
+					ErrorHelper.updateErrorView(errorView, CrowdNotifierErrorState.QR_CODE_NOT_VALID_ANYMORE, null, context, false)
+				else -> ErrorHelper.updateErrorView(errorView, CrowdNotifierErrorState.NO_VALID_QR_CODE, null, context, false)
+			}
+		}
+	}
+
+	private fun showInstallPrompt(qrCodeUrl: String?) {
+		storeInstantAppCookie(qrCodeUrl)
+		val postInstallIntent = Intent(Intent.ACTION_MAIN)
+			.addCategory(Intent.CATEGORY_DEFAULT)
+			.setPackage(requireContext().packageName)
+		InstantApps.showInstallPrompt(requireActivity(), postInstallIntent, REQUEST_CODE_INSTALL, null)
+	}
+
+	private fun storeInstantAppCookie(qrCodeUrl: String?) {
+		val pmc: PackageManagerCompat = InstantApps.getPackageManagerCompat(requireContext())
+		val cookieContent: ByteArray? = if (qrCodeUrl == null || !qrCodeUrl.startsWith(QR_URL_PREFIX_WITH_VERSION)) {
+			null
+		} else {
+			qrCodeUrl.toByteArray(StandardCharsets.UTF_8)
+		}
+		if (cookieContent == null || cookieContent.size <= pmc.instantAppCookieMaxSize) {
+			pmc.instantAppCookie = cookieContent
+		}
+	}
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_update_boarding.xml b/instant/src/main/res/layout/activity_instant.xml
similarity index 67%
rename from app/src/main/res/layout/activity_update_boarding.xml
rename to instant/src/main/res/layout/activity_instant.xml
index 0cbdc2bc6..dd1a0e151 100644
--- a/app/src/main/res/layout/activity_update_boarding.xml
+++ b/instant/src/main/res/layout/activity_instant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/main_fragment_container"
+	android:id="@+id/instant_fragment_container"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent" />
\ No newline at end of file
+	android:layout_height="match_parent" />
diff --git a/instant/src/main/res/layout/fragment_instant.xml b/instant/src/main/res/layout/fragment_instant.xml
new file mode 100644
index 000000000..baa401403
--- /dev/null
+++ b/instant/src/main/res/layout/fragment_instant.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/white"
+	android:orientation="vertical">
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_large"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/title"
+				style="@style/NextStep.Text.SplashTitle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:gravity="center_horizontal"
+				tools:text="Reuss Ubique" />
+
+			<TextView
+				android:id="@+id/subtitle"
+				style="@style/NextStep.Text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal"
+				tools:text="User Upload Code" />
+
+			<ImageView
+				android:id="@+id/illu"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:src="@drawable/ic_illu_check_in" />
+
+			<include
+				android:id="@+id/error_view"
+				layout="@layout/item_error_status"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:visibility="gone" />
+
+			<TextView
+				style="@style/NextStep.Text.SplashTitle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_huge"
+				android:gravity="center_horizontal"
+				android:text="@string/onboarding_checkin_title" />
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_larger"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_marginRight="@dimen/spacing_medium_large"
+					android:src="@drawable/ic_qr"
+					android:tint="@color/blue_main" />
+
+				<TextView
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:breakStrategy="high_quality"
+					android:hyphenationFrequency="full"
+					android:text="@string/onboarding_checkin_text1" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:id="@+id/icon"
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_marginRight="@dimen/spacing_medium_large"
+					android:src="@drawable/ic_info"
+					android:tint="@color/blue_main" />
+
+				<TextView
+					android:id="@+id/text"
+					style="@style/NextStep.Text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:breakStrategy="high_quality"
+					android:hyphenationFrequency="full"
+					android:text="@string/onboarding_checkin_text2" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:background="@color/white"
+		android:elevation="@dimen/onboarding_button_container_elevation"
+		android:gravity="center"
+		android:orientation="vertical"
+		android:outlineProvider="bounds"
+		android:padding="@dimen/spacing_medium">
+
+		<Button
+			android:id="@+id/install_button"
+			style="@style/NextStep.Button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingHorizontal="@dimen/spacing_small"
+			android:text="@string/instant_app_install_action" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6eb1d7643..d86e9a128 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,4 +9,6 @@
  */
 
 rootProject.name='dp3t-android-app'
-include ':app'
\ No newline at end of file
+include ':app'
+include ':instant'
+include ':common'

From aca3dedffaaef3325ac03b834be059142108f1ab Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 11:05:37 +0200
Subject: [PATCH 113/207] Remove Test Flavour

---
 app/build.gradle | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a8565e081..a41cf94bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,21 +77,6 @@ android {
 			applicationIdSuffix '.dev'
 			manifestPlaceholders = [qrCodeHostName: "qr-d.swisscovid.ch"]
 		}
-		tescht {
-			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
-			buildConfigField 'String', 'AUTH_CODE_URL', '"https://codegen-service-t.bag.admin.ch/"'
-			buildConfigField 'String', 'CONFIG_URL', '"https://www.pt-t.bfs.admin.ch/"'
-			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-t.bfs.admin.ch/"'
-			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-t.bfs.admin.ch/"'
-			buildConfigField 'String', 'STATS_URL', '"https://www.pt-t.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-t.swisscovid.ch"'
-			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
-			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
-			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.test.BUCKET_PUBLIC_KEY}\""
-			applicationIdSuffix '.test'
-			manifestPlaceholders = [qrCodeHostName: "qr-t.swisscovid.ch"]
-		}
 		abnahme {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
 			buildConfigField 'String', 'AUTH_CODE_URL', '"https://codegen-service-a.bag.admin.ch/"'
@@ -189,7 +174,6 @@ dependencies {
 
 	def dp3t_sdk_version = '2.3.0-dev-6'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
-	teschtImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"

From bcb046401d94ee68ce9daab64528c54a04acaf6c Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 11:20:00 +0200
Subject: [PATCH 114/207] Finalize Base URLs

---
 app/build.gradle                                | 14 +++++---------
 .../main/java/ch/admin/bag/dp3t/MainActivity.kt | 15 +++++----------
 .../checkinflow/QrCodeScannerFragment.java      | 17 ++---------------
 .../checkin/networking/UserUploadRepository.kt  |  2 +-
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a41cf94bc..49cbc2c61 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,9 +69,8 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
-			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.dev'
@@ -84,9 +83,8 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
-			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.abnahme'
@@ -99,9 +97,8 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
-			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
@@ -113,9 +110,8 @@ android {
 			buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://app-dev-ws.notify-me.ch/"'
+			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
-			buildConfigField "String", "TRACE_QR_CODE_PREFIX", '"https://upload-dev.notify-me.ch"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
@@ -178,7 +174,7 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-10'
+	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-13'
 
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index c04bd9157..0e924ca5e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -118,7 +118,7 @@ class MainActivity : FragmentActivity() {
 		tracingViewModel.sync()
 	}
 
-	public fun launchOnboarding(onboardingType: OnboardingType, instantAppQrCodeUrl: String? = null) {
+	fun launchOnboarding(onboardingType: OnboardingType, instantAppQrCodeUrl: String? = null) {
 		val intent = Intent(this, OnboardingActivity::class.java).apply {
 			putExtra(OnboardingActivity.ARG_ONBOARDING_TYPE, onboardingType)
 		}
@@ -229,7 +229,7 @@ class MainActivity : FragmentActivity() {
 				showFragmentWithoutAnimation(CheckInFragment.newInstance(false))
 			}
 		} catch (e: QRException) {
-			handleInvalidQRCodeExceptions(qrCodeData, e)
+			handleInvalidQRCodeExceptions(e)
 		}
 	}
 
@@ -242,11 +242,11 @@ class MainActivity : FragmentActivity() {
 				crowdNotifierViewModel.performCheckinAndSetReminders(venueInfo, 0)
 			}
 		} catch (e: QRException) {
-			handleInvalidQRCodeExceptions(qrCodeUrl, e)
+			handleInvalidQRCodeExceptions(e)
 		}
 	}
 
-	private fun handleInvalidQRCodeExceptions(qrCodeData: String, e: QRException) {
+	private fun handleInvalidQRCodeExceptions(e: QRException) {
 		if (e is InvalidQRCodeVersionException) {
 			ErrorDialog(this, CrowdNotifierErrorState.UPDATE_REQUIRED).show()
 		} else if (e is NotYetValidException) {
@@ -254,12 +254,7 @@ class MainActivity : FragmentActivity() {
 		} else if (e is NotValidAnymoreException) {
 			ErrorDialog(this, CrowdNotifierErrorState.QR_CODE_NOT_VALID_ANYMORE).show()
 		} else {
-			if (qrCodeData.startsWith(BuildConfig.TRACE_QR_CODE_PREFIX)) {
-				val openBrowserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeData))
-				startActivity(openBrowserIntent)
-			} else {
-				ErrorDialog(this, CrowdNotifierErrorState.NO_VALID_QR_CODE).show()
-			}
+			ErrorDialog(this, CrowdNotifierErrorState.NO_VALID_QR_CODE).show()
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 48c7b10f6..662673d47 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -63,7 +63,6 @@ public class QrCodeScannerFragment extends Fragment implements QrCodeAnalyzer.Li
 	private View bottomLeftIndicator;
 	private View errorView;
 	private View mainView;
-	private boolean goToHome = false;
 	private boolean isQRScanningEnabled = true;
 	private long lastUIErrorUpdate = 0L;
 
@@ -82,12 +81,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
 	@Override
 	public void onResume() {
-		if (goToHome) {
-			requireActivity().getSupportFragmentManager().popBackStack();
-			goToHome = false;
-		} else {
-			isQRScanningEnabled = true;
-		}
+		isQRScanningEnabled = true;
 		super.onResume();
 	}
 
@@ -211,14 +205,7 @@ private void handleInvalidQRCodeExceptions(String qrCodeData, QrUtils.QRExceptio
 		} else if (e instanceof QrUtils.NotValidAnymoreException) {
 			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NOT_VALID_ANYMORE));
 		} else {
-			if (qrCodeData.startsWith(BuildConfig.TRACE_QR_CODE_PREFIX)) {
-				isQRScanningEnabled = false;
-				Intent openBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeData));
-				startActivity(openBrowserIntent);
-				goToHome = true;
-			} else {
-				if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.INVALID_FORMAT));
-			}
+			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.INVALID_FORMAT));
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
index 1d454fb5c..e550c3981 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -25,7 +25,7 @@ class UserUploadRepository {
 		okHttpBuilder.addInterceptor(UserAgentInterceptor(DP3T.getUserAgent()))
 
 		val retrofit = Retrofit.Builder()
-			.baseUrl(BuildConfig.PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL)
+			.baseUrl(BuildConfig.REPORT_URL)
 			.client(okHttpBuilder.build())
 			.addConverterFactory(ProtoConverterFactory.create())
 			.build()

From ce389f3e96ad40c59b709731730cf072bd344e45 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 11:43:34 +0200
Subject: [PATCH 115/207] Delay UserUpload

---
 .../networking/UserUploadRepository.kt        | 21 +++++++++++++------
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 19 +++++++++++++----
 .../admin/bag/dp3t/networking/FakeWorker.kt   |  3 ++-
 common/src/main/proto/App.proto               |  1 +
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
index e550c3981..a9c81e9c8 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -32,14 +32,23 @@ class UserUploadRepository {
 		userUploadService = retrofit.create(UserUploadService::class.java)
 	}
 
-	suspend fun userUpload(uploadVenueInfos: List<UploadVenueInfo>, authorizationHeader: String) =
-		userUploadService.userUpload(getUserUploadPayload(uploadVenueInfos), authorizationHeader)
+	suspend fun userUpload(
+		uploadVenueInfos: List<UploadVenueInfo>,
+		timeBetweenOnsetAndUploadRequest: Int,
+		authorizationHeader: String
+	) =
+		userUploadService.userUpload(getUserUploadPayload(uploadVenueInfos, timeBetweenOnsetAndUploadRequest), authorizationHeader)
 
-	suspend fun fakeUserUpload(authorizationHeader: String) =
-		userUploadService.userUpload(getUserUploadPayload(listOf()), authorizationHeader)
+	suspend fun fakeUserUpload(timeBetweenOnsetAndUploadRequest: Int, authorizationHeader: String) =
+		userUploadService.userUpload(getUserUploadPayload(listOf(), timeBetweenOnsetAndUploadRequest), authorizationHeader)
 
-	private fun getUserUploadPayload(uploadVenueInfos: List<UploadVenueInfo>): UserUploadPayload {
-		val userUploadPayloadBuilder = UserUploadPayload.newBuilder().setVersion(USER_UPLOAD_VERSION)
+	private fun getUserUploadPayload(
+		uploadVenueInfos: List<UploadVenueInfo>,
+		timeBetweenOnsetAndUploadRequest: Int
+	): UserUploadPayload {
+		val userUploadPayloadBuilder = UserUploadPayload.newBuilder()
+			.setVersion(USER_UPLOAD_VERSION)
+			.setUserInteractionDurationMs(timeBetweenOnsetAndUploadRequest)
 		userUploadPayloadBuilder.addAllVenueInfos(uploadVenueInfos)
 		for (i in userUploadPayloadBuilder.venueInfosCount until USER_UPLOAD_SIZE) {
 			userUploadPayloadBuilder.addVenueInfos(getRandomFakeVenueInfo())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 6615b5697..cc709d75f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -18,6 +18,7 @@ import ch.admin.bag.dp3t.util.JwtUtil
 import ch.admin.bag.dp3t.util.toUploadVenueInfo
 import com.google.android.gms.common.api.ApiException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.DP3TKotlin
@@ -37,12 +38,14 @@ import kotlin.coroutines.suspendCoroutine
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
+private const val UPLOAD_REQUEST_TIME_PADDING = 5000L
 private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
 private const val KEY_HAS_SHARED_CHECKINS = "KEY_HAS_SHARED_CHECKINS"
 private const val KEY_PENDING_UPLOAD_TASK = "KEY_PENDING_UPLOAD_TASK"
 private const val KEY_SELECTED_DIARY_ENTRIES = "KEY_SELECTED_DIARY_ENTRIES"
 private const val KEY_ONSET_DATE = "KEY_ONSET_DATE"
+private const val KEY_ONSET_REQUEST_TIME = "KEY_ONSET_REQUEST_TIME"
 
 class InformViewModel(application: Application, private val state: SavedStateHandle) : AndroidViewModel(application) {
 
@@ -75,10 +78,15 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		get() = state.get<Long>(KEY_ONSET_DATE)
 		set(value) = state.set(KEY_ONSET_DATE, value)
 
+	private var onsetResponseTime: Long?
+		get() = state.get<Long>(KEY_ONSET_REQUEST_TIME)
+		set(value) = state.set(KEY_ONSET_REQUEST_TIME, value)
+
 	fun loadOnsetDate() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
 			emit(Resource.success(loadOnsetDate(covidCode)))
+			onsetResponseTime = System.currentTimeMillis()
 		} catch (exception: Throwable) {
 			emit(Resource.error(data = null, exception = exception))
 		}
@@ -86,6 +94,9 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 	fun performUpload() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
+		val onsetResponseTime = onsetResponseTime ?: System.currentTimeMillis()
+		val timeBetweenOnsetAndUploadRequest = (System.currentTimeMillis() - onsetResponseTime).toInt()
+		delay(UPLOAD_REQUEST_TIME_PADDING - (System.currentTimeMillis() - onsetResponseTime) % UPLOAD_REQUEST_TIME_PADDING)
 		try {
 			loadAccessTokens(covidCode)
 		} catch (exception: Throwable) {
@@ -113,7 +124,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 
 		try {
-			performCheckinsUpload(isFake = !hasSharedCheckins)
+			performCheckinsUpload(timeBetweenOnsetAndUploadRequest, isFake = !hasSharedCheckins)
 		} catch (exception: Throwable) {
 			when (exception) {
 				is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
@@ -194,12 +205,12 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		error?.let { throw(it) }
 	}
 
-	private suspend fun performCheckinsUpload(isFake: Boolean) {
+	private suspend fun performCheckinsUpload(timeBetweenOnsetAndUploadRequest: Int, isFake: Boolean) {
 		val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
 		if (isFake) {
-			userUploadRepository.fakeUserUpload(authorizationHeader)
+			userUploadRepository.fakeUserUpload(timeBetweenOnsetAndUploadRequest, authorizationHeader)
 		} else {
-			userUploadRepository.userUpload(getUploadVenueInfos(), authorizationHeader)
+			userUploadRepository.userUpload(getUploadVenueInfos(), timeBetweenOnsetAndUploadRequest, authorizationHeader)
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
index da5a80c3b..d5f0fd510 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
@@ -159,7 +159,8 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 			DP3TKotlin.sendFakeInfectedRequest(context, ExposeeAuthMethodAuthorization(getAuthorizationHeader(dp3tAccessToken)))
 			//Execute Checkin UserUpload Request
 			val checkinAccessToken = accessTokenResponse.checkInAccessToken.accessToken
-			UserUploadRepository().fakeUserUpload(getAuthorizationHeader(checkinAccessToken))
+			//TODO: Replace this with random delay
+			UserUploadRepository().fakeUserUpload(0, getAuthorizationHeader(checkinAccessToken))
 			true
 		} catch (e: Throwable) {
 			Logger.e(TAG, "fake request failed", e)
diff --git a/common/src/main/proto/App.proto b/common/src/main/proto/App.proto
index 995364bd4..19732ac79 100644
--- a/common/src/main/proto/App.proto
+++ b/common/src/main/proto/App.proto
@@ -51,6 +51,7 @@ message AssociatedData {
 message UserUploadPayload {
   int32 version = 1;
   repeated UploadVenueInfo venueInfos = 2;
+  fixed32 userInteractionDurationMs = 3;
 }
 message UploadVenueInfo {
   bytes preId = 1;

From 4ea47f78e6873d221c0dc3e1927028c1f74ebfcb Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 12:06:16 +0200
Subject: [PATCH 116/207] Fix error handling for onset Request

---
 .../java/ch/admin/bag/dp3t/inform/InformFragment.kt |  9 ++++++++-
 .../ch/admin/bag/dp3t/inform/InformViewModel.kt     | 10 +++++++---
 .../bag/dp3t/inform/TraceKeyShareBaseFragment.kt    |  2 +-
 .../admin/bag/dp3t/networking/AuthCodeRepository.kt | 13 ++++++++++++-
 .../ch/admin/bag/dp3t/networking/AuthCodeService.kt |  2 +-
 .../bag/dp3t/networking/models/AuthCodeModels.kt    |  2 +-
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 593aec185..de0f6a317 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -20,6 +20,8 @@ import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.inform.views.ChainedEditText
 import ch.admin.bag.dp3t.inform.views.ChainedEditText.ChainedEditTextListener
+import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
+import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.util.PhoneUtil
 
 private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}"
@@ -90,7 +92,12 @@ class InformFragment : TraceKeyShareBaseFragment() {
 					}
 				}
 			} else if (it.status == Status.ERROR) {
-				setInvalidCovidcodeErrorVisible(true)
+				if (it.data == null) return@observe
+				when (it.exception) {
+					is ResponseError -> showErrorDialog(it.data, it.exception.statusCode.toString())
+					is InvalidCodeError -> setInvalidCovidcodeErrorVisible(true)
+					else -> showErrorDialog(it.data)
+				}
 			}
 		}
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index cc709d75f..b48b4cb7b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -85,10 +85,15 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	fun loadOnsetDate() = liveData(Dispatchers.IO) {
 		emit(Resource.loading(data = null))
 		try {
-			emit(Resource.success(loadOnsetDate(covidCode)))
+			loadOnsetDate(covidCode)
+			emit(Resource.success(data = null))
 			onsetResponseTime = System.currentTimeMillis()
 		} catch (exception: Throwable) {
-			emit(Resource.error(data = null, exception = exception))
+			when (exception) {
+				is InvalidCodeError -> emit(Resource.error(InformRequestError.BLACK_INVALID_AUTH_RESPONSE_FORM, exception))
+				is ResponseError -> emit(Resource.error(InformRequestError.BLACK_STATUS_ERROR, exception))
+				else -> emit(Resource.error(InformRequestError.BLACK_MISC_NETWORK_ERROR, exception))
+			}
 		}
 	}
 
@@ -216,7 +221,6 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 	private suspend fun loadOnsetDate(covidcode: String) {
 		val onsetResponse = authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(covidcode, 0))
-		if (onsetResponse.onset == null) throw InvalidCodeError()
 		onsetDate = SimpleDateFormat("yyyy-MM-dd").parse(onsetResponse.onset)?.time
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index ff1295d4c..542cca462 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -81,7 +81,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 		error.exception?.printStackTrace()
 	}
 
-	private fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
+	protected fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
 		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(error.errorMessage)
 			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
index 93d046613..f1c957bbd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeRepository.kt
@@ -15,6 +15,7 @@ import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeResponseModelV2
+import ch.admin.bag.dp3t.networking.models.OnsetResponse
 import kotlinx.coroutines.*
 import okhttp3.Cache
 import okhttp3.Interceptor
@@ -69,5 +70,15 @@ class AuthCodeRepository(context: Context) {
 			return@withContext response.body() ?: throw ResponseError(response.raw())
 		}
 
-	suspend fun getOnsetDate(authCode: AuthenticationCodeRequestModel) = authCodeService.getOnsetDate(authCode)
+	suspend fun getOnsetDate(authCode: AuthenticationCodeRequestModel): OnsetResponse {
+		val response = authCodeService.getOnsetDate(authCode)
+		if (!response.isSuccessful) {
+			if (response.code() == 404) {
+				throw InvalidCodeError()
+			} else {
+				throw ResponseError(response.raw())
+			}
+		}
+		return response.body() ?: throw ResponseError(response.raw())
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
index cc1322c97..665d84d90 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/AuthCodeService.kt
@@ -25,6 +25,6 @@ interface AuthCodeService {
 
 	@Headers("accept: */*", "content-type: application/json")
 	@POST("v2/onset/date")
-	suspend fun getOnsetDate(@Body code: AuthenticationCodeRequestModel): OnsetResponse
+	suspend fun getOnsetDate(@Body code: AuthenticationCodeRequestModel): Response<OnsetResponse>
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
index 83b9e9a28..94d46ca35 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/AuthCodeModels.kt
@@ -12,4 +12,4 @@ data class AuthenticationCodeResponseModelV2(
 class AuthenticationCodeResponseModel(val accessToken: String)
 
 
-data class OnsetResponse(val onset: String?)
+data class OnsetResponse(val onset: String)

From 6d03f90aea27bb2683e5ff0c3a4c1b2eeb2e8754 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 12:39:57 +0200
Subject: [PATCH 117/207] Only Upload venueInfos of type USER_QR_CODE

---
 app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index b48b4cb7b..b3ad7ab2b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -5,8 +5,10 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.liveData
 import ch.admin.bag.dp3t.checkin.models.UploadVenueInfo
+import ch.admin.bag.dp3t.checkin.models.VenueType
 import ch.admin.bag.dp3t.checkin.networking.UserUploadRepository
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
 import ch.admin.bag.dp3t.networking.AuthCodeRepository
@@ -147,7 +149,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 	fun getSelectableCheckinItems(): List<SelectableCheckinItem> {
 		return diaryStorage.entries.filter {
-			it.departureTime >= onsetDate ?: 0
+			it.venueInfo.getSwissCovidLocationData().type == VenueType.USER_QR_CODE && it.departureTime >= onsetDate ?: 0
 		}.map {
 			SelectableCheckinItem(it, isSelected = selectedDiaryEntryIds.contains(it.id))
 		}

From 3c600ef35a86485497e7d66325dd87c5dc0d7049 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 15:38:05 +0200
Subject: [PATCH 118/207] Implement Max Checkin Duration

---
 .../checkin/checkinflow/CheckInFragment.kt    |   4 -
 .../checkin/checkinflow/CheckOutFragment.kt   |  16 +-
 .../dp3t/checkin/diary/CheckinTimeHelper.kt   |   6 +-
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |   2 +-
 .../diary/DiaryRecyclerViewAdapter.java       |   3 +-
 .../checkin/diary/EditDiaryEntryFragment.kt   |  16 +-
 .../bag/dp3t/checkin/models/ReminderOption.kt |  18 +
 .../dp3t/extensions/VenueInfoExtensions.kt    |  19 -
 .../admin/bag/dp3t/reports/ReportsFragment.kt |  13 +-
 .../ch/admin/bag/dp3t/util/StringUtil.java    | 158 -------
 .../java/ch/admin/bag/dp3t/util/StringUtil.kt | 188 ++++++++
 .../bag/dp3t/checkin/models/ReminderOption.kt |  36 --
 .../extensions/CommonVenueInfoExtensions.kt   |  23 +
 common/src/main/res/values-bs/strings.xml     | 342 +++++++--------
 common/src/main/res/values-de/strings.xml     |  18 +-
 common/src/main/res/values-es/strings.xml     | 407 +++++++++--------
 common/src/main/res/values-fr/strings.xml     | 413 +++++++++---------
 common/src/main/res/values-hr/strings.xml     | 342 +++++++--------
 common/src/main/res/values-it/strings.xml     | 409 +++++++++--------
 common/src/main/res/values-pt/strings.xml     | 342 +++++++--------
 common/src/main/res/values-rm/strings.xml     | 342 +++++++--------
 common/src/main/res/values-sq/strings.xml     | 342 +++++++--------
 common/src/main/res/values-sr/strings.xml     | 342 +++++++--------
 common/src/main/res/values-ti/strings.xml     | 342 +++++++--------
 common/src/main/res/values-tr/strings.xml     | 342 +++++++--------
 common/src/main/res/values/strings.xml        | 411 +++++++++--------
 26 files changed, 2445 insertions(+), 2451 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
 rename {common => app}/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt (69%)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt
 delete mode 100644 common/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
 create mode 100644 common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index e98afaaa2..6ec7a2d1e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -17,14 +17,10 @@ import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
-import ch.admin.bag.dp3t.checkin.utils.*
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
-import ch.admin.bag.dp3t.extensions.getAutoCheckoutDelay
-import ch.admin.bag.dp3t.extensions.getCheckoutWarningDelay
 import ch.admin.bag.dp3t.extensions.getReminderDelayOptions
 import ch.admin.bag.dp3t.extensions.getSubtitle
 import com.google.android.material.button.MaterialButton
-import org.crowdnotifier.android.sdk.model.VenueInfo
 
 private const val ARG_IS_SELF_CHECKIN = "ARG_IS_SELF_CHECKIN"
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index ed8775516..aba2145cd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -17,6 +17,8 @@ import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
 import ch.admin.bag.dp3t.extensions.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
+import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
@@ -85,7 +87,19 @@ class CheckOutFragment : Fragment() {
 		val hasOverlapWithOtherCheckin =
 			CheckinTimeHelper.checkForOverlap(checkInState.checkInTime, checkInState.checkOutTime, requireContext())
 		if (hasOverlapWithOtherCheckin) {
-			CheckinTimeHelper.showOverlapDialog(requireContext())
+			CheckinTimeHelper.showSavingNotPossibleDialog(
+				getString(R.string.checkout_overlapping_alert_description),
+				requireContext()
+			)
+			return
+		}
+
+		val checkinDuration = checkInState.checkOutTime - checkInState.checkInTime
+		val maxCheckinTime = checkInState.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
+		if (checkinDuration > maxCheckinTime) {
+			val maxDurationString = StringUtil.getShortDurationStringWithUnits(maxCheckinTime, requireContext())
+			val dialogText = getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
+			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
 			return
 		}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
index e828b9652..b8ed833b3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
@@ -1,10 +1,12 @@
 package ch.admin.bag.dp3t.checkin.diary
 
 import android.content.Context
+import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 
 object CheckinTimeHelper {
 
@@ -22,10 +24,10 @@ object CheckinTimeHelper {
 		return checkins.any { it.departureTime > arrivalTime && departureTime > it.arrivalTime }
 	}
 
-	fun showOverlapDialog(context: Context) {
+	fun showSavingNotPossibleDialog(message: String, context: Context) {
 		AlertDialog.Builder(context, R.style.NextStep_AlertDialogStyle)
 			.setTitle(R.string.checkout_overlapping_alert_title)
-			.setMessage(R.string.checkout_overlapping_alert_description)
+			.setMessage(message)
 			.setNegativeButton(R.string.android_button_ok) { dialog, _ -> dialog.dismiss() }
 			.show()
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index c81caa9bd..528837c93 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -47,7 +47,7 @@ class DiaryFragment : Fragment() {
 				checkinDiaryEmptyView.isVisible = isEmpty
 				var daysAgoString = ""
 				for (diaryEntry in diaryEntries) {
-					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.arrivalTime, context)
+					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.arrivalTime, requireContext())
 					if (newDaysAgoString != daysAgoString) {
 						daysAgoString = newDaysAgoString
 						items.add(ItemVenueVisitDayHeader(daysAgoString))
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index a3a05a988..8fcb9a6e3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -17,6 +17,7 @@
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit;
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader;
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem;
+import ch.admin.bag.dp3t.extensions.CommonVenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
@@ -105,7 +106,7 @@ public VenueVisitViewHolder(View itemView) {
 		public void bind(ItemVenueVisit item) {
 			VenueInfo venueInfo = item.getDiaryEntry().getVenueInfo();
 			nameTextView.setText(venueInfo.getTitle());
-			locationTextView.setText(VenueInfoExtensionsKt.getSubtitle(venueInfo));
+			locationTextView.setText(CommonVenueInfoExtensionsKt.getSubtitle(venueInfo));
 			String start = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getArrivalTime(), ":");
 			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getDepartureTime(), ":");
 			timeTextView.setText(start + " — " + end);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 4d3ec90e0..9d176220d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -11,6 +11,8 @@ import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
 import ch.admin.bag.dp3t.extensions.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
+import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.CrowdNotifier
 
 class EditDiaryEntryFragment : Fragment() {
@@ -68,7 +70,19 @@ class EditDiaryEntryFragment : Fragment() {
 
 		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(diaryEntry, requireContext())
 		if (hasOverlapWithOtherCheckin) {
-			CheckinTimeHelper.showOverlapDialog(requireContext())
+			CheckinTimeHelper.showSavingNotPossibleDialog(
+				getString(R.string.checkout_overlapping_alert_description),
+				requireContext()
+			)
+			return
+		}
+
+		val checkinDuration = diaryEntry.departureTime - diaryEntry.arrivalTime
+		val maxCheckinTime = diaryEntry.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
+		if (checkinDuration > maxCheckinTime) {
+			val maxDurationString = StringUtil.getShortDurationStringWithUnits(checkinDuration, requireContext())
+			val dialogText = getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
+			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
 			return
 		}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
new file mode 100644
index 000000000..56d65ce4a
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
@@ -0,0 +1,18 @@
+package ch.admin.bag.dp3t.checkin.models
+
+import android.content.Context
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.util.StringUtil
+import java.util.concurrent.TimeUnit
+
+class ReminderOption(val delayMillis: Long) {
+
+	fun getDisplayString(context: Context): String {
+		return if (delayMillis < TimeUnit.MINUTES.toMillis(1)) {
+			context.getString(R.string.reminder_option_off)
+		} else {
+			StringUtil.getShortDurationStringWithUnits(delayMillis, context)
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
similarity index 69%
rename from common/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
rename to app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
index de4b5a946..fbf2dc4ef 100644
--- a/common/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
@@ -1,31 +1,12 @@
 package ch.admin.bag.dp3t.extensions
 
-import androidx.annotation.StringRes
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
-import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
 import com.google.protobuf.InvalidProtocolBufferException
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
 
-fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
-	return if (countryData == null) {
-		SwissCovidLocationData.newBuilder().build()
-	} else {
-		try {
-			SwissCovidLocationData.parseFrom(countryData)
-		} catch (e: InvalidProtocolBufferException) {
-			SwissCovidLocationData.newBuilder().build()
-		}
-	}
-}
-
-@StringRes
-fun VenueInfo.getSubtitle(): Int {
-	return getSwissCovidLocationData().type.getNameRes()
-}
-
 fun VenueInfo.toQrCodePayload(): QRCodePayload {
 	try {
 		return QRCodePayload.parseFrom(qrCodePayload)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 8138ecef1..4e3a631b4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -44,7 +44,6 @@ import ch.admin.bag.dp3t.home.model.TracingStatusInterface
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.*
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
-import ch.admin.bag.dp3t.whattodo.WhereToTestDialogFragment
 import java.util.*
 import kotlin.math.min
 
@@ -129,9 +128,9 @@ class ReportsFragment : Fragment() {
 						headerDate.text =
 							StringUtil.getReportDateString(
 								exposureDays[exposureDays.size - 1].exposedDate.getStartOfDay(TimeZone.getDefault()),
-								true,
-								true,
-								context
+								withDiff = true,
+								withPrefix = true,
+								requireContext()
 							)
 					}
 					datesContainer.removeAllViews()
@@ -141,9 +140,9 @@ class ReportsFragment : Fragment() {
 						val itemDate = itemView.findViewById<TextView>(R.id.exposure_day_textview)
 						itemDate.text = StringUtil.getReportDateString(
 							exposureDay.exposedDate.getStartOfDay(TimeZone.getDefault()),
-							false,
-							true,
-							context
+							withDiff = false,
+							withPrefix = true,
+							requireContext()
 						)
 						datesContainer.addView(itemView, 0)
 					}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
deleted file mode 100644
index 95c0cf8d6..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- */
-package ch.admin.bag.dp3t.util;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.style.StyleSpan;
-import androidx.annotation.NonNull;
-
-import java.math.BigInteger;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.concurrent.TimeUnit;
-
-import ch.admin.bag.dp3t.R;
-
-public class StringUtil {
-
-	private static final long ONE_HOUR = TimeUnit.HOURS.toMillis(1);
-
-	/**
-	 * Creates a spannable where the {@code boldString} is set to bold within the {@code fullString}.
-	 * Be aware that this only applies to the first occurence.
-	 * @param fullString The entire string
-	 * @param boldString The partial string to be made bold
-	 * @return A partially bold spannable
-	 */
-	public static Spannable makePartiallyBold(@NonNull String fullString, @NonNull String boldString) {
-		int start = fullString.indexOf(boldString);
-		if (start >= 0) {
-			return makePartiallyBold(fullString, start, start + boldString.length());
-		}
-		return new SpannableString(fullString);
-	}
-
-	public static SpannableString makePartiallyBold(@NonNull String string, int start, int end) {
-		SpannableString result = new SpannableString(string);
-		result.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-		return result;
-	}
-
-	public static String toHex(byte[] array) {
-		BigInteger bi = new BigInteger(1, array);
-		String hex = bi.toString(16);
-		int paddingLength = (array.length * 2) - hex.length();
-		if (paddingLength > 0)
-			return String.format("%0" + paddingLength + "d", 0) + hex;
-		else
-			return hex;
-	}
-
-	public static String getHourMinuteTimeString(long timeStamp, String delimiter) {
-		Calendar time = Calendar.getInstance();
-		time.setTimeInMillis(timeStamp);
-		return prependZero(time.get(Calendar.HOUR_OF_DAY)) + delimiter + prependZero(time.get(Calendar.MINUTE));
-	}
-
-	private static String prependZero(int timeUnit) {
-		if (timeUnit < 10) {
-			return "0" + timeUnit;
-		} else {
-			return String.valueOf(timeUnit);
-		}
-	}
-
-	/**
-	 * Formats a duration in milliseconds to a String of hours, minutes and seconds, or to only hours and minutes if the
-	 * duration is more than 10 hours
-	 * @param duration in milliseconds
-	 * @return a formatted duration String
-	 */
-	public static String getShortDurationString(long duration) {
-		if (duration >= TimeUnit.HOURS.toMillis(10)) {
-			return String.format(Locale.GERMAN, "%d:%02d",
-					TimeUnit.MILLISECONDS.toHours(duration),
-					TimeUnit.MILLISECONDS.toMinutes(duration - TimeUnit.HOURS.toMillis(TimeUnit.MILLISECONDS.toHours(duration)))
-			);
-		} else {
-			return getDurationString(duration);
-		}
-	}
-
-	public static String getDurationString(long duration) {
-		if (duration >= ONE_HOUR) {
-			return String.format(Locale.GERMAN, "%d:%02d:%02d",
-					TimeUnit.MILLISECONDS.toHours(duration),
-					TimeUnit.MILLISECONDS.toMinutes(duration - TimeUnit.HOURS.toMillis(TimeUnit.MILLISECONDS.toHours(duration))),
-					TimeUnit.MILLISECONDS.toSeconds(duration - TimeUnit.MINUTES.toMillis(TimeUnit.MILLISECONDS.toMinutes(duration)))
-			);
-		} else {
-			return String.format(Locale.GERMAN, "%02d:%02d",
-					TimeUnit.MILLISECONDS.toMinutes(duration),
-					TimeUnit.MILLISECONDS.toSeconds(duration - TimeUnit.MINUTES.toMillis(TimeUnit.MILLISECONDS.toMinutes(duration)))
-			);
-		}
-	}
-
-	public static String getCheckOutDateString(Context context, long checkInTime, long checkOutTime) {
-		DateFormat dateFormat = new SimpleDateFormat("EEEE, dd. MMMM");
-		String checkInDate = dateFormat.format(new Date(checkInTime));
-		String checkOutDate = dateFormat.format(new Date(checkOutTime));
-		if (checkInDate.equals(checkOutDate)) {
-			return checkInDate;
-		} else {
-			return context.getResources().getString(R.string.checkout_from_to_date).replace("{DATE1}", checkInDate)
-					.replace("{DATE2}", "\n" + checkOutDate);
-		}
-	}
-
-	public static String getDaysAgoString(long timeStamp, Context context) {
-		final long daysAgo = DateUtils.getDaysDiff(timeStamp);
-		if (daysAgo <= 0) {
-			return context.getResources().getString(R.string.date_today);
-		} else if (daysAgo == 1) {
-			return context.getResources().getString(R.string.date_one_day_ago);
-		} else {
-			return context.getResources().getString(R.string.date_days_ago)
-					.replace("{COUNT}", String.valueOf(daysAgo));
-		}
-	}
-
-	public static String getReportDateString(long timestamp, boolean withDiff, boolean withPrefix, Context context) {
-		if (!withDiff) {
-			return DateUtils.getFormattedDateWrittenMonth(timestamp);
-		}
-		String dateStr;
-		if (withPrefix) {
-			dateStr = context.getString(R.string.date_text_before_date).replace("{DATE}", DateUtils.getFormattedDate(timestamp));
-		} else {
-			dateStr = DateUtils.getFormattedDate(timestamp);
-		}
-		dateStr += " / ";
-		int daysDiff = DateUtils.getDaysDiff(timestamp);
-
-		if (daysDiff == 0) {
-			dateStr += context.getString(R.string.date_today);
-		} else if (daysDiff == 1) {
-			dateStr += context.getString(R.string.date_one_day_ago);
-		} else {
-			dateStr += context.getString(R.string.date_days_ago).replace("{COUNT}", String.valueOf(daysDiff));
-		}
-		return dateStr;
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt
new file mode 100644
index 000000000..38ae7a517
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package ch.admin.bag.dp3t.util
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.StyleSpan
+import ch.admin.bag.dp3t.R
+import java.math.BigInteger
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+object StringUtil {
+	private val ONE_HOUR = TimeUnit.HOURS.toMillis(1)
+
+	/**
+	 * Creates a spannable where the `boldString` is set to bold within the `fullString`.
+	 * Be aware that this only applies to the first occurence.
+	 * @param fullString The entire string
+	 * @param boldString The partial string to be made bold
+	 * @return A partially bold spannable
+	 */
+	fun makePartiallyBold(fullString: String, boldString: String): Spannable {
+		val start = fullString.indexOf(boldString)
+		return if (start >= 0) {
+			makePartiallyBold(fullString, start, start + boldString.length)
+		} else SpannableString(fullString)
+	}
+
+	@JvmStatic
+	fun makePartiallyBold(string: String, start: Int, end: Int): SpannableString {
+		val result = SpannableString(string)
+		result.setSpan(StyleSpan(Typeface.BOLD), start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+		return result
+	}
+
+	@JvmStatic
+	fun toHex(array: ByteArray): String {
+		val bi = BigInteger(1, array)
+		val hex = bi.toString(16)
+		val paddingLength = array.size * 2 - hex.length
+		return if (paddingLength > 0) String.format("%0" + paddingLength + "d", 0) + hex else hex
+	}
+
+	@JvmStatic
+	fun getHourMinuteTimeString(timeStamp: Long, delimiter: String): String {
+		val time = Calendar.getInstance()
+		time.timeInMillis = timeStamp
+		return prependZero(time[Calendar.HOUR_OF_DAY]) + delimiter + prependZero(time[Calendar.MINUTE])
+	}
+
+	private fun prependZero(timeUnit: Int): String {
+		return if (timeUnit < 10) {
+			"0$timeUnit"
+		} else {
+			timeUnit.toString()
+		}
+	}
+
+	/**
+	 * Formats a duration in milliseconds to a String of hours and minutes with units. e.g. "1 h 12 min"
+	 * duration is more than 10 hours
+	 * @param duration in milliseconds
+	 * @return a formatted duration String
+	 */
+	fun getShortDurationStringWithUnits(duration: Long, context: Context): String {
+		return if (duration < ONE_HOUR) {
+			val minutes = TimeUnit.MILLISECONDS.toMinutes(duration)
+			minutes.toMinutesString(context)
+		} else {
+			val hours = TimeUnit.MILLISECONDS.toHours(duration)
+			val minutes = TimeUnit.MILLISECONDS.toMinutes(duration) - TimeUnit.HOURS.toMinutes(hours)
+			if (minutes > 0L) {
+				"${hours.toHoursString(context)} ${minutes.toMinutesString(context)}"
+			} else {
+				hours.toHoursString(context)
+			}
+		}
+	}
+
+	private fun Long.toHoursString(context: Context): String {
+		return context.getString(R.string.reminder_option_hours).replace("{HOURS}", this.toString())
+	}
+
+	private fun Long.toMinutesString(context: Context): String {
+		return context.getString(R.string.reminder_option_minutes).replace("{MINUTES}", this.toString())
+	}
+
+	/**
+	 * Formats a duration in milliseconds to a String of hours, minutes and seconds, or to only hours and minutes if the
+	 * duration is more than 10 hours
+	 * @param duration in milliseconds
+	 * @return a formatted duration String
+	 */
+	@JvmStatic
+	fun getShortDurationString(duration: Long): String {
+		return if (duration >= TimeUnit.HOURS.toMillis(10)) {
+			String.format(
+				Locale.GERMAN, "%d:%02d",
+				TimeUnit.MILLISECONDS.toHours(duration),
+				TimeUnit.MILLISECONDS
+					.toMinutes(duration - TimeUnit.HOURS.toMillis(TimeUnit.MILLISECONDS.toHours(duration)))
+			)
+		} else {
+			getDurationString(duration)
+		}
+	}
+
+	fun getDurationString(duration: Long): String {
+		return if (duration >= ONE_HOUR) {
+			String.format(
+				Locale.GERMAN, "%d:%02d:%02d",
+				TimeUnit.MILLISECONDS.toHours(duration),
+				TimeUnit.MILLISECONDS.toMinutes(
+					duration - TimeUnit.HOURS.toMillis(
+						TimeUnit.MILLISECONDS.toHours(
+							duration
+						)
+					)
+				),
+				TimeUnit.MILLISECONDS.toSeconds(
+					duration - TimeUnit.MINUTES.toMillis(
+						TimeUnit.MILLISECONDS.toMinutes(
+							duration
+						)
+					)
+				)
+			)
+		} else {
+			String.format(
+				Locale.GERMAN, "%02d:%02d",
+				TimeUnit.MILLISECONDS.toMinutes(duration),
+				TimeUnit.MILLISECONDS.toSeconds(
+					duration - TimeUnit.MINUTES.toMillis(
+						TimeUnit.MILLISECONDS.toMinutes(
+							duration
+						)
+					)
+				)
+			)
+		}
+	}
+
+	fun getDaysAgoString(timeStamp: Long, context: Context): String {
+		val daysAgo = DateUtils.getDaysDiff(timeStamp).toLong()
+		return if (daysAgo <= 0) {
+			context.resources.getString(R.string.date_today)
+		} else if (daysAgo == 1L) {
+			context.resources.getString(R.string.date_one_day_ago)
+		} else {
+			context.resources.getString(R.string.date_days_ago)
+				.replace("{COUNT}", daysAgo.toString())
+		}
+	}
+
+	fun getReportDateString(timestamp: Long, withDiff: Boolean, withPrefix: Boolean, context: Context): String {
+		if (!withDiff) {
+			return DateUtils.getFormattedDateWrittenMonth(timestamp)
+		}
+		var dateStr: String
+		dateStr = if (withPrefix) {
+			context.getString(R.string.date_text_before_date)
+				.replace("{DATE}", DateUtils.getFormattedDate(timestamp))
+		} else {
+			DateUtils.getFormattedDate(timestamp)
+		}
+		dateStr += " / "
+		val daysDiff = DateUtils.getDaysDiff(timestamp)
+		dateStr += if (daysDiff == 0) {
+			context.getString(R.string.date_today)
+		} else if (daysDiff == 1) {
+			context.getString(R.string.date_one_day_ago)
+		} else {
+			context.getString(R.string.date_days_ago).replace("{COUNT}", daysDiff.toString())
+		}
+		return dateStr
+	}
+}
\ No newline at end of file
diff --git a/common/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt b/common/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
deleted file mode 100644
index f75dcb8ef..000000000
--- a/common/src/main/java/ch/admin/bag/dp3t/checkin/models/ReminderOption.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package ch.admin.bag.dp3t.checkin.models
-
-import android.content.Context
-import ch.admin.bag.dp3t.R
-import java.util.concurrent.TimeUnit
-
-class ReminderOption(val delayMillis: Long) {
-
-	fun getDisplayString(context: Context): String {
-		return when {
-			delayMillis < TimeUnit.MINUTES.toMillis(1) -> context.getString(R.string.reminder_option_off)
-			delayMillis < TimeUnit.HOURS.toMillis(1) -> {
-				val minutes = TimeUnit.MILLISECONDS.toMinutes(delayMillis)
-				minutes.toMinutesString(context)
-			}
-			else -> {
-				val hours = TimeUnit.MILLISECONDS.toHours(delayMillis)
-				val minutes = TimeUnit.MILLISECONDS.toMinutes(delayMillis) - TimeUnit.HOURS.toMinutes(hours)
-				if (minutes > 0L) {
-					"${hours.toHoursString(context)} ${minutes.toMinutesString(context)}"
-				} else {
-					hours.toHoursString(context)
-				}
-			}
-		}
-	}
-
-	private fun Long.toHoursString(context: Context): String {
-		return context.getString(R.string.reminder_option_hours).replace("{HOURS}", this.toString())
-	}
-
-	private fun Long.toMinutesString(context: Context): String {
-		return context.getString(R.string.reminder_option_minutes).replace("{MINUTES}", this.toString())
-	}
-
-}
\ No newline at end of file
diff --git a/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt b/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt
new file mode 100644
index 000000000..08d85983e
--- /dev/null
+++ b/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt
@@ -0,0 +1,23 @@
+package ch.admin.bag.dp3t.extensions
+
+import androidx.annotation.StringRes
+import ch.admin.bag.dp3t.checkin.models.SwissCovidLocationData
+import com.google.protobuf.InvalidProtocolBufferException
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
+	return if (countryData == null) {
+		SwissCovidLocationData.newBuilder().build()
+	} else {
+		try {
+			SwissCovidLocationData.parseFrom(countryData)
+		} catch (e: InvalidProtocolBufferException) {
+			SwissCovidLocationData.newBuilder().build()
+		}
+	}
+}
+
+@StringRes
+fun VenueInfo.getSubtitle(): Int {
+	return getSwissCovidLocationData().type.getNameRes()
+}
diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index 4c661df6b..e615aac2b 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -1407,365 +1407,363 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 6ae4055ef..42e94e259 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -1650,7 +1650,6 @@ Dann rufen Sie hier an:"</string>
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all">"Alle auswählen"</string>
     <string name="inform_dont_send_button_title">"Nicht senden"</string>
-    <string name="inform_try_again_button_title">"Erneut versuchen"</string>
     <string name="inform_dont_share_button_title">"Nicht teilen"</string>
     <string name="inform_really_not_share_title">"Wirklich nicht teilen?"</string>
     <string name="inform_really_not_share_subtitle">"Das Teilen Ihrer privaten Schlüssel hilft «SwissCovid», andere potenziell infizierte Personen zu benachrichtigen und die weitere Ausbreitung des Virus zu verhindern. Wenn Sie Ihre privaten Schlüssel nicht teilen, werden keine potenziell infizierten Personen benachrichtigt."</string>
@@ -1702,18 +1701,6 @@ Dann rufen Sie hier an:"</string>
     <!-- Informieren: Danke Text Checkins Teil -->
     <string name="inform_send_thankyou_text_checkins">"Ihre ausgewählten Check-In-Einträge wurden gesendet. Alle Personen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben, werden benachrichtigt."</string>
 
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
-
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
     <string name="pdf_headline">"SwissCovid-Check-in"</string>
 
@@ -1853,4 +1840,9 @@ Dieser Titel wird beim Check-in angezeigt."</string>
     <string name="partial_onboarding_done_title">"Konfiguration abgeschlossen"</string>
     <string name="partial_onboarding_done_text">"Vielen Dank, dass Sie mithelfen, die Verbreitung des Coronavirus einzudämmen."</string>
     <string name="web_slogan">"Bei einem Ansteckungsrisiko schnell informiert."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text">"Für diesen Check-In gilt eine maximale Check-in Dauer von {DURATION}. Bitte überprüfen Sie nochmals Ihre Angabe."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 3bddafd99..66d28d707 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -104,7 +104,7 @@ De esta forma, está ayudando a parar las cadenas de contagio."</string>
     <string name="meldungen_meldung_title">"Posible infección"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Existe la posibilidad de un contagio."</string>
+    <string name="meldungen_meldung_text">"Es posible que se haya contagiado"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"Aplicación activa"</string>
@@ -194,7 +194,7 @@ De esta forma, está ayudando a parar las cadenas de contagio."</string>
     <string name="inform_detail_box_subtitle">"Con el código Covid…"</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Parar las cadenas de contagio"</string>
+    <string name="inform_detail_box_title">"Advertir de posibles contagios"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Introducir el código Covid"</string>
@@ -228,7 +228,7 @@ De esta forma, está ayudando a parar las cadenas de contagio."</string>
     <string name="tracing_turned_off_title">"Rastreo desactivado"</string>
     <string name="tracing_turned_off_text">"Active el rastreo para que la aplicación funcione."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth desactivado"</string>
-    <string name="bluetooth_turned_off_text">"Para que el rastreo funcione, active Bluetooth en su dispositivo."</string>
+    <string name="bluetooth_turned_off_text">"Para que el rastreo anónimo funcione, active Bluetooth en su dispositivo."</string>
     <string name="bluetooth_turn_on_button_title">"Activar Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Rechazada la utilización de Bluetooth"</string>
     <string name="bluetooth_permission_error_text">"Autorice la utilización de Bluetooth para permitir el funcionamiento del rastreo"</string>
@@ -260,11 +260,11 @@ De esta forma, está ayudando a parar las cadenas de contagio."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Siga las instrucciones de aislamiento recibidas."</string>
-    <string name="tracing_ended_title">"Rastreo terminado"</string>
-    <string name="tracing_ended_text">"No se guardan más contactos."</string>
+    <string name="tracing_ended_title">"Contactos y Check-in desactivados"</string>
+    <string name="tracing_ended_text">"No se guardan contactos"</string>
     <string name="exposed_info_contact_hotline">"Contacte"</string>
     <string name="meldung_homescreen_positive_info_line1">"Siga las "</string>
-    <string name="meldung_homescreen_positive_info_line2">"instrucciones para el autoaislamiento"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Instrucciones para el aislamiento"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Nueva notificación"</string>
@@ -274,7 +274,7 @@ De esta forma, está ayudando a parar las cadenas de contagio."</string>
     <string name="meldung_homescreen_positiv_title">"Test positivo"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Existe la posibilidad de un contagio."</string>
+    <string name="meldung_detail_exposed_subtitle">"Es posible que se haya contagiado"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"A dado usted positivo en el test del coronavirus"</string>
@@ -345,7 +345,7 @@ Infoline SwissCovid
     <string name="onboarding_privacy_text2">"Los ID aleatorios guardados permanecen en su teléfono móvil y son eliminados transcurridos 14 días."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"¿Cómo funciona la aplicación?"</string>
+    <string name="onboarding_begegnungen_heading">"Contactos"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Detección de contactos a través de Bluetooth"</string>
@@ -396,7 +396,7 @@ Infoline SwissCovid
     <string name="onboarding_push_title">"Permitir mensajes"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Para que la aplicación pueda informarle, debe activar los mensajes"</string>
+    <string name="onboarding_push_text">"Para que la aplicación pueda avisarle, debe activar los mensajes"</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Activar mensajes"</string>
@@ -419,7 +419,7 @@ Siga las instrucciones de aislamiento recibidas."</string>
     <string name="onboarding_go_title">"La aplicación está instalada"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Gracias por ayudar a romper las cadenas de contagio."</string>
+    <string name="onboarding_go_text">"Gracias por contribuir a contener la propagación del coronavirus."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Comenzar"</string>
@@ -446,7 +446,7 @@ Siga las instrucciones de aislamiento recibidas."</string>
     <string name="meldung_detail_new_contact_title">"Posible infección"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Puede haber ocurrido una infección"</string>
+    <string name="meldung_detail_new_contact_subtitle">"Es posible que se haya contagiado"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Error en la hora"</string>
@@ -578,9 +578,9 @@ Siga las instrucciones de aislamiento recibidas."</string>
     <string name="meldungen_nomeldungen_faq1_title">"¿Qué son las notificaciones?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"La aplicación controla regularmente si alguno de los usuarios con los que se ha encontrado ha notificado un test positivo. 
+    <string name="meldungen_nomeldungen_faq1_text">"La aplicación controla regularmente si alguno de los usuarios con los que se ha encontrado o que se han registrado en el mismo sitio que usted, ha notificado un test positivo. 
 
-En caso de un posible contacto, será informado con un mensaje en la pantalla de bloqueo."</string>
+En caso de un posible contagio, será informado con un mensaje en la pantalla de bloqueo."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"La Infoline SwissCovid le asesora sobre la posibilidad de realizar un test gratuito."</string>
@@ -619,7 +619,7 @@ Así queda garantizado que solo se notifiquen casos confirmados a través de la
     <string name="inform_detail_faq2_title">"¿Qué es lo que se envía?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Solamente se envían las claves privadas de la aplicación y no los datos personales. 
+    <string name="inform_detail_faq2_text">"Solamente se envían las claves privadas de la aplicación, así como los identificadores codificados de los Check-in, no los datos personales. 
 
 De esta forma, se informa a otros usuarios de la aplicación SwissCovid de que existe la posibilidad de contagio."</string>
 
@@ -630,7 +630,7 @@ De esta forma, se informa a otros usuarios de la aplicación SwissCovid de que e
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Aviso importante"</string>
+    <string name="inform_code_intro_title">"Información sobre el registro"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"A pesar de que no se envían datos sobre su persona, es posible que alguien recuerde por la fecha haber tenido contacto con usted."</string>
@@ -663,7 +663,7 @@ Pueden aparecer también los síntomas siguientes:
     <string name="meldungen_positive_tested_faq1_title">"¿Por qué está desactivado el rastreo?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"El rastreo en la aplicación se desactiva automáticamente tras un resultado positivo. El rastreo puede volver a activarse, tan pronto como haya acabado el aislamiento."</string>
+    <string name="meldungen_positive_tested_faq1_text">"El rastreo en la aplicación se desactiva automáticamente tras un resultado positivo. El rastreo puede volver a activarse tan pronto como haya acabado el aislamiento."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"es"</string>
@@ -703,8 +703,7 @@ Pueden aparecer también los síntomas siguientes:
     <string name="onboarding_gaen_title">"Activar el rastreo"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Para poder utilizar la aplicación debe activarse Notificaciones de exposición a la COVID-19"</string>
+    <string name="onboarding_gaen_text_ios">"La función de rastreo debe estar activada a fin de detectar los contactos."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Activar"</string>
@@ -736,7 +735,7 @@ Pueden aparecer también los síntomas siguientes:
     <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
     <string name="delete_infection_dialog">"¿De verdad quiere eliminar esta notificación?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignorar optimización de la batería"</string>
-    <string name="android_onboarding_battery_permission_text">"Para poder detectar los contactos en todo momento, la optimización de la batería debe estar desconectada para esta aplicación."</string>
+    <string name="android_onboarding_battery_permission_text">"La aplicación solo funciona si la optimización de la batería está desconectada."</string>
     <string name="android_onboarding_battery_permission_button">"Autorizar"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Solo para esta aplicación"</string>
@@ -759,8 +758,7 @@ Pueden aparecer también los síntomas siguientes:
     <string name="tracing_permission_error_title_ios">"Notificaciones de exposición a la COVID-19 desactivado desactivado"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Active la función Notificaciones de exposición a la COVID-19, para que el rastreo pueda funcionar."</string>
+    <string name="tracing_permission_error_text_ios">"Active {TRACING_SETTING_TEXT} para que el rastreo anónimo pueda funcionar."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"No se ha podido enviar el mensaje. Autorice el intercambio de su ID aleatoria con la app SwissCovid."</string>
@@ -802,10 +800,10 @@ Si la actualización no estuviera disponible en su dispositivo actualmente, int
     <string name="tracing_active_tracking_always_info">"Swisscovid permanece activa aún cuando se cierra la aplicación."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-para las 
-cadenas de contagio."</string>
-    <string name="inform_detail_faq3_text">"A pesar de que no se envían datos sobre su persona, es posible que alguien recuerde por la fecha haber tenido contacto con usted."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid -
+información rápida
+ante riesgo de contagio."</string>
+    <string name="inform_detail_faq3_text">"Sí, pero aunque no se envían datos sobre su persona, es posible que alguien recuerde por la fecha haber tenido contacto con usted."</string>
     <string name="inform_detail_faq3_title">"¿Permanezco en el anonimato?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -815,7 +813,7 @@ cadenas de contagio."</string>
     <string name="tracing_setting_text_android">"Notificaciones de exposición a la COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Para poder utilizar la aplicación debe activarse Notificaciones de exposición a la COVID-19"</string>
+    <string name="onboarding_gaen_text_android">"La función de rastreo debe estar activada a fin de detectar los contactos."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -908,7 +906,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Viajar"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid funciona en los países siguientes:"</string>
+    <string name="travel_home_description">"La función SwissCovid-Contactos funciona en los países siguientes:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"¿Y esto qué significa?"</string>
@@ -1225,8 +1223,8 @@ Al fin de poder alertar también a los viajeros del extranjero, esto ocurre inde
     <string name="delete_infection_dialog_finish_button">"Finalizar"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"No se registran más contactos.
-El rastreo puede volver a activarse una vez finalizado en aislamiento."</string>
+    <string name="tracing_ended_info">"No se registran más contactos. El Check-in tampoco está disponible.
+Ambas funciones pueden volver a activarse una vez finalizado en aislamiento."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1258,7 +1256,7 @@ El rastreo puede volver a activarse una vez finalizado en aislamiento."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"¿Es usted sordo o tiene una discapacidad auditiva y no puede llamar a la Infoline del coronavirus?
+    <string name="hearing_impaired_info">"¿Es usted sordo o tiene una discapacidad auditiva y no puede llamar por teléfono?
 
 Envíe un correo electrónico a covid-support@medgate.ch"</string>
 
@@ -1314,7 +1312,7 @@ El tiempo es un factor determinante a la hora de luchar contra el coronavirus: c
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"¿Ha dado usted positivo (test PCR o test rápido de antígenos) y no ha recibido el código Covid después de 4 horas?
-Contacte con la Infoline del coronavirus:"</string>
+Llame a este número:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"¿Aún no ha recibido el código Covid?"</string>
@@ -1338,7 +1336,7 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="travel_screen_compatible_countries">"Países compatibles:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"A fin de alertar también a viajeros del extranjero, las claves privadas se comparten con las aplicaciones contra el coronavirus de países compatibles."</string>
+    <string name="inform_code_travel_text">"A fin de alertar también a viajeros del extranjero tras un contacto, las claves privadas se comparten con las aplicaciones contra el coronavirus de países compatibles."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Total"</string>
@@ -1353,13 +1351,13 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"¿Quién será notificado?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Se notificará a todos los contactos establecidos durante la fase de contagio desde el {ONSET_DATE} hasta la introducción del código Covid si un contagio es probable a raíz de la distancia y la duración."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Se notificará a todos los contactos establecidos durante la fase de contagio desde el {ONSET_DATE} hasta la introducción del código Covid si existe un riesgo de contagio - a raíz de la distancia y la duración del contacto, así como en el caso de haberse registrado en el mismo sitio."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – hoy"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Así está contribuyendo a interrumpir las cadenas de contagio."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Así está contribuyendo a avisar a otras personas de un posible contagio."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Las claves privadas de su aplicación se han enviado para el periodo siguiente:"</string>
@@ -1398,365 +1396,362 @@ Contacte con la Infoline del coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"En 1 día"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Recordatorio Check-out"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"¿Quiere hacer el Check-out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Check-out automático"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"Su salida ha sido registrada automáticamente."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Escanear el código QR y registrarse"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"¡Código QR no válido!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"De"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"hasta"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Añadir nota"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"por ej. ¿Quién le acompañaba?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Listo"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Recordatorio Check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Autentifíquese para acceder al diario"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{HOURS} h"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"La app debe acceder a la cámara del dispositivo para poder escanear el código QR."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"Mis Check-in"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"Se necesita la cámara para escanear el código QR."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Habilite la función Face-ID para acceder a su diario con total seguridad."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Autentifíquese para acceder al diario"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generar código QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"¿Quiere ofrecer Check-in a otros?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check-in ahora"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"No se podido fijar el recordatorio"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"Para poder recibir los recordatorios para el registro de salida, debe habilitar \\"Notificaciones\\" en los ajustes de la aplicación. "</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Ajustar"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Editar"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"Aún no hay entradas"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"Aquí se genera de modo automático un registro al escanear un código QR SwissCovid cuando hace un Check-in in situ."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid debe acceder a la cámara de su dispositivo. La cámara se utiliza solo para escanear el código QR."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Permitir el acceso a la cámara"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"por ej. lugar o nombre del evento"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Imprimir PDF"</string>
+    <string name="bottom_nav_tab_info">"Información"</string>
+    <string name="error_network_title">"Error de red"</string>
+    <string name="error_network_text">"Compruebe su conexión a internet"</string>
+    <string name="error_action_retry">"Volver a intentar"</string>
+    <string name="error_notification_deactivated_title">"Notificaciones desactivadas"</string>
+    <string name="error_notification_deactivated_text">"Modifique los ajustes para recibir los avisos directamente."</string>
+    <string name="error_action_change_settings">"Modificar ajustes"</string>
+    <string name="error_camera_permission_title">"No es posible acceder a la cámara"</string>
+    <string name="error_camera_permission_text">"La app debe acceder a la cámara para escanear el código QR."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"Código QR aún no válido"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Código QR ya no es válido"</string>
+    <string name="error_already_checked_in">"Ya ha registrado su entrada."</string>
+    <string name="error_update_text">"Este código QR no es compatible con la versión instalada de la app. Actualice la aplicación para continuar."</string>
+    <string name="error_update_title">"Se requiere actualización"</string>
+    <string name="error_action_update">"Actualizar ahora"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Notificación de Check-in permanente"</string>
+    <string name="ongoing_notification_title">"Está usted registrado desde las {TIME} horas."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Guardar"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Escanear código QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in desactivado"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"El Check-in no es posible actualmente"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Escanee un código QR SwissCovid para hacer el Check-in in situ."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"Aquí se genera de modo automático un registro si escanea usted un código QR SwissCovid al hacer un Check-in in situ."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"Esta usted registrado"</string>
+    <string name="checkout_from_to_date">"{DATE1} hasta {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Más información sobre el código Covid"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Eliminar registro"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Eliminar"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Compartir"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Imprimir"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Escanee un código QR SwissCovid para hacer el registro de entrada in situ."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Compartir registros de Check-in"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"Al compartir los registros de Check-in, la aplicación puede informar a personas que se registraron al mismo tiempo en el mismo sitio."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Seleccionar todos"</string>
+    <string name="inform_dont_send_button_title">"No enviar"</string>
+    <string name="inform_dont_share_button_title">"No compartir"</string>
+    <string name="inform_really_not_share_title">"¿Seguro que no quiere compartir?"</string>
+    <string name="inform_really_not_share_subtitle">"Al compartir sus claves privadas, «SwissCovid» puede alertar a otras personas potencialmente contagiadas y evitar así la propagación del virus. Si no comparte sus claves privadas no es posible alertar a otras personas que pueden haberse contagiado."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Eliminar registro"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"El registro será eliminado irreversiblemente de la lista."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Eliminar por completo"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"¿Solo ocultar y seguir recibiendo avisos?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"¿Ha dado positivo?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Volver a activar contactos y Check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"No puede usted hacer un registro de entrada si ha dado positivo en el test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Genere un código QR para permitir que las personas puedan registrase in situ."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"¿Seguro que quiere eliminar el código QR?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Auto Check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Escanee un código QR SwissCovid para registrarse in situ."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"No es posible guardar"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"Las horas seleccionadas coinciden con otros Check-in en su diario. Por favor, compruebe la entrada."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"Se han enviado los registros de Check-in seleccionados. Todas las personas que se registraron al mismo tiempo en el mismo sitio recibirán un aviso. "</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check-in sin dejar datos"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"Con la app SwissCovid puede usted registrarse fácilmente sin necesidad de dejar sus datos. Ante una situación de riesgo, será usted informado rápidamente a través de la aplicación."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"App SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Descargar ahora"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Registro de entrada sin dejar datos"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Introduzca aquí el código Covid para alertar a otras personas."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"¿Finalizado el aislamiento?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"¿Quiere usted ofrecer Check-in a otros?"</string>
+    <string name="checkin_footer_title1">"¿Por qué una función Check-in?"</string>
+    <string name="checkin_footer_subtitle1">"La función Check-in sin registro de datos de contacto es una ampliación de la app SwissCovid. En caso de dar positivo en un test, esta función le permite alertar no solo a los contactos estrechos, sino también a personas que se registraron al mismo tiempo en el mismo lugar que usted."</string>
+    <string name="checkin_footer_title2">"Sin almacenamiento centralizado de datos"</string>
+    <string name="checkin_footer_subtitle2">"Para los Check-in de la app SwissCovid no es necesario indicar datos personales como el nombre, la dirección o el número de teléfono. Tampoco se registran datos GPS de geolocalización. La lista con los Check-in se guarda en su dispositivo. Estos datos locales se eliminan transcurridos 14 días."</string>
+    <string name="events_empty_state_title">"Genere un código QR"</string>
+    <string name="events_empty_state_subtitle">"Con un código QR SwissCovid es posible registrarse in situ sin necesidad de dejar datos personales."</string>
+    <string name="events_info_box_title">"No sustituye el registro obligatorio de los datos de contacto"</string>
+    <string name="events_info_box_text">"Los Check-in SwissCovid nos sustituyen el registro obligatorio de los datos de contacto estipulado en la «Ordenanza Covid-19, situación particular». "</string>
+    <string name="events_footer_title1">"¿Dónde utilizar los Check-in?"</string>
+    <string name="events_footer_title2">"¿Por qué una función Check-in?"</string>
+    <string name="events_footer_subtitle1">"Los Check-in SwissCovid puede utilizarse allí donde las personas se reúnen pero el registro de los datos de contacto no es obligatorio.
+
+Posibles utilizaciones:
+– eventos privados
+– eventos de asociaciones
+– reuniones en el entorno laboral, por ej. salas de reuniones, oficinas, cantinas, etc."</string>
+    <string name="events_footer_subtitle2">"La función Check-in sin registro de datos de contacto es una ampliación de la app SwissCovid. En caso de dar positivo en un test, esta función le permite alertar no solo a los contactos estrechos, sino también a personas que se registraron al mismo tiempo"</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Situaciones de riesgo"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Contactos"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"¿Qué debo hacer?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Check-in positivo"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Check-in positivos / contactos"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"Código QR usuario"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Código QR rastreo de contacto"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"La función Check-in se desactiva automáticamente en caso de dar positivo en un test. La función puede volver a activarse una vez finalizado el aislamiento."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Elija un título que describa bien el lugar o el evento. Este título aparecerá en el Check-in. "</string>
+    <string name="checkin_report_heading">"¿Qué puede usted hacer?"</string>
+    <string name="checkin_report_title1">"Proteger a sus contactos"</string>
+    <string name="checkin_report_title2">"Estar atento a los síntomas"</string>
+    <string name="checkin_report_title3">"Hacer el test"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Vigile su estado de salud."</string>
+    <string name="checkin_report_subtitle3">"Ante la aparición de síntomas haga el test inmediatamente. Incluso si no tiene síntomas, es oportuno y recomendable hacer el test de Covid-19."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No se han enviado datos"</string>
+    <string name="not_thank_you_screen_text1">"No se han enviado claves privadas."</string>
+    <string name="not_thank_you_screen_back_button">"Volver"</string>
+    <string name="not_thank_you_screen_dont_send_button">"No enviar datos"</string>
+    <string name="not_thank_you_screen_text2">"No se han enviado registros de Check-in."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Compartir la selección"</string>
+    <string name="inform_share_checkins_not_send_button">"No compartir nada"</string>
+    <string name="onboarding_checkin_title">"Check-in sin dejar datos"</string>
+    <string name="onboarding_checkin_heading">"Registros de Check-in"</string>
+    <string name="onboarding_checkin_text1">"La función Check-in SwissCovid le permite registrarse con la aplicación en un lugar o en un evento."</string>
+    <string name="onboarding_checkin_text2">"Su presencia solo queda registra en la aplicación. No es necesario indicar datos personales en la app."</string>
+    <string name="checkin_updateboarding_text">"La función Check-in SwissCovid le permite registrarse con la aplicación en un lugar o en un evento. Su presencia solo queda registrada en la aplicación. No es necesario indicar datos personales en la app. A estos efectos se han actualizado las condiciones de uso y la política de privacidad."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Omitir"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"El registro permanece codificado en la aplicación en segundo plano durante 14 días. En caso de un posible contagio puede usted recibir un aviso."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Solo ocultar"</string>
+    <string name="checkin_set_reminder_explanation">"La app puede recordarle que registre la salida en el momento adecuado."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"¿O eliminar por completo?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"El registro será eliminado por completo. A partir de ahora no recibirá ningún aviso."</string>
+    <string name="not_thank_you_screen_text3">"Nadie será avisado."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"¿Qué debo saber sobre el test?"</string>
+    <string name="instant_app_install_action">"Instalar la app y Check-in "</string>
+    <string name="partial_onboarding_box_text">"Cierre la configuración de la aplicación para poder utilizar la función de rastreo."</string>
+    <string name="partial_onboarding_box_action">"Cerrar ahora"</string>
+    <string name="partial_onboarding_done_title">"Configuración finalizada"</string>
+    <string name="partial_onboarding_done_text">"Gracias por contribuir a contener la propagación del coronavirus."</string>
+    <string name="web_slogan">"Información rápida ante un riesgo de contagio."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 0f5c72a0b..c3f7a79ef 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -104,7 +104,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="meldungen_meldung_title">"Infection possible"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Il y a un risque d'infection."</string>
+    <string name="meldungen_meldung_text">"Vous pourriez avoir contracté le virus."</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"Application active"</string>
@@ -194,7 +194,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="inform_detail_box_subtitle">"Avec le code COVID…"</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Interrompre les chaînes d'infection"</string>
+    <string name="inform_detail_box_title">"Avertir d’une infection possible"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Entrer le code COVID"</string>
@@ -228,7 +228,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="tracing_turned_off_title">"Traçage de proximité désactivé"</string>
     <string name="tracing_turned_off_text">"Pour que l'application fonctionne, activez le traçage de proximité."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth désactivé"</string>
-    <string name="bluetooth_turned_off_text">"Pour que le traçage de proximité fonctionne, activez Bluetooth sur votre appareil."</string>
+    <string name="bluetooth_turned_off_text">"Pour que le traçage anonyme fonctionne, le Bluetooth doit être activé sur votre smartphone."</string>
     <string name="bluetooth_turn_on_button_title">"Bluetooth activé."</string>
     <string name="bluetooth_permission_error_title">"Bluetooth : utilisation refusée"</string>
     <string name="bluetooth_permission_error_text">"Pour que le traçage de proximité fonctionne, autorisez l'utilisation de Bluetooth."</string>
@@ -260,11 +260,11 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Suivez les consignes reçues sur l'isolement."</string>
-    <string name="tracing_ended_title">"Traçage de proximité terminé"</string>
-    <string name="tracing_ended_text">"Plus aucun contact ne sera sauvegardé."</string>
+    <string name="tracing_ended_title">"Contacts et connexion désactivés"</string>
+    <string name="tracing_ended_text">"Aucune contact n’est sauvegardé."</string>
     <string name="exposed_info_contact_hotline">"Contactez"</string>
     <string name="meldung_homescreen_positive_info_line1">"Suivez"</string>
-    <string name="meldung_homescreen_positive_info_line2">"Consignes sur l'auto-isolement"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Consignes sur l’isolement"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Nouvelle alerte"</string>
@@ -274,7 +274,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="meldung_homescreen_positiv_title">"Test positif"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Il y a un risque d'infection."</string>
+    <string name="meldung_detail_exposed_subtitle">"Vous pourriez avoir contracté le virus."</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Vous avez été testé positif au coronavirus."</string>
@@ -328,7 +328,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="onboarding_prinzip_text1">"Grâce à l'application SwissCovid, tout le monde peut contribuer à endiguer la propagation du virus."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"L'application vous informe si vous avez été potentiellement exposé au coronavirus."</string>
+    <string name="onboarding_prinzip_text2">"L’application vous avertit en cas d’exposition possible au coronavirus."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -343,7 +343,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="onboarding_privacy_text2">"Les ID aléatoires enregistrés restent sur votre appareil et sont supprimés après 14 jours."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Comment fonctionne l'application ?"</string>
+    <string name="onboarding_begegnungen_heading">"Contacts"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Détection des contacts via Bluetooth"</string>
@@ -361,7 +361,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="onboarding_meldung_title">"Notification en cas de possible infection"</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"L'application vous informe si vous avez été potentiellement exposé au coronavirus."</string>
+    <string name="onboarding_meldung_text1">"L’application vous avertit en cas d’exposition possible au coronavirus."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"En adoptant une bonne conduite, vous pouvez interrompre les chaînes de transmission et protéger les autres."</string>
@@ -394,7 +394,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="onboarding_push_title">"Autoriser les notifications"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Vous devez autorisez les notifications pour recevoir des informations de la part de l'application."</string>
+    <string name="onboarding_push_text">"Pour que l’application puisse vous avertir, vous devez autoriser les notifications."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Autoriser les notifications"</string>
@@ -417,7 +417,7 @@ Respectez les consignes reçues sur l'isolement."</string>
     <string name="onboarding_go_title">"L'application est prête."</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Merci d'aider à interrompre les chaînes de transmission."</string>
+    <string name="onboarding_go_text">"Merci d’aider à endiguer la propagation du coronavirus."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Commencer"</string>
@@ -444,7 +444,7 @@ Respectez les consignes reçues sur l'isolement."</string>
     <string name="meldung_detail_new_contact_title">"Infection possible"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Il y a un risque d'infection."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Vous pourriez avoir contracté le virus."</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Erreur dans l'heure"</string>
@@ -583,9 +583,9 @@ Ces identifiants sont enregistrés localement dans les appareils et effacés apr
     <string name="meldungen_nomeldungen_faq1_title">"Que sont les notifications ?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"L'application contrôle régulièrement si d'autres utilisateurs que vous avez rencontrés ont déclaré un test positif.
+    <string name="meldungen_nomeldungen_faq1_text">"L’application contrôle régulièrement si d’autres utilisateurs que vous avez rencontrés ou qui se sont connectés au même endroit que vous ont signalé un test positif.
 
-En cas de possible infection, vous serez informé par message sur l'écran de verrouillage."</string>
+Un message s’affichera sur l’écran de verrouillage pour vous informer d’une possible infection."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"L'infoline SwissCovid vous conseille sur la possibilité d'effectuer un test gratuit."</string>
@@ -624,9 +624,10 @@ Ceci permet de garantir que seuls les cas confirmés sont déclarés dans l'appl
     <string name="inform_detail_faq2_title">"Qu'est-ce qui est envoyé ?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Seules les clés privées de votre application sont envoyées, aucune donnée personnelle.
+    <string name="inform_detail_faq2_text">"Seules les clés privées de votre application et les identifiants codés de vos connexions sont transmises, aucune donnée personnelle.
 
-Ainsi, d'autres utilisateurs de l'application SwissCovid apprennent qu'ils ont peut-être été infectés."</string>
+Ainsi, d’autres utilisateurs de l’application SwissCovid apprennent qu’il y a un risque d’infection.
+"</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -635,10 +636,10 @@ Ainsi, d'autres utilisateurs de l'application SwissCovid apprennent qu'ils ont p
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/fr/categories/application-swisscovid"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Avis important"</string>
+    <string name="inform_code_intro_title">"Information concernant la saisie"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"Même si aucune donnée personnelle n'est envoyée sur vous, il est possible que quelqu'un se souvienne du contact sur la base de la date."</string>
+    <string name="inform_code_intro_text">"Même si aucune donnée personnelle n’est transmise à votre sujet, il se peut que, grâce à la date, un utilisateur se souvienne de la rencontre."</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
     <string name="inform_code_intro_button">"D'accord"</string>
@@ -669,7 +670,7 @@ Les symptômes suivants peuvent aussi apparaître :
     <string name="meldungen_positive_tested_faq1_title">"Pourquoi le traçage est-il désactivé ?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"Le traçage est automatiquement désactivé après un test positif. Vous pourrez le réactiver à la fin de votre isolement."</string>
+    <string name="meldungen_positive_tested_faq1_text">"La fonction de traçage de l’application est automatiquement désactivée après un test positif. Vous pouvez la réactiver dès la fin de votre isolement."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"fr"</string>
@@ -710,8 +711,7 @@ Les symptômes suivants peuvent aussi apparaître :
     <string name="onboarding_gaen_title">"Activer le traçage de proximité"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Pour utiliser l'application, les notifications d'exposition au COVID 19 doivent être activées."</string>
+    <string name="onboarding_gaen_text_ios">"Pour que l’application puisse détecter des rencontres, la fonction de traçage doit être activée."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Activer"</string>
@@ -743,7 +743,7 @@ Les symptômes suivants peuvent aussi apparaître :
     <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
     <string name="delete_infection_dialog">"Voulez-vous vraiment supprimer la notification ? "</string>
     <string name="android_onboarding_battery_permission_title">"Ignorer l'optimisation de la batterie"</string>
-    <string name="android_onboarding_battery_permission_text">"Pour pouvoir détecter les contacts en tout temps, désactiver l'optimisation de la batterie pour cette application."</string>
+    <string name="android_onboarding_battery_permission_text">"L’option d’optimisation de la batterie doit être désactivée pour que l’application fonctionne."</string>
     <string name="android_onboarding_battery_permission_button">"Autoriser"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Seulement pour cette application"</string>
@@ -766,8 +766,7 @@ Les symptômes suivants peuvent aussi apparaître :
     <string name="tracing_permission_error_title_ios">"Notifications d'exposition au COVID 19 désactivé"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Activez les notifications d'exposition au COVID 19 pour que le traçage de proximité fonctionne."</string>
+    <string name="tracing_permission_error_text_ios">"Il faut activer {TRACING_SETTING_TEXT} pour que le traçage anonyme fonctionne."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Le message n'a pas pu être envoyé. Veuillez autoriser le partage de vos IDs aléatoires avec l'application SwissCovid."</string>
@@ -811,10 +810,8 @@ Si aucune mise à jour n'est actuellement disponible sur votre appareil, veuille
     <string name="tracing_active_tracking_always_info">"SwissCovid reste active, même lorsque l'application est fermée."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-stoppe les chaînes 
-de transmission."</string>
-    <string name="inform_detail_faq3_text">"Même si aucune donnée personnelle n'est envoyée sur vous, il est possible que quelqu'un se souvienne du contact sur la base de la date."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid – information rapide en cas de risque d’infection."</string>
+    <string name="inform_detail_faq3_text">"Même si aucune donnée personnelle n’est transmise à votre sujet, il se peut que, grâce à la date, un utilisateur se souvienne du contact."</string>
     <string name="inform_detail_faq3_title">"Est-ce que je reste anonyme ?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -824,7 +821,7 @@ de transmission."</string>
     <string name="tracing_setting_text_android">"Notifications d'exposition au COVID 19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Pour utiliser l'application, les notifications d'exposition au COVID 19 doivent être activées."</string>
+    <string name="onboarding_gaen_text_android">"Pour que l’application puisse détecter des contacts, la fonction de traçage doit être activée."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -917,7 +914,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Voyages"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid fonctionne dans les pays suivants :"</string>
+    <string name="travel_home_description">"SwissCovid fonctionne dans les pays suivants :"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Qu'est-ce que cela signifie ?"</string>
@@ -1261,7 +1258,9 @@ d'ouvrir un site internet."</string>
     <string name="delete_infection_dialog_finish_button">"Terminer"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Aucun contact n'est enregistré. Le traçage peut être réactivé après l'isolement."</string>
+    <string name="tracing_ended_info">"Plus aucun nouveau contact n’est enregistré et il n’est plus possible de se reconnecter.
+
+Les deux fonctions peuvent être réactivées à la fin de votre isolement."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1293,9 +1292,9 @@ d'ouvrir un site internet."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Vous êtes sourd ou malentendant et vous ne pouvez pas appeler l'infoline dédiée au coronavirus ? 
+    <string name="hearing_impaired_info">"Vous êtes sourd ou malentendant et vous ne pouvez pas appeler l’infoline ?
 
-Alors envoyez un message à covid-support@medgate.ch."</string>
+Alors, envoyez un courriel à covid-support@medgate.ch"</string>
 
     <!-- Überschrift des Covidcodes-Statistik-Moduls -->
     <string name="stats_covidcodes_title">"Codes COVID"</string>
@@ -1348,8 +1347,8 @@ La vitesse est un facteur décisif dans la lutte contre le coronavirus : moins o
     <string name="stats_cases_current_description">"Le graphique indique les nouvelles infections déclarées pendant les 28 derniers jours pour donner un aperçu de l'évolution actuelle."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"Vous avez été testé positif (test PCR ou test rapide antigénique) mais vous n'avez pas encore reçu de code COVID après 4 heures ?
-Contactez l'infoline coronavirus :"</string>
+    <string name="inform_detail_infobox1_text">"Le résultat de votre test (PCR ou antigénique) est positif, mais vous n’avez pas encore reçu de code COVID après 4 heures ?
+Appelez :"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Pas encore de code COVID ?"</string>
@@ -1373,7 +1372,7 @@ Contactez l'infoline coronavirus :"</string>
     <string name="travel_screen_compatible_countries">"Pays compatibles :"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Afin que les voyageurs en provenance de l'étranger puissent aussi être avertis, les clés privées sont partagées avec les applications des pays compatibles."</string>
+    <string name="inform_code_travel_text">"Afin que les voyageurs en provenance de l’étranger puissent aussi être avertis, les clés privées sont partagées avec les applications des pays compatibles."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Total"</string>
@@ -1388,13 +1387,13 @@ Contactez l'infoline coronavirus :"</string>
     <string name="meldungen_positive_tested_faq2_title">"Qui est averti ?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Tous les contacts recensés pendant votre phase contagieuse du {ONSET_DATE} jusqu'à la saisie de votre code COVID sont avertis en cas de risque d'infection dû à la distance et à la durée du contact."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Tous les contacts recensés pendant votre phase contagieuse du {ONSET_DATE} jusqu'à la saisie de votre code COVID sont avertis en cas de risque d'infection dû à la distance et à la durée du contact ou si vous avez été connecté au même endroit qu’un autre utilisateur."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – aujourd'hui"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Merci de nous aider à briser les chaînes d'infection."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Vous contribuez ainsi à avertir d’autres utilisateurs d’une possible infection."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Les clés privées de votre application ont été envoyées pour la période suivante :"</string>
@@ -1433,365 +1432,357 @@ Contactez l'infoline coronavirus :"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Dans 1 jour"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Rappel de déconnexion"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Souhaitez-vous vous déconnecter ?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Déconnexion automatique"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"Il y a eu une déconnexion automatique."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scanner le code QR et se connecter"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"Code QR invalide !"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"De"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"À"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Ajouter une mention"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"P. ex. qui vous a accompagné ?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Fin"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Rappel de déconnexion"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Arrêter"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Veuillez vous authentifier pour accéder au journal"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"L'application doit avoir accès à l'appareil photo pour pouvoir scanner le code QR."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"Mes connexions"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Connexion"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"L’appareil photo est nécessaire pour scanner le code QR."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Autorisez la reconnaissance faciale pour accéder à votre journal en toute sécurité."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Veuillez vous authentifier pour accéder au journal"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Déconnexion"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Connexion"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Connexion"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Créer un code QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Proposer des connexions ?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Se connecter "</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"Le rappel n’a pas pu être activé."</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"Afin de recevoir un rappel de déconnexion, vous devez autoriser la fonction \\"Notifications\\" dans les paramètres de l’application."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Adapter"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Traiter"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"Il n'existe aucune donnée."</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"Si vous scannez un code QR SwissCovid pour vous connecter sur place, une donnée est automatiquement enregistrée."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid doit avoir accès à l’appareil photo de votre smartphone. L’appareil photo est uniquement utilisé pour scanner les codes QR."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Autoriser l’accès à l’appareil photo"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"P. ex. lieu de rencontre ou nom de l’événement"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Imprimer le PDF"</string>
+    <string name="bottom_nav_tab_info">"Information"</string>
+    <string name="error_network_title">"Problème de réseau"</string>
+    <string name="error_network_text">"Veuillez vérifier votre connexion Internet."</string>
+    <string name="error_action_retry">"Essayez à nouveau"</string>
+    <string name="error_notification_deactivated_title">"Notifications désactivées"</string>
+    <string name="error_notification_deactivated_text">"Veuillez modifier vos paramètres afin de recevoir directement les notifications."</string>
+    <string name="error_action_change_settings">"Modifier les paramètres"</string>
+    <string name="error_camera_permission_title">"Pas d’accès à l’appareil photo"</string>
+    <string name="error_camera_permission_text">"L'application doit avoir accès à l'appareil photo pour pouvoir scanner le code QR."</string>
+    <string name="error_title">"Erreur"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"Le code QR n’est pas encore valable."</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Le code QR n’est plus valable."</string>
+    <string name="error_already_checked_in">"Votre connexion a déjà été établie."</string>
+    <string name="error_update_text">"Ce code QR n'est pas compatible avec la version installée de l’application. Veuillez mettre à jour l’application."</string>
+    <string name="error_update_title">"Mise à jour requise"</string>
+    <string name="error_action_update">"Mettre à jour "</string>
+    <string name="ongoing_notification_checkout_quick_action">"Déconnecter"</string>
+    <string name="reminder_notification_snooze_action">"Fonction de rappel"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Notification de connexion permanente"</string>
+    <string name="ongoing_notification_title">"Connexion activée depuis {TIME} heures."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Sauvegarder"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scanner le code QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Connexion désactivée"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Pas de connexion possible actuellement"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scannez un code QR SwissCovid pour vous connecter sur place."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"Si vous scannez un code QR SwissCovid pour vous connecter sur place, une donnée est automatiquement enregistrée."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"Connexion effectuée"</string>
+    <string name="checkout_from_to_date">"Du {DATE1} au {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Plus d’informations sur le code COVID"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Effacer la donnée enregistrée"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Effacer"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Partager"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Imprimer"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scannez un code QR SwissCovid pour vous connecter sur place."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Partager les données de connexion"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"Si vous partagez vos données de connexion, l’application peut notifier les personnes qui étaient connectées au même endroit et à la même heure."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Sélectionner tous"</string>
+    <string name="inform_dont_send_button_title">"Ne pas transmettre"</string>
+    <string name="inform_dont_share_button_title">"Ne pas partager"</string>
+    <string name="inform_really_not_share_title">"Ne voulez-vous vraiment pas partager les données ?"</string>
+    <string name="inform_really_not_share_subtitle">"Le partage des clés privées permet à SwissCovid de notifier des personnes ayant pu s’infecter et de freiner ainsi la propagation du virus. Si vous ne partagez pas vos clés privées, des personnes ayant potentiellement été infectées ne peuvent pas être averties."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Effacer la donnée enregistrée"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"La donnée a été définitivement effacée de la liste."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Effacer définitivement"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Masquer uniquement et maintenir en vigueur les notifications ?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Test positif ?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Réactiver contacts et connexions."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"Vous ne pouvez plus vous connecter après un test positif."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Créez un code QR permettant aux utilisateurs de se connecter sur place."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Souhaitez-vous vraiment supprimer le code QR ?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Auto-connexion"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scannez un code QR SwissCovid pour vous connecter sur place."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Sauvegarde impossible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"Les heures sélectionnées coïncident avec d’autres connexions dans votre journal. Vérifiez encore une fois votre saisie."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"Les données de connexion sélectionnées ont été transmises. Toutes les personnes qui étaient connectées au même endroit à la même heure seront notifiées."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"Connexion SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Se connecter sans enregistrer de données"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"Avec l’application SwissCovid, vous pouvez facilement vous connecter, sans enregistrer vos données. L’application vous informera rapidement d’un éventuel risque d’infection."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"Application SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Télécharger"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Se connecter sans enregistrer de données"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Saisissez ici votre code COVID pour alerter d’autres utilisateurs."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Fin de l’isolement ?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Souhaitez-vous proposer des connexions ?"</string>
+    <string name="checkin_footer_title1">"À quoi sert la fonction de connexion ?"</string>
+    <string name="checkin_footer_subtitle1">"La fonction de connexion sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
+    <string name="checkin_footer_title2">"Pas de sauvegarde centralisée des données"</string>
+    <string name="checkin_footer_subtitle2">"La fonction de connexion SwissCovid ne nécessite pas la saisie de coordonnées comme le nom, l’adresse ou le numéro de téléphone et elle n’enregistre pas les données de géolocalisation. La liste des connexions est enregistrée localement sur votre smartphone. Les données locales sont effacées après 14 jours."</string>
+    <string name="events_empty_state_title">"Créer un code QR"</string>
+    <string name="events_empty_state_subtitle">"Au moyen du code QR SwissCovid, il est possible de se connecter sur place sans devoir enregistrer ses données."</string>
+    <string name="events_info_box_title">"Cette fonction ne remplace pas la collecte obligatoire des coordonnées."</string>
+    <string name="events_info_box_text">"La connexion SwissCovid ne remplace la collecte des coordonnées prescrite par l’« ordonnance COVID-19 situation particulière »."</string>
+    <string name="events_footer_title1">"Où la fonction de connexion peut-elle être utilisée ?"</string>
+    <string name="events_footer_title2">"À quoi sert la fonction de connexion ?"</string>
+    <string name="events_footer_subtitle1">"La fonction de connexion SwissCovid sera utile lors de rencontres dans des lieux où la collecte des coordonnées n’est pas obligatoire. Il peut s’agir – de rencontres privées – d’événements organisés par des associations – de rassemblements dans le cadre professionnel, p. ex. salles de réunion, bureaux, cantines, etc."</string>
+    <string name="events_footer_subtitle2">"La fonction de connexion sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Situations à risque"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Contacts"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Connexion"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Que dois-je faire ?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Connexion positive"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Connexions / contacts positifs"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"Code QR de l’utilisateur"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Code QR de traçage des contacts"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"Après un test positif, la fonction de connexion est automatiquement désactivée. Elle peut être réactivée après la fin de l’isolement."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Saisissez un titre qui décrit le lieu ou l’événement. Ce titre s’affichera lors de la connexion."</string>
+    <string name="checkin_report_heading">"Que pouvez-vous faire ?"</string>
+    <string name="checkin_report_title1">"Protéger les contacts"</string>
+    <string name="checkin_report_title2">"Observer les symptômes"</string>
+    <string name="checkin_report_title3">"Se faire tester"</string>
+    <string name="checkin_report_subtitle1">"Il est possible d’être contagieux sans le savoir. Respectez les règles d’hygiène et de conduite pour protéger votre famille, vos amis et tout votre entourage."</string>
+    <string name="checkin_report_subtitle2">"Surveillez votre état de santé."</string>
+    <string name="checkin_report_subtitle3">"Faites-vous immédiatement tester si vous présentez des symptômes. Même en l’absence de symptômes il peut être utile et recommandé de se faire tester pour le coronavirus."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Connexion"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"Pas de données transmises"</string>
+    <string name="not_thank_you_screen_text1">"Aucune clé privée n’a été transmise."</string>
+    <string name="not_thank_you_screen_back_button">"Retour"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Ne pas transmettre de données"</string>
+    <string name="not_thank_you_screen_text2">"Aucune donnée de connexion n’a été transmise."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Partager la sélection"</string>
+    <string name="inform_share_checkins_not_send_button">"Ne rien partager"</string>
+    <string name="onboarding_checkin_title">"Se connecter sans enregistrer de données"</string>
+    <string name="onboarding_checkin_heading">"Connexions"</string>
+    <string name="onboarding_checkin_text1">"La fonction de connexion SwissCovid vous permet de vous connecter via l’application dans un lieu particulier ou lors d’une rencontre."</string>
+    <string name="onboarding_checkin_text2">"Votre présence est seulement enregistrée dans votre application. Il n’est pas nécessaire de saisir vos coordonnées dans l’application."</string>
+    <string name="checkin_updateboarding_text">"La fonction de connexion SwissCovid vous permet de vous connecter via l’application dans un lieu particulier ou lors d’une rencontre. Votre présence est seulement enregistrée dans votre application. Il n’est pas nécessaire de saisir vos coordonnées dans l’application. À cette fin, les conditions d’utilisation et la déclaration de protection des données ont été mises à jour."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Passer à l'étape suivante "</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"La donnée codée est enregistrée en arrière-plan dans l’application pendant 14 jours. Ainsi, en cas de possible infection, une notification peut vous être envoyée."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Masquer uniquement"</string>
+    <string name="checkin_set_reminder_explanation">"L’application peut vous rappeler de vous déconnecter au moment voulu."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Ou entièrement effacer ?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"La donnée est entièrement effacée. Vous ne pourrez plus recevoir d’avertissement."</string>
+    <string name="not_thank_you_screen_text3">"Personne ne sera notifié."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"Que dois-je savoir au sujet des tests ?"</string>
+    <string name="instant_app_install_action">"Installer l’application et se connecter"</string>
+    <string name="partial_onboarding_box_text">"Complétez la configuration de l’application pour pouvoir utiliser la fonction de traçage."</string>
+    <string name="partial_onboarding_box_action">"Terminer "</string>
+    <string name="partial_onboarding_done_title">"Configuration terminée"</string>
+    <string name="partial_onboarding_done_text">"Merci d’aider à endiguer la propagation du coronavirus."</string>
+    <string name="web_slogan">"Information rapide en cas de risque d’infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 41c864c31..68c76ae3d 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -1403,365 +1403,363 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 7c27d5c1e..82a4ebdd0 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -104,7 +104,7 @@ Così contribuisci a fermare le catene di infezione."</string>
     <string name="meldungen_meldung_title">"Possibile contagio"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Vi è la possibilità di un contagio."</string>
+    <string name="meldungen_meldung_text">"Potresti essere stato contagiato"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"App attiva"</string>
@@ -194,7 +194,7 @@ Così contribuisci a fermare le catene di infezione."</string>
     <string name="inform_detail_box_subtitle">"Con il codice Covid..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Fermare le catene di infezione"</string>
+    <string name="inform_detail_box_title">"Avvisa di possibili contagi"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Immetti il codice Covid"</string>
@@ -228,7 +228,7 @@ Così contribuisci a fermare le catene di infezione."</string>
     <string name="tracing_turned_off_title">"Tracciamento disattivato"</string>
     <string name="tracing_turned_off_text">"Attiva il tracciamento per far funzionare l'app."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth disattivato"</string>
-    <string name="bluetooth_turned_off_text">"Attiva Bluetooth sul tuo dispositivo per far funzionare il tracciamento."</string>
+    <string name="bluetooth_turned_off_text">"Attiva il Bluetooth sul tuo dispositivo per avviare il tracciamento anonimo"</string>
     <string name="bluetooth_turn_on_button_title">"Attiva Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Uso di Bluetooth negato"</string>
     <string name="bluetooth_permission_error_text">"Consenti l'uso di Bluetooth sul tuo dispositivo per far funzionare il tracciamento."</string>
@@ -260,11 +260,11 @@ Così contribuisci a fermare le catene di infezione."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Segui le istruzioni sull'isolamento che hai ricevuto."</string>
-    <string name="tracing_ended_title">"Tracciamento terminato"</string>
-    <string name="tracing_ended_text">"Gli incontri non vengono più salvati."</string>
+    <string name="tracing_ended_title">"Incontri e check-in disattivati"</string>
+    <string name="tracing_ended_text">"Gli incontri non vengono salvati"</string>
     <string name="exposed_info_contact_hotline">"Contatta la"</string>
     <string name="meldung_homescreen_positive_info_line1">"Segui le"</string>
-    <string name="meldung_homescreen_positive_info_line2">"istruzioni sull'auto-isolamento"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Istruzioni sull'isolamento"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Nuova segnalazione"</string>
@@ -274,7 +274,7 @@ Così contribuisci a fermare le catene di infezione."</string>
     <string name="meldung_homescreen_positiv_title">"Positivo al test"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Vi è la possibilità di un contagio."</string>
+    <string name="meldung_detail_exposed_subtitle">"Potresti essere stato contagiato"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Sei risultato positivo al test del coronavirus."</string>
@@ -345,7 +345,7 @@ Infoline SwissCovid
     <string name="onboarding_privacy_text2">"Gli ID casuali salvati restano sul tuo telefono cellulare e vengono eliminati dopo 14 giorni."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Come funziona l'app?"</string>
+    <string name="onboarding_begegnungen_heading">"Incontri"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Riconosce gli incontri
@@ -398,7 +398,7 @@ possibile contagio"</string>
     <string name="onboarding_push_title">"Consenti messaggi"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Per poter essere informato dall'app, devi consentire i messaggi."</string>
+    <string name="onboarding_push_text">"Per poter essere informato dall'app, devi consentire le notifiche."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Consenti messaggi"</string>
@@ -421,7 +421,7 @@ Segui le istruzioni sull'isolamento che hai ricevuto."</string>
     <string name="onboarding_go_title">"L'app è installata"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Grazie per aiutarci a interrompere le catene di infezione."</string>
+    <string name="onboarding_go_text">"Grazie per aiutarci a contenere la diffusione del coronavirus."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Avvia"</string>
@@ -448,7 +448,7 @@ Segui le istruzioni sull'isolamento che hai ricevuto."</string>
     <string name="meldung_detail_new_contact_title">"Possibile contagio"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Vi è il sospetto di un possibile contagio."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Potresti essere stato contagiato"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Errore nell'impostazione dell'ora"</string>
@@ -588,9 +588,9 @@ Il consumo della batteria aumenta soltanto leggermente."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Cosa sono le segnalazioni?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"L'app controlla regolarmente se altri utenti che hai incontrato hanno segnalato di essere positivi al test.
+    <string name="meldungen_nomeldungen_faq1_text">"L'app controlla regolarmente se altri utenti che hai incontrato o che hanno fatto il check-in nello stesso luogo hanno segnalato un risultato positivo del test.
 
-In caso di possibile contagio viene visualizzato un messaggio sulla schermata di blocco."</string>
+In caso di possibile contagio viene visualizzata una notifica sulla schermata di blocco."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"La Infoline SwissCovid ti offre consulenza sulla possibilità di fare un test gratuito."</string>
@@ -629,9 +629,9 @@ In questo modo si garantisce che l'app segnali soltanto i casi confermati."</str
     <string name="inform_detail_faq2_title">"Che cosa viene inviato?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Vengono inviate soltanto le chiavi private della tua app, non i tuoi dati personali.
+    <string name="inform_detail_faq2_text">"Vengono inviate soltanto le chiavi private dell'app e gli ID criptati dei tuoi check-in, non i tuoi dati personali.
 
-In questo modo gli altri utenti dell'app SwissCovid vengono a sapere che vi è la possibilità di un contagio."</string>
+Gli altri utenti dell'app SwissCovid saranno così informati di un possibile contagio."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -640,7 +640,7 @@ In questo modo gli altri utenti dell'app SwissCovid vengono a sapere che vi è l
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/it/categories/app-swisscovid"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Avvertenza importante"</string>
+    <string name="inform_code_intro_title">"Informazione sull'immissione"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Anche se non vengono inviati dati personali, è possibile che qualcuno possa ricordarsi dell'incontro sulla base della data in cui è avvenuto."</string>
@@ -675,7 +675,7 @@ Possono inoltre comparire i seguenti sintomi:
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
     <string name="meldungen_positive_tested_faq1_text">"Dopo un test positivo, il tracciamento dell'app
-viene disattivato automaticamente. Il tracciamento può essere riattivato non appena avrete concluso l'isolamento"</string>
+viene disattivato automaticamente. Il tracciamento può essere riattivato al termine dell'isolamento."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"it"</string>
@@ -716,8 +716,7 @@ viene disattivato automaticamente. Il tracciamento può essere riattivato non ap
     <string name="onboarding_gaen_title">"Attivare il tracciamento"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Per utilizzare l'app è necessario attivare le notifiche di esposizione al COVID-19."</string>
+    <string name="onboarding_gaen_text_ios">"Per riconoscere gli incontri è necessario attivare la funzione di tracciamento."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Attiva"</string>
@@ -749,7 +748,7 @@ viene disattivato automaticamente. Il tracciamento può essere riattivato non ap
     <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
     <string name="delete_infection_dialog">"Eliminare la segnalazione?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignora l'ottimizzazione della batteria"</string>
-    <string name="android_onboarding_battery_permission_text">"Per poter riconoscere sempre gli incontri, l'ottimizzazione della batteria deve essere disattivata per questa app."</string>
+    <string name="android_onboarding_battery_permission_text">"Per utilizzare l'app è necessario disattivare l'ottimizzazione della batteria."</string>
     <string name="android_onboarding_battery_permission_button">"Consenti"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Solo per questa app"</string>
@@ -772,8 +771,7 @@ viene disattivato automaticamente. Il tracciamento può essere riattivato non ap
     <string name="tracing_permission_error_title_ios">"Notifiche di esposizione al COVID-19 disattivato"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Attiva le notifiche di esposizione al COVID-19 per avviare il tracciamento."</string>
+    <string name="tracing_permission_error_text_ios">"Attiva {TRACING_SETTING_TEXT} per avviare il tracciamento anonimo."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Impossibile inviare la segnalazione. Consentire la condivisione dei propri ID casuali con l'app SwissCovid."</string>
@@ -817,10 +815,9 @@ Se al momento non è disponibile alcun aggiornamento sul tuo dispositivo, riprov
     <string name="tracing_active_tracking_always_info">"SwissCovid resta attiva anche quando l'app viene chiusa."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-ferma le 
-catene di infezione"</string>
-    <string name="inform_detail_faq3_text">"Anche se non vengono inviati dati personali, è possibile che qualcuno possa ricordarsi dell'incontro sulla base della data in cui è avvenuto."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid –
+informazione rapida in caso di rischio di contagio."</string>
+    <string name="inform_detail_faq3_text">"Sì, ma anche se non vengono inviati dati personali, è possibile che qualcuno possa ricordarsi dell'incontro sulla base della data in cui è avvenuto."</string>
     <string name="inform_detail_faq3_title">"Resto anonimo?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -830,7 +827,7 @@ catene di infezione"</string>
     <string name="tracing_setting_text_android">"Notifiche di esposizione al COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Per utilizzare l'app è necessario attivare le notifiche di esposizione al COVID-19."</string>
+    <string name="onboarding_gaen_text_android">"Per riconoscere gli incontri è necessario attivare la funzione di tracciamento."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -1267,9 +1264,9 @@ Affinché anche i viaggiatori all'estero possano essere avvisati, la condivision
     <string name="delete_infection_dialog_finish_button">"Interrompi"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Non verranno più registrati i contatti.
+    <string name="tracing_ended_info">"Gli incontri non vengono più salvati e non sono più possibili nuovi check-in.
 
- Il tracciamento può essere riattivato non appena avrete concluso l'isolamento"</string>
+Entrambe le funzioni potranno essere riattivate al termine dell'isolamento."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1301,9 +1298,9 @@ Affinché anche i viaggiatori all'estero possano essere avvisati, la condivision
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Siete sordi o audiolesi e non potete chiamare l'Infoline Coronavirus?
+    <string name="hearing_impaired_info">"Sei sordo o audioleso e non puoi telefonare?
 
-Scrivete un'e-mail all'indirizzo: covid-support@medgate.ch"</string>
+Scrivi un'e-mail all'indirizzo: covid-support@medgate.ch"</string>
 
     <!-- Überschrift des Covidcodes-Statistik-Moduls -->
     <string name="stats_covidcodes_title">"Codici Covid"</string>
@@ -1357,7 +1354,7 @@ Nella lotta al coronavirus il tempo è un fattore fondamentale: meno tempo trasc
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"Sei risultato positivo al test (PCR o antigenico rapido) e dopo quattro ore non hai ancora ricevuto un codice Covid?
-Contatta la Infoline coronavirus:"</string>
+Chiama il seguente numero:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Non hai ancora un codice Covid?"</string>
@@ -1381,7 +1378,7 @@ Contatta la Infoline coronavirus:"</string>
     <string name="travel_screen_compatible_countries">"Paesi compatibili:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Affinché anche i viaggiatori all'estero possano essere avvisati, le chiavi private vengono condivise con le app di tracciamento dei Paesi compatibili."</string>
+    <string name="inform_code_travel_text">"Affinché anche i viaggiatori provenienti dall'estero possano essere avvisati dopo un incontro, le chiavi private vengono condivise con le app di tracciamento dei Paesi compatibili."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Totale"</string>
@@ -1396,13 +1393,13 @@ Contatta la Infoline coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Chi viene avvertito?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Vengono avvertiti tutti i contatti nel periodo della tua fase contagiosa dal {ONSET_DATE} fino all'immissione del codice Covid, se in base alla distanza e alla durata vi è stata la possibilità di un contagio."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Vengono avvisati tutti i contatti durante la tua fase contagiosa dal {ONSET_DATE} fino all'immissione del codice Covid, se possono essere stati contagiati in base alla distanza e alla durata o hanno fatto il check-in nello stesso luogo."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – oggi"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Così contribuisci a fermare le catene di infezione."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Così contribuisci ad avvisare gli altri di un possibile contagio."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Le chiavi private della tua app sono state inviate per il seguente periodo:"</string>
@@ -1441,365 +1438,363 @@ Contatta la Infoline coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Fra 1 giorno"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Promemoria check-out"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Vuoi fare il check-out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Check-out automatico"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"È stato effettuato il check-out automatico."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scansiona il codice QR e fai il check-in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"Codice QR non valido!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"Dal"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"Al"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Aggiungi una nota"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"p. es. con chi eri?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Fatto"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Promemoria check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Disattiva"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Autenticati per accedere al diario"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"L'app deve avere accesso alla fotocamera per poter scansionare il codice QR."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"I miei check-in"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"Per scansionare il codice QR è necessaria la fotocamera."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Consenti l'utilizzo di Face-ID per accedere al diario in modo sicuro."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Autenticati per accedere al diario"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Crea codice QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offrire i check-in?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Fai il check-in ora"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"Impossibile impostare il promemoria"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"Per ricevere i promemoria check-out devi consentire le \\"notifiche\\" nelle impostazioni dell'app."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Adatta"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Modifica"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"Ancora nessuna voce presente"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"Quando scansioni un codice QR SwissCovid per fare il check-in sul posto, viene creata automaticamente una voce qui."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid necessita dell'accesso alla fotocamera del tuo dispositivo. La fotocamera è utilizzata solo per scansionare i codici QR."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Consenti l'accesso alla fotocamera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"p. es. locale o nome dell'evento"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Stampa PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Errore di rete"</string>
+    <string name="error_network_text">"Verifica la connessione a Internet."</string>
+    <string name="error_action_retry">"Riprova"</string>
+    <string name="error_notification_deactivated_title">"Notifiche disattivate"</string>
+    <string name="error_notification_deactivated_text">"Modifica le impostazioni per essere informato direttamente in caso di segnalazione."</string>
+    <string name="error_action_change_settings">"Modifica le impostazioni"</string>
+    <string name="error_camera_permission_title">"Nessun accesso alla fotocamera"</string>
+    <string name="error_camera_permission_text">"L'app necessita dell'accesso alla fotocamera per poter scansionare il codice QR."</string>
+    <string name="error_title">"Errore"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"Codice QR non ancora valido"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Codice QR non più valido"</string>
+    <string name="error_already_checked_in">"Hai già fatto il check-in."</string>
+    <string name="error_update_text">"Questo codice QR non è compatibile con la versione dell'app installata. Aggiorna l'app per continuare."</string>
+    <string name="error_update_title">"Aggiornamento necessario"</string>
+    <string name="error_action_update">"Aggiorna ora"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check-out"</string>
+    <string name="reminder_notification_snooze_action">"Posponi"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Notifica check-in permanente"</string>
+    <string name="ongoing_notification_title">"Hai fatto il check-in alle {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Salva"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scansiona codice QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in disattivato"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Impossibile fare il check-in"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scansiona un codice QR SwissCovid per fare il check-in."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"Quando scansioni un codice QR SwissCovid per fare il check-in sul posto, viene creata automaticamente una voce qui."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"Hai fatto il check-in"</string>
+    <string name="checkout_from_to_date">"Dal {DATE1} al {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Maggiori informazioni sul codice Covid"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Rimuovi voce"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Elimina"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Condividi"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Stampa"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scansiona un codice QR SwissCovid per fare il check-in sul posto."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Condividi le voci di check-in"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"Se condividi le tue voci di check-in, l'app potrà informare le persone che hanno fatto il check-in nello stesso luogo e nello stesso momento."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Seleziona tutto"</string>
+    <string name="inform_dont_send_button_title">"Non inviare"</string>
+    <string name="inform_dont_share_button_title">"Non condividere"</string>
+    <string name="inform_really_not_share_title">"Non condividere?"</string>
+    <string name="inform_really_not_share_subtitle">"La condivisione delle tue chiavi private aiuterà «SwissCovid» ad avvisare altre persone potenzialmente infette e a prevenire l'ulteriore diffusione del virus. Se non condividi le tue chiavi private, non sarà avvisata nessuna persona potenzialmente infetta."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Elimina voce"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"La tua voce sarà eliminata definitivamente dall'elenco."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Elimina definitivamente"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Nascondi e continua a ricevere notifiche?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Positivo al test?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Riattiva gli incontri e il check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"Se sei risultato positivo al test, non puoi più fare il check-in."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Crea un codice QR per consentire alle persone di fare il check-in sul posto"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Eliminare il codice QR?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scansiona un codice QR SwissCovid per fare il check-in sul posto."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Impossibile salvare"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"Gli orari selezionati si sovrappongono ad altri check-in del diario. Verifica nuovamente i dati immessi."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"I check-in selezionati sono stati inviati. Saranno avvisate tutte le persone che hanno fatto il check nello stesso luogo e nello stesso momento."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"Check-in SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Fai il check-in senza lasciare dati"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"Da noi con l'app SwissCovid puoi fare il check-in facilmente, senza lasciare dati. In caso di rischio di contagio sarai informato rapidamente dall'app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"App SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Scarica ora"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check-in
+senza lasciare dati"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Immetti il codice Covid per avvisare gli altri"</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Terminare l'isolamento?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Vuoi offrire i check-in?"</string>
+    <string name="checkin_footer_title1">"Perché una funzione check-in?"</string>
+    <string name="checkin_footer_subtitle1">"La funzione check-in senza registrazione dei dati di contatto completa l'app SwissCovid. Con questa funzione, in caso di test positivo puoi avvisare non solo i contatti stretti, ma anche le persone che hanno fatto il check-in nello stesso luogo e nello stesso momento."</string>
+    <string name="checkin_footer_title2">"Nessun salvataggio centralizzato dei dati"</string>
+    <string name="checkin_footer_subtitle2">"Per il check-in SwissCovid non occorre fornire dati personali come il nome, l'indirizzo o il numero di telefono e non sono registrati dati sulla posizione GPS. L'elenco dei check-in è salvato localmente sul tuo smartphone. Dopo 14 giorni, i dati locali sono cancellati."</string>
+    <string name="events_empty_state_title">"Crea un codice QR"</string>
+    <string name="events_empty_state_subtitle">"Il codice QR SwissCovid consente di fare il check-in sul posto senza lasciare dati."</string>
+    <string name="events_info_box_title">"Nessuna esenzione dall'obbligo di registrare i dati di contatto"</string>
+    <string name="events_info_box_text">"Il check-in SwissCovid non esenta dall'obbligo di registrare i dati di contatto secondo l'«ordinanza COVID-19 situazione particolare»."</string>
+    <string name="events_footer_title1">"Dove può essere impiegato il check-in?"</string>
+    <string name="events_footer_title2">"Perché una funzione check-in?"</string>
+    <string name="events_footer_subtitle1">"Il check-in SwissCovid può essere impiegato dove più persone s'incontrano, ma non vige alcun obbligo di registrare i dati di contatto.
+
+Possibili luoghi d'impiego:
+– eventi privati
+– eventi associativi
+– incontri in ambito professionale, p. es. in sale riunioni, uffici, mense ecc."</string>
+    <string name="events_footer_subtitle2">"La funzione check-in senza registrazione dei dati di contatto completa l'app SwissCovid. Con questa funzione, in caso di test positivo puoi avvisare non solo i contatti stretti, ma anche le persone che hanno fatto il check-in nello stesso luogo e nello stesso momento."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Situazione a rischio"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Incontri"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Cosa devo fare?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Check-in positivo"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Check-in/contatti positivi"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"Codice QR utente"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Codice QR tracciamento dei contatti"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"Dopo un test positivo, la funzione check-in viene disattivata automaticamente. Può essere riattivata al termine dell'isolamento."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Attribuisci un titolo che descriva il luogo o l'evento. Questo titolo sarà visualizzato al momento del check-in."</string>
+    <string name="checkin_report_heading">"Cosa puoi fare?"</string>
+    <string name="checkin_report_title1">"Proteggi i tuoi contatti"</string>
+    <string name="checkin_report_title2">"Presta attenzione ai sintomi"</string>
+    <string name="checkin_report_title3">"Fai il test"</string>
+    <string name="checkin_report_subtitle1">"Potresti già essere contagioso senza accorgertene. Rispetta le misure d'igiene e di protezione vigenti e proteggi la tua famiglia, i tuoi amici e il tuo ambiente."</string>
+    <string name="checkin_report_subtitle2">"Sorveglia il tuo stato di salute."</string>
+    <string name="checkin_report_subtitle3">"In caso di sintomi fai subito il test. Il test è raccomandato anche in assenza di stintomi."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"Nessun dato inviato"</string>
+    <string name="not_thank_you_screen_text1">"Nessuna chiave privata inviata"</string>
+    <string name="not_thank_you_screen_back_button">"Indietro"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Non inviare nessun dato"</string>
+    <string name="not_thank_you_screen_text2">"Nessuna voce di check-in inviata"</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Condividi la selezione"</string>
+    <string name="inform_share_checkins_not_send_button">"Non condividere"</string>
+    <string name="onboarding_checkin_title">"Check-in senza lasciare dati"</string>
+    <string name="onboarding_checkin_heading">"Check-in"</string>
+    <string name="onboarding_checkin_text1">"Con i check-in SwissCovid puoi fare il check-in in un luogo o a un incontro con l'app."</string>
+    <string name="onboarding_checkin_text2">"La tua presenza è salvata solo nell'app. L'app non chiede dati personali."</string>
+    <string name="checkin_updateboarding_text">"Con i check-in SwissCovid puoi fare il check-in in un luogo o a un incontro con l'app. La tua presenza è salvata solo nell'app. L'app non chiede dati personali. Le condizioni per l'uso e l'informativa sulla protezione dei dati sono state aggiornate."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Ignora"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"La voce è salvata dall'app in background in forma criptata per 14 giorni. Così potrai essere avvisato comunque in caso di possibile contagio."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Nascondi soltanto"</string>
+    <string name="checkin_set_reminder_explanation">"L'app può ricordarti di fare il check-out al momento giusto."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"O elimina definitivamente?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"La voce sarà eliminata definitivamente. Non potrai più essere avvisato."</string>
+    <string name="not_thank_you_screen_text3">"Non sarà informato nessuno."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"Cosa devo sapere a proposito del test?"</string>
+    <string name="instant_app_install_action">"Installa l'app e fai il check-in"</string>
+    <string name="partial_onboarding_box_text">"Per poter utilizzare la funzione di tracciamento devi completare la configurazione dell'app."</string>
+    <string name="partial_onboarding_box_action">"Completa ora"</string>
+    <string name="partial_onboarding_done_title">"Configurazione completata"</string>
+    <string name="partial_onboarding_done_text">"Grazie per aiutarci a contenere la diffusione del coronavirus."</string>
+    <string name="web_slogan">"Informazione rapida in caso di rischio di contagio"</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index 6ee0bfebe..e2a649b86 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -1408,365 +1408,363 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Em 1 dia"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index 9b116c6e1..4f92d7d88 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -1403,365 +1403,363 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"En 1 di"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 4af0a8abe..3ecbc1323 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -1408,365 +1408,363 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Në 1 ditë"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index 112e8d072..ad4d2cdca 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -1403,365 +1403,363 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index 561dbb8bf..4a072b544 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -1385,365 +1385,363 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="meldungen_detail_free_test_tomorrow">"ኣብ 1 መዓልቲ"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index deb5dcc17..bb6dff3e3 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -1385,365 +1385,363 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"1 gün sonra"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 18eaafde7..a97154e9b 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -104,7 +104,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="meldungen_meldung_title">"Possible infection"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"An infection could have occurred"</string>
+    <string name="meldungen_meldung_text">"You may have been infected"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"App active"</string>
@@ -194,7 +194,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="inform_detail_box_subtitle">"With the Covidcode"</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Break the chains of infection"</string>
+    <string name="inform_detail_box_title">"Alert the app to possible infections"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Enter the Covidcode"</string>
@@ -228,7 +228,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="tracing_turned_off_title">"Proximity tracing deactivated"</string>
     <string name="tracing_turned_off_text">"Activate proximity tracing so that the app works."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth off"</string>
-    <string name="bluetooth_turned_off_text">"Turn on Bluetooth on your device so that proximity tracing works."</string>
+    <string name="bluetooth_turned_off_text">"Turn on Bluetooth on your device so that anonymous tracing works."</string>
     <string name="bluetooth_turn_on_button_title">"Turn on Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Bluetooth use declined"</string>
     <string name="bluetooth_permission_error_text">"Enable the use of Bluetooth so that proximity tracing works."</string>
@@ -260,8 +260,8 @@ Thank you for helping to break the chain of infection."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Follow the instructions you receive on isolation."</string>
-    <string name="tracing_ended_title">"Tracing deactivated"</string>
-    <string name="tracing_ended_text">"No further encounters registered"</string>
+    <string name="tracing_ended_title">"Encounters and check-in deactivated"</string>
+    <string name="tracing_ended_text">"No encounters registered"</string>
     <string name="exposed_info_contact_hotline">"Contact the"</string>
     <string name="meldung_homescreen_positive_info_line1">"Follow the"</string>
     <string name="meldung_homescreen_positive_info_line2">"Instructions on self-isolation"</string>
@@ -274,7 +274,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="meldung_homescreen_positiv_title">"Tested positive"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"An infection could have occurred"</string>
+    <string name="meldung_detail_exposed_subtitle">"You may have been infected"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"You have tested positive for the coronavirus."</string>
@@ -330,7 +330,7 @@ Infoline SwissCovid
     <string name="onboarding_prinzip_text1">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"The app tells you if you might have been exposed to the coronavirus."</string>
+    <string name="onboarding_prinzip_text2">"The app alerts you if you might have been exposed to the coronavirus."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by design"</string>
@@ -345,7 +345,7 @@ Infoline SwissCovid
     <string name="onboarding_privacy_text2">"The random IDs are stored on your device for 14 days and then deleted."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"How does the app work?"</string>
+    <string name="onboarding_begegnungen_heading">"Encounters"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Recognising encounters using Bluetooth"</string>
@@ -363,7 +363,7 @@ Infoline SwissCovid
     <string name="onboarding_meldung_title">"Report of potential infection"</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"The app tells you if you might have been exposed to the coronavirus."</string>
+    <string name="onboarding_meldung_text1">"The app alerts you if you might have been exposed to the coronavirus."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"By responding appropriately, you can break the chain of infection and protect other people."</string>
@@ -396,7 +396,7 @@ Infoline SwissCovid
     <string name="onboarding_push_title">"Allow messages"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"In order to receive notifications from the app, you must enable messages."</string>
+    <string name="onboarding_push_text">"In order to receive alerts from the app, you must enable notifications."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Enable messages"</string>
@@ -419,7 +419,7 @@ Follow the instructions  you have received on isolation."</string>
     <string name="onboarding_go_title">"The app is ready to go"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Thank you for helping to break the chain of infection."</string>
+    <string name="onboarding_go_text">"Thank you for helping to stop the spread of coronavirus."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Start"</string>
@@ -446,7 +446,7 @@ Follow the instructions  you have received on isolation."</string>
     <string name="meldung_detail_new_contact_title">"Possible infection"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"An infection could have occurred"</string>
+    <string name="meldung_detail_new_contact_subtitle">"You may have been infected"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Time error"</string>
@@ -584,9 +584,9 @@ They are saved locally on the smartphones and then deleted 14 days later."</stri
     <string name="meldungen_nomeldungen_faq1_title">"What are reports?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"The app checks regularly to see whether any users that you have encountered have reported testing positive for the virus. 
+    <string name="meldungen_nomeldungen_faq1_text">"The app checks regularly to see whether any users that you have encountered or who were checked in at the same location as you have reported testing positive for the virus. 
 
-If it is possible that you have been infected, you will receive a message on your lock screen."</string>
+If it is possible that you have been infected, you will receive a notification on your lock screen."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"The infoline SwissCovid will advise you on getting a free test."</string>
@@ -626,9 +626,9 @@ This guarantees that only confirmed cases are reported via the app."</string>
     <string name="inform_detail_faq2_title">"What information gets sent?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Only the private keys from your app are sent, no personal data. 
+    <string name="inform_detail_faq2_text">"Only the private keys from your app and the encrypted IDs from your check-ins are sent, no personal data. 
 
-Other SwissCovid apps can then check if it is possible that they have been infected."</string>
+This tells other SwissCovid app users that they may have been infected."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -637,7 +637,7 @@ Other SwissCovid apps can then check if it is possible that they have been infec
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/en/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Important information"</string>
+    <string name="inform_code_intro_title">"Information on the entry"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
@@ -711,8 +711,7 @@ Other symptoms may include:
     <string name="onboarding_gaen_title">"Activate proximity tracing"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"COVID-19 Exposure Notifications must be activated to use the app."</string>
+    <string name="onboarding_gaen_text_ios">"The tracing function must be activated to detect encounters."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Activate"</string>
@@ -744,7 +743,7 @@ Other symptoms may include:
     <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
     <string name="delete_infection_dialog">"Do you really want to delete the notification? "</string>
     <string name="android_onboarding_battery_permission_title">"Ignore battery optimisation"</string>
-    <string name="android_onboarding_battery_permission_text">"To be able to recognise encounters at all times, the battery optimisation function for this app must be disabled."</string>
+    <string name="android_onboarding_battery_permission_text">"For the app to work, battery optimisation must be switched off."</string>
     <string name="android_onboarding_battery_permission_button">"Allow"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Only for this app"</string>
@@ -767,8 +766,7 @@ Other symptoms may include:
     <string name="tracing_permission_error_title_ios">"COVID-19 Exposure Notifications disabled"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Activate COVID-19 Exposure Notifications for proximity tracing to work."</string>
+    <string name="tracing_permission_error_text_ios">"Activate {TRACING_SETTING_TEXT} for anonymous tracing to work."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"The message could not be sent. Please allow your random IDs to be shared with the SwissCovid app."</string>
@@ -810,10 +808,9 @@ If no update is currently available on your device, please try again later."</st
     <string name="tracing_active_tracking_always_info">"SwissCovid remains active even if the app has been closed."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-breaks 
-chains of infection."</string>
-    <string name="inform_detail_faq3_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid –
+find out fast if you're at risk of infection."</string>
+    <string name="inform_detail_faq3_text">"Yes, but although no personal data is sent out, it may well be that someone remembers their encounter with you from the date."</string>
     <string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -823,7 +820,7 @@ chains of infection."</string>
     <string name="tracing_setting_text_android">"COVID-19 Exposure Notifications"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"COVID-19 Exposure Notifications must be activated to use the app."</string>
+    <string name="onboarding_gaen_text_android">"The tracing function must be activated to detect encounters."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -916,7 +913,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Travel"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid works in the following countries:"</string>
+    <string name="travel_home_description">"The SwissCovid encounters function works in the following countries:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"What does that mean?"</string>
@@ -1256,9 +1253,9 @@ To enable travellers from abroad to also receive alerts, this happens regardless
     <string name="delete_infection_dialog_finish_button">"End"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Notifications will no longer be stored.
+    <string name="tracing_ended_info">"No new encounters will be stored and no new check-ins are possible either.
 
-Tracing can be reactivated after isolation."</string>
+Both functions can be reactivated when the isolation period is over."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1290,9 +1287,9 @@ Tracing can be reactivated after isolation."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Are you deaf or hard of hearing and unable to call the coronavirus infoline on the phone?
+    <string name="hearing_impaired_info">"Are you deaf or hard of hearing and unable to call?
 
-Send an email to covid-support@medgate.ch."</string>
+Send an email to covid-support@medgate.ch"</string>
 
     <!-- Überschrift des Covidcodes-Statistik-Moduls -->
     <string name="stats_covidcodes_title">"Covidcodes"</string>
@@ -1345,8 +1342,8 @@ Time is a crucial factor when it comes to combating coronavirus: the shorter the
     <string name="stats_cases_current_description">"The chart shows new infections reported in the last 28 days. This gives an overview of current developments."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"Have you tested positive (PCR test or rapid antigen test) and did not receive a Covidcode after 4 hours?
-If so, contact the Coronavirus Infoline:"</string>
+    <string name="inform_detail_infobox1_text">"Have you tested positive (PCR test or rapid antigen test) and were not sent a Covidcode after 4 hours?
+If so, call this number:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Don’t have a Covidcode yet?"</string>
@@ -1385,13 +1382,13 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Who will be notified?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"All the people you came into contact with during the infectious period from {ONSET_DATE} until you entered the Covidcode will be notified, if there is a possibility of infection due to the proximity and duration of the contact."</string>
+    <string name="meldungen_positive_tested_faq2_text">"All the people you came into contact with during the infectious period from {ONSET_DATE} until you entered the Covidcode will be notified, if there is a possibility of infection due to the proximity and duration of the contact, or if you were checked-in at the same location."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – today"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"In this way you are helping break chains of infection."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"In this way you are helping alert others to a possible infection."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Your app's private key was sent for the following period:"</string>
@@ -1430,365 +1427,363 @@ If so, contact the Coronavirus Infoline:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"In 1 day"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title"></string>
+    <string name="checkout_reminder_title">"Check-out reminder"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text"></string>
+    <string name="checkout_reminder_text">"Do you want to check out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title"></string>
+    <string name="auto_checkout_title">"Automatic check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body"></string>
+    <string name="auto_checkout_body">"You were checked out automatically."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text"></string>
+    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error"></string>
+    <string name="qrscanner_error">"No valid QR code!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from"></string>
+    <string name="datepicker_from">"From"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to"></string>
+    <string name="datepicker_to">"To"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment"></string>
+    <string name="edit_mode_addcomment">"Add note"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder"></string>
+    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button"></string>
+    <string name="done_button">"Done"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder"></string>
+    <string name="checkin_set_reminder">"Check-out reminder"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off"></string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary"></string>
+    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours"></string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes"></string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission"></string>
+    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title"></string>
+    <string name="diary_title">"My check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title"></string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription"></string>
+    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription"></string>
+    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text"></string>
+    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title"></string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title"></string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title"></string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code"></string>
+    <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title"></string>
+    <string name="events_title">"Offer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title"></string>
+    <string name="check_in_now_button_title">"Check in now"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title"></string>
+    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message"></string>
+    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings"></string>
+    <string name="checkin_reminder_option_open_settings">"Customise"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title"></string>
+    <string name="edit_controller_title">"Edit"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title"></string>
+    <string name="empty_diary_title">"No entries available yet"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text"></string>
+    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text"></string>
+    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action"></string>
+    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder"></string>
+    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button"></string>
-    <string name="bottom_nav_tab_info"></string>
-    <string name="error_network_title"></string>
-    <string name="error_network_text"></string>
-    <string name="error_action_retry"></string>
-    <string name="error_notification_deactivated_title"></string>
-    <string name="error_notification_deactivated_text"></string>
-    <string name="error_action_change_settings"></string>
-    <string name="error_camera_permission_title"></string>
-    <string name="error_camera_permission_text"></string>
-    <string name="error_title"></string>
-    <string name="qr_scanner_error_code_not_yet_valid"></string>
-    <string name="qr_scanner_error_code_not_valid_anymore"></string>
-    <string name="error_already_checked_in"></string>
-    <string name="error_update_text"></string>
-    <string name="error_update_title"></string>
-    <string name="error_action_update"></string>
-    <string name="ongoing_notification_checkout_quick_action"></string>
-    <string name="reminder_notification_snooze_action"></string>
-    <string name="android_ongoing_checkin_notification_channel_name"></string>
-    <string name="ongoing_notification_title"></string>
+    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="bottom_nav_tab_info">"Info"</string>
+    <string name="error_network_title">"Network error"</string>
+    <string name="error_network_text">"Check your internet connection."</string>
+    <string name="error_action_retry">"Try again"</string>
+    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
+    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
+    <string name="error_action_change_settings">"Modify settings"</string>
+    <string name="error_camera_permission_title">"No access to camera"</string>
+    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="error_title">"Error"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
+    <string name="error_already_checked_in">"You are already checked in."</string>
+    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
+    <string name="error_update_title">"Update required"</string>
+    <string name="error_action_update">"Update now"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="reminder_notification_snooze_action">"Snooze"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
+    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title"></string>
+    <string name="checkout_save_button_title">"Save"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title"></string>
+    <string name="scan_qr_code_button_title">"Scan QR code"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title"></string>
+    <string name="checkin_ended_title">"Check-in deactivated"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text"></string>
+    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text"></string>
+    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text"></string>
+    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in"></string>
-    <string name="checkout_from_to_date"></string>
-    <string name="inform_detail_covidcode_info_button"></string>
+    <string name="checkin_checked_in">"You're checked in"</string>
+    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button"></string>
+    <string name="remove_from_diary_button">"Remove entry"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title"></string>
+    <string name="delete_button_title">"Delete"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title"></string>
+    <string name="share_button_title">"Share"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title"></string>
+    <string name="print_button_title">"Print"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description"></string>
+    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title"></string>
+    <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle"></string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all"></string>
-    <string name="inform_dont_send_button_title"></string>
-    <string name="inform_try_again_button_title"></string>
-    <string name="inform_dont_share_button_title"></string>
-    <string name="inform_really_not_share_title"></string>
-    <string name="inform_really_not_share_subtitle"></string>
+    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_dont_send_button_title">"Don't send"</string>
+    <string name="inform_dont_share_button_title">"Don't share"</string>
+    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title"></string>
+    <string name="remove_diary_warning_title">"Remove entry"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text"></string>
+    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button"></string>
+    <string name="remove_diary_remove_now_button">"Completely remove"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title"></string>
+    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title"></string>
+    <string name="home_covidcode_card_title">"Tested positive?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text"></string>
+    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes"></string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check-in when you tested positive. More text more text more text more text more text more text more"</string>
+    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle"></string>
+    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog"></string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title"></string>
+    <string name="self_checkin_button_title">"Self check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation"></string>
+    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title"></string>
+    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description"></string>
+    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins"></string>
-
-    <!-- Covidcode eingabe, are your sure not to share, titel -->
-    <string name="inform_are_you_sure_title">"Are you sure?"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, text -->
-    <string name="inform_are_you_sure_text">"Sharing your random IDs helps “SwissCovid” to notify other potential infected people and avoid the further spreading of the pandemic. If you don’t share your random IDs no automatically recognized encounters can be notified. "</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, try agan button -->
-    <string name="inform_are_you_sure_try_again_button">"Try again"</string>
-
-    <!-- Covidcode eingabe, are your sure not to share, dont send button -->
-    <string name="inform_are_you_sure_dont_send_button">"Don't share"</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline"></string>
+    <string name="pdf_headline">"SwissCovid check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan"></string>
+    <string name="pdf_slogan">"Check in without leaving any data"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation"></string>
+    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app"></string>
+    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app"></string>
+    <string name="pdf_download_app">"Download now"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title"></string>
+    <string name="checkin_detail_checked_out_title">"Check in without leaving 
+data"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text"></string>
+    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title"></string>
+    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title"></string>
-    <string name="checkin_footer_title1"></string>
-    <string name="checkin_footer_subtitle1"></string>
-    <string name="checkin_footer_title2"></string>
-    <string name="checkin_footer_subtitle2"></string>
-    <string name="events_empty_state_title"></string>
-    <string name="events_empty_state_subtitle"></string>
-    <string name="events_info_box_title"></string>
-    <string name="events_info_box_text"></string>
-    <string name="events_footer_title1"></string>
-    <string name="events_footer_title2"></string>
-    <string name="events_footer_subtitle1"></string>
-    <string name="events_footer_subtitle2"></string>
+    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_title2">"No central data storage"</string>
+    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
+    <string name="events_empty_state_title">"Generate a QR code"</string>
+    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
+    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
+    <string name="events_footer_title1">"Where can check-ins be used?"</string>
+    <string name="events_footer_title2">"Why a check-in function?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
+
+Possible locations:
+– Private events
+– Club meetings or events
+– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle"></string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters"></string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin"></string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button"></string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed"></string>
+    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed"></string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code"></string>
+    <string name="venue_type_user_qr_code">"User QR code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code"></string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed"></string>
+    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle"></string>
-    <string name="checkin_report_heading"></string>
-    <string name="checkin_report_title1"></string>
-    <string name="checkin_report_title2"></string>
-    <string name="checkin_report_title3"></string>
-    <string name="checkin_report_subtitle1"></string>
-    <string name="checkin_report_subtitle2"></string>
-    <string name="checkin_report_subtitle3"></string>
+    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
+    <string name="checkin_report_heading">"What can you do?"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title2">"Look out for symptoms"</string>
+    <string name="checkin_report_title3">"Get tested"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
+    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title"></string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
 
     <!-- SubTitel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title"></string>
-    <string name="not_thank_you_screen_text1"></string>
-    <string name="not_thank_you_screen_back_button"></string>
-    <string name="not_thank_you_screen_dont_send_button"></string>
-    <string name="not_thank_you_screen_text2"></string>
+    <string name="not_thank_you_screen_title">"No data sent"</string>
+    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
+    <string name="not_thank_you_screen_back_button">"Back"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
+    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title"></string>
-    <string name="inform_share_checkins_not_send_button"></string>
-    <string name="onboarding_checkin_title"></string>
-    <string name="onboarding_checkin_heading"></string>
-    <string name="onboarding_checkin_text1"></string>
-    <string name="onboarding_checkin_text2"></string>
-    <string name="checkin_updateboarding_text"></string>
-    <string name="onboarding_gaen_button_dont_activate"></string>
+    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
+    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
+    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text"></string>
+    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button"></string>
-    <string name="checkin_set_reminder_explanation"></string>
+    <string name="remove_diary_warning_hide_button">"Hide only"</string>
+    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title"></string>
+    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text"></string>
-    <string name="not_thank_you_screen_text3"></string>
+    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link"></string>
-    <string name="instant_app_install_action"></string>
-    <string name="partial_onboarding_box_text"></string>
-    <string name="partial_onboarding_box_action"></string>
-    <string name="partial_onboarding_done_title"></string>
-    <string name="partial_onboarding_done_text"></string>
-    <string name="web_slogan"></string>
+    <string name="checkin_report_link">"What do I need to know about testing?"</string>
+    <string name="instant_app_install_action">"Install app and check in"</string>
+    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
+    <string name="partial_onboarding_box_action">"Complete now"</string>
+    <string name="partial_onboarding_done_title">"Configuration complete"</string>
+    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
+    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+
+    <!-- Info URL for testing -->
+    <!-- Fuzzy -->
+    <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
+    <string name="checkout_too_long_alert_text"></string>
 </resources>
\ No newline at end of file

From 064bf2ba1af53479af6252207bd481a3572e0ed5 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 17:15:58 +0200
Subject: [PATCH 119/207] Make Master Public Key a BuildConfig field

---
 app/build.gradle                                             | 4 ++++
 .../admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49cbc2c61..f13efd81f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,6 +71,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.dev'
@@ -85,6 +86,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.abnahme'
@@ -99,6 +101,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
@@ -112,6 +115,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index e7b2d5bc9..8e350d905 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -3,7 +3,6 @@ package ch.admin.bag.dp3t.checkin.generateqrcode
 import android.app.Application
 import android.content.Context
 import android.graphics.Bitmap
-import android.util.Base64
 import android.util.Log
 import androidx.datastore.core.DataStore
 import androidx.datastore.dataStore
@@ -27,8 +26,6 @@ import java.io.IOException
 import kotlin.math.max
 
 
-private const val MASTER_PUBLIC_KEY_BASE64 =
-	"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"
 private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
 private const val ONE_HOUR_IN_MILLIS = 60 * ONE_MINUTE_IN_MILLIS
 private const val AUTOMATIC_CHECKOUT_DELAY_MS = 12 * ONE_HOUR_IN_MILLIS
@@ -90,7 +87,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 			swissCovidLocationData.toByteArray(),
 			System.currentTimeMillis() / 1000,
 			(System.currentTimeMillis() + QR_CODE_VALIDITY_DURATION_MS) / 1000,
-			Base64Util.fromBase64(MASTER_PUBLIC_KEY_BASE64)
+			Base64Util.fromBase64(BuildConfig.QR_MASTER_PUBLIC_KEY_BASE_64)
 		)
 
 

From 27abfa9a3f5801c7b01e8bdb3af6dfd9d2d0767c Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 17:36:22 +0200
Subject: [PATCH 120/207] Remove addToBackStack option from showFragment
 extension function

---
 .../generateqrcode/GenerateQrCodeFragment.kt      |  3 ++-
 .../dp3t/checkin/generateqrcode/QrCodeFragment.kt | 15 ++++-----------
 .../bag/dp3t/extensions/FragmentExtensions.kt     |  5 +----
 .../java/ch/admin/bag/dp3t/home/HomeFragment.java |  4 ++--
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index c65f7563d..87b65ff5e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -34,7 +34,8 @@ class GenerateQrCodeFragment : Fragment() {
 
 	private fun generateQrCode(title: String) {
 		qrCodeViewModel.generateAndSaveQrCode(title).observe(viewLifecycleOwner) {
-			showFragment(QrCodeFragment.newInstance(it), addToBackStack = false)
+			requireActivity().supportFragmentManager.popBackStack()
+			showFragment(QrCodeFragment.newInstance(it))
 		}
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index f76f7d62d..1e8b9808e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -20,11 +20,8 @@ import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.checkinflow.CheckInFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
-import ch.admin.bag.dp3t.extensions.getSubtitle
-import ch.admin.bag.dp3t.extensions.toQrCodePayload
-import ch.admin.bag.dp3t.extensions.toVenueInfo
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeBinding
-import ch.admin.bag.dp3t.extensions.combineWith
+import ch.admin.bag.dp3t.extensions.*
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import com.google.protobuf.ByteString
 import org.crowdnotifier.android.sdk.model.VenueInfo
@@ -45,9 +42,9 @@ class QrCodeFragment : Fragment() {
 	private val tracingViewModel: TracingViewModel by activityViewModels()
 
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		return FragmentQrCodeBinding.inflate(layoutInflater).apply {
-			cancelButton.setOnClickListener { parentFragmentManager.popBackStack() }
+			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
 			titleTextview.text = venueInfo.title
 			subtitleTextview.setText(venueInfo.getSubtitle())
@@ -85,11 +82,7 @@ class QrCodeFragment : Fragment() {
 	private fun showCheckInFragment(venueInfo: VenueInfo) {
 		crowdNotifierViewModel.checkInState =
 			CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
-		requireActivity().supportFragmentManager.beginTransaction()
-			.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit)
-			.replace(R.id.main_fragment_container, CheckInFragment.newInstance(isSelfCheckin = true))
-			.addToBackStack(CheckInFragment::class.java.canonicalName)
-			.commit()
+		showFragment(CheckInFragment.newInstance(isSelfCheckin = true))
 	}
 
 	private fun printPdf(file: File) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
index b0aacf6e0..432a426f3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/FragmentExtensions.kt
@@ -7,7 +7,6 @@ import ch.admin.bag.dp3t.R
 fun Fragment.showFragment(
 	fragment: Fragment,
 	@IdRes container: Int = R.id.main_fragment_container,
-	addToBackStack: Boolean = true,
 	modalAnimation: Boolean = false
 ) {
 	requireActivity().supportFragmentManager.beginTransaction()
@@ -19,10 +18,8 @@ fun Fragment.showFragment(
 			} else {
 				this.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
 			}
-			if (addToBackStack) {
-				this.addToBackStack(fragment::class.java.canonicalName)
-			}
 		}
+		.addToBackStack(fragment::class.java.canonicalName)
 		.replace(container, fragment)
 		.commit()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 3edae7802..2c7e7b2f1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -260,9 +260,9 @@ private void showReportsFragment() {
 		boolean isReportedPositive = tracingViewModel.getTracingStatusInterface().isReportedAsInfected();
 		if (((checkinReports > 0 && tracingReports > 0) || checkinReports > 1) && !isReportedPositive) {
 			FragmentExtensionsKt
-					.showFragment(this, ReportsOverviewFragment.newInstance(), R.id.main_fragment_container, true, false);
+					.showFragment(this, ReportsOverviewFragment.newInstance(), R.id.main_fragment_container, false);
 		} else {
-			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), R.id.main_fragment_container, true, false);
+			FragmentExtensionsKt.showFragment(this, ReportsFragment.newInstance(null), R.id.main_fragment_container, false);
 		}
 	}
 

From 7b82c6a5cbce1571bc588220b4bf59be4c84530c Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 17:41:19 +0200
Subject: [PATCH 121/207] Add Abnahme Master Key

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f13efd81f..68039f576 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -86,7 +86,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
-			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"RHk4TO95YVnihWuCSVnbQ3ow-AcO-BXZ9caWeO_GP7o-vEiowJXTkKSUAf77n4oAmzshDvFVLkQFsA72JfBcaC8QSIT9owk83tnDuwpUuDfFgiBq_KXqcA2UcxaInmQS"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
 			applicationIdSuffix '.abnahme'

From 19f56e1ee1d0fa149c80169cb85d22d4778d4cc9 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 31 May 2021 23:11:26 +0200
Subject: [PATCH 122/207] Remove test flavour Appcenter github action

---
 .github/workflows/appcenter_test.yml | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 .github/workflows/appcenter_test.yml

diff --git a/.github/workflows/appcenter_test.yml b/.github/workflows/appcenter_test.yml
deleted file mode 100644
index 1bf3f23f2..000000000
--- a/.github/workflows/appcenter_test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Android Build
-
-on:
-  push:
-    branches: [ master, develop ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build with Gradle
-      uses: ./.github/actions/gradle_docker
-      with:
-        gradle-cmd: assembleTeschtRelease -PkeystorePassword=${{secrets.KEYSTORE_PASSWORD}} -PkeyAliasPassword=${{secrets.KEY_ALIAS_PASSWORD}}
-    - name: upload artefact to App Center
-      uses: wzieba/AppCenter-Github-Action@v1.0.0
-      with:
-        appName: ${{secrets.APPCENTER_ORGANIZATION}}/${{secrets.APPCENTER_APP_TEST}}
-        token: ${{secrets.APPCENTER_API_TOKEN}}
-        group: Internal
-        file: app/build/outputs/apk/tescht/release/app-tescht-release.apk

From 3cff7db0452f40bce3b1470feaf3bec98d0daa46 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 09:42:07 +0200
Subject: [PATCH 123/207] Fix some Reminder Options Bugs

---
 .../checkin/checkinflow/CheckInFragment.kt     |  2 +-
 .../bag/dp3t/extensions/VenueInfoExtensions.kt | 18 +++++++++++++-----
 app/src/main/res/values/app_styles.xml         |  2 ++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 6ec7a2d1e..30d57a842 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -66,7 +66,7 @@ class CheckInFragment : Fragment() {
 			}
 
 			reminderToggleGroup.removeAllViews()
-			val reminderOptions = venueInfo.getReminderDelayOptions().toMutableList()
+			val reminderOptions = venueInfo.getReminderDelayOptions(requireContext()).toMutableList()
 			reminderOptions.add(0, ReminderOption(0L))
 			for (option in reminderOptions) {
 				val toggleButton =
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
index fbf2dc4ef..0d69000fe 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.extensions
 
+import android.content.Context
 import ch.admin.bag.dp3t.checkin.models.QRCodePayload
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import com.google.protobuf.InvalidProtocolBufferException
@@ -19,12 +20,19 @@ fun VenueInfo.getAutoCheckoutDelay() = getSwissCovidLocationData().automaticChec
 
 fun VenueInfo.getCheckoutWarningDelay() = getSwissCovidLocationData().checkoutWarningDelayMs
 
-fun VenueInfo.getReminderDelayOptions(): List<ReminderOption> {
-	if (getSwissCovidLocationData().reminderDelayOptionsMsList.size == 0) {
+fun VenueInfo.getReminderDelayOptions(context: Context): List<ReminderOption> {
+	val filteredResult = getSwissCovidLocationData().reminderDelayOptionsMsList.asSequence()
+		.filter { it >= ONE_MINUTE_IN_MILLIS && it < getAutoCheckoutDelay() }
+		.sorted()
+		.map { ReminderOption(it) }
+		.distinctBy { it.getDisplayString(context) }
+		.take(4)
+		.toList()
+	return if (filteredResult.isEmpty()) {
 		//Fallback if reminderDelayOptionsMsList is empty (30, 60, 120 and 240 minutes)
-		return listOf(30, 60, 120, 240).map { ReminderOption(it * ONE_MINUTE_IN_MILLIS) }
+		listOf(30, 60, 120, 240).map { ReminderOption(it * ONE_MINUTE_IN_MILLIS) }
+	} else {
+		filteredResult
 	}
-	return getSwissCovidLocationData().reminderDelayOptionsMsList.asSequence().distinct().filter { it > 0 }.sorted()
-		.map { ReminderOption(it) }.take(4).toList()
 }
 
diff --git a/app/src/main/res/values/app_styles.xml b/app/src/main/res/values/app_styles.xml
index dea786d64..1ffb6f391 100644
--- a/app/src/main/res/values/app_styles.xml
+++ b/app/src/main/res/values/app_styles.xml
@@ -32,6 +32,8 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:textAllCaps">false</item>
+		<item name="android:paddingEnd">0dp</item>
+		<item name="android:paddingStart">0dp</item>
 		<item name="android:backgroundTint">@drawable/reminder_toggle_background_color</item>
 		<item name="strokeColor">@drawable/reminder_toggle_text_color</item>
 		<item name="android:textColor">@drawable/reminder_toggle_text_color</item>

From 54f8b2ef54408552bf8ac5fe8e9820e9bda497fc Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 10:29:05 +0200
Subject: [PATCH 124/207] Implemented minimum exposure overlap of 15 min

---
 app/build.gradle                                            | 2 --
 .../ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java   | 3 ++-
 .../bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java | 6 ++----
 .../bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java    | 1 -
 .../dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java | 4 +++-
 common/build.gradle                                         | 2 +-
 instant/build.gradle                                        | 2 --
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 68039f576..7b6241f38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -178,8 +178,6 @@ dependencies {
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-13'
-
 	implementation 'androidx.appcompat:appcompat:1.2.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 	implementation 'androidx.fragment:fragment-ktx:1.3.3'
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index eeccb4f1f..2fc8a1247 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -35,6 +35,7 @@
 public class CrowdNotifierViewModel extends AndroidViewModel {
 
 	private static final long MAX_DURATION_WITHOUT_SUCCESSFUL_DOWNLOAD = 24 * 60 * 60 * 1000L;
+	private static final long MIN_EXPOSURE_OVERLAP = 15 * 1000L * 60;
 
 	private final MutableLiveData<List<ExposureEvent>> exposures = new MutableLiveData<>();
 	private final MutableLiveData<Long> timeSinceCheckIn = new MutableLiveData<>(0L);
@@ -129,7 +130,7 @@ public void refreshTraceKeys() {
 				traceKeyLoadingState.setValue(LoadingState.FAILURE);
 			} else {
 				SecureStorage.getInstance(getApplication()).setLastSuccessfulCheckinDownload(System.currentTimeMillis());
-				CrowdNotifier.checkForMatches(traceKeys, getApplication());
+				CrowdNotifier.checkForMatches(traceKeys, MIN_EXPOSURE_OVERLAP,getApplication());
 				refreshExposures();
 				traceKeyLoadingState.setValue(LoadingState.SUCCESS);
 			}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 662673d47..39ca57805 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -1,11 +1,9 @@
 package ch.admin.bag.dp3t.checkin.checkinflow;
 
 import android.Manifest;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -187,11 +185,11 @@ public synchronized void onQRCodeFound(String qrCodeData) {
 			showCheckInFragment();
 			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.VALID));
 		} catch (QrUtils.QRException e) {
-			handleInvalidQRCodeExceptions(qrCodeData, e);
+			handleInvalidQRCodeExceptions(e);
 		}
 	}
 
-	private void handleInvalidQRCodeExceptions(String qrCodeData, QrUtils.QRException e) {
+	private void handleInvalidQRCodeExceptions(QrUtils.QRException e) {
 		if (e instanceof QrUtils.InvalidQRCodeVersionException) {
 			if (getActivity() != null) getActivity().runOnUiThread(() -> {
 				isQRScanningEnabled = false;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index 8fcb9a6e3..0f41767e5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -18,7 +18,6 @@
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader;
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem;
 import ch.admin.bag.dp3t.extensions.CommonVenueInfoExtensionsKt;
-import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 public class DiaryRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
index 6cfb77a75..34767bfc1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
@@ -28,6 +28,7 @@ public class CrowdNotifierKeyLoadWorker extends Worker {
 	private static final String WORK_TAG = "ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker";
 	private static final int DAYS_TO_KEEP_VENUE_VISITS = 14;
 	private static final int REPEAT_INTERVAL_MINUTES = 120;
+	private static final long MIN_EXPOSURE_OVERLAP = 15 * 1000L * 60;
 	private static final String LOG_TAG = "KeyLoadWorker";
 
 	public static void startKeyLoadWorker(Context context) {
@@ -59,7 +60,8 @@ public Result doWork() {
 			LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(new Intent(ACTION_NEW_TRACE_KEY_SYNC));
 			return Result.retry();
 		}
-		List<ExposureEvent> exposures = CrowdNotifier.checkForMatches(problematicEventInfos, getApplicationContext());
+		List<ExposureEvent> exposures =
+				CrowdNotifier.checkForMatches(problematicEventInfos, MIN_EXPOSURE_OVERLAP, getApplicationContext());
 		if (!exposures.isEmpty()) {
 			showExposureNotification();
 		}
diff --git a/common/build.gradle b/common/build.gradle
index 740c7df98..269feaf6f 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-10'
+	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-14'
 	api 'com.google.android.gms:play-services-instantapps:17.0.0'
 
 }
\ No newline at end of file
diff --git a/instant/build.gradle b/instant/build.gradle
index cbb1b73e7..b7abc581d 100644
--- a/instant/build.gradle
+++ b/instant/build.gradle
@@ -68,6 +68,4 @@ dependencies {
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-	implementation 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-10'
-
 }
\ No newline at end of file

From 8e21d368c531ef4f6627ef784dfd05b847066927 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 10:46:25 +0200
Subject: [PATCH 125/207] Update strings

---
 common/src/main/res/values-bs/strings.xml | 397 +++++++++++----------
 common/src/main/res/values-de/strings.xml |  11 +-
 common/src/main/res/values-es/strings.xml |  15 +-
 common/src/main/res/values-fr/strings.xml |  15 +-
 common/src/main/res/values-hr/strings.xml | 395 +++++++++++----------
 common/src/main/res/values-it/strings.xml |  13 +-
 common/src/main/res/values-pt/strings.xml | 382 ++++++++++-----------
 common/src/main/res/values-rm/strings.xml |  13 +-
 common/src/main/res/values-sq/strings.xml | 395 +++++++++++----------
 common/src/main/res/values-sr/strings.xml | 395 +++++++++++----------
 common/src/main/res/values-ti/strings.xml | 397 +++++++++++----------
 common/src/main/res/values-tr/strings.xml | 401 +++++++++++-----------
 common/src/main/res/values/strings.xml    |  15 +-
 13 files changed, 1361 insertions(+), 1483 deletions(-)

diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index e615aac2b..6d709a2ab 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -194,7 +194,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="inform_detail_box_subtitle">"Sa Covid šifrom..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Zaustavljanje lanca širenja infekcije"</string>
+    <string name="inform_detail_box_title">"Upozorenje u slučaju moguće infekcije"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Unos Covid šifre"</string>
@@ -228,7 +228,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="tracing_turned_off_title">"Praćenje je deaktivirano"</string>
     <string name="tracing_turned_off_text">"Aktivirajte praćenje da bi aplikacija radila."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth isključen"</string>
-    <string name="bluetooth_turned_off_text">"Uključite Bluetooth na vašem uređaju da bi praćenje radilo."</string>
+    <string name="bluetooth_turned_off_text">"Uključite Bluetooth na vašem uređaju, kako bi funkcionisalo anonomno praćenje."</string>
     <string name="bluetooth_turn_on_button_title">"Uključi Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Korišćenje Bluetooth-a odbijeno"</string>
     <string name="bluetooth_permission_error_text">"Dozvolite korišćenje Bluetooth-a da bi praćenje radilo."</string>
@@ -260,8 +260,8 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Sledite uputstva za izolaciju koja ste dobili"</string>
-    <string name="tracing_ended_title">"Praćenje završeno"</string>
-    <string name="tracing_ended_text">"Dalji kontakti se više ne čuvaju."</string>
+    <string name="tracing_ended_title">"Deaktivirani kontakti i prijave "</string>
+    <string name="tracing_ended_text">"Dalji kontakti se više ne čuvaju"</string>
     <string name="exposed_info_contact_hotline">"Obratite se"</string>
     <string name="meldung_homescreen_positive_info_line1">"Sledite"</string>
     <string name="meldung_homescreen_positive_info_line2">"Uputstva za samoizolaciju"</string>
@@ -274,7 +274,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="meldung_homescreen_positiv_title">"Testiran pozitivno"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Postoji mogućnost infekcije."</string>
+    <string name="meldung_detail_exposed_subtitle">"Postoji mogućnost infekcije"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Testirani ste pozitivno na virus korona."</string>
@@ -331,7 +331,7 @@ ispred virusa"</string>
     <string name="onboarding_prinzip_text1">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"Aplikacija vas obaveštava ako postoji sumnja na to da ste zaraženi virusom korona."</string>
+    <string name="onboarding_prinzip_text2">"Aplikacija vas obaveštava ako postoji sumnja na to da ste zaraženi virusom korone."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -346,7 +346,7 @@ ispred virusa"</string>
     <string name="onboarding_privacy_text2">"Sačuvani nasumični ID-ovi se čuvaju na vašem mobilnom telefonu i brišu se nakon 14 dana."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Kako funkcioniše aplikacija?"</string>
+    <string name="onboarding_begegnungen_heading">"Kontakti"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Prepoznavanje kontakta
@@ -422,7 +422,7 @@ Pridržavajte se dobijenih uputstava o izolaciji."</string>
     <string name="onboarding_go_title">"Aplikacija je spremna"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Hvala vam što pomažete u prekidanju lanca širenja infekcije."</string>
+    <string name="onboarding_go_text">"Hvala vam što pomažete u suzbijanju širenja virusa korone."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Pokreni"</string>
@@ -449,7 +449,7 @@ Pridržavajte se dobijenih uputstava o izolaciji."</string>
     <string name="meldung_detail_new_contact_title">"Moguća infekcija"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Postoji sumnja na moguću infekciju."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Postoji sumnja da ste se inficirali."</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Vremenska greška"</string>
@@ -585,7 +585,7 @@ Time se potrošnja baterije samo neznatno povećava."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Šta su poruke?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"Aplikacija redovno proverava da li su drugi korisnici sa kojima ste bili u kontaktu prijavili pozitivan test.
+    <string name="meldungen_nomeldungen_faq1_text">"Aplikacija redovno proverava da li su drugi korisnici, sa kojima ste bili u kontaktu, prijavili pozitivan test.
 
 U slučaju moguće infekcije, dobićete obaveštenje na zaključanom ekranu."</string>
 
@@ -626,7 +626,7 @@ Time se obezbeđuje da samo potvrđeni slučajevi budu prijavljeni preko aplikac
     <string name="inform_detail_faq2_title">"Šta se šalje?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Šalju se samo privatni identifikacioni ključevi iz vaše aplikacije, a ne šalju se lični podaci.
+    <string name="inform_detail_faq2_text">"Šalju se samo privatni ključevi iz vaše aplikacije i šifrovani ID podaci vaših prijava, a ne šalju se lični podaci.
 
 Time drugi korisnici aplikacije SwissCovid mogu da saznaju da postoji mogućnost infekcije."</string>
 
@@ -637,7 +637,7 @@ Time drugi korisnici aplikacije SwissCovid mogu da saznaju da postoji mogućnost
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Važna napomena"</string>
+    <string name="inform_code_intro_title">"Informacije za korišćenje "</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Iako se lični podaci koji se odnose na vas ne šalju, možda se neko seća svog kontakta sa vama na osnovu datuma."</string>
@@ -711,8 +711,7 @@ Osim toga, mogući su sledeći simptomi:
     <string name="onboarding_gaen_title">"Aktiviraj praćenje"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Da biste mogli da koristite aplikaciju, morate da aktivirate obavijesti o izloženosti bolesti COVID-19."</string>
+    <string name="onboarding_gaen_text_ios">"Za identifikaciju kontakata, mora biti aktivirana funkcija praćenja."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Aktiviraj"</string>
@@ -741,10 +740,10 @@ Osim toga, mogući su sledeći simptomi:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Da li želite da završite fazu izolacije?"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Da li ste sigurni da želite da obrišete poruku?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignoriši optimizaciju baterije"</string>
-    <string name="android_onboarding_battery_permission_text">"Da biste uvek mogli da prepoznate kontakte, optimizacija baterije za ovu aplikaciju mora biti isključena."</string>
+    <string name="android_onboarding_battery_permission_text">"Kako bi aplikacija funkcionisala, optimizacija baterije mora biti isključena."</string>
     <string name="android_onboarding_battery_permission_button">"Dozvoli"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Samo za ovu aplikaciju"</string>
@@ -767,8 +766,7 @@ Osim toga, mogući su sledeći simptomi:
     <string name="tracing_permission_error_title_ios">"COVID-19: obavještenja deaktivirano"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Aktivirajte Obavijesti o izloženosti bolesti COVID-19 da bi praćenje radilo."</string>
+    <string name="tracing_permission_error_text_ios">"Aktivirajte funkciju  {TRACING_SETTING_TEXT}, kako bi  funkcionisalo anonimno praćenje."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Slanje poruke nije uspelo. Dozvolite deljenje nasumičnog ID-a sa aplikacijom SwissCovid."</string>
@@ -810,9 +808,8 @@ Ako trenutno na uređaju nije dostupno ažuriranje, probajte kasnije ponovo."</s
     <string name="tracing_active_tracking_always_info">"Aplikacija SwissCovid ostaje aktivna čak i kad se zatvori."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-prekida lanac 
-širenja infekcije."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid - brze informacije u slučaju rizika od zaraze. 
+"</string>
     <string name="inform_detail_faq3_text">"Iako se lični podaci koji se odnose na vas ne šalju, možda se neko seća svog kontakta sa vama na osnovu datuma."</string>
     <string name="inform_detail_faq3_title">"Da li ostajem anoniman?"</string>
 
@@ -823,7 +820,7 @@ prekida lanac
     <string name="tracing_setting_text_android">"Obavijesti o izloženosti bolesti COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Da biste mogli da koristite aplikaciju, morate da aktivirate obavijesti o izloženosti bolesti COVID-19."</string>
+    <string name="onboarding_gaen_text_android">"Za identifikaciju kontakata, mora biti aktivirana funkcija praćenja."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -916,7 +913,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Putovanja"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid funkcijoniše u sledećim državama:"</string>
+    <string name="travel_home_description">"SwissCovid-kontakti funkcionišu u sledećim državama:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Šta to znači?"</string>
@@ -946,12 +943,6 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1233,9 +1224,9 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="delete_infection_dialog_finish_button">"Beenden (završi)"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Kontakti više neće da se čuvaju.
+    <string name="tracing_ended_info">"Kontakti se više neće čuvati i nove prijave nisu više moguće.
 
-Praćenje može ponovo da se aktivira po završetku izolacije."</string>
+Ove dve funkcije mogu se ponovo aktivirati po završetku izolacije."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1267,7 +1258,7 @@ Praćenje može ponovo da se aktivira po završetku izolacije."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Da li ste bez sluha ili imate smetnju sluha i ne možete nazvati Infoline Coronavirus?
+    <string name="hearing_impaired_info">"Da li ste bez sluha ili imate oštećenje sluha i ne možete nazvati?
 
 Onda pošaljite e-mail na covid-support@medgate.ch"</string>
 
@@ -1322,8 +1313,8 @@ Vreme je odlučujući faktor u suzbijanju Corona virusa: što je vreme između p
     <string name="stats_cases_current_description">"Grafika pokazuje prijavljene nove infekcije poslednjih 28 dana. Time imate pregled o aktuelnom razvoju."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"Pozitivno ste testirani (PCR test ili antigen brzi test) i ni posle 4 sata niste dobili kovid šifru?
-U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
+    <string name="inform_detail_infobox1_text">"Pozitivno ste testirani (PCR test ili brzi antigen test) i ni posle 4 sata niste dobili Covid kod?
+U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Još niste dobili Covid šifru?"</string>
@@ -1362,13 +1353,13 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Ko se obaveštava"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Obaveštavaju se svi kontakti u periodu vaše faze zaražavanja od {ONSET_DATE} do unosa kovid šifre, ukoliko je na osnovu distance i trajanja postojala mogućnost zaraze."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Obaveštavaju se svi kontakti u periodu vaše faze infekcioznosti od {ONSET_DATE} do unosa Covid koda, ukoliko je na osnovu distance i trajanja ili zbog prijave na istoj lokaciji postojala mogućnost zaraze."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – danas"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Na taj način pomažete u zaustavljanju lanca zaraze."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Na taj način pomažete da se upozore drugi o mogućosti zaraze."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Privatni ključevi vaše aplikacije poslati su za sledeći period:"</string>
@@ -1407,363 +1398,359 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Želite li da se odjavite?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Automatska odjava"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"Automatski ste odjavljeni."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Skenirati QR kod i prijaviti se"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"Nevažeći QR kod!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"Od"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"Do"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Dodati zabelešku"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"npr. S kim ste bili tamo?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Gotovo"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Isključeno"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours">"{HOURS} h"</string>
+    <string name="reminder_option_hours">"časovi {HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+    <string name="reminder_option_minutes">"minute {MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"Aplikaciji je potreban pristup kameri, da bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Moje prijave"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title">"Check-in"</string>
+    <string name="checkin_button_title">"Prijava"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"Kamera je potrebna, kako bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Dozvolite identifikaciju lica, da biste mogli bezbedno pristupiti vašem dnevniku."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"Identifikujte se za pristup dnevniku"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Odjava "</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-in"</string>
+    <string name="module_checkins_title">"Prijava"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <string name="checkin_title">"Prijava"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Napraviti QR kod"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Ponuditi prijave?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Sada se prijaviti"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"Podsećanje nije uspelo da se unese"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Da biste dobijali podsetnike za odjavu, morate da dozvolite \ \"Obaveštenja \\" u podešavanjima aplikacije."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Prilagoditi"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Urediti"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Još nema unosa"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Ako skenirate SwissCovid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid-u treba pristup kameri na vašem aparatu. Kamera se koristi, kako bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Dozvoliti pristup kameri"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"npr. soba ili naziv događaja"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
-    <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="show_pdf_button">"Odštampati PDF"</string>
+    <string name="bottom_nav_tab_info">"Informacija"</string>
+    <string name="error_network_title">"Mrežna greška"</string>
+    <string name="error_network_text">"Proverite vašu vezu sa internetom "</string>
+    <string name="error_action_retry">"Pokušajte ponovo"</string>
+    <string name="error_notification_deactivated_title">"Deaktivirati obaveštenja"</string>
+    <string name="error_notification_deactivated_text">"Promenite podešavanja, kako biste bili direktno bili obavešteni o prijavi."</string>
+    <string name="error_action_change_settings">"Promenite podešavanja"</string>
+    <string name="error_camera_permission_title">"Nema pristupa kameri"</string>
+    <string name="error_camera_permission_text">"Aplikaciji je potreban pristup kameri, kako bi se mogao skenirati QR kod."</string>
+    <string name="error_title">"Greška"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR kod je još nevažeći"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR kod je nevažeći "</string>
+    <string name="error_already_checked_in">"Upravo ste prijavljeni."</string>
+    <string name="error_update_text">"Ovaj QR kod nije kompatibilan sa instaliranom verzijom aplikacije. Ažurirajte aplikaciju, da biste nastavili korišćenje."</string>
+    <string name="error_update_title">"Potrebno ažuriranje"</string>
+    <string name="error_action_update">"Sada ažurirati"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Odjava "</string>
+    <string name="reminder_notification_snooze_action">"Snooze mirovanje"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Poruka o trajnom prijavljivanju"</string>
+    <string name="ongoing_notification_title">"Prijavljeni ste {TIME} časova."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Osigurati"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Skenirati QR kod"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Deaktivirano prijavljivanje"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Trenutno nije moguća prijava"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Ako skenirate Swiss-Covid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Prijavljeni ste"</string>
+    <string name="checkout_from_to_date">"{DATE1} do {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Više o Covid kodu"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Ukloniti unos"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Izbrisati"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Podeliti"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Štampati"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Deliti unose o prijavama"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Kada delite unose prijave, aplikacija može istovremeno da obavesti lica, koja su se prijavila na istoj lokaciji."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Izabrati sve"</string>
+    <string name="inform_dont_send_button_title">"Ne slati"</string>
+    <string name="inform_dont_share_button_title">"Ne deliti"</string>
+    <string name="inform_really_not_share_title">"Zaista ne deliti?"</string>
+    <string name="inform_really_not_share_subtitle">"Deljenje privatnog ključa pomaže «SvissCovid» da obavesti druge potencijalno zaražene ljude i spreči dalje širenje virusa. Ako ne delite privatne ključeve, potencijalno zaražene osobe neće biti obaveštene."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Ukloniti unos"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"Vaš unos će biti neopozivo uklonjen sa liste."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Ukoniti u potpunosti"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Samo sakriti i nastaviti da budete obaveštavani?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Test pozitivan?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Kontakte i prijave ponovo aktivirati. "</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"časovi {HOURS} h minute {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Ne možete ponovo da se prijavite ako imate pozitivan test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Napravite QR kod, pomoću kojeg lica mogu da se prijave na lokaciji."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? "</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Samostalno prijavljivanje"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na lokaciji."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Nije moguće obezbeđenje"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Odabrana vremena se preklapaju sa ostalim prijavama iz vašeg dnevnika. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Vaši odabrani unosi za prijavu su poslati. Biće obaveštena sva lica koja su se istovremeno prijavili na istom mestu."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"SwissCovid prijava
+
+"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Prijaviti se bez ostavljanja podataka"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"Pomoći aplikacije SwissCovid možete jednostavno da se prijavite kod nas ne ostavljajući svoje podatke. U slučaju rizične situacije, brzo ćete biti obavešteni u aplikaciji."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"SwissCovid aplikacija"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Sada preuzeti"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Prijaviti se bez ostavljanja podataka"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Ovde unesite svoj Covid kod, kako biste upozorili druge."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"Kraj izolacije?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Želite da ponudite prijave?"</string>
+    <string name="checkin_footer_title1">"Čemu služi funkcija prijave?"</string>
+    <string name="checkin_footer_subtitle1">"Funkcija prijave bez unošenja podataka o kontaktima povećava funkcije aplikacije SwissCovid. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istom mestu."</string>
+    <string name="checkin_footer_title2">"Nema centralnog čuvanja podataka"</string>
+    <string name="checkin_footer_subtitle2">"Za SwissCovid prijave ne treba unositi lične podatke kao što su ime, adresa ili telefonski broj i ne beleže se GPS podaci o lokaciji. Spisak prijava čuva se lokalno na vašem mobilnom telefonu. Lokalni podaci će se izbrisati nakon 14 dana."</string>
+    <string name="events_empty_state_title">"Napravite QR kod"</string>
+    <string name="events_empty_state_subtitle">"Sa SwissCovid-QR kodom mogu se na licu mjesta prijaviti lica, a da ne ostavljaju svoje podatke.  "</string>
+    <string name="events_info_box_title">"To nije zamena za obavezni unos kontakt podataka"</string>
+    <string name="events_info_box_text">"SwissCovid prijave nisu zamena za obavezu evidenciju kontakt podataka utvrđenu u „Pravilniku Covid 19 za posebne situacije“."</string>
+    <string name="events_footer_title1">"Gde se mogu koristiti prijave?"</string>
+    <string name="events_footer_title2">"Zašto služi funkcija prijave?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid prijave se mogu koristiti tamo gde se ljudi sastaju, ali ne postoji obaveza beleženja podataka o kontaktima.                                                                 Moguće lokacije:
+- Privatni događaji
+- Događaji u klubovima
+- Sastanci u profesionalnom okruženju kao što su sale za sastanke, kancelarije, menze itd. \""</string>
+    <string name="events_footer_subtitle2">"Funkcija prijave bez unošenja podataka o kontaktima proširuje funkcije aplikacije. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istoj lokaciji."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Rizična situacija"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Kontakti"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Prijava"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Šta treba da uradima?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Pozitivna prijava"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Pozitivne prijave / kontakti"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"QR kod korisnika"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"QR kod za praćenje kontakata"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Ako je rezultat testa pozitivan, funkcija prijave se automatski deaktivira. Može se ponovo aktivirati nakon završetka izolacije."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Dodelite naziv, koji detaljnije opisuje lokaciju ili vaš događaj.                                            Ovaj naziv će biti prikazan prilikom prijave."</string>
+    <string name="checkin_report_heading">"Šta možete da uradite?"</string>
+    <string name="checkin_report_title1">"Zaštititi kontakte"</string>
+    <string name="checkin_report_title2">"Obratiti pažnju na simptome"</string>
+    <string name="checkin_report_title3">"Vršiti testiranje"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Proveravajte svoje zdravsveno stanje."</string>
+    <string name="checkin_report_subtitle3">"Odmah se testirajte ako imate simptome. Čak i ako nema simptoma, test korone je važan i  preporučuje se."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="meldung_detail_checkin_title">"Prijava"</string>
+    <string name="not_thank_you_screen_title">"Podaci nisu poslati"</string>
+    <string name="not_thank_you_screen_text1">"Nisu poslati privatni ključevi."</string>
+    <string name="not_thank_you_screen_back_button">"Nazad"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Ne slati nikakve podatke"</string>
+    <string name="not_thank_you_screen_text2">"Nisu poslati unosi za prijavu."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
-    <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="inform_share_checkins_send_button_title">"Deliti izbor"</string>
+    <string name="inform_share_checkins_not_send_button">"Ne deliti"</string>
+    <string name="onboarding_checkin_title">"Prijaviti se bez unošenja podataka"</string>
+    <string name="onboarding_checkin_heading">"Prijave"</string>
+    <string name="onboarding_checkin_text1">"Sa SwissCovid prijavama možete da koristite aplikaciju za prijavu na nekoj lokaciji ili prilikom sastanka."</string>
+    <string name="onboarding_checkin_text2">"Vaše prisustvo se memoriše samo u aplikaciji. Ne morate da ostavljate lične podatke u aplikaciji."</string>
+    <string name="checkin_updateboarding_text">"Sa SwissCovid prijavama možete da koristite aplikaciju za prijavu na nekoj lokaciji ili prilikom sastanka. Vaše prisustvo se memoriše samo u aplikaciji. Ne morate da ostavljate lične podatke u aplikaciji. U ove svrhe ažurirani su uslovi korišćenja i izjava o zaštiti podataka."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Preskočiti"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"Šifrovani unos čuva se u pozadini aplikacije 14 dana. U slučaju moguće infekcije, i dalje možete biti obavešteni."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Sada sakriti"</string>
+    <string name="checkin_set_reminder_explanation">"Aplikacija vas može podsetiti da se odjavite u pravo vreme."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"Ili potpuno ukloniti?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"Unos je potpuno uklonjen. Više ne možete biti upozoreni."</string>
+    <string name="not_thank_you_screen_text3">"Niko neće biti obavešten."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"Šta treba da znam o testiranju?"</string>
+    <string name="instant_app_install_action">"Instalirati aplikaciju i prijavite se"</string>
+    <string name="partial_onboarding_box_text">"Završite konfiguraciju aplikacije, kako biste mogli da koristite funkciju praćenja."</string>
+    <string name="partial_onboarding_box_action">"Završiti sada"</string>
+    <string name="partial_onboarding_done_title">"Konfiguracija završena"</string>
+    <string name="partial_onboarding_done_text">"Hvala vam što pomažete u suzbijanju širenja virusa korone."</string>
+    <string name="web_slogan">"Brze informacije u slučaju rizika od zaraze. "</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 42e94e259..09fb2a557 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -760,7 +760,7 @@ Zudem sind folgende Symptome möglich:
     <!-- Fuzzy -->
     <string name="delete_infection_button">"Isolation beenden"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <!-- Fuzzy -->
     <string name="delete_infection_dialog">"Möchten Sie die Isolation wirklich beenden?"</string>
     <string name="android_onboarding_battery_permission_title">"Akku-Optimierung ignorieren"</string>
@@ -970,12 +970,6 @@ Damit auch Reisende aus dem Ausland gewarnt werden können, geschieht das unabh
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5">"COVID-19-Kontaktmitteilungen"</string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6">"COVID-19-Begegnungsmitteilungen"</string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <!-- Fuzzy -->
     <string name="tracing_setting_text_ios_14_0">"Begegnungsmitteilungen"</string>
@@ -1795,9 +1789,6 @@ Dieser Titel wird beim Check-in angezeigt."</string>
     <!-- Titel von CheckIn Meldungen Screen. -->
     <!-- Fuzzy -->
     <string name="meldung_detail_checkin_title">"Check-In"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
     <string name="not_thank_you_screen_title">"Keine Daten gesendet"</string>
 
     <!-- Fuzzy -->
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 66d28d707..77773d607 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -173,7 +173,7 @@ De esta forma, está ayudando a parar las cadenas de contagio."</string>
     <string name="tab_tracing_title">"Rastreo"</string>
 
     <!-- Titel auf Homescreen für Was tun Section -->
-    <string name="whattodo_title_symptoms">"Síntomas de la enfermedad"</string>
+    <string name="whattodo_title_symptoms">"tengo síntomas de la enfermedad"</string>
 
     <!-- Subtitel auf Homescreen für Was Tun Section -->
     <string name="whattodo_subtitle_symptoms">"¿Qué hacer si…"</string>
@@ -732,7 +732,7 @@ Pueden aparecer también los síntomas siguientes:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Finalizar el aislamiento."</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"¿De verdad quiere eliminar esta notificación?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignorar optimización de la batería"</string>
     <string name="android_onboarding_battery_permission_text">"La aplicación solo funciona si la optimización de la batería está desconectada."</string>
@@ -936,12 +936,6 @@ Al fin de poder alertar también a los viajeros del extranjero, esto ocurre inde
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1708,9 +1702,6 @@ Posibles utilizaciones:
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
     <string name="not_thank_you_screen_title">"No se han enviado datos"</string>
     <string name="not_thank_you_screen_text1">"No se han enviado claves privadas."</string>
     <string name="not_thank_you_screen_back_button">"Volver"</string>
@@ -1753,5 +1744,5 @@ Posibles utilizaciones:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index c3f7a79ef..057cc8715 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -740,8 +740,8 @@ Les symptômes suivants peuvent aussi apparaître :
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Terminer l'isolement"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
-    <string name="delete_infection_dialog">"Voulez-vous vraiment supprimer la notification ? "</string>
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
+    <string name="delete_infection_dialog">"Voulez-vous vraiment supprimer la notification ?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignorer l'optimisation de la batterie"</string>
     <string name="android_onboarding_battery_permission_text">"L’option d’optimisation de la batterie doit être désactivée pour que l’application fonctionne."</string>
     <string name="android_onboarding_battery_permission_button">"Autoriser"</string>
@@ -945,12 +945,6 @@ d'ouvrir un site internet."</string>
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Notifications d’exposition"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1739,9 +1733,6 @@ Appelez :"</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Connexion"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
     <string name="not_thank_you_screen_title">"Pas de données transmises"</string>
     <string name="not_thank_you_screen_text1">"Aucune clé privée n’a été transmise."</string>
     <string name="not_thank_you_screen_back_button">"Retour"</string>
@@ -1784,5 +1775,5 @@ Appelez :"</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 68c76ae3d..1fd361d7a 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -193,7 +193,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="inform_detail_box_subtitle">"Sa Covid šifrom..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Zaustavljanje lanca širenja infekcije"</string>
+    <string name="inform_detail_box_title">"Upozorenje u slučaju moguće infekcije"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Unos Covid šifre"</string>
@@ -227,7 +227,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="tracing_turned_off_title">"Praćenje je deaktivirano"</string>
     <string name="tracing_turned_off_text">"Aktivirajte praćenje da bi aplikacija radila."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth isključen"</string>
-    <string name="bluetooth_turned_off_text">"Uključite Bluetooth na vašem uređaju da bi praćenje radilo."</string>
+    <string name="bluetooth_turned_off_text">"Uključite Bluetooth na vašem uređaju, kako bi funkcionisalo anonomno praćenje."</string>
     <string name="bluetooth_turn_on_button_title">"Uključi Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Korišćenje Bluetooth-a odbijeno"</string>
     <string name="bluetooth_permission_error_text">"Dozvolite korišćenje Bluetooth-a da bi praćenje radilo."</string>
@@ -259,8 +259,8 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Sledite uputstva za izolaciju koja ste dobili"</string>
-    <string name="tracing_ended_title">"Praćenje završeno"</string>
-    <string name="tracing_ended_text">"Dalji kontakti se više ne čuvaju."</string>
+    <string name="tracing_ended_title">"Deaktivirani kontakti i prijave "</string>
+    <string name="tracing_ended_text">"Dalji kontakti se više ne čuvaju"</string>
     <string name="exposed_info_contact_hotline">"Obratite se"</string>
     <string name="meldung_homescreen_positive_info_line1">"Sledite"</string>
     <string name="meldung_homescreen_positive_info_line2">"Uputstva za samoizolaciju"</string>
@@ -273,7 +273,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="meldung_homescreen_positiv_title">"Testiran pozitivno"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Postoji mogućnost infekcije."</string>
+    <string name="meldung_detail_exposed_subtitle">"Postoji mogućnost infekcije"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Testirani ste pozitivno na virus korona."</string>
@@ -330,7 +330,7 @@ ispred virusa"</string>
     <string name="onboarding_prinzip_text1">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"Aplikacija vas obaveštava ako postoji sumnja na to da ste zaraženi virusom korona."</string>
+    <string name="onboarding_prinzip_text2">"Aplikacija vas obaveštava ako postoji sumnja na to da ste zaraženi virusom korone."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -345,7 +345,7 @@ ispred virusa"</string>
     <string name="onboarding_privacy_text2">"Sačuvani nasumični ID-ovi se čuvaju na vašem mobilnom telefonu i brišu se nakon 14 dana."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Kako funkcioniše aplikacija?"</string>
+    <string name="onboarding_begegnungen_heading">"Kontakti"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Prepoznavanje kontakta
@@ -421,7 +421,7 @@ Pridržavajte se dobijenih uputstava o izolaciji."</string>
     <string name="onboarding_go_title">"Aplikacija je spremna"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Hvala vam što pomažete u prekidanju lanca širenja infekcije."</string>
+    <string name="onboarding_go_text">"Hvala vam što pomažete u suzbijanju širenja virusa korone."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Pokreni"</string>
@@ -448,7 +448,7 @@ Pridržavajte se dobijenih uputstava o izolaciji."</string>
     <string name="meldung_detail_new_contact_title">"Moguća infekcija"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Postoji sumnja na moguću infekciju."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Postoji sumnja da ste se inficirali."</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Vremenska greška"</string>
@@ -584,7 +584,7 @@ Time se potrošnja baterije samo neznatno povećava."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Šta su poruke?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"Aplikacija redovno proverava da li su drugi korisnici sa kojima ste bili u kontaktu prijavili pozitivan test.
+    <string name="meldungen_nomeldungen_faq1_text">"Aplikacija redovno proverava da li su drugi korisnici, sa kojima ste bili u kontaktu, prijavili pozitivan test.
 
 U slučaju moguće infekcije, dobićete obaveštenje na zaključanom ekranu."</string>
 
@@ -625,7 +625,7 @@ Time se obezbeđuje da samo potvrđeni slučajevi budu prijavljeni preko aplikac
     <string name="inform_detail_faq2_title">"Šta se šalje?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Šalju se samo privatni identifikacioni ključevi iz vaše aplikacije, a ne šalju se lični podaci.
+    <string name="inform_detail_faq2_text">"Šalju se samo privatni ključevi iz vaše aplikacije i šifrovani ID podaci vaših prijava, a ne šalju se lični podaci.
 
 Time drugi korisnici aplikacije SwissCovid mogu da saznaju da postoji mogućnost infekcije."</string>
 
@@ -636,7 +636,7 @@ Time drugi korisnici aplikacije SwissCovid mogu da saznaju da postoji mogućnost
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Važna napomena"</string>
+    <string name="inform_code_intro_title">"Informacije za korišćenje "</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Iako se lični podaci koji se odnose na vas ne šalju, možda se neko seća svog kontakta sa vama na osnovu datuma."</string>
@@ -710,7 +710,7 @@ Osim toga, mogući su sledeći simptomi:
     <string name="onboarding_gaen_title">"Aktiviraj praćenje"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <string name="onboarding_gaen_text_ios">"Da biste mogli da koristite aplikaciju, morate da aktivirate obavijesti o izloženosti bolesti COVID-19."</string>
+    <string name="onboarding_gaen_text_ios">"Za identifikaciju kontakata, mora biti aktivirana funkcija praćenja."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Aktiviraj"</string>
@@ -739,10 +739,10 @@ Osim toga, mogući su sledeći simptomi:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Da li želite da završite fazu izolacije?"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Da li ste sigurni da želite da obrišete poruku?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignoriši optimizaciju baterije"</string>
-    <string name="android_onboarding_battery_permission_text">"Da biste uvek mogli da prepoznate kontakte, optimizacija baterije za ovu aplikaciju mora biti isključena."</string>
+    <string name="android_onboarding_battery_permission_text">"Kako bi aplikacija funkcionisala, optimizacija baterije mora biti isključena."</string>
     <string name="android_onboarding_battery_permission_button">"Dozvoli"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Samo za ovu aplikaciju"</string>
@@ -764,7 +764,7 @@ Osim toga, mogući su sledeći simptomi:
     <string name="tracing_permission_error_title_ios">"COVID-19: obavještenja deaktivirano"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <string name="tracing_permission_error_text_ios">"Aktivirajte Obavijesti o izloženosti bolesti COVID-19 da bi praćenje radilo."</string>
+    <string name="tracing_permission_error_text_ios">"Aktivirajte funkciju  {TRACING_SETTING_TEXT}, kako bi  funkcionisalo anonimno praćenje."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Slanje poruke nije uspelo. Dozvolite deljenje nasumičnog ID-a sa aplikacijom SwissCovid."</string>
@@ -806,9 +806,8 @@ Ako trenutno na uređaju nije dostupno ažuriranje, probajte kasnije ponovo."</s
     <string name="tracing_active_tracking_always_info">"Aplikacija SwissCovid ostaje aktivna čak i kad se zatvori."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-prekida lanac 
-širenja infekcije."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid - brze informacije u slučaju rizika od zaraze. 
+"</string>
     <string name="inform_detail_faq3_text">"Iako se lični podaci koji se odnose na vas ne šalju, možda se neko seća svog kontakta sa vama na osnovu datuma."</string>
     <string name="inform_detail_faq3_title">"Da li ostajem anoniman?"</string>
 
@@ -819,7 +818,7 @@ prekida lanac
     <string name="tracing_setting_text_android">"Obavijesti o izloženosti bolesti COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Da biste mogli da koristite aplikaciju, morate da aktivirate obavijesti o izloženosti bolesti COVID-19."</string>
+    <string name="onboarding_gaen_text_android">"Za identifikaciju kontakata, mora biti aktivirana funkcija praćenja."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -912,7 +911,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Putovanja"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid funkcijoniše u sledećim državama:"</string>
+    <string name="travel_home_description">"SwissCovid-kontakti funkcionišu u sledećim državama:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Šta to znači?"</string>
@@ -942,12 +941,6 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1229,9 +1222,9 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="delete_infection_dialog_finish_button">"Beenden (završi)"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Kontakti više neće da se čuvaju.
+    <string name="tracing_ended_info">"Kontakti se više neće čuvati i nove prijave nisu više moguće.
 
-Praćenje može ponovo da se aktivira po završetku izolacije."</string>
+Ove dve funkcije mogu se ponovo aktivirati po završetku izolacije."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1263,7 +1256,7 @@ Praćenje može ponovo da se aktivira po završetku izolacije."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Da li ste bez sluha ili imate smetnju sluha i ne možete nazvati Infoline Coronavirus?
+    <string name="hearing_impaired_info">"Da li ste bez sluha ili imate oštećenje sluha i ne možete nazvati?
 
 Onda pošaljite e-mail na covid-support@medgate.ch"</string>
 
@@ -1318,8 +1311,8 @@ Vreme je odlučujući faktor u suzbijanju Corona virusa: što je vreme između p
     <string name="stats_cases_current_description">"Grafika pokazuje prijavljene nove infekcije poslednjih 28 dana. Time imate pregled o aktuelnom razvoju."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"Pozitivno ste testirani (PCR test ili antigen brzi test) i ni posle 4 sata niste dobili kovid šifru?
-U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
+    <string name="inform_detail_infobox1_text">"Pozitivno ste testirani (PCR test ili brzi antigen test) i ni posle 4 sata niste dobili Covid kod?
+U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Još niste dobili Covid šifru?"</string>
@@ -1358,13 +1351,13 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Ko se obaveštava"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Obaveštavaju se svi kontakti u periodu vaše faze zaražavanja od {ONSET_DATE} do unosa kovid šifre, ukoliko je na osnovu distance i trajanja postojala mogućnost zaraze."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Obaveštavaju se svi kontakti u periodu vaše faze infekcioznosti od {ONSET_DATE} do unosa Covid koda, ukoliko je na osnovu distance i trajanja ili zbog prijave na istoj lokaciji postojala mogućnost zaraze."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – danas"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Na taj način pomažete u zaustavljanju lanca zaraze."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Na taj način pomažete da se upozore drugi o mogućosti zaraze."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Privatni ključevi vaše aplikacije poslati su za sledeći period:"</string>
@@ -1403,363 +1396,359 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Želite li da se odjavite?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Automatska odjava"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"Automatski ste odjavljeni."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Skenirati QR kod i prijaviti se"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"Nevažeći QR kod!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"Od"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"Do"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Dodati zabelešku"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"npr. S kim ste bili tamo?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Gotovo"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Isključeno"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours">"{HOURS} h"</string>
+    <string name="reminder_option_hours">"časovi {HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+    <string name="reminder_option_minutes">"minute {MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"Aplikaciji je potreban pristup kameri, da bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Moje prijave"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title">"Check-in"</string>
+    <string name="checkin_button_title">"Prijava"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"Kamera je potrebna, kako bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Dozvolite identifikaciju lica, da biste mogli bezbedno pristupiti vašem dnevniku."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"Identifikujte se za pristup dnevniku"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Odjava "</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-in"</string>
+    <string name="module_checkins_title">"Prijava"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <string name="checkin_title">"Prijava"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Napraviti QR kod"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Ponuditi prijave?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Sada se prijaviti"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"Podsećanje nije uspelo da se unese"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Da biste dobijali podsetnike za odjavu, morate da dozvolite \ \"Obaveštenja \\" u podešavanjima aplikacije."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Prilagoditi"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Urediti"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Još nema unosa"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Ako skenirate SwissCovid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid-u treba pristup kameri na vašem aparatu. Kamera se koristi, kako bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Dozvoliti pristup kameri"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"npr. soba ili naziv događaja"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
-    <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="show_pdf_button">"Odštampati PDF"</string>
+    <string name="bottom_nav_tab_info">"Informacija"</string>
+    <string name="error_network_title">"Mrežna greška"</string>
+    <string name="error_network_text">"Proverite vašu vezu sa internetom "</string>
+    <string name="error_action_retry">"Pokušajte ponovo"</string>
+    <string name="error_notification_deactivated_title">"Deaktivirati obaveštenja"</string>
+    <string name="error_notification_deactivated_text">"Promenite podešavanja, kako biste bili direktno bili obavešteni o prijavi."</string>
+    <string name="error_action_change_settings">"Promenite podešavanja"</string>
+    <string name="error_camera_permission_title">"Nema pristupa kameri"</string>
+    <string name="error_camera_permission_text">"Aplikaciji je potreban pristup kameri, kako bi se mogao skenirati QR kod."</string>
+    <string name="error_title">"Greška"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR kod je još nevažeći"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR kod je nevažeći "</string>
+    <string name="error_already_checked_in">"Upravo ste prijavljeni."</string>
+    <string name="error_update_text">"Ovaj QR kod nije kompatibilan sa instaliranom verzijom aplikacije. Ažurirajte aplikaciju, da biste nastavili korišćenje."</string>
+    <string name="error_update_title">"Potrebno ažuriranje"</string>
+    <string name="error_action_update">"Sada ažurirati"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Odjava "</string>
+    <string name="reminder_notification_snooze_action">"Snooze mirovanje"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Poruka o trajnom prijavljivanju"</string>
+    <string name="ongoing_notification_title">"Prijavljeni ste {TIME} časova."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Osigurati"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Skenirati QR kod"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Deaktivirano prijavljivanje"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Trenutno nije moguća prijava"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Ako skenirate Swiss-Covid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Prijavljeni ste"</string>
+    <string name="checkout_from_to_date">"{DATE1} do {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Više o Covid kodu"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Ukloniti unos"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Izbrisati"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Podeliti"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Štampati"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Deliti unose o prijavama"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Kada delite unose prijave, aplikacija može istovremeno da obavesti lica, koja su se prijavila na istoj lokaciji."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Izabrati sve"</string>
+    <string name="inform_dont_send_button_title">"Ne slati"</string>
+    <string name="inform_dont_share_button_title">"Ne deliti"</string>
+    <string name="inform_really_not_share_title">"Zaista ne deliti?"</string>
+    <string name="inform_really_not_share_subtitle">"Deljenje privatnog ključa pomaže «SvissCovid» da obavesti druge potencijalno zaražene ljude i spreči dalje širenje virusa. Ako ne delite privatne ključeve, potencijalno zaražene osobe neće biti obaveštene."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Ukloniti unos"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"Vaš unos će biti neopozivo uklonjen sa liste."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Ukoniti u potpunosti"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Samo sakriti i nastaviti da budete obaveštavani?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Test pozitivan?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Kontakte i prijave ponovo aktivirati. "</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"časovi {HOURS} h minute {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Ne možete ponovo da se prijavite ako imate pozitivan test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Napravite QR kod, pomoću kojeg lica mogu da se prijave na lokaciji."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? "</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Samostalno prijavljivanje"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na lokaciji."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Nije moguće obezbeđenje"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Odabrana vremena se preklapaju sa ostalim prijavama iz vašeg dnevnika. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Vaši odabrani unosi za prijavu su poslati. Biće obaveštena sva lica koja su se istovremeno prijavili na istom mestu."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"SwissCovid prijava
+
+"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Prijaviti se bez ostavljanja podataka"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"Pomoći aplikacije SwissCovid možete jednostavno da se prijavite kod nas ne ostavljajući svoje podatke. U slučaju rizične situacije, brzo ćete biti obavešteni u aplikaciji."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"SwissCovid aplikacija"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Sada preuzeti"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Prijaviti se bez ostavljanja podataka"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Ovde unesite svoj Covid kod, kako biste upozorili druge."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"Kraj izolacije?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Želite da ponudite prijave?"</string>
+    <string name="checkin_footer_title1">"Čemu služi funkcija prijave?"</string>
+    <string name="checkin_footer_subtitle1">"Funkcija prijave bez unošenja podataka o kontaktima povećava funkcije aplikacije SwissCovid. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istom mestu."</string>
+    <string name="checkin_footer_title2">"Nema centralnog čuvanja podataka"</string>
+    <string name="checkin_footer_subtitle2">"Za SwissCovid prijave ne treba unositi lične podatke kao što su ime, adresa ili telefonski broj i ne beleže se GPS podaci o lokaciji. Spisak prijava čuva se lokalno na vašem mobilnom telefonu. Lokalni podaci će se izbrisati nakon 14 dana."</string>
+    <string name="events_empty_state_title">"Napravite QR kod"</string>
+    <string name="events_empty_state_subtitle">"Sa SwissCovid-QR kodom mogu se na licu mjesta prijaviti lica, a da ne ostavljaju svoje podatke.  "</string>
+    <string name="events_info_box_title">"To nije zamena za obavezni unos kontakt podataka"</string>
+    <string name="events_info_box_text">"SwissCovid prijave nisu zamena za obavezu evidenciju kontakt podataka utvrđenu u „Pravilniku Covid 19 za posebne situacije“."</string>
+    <string name="events_footer_title1">"Gde se mogu koristiti prijave?"</string>
+    <string name="events_footer_title2">"Zašto služi funkcija prijave?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid prijave se mogu koristiti tamo gde se ljudi sastaju, ali ne postoji obaveza beleženja podataka o kontaktima.                                                                 Moguće lokacije:
+- Privatni događaji
+- Događaji u klubovima
+- Sastanci u profesionalnom okruženju kao što su sale za sastanke, kancelarije, menze itd. \""</string>
+    <string name="events_footer_subtitle2">"Funkcija prijave bez unošenja podataka o kontaktima proširuje funkcije aplikacije. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istoj lokaciji."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Rizična situacija"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Kontakti"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Prijava"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Šta treba da uradima?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Pozitivna prijava"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Pozitivne prijave / kontakti"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"QR kod korisnika"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"QR kod za praćenje kontakata"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Ako je rezultat testa pozitivan, funkcija prijave se automatski deaktivira. Može se ponovo aktivirati nakon završetka izolacije."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Dodelite naziv, koji detaljnije opisuje lokaciju ili vaš događaj.                                            Ovaj naziv će biti prikazan prilikom prijave."</string>
+    <string name="checkin_report_heading">"Šta možete da uradite?"</string>
+    <string name="checkin_report_title1">"Zaštititi kontakte"</string>
+    <string name="checkin_report_title2">"Obratiti pažnju na simptome"</string>
+    <string name="checkin_report_title3">"Vršiti testiranje"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Proveravajte svoje zdravsveno stanje."</string>
+    <string name="checkin_report_subtitle3">"Odmah se testirajte ako imate simptome. Čak i ako nema simptoma, test korone je važan i  preporučuje se."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="meldung_detail_checkin_title">"Prijava"</string>
+    <string name="not_thank_you_screen_title">"Podaci nisu poslati"</string>
+    <string name="not_thank_you_screen_text1">"Nisu poslati privatni ključevi."</string>
+    <string name="not_thank_you_screen_back_button">"Nazad"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Ne slati nikakve podatke"</string>
+    <string name="not_thank_you_screen_text2">"Nisu poslati unosi za prijavu."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
-    <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="inform_share_checkins_send_button_title">"Deliti izbor"</string>
+    <string name="inform_share_checkins_not_send_button">"Ne deliti"</string>
+    <string name="onboarding_checkin_title">"Prijaviti se bez unošenja podataka"</string>
+    <string name="onboarding_checkin_heading">"Prijave"</string>
+    <string name="onboarding_checkin_text1">"Sa SwissCovid prijavama možete da koristite aplikaciju za prijavu na nekoj lokaciji ili prilikom sastanka."</string>
+    <string name="onboarding_checkin_text2">"Vaše prisustvo se memoriše samo u aplikaciji. Ne morate da ostavljate lične podatke u aplikaciji."</string>
+    <string name="checkin_updateboarding_text">"Sa SwissCovid prijavama možete da koristite aplikaciju za prijavu na nekoj lokaciji ili prilikom sastanka. Vaše prisustvo se memoriše samo u aplikaciji. Ne morate da ostavljate lične podatke u aplikaciji. U ove svrhe ažurirani su uslovi korišćenja i izjava o zaštiti podataka."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Preskočiti"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"Šifrovani unos čuva se u pozadini aplikacije 14 dana. U slučaju moguće infekcije, i dalje možete biti obavešteni."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Sada sakriti"</string>
+    <string name="checkin_set_reminder_explanation">"Aplikacija vas može podsetiti da se odjavite u pravo vreme."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"Ili potpuno ukloniti?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"Unos je potpuno uklonjen. Više ne možete biti upozoreni."</string>
+    <string name="not_thank_you_screen_text3">"Niko neće biti obavešten."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"Šta treba da znam o testiranju?"</string>
+    <string name="instant_app_install_action">"Instalirati aplikaciju i prijavite se"</string>
+    <string name="partial_onboarding_box_text">"Završite konfiguraciju aplikacije, kako biste mogli da koristite funkciju praćenja."</string>
+    <string name="partial_onboarding_box_action">"Završiti sada"</string>
+    <string name="partial_onboarding_done_title">"Konfiguracija završena"</string>
+    <string name="partial_onboarding_done_text">"Hvala vam što pomažete u suzbijanju širenja virusa korone."</string>
+    <string name="web_slogan">"Brze informacije u slučaju rizika od zaraze. "</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 82a4ebdd0..5e6fc52bc 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -745,7 +745,7 @@ viene disattivato automaticamente. Il tracciamento può essere riattivato al ter
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Isolamento concluso"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Eliminare la segnalazione?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignora l'ottimizzazione della batteria"</string>
     <string name="android_onboarding_battery_permission_text">"Per utilizzare l'app è necessario disattivare l'ottimizzazione della batteria."</string>
@@ -950,12 +950,6 @@ Affinché anche i viaggiatori all'estero possano essere avvisati, la condivision
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Notifiche di esposizione"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1751,9 +1745,6 @@ Possibili luoghi d'impiego:
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
     <string name="not_thank_you_screen_title">"Nessun dato inviato"</string>
     <string name="not_thank_you_screen_text1">"Nessuna chiave privata inviata"</string>
     <string name="not_thank_you_screen_back_button">"Indietro"</string>
@@ -1796,5 +1787,5 @@ Possibili luoghi d'impiego:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index e2a649b86..800bfe8d2 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -104,7 +104,7 @@ Obrigado por ajudar a travar as cadeias de transmissão."</string>
     <string name="meldungen_meldung_title">"Possível contágio"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Existe a possibilidade de um contágio.
+    <string name="meldungen_meldung_text">"Existe a possibilidade de contágio.
 "</string>
 
     <!-- Titel ob Tracing aktiv -->
@@ -229,7 +229,7 @@ Obrigado por ajudar a travar as cadeias de transmissão."</string>
     <string name="tracing_turned_off_title">"Rastreamento desativado"</string>
     <string name="tracing_turned_off_text">"Ative o rastreamento para que a app funcione."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth desligado"</string>
-    <string name="bluetooth_turned_off_text">"Ligue o Bluetooth no seu dispositivo para que o rastreamento funcione."</string>
+    <string name="bluetooth_turned_off_text">"Ligue o Bluetooth no seu dispositivo para que o rastreamento anónimo funcione."</string>
     <string name="bluetooth_turn_on_button_title">"Ligar o Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Utilização de Bluetooth recusada"</string>
     <string name="bluetooth_permission_error_text">"Permita a utilização do Bluetooth para que o rastreamento funcione."</string>
@@ -262,10 +262,10 @@ Obrigado por ajudar a travar as cadeias de transmissão."</string>
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Siga as instruções que recebeu relativamente ao isolamento"</string>
     <string name="tracing_ended_title">"Rastreamento terminado"</string>
-    <string name="tracing_ended_text">"Não serão guardados mais contactos."</string>
+    <string name="tracing_ended_text">"Não serão memorizados contactos"</string>
     <string name="exposed_info_contact_hotline">"Contacte o/a"</string>
     <string name="meldung_homescreen_positive_info_line1">"Siga o/a"</string>
-    <string name="meldung_homescreen_positive_info_line2">"As instruções relativas ao auto-isolamento"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Instruções relativas ao auto-isolamento"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Nova notificação"</string>
@@ -275,7 +275,7 @@ Obrigado por ajudar a travar as cadeias de transmissão."</string>
     <string name="meldung_homescreen_positiv_title">"Teste positivo"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Existe a possibilidade de um contágio."</string>
+    <string name="meldung_detail_exposed_subtitle">"Existe a possibilidade de contágio"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Testou positivo para o coronavírus."</string>
@@ -332,7 +332,7 @@ linha informativa SwissCovid
     <string name="onboarding_prinzip_text1">"Com a app Swiss Covid, todos podem ajudar a conter a propagação do coronavírus."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"A app informa-o, caso possa ter estado exposto ao coronavírus."</string>
+    <string name="onboarding_prinzip_text2">"O aplicativo informa-o, caso possa ter estado exposto ao coronavírus."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -347,7 +347,7 @@ linha informativa SwissCovid
     <string name="onboarding_privacy_text2">"Os IDs aleatórios são guardados no seu telemóvel durante 14 dias, apagando-se automaticamente após esse tempo."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Como funciona a app?"</string>
+    <string name="onboarding_begegnungen_heading">"Como funciona o aplicativo?"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Deteta contactos através do Bluetooth
@@ -367,7 +367,7 @@ linha informativa SwissCovid
 "</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"A app informa-o, caso possa ter estado exposto ao coronavírus."</string>
+    <string name="onboarding_meldung_text1">"O aplicativo informa-o, caso possa ter estado exposto ao coronavírus."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"Se agir da forma correta, estará a travar as cadeias de transmissão e a proteger os outros."</string>
@@ -400,7 +400,7 @@ linha informativa SwissCovid
     <string name="onboarding_push_title">"Permitir as notificações"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Para receber informações da app, tem de permitir as notificações."</string>
+    <string name="onboarding_push_text">"Para receber informações do aplicativo, tem de permitir as notificações."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Permitir as notificações"</string>
@@ -423,7 +423,7 @@ Siga as instruções que recebeu relativamente ao isolamento."</string>
     <string name="onboarding_go_title">"A app está pronta"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Muito obrigado por ajudar a interromper as cadeias de transmissão."</string>
+    <string name="onboarding_go_text">"Muito obrigado por ajudar a conter as cadeias de transmissão."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Iniciar"</string>
@@ -586,7 +586,7 @@ Isto aumenta muito pouco o consumo da bateria."</string>
     <string name="meldungen_nomeldungen_faq1_title">"O que são as notificações?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"A app verifica periodicamente se outros utilizadores com quem teve contacto comunicaram um teste positivo.
+    <string name="meldungen_nomeldungen_faq1_text">"O aplicativo verifica periodicamente se outros utilizadores com os quais teve contacto comunicaram um teste positivo.
 
 Em caso de possível contágio, receberá uma notificação no ecrã de bloqueio."</string>
 
@@ -627,9 +627,9 @@ Isso assegura que só casos confirmados sejam comunicados através do aplicativo
     <string name="inform_detail_faq2_title">"Que dados são enviados?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Só são enviadas as chaves privadas do seu app e nunca dados pessoais.
+    <string name="inform_detail_faq2_text">"Só são enviadas as chaves privadas do seu aplicativo e nunca dados pessoais.
 
-Desta forma, outros utilizadores do app SwissCovid ficam a saber que existe a possibilidade de um contágio."</string>
+Desta forma, outros utilizadores do aplicativo SwissCovid ficam a saber que existe a possibilidade de contágio."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -638,7 +638,7 @@ Desta forma, outros utilizadores do app SwissCovid ficam a saber que existe a po
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Aviso importante"</string>
+    <string name="inform_code_intro_title">"Informações para a introdução"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Embora não sejam enviados dados pessoais seus, é possível que alguém se recorde de um contacto consigo pela data."</string>
@@ -672,7 +672,7 @@ Outros sintomas podem ser:
     <string name="meldungen_positive_tested_faq1_title">"Porque está o rastreamento desativado?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"Após um teste positivo, o rastreamento na app é automaticamente desativado. O rastreamento pode ser reativado logo que termine o isolamento."</string>
+    <string name="meldungen_positive_tested_faq1_text">"Após um teste positivo, o rastreamento no aplicativo é automaticamente desativado. O rastreamento pode ser reativado logo que termine o isolamento."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"pt"</string>
@@ -712,8 +712,7 @@ Outros sintomas podem ser:
     <string name="onboarding_gaen_title">"Ativar o rastreamento"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Para poder usar a app, tem de ativar a função Notificações de exposição à COVID-19."</string>
+    <string name="onboarding_gaen_text_ios">"Para poder usar o aplicativo, tem de ativar a função de rastreamento para que seja possível reconhecer os contactos."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Ativar"</string>
@@ -742,10 +741,10 @@ Outros sintomas podem ser:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Terminar o isolamento"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Pretende apagar a notificação?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignorar otimização da bateria"</string>
-    <string name="android_onboarding_battery_permission_text">"A função de otimização da bateria tem de ser desligada para esta app para que ela possa detetar contactos em qualquer altura."</string>
+    <string name="android_onboarding_battery_permission_text">"A função de otimização da bateria tem de ser desligada para que este aplicativo funcione."</string>
     <string name="android_onboarding_battery_permission_button">"Permitir"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Só para esta app"</string>
@@ -768,8 +767,7 @@ Outros sintomas podem ser:
     <string name="tracing_permission_error_title_ios">"Notificações de exposição à COVID-19 desativada"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Ative a função Notificações de exposição à COVID-19 para que o rastreamento funcione."</string>
+    <string name="tracing_permission_error_text_ios">"Ative {TRACING_SETTING_TEXT} para que o rastreamento anónimo funcione."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"A mensagem não foi enviada. Por favor, autorize a partilha dos seus dados de IDs aleatórios com a app SwissCovid."</string>
@@ -811,9 +809,8 @@ Se não houver de momento nenhuma atualização disponível no seu dispositivo,
     <string name="tracing_active_tracking_always_info">"A SwissCovid mantém-se ativa, mesmo quando a app é desligada."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"A SwissCovid 
-trava as 
-cadeias de transmissão."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid -
+informação rápida em caso de risco de contágio."</string>
     <string name="inform_detail_faq3_text">"Embora não sejam enviados dados pessoais seus, é possível que alguém se recorde de um contacto consigo pela data."</string>
     <string name="inform_detail_faq3_title">"Permaneço anónimo?"</string>
 
@@ -824,7 +821,7 @@ cadeias de transmissão."</string>
     <string name="tracing_setting_text_android">"Notificações de exposição à COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Para poder usar a app, tem de ativar a função Notificações de exposição à COVID-19."</string>
+    <string name="onboarding_gaen_text_android">"Para que seja possível reconhecer contactos, tem de ativar a função de rastreamento."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -917,7 +914,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Viajar"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"A SwissCovid funciona nos seguintes países:"</string>
+    <string name="travel_home_description">"O SwissCovid-Contactos funciona nos seguintes países:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"O que significa isto?"</string>
@@ -947,12 +944,6 @@ Isto acontece independentemente de ter estado no estrangeiro ou não para que os
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Notificações de exposição"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1234,9 +1225,9 @@ Isto acontece independentemente de ter estado no estrangeiro ou não para que os
     <string name="delete_infection_dialog_finish_button">"Finalizar"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Não serão guardados mais contactos.
+    <string name="tracing_ended_info">"Não são memorizados mais contactos novos e check-ins novos também não são mais possíveis.
 
-Após o isolamento, o rastreamento pode ser reativado."</string>
+Após o isolamento, ambas as funções podem ser reativadas."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1268,7 +1259,7 @@ Após o isolamento, o rastreamento pode ser reativado."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Sofre de surdez ou de insuficiência auditiva e não pode ligar para a linha informativa do coronavírus?
+    <string name="hearing_impaired_info">"Sofre de surdez ou de insuficiência auditiva e não pode telefonar?
 
 Nesse caso, envie um e-mail para covid-support@medgate.ch"</string>
 
@@ -1324,7 +1315,7 @@ No combate ao coronavírus, o tempo é um fator decisivo: quanto menos tempo pas
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"Foi testado positivo (teste PCR ou teste rápido de antigénio) e ainda não recebeu um código Covid depois de 4 hs?
-Contacte a linha de informação coronavírus:"</string>
+Ligue para:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Ainda não recebeu um código COVID?"</string>
@@ -1348,7 +1339,7 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="travel_screen_compatible_countries">"Países compatíveis:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Para alertar também os viajantes de outros países, as chaves privadas são partilhadas com os apps de coronavírus dos países compatíveis."</string>
+    <string name="inform_code_travel_text">"Para alertar também os viajantes de outros países, as chaves privadas são partilhadas com os aplicativos de coronavírus dos países compatíveis."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Total"</string>
@@ -1363,13 +1354,13 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Quem vai ser informado?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"No período da sua fase contagiosa de {ONSET_DATE} até à introdução do código Covid, todos os contactos são informados, se houver a possibilidade de infecção devido à distância e à duração."</string>
+    <string name="meldungen_positive_tested_faq2_text">"No período da sua fase contagiosa de {ONSET_DATE} até à introdução do código Covid, todos os contactos são informados, se houver a possibilidade de infeção devido à distância e à duração ou se você tiver feito check-in no mesmo lugar."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – hoje"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Com isso, você ajuda a parar as cadeias de infecção."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Com isso, você pode ajudar a alertar outros sobre um eventual contágio."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Os códigos privados do seu aplicativo foram enviados para o seguinte período:"</string>
@@ -1408,46 +1399,46 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Em 1 dia"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Lembrete de check-out"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Quer fazer check-out?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Checkout automático"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"O seu check-out foi feito automaticamente."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Ler o código QR e fazer check-in"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"O código QR não é válido!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"De"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"a"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Acrescentar uma nota"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"p. ex. Com quem você esteve lá?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Pronto"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Lembrete de checkout"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Desligado"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"Autentique-se para ter acesso ao diário"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
     <string name="reminder_option_hours">"{HOURS} h"</string>
@@ -1456,22 +1447,22 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"O aplicativo tem de ter acesso à câmara para poder ler o código QR."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Meus check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
     <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"A câmara é necessária para ler o código QR."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Permita Face-ID para aceder seguramente ao seu diário."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"Autentique-se para o acesso ao diário"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
     <string name="checkout_button_title">"Check-out"</string>
@@ -1483,288 +1474,285 @@ Contacte a linha de informação coronavírus:"</string>
     <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Criar um código QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Oferecer check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Fazer check-in agora"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"Não foi possível enviar o lembrete"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Para receber lembretes de check-out, é necessário permitir as \\"notificações\\" na configuração do aplicativo."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Adaptar"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Editar"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Ainda não há registos"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Se ler um código QR SwissCovid para fazer check-in no local, um registo vai ser criado automaticamente aqui."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"O SwissCovid precisa ter acesso à câmara do seu dispositivo. A câmara só é usada para ler códigos QR."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Permitir o acesso à câmara"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"p. ex. sala ou nome do evento"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
-    <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="show_pdf_button">"Imprimir PDF"</string>
+    <string name="bottom_nav_tab_info">"Informação"</string>
+    <string name="error_network_title">"Erro de rede"</string>
+    <string name="error_network_text">"Verifique a sua ligação à Internet."</string>
+    <string name="error_action_retry">"Tentar novamente"</string>
+    <string name="error_notification_deactivated_title">"Notificações desativadas"</string>
+    <string name="error_notification_deactivated_text">"Mude a configuração para ser informado diretamente em caso duma mensagem."</string>
+    <string name="error_action_change_settings">"Mudar a configuração"</string>
+    <string name="error_camera_permission_title">"Nenhum acesso à câmara"</string>
+    <string name="error_camera_permission_text">"O aplicativo tem de ter acesso à câmara para poder ler o código QR."</string>
+    <string name="error_title">"Erro"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"O código QR ainda não é válido!"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"O código QR não é mais válido!"</string>
+    <string name="error_already_checked_in">"Você já fez check-in."</string>
+    <string name="error_update_text">"Este código QR não é compatível com a versão do aplicativo instalada. Por favor, atualize o aplicativo para continuar."</string>
+    <string name="error_update_title">"É necessário atualizar."</string>
+    <string name="error_action_update">"Atualizar agora"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Check-out"</string>
+    <string name="reminder_notification_snooze_action">"Repetir o alarme"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Mensagem de check-in permanente"</string>
+    <string name="ongoing_notification_title">"Você fez check-in às {TIME} horas."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Salvar"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Ler o código QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Check-in desativado"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Atualmente, não é possível fazer check-in"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Leia o código QR SwissCovid para fazer check-in no local."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Se ler um código QR SwissCovid para fazer check-in no local, um registo vai ser criado automaticamente aqui."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Você fez check-in"</string>
+    <string name="checkout_from_to_date">"{DATE1} a {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Mais informações sobre o código Covid"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Remover o registo"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Apagar"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Compartilhar"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Imprimir"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Leia um código QR SwissCovid para fazer check-in no local."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Compartilhar registos de check-in"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Se compartilhar os seus registos de check-in, o aplicativo pode informar pessoas que fizeram check-in no mesmo lugar e na mesma altura."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Selecionar todos"</string>
+    <string name="inform_dont_send_button_title">"Não enviar"</string>
+    <string name="inform_dont_share_button_title">"Não compartilhar"</string>
+    <string name="inform_really_not_share_title">"Realmente não deseja compartilhar?"</string>
+    <string name="inform_really_not_share_subtitle">"O compartilhamento das suas chaves privada ajuda o «SwissCovid» a informar outras pessoas potencialmente infetadas e a evitar a propagação do coronavírus. Se não compartilhar as suas chaves privadas, pessoas potencialmente infetadas não serão informadas."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Remover o registo"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"O seu registo vai ser removido irrevogavelmente da lista."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Remover completamente"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Só ocultar e continuar a receber notificações?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Testou positivo?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Voltar a ativar os contactos e check-ins."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Você não pode mais fazer check-in depois de ser testado positivo."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Gere um código QR com o qual pessoas podem fazer check-in no local."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Realmente deseja apagar o código QR?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Check-in próprio"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Leia um código QR SwissCovid para fazer check-in no local."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Não é possível salvar"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Os seus períodos de tempo selecionados sobrepõe-se a outros check-ins no seu diário. Por favor, verifique novamente a sua introdução."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Os seus registos de check-in selecionados foram enviados. Todas as pessoas que fizeram check-in na mesma altura e no mesmo lugar vão ser notificadas."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"SwissCovid-Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Fazer check-in sem deixar dados"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"Com o aplicativo SwissCovid você pode fazer check-in aqui sem deixar dados. Em caso de situação de risco, você vai ser informado rapidamente no aplicativo."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"Aplicativo SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Baixar agora"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Fazer check-in sem deixar dados"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Introduza o seu código Covid aqui para alertar outras pessoas."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Terminar o isolamento?"</string>
+    <string name="checkin_footer_title1">"Porque uma função de check-in?"</string>
+    <string name="checkin_footer_subtitle1">"A função de check-in sem recolha de dados de contacto amplia o aplicativo SwissCovid. Com esta função você pode não só alertar contactos próximos, mas também pessoas que fizeram check-in no mesmo lugar e na mesma altura, em caso de teste positivo."</string>
+    <string name="checkin_footer_title2">"Nenhum armazenamento de dados centralizado"</string>
+    <string name="checkin_footer_subtitle2">"Para os Swiss Covid check-ins não é necessário indicar dados pessoais como nome, endereço ou número de telefone e dados de localização GPS também não são recolhidos. A lista dos check-ins é memorizada localmente no seu smartphone. Depois de 14 dias os dados locais são apagados."</string>
+    <string name="events_empty_state_title">"Gere um código QR"</string>
+    <string name="events_empty_state_subtitle">"Com um código QR SwissCovid-QR pessoas podem fazer check-in no local sem deixar dados."</string>
+    <string name="events_info_box_title">"Não substitui a recolha de dados de contacto obrigatória"</string>
+    <string name="events_info_box_text">"SwissCovid-Check-ins não substituem a obrigação da recolha de dados de contacto especificada no «Regulamento Covid-19 situação especial»."</string>
+    <string name="events_footer_title1">"Onde podem ser utilizados check-ins?"</string>
+    <string name="events_footer_title2">"Porque uma função de check-in?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid-Check-ins podem ser usados, onde pessoas se encontram, mas não existe uma obrigação de recolher os dados de contacto.
+
+Lugares de utilização possíveis:
+– Eventos privados
+– Eventos de associações
+– Reuniões profissionais como, p. ex. na sala de reunião, escritórios, cantinas, etc."</string>
+    <string name="events_footer_subtitle2">"A função de check-in sem recolha de dados de contacto amplia o aplicativo SwissCovid. Com esta função você pode não só alertar contactos próximos, mas também pessoas que fizeram check-in no mesmo lugar e na mesma altura, em caso de teste positivo."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Situação de risco"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Contactos"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
     <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"O que devo fazer?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Check-in positivo"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Check-ins positivos / Contactos"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"Código QR do utilizador"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"Código QR de rastreamento de contactos"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Após um resultado de teste positivo, a função de check-in é desativada automaticamente. Ela só pode ser reativada após o seu isolamento."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Dê um título que descreve o lugar ou o seu evento.
+Este título vai ser indicado no check-in."</string>
+    <string name="checkin_report_heading">"O que pode fazer?"</string>
+    <string name="checkin_report_title1">"Proteger os contactos"</string>
+    <string name="checkin_report_title2">"Observar os sintomas"</string>
+    <string name="checkin_report_title3">"Deixar testar-se"</string>
+    <string name="checkin_report_subtitle1">"Você já pode ser contagioso, sem percebê-lo. Observe as medidas de higiene e proteção vigentes e proteja a sua família, os amigos e o seu ambiente."</string>
+    <string name="checkin_report_subtitle2">"Observe o seu estado de saúde."</string>
+    <string name="checkin_report_subtitle3">"Deixe testar-se imediatamente se aparecerem sintomas. Mesmo se não aparecerem sintomas, um teste de corona é conveniente e recomendado."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="not_thank_you_screen_title">"Não foram enviados dados."</string>
+    <string name="not_thank_you_screen_text1">"Não foram enviadas chaves privadas."</string>
+    <string name="not_thank_you_screen_back_button">"Voltar"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Não enviar dados"</string>
+    <string name="not_thank_you_screen_text2">"Não foram enviados registos de check-in."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="inform_share_checkins_send_button_title">"Compartilhar a seleção"</string>
+    <string name="inform_share_checkins_not_send_button">"Não compartilhar nada"</string>
+    <string name="onboarding_checkin_title">"Fazer check-in sem deixar dados"</string>
     <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="onboarding_checkin_text1">"Com SwissCovid-Check-ins você pode fazer check-in num local ou numa reunião com o aplicativo."</string>
+    <string name="onboarding_checkin_text2">"A sua presença só é memorizada no aplicativo. Você não tem de deixar dados pessoais no aplicativo."</string>
+    <string name="checkin_updateboarding_text">"Com SwissCovid-Check-ins você pode fazer check-in num local ou numa reunião com o aplicativo. A sua presença só é memorizada no aplicativo. Você não tem de deixar dados pessoais no aplicativo. Para tal, as condições de utilização e a política de privacidade foram atualizadas."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Saltar"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"O registo vai ser memorizado codificado no fundo do aplicativo por 14 dias. Em caso de contágio possível você vai poder ser notificado, mesmo assim."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Só ocultar"</string>
+    <string name="checkin_set_reminder_explanation">"O aplicativo pode lembrar de fazer check-out na altura certa."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"Ou remover completamente?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"O registo vai ser removido completamente. Você não vai mais poder ser alertado."</string>
+    <string name="not_thank_you_screen_text3">"Ninguém vai ser notificado."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"O que devo saber sobre os testes?"</string>
+    <string name="instant_app_install_action">"Instalar o aplicativo e fazer check-in"</string>
+    <string name="partial_onboarding_box_text">"Conclua a configuração do aplicativo para poder usar a função de rastreamento."</string>
+    <string name="partial_onboarding_box_action">"Concluir agora"</string>
+    <string name="partial_onboarding_done_title">"Configuração concluída"</string>
+    <string name="partial_onboarding_done_text">"Agradecemos a sua ajuda para conter a propagação do coronavírus."</string>
+    <string name="web_slogan">"Informação rápida em caso de risco de infeção"</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index 4f92d7d88..3de7f0790 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -737,7 +737,7 @@ Pussaivels èn er ils suandants sintoms:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Terminar l'isolaziun"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Vulais Vus propi stizzar l’avis?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignorar l'optimaziun da l'accu"</string>
     <string name="android_onboarding_battery_permission_text">"Per pudair identifitgar ils inscunters d’in cuntin, sto l'optimaziun da l'accu esser deactivada per questa app."</string>
@@ -942,12 +942,6 @@ Per che er las viagiaturas ed ils viagiaturs da l'exteriur possian vegnir infurm
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1716,9 +1710,6 @@ Possible locations:
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
     <string name="not_thank_you_screen_title">"No data sent"</string>
     <string name="not_thank_you_screen_text1">"No private key was sent."</string>
     <string name="not_thank_you_screen_back_button">"Back"</string>
@@ -1761,5 +1752,5 @@ Possible locations:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 3ecbc1323..8912c8f0d 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -104,7 +104,7 @@ Në këtë mënyrë na ndihmoni, për të ndaluar zinxhirin e infeksionit."</str
     <string name="meldungen_meldung_title">"Infeksion i mundshëm"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Ekziston dyshimi i një infeksioni të mundshëm."</string>
+    <string name="meldungen_meldung_text">"Ju mund të jeni infektuar"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"APP është aktiv"</string>
@@ -194,7 +194,7 @@ Në këtë mënyrë na ndihmoni, për të ndaluar zinxhirin e infeksionit."</str
     <string name="inform_detail_box_subtitle">"Me kodin Covid..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Ndalo zinxhirin e infeksionit"</string>
+    <string name="inform_detail_box_title">"Informoni për infektimet e mundshme"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Fut kodin e Covid"</string>
@@ -228,7 +228,7 @@ Në këtë mënyrë na ndihmoni, për të ndaluar zinxhirin e infeksionit."</str
     <string name="tracing_turned_off_title">"Gjurmimi i çaktivizuar"</string>
     <string name="tracing_turned_off_text">"Aktivizoni gjurmimin që aplikacioni të funksionojë."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth fikur"</string>
-    <string name="bluetooth_turned_off_text">"Ndizni Bluetooth në pajisje në mënyrë që gjurmimi të funksionojë."</string>
+    <string name="bluetooth_turned_off_text">"Ndizni Bluetooth në pajisjen tuaj në mënyrë që të funksionojë gjurmimi anonim."</string>
     <string name="bluetooth_turn_on_button_title">"Ndiz Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Përdorimi i Bluetooth u refuzua"</string>
     <string name="bluetooth_permission_error_text">"Lejoni përdorimin e Bluetooth, në mënyrë që gjurmimi të funksionojë."</string>
@@ -260,11 +260,11 @@ Në këtë mënyrë na ndihmoni, për të ndaluar zinxhirin e infeksionit."</str
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Ndiqni udhëzimet e caktuara për izolimin"</string>
-    <string name="tracing_ended_title">"Gjurmimi i përfunduar"</string>
-    <string name="tracing_ended_text">"Nuk ruhet më asnjë kontakt."</string>
+    <string name="tracing_ended_title">"Kontaktet dhe Check-in janë çaktivizuar"</string>
+    <string name="tracing_ended_text">"Nuk ruhet asnjë kontakt"</string>
     <string name="exposed_info_contact_hotline">"Kontaktoni"</string>
     <string name="meldung_homescreen_positive_info_line1">"Ndiqni"</string>
-    <string name="meldung_homescreen_positive_info_line2">"Udhëzimet për vetë-izolimin"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Udhëzimet për izolimin"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Njoftim i ri"</string>
@@ -274,7 +274,7 @@ Në këtë mënyrë na ndihmoni, për të ndaluar zinxhirin e infeksionit."</str
     <string name="meldung_homescreen_positiv_title">"Pozitiv në test"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Ekziston dyshimi i një infeksioni të mundshëm."</string>
+    <string name="meldung_detail_exposed_subtitle">"Ju mund të jeni infektuar"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Ju keni rezultuar pozitiv me koronavirusin."</string>
@@ -331,7 +331,7 @@ virusit"</string>
     <string name="onboarding_prinzip_text1">"Me aplikacionin Swiss Covid të gjithë ne mund të ndihmojmë për të frenuar përhapjen e koronavirusin."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"Aplikacioni ju informon nëse jeni ekspozuar potencialisht me koronavirusin."</string>
+    <string name="onboarding_prinzip_text2">"Aplikacioni ju informon nëse jeni ekspozuar potencialisht me koronavirus."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -346,7 +346,7 @@ virusit"</string>
     <string name="onboarding_privacy_text2">"ID e ruajtura të rastit mbeten në telefonin tuaj celular dhe fshihen pas 14 ditësh."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Si funksionon aplikacioni?"</string>
+    <string name="onboarding_begegnungen_heading">"Kontaktet"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Identifikon kontaktet
@@ -366,7 +366,7 @@ falë Bluetooth"</string>
 infeksioni të mundshëm"</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"Aplikacioni ju informon nëse jeni ekspozuar potencialisht me koronavirusin."</string>
+    <string name="onboarding_meldung_text1">"Aplikacioni ju informon nëse jeni ekspozuar potencialisht me koronavirus."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"Me sjelljen e duhur ju mund të ndërprisni zinxhirin e infeksionit dhe të mbroni të tjerët."</string>
@@ -422,7 +422,7 @@ Respektoni udhëzimet e caktuara për izolimin."</string>
     <string name="onboarding_go_title">"Aplikacioni është instaluar"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Shumë faleminderit që na ndihmoni për të ndërprerë zinxhirin e infeksionit."</string>
+    <string name="onboarding_go_text">"Shumë faleminderit që na ndihmoni për të ndaluar zgjerimin e koronavirusit."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Nis"</string>
@@ -449,7 +449,7 @@ Respektoni udhëzimet e caktuara për izolimin."</string>
     <string name="meldung_detail_new_contact_title">"Infeksion i mundshëm"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Ekziston dyshimi i një infeksioni të mundshëm."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Ju mund të jeni infektuar"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Gabim i orës"</string>
@@ -585,9 +585,9 @@ Nga kjo, konsumi i baterisë rritet vetëm pak."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Çfarë janë mesazhet?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"Aplikacioni kontrollon rregullisht nëse përdoruesit e tjerë që keni takuar kanë rezultuar pozitivë në test.
+    <string name="meldungen_nomeldungen_faq1_text">"Aplikacioni kontrollon rregullisht nëse përdoruesit e tjerë që keni takuar ose ata që janë kontrolluar në të njëjtin vend kanë rezultuar pozitivë në test.
 
-Në rast infeksioni të mundshëm informoheni me një mesazh në ekranin e mbyllur."</string>
+Në rast infektimi të mundshëm informoheni me një mesazh në ekranin e mbyllur."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"Infoline SwissCovid ju këshillon për mundësinë e një testi falas."</string>
@@ -626,9 +626,9 @@ Kjo siguron se vetëm rastet e konfirmuara raportohen përmes aplikacionit."</st
     <string name="inform_detail_faq2_title">"Çfarë dërgohet?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Dërgohen vetëm kodet e identifikimit të aplikacionit tuaj, asnjë e dhënë personale.
+    <string name="inform_detail_faq2_text">"Dërgohen vetëm çelësat personal të aplikacionit tuaj dhe ID e koduara të Check-ins tuaj, asnjë e dhënë personale.
 
-Në këtë mënyrë mësoni përdoruesit e tjerë të alikacionit SwissCovid, të cilët mundësisht janë infektuar."</string>
+Në këtë mënyrë mësoni përdorueset dhe përdoruesit e tjerë të aplikacionit SwissCovid, të cilët ka mundësi të jenë infektuar."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -637,10 +637,10 @@ Në këtë mënyrë mësoni përdoruesit e tjerë të alikacionit SwissCovid, t
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Udhëzim i rëndësishëm"</string>
+    <string name="inform_code_intro_title">"Informacion për futjen e të dhënave"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"Edhe pse nuk dërgohet asnjë e dhënë personale, mund të ndodhë që dikush mund të kujtohet për kontaktin me anë të datës."</string>
+    <string name="inform_code_intro_text">"Edhe pse nuk dërgohet asnjë e dhënë personale, mund të ndodhë që dikush mund të kujtohet për kontaktin me ju me anë të datës."</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
     <string name="inform_code_intro_button">"Pranoj"</string>
@@ -711,8 +711,7 @@ Simptoma gastrointestinale (të përziera, të vjella, diarre, dhimbje abdominal
     <string name="onboarding_gaen_title">"Aktivizo gjurmimin"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <!-- Fuzzy -->
-    <string name="onboarding_gaen_text_ios">"Për të përdorur aplikacionin, funksioni Njoftime rreth COVID-19 duhet të jetë i aktivizuar."</string>
+    <string name="onboarding_gaen_text_ios">"Funksioni i gjurmimit duhet të jetë i aktivizuar, në mënyrë që të dallohen kontaktet."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Aktivizo"</string>
@@ -741,10 +740,10 @@ Simptoma gastrointestinale (të përziera, të vjella, diarre, dhimbje abdominal
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Fundi i izolimit"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Dëshironi vërtet ta fshini njoftimin?"</string>
     <string name="android_onboarding_battery_permission_title">"Injoro optimizimin e baterisë"</string>
-    <string name="android_onboarding_battery_permission_text">"Për të identifikuar gjithnjë kontaktet, optimizimi i baterisë duhet të jetë i fikur për këtë aplikacion."</string>
+    <string name="android_onboarding_battery_permission_text">"Në mënyrë që aplikacioni të funksionojë, optimizimi i baterisë duhet të jetë i fikur."</string>
     <string name="android_onboarding_battery_permission_button">"Lejo"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Vetëm për këtë aplikacion"</string>
@@ -767,8 +766,7 @@ Simptoma gastrointestinale (të përziera, të vjella, diarre, dhimbje abdominal
     <string name="tracing_permission_error_title_ios">"Njoftime rreth ekspozimit ndaj COVID-19 i çaktivizuar"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <!-- Fuzzy -->
-    <string name="tracing_permission_error_text_ios">"Aktivizoni Njoftime rreth ekspozimit ndaj COVID-19, në mënyrë që gjurmimi të funksionojë."</string>
+    <string name="tracing_permission_error_text_ios">"Aktivizoni {TRACING_SETTING_TEXT}, në mënyrë që të funksionojë gjurmimi anonim."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Mesazhi nuk u dërgua dot. Ju lutemi lejoni ndarjen e ID të rastit tuaj me aplikacionin SwissCovid."</string>
@@ -811,10 +809,9 @@ Në rast se në pajisjen tuaj nuk disponohet ndërkohë asnjë Update, ju lutemi
     <string name="tracing_active_tracking_always_info">"SwissCovid mbetet aktiv, edhe nëse aplikacioni mbyllet."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-ndalon zinxhirin 
-e infeksionit."</string>
-    <string name="inform_detail_faq3_text">"Edhe pse nuk dërgohet asnjë e dhënë personale, mund të ndodhë që dikush mund të kujtohet për kontaktin me anë të datës."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid –
+në rastin e një rreziku infektimi ju informon shpejt."</string>
+    <string name="inform_detail_faq3_text">"Po, por edhe pse nuk dërgohet asnjë e dhënë personale, mund të ndodhë që dikush mund të kujtohet për kontaktin me ju me anë të datës."</string>
     <string name="inform_detail_faq3_title">"A mbetem unë anonim?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -824,7 +821,7 @@ e infeksionit."</string>
     <string name="tracing_setting_text_android">"Njoftime rreth ekspozimit ndaj COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Për të përdorur aplikacionin, funksioni Njoftime rreth COVID-19 duhet të jetë i aktivizuar."</string>
+    <string name="onboarding_gaen_text_android">"Funksioni i gjurmimit duhet të jetë i aktivizuar, në mënyrë që të dallohen kontaktet."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -917,7 +914,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Udhëtimi"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid punon në shtetet më poshtë:"</string>
+    <string name="travel_home_description">"Kontaktet e SwissCovid funksionojnë në shtetet më poshtë:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Cfarë do të thotë kjo?"</string>
@@ -947,12 +944,6 @@ Në mënyrë që udhëtarët nga jashtë shtetit të mund të paralajmërohen, k
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1234,9 +1225,9 @@ Në mënyrë që udhëtarët nga jashtë shtetit të mund të paralajmërohen, k
     <string name="delete_infection_dialog_finish_button">"Përfundo"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Nuk ruhen më takime.
+    <string name="tracing_ended_info">"Nuk ruhen më kontakte të reja dhe gjithashtu Check-ins e reja nuk janë më të mundshme.
 
-Gjurmimi mund të riaktivizohet pas izolimit."</string>
+Të dyja funksionet mund të aktivizohen përsëri, pasi të ketë mbaruar izolimi."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1268,7 +1259,7 @@ Gjurmimi mund të riaktivizohet pas izolimit."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"A jeni i shurdhër ose keni probleme dëgjimi dhe nuk mund të telefononi linjën telefonike për koronavirusin Infoline Coronavirus?
+    <string name="hearing_impaired_info">"A jeni i shurdhër ose keni probleme dëgjimi dhe nuk mund të telefononi?
 
 Atëherë na dërgoni një email te covid-support@medgate.ch"</string>
 
@@ -1323,8 +1314,8 @@ Koha është faktor vendimtar në luftën ndaj koronavirusit: sa më e shkurtër
     <string name="stats_cases_current_description">"Grafiku tregon infeksionet e reja të raportuara gjatë 28 ditëve të fundit. Kjo jep një pasqyrë të rasteve aktuale."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"A keni testuar pozitiv (nga test PCR ose test i shpejtë antigjeni) dhe nuk keni marrë një kod Covid pas 4 orësh? 
-Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
+    <string name="inform_detail_infobox1_text">"A keni dalë pozitiv në test (testi PCR ose testi i shpejtë antigjen) dhe nuk keni marrë një kod Covid pas 4 orësh?
+Atëherë na telefononi këtu:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Nuk keni marrë ende asnjë kod Covid?"</string>
@@ -1348,7 +1339,7 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="travel_screen_compatible_countries">"Shtetet e përfshira:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Në mënyrë që udhëtarët nga jashtë shtetit të mund të paralajmërohen, kodet e identifikimit shpërndahen me aplikacionet për koronavirusin të vendeve të përfshira."</string>
+    <string name="inform_code_travel_text">"Në mënyrë që udhëtarët nga jashtë shtetit të mund të paralajmërohen pas një kontakti, çelësat personal shpërndahen me aplikacionet për koronavirusin të vendeve të përfshira."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Total"</string>
@@ -1363,13 +1354,13 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Kush njoftohet?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Të gjithë kontaktet në periudhën e fazës tuaj të infektimit nga {ONSET_DATE} deri në hyrjen e kodit Covid njoftohen nëse ekziston mundësia e infektimit për shkak të distancës dhe kohëzgjatjes."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Të gjitha kontaktet në periudhën e fazës suaj të infektimit nga {ONSET_DATE} deri në futjen e kodit Covid njoftohen, nëse ekziston rreziku i një infektimi – për shkak të distancës dhe kohëzgjatjes ose nëse jeni kontrolluar në të njëjtin vend."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – sot"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Duke vepruar kështu, ju ndihmoni të ndaloni zinxhirin e infektimit."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Duke vepruar kështu, ju ndihmoni të informoni të tjerët për një infektim të mundshëm."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Çelësat privatë të aplikacionit tuaj janë dërguar për periudhën kohore vijuese:"</string>
@@ -1408,46 +1399,46 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Në 1 ditë"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Kujtesa e Check-out"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Dëshironi të kontrolloheni?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Checkout automatik"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"Ju u kontrolluat automatikisht."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Skanoni dhe kontrolloni kodin QR"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"Kodi QR i pavlefshëm!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"Nga"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"Deri"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Shtoni shënimin"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"psh. Me kë ishit aty?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Gati"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Kujtesa e Check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Fikur"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"Autentifikohuni për aksesin në ditar"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
     <string name="reminder_option_hours">"{HOURS} h"</string>
@@ -1456,315 +1447,313 @@ Atëherë kontaktoni qendrën telefonike të koronavirusit:"</string>
     <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"Aplikacionit i nevojitet aksesi në kamera për të skanuar kodin QR."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Check-ins e mia"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
     <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"Kamera nevojitet për të skanuar kodin QR."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Lejoni Face-ID për të pasur akses të sigurt në ditarin tuaj."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"Autentifikohuni për aksesin në ditar"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Check out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
     <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <string name="checkin_title">"Check-In"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Krijoni kodin QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Ofroni Check-ins?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Kontrollohuni tani"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"Kujtesa nuk u vendos dot"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Në mënyrë që të merrni kujtesa nga Check-out, duhet të lejoni \\"Njoftimet\'’ te cilësimet e aplikacionit."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Përshtat"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Përpuno"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Nuk ekziston ende asnjë shënim"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Nëse skanoni një kod QR të SwissCovid për t’u kontrolluar në vend, atëherë këtu krijohet automatikisht një shënim."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid i nevojitet aksesi në kamerën e pajisjes suaj. Kamera përdoret vetëm për të skanuar kodin QR."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Lejoni aksesin e kamerës"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"p.sh. Hapësira ose emri për rastin"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="show_pdf_button">"Printoni në PDF"</string>
     <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
+    <string name="error_network_title">"Gabim i rrjetit"</string>
+    <string name="error_network_text">"Kontrolloni lidhjen tuaj të internetit."</string>
+    <string name="error_action_retry">"Provoheni përsëri"</string>
+    <string name="error_notification_deactivated_title">"Njoftimet janë çaktivizuar"</string>
+    <string name="error_notification_deactivated_text">"Ndryshoni cilësimet për t’u informuar direkt me një njoftim."</string>
+    <string name="error_action_change_settings">"Ndryshoni cilësimet"</string>
+    <string name="error_camera_permission_title">"Asnjë akses në kamera"</string>
+    <string name="error_camera_permission_text">"Aplikacionit i nevojitet aksesi në kamera për të skanuar kodin QR."</string>
+    <string name="error_title">"Gabim"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"Kodi QR nuk është ende i vlefshëm"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Kodi QR nuk është më i vlefshëm"</string>
+    <string name="error_already_checked_in">"Ju jeni kontrolluar tashmë."</string>
+    <string name="error_update_text">"Ky kod QR nuk është i pajtueshëm me versionin e aplikacionit të instaluar. Përditësoni aplikacionin për të vazhduar më tej."</string>
+    <string name="error_update_title">"Përditësimi i nevojshëm"</string>
+    <string name="error_action_update">"Përditësoni tani"</string>
     <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Mesazh i përhershëm i Checkin"</string>
+    <string name="ongoing_notification_title">"Ju jeni kontrolluar nga ora {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Siguro"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Skanoni kodin QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Check-In i çaktivizuar"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Ndërkohë nuk është i mundur asnjë Check-in"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Skanoni një kod QR të SwissCovid për t’u kontrolluar në vend."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Nëse skanoni një kod QR të SwissCovid për t’u kontrolluar në vend, atëherë këtu krijohet automatikisht një shënim."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Ju jeni kontrolluar"</string>
+    <string name="checkout_from_to_date">"{DATE1} deri {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Më shumë për kodin Covid"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Hiqni shënimin"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Fshi"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Shpërndaj"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Printo"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Skanoni një kod QR të SwissCovid për t’u kontrolluar në vend."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Shpërndani shënimet e Check-in"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Nëse shpërndani shënimet tuaja të Check-in, atëherë aplikacioni njofton personat, të cilët janë kontrolluar në të njëjtën kohë në të njëjtin vend."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Zgjidhni të gjitha"</string>
+    <string name="inform_dont_send_button_title">"Mos dërgoni"</string>
+    <string name="inform_dont_share_button_title">"Mos shpërndani"</string>
+    <string name="inform_really_not_share_title">"Vërtet të mos shpërndani?"</string>
+    <string name="inform_really_not_share_subtitle">"Shpërndarja e çelësave tuaj personal ndihmon ''SwissCovid'' për të njoftuar persona të tjerë të infektuar potencialisht dhe për të parandaluar zgjerimin e mëtejshëm të virusit. Nëse nuk i shpërndani çelësat tuaj personal, atëherë nuk njoftohet asnjë person i infektuar potencialisht."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Hiqni shënimin"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"Shënimi juaj hiqet nga lista në mënyrë të paprapësueshme."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Hiqni plotësisht"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Thjesht ta fshini dhe të njoftoheni gjithsesi?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Keni dalë pozitiv në test?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Aktivizoni përsëri kontaktet dhe Check-in."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Ju nuk mund të kontrolloheni më, sepse keni dalë pozitiv në test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Krijoni një kod QR, me të cilin të kontrolloni personat në vend."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Dëshironi vërtet ta fshini kodin QR?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Self Check-In"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Skanoni një kod QR të SwissCovid për t’u kontrolluar në vend."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Sigurimi nuk është i mundur"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Kohët tuaja të zgjedhura përkojnë me Check-ins e tjera nga ditari juaj. Kontrolloni edhe njëherë të dhënat tuaja."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Shënimet tuaja të zgjedhura të Check-in u dërguan. Të gjithë personat, të cilët janë kontrolluar në të njëjtën kohë në të njëjtin vend, do të njoftohen."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"Check-in i SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Kontrolli pa lënë të dhëna"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"Me aplikacionin SwissCovid mund të kontrolloheni thjesht te ne, pa lënë të dhënat tuaja. Në rastin e një situate rreziku do të informoheni shpejt në aplikacion."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"Aplikacioni \"SwissCovid\""</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Shkarkoni tani"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Kontrolli pa lënë të dhëna 
+"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Futni këtu kodin tuaj Covid për të informuar të tjerët."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"Keni përfunduar izolimin?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Dëshironi të ofroni Check-ins?"</string>
+    <string name="checkin_footer_title1">"Përse duhet një funksion i Check-in?"</string>
+    <string name="checkin_footer_subtitle1">"Aplikacioni SwissCovid zgjeron funksionin e Check-in pa futjen e të dhënave të kontaktit. Me këtë funksion, në rastin kur keni dalë pozitiv në test, ju jo vetëm që mund të informoni kontaktet e afërta, por edhe personat që janë kontrolluar në të njëjtën kohë në të njëjtin vend."</string>
+    <string name="checkin_footer_title2">"Asnjë ruajtje qendrore e të dhënave"</string>
+    <string name="checkin_footer_subtitle2">"Për Check-ins e SwissCovid nuk duhet futur asnjë e dhënë personale si emri, adresa ose numri i telefonit dhe nuk përfshihen as të dhënat e vendndodhjes në GPS. Lista e Check-ins ruhet lokalisht në smartfonin tuaj. Pas 14 ditësh të dhënat lokale fshihen përsëri."</string>
+    <string name="events_empty_state_title">"Krijoni një kod QR"</string>
+    <string name="events_empty_state_subtitle">"Me një kod QR të SwissCovid mund të kontrollohen në vend personat pa lënë të dhënat e tyre."</string>
+    <string name="events_info_box_title">"Asnjë zëvendësim për përfshirjen e detyruar të të dhënave të kontaktit."</string>
+    <string name="events_info_box_text">"Check-ins e SwissCovid nuk janë zëvendësim i detyrimit për të regjistruar të dhënat e kontaktit të përcaktuara në \"Rregulloren e Covid-19, Situatë e veçantë\"."</string>
+    <string name="events_footer_title1">"Ku mund të përdoren Check-ins?"</string>
+    <string name="events_footer_title2">"Përse duhet një funksion i Check-in?"</string>
+    <string name="events_footer_subtitle1">"Check-ins e SwissCovid mund të përdoren atje, ku mblidhen njerëzit, por që nuk ka asnjë detyrim për regjistrimin e të dhënave të kontaktit.
+
+Vendet e mundshme të përdorimit:
+– Arsye personale
+– Arsye shoqërore
+– Takime në një ambient profesional siç janë sallat e mbledhjeve, zyrat, mensat, etj."</string>
+    <string name="events_footer_subtitle2">"Aplikacioni SwissCovid zgjeron funksionin e Check-in pa futjen e të dhënave të kontaktit. Me këtë funksion, në rastin kur keni dalë pozitiv në test, ju jo vetëm që mund të informoni kontaktet e afërta, por edhe personat që janë kontrolluar në të njëjtën kohë në të njëjtin vend."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Situata e rrezikut"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Kontaktet"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
     <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Çfarë nevojitet të bëj?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Check-in që ka dalë pozitiv"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Check-ins që kanë dalë pozitiv / kontaktet"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"Kodi ynë QR"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"Kodi QR i Contact Tracing"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Pas një rezultati të testit që ka dalë pozitiv funksioni i Check-in është çaktivizuar. Ai mund të aktivizohet përsëri pas përfundimit të izolimit tuaj."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Jepni një titull që e përshkruan më afër vendin ose arsyen tuaj.
+Ky titull shfaqet gjatë Check-in."</string>
+    <string name="checkin_report_heading">"Çfarë mund të bëni?"</string>
+    <string name="checkin_report_title1">"Mbroni kontaktet"</string>
+    <string name="checkin_report_title2">"Kini parasysh simptomat"</string>
+    <string name="checkin_report_title3">"Kryeni testin"</string>
+    <string name="checkin_report_subtitle1">"Ju tashmë mund të jeni i infektuar pa e vënë re. Mbani parasysh masat e higjienës dhe të mbrojtjes dhe mbroni familjen tuaj, miqtë tuaj dhe mjedisin tuaj rrethues."</string>
+    <string name="checkin_report_subtitle2">"Mbikëqyrni gjendjen tuaj shëndetësore."</string>
+    <string name="checkin_report_subtitle3">"Testohuni menjëherë gjatë shfaqjes së simptomave. Edhe nëse nuk shfaqet asnjë simptomë, testi i koronës është i arsyeshëm dhe i rekomandueshëm."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="meldung_detail_checkin_title">"Check-In"</string>
+    <string name="not_thank_you_screen_title">"Nuk u dërgua asnjë e dhënë"</string>
+    <string name="not_thank_you_screen_text1">"Nuk u dërgua asnjë çelës personal."</string>
+    <string name="not_thank_you_screen_back_button">"Kthehu"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Mos dërgoni asnjë të dhënë"</string>
+    <string name="not_thank_you_screen_text2">"Nuk u dërgua asnjë shënim për Check-in."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="inform_share_checkins_send_button_title">"Shpërndani zgjedhjen"</string>
+    <string name="inform_share_checkins_not_send_button">"Mos shpërndani asgjë"</string>
+    <string name="onboarding_checkin_title">"Kontrolli pa lënë të dhëna"</string>
     <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="onboarding_checkin_text1">"Me Check-ins e SwissCovid mund të kontrolloheni në një vend ose në një takim me aplikacion."</string>
+    <string name="onboarding_checkin_text2">"Prania juaj ruhet vetëm në aplikacion. Ju nuk duhet të lini asnjë të dhënë personale në aplikacion."</string>
+    <string name="checkin_updateboarding_text">"Me Check-ins e SwissCovid mund të kontrolloheni në një vend ose në një takim me aplikacion. Prania juaj ruhet vetëm në aplikacion. Ju nuk duhet të lini asnjë të dhënë personale në aplikacion. Për më tepër u përditësuan kushtet e përdorimit dhe politika për privatësinë."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Tejkalo"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"Shënimi ruhet i koduar 14 ditë në sfondin e aplikacionit. Në rastin e një infektimit të mundshëm, përsëri mund të njoftoheni."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Thjesht fshini"</string>
+    <string name="checkin_set_reminder_explanation">"Aplikacioni mund t’ju kujtojë për t’u kontrolluar përsëri në kohën e duhur."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"Ose ta hiqni plotësisht?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"Shënimi hiqet plotësisht. Ju nuk mund të informoheni më."</string>
+    <string name="not_thank_you_screen_text3">"Nuk njoftohet askush."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"Çfarë duhet të di unë rreth testimeve?"</string>
+    <string name="instant_app_install_action">"Instaloni dhe kontrolloni aplikacionin."</string>
+    <string name="partial_onboarding_box_text">"Mbylleni konfigurimin e aplikacionit për të përdorur funksionin Tracking."</string>
+    <string name="partial_onboarding_box_action">"Mbylleni tani"</string>
+    <string name="partial_onboarding_done_title">"Konfigurimi u mbyll"</string>
+    <string name="partial_onboarding_done_text">"Shumë faleminderit që na ndihmoni për të ndaluar zgjerimin e koronavirusit."</string>
+    <string name="web_slogan">"Në rastin e një rreziku të infektimit informoheni shpejt."</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index ad4d2cdca..a4162b5f0 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -193,7 +193,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="inform_detail_box_subtitle">"Sa Covid šifrom..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Zaustavljanje lanca širenja infekcije"</string>
+    <string name="inform_detail_box_title">"Upozorenje u slučaju moguće infekcije"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Unos Covid šifre"</string>
@@ -227,7 +227,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="tracing_turned_off_title">"Praćenje je deaktivirano"</string>
     <string name="tracing_turned_off_text">"Aktivirajte praćenje da bi aplikacija radila."</string>
     <string name="bluetooth_turned_off_title">"Bluetooth isključen"</string>
-    <string name="bluetooth_turned_off_text">"Uključite Bluetooth na vašem uređaju da bi praćenje radilo."</string>
+    <string name="bluetooth_turned_off_text">"Uključite Bluetooth na vašem uređaju, kako bi funkcionisalo anonomno praćenje."</string>
     <string name="bluetooth_turn_on_button_title">"Uključi Bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Korišćenje Bluetooth-a odbijeno"</string>
     <string name="bluetooth_permission_error_text">"Dozvolite korišćenje Bluetooth-a da bi praćenje radilo."</string>
@@ -259,8 +259,8 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Sledite uputstva za izolaciju koja ste dobili"</string>
-    <string name="tracing_ended_title">"Praćenje završeno"</string>
-    <string name="tracing_ended_text">"Dalji kontakti se više ne čuvaju."</string>
+    <string name="tracing_ended_title">"Deaktivirani kontakti i prijave "</string>
+    <string name="tracing_ended_text">"Dalji kontakti se više ne čuvaju"</string>
     <string name="exposed_info_contact_hotline">"Obratite se"</string>
     <string name="meldung_homescreen_positive_info_line1">"Sledite"</string>
     <string name="meldung_homescreen_positive_info_line2">"Uputstva za samoizolaciju"</string>
@@ -273,7 +273,7 @@ Time nam pomažete u prekidanju lanca širenja infekcije."</string>
     <string name="meldung_homescreen_positiv_title">"Testiran pozitivno"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Postoji mogućnost infekcije."</string>
+    <string name="meldung_detail_exposed_subtitle">"Postoji mogućnost infekcije"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Testirani ste pozitivno na virus korona."</string>
@@ -330,7 +330,7 @@ ispred virusa"</string>
     <string name="onboarding_prinzip_text1">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"Aplikacija vas obaveštava ako postoji sumnja na to da ste zaraženi virusom korona."</string>
+    <string name="onboarding_prinzip_text2">"Aplikacija vas obaveštava ako postoji sumnja na to da ste zaraženi virusom korone."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -345,7 +345,7 @@ ispred virusa"</string>
     <string name="onboarding_privacy_text2">"Sačuvani nasumični ID-ovi se čuvaju na vašem mobilnom telefonu i brišu se nakon 14 dana."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Kako funkcioniše aplikacija?"</string>
+    <string name="onboarding_begegnungen_heading">"Kontakti"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Prepoznavanje kontakta
@@ -421,7 +421,7 @@ Pridržavajte se dobijenih uputstava o izolaciji."</string>
     <string name="onboarding_go_title">"Aplikacija je spremna"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Hvala vam što pomažete u prekidanju lanca širenja infekcije."</string>
+    <string name="onboarding_go_text">"Hvala vam što pomažete u suzbijanju širenja virusa korone."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Pokreni"</string>
@@ -448,7 +448,7 @@ Pridržavajte se dobijenih uputstava o izolaciji."</string>
     <string name="meldung_detail_new_contact_title">"Moguća infekcija"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Postoji sumnja na moguću infekciju."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Postoji sumnja da ste se inficirali."</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Vremenska greška"</string>
@@ -584,7 +584,7 @@ Time se potrošnja baterije samo neznatno povećava."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Šta su poruke?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"Aplikacija redovno proverava da li su drugi korisnici sa kojima ste bili u kontaktu prijavili pozitivan test.
+    <string name="meldungen_nomeldungen_faq1_text">"Aplikacija redovno proverava da li su drugi korisnici, sa kojima ste bili u kontaktu, prijavili pozitivan test.
 
 U slučaju moguće infekcije, dobićete obaveštenje na zaključanom ekranu."</string>
 
@@ -625,7 +625,7 @@ Time se obezbeđuje da samo potvrđeni slučajevi budu prijavljeni preko aplikac
     <string name="inform_detail_faq2_title">"Šta se šalje?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Šalju se samo privatni identifikacioni ključevi iz vaše aplikacije, a ne šalju se lični podaci.
+    <string name="inform_detail_faq2_text">"Šalju se samo privatni ključevi iz vaše aplikacije i šifrovani ID podaci vaših prijava, a ne šalju se lični podaci.
 
 Time drugi korisnici aplikacije SwissCovid mogu da saznaju da postoji mogućnost infekcije."</string>
 
@@ -636,7 +636,7 @@ Time drugi korisnici aplikacije SwissCovid mogu da saznaju da postoji mogućnost
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Važna napomena"</string>
+    <string name="inform_code_intro_title">"Informacije za korišćenje "</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
     <string name="inform_code_intro_text">"Iako se lični podaci koji se odnose na vas ne šalju, možda se neko seća svog kontakta sa vama na osnovu datuma."</string>
@@ -710,7 +710,7 @@ Osim toga, mogući su sledeći simptomi:
     <string name="onboarding_gaen_title">"Aktiviraj praćenje"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <string name="onboarding_gaen_text_ios">"Da biste mogli da koristite aplikaciju, morate da aktivirate obavijesti o izloženosti bolesti COVID-19."</string>
+    <string name="onboarding_gaen_text_ios">"Za identifikaciju kontakata, mora biti aktivirana funkcija praćenja."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Aktiviraj"</string>
@@ -739,10 +739,10 @@ Osim toga, mogući su sledeći simptomi:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"Da li želite da završite fazu izolacije?"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Da li ste sigurni da želite da obrišete poruku?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignoriši optimizaciju baterije"</string>
-    <string name="android_onboarding_battery_permission_text">"Da biste uvek mogli da prepoznate kontakte, optimizacija baterije za ovu aplikaciju mora biti isključena."</string>
+    <string name="android_onboarding_battery_permission_text">"Kako bi aplikacija funkcionisala, optimizacija baterije mora biti isključena."</string>
     <string name="android_onboarding_battery_permission_button">"Dozvoli"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Samo za ovu aplikaciju"</string>
@@ -764,7 +764,7 @@ Osim toga, mogući su sledeći simptomi:
     <string name="tracing_permission_error_title_ios">"COVID-19: obavještenja deaktivirano"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <string name="tracing_permission_error_text_ios">"Aktivirajte Obavijesti o izloženosti bolesti COVID-19 da bi praćenje radilo."</string>
+    <string name="tracing_permission_error_text_ios">"Aktivirajte funkciju  {TRACING_SETTING_TEXT}, kako bi  funkcionisalo anonimno praćenje."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Slanje poruke nije uspelo. Dozvolite deljenje nasumičnog ID-a sa aplikacijom SwissCovid."</string>
@@ -806,9 +806,8 @@ Ako trenutno na uređaju nije dostupno ažuriranje, probajte kasnije ponovo."</s
     <string name="tracing_active_tracking_always_info">"Aplikacija SwissCovid ostaje aktivna čak i kad se zatvori."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-prekida lanac 
-širenja infekcije."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid - brze informacije u slučaju rizika od zaraze. 
+"</string>
     <string name="inform_detail_faq3_text">"Iako se lični podaci koji se odnose na vas ne šalju, možda se neko seća svog kontakta sa vama na osnovu datuma."</string>
     <string name="inform_detail_faq3_title">"Da li ostajem anoniman?"</string>
 
@@ -819,7 +818,7 @@ prekida lanac
     <string name="tracing_setting_text_android">"Obavijesti o izloženosti bolesti COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Da biste mogli da koristite aplikaciju, morate da aktivirate obavijesti o izloženosti bolesti COVID-19."</string>
+    <string name="onboarding_gaen_text_android">"Za identifikaciju kontakata, mora biti aktivirana funkcija praćenja."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -912,7 +911,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Putovanja"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid funkcijoniše u sledećim državama:"</string>
+    <string name="travel_home_description">"SwissCovid-kontakti funkcionišu u sledećim državama:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Šta to znači?"</string>
@@ -942,12 +941,6 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1229,9 +1222,9 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="delete_infection_dialog_finish_button">"Beenden (završi)"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Kontakti više neće da se čuvaju.
+    <string name="tracing_ended_info">"Kontakti se više neće čuvati i nove prijave nisu više moguće.
 
-Praćenje može ponovo da se aktivira po završetku izolacije."</string>
+Ove dve funkcije mogu se ponovo aktivirati po završetku izolacije."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1263,7 +1256,7 @@ Praćenje može ponovo da se aktivira po završetku izolacije."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Da li ste bez sluha ili imate smetnju sluha i ne možete nazvati Infoline Coronavirus?
+    <string name="hearing_impaired_info">"Da li ste bez sluha ili imate oštećenje sluha i ne možete nazvati?
 
 Onda pošaljite e-mail na covid-support@medgate.ch"</string>
 
@@ -1318,8 +1311,8 @@ Vreme je odlučujući faktor u suzbijanju Corona virusa: što je vreme između p
     <string name="stats_cases_current_description">"Grafika pokazuje prijavljene nove infekcije poslednjih 28 dana. Time imate pregled o aktuelnom razvoju."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"Pozitivno ste testirani (PCR test ili antigen brzi test) i ni posle 4 sata niste dobili kovid šifru?
-U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
+    <string name="inform_detail_infobox1_text">"Pozitivno ste testirani (PCR test ili brzi antigen test) i ni posle 4 sata niste dobili Covid kod?
+U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Još niste dobili Covid šifru?"</string>
@@ -1358,13 +1351,13 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Ko se obaveštava"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Obaveštavaju se svi kontakti u periodu vaše faze zaražavanja od {ONSET_DATE} do unosa kovid šifre, ukoliko je na osnovu distance i trajanja postojala mogućnost zaraze."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Obaveštavaju se svi kontakti u periodu vaše faze infekcioznosti od {ONSET_DATE} do unosa Covid koda, ukoliko je na osnovu distance i trajanja ili zbog prijave na istoj lokaciji postojala mogućnost zaraze."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – danas"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Na taj način pomažete u zaustavljanju lanca zaraze."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Na taj način pomažete da se upozore drugi o mogućosti zaraze."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Privatni ključevi vaše aplikacije poslati su za sledeći period:"</string>
@@ -1403,363 +1396,359 @@ U tom slučaju kontaktirajte Infoline Coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Za 1 dan"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Želite li da se odjavite?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Automatska odjava"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"Automatski ste odjavljeni."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Skenirati QR kod i prijaviti se"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"Nevažeći QR kod!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"Od"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"Do"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Dodati zabelešku"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"npr. S kim ste bili tamo?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Gotovo"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Isključeno"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours">"{HOURS} h"</string>
+    <string name="reminder_option_hours">"časovi {HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+    <string name="reminder_option_minutes">"minute {MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"Aplikaciji je potreban pristup kameri, da bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Moje prijave"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title">"Check-in"</string>
+    <string name="checkin_button_title">"Prijava"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"Kamera je potrebna, kako bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Dozvolite identifikaciju lica, da biste mogli bezbedno pristupiti vašem dnevniku."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"Identifikujte se za pristup dnevniku"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Odjava "</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-in"</string>
+    <string name="module_checkins_title">"Prijava"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <string name="checkin_title">"Prijava"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Napraviti QR kod"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Ponuditi prijave?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Sada se prijaviti"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"Podsećanje nije uspelo da se unese"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Da biste dobijali podsetnike za odjavu, morate da dozvolite \ \"Obaveštenja \\" u podešavanjima aplikacije."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Prilagoditi"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Urediti"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Još nema unosa"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Ako skenirate SwissCovid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid-u treba pristup kameri na vašem aparatu. Kamera se koristi, kako bi se skenirao QR kod."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Dozvoliti pristup kameri"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"npr. soba ili naziv događaja"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
-    <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="show_pdf_button">"Odštampati PDF"</string>
+    <string name="bottom_nav_tab_info">"Informacija"</string>
+    <string name="error_network_title">"Mrežna greška"</string>
+    <string name="error_network_text">"Proverite vašu vezu sa internetom "</string>
+    <string name="error_action_retry">"Pokušajte ponovo"</string>
+    <string name="error_notification_deactivated_title">"Deaktivirati obaveštenja"</string>
+    <string name="error_notification_deactivated_text">"Promenite podešavanja, kako biste bili direktno bili obavešteni o prijavi."</string>
+    <string name="error_action_change_settings">"Promenite podešavanja"</string>
+    <string name="error_camera_permission_title">"Nema pristupa kameri"</string>
+    <string name="error_camera_permission_text">"Aplikaciji je potreban pristup kameri, kako bi se mogao skenirati QR kod."</string>
+    <string name="error_title">"Greška"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR kod je još nevažeći"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"QR kod je nevažeći "</string>
+    <string name="error_already_checked_in">"Upravo ste prijavljeni."</string>
+    <string name="error_update_text">"Ovaj QR kod nije kompatibilan sa instaliranom verzijom aplikacije. Ažurirajte aplikaciju, da biste nastavili korišćenje."</string>
+    <string name="error_update_title">"Potrebno ažuriranje"</string>
+    <string name="error_action_update">"Sada ažurirati"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Odjava "</string>
+    <string name="reminder_notification_snooze_action">"Snooze mirovanje"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Poruka o trajnom prijavljivanju"</string>
+    <string name="ongoing_notification_title">"Prijavljeni ste {TIME} časova."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Osigurati"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Skenirati QR kod"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Deaktivirano prijavljivanje"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Trenutno nije moguća prijava"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Ako skenirate Swiss-Covid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Prijavljeni ste"</string>
+    <string name="checkout_from_to_date">"{DATE1} do {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Više o Covid kodu"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Ukloniti unos"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Izbrisati"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Podeliti"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Štampati"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Deliti unose o prijavama"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Kada delite unose prijave, aplikacija može istovremeno da obavesti lica, koja su se prijavila na istoj lokaciji."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Izabrati sve"</string>
+    <string name="inform_dont_send_button_title">"Ne slati"</string>
+    <string name="inform_dont_share_button_title">"Ne deliti"</string>
+    <string name="inform_really_not_share_title">"Zaista ne deliti?"</string>
+    <string name="inform_really_not_share_subtitle">"Deljenje privatnog ključa pomaže «SvissCovid» da obavesti druge potencijalno zaražene ljude i spreči dalje širenje virusa. Ako ne delite privatne ključeve, potencijalno zaražene osobe neće biti obaveštene."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Ukloniti unos"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"Vaš unos će biti neopozivo uklonjen sa liste."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Ukoniti u potpunosti"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Samo sakriti i nastaviti da budete obaveštavani?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Test pozitivan?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Kontakte i prijave ponovo aktivirati. "</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"časovi {HOURS} h minute {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Ne možete ponovo da se prijavite ako imate pozitivan test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Napravite QR kod, pomoću kojeg lica mogu da se prijave na lokaciji."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? "</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Samostalno prijavljivanje"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na lokaciji."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Nije moguće obezbeđenje"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Odabrana vremena se preklapaju sa ostalim prijavama iz vašeg dnevnika. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Vaši odabrani unosi za prijavu su poslati. Biće obaveštena sva lica koja su se istovremeno prijavili na istom mestu."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"SwissCovid prijava
+
+"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Prijaviti se bez ostavljanja podataka"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"Pomoći aplikacije SwissCovid možete jednostavno da se prijavite kod nas ne ostavljajući svoje podatke. U slučaju rizične situacije, brzo ćete biti obavešteni u aplikaciji."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"SwissCovid aplikacija"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Sada preuzeti"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Prijaviti se bez ostavljanja podataka"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Ovde unesite svoj Covid kod, kako biste upozorili druge."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"Kraj izolacije?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Želite da ponudite prijave?"</string>
+    <string name="checkin_footer_title1">"Čemu služi funkcija prijave?"</string>
+    <string name="checkin_footer_subtitle1">"Funkcija prijave bez unošenja podataka o kontaktima povećava funkcije aplikacije SwissCovid. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istom mestu."</string>
+    <string name="checkin_footer_title2">"Nema centralnog čuvanja podataka"</string>
+    <string name="checkin_footer_subtitle2">"Za SwissCovid prijave ne treba unositi lične podatke kao što su ime, adresa ili telefonski broj i ne beleže se GPS podaci o lokaciji. Spisak prijava čuva se lokalno na vašem mobilnom telefonu. Lokalni podaci će se izbrisati nakon 14 dana."</string>
+    <string name="events_empty_state_title">"Napravite QR kod"</string>
+    <string name="events_empty_state_subtitle">"Sa SwissCovid-QR kodom mogu se na licu mjesta prijaviti lica, a da ne ostavljaju svoje podatke.  "</string>
+    <string name="events_info_box_title">"To nije zamena za obavezni unos kontakt podataka"</string>
+    <string name="events_info_box_text">"SwissCovid prijave nisu zamena za obavezu evidenciju kontakt podataka utvrđenu u „Pravilniku Covid 19 za posebne situacije“."</string>
+    <string name="events_footer_title1">"Gde se mogu koristiti prijave?"</string>
+    <string name="events_footer_title2">"Zašto služi funkcija prijave?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid prijave se mogu koristiti tamo gde se ljudi sastaju, ali ne postoji obaveza beleženja podataka o kontaktima.                                                                 Moguće lokacije:
+- Privatni događaji
+- Događaji u klubovima
+- Sastanci u profesionalnom okruženju kao što su sale za sastanke, kancelarije, menze itd. \""</string>
+    <string name="events_footer_subtitle2">"Funkcija prijave bez unošenja podataka o kontaktima proširuje funkcije aplikacije. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istoj lokaciji."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Rizična situacija"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Kontakti"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Prijava"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Šta treba da uradima?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Pozitivna prijava"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Pozitivne prijave / kontakti"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"QR kod korisnika"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"QR kod za praćenje kontakata"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Ako je rezultat testa pozitivan, funkcija prijave se automatski deaktivira. Može se ponovo aktivirati nakon završetka izolacije."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Dodelite naziv, koji detaljnije opisuje lokaciju ili vaš događaj.                                            Ovaj naziv će biti prikazan prilikom prijave."</string>
+    <string name="checkin_report_heading">"Šta možete da uradite?"</string>
+    <string name="checkin_report_title1">"Zaštititi kontakte"</string>
+    <string name="checkin_report_title2">"Obratiti pažnju na simptome"</string>
+    <string name="checkin_report_title3">"Vršiti testiranje"</string>
+    <string name="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."</string>
+    <string name="checkin_report_subtitle2">"Proveravajte svoje zdravsveno stanje."</string>
+    <string name="checkin_report_subtitle3">"Odmah se testirajte ako imate simptome. Čak i ako nema simptoma, test korone je važan i  preporučuje se."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="meldung_detail_checkin_title">"Prijava"</string>
+    <string name="not_thank_you_screen_title">"Podaci nisu poslati"</string>
+    <string name="not_thank_you_screen_text1">"Nisu poslati privatni ključevi."</string>
+    <string name="not_thank_you_screen_back_button">"Nazad"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Ne slati nikakve podatke"</string>
+    <string name="not_thank_you_screen_text2">"Nisu poslati unosi za prijavu."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
-    <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="inform_share_checkins_send_button_title">"Deliti izbor"</string>
+    <string name="inform_share_checkins_not_send_button">"Ne deliti"</string>
+    <string name="onboarding_checkin_title">"Prijaviti se bez unošenja podataka"</string>
+    <string name="onboarding_checkin_heading">"Prijave"</string>
+    <string name="onboarding_checkin_text1">"Sa SwissCovid prijavama možete da koristite aplikaciju za prijavu na nekoj lokaciji ili prilikom sastanka."</string>
+    <string name="onboarding_checkin_text2">"Vaše prisustvo se memoriše samo u aplikaciji. Ne morate da ostavljate lične podatke u aplikaciji."</string>
+    <string name="checkin_updateboarding_text">"Sa SwissCovid prijavama možete da koristite aplikaciju za prijavu na nekoj lokaciji ili prilikom sastanka. Vaše prisustvo se memoriše samo u aplikaciji. Ne morate da ostavljate lične podatke u aplikaciji. U ove svrhe ažurirani su uslovi korišćenja i izjava o zaštiti podataka."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Preskočiti"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"Šifrovani unos čuva se u pozadini aplikacije 14 dana. U slučaju moguće infekcije, i dalje možete biti obavešteni."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Sada sakriti"</string>
+    <string name="checkin_set_reminder_explanation">"Aplikacija vas može podsetiti da se odjavite u pravo vreme."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"Ili potpuno ukloniti?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"Unos je potpuno uklonjen. Više ne možete biti upozoreni."</string>
+    <string name="not_thank_you_screen_text3">"Niko neće biti obavešten."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"Šta treba da znam o testiranju?"</string>
+    <string name="instant_app_install_action">"Instalirati aplikaciju i prijavite se"</string>
+    <string name="partial_onboarding_box_text">"Završite konfiguraciju aplikacije, kako biste mogli da koristite funkciju praćenja."</string>
+    <string name="partial_onboarding_box_action">"Završiti sada"</string>
+    <string name="partial_onboarding_done_title">"Konfiguracija završena"</string>
+    <string name="partial_onboarding_done_text">"Hvala vam što pomažete u suzbijanju širenja virusa korone."</string>
+    <string name="web_slogan">"Brze informacije u slučaju rizika od zaraze. "</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index 4a072b544..db660c206 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -103,7 +103,7 @@
     <string name="meldungen_meldung_title">"ብሕማም  ናይ ምልካፍ ተኽእሎ"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"ብሕማም  ናይ ምልካፍ ተኽእሎ ኣሎ።"</string>
+    <string name="meldungen_meldung_text">"ልበዳ ተለኪፍኩም ትኾኑ"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"ኣፕ ይሰርሕ ኣሎ"</string>
@@ -193,7 +193,7 @@
     <string name="inform_detail_box_subtitle">"ብኮቪድኮድ"</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"ሰንሰለት ለበዳ ሕማም ምቁራጽ"</string>
+    <string name="inform_detail_box_title">"ካብ ክፍጸሙ ዝኽእሉ ልበዳታት ምጥንቃቕ"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"ኮቪድኮድ ኣእትው"</string>
@@ -227,7 +227,7 @@
     <string name="tracing_turned_off_title">"ኣገልግሎት ምክትታል ኣይሰርሕን ኣሎ (ጠፊኡ ኣሎ)"</string>
     <string name="tracing_turned_off_text">"እቲ ኣፕ ክሰርሕ ምእንታን ነቲ ኣገልግሎት ምክትታል ከም ዝሰርሕ ግበርዎ (ወልዕዎ)። "</string>
     <string name="bluetooth_turned_off_title">"ብሉቱዝ ጠፊኡ ኣሎ"</string>
-    <string name="bluetooth_turned_off_text">"ኣገልግሎት ምክትታል ክስርሕ ምእንታን ኣብ ሞባይልኩም ብሉቱዝ ክፈቱ።"</string>
+    <string name="bluetooth_turned_off_text">"ኣገልግሎት ስመ-ስውር ምክትታል ክስርሕ ምእንታን ኣብ ሞባይልኩም ብሉቱዝ ክፈቱ።"</string>
     <string name="bluetooth_turn_on_button_title">"ብሉቱዝ ክፈትዎ"</string>
     <string name="bluetooth_permission_error_title">"ምጥቃም ብሉቱዝ ተነጺጉ"</string>
     <string name="bluetooth_permission_error_text">"ኣገልግሎት ምክትታል ክስርሕ ምእንታን ብሉቱዝ ምጥቃም ኣፍቅዱ።  "</string>
@@ -259,11 +259,11 @@
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"ንምግላል ዝምልከት ዝተወሃበኩም መምርሒታት ተኸታተሉ። "</string>
-    <string name="tracing_ended_title">"ምክትታል ተወዲኡ"</string>
-    <string name="tracing_ended_text">"ካብ ሕጂ ንንዮ ርክባት ኣይዕቀቡን እዮም። "</string>
+    <string name="tracing_ended_title">"ምርኽኻብን ቸክ-ኢንን ተዓጽዩ ኣሎ"</string>
+    <string name="tracing_ended_text">"ዝኾነ ምርኽኻብ ኣይክዕቀብን እዩ"</string>
     <string name="exposed_info_contact_hotline">"ን…..ተወከሱ"</string>
     <string name="meldung_homescreen_positive_info_line1">"ን……..ተኸታተሉ"</string>
-    <string name="meldung_homescreen_positive_info_line2">"ባዕልኻ ነብስኻ ንምግላል ዝምልከት መምርሒታት "</string>
+    <string name="meldung_homescreen_positive_info_line2">"ንምግላል ዝምልከት መምርሒታት"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"ሓድሽ ሓበሬታ"</string>
@@ -273,7 +273,7 @@
     <string name="meldung_homescreen_positiv_title">"ውጽኢት መርመራ ፖዚቲቭ ኮይኑ"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"ተኽእሎ ናይ ለበዳ ሕማም ኣሎ። "</string>
+    <string name="meldung_detail_exposed_subtitle">"ልበዳ ተለኪፍኩም ትኾኑ"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"ዝገበርካዮ መርመራ ንኮሮናቫይረስ ውጽኢቱ ፖዚቲቭ ኮይኑ ተረኺቡ።"</string>
@@ -342,7 +342,7 @@
     <string name="onboarding_privacy_text2">"እቶም ዝተዓቀቡ ብግምት ዝተሰርዑ መለልዪ ቁጽርታት ኣብ ሞባይልኩም ጸኒሖም ድሕሪ 14 መዓልቲ ይስረዙ።"</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"እቲ ኣፕ ከምይ ይሰርሕ፧"</string>
+    <string name="onboarding_begegnungen_heading">"ምርኽኻብ"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"ሳላ ብሉቱዝ ርክባት ምልላይ "</string>
@@ -414,7 +414,7 @@
     <string name="onboarding_go_title">"እቲ ኣፕ ተዳልዩ ኣሎ።"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"ሰንሰለት ለበዳ ሕማም ንምቁራጽ ምትሕግጋዝኩም ኣዚና ነመስግነኩም።"</string>
+    <string name="onboarding_go_text">"ምዝርጋሕ ኮሮናቫይረስ ንምድራት እትገብሩ ምትሕብባር ነመስግነኩም ኢና።"</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"ምጅማር"</string>
@@ -441,7 +441,7 @@
     <string name="meldung_detail_new_contact_title">"ከምብሓድሽ ጥርጠራ"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"ተኽእሎ ናይ ምልካፍ ብሕማም ኣሎ።"</string>
+    <string name="meldung_detail_new_contact_subtitle">"ልበዳ ተለኪፍኩም ትኾኑ"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"ናይ ሰዓት ጌጋ"</string>
@@ -573,8 +573,9 @@
     <string name="meldungen_nomeldungen_faq1_title">"ሓበሬታ ክብሃል ከሎ እንታይ ማለት እዩ፧"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"እቲ ኣፕ ክልኦት ዝተራኸብኩሞም ተጠቀምቲ  ብመርመራ ፖዚቲቭ ከምዝኾኑ ሓቢሮም እንተኾይኖም ቀጻሊ ይምርምር። 
-ተኽእሎ ምልካፍ ብሕማም ምስዝህሉ ብመነግዲ መልእኽቲ ኣብ ዕጹው ስክሪን ሞባይል ክትሕበሩ ኢኹም።  "</string>
+    <string name="meldungen_nomeldungen_faq1_text">"እቲ ኣፕ ክልኦት ዝተራኸብኩሞም ተጠቀምቲ  ብመርመራ ፖዚቲቭ ከምዝኾኑ ሓቢሮም እንተኾይኖም ቀጻሊ ይምርምር።
+
+ኣብ ክፍጸም ዝኽእል ልበዳ ብመልእኽቲ ኣብ መዕጸዊ ስክሪን ክትሕበሩ ኢኹም።"</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"መስመር ሓበሬታ ስዊስኮቪድ ብዛዕባ  ተኽእሎ ካብ ክፍሊት ነጻ ናይ ዝኾነ መርመራ የማኽረኩም።  "</string>
@@ -611,8 +612,8 @@
 
     <!-- Inform Detail FAQ Text -->
     <string name="inform_detail_faq2_text">"ውልቃዊ ሓበሬታ ዘይኮነ፣ ጥራይ እቶም ግላውያን መፋትሕ እዮም ዝስደዱ።
-  
-ብኸምዚ መንገዲ ካልኦት ተጠቀምቲ ስዊስኮቪድ ተኽእሎ መልከፍቲ ሕማም ከምዘሎ ይፈልጡ።"</string>
+
+ተኽእሎ ናይ ምልከፍቲ ከምዘሎ እቶም ተጠቀምቲ ስዊስ ኮቪድ ኣፕ (SwissCovid App) ክፈልጡ ይኽእሉ።"</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -621,10 +622,10 @@
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"ኣገዳሲ ሓበሬታ"</string>
+    <string name="inform_code_intro_title">"ሓበሬታ ብዛዕባ ምእትታው"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"ዝኾነ ሓበሬታ ብዛዕባኹም ዋላኳ እንተዘይተሰደደ: ዝኾነ ሰብ በቲ ዕለት ጌሩ ምርኻብኩም ክዝክሮ ይኽእል እዩ። "</string>
+    <string name="inform_code_intro_text">"ዝኾነ ሓበሬታ ብዛዕባኹም ዋላኳ እንተዘይተሰደደ: ዝኾነ ሰብ በቲ ዕለት ጌሩ ምርኻብኩም ክዝክሮ ይኽእል እዩ።"</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
     <string name="inform_code_intro_button">"ተሰማሚዐ"</string>
@@ -696,7 +697,7 @@
     <string name="onboarding_gaen_title">"ኣገልግሎት ምክትታል ከም ዝሰርሕ ግበርዎ (ወልዕዎ)"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <string name="onboarding_gaen_text_ios">"ኣፕ ምጥቃም ንምኽኣል ናይ ኮቪድ-19 መልእኽትታት ናይ ርክባት ከጅመሩ (ከም ዝሰርሑ ክግበሩ) ኣለዎም።"</string>
+    <string name="onboarding_gaen_text_ios">"እቲ ናይ ምክትታል ኣገባብ ክውላዕ ኣለዎ፣ ምርኽኻብ ክረጋገጽ መታን ክከኣል።"</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"ምውላዕ (ከም ዝሰርሕ ምግባር)"</string>
@@ -725,10 +726,10 @@
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"ግለላ ምዝዛም"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"ሓበሬታ ናይ ብሓቂ  ክትድምስስዎ ደሊኹም ዶ፧"</string>
     <string name="android_onboarding_battery_permission_title">"ኣገልግሎት ምምሕያሽ ባትሪ (ኣኩ) ሸለል ምባል"</string>
-    <string name="android_onboarding_battery_permission_text">"ርክባት ኩልግዜ ምልላይ ንምኽኣል: ኣገልግሎት ምምሕያሽ ባትሪ (ኣኩ)ናይዚ ኣፕ ዕጹው ክኸውን ኣለዎ።  "</string>
+    <string name="android_onboarding_battery_permission_text">"ዝኾነ ምቍጣብ ባትሪ ዘልዕል ኣገባብ ኣብቲ ሞባይል ክጠፍእ ኣለዎ፣ እቲ ኤፕ መታን ጽቡቕ ክሰርሕ።"</string>
     <string name="android_onboarding_battery_permission_button">"ምፍቃድ (ሐራይ ምባል)"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"ሐራይ"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"ነዚ ኣፕ ጥራይ"</string>
@@ -750,7 +751,7 @@
     <string name="tracing_permission_error_title_ios">"መልእኽትታት ርክባት ኮቪድ-19 ኣይሰርሕን ኣሎ (ዕጹው ኣሎ) "</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <string name="tracing_permission_error_text_ios">"ምክትታል ክሰርሕ ምእንቲ  መልእኽትታት ርክባት ኮቪድ-19 ከምዝሰርሕ ግበርዎ (ወልዕዎ)። "</string>
+    <string name="tracing_permission_error_text_ios">"ን {TRACING_SETTING_TEXT} ወልዕዎ፣ እቲ ስመ-ስውር ምክትታል ክሰርሕ ምእንቲ ክኽእል።"</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"መልእኽቲ ክስደድ ኣይክኣለን። ብግምት ዝተሰርዑ መለልዪ ቁጽርታትኩም ብስዊስኮቪድ ኣፕ ንኽከፋፈል ኣፍቅዱ። "</string>
@@ -791,7 +792,8 @@
     <string name="tracing_active_tracking_always_info">"እቲ ኣፕ ዋላ እንተተዓጽወ ስዊስኮቪድ ይስርሕ እዩ።"</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"ስዊስኮቪድ ንሰነሰለት ለበዳ ሕማም የቋርጾ"</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid -
+ኣብ ርከሳ ልበዳ ብቕልጡፍ ትሕበሩ።"</string>
     <string name="inform_detail_faq3_text">"ዋላኳ  ዝኾነ ሓበሬታ ብዛዕባኹም እንተዘይተሰደደ ዝኾነ ሰብ በቲ ዕለት ጌሩ ምርኻብኩም ክዝክሮ ይኽእል እዩ። "</string>
     <string name="inform_detail_faq3_title">"ስቱር ድዩ፧"</string>
 
@@ -802,7 +804,7 @@
     <string name="tracing_setting_text_android">" መልእኽትታት ኮቪድ-19 "</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"ኣፕ ምጥቃም ንኽክኣል መልእኽትታት ናይ ኮቪድ-19 ክኽፈቱ ወይ ከም ዝሰርሑ ክግብሩ ኣለዎም።"</string>
+    <string name="onboarding_gaen_text_android">"እቲ ናይ ምክትታል ኣገባብ ክውላዕ ኣለዎ፣ ምርኽኻብ ክረጋገጽ መታን ክከኣል።"</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"ስዊዝኮቪድ"</string>
@@ -895,7 +897,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"መገሻታት"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid ኣብ ዝስዕቡ ሃገራት ይሰርሕ፥"</string>
+    <string name="travel_home_description">"ምርኽኻብ SwissCovid ኣብ ዝስዕቡ ሃገራት ይሰርሕ፥"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"እዚ እንታይ ማለት፧"</string>
@@ -925,12 +927,6 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1212,9 +1208,9 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="delete_infection_dialog_finish_button">"ተዛዘመ"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"ምዕቃብ ዝኾነ ምርኽኻብ ተገዲፉ።
+    <string name="tracing_ended_info">"ዝኾነ ሓድሽ ምርኽኻብ ካብ ምዕቃብ ክቋረጽ እዩ ከምኡ ድማ ሓድሽ ቸክ-ኢን ክግበር ኣይክእልን።
 
-እቲ ምክትታል ድሕሪ ግለላ ምሊሱ ክውላዕ ይከኣል።"</string>
+እቲ ግለላ ምስተወድአ ክልተኦም ኣገባባት እንደገና ክውላዑ ይከኣሉ።"</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1246,7 +1242,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"ክትሰምዑ ኣይትኽእሉን ወይ ናይ ምስማዕ ስንክልና ስለዘለና ነቲ ሓበሬታ ስልኪ ኮሮናቫይረስ ክትድውሉ ኣይትኽእሉን፧
+    <string name="hearing_impaired_info">"ክትሰምዑ ኣይትኽእሉን ወይ ናይ ምስማዕ ስንክልና ኣለኩም ከምኡ ድማ ክትድውሉ ኣይትኽእሉን፧
 
 ሽዑ ኢመይል ናብ covid-support@medgate.ch ስደዱ ኢኹም"</string>
 
@@ -1301,7 +1297,8 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="stats_cases_current_description">"እቲ ስእሊ ነቶም ዝተሓበሩ ሓድሽቲ ልበዳታት ኣብ ዝሓለፉ 28 መዓልትታት የርኢ። እዚ ሓፈሻዊ ሓበሬታ ብዛዕባ ግዝያዊ ምዕባለ ይህብ።"</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"ፖዚቲቭ ተመርሚርኩም (ናይ PCR መርመራ ወይ ቅልጡፍ መርመራ ጸረ-ፈርዒ) ከምኡ'ውን ድሕሪ 4 ሰዓት ገና ናይ ኮቪድ ኮድ ኣይተወሃብኩምን፧ ሽዑ እቲ ኢንፎላይን ኮሮናቫይረስ ርኸቡ ኢኹም፥"</string>
+    <string name="inform_detail_infobox1_text">"ፖዚቲቭ ተመርሚርኩም (ናይ PCR መርመራ ወይ ቅልጡፍ መርመራ ጸረ-ፈርዒ) ከምኡ'ውን ድሕሪ 4 ሰዓት ገና ናይ ኮቪድ ኮድ ኣይተወሃብኩምን፧
+ሽዑ ናብዚ ደውሉ ኢኹም፥"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"ናይ ኮቪድ ኮድ ገና የብልኩምን፧"</string>
@@ -1325,7 +1322,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="travel_screen_compatible_countries">"ተቓደውቲ ሃገራት፥"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"ገየሽቲ ካብ ወጻኢ ውን መታን ክጥንቀቑ፣ እቶም ግላውያን መፋትሕ ምስቶም ኮሮና ኤፕስ ናይቶም ተቓደውቲ ሃገራት ክካፈሉ እዮም።"</string>
+    <string name="inform_code_travel_text">"ገየሽቲ ካብ ወጻኢ ውን ድሕሪ ምርኽኻብ መጠንቀቕታ መታን ክወሃቡ፣ እቶም ግላውያን መፋትሕ ምስቶም ኮሮና ኤፕስ ናይቶም ተቓደውቲ ሃገራት ክካፈሉ እዮም።"</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"ጥቕላላ"</string>
@@ -1340,13 +1337,13 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="meldungen_positive_tested_faq2_title">"መን ክሕበር እዩ፧"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"ኩሎም ኣብ እዋንኩም መልከፍቲ ካብ {ONSET_DATE} ክሳብ ምእታው ኮቪድ-ኮድ ዝነበረኩም ርክባት ክሕበሩ እዮም፣ ብምኽንያት ርሕቐትን እዋንን ኣማራጺ ልበዳ እንድሕር ኔሩ።"</string>
+    <string name="meldungen_positive_tested_faq2_text">"ኩሎም ኣብ እዋንኩም መልከፍቲ ካብ {ONSET_DATE} ክሳብ ምእታው ኮቪድ-ኮድ ዝነበረኩም ርክባት ክሕበሩ እዮም፣ ብምኽንያት ርሕቐትን እዋንን ናይ ልበዳ ርከሳ እንድሕር ኔሩ ወይ ኣብ ማዕረ ቦታ ብችክ-ኢን እድንድሕር ተመዝጊብኩም ኔርኩም።"</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – ሎሚ"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"ሽዑ ናይ ልበዳ ሰንሰለታት ንክቋረጹ ትሐባበሩ ኢኹም።"</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"በዚ መንገዲ‘ዚ ካልኦት ሰባት ካብ ክፍጸም ዝኽእል ልበዳ ንክጥንቀቑ ትሕግዙ ኣለኹ።"</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"ግላውያን መፋትሕ ናይ ኤፕኩም ንዝስዕብ እዋን ተሰዲዶም ኔሮም፥"</string>
@@ -1385,46 +1382,46 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="meldungen_detail_free_test_tomorrow">"ኣብ 1 መዓልቲ"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"ናይ ቸክ-ኣውት/መውጽኢ መዘኻኸሪ"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"ክትወጹ ደሊኹም ዶ፧"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"ኣውቶማቲካሊ ቸክ-ኣውት"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"ብኣውቶማቲካሊ ከም ትወጹ ተገሩ።"</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"ኮድ Code ስኬን ምግባርን ምእታውን"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"ብቑዕ QR-ኮድ ኣይኮነን!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"ካብ"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"ክሳብ"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"ምልክታ ምውሳኽ"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"ንኣ. ምስ መን ኔርኩም፧"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"ተፈጺሙ"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"ናይ ቸክ-ኣውት/መውጽኢ መዘኻኸሪ"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"ወጽአ"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"መዝገበ-ዕለት ንክትረኽቡ ፍቓድ መእተዊ ኣምጽኡ።"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
     <string name="reminder_option_hours">"{HOURS} h"</string>
@@ -1433,315 +1430,313 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"እቲ ኤፕ ርክብ ምስቲ ካመራ ክህልዎ ኣለዎ፣ ነቲ ኮድ QR ስኬን ክገብር መታን ክኽእል።"</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"ናተይ ቸክ-ኢን"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title">"Check-in"</string>
+    <string name="checkin_button_title">"ቸክ-ኢን"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"ካሜራ ነቲ ኮድ QR ስኬን ንክትገብር፣ ተድልያ።"</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"ነቲ ናይ ገጽ ኣይ.ዲ. ኣፍቅዱ፣ ንመዝገበ-ዕለትኩም ብርጉጽ ንክትረኽብዎ።"</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"መዝገበ-ዕለት ንክትረኽቡ ፍቓድ መእተዊ ኣምጽኡ።"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"ቸክ-ኣውት"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-in"</string>
+    <string name="module_checkins_title">"ቸክ-ኢን"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <string name="checkin_title">"ቸክ-ኢን"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"QR-ኮድ ምፍጣር"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"ቸክ-ኢን ምቕራብ"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"ሕጂ ቸክ-ኢን ምእታው"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"እቲ መዘኻኸሪ ክዕቀብ ኣይከኣለን"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"ናይ ቸክ-ኣውት መዘኻኸሪታት መታን ክትቕበሉ \\"Mitteilungen/መልእኽትታት\\" ኣብቲ ምስትኽኽእል ኤፕ ከተፍቕዱ ኣለኩም።"</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"ምስናድ"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"ምስራሕ"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"ገና መዝገባት የለውን"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"ናይ ስዊዝ ኮቪድ ኮድ QR ኣብቲ ቦታ ንክትኣትዉ ስከን እንተገበርክኩም፣ ኣውቶማቲካሊ መዝገብ ክዕቀብ እዩ።"</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid ምምርኽኻብ ምስ ካመራ ኣብ መሳርሒኹም የድሊ። እታ ካሜራ ጥራይ ኮድ QR ስኬን ንምግባር ትጥቀም እያ።"</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"መርከቢ ካመራ ምፍቓድ"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"ንኣ. ክፍሊ ወይ ቦታ ፍጻሜ"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
-    <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="show_pdf_button">"PDF ፕሪንት ምግባር"</string>
+    <string name="bottom_nav_tab_info">"ሓበሬታ"</string>
+    <string name="error_network_title">"ጉድለት መርበብ"</string>
+    <string name="error_network_text">"ምትእስሳር ኢንተርነትኩም ኣረጋግጹ ኢኹም"</string>
+    <string name="error_action_retry">"ብሓድሽ ምፍታን"</string>
+    <string name="error_notification_deactivated_title">"መልእኽትታት ጠፊኦም"</string>
+    <string name="error_notification_deactivated_text">"ኣብ ሓደ መልእኽቲ ብቐጥታ መታን ክትሕበሩ ነቲ ምስትኽኻል ቀይሩ ኢኹም።"</string>
+    <string name="error_action_change_settings">"ምስትኽኻል ምቕያር"</string>
+    <string name="error_camera_permission_title">"ካመራ ክትርከብ ኣይከኣለትን"</string>
+    <string name="error_camera_permission_text">"እቲ ኤፕ ርክብ ምስቲ ካመራ ክህልዎ ኣለዎ፣ ነቲ ኮድ QR ስኬን ክገብር መታን ክኽእል።"</string>
+    <string name="error_title">"ጉድለት"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"QR-ኮድ ገና ብቑዕ ኣይኮነን"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"ብቕዓት QR-Code ሓሊፉ"</string>
+    <string name="error_already_checked_in">"ድሮ ኣቲኹም ዲኹም፧"</string>
+    <string name="error_update_text">"እዚ ኮድ QR ምስቲ ዝተተከለ ቨርዝዮን ኤፕ ኣይሰርሕን እዩ። ነቲ ኤፕ ኣሕድስዎ ብኽብረትኩም መታን ክትቕጸሉ።"</string>
+    <string name="error_update_title">"ምምሕዳስ የድሊ"</string>
+    <string name="error_action_update">"ሕጂ ምምሕዳስ"</string>
+    <string name="ongoing_notification_checkout_quick_action">"ቸክ-ኣውት"</string>
+    <string name="reminder_notification_snooze_action">"ስኑዝ"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"ዝተደጋጋሚ መሓበሪ ቸክ-ኢን"</string>
+    <string name="ongoing_notification_title">"ኣቲኹም ኢኹም ካብ ሰዓት {TIME}።"</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"ምርግጋጽ"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"QR-ኮድ ስከን ምግባር"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Check-In ተዓጽዩ"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"ሕጂ Check-in ዝከኣል ኣይኮነን"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"ሓደ ናይ SwissCovid QR ኮድ ስከን ግበሩ ኣብቲ ቦታ ምእንቲ ብቸክ-ኢን ክትኣትው።"</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"ናይ ስዊዝ ኮቪድ ኮድ QR ኣብቲ ቦታ ንክትኣትዉ ስከን እንተገበርክኩም፣ ኣብዚ ኣውቶማቲካሊ መዝገብ ክዕቀብ እዩ።"</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"ኣቲኹም ዲኹም።"</string>
+    <string name="checkout_from_to_date">"{DATE1} ክሳብ {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"ዝያዳ ብዛዕባ ኮድ ኮቪድ"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"መዝገብ ምድምሳስ"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"ምድምሳስ"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"ምክፍፋል"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"ፕሪንት ምግባር"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"ሓደ ናይ SwissCovid QR ኮድ ስከን ግበሩ ኣብቲ ቦታ ምእንቲ ብቸክ-ኢን ክትኣትው።"</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"ቸክ-ኢን መዝገበኣት ምክፍፋል"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"ናይ ቸክ-ኢን መዝገባትኩም እንድሕር ኣካፊልኩም፣ እቲ ኤፕ ኣብ ማዕረ ግዜ ኣብ ሽዑ ቦታ ኔሮም ዝነበሩ ሰባት ክሕብሮም ይኽእል።"</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"ኩሉ ምምራጽ"</string>
+    <string name="inform_dont_send_button_title">"ኣይትስደድ"</string>
+    <string name="inform_dont_share_button_title">"ዘይምክፍፋል"</string>
+    <string name="inform_really_not_share_title">"ናይ ብሓቂ ብዘይ ምክፍፋል፧"</string>
+    <string name="inform_really_not_share_subtitle">"ምክፍፋል ግላውያን መፋትሕኩም ን«SwissCovid» ይሕግዝ፣ ኣብ ምሕባር ናብ ካልእ ተለቢዶም ዝኾኑ ሰባት ከምኡ ድማ ቀጻሊ ምዝርጋሕ እዚ ቫይረስ ንክውገድ። ምክፍፋል ግላውያን መፋትሕኩም ዘይትገብሩ እንተኾይንኩም፣ ተለቢዶም ዝኾኑ ሰባት ኣይክሕበሩን እዮም።"</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"መዝገብ ምድምሳስ"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"መዝገብኩም ሓንሳዕ ንሓዋሩ ካብቲ ዝርዝር ክድምሰስ እዩ።"</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"ብምልኡ ምልጋስ"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"ጥራይ ምሕባእ ከምኡ‘ውን ንቀጻሊ ክሕበር ይግባእ፧"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"ፖዚቲቭች ተመርሚርካ/ኪ፧"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"ምርኽኻብን ቸክ-ኢንን እንደገና ምውላዕ።"</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"ፖዚቲቭ ቸክ-ኢን እንድሕር ጌርኩም፣ ክትኣትዉ ኣይትኽእሉን ኢኹም።"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"ኮድ QR ምስፈጠርካዮ ብእኡ ሰባት ኣብቲ ቦታ ክኣትዉ ይኽእሉ።"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"ነቲ ኮድ QR ናይብሓቂ ክትድምሥዎ ደሊኹም ዶ፧"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"ባዕልኻ እትገብር ቸክ-ኢን"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"ሓደ ናይ SwissCovid QR ኮድ ስከን ግበሩ ኣብቲ ቦታ ምእንቲ ብቸክ-ኢን ክትኣትው።"</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"ምዕቃብ ዝከኣል ኣይኮነን"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"ዝመረጽኩሞም ግዜታት ምስቶም ካልኦት ካብቲ መዝገበ-ዕለትኩም ዝመጽኡ ቸክ-ኢናት ኣይሰማምዑን እዮም። ሓበሬታኹም እንደገና ኣቈጻጸሩ ብኽበርትኩም።"</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"ዝመረጽኩሞም ቸክ-ኢን ተሰዲዶም ኔሮም። ኣብ ማዕረ ግዜ ኣብ ሽዑ ቦታ ኣትዮም ዝነበሩ ሰባት ክሕበሩ እዮም።"</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"SwissCovid-Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"ምእታው ብዘይ ምግዳፍ ሓበሬታ/ዳታ"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"ምስቲ ናይ SwissCovid ኤፕ ኣባና ብቐሊል ብቸክ-ኢን ክትኣትዉ ትኽእሉ ሓበሬታይ ብዘይምግዳፍ። ኩነተ ርከሳ እንተሎ በቲ ኤፕ ቀልጢፍኩም ክትሕበሩ ኢኹም።"</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"ኤፕ SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"ሕጂ ምምጻእ ብዳውንሎድ"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"ቸክ-ኢን ብዘይ ሓበሬታ
+ምግዳፍ"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"ኣብዚ ኮቪድ ኮድኩም ኣእትዉ ንካልኦት መታን ከተጠንቅቕዎም።"</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"ግላለ ምዝዛም፧"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"ቸክ-ኢን ከተቕርቡ ደሊኹም ዶ፧"</string>
+    <string name="checkin_footer_title1">"ስለምንታይ ናይ ቸክ-ኢን ኣገባብ፧"</string>
+    <string name="checkin_footer_subtitle1">"ናይ ቸክ-ኢን ኣገባብ ብዘይ ምሓዝ ሓበሬታ ርክብ ነቲ SwissCovid ኤፕ ይውስኾ። ምስዚ ኣገባብ‘ዚ ፖዚቲቭ እንተ ደኣ ተመርሚርኩም፣ ጥራይ ቀረባ ርክባት ዘይኮነ ዋላ ውን ኣብ ማዕረ ግዜን ማዕረ ቦታን ኣትዮም ዝነበርይ ሰባት ከተጠንቅቕዎም ትኽእሉ።"</string>
+    <string name="checkin_footer_title2">"ማእከላዊ ዕቃበ ዳታ የለን"</string>
+    <string name="checkin_footer_subtitle2">"ነቲ ናይ SwissCovid-ቸክ-ኢን ግላዊ ዳታ ከም ስም፣ ኣድራሻ ወይ ቁጽሪ ተሌፎን ክወሃብ ኣየድልን ከምኡ‘ውን ናይ GPS ሓበሬታ ቦታ ውን ኣይክተሓዝን እዩ። ዝርዝር ቸክ-ኢን ብዘይ ኢንተርነት ኣብ ሞባይልኩም ክዕቀብ እዩ። ድሕሪ 14 መዓልትታት እቶም ኣብ ሞባይልኩም ዘሎ ሓበሬታ ክድምሰስ እዩ።"</string>
+    <string name="events_empty_state_title">"ኮድ QR ፈጥሩ"</string>
+    <string name="events_empty_state_subtitle">"ምስ ሓደ SwissCovid-QR-ኮድ ሰባት ኣብቲ ቦታ ሓበሬታኦም ብዘይምግዳፍ ቸክ-ኢን ክገብሩ ይኽእሉ።"</string>
+    <string name="events_info_box_title">"ነቲ ግድነታዊ ምልዓል ዳታ ርክብ መተካእታ የለን"</string>
+    <string name="events_info_box_text">"ቸክ-ኢን SwissCovid መተካእታ ንኣብ «ኮቪድ-19-መትከል ፍሉይ ኩነት» ዝተኣዘዘ ግዴታ ምልዓል ዳታ ርክብ ኣይኮነን።"</string>
+    <string name="events_footer_title1">"እዚኦም Check-ins ኣበይ ክጥቀሙ ይከኣሉ፧"</string>
+    <string name="events_footer_title2">"ስለምንታይ ናይ ቸክ-ኢን ኣገባብ፧"</string>
+    <string name="events_footer_subtitle1">"ኣብ ሰብ ዝራኸቡ ቦታ እቲ ስዊዝ ቸክ-ኢን ውን ክጥቐም ይኽእል፣ ግና ግዴታ ናይ ምልዓል ዳታ ርክብ የለን።
+
+ዝኾኑ ቦታታት ስራሕ፤
+– ግላውያን ፍጻሜታት
+– ፍጻሜታት ማሕበር
+– ኣኼባታት ኣብ ሞያዊ ከባቢ ከም ንኣ. ክፍሊ ዋዕላ፣ ክፍሊ ቤትጽሕፈት፣ ካንቲናታት፣ ወዘተ"</string>
+    <string name="events_footer_subtitle2">"ናይ ቸክ-ኢን ኣገባብ ብዘይ ምሓዝ ሓበሬታ ርክብ ነቲ SwissCovid ኤፕ ይውስኾ። ምስዚ ኣገባብ‘ዚ ፖዚቲቭ እንተ ደኣ ተመርሚርኩም፣ ጥራይ ቀረባ ርክባት ዘይኮነ ዋላ ውን ኣብ ማዕረ ግዜን ማዕረ ቦታን ኣትዮም ዝነበርይ ሰባት ከተጠንቅቕዎም ትኽእሉ።"</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"ኩነት ርከሳ"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"ምርኽኻብ"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"ቸክ-ኢን"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"እንታይ ክገብር ኣለኒ፧"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"ኣወንታዊ Check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"ኣወንታዊ Check-ins / ርክባት"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"User QR Code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact Tracing QR Code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"ድሕሪ ሓደ ኣወንታዊ ውጽኢት መርመራ ናይ ቸክ-ኢን ኣገባብ ኣውቶማቲካሊ ተዓጽዩ እዩ። ድሕሪ ምድጻም ግላለኹም እንደገና ክውላዕ ይከኣል።"</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"እቲ ቦታ ወይ ፍጻሜኹም ብቀረባ ዝገልጽ ኣርእስቲ ወይ ስም ሃቡ ኢኹም።
+እዚ ኣርእስቲ ኣብ Check-in ክረአ እዩ።"</string>
+    <string name="checkin_report_heading">"እንታይ ክትገብሩ ትኽእሉ፧"</string>
+    <string name="checkin_report_title1">"ርክባት ምክልኻል"</string>
+    <string name="checkin_report_title2">"ምልክታት ምጥንቃቕ"</string>
+    <string name="checkin_report_title3">"ምምርማር"</string>
+    <string name="checkin_report_subtitle1">"ድሮ ተላጋቢ ክትኮኑ ትኽእሉ ከይተገንዘብኩም። እቶም ብቑዓት ናይ ጽሬትን ምክልኻልን ስጉምትታት ተኸተሉ ከምኡውን ስድራኹምን ኣዕሩኽትኹምን ከባብኹምን ኣስተውዕሉ።"</string>
+    <string name="checkin_report_subtitle2">"መርገጽ ጥዕናኹም ተኸታተሉ።"</string>
+    <string name="checkin_report_subtitle3">"ኣብ ምቕልቓል ምልክታት ብዝቐልጠፈ ተመርመሩ። ዋላ ምልክታት ዘይቕልቀሉ እንተኾይኖም፣ መርመራ ኮሮና ጤቓምን ዝምረጽን እዩ።"</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="meldung_detail_checkin_title">"ቸክ-ኢን"</string>
+    <string name="not_thank_you_screen_title">"ዝኾነ ዳታ ኣይተሰደደን"</string>
+    <string name="not_thank_you_screen_text1">"ዝኾነ ግላዊ መፍትሕ ኣይተሰደደን።"</string>
+    <string name="not_thank_you_screen_back_button">"ተመለስ"</string>
+    <string name="not_thank_you_screen_dont_send_button">"ዝኾነ ዳታ ዘይምስዳድ"</string>
+    <string name="not_thank_you_screen_text2">"ቸክ-ኢን መዝገባት ኣይተሰደዱን።"</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
+    <string name="inform_share_checkins_send_button_title">"ምክፍፋል መርጫ"</string>
+    <string name="inform_share_checkins_not_send_button">"ዋላሓደ ዘይምክፋል"</string>
+    <string name="onboarding_checkin_title">"ምእታው ብዘይ ምግዳፍ ሓበሬታ/ዳታ"</string>
     <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="onboarding_checkin_text1">"ምስቲ SwissCovid-ቸክ-ኢን ምስቲ ኤፕ ኣብ ሓደ ቦታ ወይ ኣብ ሓደ ምርኽኻብ ክትኣትዉ ትኽእሉ ኢኹም።"</string>
+    <string name="onboarding_checkin_text2">"ህላወኹም ጥራይ ኣብቲ ኤፕ እዩ ዝዕቀብ። ዝኾነ ግላዊ ሓበሬታ ኣብቲ ኤፕ ክትገድፉ ኣየድልየኩምን።"</string>
+    <string name="checkin_updateboarding_text">"ምስቲ SwissCovid-ቸክ-ኢን ምስቲ ኤፕ ኣብ ሓደ ቦታ ወይ ኣብ ሓደ ምርኽኻብ ክትኣትዉ ትኽእሉ ኢኹም። ህላወኹም ጥራይ ኣብቲ ኤፕ እዩ ዝዕቀብ። ዝኾነ ግላዊ ሓበሬታ ኣብቲ ኤፕ ክትገድፉ ኣየድልየኩምን። ሽዑ እቶም ናይ ኣጠቓቕማ ኩነታት ከምኡ'ውን ስምምዕ ምክልኻል ዳታ ክሕደሱ እዮም።"</string>
+    <string name="onboarding_gaen_button_dont_activate">"ገዲፍካ ምቕጻል"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"እቲ መዝገብ ን14 መዓልታት ዝተመስጠረ ኣብቲ ዳሕረዋይ ኤፕ ክዕቀብ እዩ። ኣብ ክኸውን ዝኽእል ልበዳ ብዝኾነ ክትሕበሩ ትኽእሉ ኢኹም።"</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"ጥራይ ምሕባእ"</string>
+    <string name="checkin_set_reminder_explanation">"እቲ ኤፕ ንልክዕ ግዜ ክትወጽኡ ከዘክረኩም ይኽእል።"</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"ወይ ብምልኡ ምድምሳስ፧"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"እቲ መዝገብ ብምልኡ ክድምሰስ እዩ። ክትጥንቀቑ ኣይትኽእሉን ኢኹም።"</string>
+    <string name="not_thank_you_screen_text3">"ማንም ሰብ ኣይክሕበርን እዩ።"</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"ብዛዕባ ምምርማር እንታይ ክፈልጥ ኣለኒ፧"</string>
+    <string name="instant_app_install_action">"ኤፕ ምትካልን ምእታውን"</string>
+    <string name="partial_onboarding_box_text">"እቲ ምስትኽኻል ኤፕ ወድእዎ፣ መታን ኣገባብ ምክትታል ክትጥቐመሉ።"</string>
+    <string name="partial_onboarding_box_action">"ሕጂ ምውዳእ"</string>
+    <string name="partial_onboarding_done_title">"ምስትኽኻል ምውዳእ"</string>
+    <string name="partial_onboarding_done_text">"ምዝርጋሕ ኮሮናቫይረስ ንምድራት እትገብሩ ምትሕብባር ነመስግነኩም ኢና።"</string>
+    <string name="web_slogan">"ኣብ ርከሳ ልበዳ ብቕልጡፍ ተሓቢርኩም።"</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index bb6dff3e3..52a2456e7 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -101,7 +101,7 @@
     <string name="meldungen_meldung_title">"Olası enfeksiyon"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Enfeksiyon olasılığı mevcuttur."</string>
+    <string name="meldungen_meldung_text">"Hastalık size bulaşmış olabilir"</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"Uygulama etkindir"</string>
@@ -191,7 +191,7 @@
     <string name="inform_detail_box_subtitle">"Kovid kodu ile..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Enfeksiyon zincirini kır"</string>
+    <string name="inform_detail_box_title">"Olası bulaşmalara karşı uyar"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Kovid kodu gir"</string>
@@ -224,8 +224,8 @@
     <string name="symptom_detail_navigation_title">"Semptomlar"</string>
     <string name="tracing_turned_off_title">"Takip devre dışı bırakıldı"</string>
     <string name="tracing_turned_off_text">"Uygulamanın çalışabilmesi için takibi etkinleştirin."</string>
-    <string name="bluetooth_turned_off_title">"Bluetooth'u kapat"</string>
-    <string name="bluetooth_turned_off_text">"Takibin çalışabilmesi için cep telefonunuzun Bluetooth özelliğini etkinleştirin."</string>
+    <string name="bluetooth_turned_off_title">"Bluetooth kapalı"</string>
+    <string name="bluetooth_turned_off_text">"Anonim takibin çalışabilmesi için cep telefonunuzun Bluetooth özelliğini etkinleştirin."</string>
     <string name="bluetooth_turn_on_button_title">"Bluetooth'u ektinleştirin"</string>
     <string name="bluetooth_permission_error_title">"Bluetooth kullanımı rededildi"</string>
     <string name="bluetooth_permission_error_text">"Takibin çalışabilmesi için Bluetooth kullanımına izin verin."</string>
@@ -257,11 +257,11 @@
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"İzolasyona ilişkin size bildirilen talimatlara uyun"</string>
-    <string name="tracing_ended_title">"Takip sonlandırıldı"</string>
-    <string name="tracing_ended_text">"Temaslarınız artık kaydedilmiyor."</string>
+    <string name="tracing_ended_title">"Temaslar ve Check-in devre dışı"</string>
+    <string name="tracing_ended_text">"Temaslar kaydedilmiyor"</string>
     <string name="exposed_info_contact_hotline">"... ile iletişime girin"</string>
     <string name="meldung_homescreen_positive_info_line1">"...'lere/lara uyun"</string>
-    <string name="meldung_homescreen_positive_info_line2">"Kendini İzole Etme Talimatları"</string>
+    <string name="meldung_homescreen_positive_info_line2">"İzolasyon Talimatları"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Yeni bildirim"</string>
@@ -271,7 +271,7 @@
     <string name="meldung_homescreen_positiv_title">"Testiniz pozitif"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Enfeksiyon riski bulunmaktadır."</string>
+    <string name="meldung_detail_exposed_subtitle">"Hastalık size bulaşmış olabilir"</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Korona virüsü testiniz pozitiftir."</string>
@@ -325,7 +325,7 @@
     <string name="onboarding_prinzip_text1">"SwissCovid uygulaması ile Korona virüsünün yayılımını sınırlandırmaya yardımcı olabilirsiniz."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"Korona virüsü ile potansiyel temaslarda uygulama sizi bilgilendirir."</string>
+    <string name="onboarding_prinzip_text2">"Korona virüsü ile potansiyel temaslarda uygulama sizi uyarır."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -340,7 +340,7 @@
     <string name="onboarding_privacy_text2">"Rastgele ID'ler telefonunuza kaydedilir ve 14 gün sonra silinir."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Uygulama nasıl çalışır?"</string>
+    <string name="onboarding_begegnungen_heading">"Temaslar"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Bluetooth sayesinde temasların tespit edilmesi"</string>
@@ -358,7 +358,7 @@
     <string name="onboarding_meldung_title">"Enfeksiyon riskinde dair bildirim"</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"Uygulama, potansiyel olarak Korona virüsü ile temasınız olduğunda sizi uyarır."</string>
+    <string name="onboarding_meldung_text1">"Korona virüsü ile potansiyel temaslarda uygulama sizi uyarır."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"Doğru davranışlarla enfeksiyon zincirlerini kırabilir ve diğer insanları koruyabilirsiniz."</string>
@@ -391,7 +391,7 @@
     <string name="onboarding_push_title">"Mesajlara izin ver"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Uygulamanın sizi bilgilendirebilmesi için mesajlara izin vermeniz gerekmektedir."</string>
+    <string name="onboarding_push_text">"Uygulamanın sizi uyarabilmesi için bildirimlere izin vermeniz gerekir."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Mesajlara izin ver"</string>
@@ -412,7 +412,7 @@
     <string name="onboarding_go_title">"Uygulama kuruldu"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Enfeksiyon zincirlerini kırmaya yardımcı olduğunuz için teşekkür ederiz."</string>
+    <string name="onboarding_go_text">"Korona virüsün yayılmasını önlemeye yardımcı olduğunuz için teşekkür ederiz."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Başlat"</string>
@@ -439,7 +439,7 @@
     <string name="meldung_detail_new_contact_title">"Yeni şüphe"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Bir enfeksiyon şüphesi vardır."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Hastalık size bulaşmış olabilir"</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Saat hatası"</string>
@@ -573,8 +573,9 @@ Bunlar cep telefonunda kaydedilmekte ve 14 gün sonra silinmektedir."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Bildirimler nedir?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"Uygulama düzenli olarak temas ettiğiniz kişilerin pozitif bir test sonucu bildirip bildirmediğini kontrol eder.
-Olası bir enfeksiyon riskinde kilit ekranında bir mesaj ile bilgilendirileceksiniz."</string>
+    <string name="meldungen_nomeldungen_faq1_text">"Uygulama düzenli olarak, temas ettiğiniz veya sizinle aynı yerde bulunan diğer kullanıcıların pozitif bir test sonucu bildirip bildirmediğini kontrol eder.
+
+Olası bir bulaşma durumunda kilit ekranındaki gösterilecek bir bildirim ile bilgilendirilirsiniz."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"SwissCovid Bilgi Hattı sizi ücretsiz testler konusunda bilgilendirir."</string>
@@ -610,8 +611,9 @@ Böylece uygulama üzerinden yalnızca onaylı vakaların bildirilmesi sağlanı
     <string name="inform_detail_faq2_title">"Neler iletilir?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Şahsi bilgileriniz değil, uygulamanızın yalnızca özel kodları iletilir. 
-Bu şekilde diğer SwissCovid uygulaması kullanıcıları yalnızca bir bulaşma riski olabileceğini öğenir."</string>
+    <string name="inform_detail_faq2_text">"Şahsi verileriniz değil, sadece uygulamanızın özel kodları ve yaptığınız Check-in’lerin şifrelenmiş ID’leri iletilir.
+
+ Bu şekilde diğer SwissCovid uygulaması kullanıcıları bir bulaşma riski söz konusu olabileceğini öğrenir."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -620,10 +622,10 @@ Bu şekilde diğer SwissCovid uygulaması kullanıcıları yalnızca bir bulaşm
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Önemli Bilgiler"</string>
+    <string name="inform_code_intro_title">"Girişler Hakkında Bilgiler"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"Kişisel bilgileriniz iletilmese dahi, bazı kişiler tarihler temelinde sizinle olan teması hatırlayabilirler."</string>
+    <string name="inform_code_intro_text">"Kişisel bilgileriniz iletilmezse dahi, bir kişini tarihi dikkate alarak sizinle temas ettiğini hatırlayabilir."</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
     <string name="inform_code_intro_button">"Kabul ediyorum"</string>
@@ -654,7 +656,7 @@ Ayrıca bu semptomlar görülebilir:
     <string name="meldungen_positive_tested_faq1_title">"İzleme neden devre dışı bırakıldı?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"Pozitif bir testten sonra uygulamadaki izleme otomatik olarak devre dışı bırakılır. İzolasyonu sona erdiğirdiğiniz anda, izleme yeniden etkinleştirilebilir."</string>
+    <string name="meldungen_positive_tested_faq1_text">"Pozitif bir test sonucundan sonra uygulamadaki takip otomatik olarak devre dışı bırakılır. İzolasyonu sona erdirdiğiniz andan itibaren, takip fonksiyonu yeniden etkinleştirilebilir."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"tr"</string>
@@ -694,7 +696,7 @@ Ayrıca bu semptomlar görülebilir:
     <string name="onboarding_gaen_title">"Takibi etkinleştir"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <string name="onboarding_gaen_text_ios">"Uygulamayı kullanabilmek için KOVİD-19 temas bildirimlerini etkinleştirmiş olmalısınız."</string>
+    <string name="onboarding_gaen_text_ios">"Temasların algılanabilmesi için takip fonksiyonunun etkinleştirilmiş olması gerekmektedir."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Etkinleştir"</string>
@@ -723,10 +725,10 @@ Ayrıca bu semptomlar görülebilir:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"İzolasyonu sona erdir"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Bildirimi gerçekten silmek mi istiyorsunuz?"</string>
     <string name="android_onboarding_battery_permission_title">"Pil optimizasyonunu yoksay"</string>
-    <string name="android_onboarding_battery_permission_text">"Temasların her zaman takip edebilebilmesi için pil optimizasyonunun bu uygulama için devre dışı bırakılması gerekmektedir."</string>
+    <string name="android_onboarding_battery_permission_text">"Uygulamanın düzgün çalışabilmesi için pil optimizasyonunun bu uygulama için devre dışı bırakılmış olması gerekir."</string>
     <string name="android_onboarding_battery_permission_button">"İzin ver"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Yalnızca bu uygulama için"</string>
@@ -748,7 +750,7 @@ Ayrıca bu semptomlar görülebilir:
     <string name="tracing_permission_error_title_ios">"KOVİD-19 temas mesajları devre dışı bırakıldı"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <string name="tracing_permission_error_text_ios">"Takibin çalışabilmesi için KOVİD-19 iletişim mesajlarının etkinleştirilmesi gerekmektedir."</string>
+    <string name="tracing_permission_error_text_ios">"Anonim takibin çalışabilmesi için {TRACING_SETTING_TEXT}’i etkinleştirin."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"Mesaj iletilemedi. Lütfen rastgele ID'lerinizin SwissCovid uygulaması ile paylaşılmasına izin verin."</string>
@@ -790,8 +792,9 @@ Ayrıca bu semptomlar görülebilir:
     <string name="tracing_active_tracking_always_info">"SwissCovid uygulama kapatıldığında da aktiftir."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid enfeksiyon zincirlerini kırar."</string>
-    <string name="inform_detail_faq3_text">"Kişisel bilgileriniz iletilmese dahi, bazı kişiler tarihler temelinde sizinle olan teması hatırlayabilirler."</string>
+    <string name="oboarding_splashscreen_title">"SwissCovid –
+bir bulaş riski durumunda hızlıca bilgi sahibi olun."</string>
+    <string name="inform_detail_faq3_text">"Evet, ancak kişisel bilgileriniz iletilmezse dahi, bazı kişiler tarihler temelinde sizinle olan teması hatırlayabilirler."</string>
     <string name="inform_detail_faq3_title">"Bilgilerim anonim mi?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -801,7 +804,7 @@ Ayrıca bu semptomlar görülebilir:
     <string name="tracing_setting_text_android">"KOVİD-19 Bildirimleri"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Uygulamanın kullanılabilmesi için KOVİD-19 bildirimlerinin etkinleştirilmiş olması gerekmektedir."</string>
+    <string name="onboarding_gaen_text_android">"Temasların algılanabilmesi için takip fonksiyonunun etkinleştirilmiş olması gerekmektedir."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -894,7 +897,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Seyahatler"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid şu ülkelerde çalışır:"</string>
+    <string name="travel_home_description">"SwissCovid temas takibi şu ülkelerde çalışır:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Bunun anlamı nedir?"</string>
@@ -924,12 +927,6 @@ Yurt dışı seyahatlerinden gelen kişilerin de uyarılabilmesi için bu, sizin
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Maruz Kalma Bildirimleri"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1211,9 +1208,9 @@ Yurt dışı seyahatlerinden gelen kişilerin de uyarılabilmesi için bu, sizin
     <string name="delete_infection_dialog_finish_button">"Sona erdir"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"Temaslar artık kaydedilmeyecek.
+    <string name="tracing_ended_info">"Artık temaslar kaydedilmiyor ve yeni Check-in’ler yapmak de artık mümkün değil.
 
-İzolasyondan sonra izleme yeniden etkinleştirilebilir."</string>
+ Her iki fonksiyon da İzolasyon sona erdikten sonra yeniden etkinleştirilebilir."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1245,9 +1242,9 @@ Yurt dışı seyahatlerinden gelen kişilerin de uyarılabilmesi için bu, sizin
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"İşitmiyor veya işitme özürlü müsünüz ve Koronavirüs bilgi hattını arayamıyor musunuz?
+    <string name="hearing_impaired_info">"İşitme sorununuz var veya işitme engellisiniz ve telefon edemiyor musunuz?
 
-O halde covid-support@medgate.ch adresine bir e-posta gönderiniz"</string>
+ O halde covid-support@medgate.ch adresine bir e-posta gönderin."</string>
 
     <!-- Überschrift des Covidcodes-Statistik-Moduls -->
     <string name="stats_covidcodes_title">"Covid kodları"</string>
@@ -1301,7 +1298,7 @@ Zaman, Koronavirüs ile mücadelede en önemli faktördür: Semptom başlangıc
 
     <!-- Inform Detail: Infobox Text -->
     <string name="inform_detail_infobox1_text">"Testiniz pozitif çıktı (PCR testi veya hızlı antijen testi) ve 4 saat sonra halen bir Covid kodu almadınız mı?
-O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
+O halde şu numarayı arayın:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Covid kodunu henüz almadınız mı?"</string>
@@ -1325,7 +1322,7 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="travel_screen_compatible_countries">"Uyumlu ülkeler:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Yurt dışı seyahatlerinden dönen kişilere de uyarıda bulunulabilmesi için, özel kodlar uyumlu ülkelerin Korona uygulamalarıyla paylaşılır."</string>
+    <string name="inform_code_travel_text">"Yurt dışından gelen ziyaretçilerin de bir temastan sonra uyarılabilmesi için kişiye özel kodlar uygulamaları uyumlu olan ülkelerin korona uygulamalarıyla paylaşılır."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"Toplam"</string>
@@ -1340,13 +1337,13 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Kimlere haber verilir?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"Mesafe ve süre nedeniyle bir bulaşma olasılığı mevcut ise {ONSET_DATE} gününden başlamak üzere, Covid kodunuzun girilmesine kadar, bulaşma döneminizin aralığındaki tüm temaslılara haber verilir."</string>
+    <string name="meldungen_positive_tested_faq2_text">"Mesafe ve süre nedeniyle veya aynı yere Check-in yapmış olmanız nedeniyle bir bulaşma riski söz konusu olduğunda {ONSET_DATE} tarihinden başlamak üzere, Covid kodunuzun girilmesine kadar geçen sürede temas ettiğiniz herkes durum hakkında bilgilendirilir."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – bugün"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Bu sayede enfeksiyon zincirlerinin durdurulması için yardımcı olacaksınız."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Bu şekilde diğer kişilerin olası bir bulaşmaya karşı uyarılmasına yardım etmiş olursunuz."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Uygulamanızın özel anahtarları şu zaman aralığı için gönderildi:"</string>
@@ -1385,46 +1382,46 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"1 gün sonra"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Check-out hatırlatması"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Çıkış yapmak mı istiyorsunuz?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Otomatik Check-out"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"Çıkış işleminiz otomatik olarak yapıldı."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Kare kodu okutun ve giriş yapın"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"Geçerli kare kod yok!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"Başlangıç tarihi"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"Bitiş tarihi"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Not ekle"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"Örn. kiminle oradaydınız?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Bitti"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Check-out hatırlatması"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Kapalı"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"Günlüğe erişim için kendinizi yetkilendirin"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
     <string name="reminder_option_hours">"{HOURS} h"</string>
@@ -1433,25 +1430,25 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"Uygulamanın kare kodu tarayabilmek için kamera erişimine ihtiyacı var."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Check-in’lerim"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
     <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"Kare kodu taramak için kameraya ihtiyaç duyuluyor."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Günlüğünüze güvenli bir şekilde erişebilmek için Face-ID’ye izin verin."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"Günlüğe erişim için kendinizi yetkilendirin"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Check out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
     <string name="module_checkins_title">"Check-in"</string>
@@ -1460,288 +1457,286 @@ O halde koronavirüz danışma hattıyla iletişim kurun:"</string>
     <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Kare kod oluşturun"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Check-in’leri öner?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Şimdi check-in yap"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"Hatırlatma oluşturulamadı"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Check-out hatırlatmasını alabilmeniz için uygulama ayarlarında \”Bildirimler\”e izin verin."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Uyarla"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Düzenle"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Henüz giriş yok"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Bir yere check-in yapmak için bir SwissCovid kare kodunu taradığınızda buraya otomatik olarak bir kayıt oluşturulur."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid’in cihazınızın kamerasına erişimine sahip olması gerekiyor. Kamera sadece kare kodları taramak için kullanılacaktır."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Kamera erişimine izin ver"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"Örn. Oda veya etkinlik adı"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
-    <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
+    <string name="show_pdf_button">"PDF yazdır"</string>
+    <string name="bottom_nav_tab_info">"Bilgi"</string>
+    <string name="error_network_title">"Ağ hatası"</string>
+    <string name="error_network_text">"İnternet bağlantısını kontrol edin."</string>
+    <string name="error_action_retry">"Yeniden dene"</string>
+    <string name="error_notification_deactivated_title">"Bildirimler devre dışı"</string>
+    <string name="error_notification_deactivated_text">"Bir bildirim ile doğrudan bilgi alabilmek için ayarları değiştirin."</string>
+    <string name="error_action_change_settings">"Ayarları değiştir"</string>
+    <string name="error_camera_permission_title">"Kamera erişimi yok"</string>
+    <string name="error_camera_permission_text">"Uygulamanın kare kodu tarayabilmek için kamera erişimine ihtiyacı var."</string>
+    <string name="error_title">"Hata"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"Kare kod henüz geçerli değil"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Kare kod artık geçerli değil"</string>
+    <string name="error_already_checked_in">"Zaten check-in yaptınız."</string>
+    <string name="error_update_text">"Bu kare kod artık kurulu olan uygulama sürümü ile uyumlu değil. Lütfen işleme devam edebilmek için uygulamayı güncelleyin."</string>
+    <string name="error_update_title">"Güncelleme gerekiyor"</string>
+    <string name="error_action_update">"Şimdi güncelleyin"</string>
     <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
-    <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="reminder_notification_snooze_action">"Sustur"</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Kalıcı Check-in Bildirimi"</string>
+    <string name="ongoing_notification_title">"Saat {TIME}’den beri check-in yapmış durumdasınız."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Emniyete al"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Kare kod tara"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Check-in devre dışı"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Şu anda check-in yapılamıyor"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Bulunduğunuz yere check-in yapmak için bir SwissCovid kare kodunu tarayın."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Bir yere check-in yapmak için bir Swiss-Covid kare kodunu taradığınızda buraya otomatik olarak bir kayıt oluşturulur."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Check-in yaptınız"</string>
+    <string name="checkout_from_to_date">"{DATE1} ile {DATE2} arasında"</string>
+    <string name="inform_detail_covidcode_info_button">"Covid kodu hakkında daha fazla bilgi"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Kaydı sil"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Sil"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Paylaş"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Yazdır"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Bulunduğunuz yere check-in yapmak için bir SwissCovid kare kodunu tarayın."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Check-in kayıtlarını paylaş"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Check-in kayıtlarınızı paylaştığınızda, uygulama aynı zaman aralığında aynı yerde check-in yapmış olan kişileri bu durum hakkında bilgilendirebilir."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Tümünü seç"</string>
+    <string name="inform_dont_send_button_title">"Gönderme"</string>
+    <string name="inform_dont_share_button_title">"Paylaşma"</string>
+    <string name="inform_really_not_share_title">"Gerçekten paylaşılmasın mı?"</string>
+    <string name="inform_really_not_share_subtitle">"Özel kodlarınızın paylaşılması «SwissCovid»’e, hastalığın bulaşmış olabileceği kişileri durumdan haberdar etmesi ve böylece virüsün daha da fazla yayılmasının önlenmesine yardımcı olur. Özel kodlarınızı paylaşmadığınızda hastalığın bulaşmış olması potansiyeli olan kişiler bu durumdan haberdar edilmez."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Kaydı sil"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"Kaydınız kalıcı olarak listeden silinecektir."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Kalıcı olarak sil"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Sadece gizleyip bildirimleri almaya devam et?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Testiniz pozitif mi sonuçlandı?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Temasları ve Check-in’i yeniden aktif et."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Test sonucunuz pozitif ise artık check-in yapamazsınız."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Kişilerin ilgili yere check-in yapabileceği bir kare kod oluşturun."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Kare kodu gerçekten silmek istiyor musunuz?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Kendi kendine check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Bulunduğunuz yere check-in yapmak için bir SwissCovid kare kodunu tarayın."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Emniyete alınamıyor"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Seçmiş olduğunuz zaman aralıkları günlüğünüzde bulunan diğer check-in’ler ile kesişiyor. Lütfen bilgileri bir kez daha kontrol edin."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Seçmiş olduğunuz check-in kayıtlarınız gönderildi. Aynı zaman aralığında aynı yere check-in yapmış olan tüm kişilere bilgi verilecek."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"SwissCovid-Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Kayıtlı veri bırakmadan check-in yap"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"SwissCovid uygulaması ile kayıtlı veri bırakmadan kolayca check-in yapabilirsiniz. Bir risk durumunda uygulama üzerinden hızlıca bilgilendirilirsiniz."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"SwissCovid Uygulaması"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Şimdi indir"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Kayıtlı veri 
+bırakmadan check-in yap"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Başkalarını uyarmak için covid kodunuzu buraya girin."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"İzolasyonu sonlandır?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Check-in’leri önermek mi istiyorsunuz?"</string>
+    <string name="checkin_footer_title1">"Bir check-in uygulaması neden gerekli?"</string>
+    <string name="checkin_footer_subtitle1">"İletişim verileri olmadan çalışan check-in fonksiyonu SwissCovid uygulamasının kapsamını genişletiyor. Bu fonksiyon ile testinizin pozitif sonuçlanması halinde sadece yakın temasta bulunduğunuz kişileri değil, aynı zaman aralığında aynı yerde check-in yapmış olan kişileri de uyarabilirsiniz."</string>
+    <string name="checkin_footer_title2">"Merkezi veri kaydı yok"</string>
+    <string name="checkin_footer_subtitle2">"SwissCovid-Check-in’leri için isim, adres veya telefon numarası gibi kişisel verilerin belirtilmesi gerekmez ve GPS konum bilgileri de kayıt edilmez. Check-in’lerin listesi yerel olarak cep telefonunuza kayıt edilir. 14 gün sonra bu yerel veriler yeniden cihazınızdan silinir."</string>
+    <string name="events_empty_state_title">"Bir kare kod oluşturun."</string>
+    <string name="events_empty_state_subtitle">"Bir SwissCode kare kodu ile kişiler bir yere, geride kayıtlı herhangi bir veri bırakmadan check-in yapabilir."</string>
+    <string name="events_info_box_title">"Zorunlu olan iletişim bilgileri kaydının ikamesi değildir"</string>
+    <string name="events_info_box_text">"SwissCovid-Check-in’leri «Covid-19-Düzenlemesi Özel Durum» kapsamında talep edilen iletişim bilgileri kaydı yükümlülüğünü ikame etmez."</string>
+    <string name="events_footer_title1">"Check-in’ler nerede kullanılabilir?"</string>
+    <string name="events_footer_title2">"Bir check-in uygulaması neden gerekli?"</string>
+    <string name="events_footer_subtitle1">"SwissCovid-Check-in’leri insanların bir araya geldiği ancak iletişim bilgileri kaydı zorunluluğunun olmadığı yerlerde kullanılabilir.
+
+ Olası kullanım yerleri: 
+– Özel etkinlikler
+– Dernek etkinlikleri
+– örneğin toplantı odaları, ofis alanları, yemekhaneler, vs. gibi bir araya gelinebilen profesyonel ortamlar."</string>
+    <string name="events_footer_subtitle2">"İletişim verileri olmadan çalışan check-in fonksiyonu SwissCovid uygulamasının kapsamını genişletiyor. Bu fonksiyon ile testinizin pozitif sonuçlanması halinde sadece yakın temasta bulunduğunuz kişileri değil, aynı zaman aralığında aynı yerde check-in yapmış olan kişileri de uyarabilirsiniz."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Risk durumu"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Temaslar"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
     <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Ne yapmalıyım?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Pozitif check-in"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Pozitif check-in’ler / temaslar"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"User QR Code"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"Contact Tracing QR Code"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Pozitif bir test sonucundan sonra check-in fonksiyonu otomatik olarak devre dışı bırakılır. İzolasyon sürenizin dolmasının ardından yeniden aktif edilebilir."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Yeri veya etkinliği daha yakından tanımlayan bir başlık belirleyin.
+Bu başlık check-in sırasında gösterilir."</string>
+    <string name="checkin_report_heading">"Ne yapabilirsiniz?"</string>
+    <string name="checkin_report_title1">"Temaslıları koruyun"</string>
+    <string name="checkin_report_title2">"Semptomlara dikkat edin"</string>
+    <string name="checkin_report_title3">"Test yaptırın"</string>
+    <string name="checkin_report_subtitle1">"Henüz kendiniz fark etmeden de hastalığı bulaştırabilirsiniz. Geçerli hijyen ve koruma önlemlerini dikkate alın ve ailenizi, arkadaşlarınızı ve çevrenizi koruyun."</string>
+    <string name="checkin_report_subtitle2">"Sağlık durumunuzu gözetim altında tutun."</string>
+    <string name="checkin_report_subtitle3">"Kendinizde semptomların varlığını gözlemlediğinizde hemen test yaptırın. Semptomlar olmadığında da bir korona testi mantıklıdır ve tavsiye edilmektedir."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="not_thank_you_screen_title">"Gönderilen veri yok"</string>
+    <string name="not_thank_you_screen_text1">"Gönderilen özel kod yok."</string>
+    <string name="not_thank_you_screen_back_button">"Geri"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Veri gönderme"</string>
+    <string name="not_thank_you_screen_text2">"Check-in kayıtları gönderilmedi."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
-    <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="inform_share_checkins_send_button_title">"Seçimi paylaş"</string>
+    <string name="inform_share_checkins_not_send_button">"Hiçbir şey paylaşma"</string>
+    <string name="onboarding_checkin_title">"Kayıtlı veri bırakmadan check-in yap"</string>
+    <string name="onboarding_checkin_heading">"Check-in’ler"</string>
+    <string name="onboarding_checkin_text1">"SwissCovid-Check-in’leri ile uygulama ile bir yerde veya bir buluşmada check-in yapabilirsiniz."</string>
+    <string name="onboarding_checkin_text2">"Orada bulunduğunuz sadece uygulama içinde kayıt edilir. Uygulama içinde kayıtlı kişisel veri bırakmanıza gerek yoktur."</string>
+    <string name="checkin_updateboarding_text">"SwissCovid-Check-in’leri ile uygulama ile bir yerde veya bir buluşmada check-in yapabilirsiniz. Orada bulunduğunuz sadece uygulama içinde kayıt edilir. Uygulama içinde kayıtlı kişisel veri bırakmanıza gerek yoktur. Bunun için kullanım koşulları ve kişisel verilen korunması beyanı güncellenmiştir."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Atla"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"Kayıt 14 gün boyunca şifrelenmiş olarak uygulamanın arka planında saklanır. Olası bir bulaşma durumunda bu sayede yine de bilgilendirilebilirsiniz."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Sadece gizle"</string>
+    <string name="checkin_set_reminder_explanation">"Uygulama size doğru zamanda check-out, yani çıkış yapmanızı hatırlatabilir."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"Veya kalıcı olarak sil?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"Kayıt kalıcı olarak silinir. Artık size uyarılar gönderilemez."</string>
+    <string name="not_thank_you_screen_text3">"Kimseye haber verilmez."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"Test yaptırmak hakkında bilmem gerekenler nelerdir?"</string>
+    <string name="instant_app_install_action">"Uygulamayı yükle ve check-in yap"</string>
+    <string name="partial_onboarding_box_text">"Takip fonksiyonunu yeniden kullanabilmek için uygulama yapılandırmasını tamamlayın."</string>
+    <string name="partial_onboarding_box_action">"Şimdi tamamla"</string>
+    <string name="partial_onboarding_done_title">"Yapılandırma tamamlandı"</string>
+    <string name="partial_onboarding_done_text">"Korona virüsün yayılmasını önlemeye yardımcı olduğunuz için teşekkür ederiz."</string>
+    <string name="web_slogan">"Bir bulaş riski durumunda hızlıca bilgi sahibi olun."</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index a97154e9b..db87b7d88 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -740,8 +740,8 @@ Other symptoms may include:
     <!-- Code-Eingabe in der App löschen, wenn infiziert -->
     <string name="delete_infection_button">"End isolation?"</string>
 
-    <!-- Meldung im Löschen Dialog nach Code-Einfragen -->
-    <string name="delete_infection_dialog">"Do you really want to delete the notification? "</string>
+    <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
+    <string name="delete_infection_dialog">"Do you really want to end the isolation?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignore battery optimisation"</string>
     <string name="android_onboarding_battery_permission_text">"For the app to work, battery optimisation must be switched off."</string>
     <string name="android_onboarding_battery_permission_button">"Allow"</string>
@@ -943,12 +943,6 @@ To enable travellers from abroad to also receive alerts, this happens regardless
     <!-- Telefonnummer der allgemeinen Infoline Coronavirus -->
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
-    <!-- Text beim Bluetooth Control iOS 13.5 -->
-    <string name="tracing_setting_text_ios_13_5"></string>
-
-    <!-- Text beim Bluetooth Control iOS 13.6 -->
-    <string name="tracing_setting_text_ios_13_6"></string>
-
     <!-- Text beim Bluetooth Control iOS 14 -->
     <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
@@ -1740,9 +1734,6 @@ Possible locations:
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
-
-    <!-- SubTitel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_subtitle"></string>
     <string name="not_thank_you_screen_title">"No data sent"</string>
     <string name="not_thank_you_screen_text1">"No private key was sent."</string>
     <string name="not_thank_you_screen_back_button">"Back"</string>
@@ -1785,5 +1776,5 @@ Possible locations:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text"></string>
+    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
 </resources>
\ No newline at end of file

From a6c5bf859eb635bf39f6456b581afdee9f1d2303 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 11:20:57 +0200
Subject: [PATCH 126/207] Remove all caps buttons

---
 .../bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java  | 2 +-
 app/src/main/res/layout/card_checkin.xml                     | 3 +--
 app/src/main/res/layout/card_what_to_do_checkin_report.xml   | 1 -
 app/src/main/res/layout/card_what_to_do_leitfaden.xml        | 4 +---
 app/src/main/res/layout/card_what_to_do_self_isolation.xml   | 1 -
 app/src/main/res/layout/fragment_checkin_overview.xml        | 3 +--
 app/src/main/res/layout/fragment_generate_qr_code.xml        | 2 +-
 app/src/main/res/layout/fragment_stats.xml                   | 1 -
 app/src/main/res/layout/fragment_what_to_do_symptoms.xml     | 3 +--
 app/src/main/res/layout/item_events_explanation.xml          | 2 +-
 app/src/main/res/layout/item_generate_qr_code.xml            | 2 +-
 common/src/main/res/values/styles.xml                        | 5 -----
 12 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 39ca57805..7bfb3ff7b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -218,7 +218,7 @@ private void indicateInvalidQrCode(QRScannerState qrScannerState) {
 			invalidCodeText.setVisibility(View.INVISIBLE);
 		} else {
 			invalidCodeText.setVisibility(View.VISIBLE);
-			color = R.color.tertiary;
+			color = R.color.status_red;
 		}
 
 		if (qrScannerState == QRScannerState.INVALID_FORMAT) {
diff --git a/app/src/main/res/layout/card_checkin.xml b/app/src/main/res/layout/card_checkin.xml
index 5a8850838..fbce02ff8 100644
--- a/app/src/main/res/layout/card_checkin.xml
+++ b/app/src/main/res/layout/card_checkin.xml
@@ -105,8 +105,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginVertical="@dimen/spacing_medium_large"
-				android:text="@string/checkout_button_title"
-				android:textAllCaps="false" />
+				android:text="@string/checkout_button_title" />
 
 		</LinearLayout>
 
diff --git a/app/src/main/res/layout/card_what_to_do_checkin_report.xml b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
index ce890d778..31e417009 100644
--- a/app/src/main/res/layout/card_what_to_do_checkin_report.xml
+++ b/app/src/main/res/layout/card_what_to_do_checkin_report.xml
@@ -85,7 +85,6 @@
 				android:paddingTop="15dp"
 				android:paddingBottom="10dp"
 				android:text="@string/delete_reports_button"
-				android:textAllCaps="true"
 				android:textColor="@color/blue_main" />
 
 		</LinearLayout>
diff --git a/app/src/main/res/layout/card_what_to_do_leitfaden.xml b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
index 2819461fa..a10e81a4f 100644
--- a/app/src/main/res/layout/card_what_to_do_leitfaden.xml
+++ b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
@@ -112,8 +112,7 @@
 						android:layout_height="wrap_content"
 						android:drawableEnd="@drawable/ic_launch"
 						android:paddingHorizontal="@dimen/spacing_medium"
-						android:text="@string/meldungen_detail_open_leitfaden_button"
-						android:textAllCaps="true" />
+						android:text="@string/meldungen_detail_open_leitfaden_button" />
 
 					<Button
 						android:id="@+id/zum_leitfaden_button"
@@ -164,7 +163,6 @@
 				android:paddingTop="15dp"
 				android:paddingBottom="10dp"
 				android:text="@string/delete_reports_button"
-				android:textAllCaps="true"
 				android:textColor="@color/blue_main"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/card_what_to_do_self_isolation.xml b/app/src/main/res/layout/card_what_to_do_self_isolation.xml
index 6c7be366e..0cf5b67f5 100644
--- a/app/src/main/res/layout/card_what_to_do_self_isolation.xml
+++ b/app/src/main/res/layout/card_what_to_do_self_isolation.xml
@@ -103,7 +103,6 @@
 				android:paddingBottom="10dp"
 				android:layout_marginBottom="10dp"
 				android:text="@string/delete_infection_button"
-				android:textAllCaps="true"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_checkin_overview.xml b/app/src/main/res/layout/fragment_checkin_overview.xml
index 91675ff6d..178039185 100644
--- a/app/src/main/res/layout/fragment_checkin_overview.xml
+++ b/app/src/main/res/layout/fragment_checkin_overview.xml
@@ -139,8 +139,7 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:layout_marginVertical="@dimen/spacing_medium_large"
-							android:text="@string/checkout_button_title"
-							android:textAllCaps="false" />
+							android:text="@string/checkout_button_title" />
 
 					</LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index 54f5d1484..387feac47 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -98,7 +98,7 @@
 
 		<Button
 			android:id="@+id/qr_code_generate"
-			style="@style/NextStep.Button.AllCaps"
+			style="@style/NextStep.Button"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_horizontal|bottom"
diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
index 1cb1aad83..ac057d2f0 100644
--- a/app/src/main/res/layout/fragment_stats.xml
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -193,7 +193,6 @@
 					android:layout_marginTop="@dimen/spacing_medium_large"
 					android:layout_marginEnd="@dimen/spacing_larger"
 					android:text="@string/share_app_button"
-					android:textAllCaps="true"
 					app:layout_constraintTop_toBottomOf="@id/share_app_image" />
 
 				<TextView
diff --git a/app/src/main/res/layout/fragment_what_to_do_symptoms.xml b/app/src/main/res/layout/fragment_what_to_do_symptoms.xml
index b5f5c1dac..67e45496d 100644
--- a/app/src/main/res/layout/fragment_what_to_do_symptoms.xml
+++ b/app/src/main/res/layout/fragment_what_to_do_symptoms.xml
@@ -100,8 +100,7 @@
 						android:layout_height="wrap_content"
 						android:layout_gravity="center_horizontal"
 						android:layout_marginTop="@dimen/spacing_very_large"
-						android:text="@string/symptom_detail_box_button"
-						android:textAllCaps="true" />
+						android:text="@string/symptom_detail_box_button" />
 
 				</LinearLayout>
 
diff --git a/app/src/main/res/layout/item_events_explanation.xml b/app/src/main/res/layout/item_events_explanation.xml
index a38fa2b37..b270f50ef 100644
--- a/app/src/main/res/layout/item_events_explanation.xml
+++ b/app/src/main/res/layout/item_events_explanation.xml
@@ -98,7 +98,7 @@
 
 			<Button
 				android:id="@+id/generate_qr_code_button"
-				style="@style/NextStep.Button.AllCaps"
+				style="@style/NextStep.Button"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/spacing_medium"
diff --git a/app/src/main/res/layout/item_generate_qr_code.xml b/app/src/main/res/layout/item_generate_qr_code.xml
index 638946310..420b33600 100644
--- a/app/src/main/res/layout/item_generate_qr_code.xml
+++ b/app/src/main/res/layout/item_generate_qr_code.xml
@@ -8,7 +8,7 @@
 
 	<Button
 		android:id="@+id/qr_code_generate"
-		style="@style/NextStep.Button.AllCaps"
+		style="@style/NextStep.Button"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@string/checkins_create_qr_code" />
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
index 6d36b6355..674ae7b0f 100644
--- a/common/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -236,10 +236,6 @@
 		<item name="android:textAllCaps">false</item>
 	</style>
 
-	<style name="NextStep.Button.AllCaps">
-		<item name="android:textAllCaps">true</item>
-	</style>
-
 	<style name="NextStep.Button.Purple">
 		<item name="android:background">@drawable/bg_button_purple</item>
 	</style>
@@ -261,7 +257,6 @@
 	<style name="NextStep.Button.Outlined">
 		<item name="android:drawableTint">@drawable/outlined_button_text_color</item>
 		<item name="android:textColor">@drawable/outlined_button_text_color</item>
-		<item name="android:textAllCaps">true</item>
 		<item name="android:background">@drawable/bg_button_outlined</item>
 	</style>
 

From f5df1d0359f6de5944eb411e790bb0b486946aaa Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 12:01:15 +0200
Subject: [PATCH 127/207] Add Debug Option to Simulate state after Instant App
 Update

---
 .../dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java  | 8 ++++++++
 app/src/main/res/layout/fragment_debug.xml               | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index e577e3ec3..3a4d1e1d6 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -37,6 +37,7 @@
 import org.dpppt.android.sdk.models.ExposureDay;
 
 import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
 import ch.admin.bag.dp3t.checkin.models.SwissCovidAssociatedData;
 import ch.admin.bag.dp3t.debug.model.DebugAppState;
 import ch.admin.bag.dp3t.networking.CertificatePinning;
@@ -109,6 +110,13 @@ private void setupSdkViews(View view) {
 			getActivity().finish();
 		});
 
+		view.findViewById(R.id.debug_button_simulate_from_instant_app).setOnClickListener(v -> {
+			setDebugAppState(DebugAppState.NONE);
+			tracingViewModel.resetSdk();
+			SecureStorage.getInstance(requireContext()).setOnlyPartialOnboardingCompleted(true);
+			getActivity().finish();
+		});
+
 		CheckBox certPinningCheckbox = view.findViewById(R.id.debug_certificate_pinning);
 		certPinningCheckbox.setChecked(CertificatePinning.isEnabled());
 		certPinningCheckbox.setOnCheckedChangeListener((v, isChecked) -> {
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index 5f85fd838..b67e4b7a0 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -115,6 +115,15 @@
 						android:backgroundTint="@color/purple_main"
 						android:text="@string/reset_update_boarding" />
 
+					<Button
+						android:id="@+id/debug_button_simulate_from_instant_app"
+						style="@style/NextStep.Button"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="@dimen/spacing_large"
+						android:backgroundTint="@color/purple_main"
+						android:text="Simulate Update From Instant App" />
+
 				</LinearLayout>
 
 			</androidx.cardview.widget.CardView>

From ffdd9f1333826484e4a22590bba0ca7555aa400f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Tue, 1 Jun 2021 12:27:27 +0200
Subject: [PATCH 128/207] fix formatting and history type

---
 .../java/ch/admin/bag/dp3t/util/NotificationUtil.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
index 571970fbc..6bc1db941 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
@@ -64,7 +64,7 @@ public static void generateContactNotification(Context context) {
 
 		NotificationManager notificationManager =
 				(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-		if(DebugFragment.EXISTS){
+		if (DebugFragment.EXISTS) {
 			HistoryDatabase.getInstance(context).addEntry(
 					new HistoryEntry(
 							HistoryEntryType.NOTIFICATION, "Showing new message notification", false,
@@ -76,6 +76,7 @@ public static void generateContactNotification(Context context) {
 
 		NotificationRepeatWorker.startWorker(context);
 	}
+
 	public static void showReminderNotification(Context context) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 			createNotificationChannel(CHANNEL_ID_REMINDER, context.getString(R.string.android_reminder_channel_name),
@@ -86,10 +87,11 @@ public static void showReminderNotification(Context context) {
 		String message = context.getString(R.string.tracing_reminder_notification_subtitle);
 
 		Notification notification = createNotification(title, message, pendingIntent, CHANNEL_ID_REMINDER, context);
-		NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);if(DebugFragment.EXISTS){
+		NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+		if (DebugFragment.EXISTS) {
 			HistoryDatabase.getInstance(context).addEntry(
 					new HistoryEntry(
-							HistoryEntryType.SYNC, "Showing activate tracing notification", false,
+							HistoryEntryType.NOTIFICATION, "Showing activate tracing notification", false,
 							System.currentTimeMillis()
 					)
 			);

From 8446f8824ed24257b74f3bffe56933edecd05835 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 13:01:14 +0200
Subject: [PATCH 129/207] Add Sync Button to Debug Fragment

---
 .../dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java  | 4 ++++
 app/src/main/res/layout/fragment_debug.xml               | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index 3a4d1e1d6..e688c0bba 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -50,6 +50,7 @@ public class DebugFragment extends Fragment {
 	public static final boolean EXISTS = true;
 
 	private TracingViewModel tracingViewModel;
+	private CrowdNotifierViewModel crowdNotifierViewModel;
 
 	public static void startDebugFragment(FragmentManager parentFragmentManager) {
 		parentFragmentManager.beginTransaction()
@@ -71,6 +72,7 @@ public DebugFragment() {
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		tracingViewModel = new ViewModelProvider(requireActivity()).get(TracingViewModel.class);
+		crowdNotifierViewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
 	}
 
 	@Override
@@ -110,6 +112,8 @@ private void setupSdkViews(View view) {
 			getActivity().finish();
 		});
 
+		view.findViewById(R.id.debug_button_sync_checkin_keys).setOnClickListener(v -> crowdNotifierViewModel.refreshTraceKeys());
+
 		view.findViewById(R.id.debug_button_simulate_from_instant_app).setOnClickListener(v -> {
 			setDebugAppState(DebugAppState.NONE);
 			tracingViewModel.resetSdk();
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index b67e4b7a0..e8e03bdc4 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -124,6 +124,15 @@
 						android:backgroundTint="@color/purple_main"
 						android:text="Simulate Update From Instant App" />
 
+					<Button
+						android:id="@+id/debug_button_sync_checkin_keys"
+						style="@style/NextStep.Button"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="@dimen/spacing_large"
+						android:backgroundTint="@color/purple_main"
+						android:text="Sync Checkin Trace Keys" />
+
 				</LinearLayout>
 
 			</androidx.cardview.widget.CardView>

From 01d342617581f8b8d06b41d0087314e0dc0f35d7 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 14:31:31 +0200
Subject: [PATCH 130/207] Fix wrong torch icon

---
 .../dp3t/checkin/checkinflow/QrCodeScannerFragment.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
index 7bfb3ff7b..83af1d99d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
@@ -125,15 +125,14 @@ private void setupFlashButton(Camera camera) {
 
 		camera.getCameraInfo().getTorchState().observe(getViewLifecycleOwner(), v -> {
 			if (v == TorchState.ON) {
-				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_off));
-			} else {
 				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_on));
+			} else {
+				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_off));
 			}
 		});
 
-		flashButton.setOnClickListener(v -> {
-			camera.getCameraControl().enableTorch(camera.getCameraInfo().getTorchState().getValue() == TorchState.OFF);
-		});
+		flashButton.setOnClickListener(v ->
+				camera.getCameraControl().enableTorch(camera.getCameraInfo().getTorchState().getValue() == TorchState.OFF));
 	}
 
 	private void startCameraAndQrAnalyzer() {

From ea975eb2c06d0660e98d40081a2e51d26b12e1cc Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 1 Jun 2021 16:06:15 +0200
Subject: [PATCH 131/207] removed deletion option in own events qr overview
 list

---
 .../generateqrcode/EventsOverviewFragment.kt        | 13 -------------
 .../dp3t/checkin/generateqrcode/QrCodeAdapter.kt    |  9 +++++----
 app/src/main/res/layout/item_qr_code.xml            |  9 ---------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index 8487526e6..a26e132d1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -32,11 +32,6 @@ class EventsOverviewFragment : Fragment() {
 				override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
 					showFragment(QrCodeFragment.newInstance(qrCodeItem), modalAnimation = true)
 				}
-
-				override fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo) {
-					showDeleteConfirmationDialog(qrCodeItem)
-				}
-
 			})
 
 			qrList.adapter = adapter
@@ -54,12 +49,4 @@ class EventsOverviewFragment : Fragment() {
 		}.root
 	}
 
-	private fun showDeleteConfirmationDialog(venueInfo: VenueInfo) {
-		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
-			.setMessage(R.string.delete_qr_code_dialog)
-			.setPositiveButton(R.string.delete_button_title) { _, _ -> qrCodeViewModel.deleteQrCode(venueInfo) }
-			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
-			.show()
-	}
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index 4d63c35d9..dc65686b2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -6,12 +6,15 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EXPLANATION
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EVENT
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EXPLANATION
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_FOOTER
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_GENERATE_QR_CODE_BUTTON
+import ch.admin.bag.dp3t.databinding.ItemEventsExplanationBinding
+import ch.admin.bag.dp3t.databinding.ItemEventsFooterBinding
+import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
+import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
 import ch.admin.bag.dp3t.extensions.getSubtitle
-import ch.admin.bag.dp3t.databinding.*
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeAdapter.QrCodeBaseViewHolder>() {
@@ -63,7 +66,6 @@ class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView
 				qrCodeName.text = item.venueInfo.title
 				qrCodeLocation.setText(item.venueInfo.getSubtitle())
 				root.setOnClickListener { onClickListener.onQrCodeClicked(item.venueInfo) }
-				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item.venueInfo) }
 			}
 		}
 	}
@@ -90,7 +92,6 @@ class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView
 interface OnClickListener {
 	fun generateQrCode()
 	fun onQrCodeClicked(qrCodeItem: VenueInfo)
-	fun onDeleteQrCodeClicked(qrCodeItem: VenueInfo)
 }
 
 
diff --git a/app/src/main/res/layout/item_qr_code.xml b/app/src/main/res/layout/item_qr_code.xml
index 235a74c92..9e88a421d 100644
--- a/app/src/main/res/layout/item_qr_code.xml
+++ b/app/src/main/res/layout/item_qr_code.xml
@@ -43,15 +43,6 @@
 
 		</LinearLayout>
 
-		<ImageView
-			android:id="@+id/qr_code_delete"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/spacing_very_small"
-			android:background="@drawable/ripple_rounded"
-			android:padding="@dimen/spacing_medium"
-			android:src="@drawable/ic_delete" />
-
 	</LinearLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From d832cb3d8ed0636cbcb993056b60a1ae2631e88d Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 1 Jun 2021 16:32:28 +0200
Subject: [PATCH 132/207] fixed 'checkin too long' message

---
 .../admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt | 4 +---
 .../ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt   | 7 +++++--
 .../admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt | 4 +---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index aba2145cd..bcf492396 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -18,7 +18,6 @@ import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
 import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
-import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
@@ -97,8 +96,7 @@ class CheckOutFragment : Fragment() {
 		val checkinDuration = checkInState.checkOutTime - checkInState.checkInTime
 		val maxCheckinTime = checkInState.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
 		if (checkinDuration > maxCheckinTime) {
-			val maxDurationString = StringUtil.getShortDurationStringWithUnits(maxCheckinTime, requireContext())
-			val dialogText = getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
+			val dialogText = CheckinTimeHelper.getMaxCheckinTimeExceededMessage(maxCheckinTime, requireContext())
 			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
 			return
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
index b8ed833b3..e9c1c6199 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
@@ -1,12 +1,11 @@
 package ch.admin.bag.dp3t.checkin.diary
 
 import android.content.Context
-import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
-import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
+import ch.admin.bag.dp3t.util.StringUtil
 
 object CheckinTimeHelper {
 
@@ -32,5 +31,9 @@ object CheckinTimeHelper {
 			.show()
 	}
 
+	fun getMaxCheckinTimeExceededMessage(maxCheckinTime: Long, context: Context): String {
+		val maxDurationString = StringUtil.getShortDurationStringWithUnits(maxCheckinTime, context)
+		return context.getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
+	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 9d176220d..31526f59a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -12,7 +12,6 @@ import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
 import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
-import ch.admin.bag.dp3t.util.StringUtil
 import org.crowdnotifier.android.sdk.CrowdNotifier
 
 class EditDiaryEntryFragment : Fragment() {
@@ -80,8 +79,7 @@ class EditDiaryEntryFragment : Fragment() {
 		val checkinDuration = diaryEntry.departureTime - diaryEntry.arrivalTime
 		val maxCheckinTime = diaryEntry.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
 		if (checkinDuration > maxCheckinTime) {
-			val maxDurationString = StringUtil.getShortDurationStringWithUnits(checkinDuration, requireContext())
-			val dialogText = getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
+			val dialogText = CheckinTimeHelper.getMaxCheckinTimeExceededMessage(maxCheckinTime, requireContext())
 			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
 			return
 		}

From de566aab209f19b526d2033629c5089bc7083b71 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 17:15:51 +0200
Subject: [PATCH 133/207] Fix Checkin Selection in Report Flow

---
 .../bag/dp3t/inform/ShareCheckinsFragment.kt    | 17 ++++++++++++-----
 .../main/res/layout/fragment_share_checkins.xml |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
index 1b8265a42..2795e4e1e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ShareCheckinsFragment.kt
@@ -28,15 +28,16 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 			adapter.setData(informViewModel.getSelectableCheckinItems())
 			adapter.itemSelectionListener { selectedItem, selected ->
 				informViewModel.setDiaryItemSelected(selectedItem.id, selected)
-				refreshSendButtonEnabled()
+				refreshSendButtonAndAllCheckbox()
 			}
 			selectAllCheckbox.setOnCheckedChangeListener { _, isChecked ->
 				informViewModel.getSelectableCheckinItems().forEach {
 					informViewModel.setDiaryItemSelected(it.diaryEntry.id, isChecked)
 				}
 				adapter.setData(informViewModel.getSelectableCheckinItems())
-				refreshSendButtonEnabled()
+				refreshSendButtonAndAllCheckbox()
 			}
+			selectAllContainer.setOnClickListener { selectAllCheckbox.isChecked = !selectAllCheckbox.isChecked }
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
 				if (informViewModel.hasSharedDP3TKeys) {
@@ -49,12 +50,18 @@ class ShareCheckinsFragment : TraceKeyShareBaseFragment() {
 				informViewModel.hasSharedCheckins = true
 				upload()
 			}
-			refreshSendButtonEnabled()
+			refreshSendButtonAndAllCheckbox()
 		}.root
 	}
 
-	private fun refreshSendButtonEnabled() {
-		binding.sendButton.isEnabled = informViewModel.getSelectableCheckinItems().find { it.isSelected } != null
+	private fun refreshSendButtonAndAllCheckbox() {
+		val hasSelectedCheckins = informViewModel.getSelectableCheckinItems().any { it.isSelected }
+		val allCheckinsSelected = informViewModel.getSelectableCheckinItems().all { it.isSelected }
+		binding.apply {
+			binding.sendButton.isEnabled = hasSelectedCheckins
+			if (!hasSelectedCheckins) selectAllCheckbox.isChecked = false
+			if (allCheckinsSelected) selectAllCheckbox.isChecked = true
+		}
 	}
 
 	private fun upload() {
diff --git a/app/src/main/res/layout/fragment_share_checkins.xml b/app/src/main/res/layout/fragment_share_checkins.xml
index dba5940fe..898cb5ccd 100644
--- a/app/src/main/res/layout/fragment_share_checkins.xml
+++ b/app/src/main/res/layout/fragment_share_checkins.xml
@@ -29,6 +29,7 @@
 			android:text="@string/inform_share_checkins_subtitle" />
 
 		<LinearLayout
+			android:id="@+id/select_all_container"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="@dimen/spacing_medium_large"

From 32e890a7c05e6ad1979179545aaffb0d823f68d7 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 1 Jun 2021 18:03:55 +0200
Subject: [PATCH 134/207] correct checkmark icon for notifications card

---
 .../dp3t/home/model/NotificationState.java    | 19 +++++++++++++++++--
 .../dp3t/util/NotificationStateHelper.java    | 10 ++++++++--
 app/src/main/res/layout/layout_status.xml     |  8 ++++----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java b/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
index ef321ad8c..6a0eef753 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/model/NotificationState.java
@@ -11,6 +11,7 @@
 
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
 import ch.admin.bag.dp3t.R;
@@ -50,7 +51,7 @@ public static int getText(NotificationState notificationState) {
 	public static int getIcon(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
-				return R.drawable.ic_check;
+				return R.drawable.ic_check_circle;
 			case EXPOSED:
 				return R.drawable.ic_warning_round;
 			case POSITIVE_TESTED:
@@ -59,6 +60,20 @@ public static int getIcon(NotificationState notificationState) {
 		return -1;
 	}
 
+	@ColorRes
+	@Nullable
+	public static Integer getIconColor(NotificationState notificationState) {
+		switch (notificationState) {
+			case NO_REPORTS:
+				return null;
+			case EXPOSED:
+				return R.color.white;
+			case POSITIVE_TESTED:
+				return R.color.white;
+		}
+		return null;
+	}
+
 	@ColorRes
 	public static int getTitleTextColor(NotificationState notificationState) {
 		switch (notificationState) {
@@ -73,7 +88,7 @@ public static int getTitleTextColor(NotificationState notificationState) {
 	}
 
 	@ColorRes
-	public static int geTextColor(NotificationState notificationState) {
+	public static int getTextColor(NotificationState notificationState) {
 		switch (notificationState) {
 			case NO_REPORTS:
 				return R.color.dark_main;
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
index f2b416133..6cfc551a5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
@@ -33,10 +33,9 @@ public static void updateStatusView(View statusView, NotificationState state, lo
 		TextView textView = statusView.findViewById(R.id.status_text);
 		ImageView illustrationView = statusView.findViewById(R.id.status_illustration);
 		int titleColor = ContextCompat.getColor(context, NotificationState.getTitleTextColor(state));
-		int textColor = ContextCompat.getColor(context, NotificationState.geTextColor(state));
+		int textColor = ContextCompat.getColor(context, NotificationState.getTextColor(state));
 		titleView.setTextColor(titleColor);
 		textView.setTextColor(textColor);
-		iconView.setImageTintList(ColorStateList.valueOf(titleColor));
 
 		if (NotificationState.getTitle(state) != -1) {
 			titleView.setText(NotificationState.getTitle(state));
@@ -53,6 +52,13 @@ public static void updateStatusView(View statusView, NotificationState state, lo
 		if (NotificationState.getIcon(state) != -1) {
 			iconView.setImageResource(NotificationState.getIcon(state));
 			iconView.setVisibility(View.VISIBLE);
+
+			Integer iconColor = NotificationState.getIconColor(state);
+			if (iconColor != null) {
+				iconView.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(context, iconColor)));
+			} else {
+				iconView.setImageTintList(null);
+			}
 		} else {
 			iconView.setVisibility(View.GONE);
 		}
diff --git a/app/src/main/res/layout/layout_status.xml b/app/src/main/res/layout/layout_status.xml
index 13c7b652b..c04f7a090 100644
--- a/app/src/main/res/layout/layout_status.xml
+++ b/app/src/main/res/layout/layout_status.xml
@@ -32,14 +32,14 @@
 
 	<ImageView
 		android:id="@+id/status_icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="34dp"
+		android:layout_height="24dp"
 		android:layout_marginStart="10dp"
 		android:layout_marginTop="10dp"
-		android:paddingEnd="10dp"
+		android:scaleType="fitStart"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="@id/status_title"
-		tools:src="@drawable/ic_check" />
+		tools:src="@drawable/ic_check_circle" />
 
 	<TextView
 		android:id="@+id/status_title"

From cc55c6019850d87eb1415c7c822a6d209169940b Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 19:13:24 +0200
Subject: [PATCH 135/207] Change oldestSharedKeyDate to
 oldestSharedKeyDateOrCheckin

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  2 +
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 49 ++++++++++++-------
 .../admin/bag/dp3t/reports/ReportsFragment.kt |  3 +-
 .../admin/bag/dp3t/storage/SecureStorage.java | 11 +++++
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 2c7e7b2f1..30a30ad50 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -459,6 +459,7 @@ private void setupCovidCodeCard() {
 								tracingStatusInterface.resetInfectionStatus(getContext());
 								secureStorage.setIsolationEndDialogTimestamp(-1L);
 								secureStorage.setPositiveReportOldestSharedKey(-1L);
+								secureStorage.setPositiveReportOldestSharedKeyOrCheckin(-1L);
 							})
 							.setNegativeButton(R.string.cancel, (dialog, id) -> {
 								//do nothing
@@ -542,6 +543,7 @@ public void onChanged(TracingStatusInterface tracingStatusInterface) {
 								tracingStatusInterface.resetInfectionStatus(getContext());
 								secureStorage.setIsolationEndDialogTimestamp(-1L);
 								secureStorage.setPositiveReportOldestSharedKey(-1L);
+								secureStorage.setPositiveReportOldestSharedKeyOrCheckin(-1L);
 							})
 							.setNegativeButton(R.string.answer_no, (dialog, which) -> {
 								long newTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index b3ad7ab2b..ba43c9865 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -35,7 +35,9 @@ import java.util.*
 import java.util.concurrent.CancellationException
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
+import kotlin.math.max
 
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
@@ -104,6 +106,8 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		val onsetResponseTime = onsetResponseTime ?: System.currentTimeMillis()
 		val timeBetweenOnsetAndUploadRequest = (System.currentTimeMillis() - onsetResponseTime).toInt()
 		delay(UPLOAD_REQUEST_TIME_PADDING - (System.currentTimeMillis() - onsetResponseTime) % UPLOAD_REQUEST_TIME_PADDING)
+		var oldestSharedKey: Long? = null
+		var oldestSharedCheckin: Long? = null
 		try {
 			loadAccessTokens(covidCode)
 		} catch (exception: Throwable) {
@@ -116,7 +120,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 		try {
 			if (hasSharedDP3TKeys) {
-				uploadTEKs()
+				oldestSharedKey = uploadTEKs()
 			} else {
 				performFakeTEKUpload()
 			}
@@ -131,7 +135,11 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		}
 
 		try {
-			performCheckinsUpload(timeBetweenOnsetAndUploadRequest, isFake = !hasSharedCheckins)
+			if (hasSharedCheckins) {
+				oldestSharedCheckin = performCheckinsUpload(timeBetweenOnsetAndUploadRequest)
+			} else {
+				performFakeCheckinsUpload(timeBetweenOnsetAndUploadRequest)
+			}
 		} catch (exception: Throwable) {
 			when (exception) {
 				is HttpException -> emit(Resource.error(InformRequestError.USER_UPLOAD_NETWORK_ERROR, exception))
@@ -144,12 +152,14 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		appConfigManager.iAmInfected = true
 		appConfigManager.iAmInfectedIsResettable = true
 		DP3T.stop(getApplication())
+		secureStorage.positiveReportOldestSharedKeyOrCheckin = listOfNotNull(oldestSharedKey, oldestSharedCheckin).minOrNull() ?: -1
 		emit(Resource.success(data = null))
 	}
 
 	fun getSelectableCheckinItems(): List<SelectableCheckinItem> {
 		return diaryStorage.entries.filter {
 			it.venueInfo.getSwissCovidLocationData().type == VenueType.USER_QR_CODE && it.departureTime >= onsetDate ?: 0
+					&& it.departureTime > System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS
 		}.map {
 			SelectableCheckinItem(it, isSelected = selectedDiaryEntryIds.contains(it.id))
 		}
@@ -176,20 +186,21 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		DP3TKotlin.sendFakeInfectedRequest(getApplication(), authorizationHeader)
 	}
 
-	private suspend fun uploadTEKs() {
+	/**
+	 * Returns the oldestSharedKeyDate
+	 */
+	private suspend fun uploadTEKs(): Long {
 		val authorizationHeader = getAuthorizationHeader(secureStorage.lastDP3TInformToken)
 		val onsetDate = JwtUtil.getOnsetDate(secureStorage.lastDP3TInformToken)
 
-		var error: Throwable? = null
-
 		// Wrapping traditional callback in a suspendCoroutine
-		suspendCoroutine<Unit> { continuation ->
+		return suspendCoroutine { continuation ->
 			pendingUploadTask?.performUpload(getApplication(), onsetDate, ExposeeAuthMethodAuthorization(authorizationHeader),
 				object : ResponseCallback<DayDate> {
 					override fun onSuccess(oldestSharedKeyDayDate: DayDate) {
 
 						// Store the oldest shared Key date of this report (but at least now-MAX_EXPOSURE_AGE_MILLIS)
-						val oldestSharedKeyDate = Math.max(
+						val oldestSharedKeyDate = max(
 							oldestSharedKeyDayDate.startOfDayTimestamp,
 							System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS
 						)
@@ -200,25 +211,29 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 							System.currentTimeMillis() + TimeUnit.DAYS.toMillis(ISOLATION_DURATION_DAYS)
 						secureStorage.isolationEndDialogTimestamp = isolationEndDialogTimestamp
 						hasSharedDP3TKeys = true
-						continuation.resume(Unit)
+						continuation.resume(oldestSharedKeyDate)
 					}
 
 					override fun onError(throwable: Throwable) {
-						error = throwable
-						continuation.resume(Unit)
+						continuation.resumeWithException(throwable)
 					}
 				})
 		}
-		error?.let { throw(it) }
 	}
 
-	private suspend fun performCheckinsUpload(timeBetweenOnsetAndUploadRequest: Int, isFake: Boolean) {
+	/**
+	 * Returns oldest shared Checkin
+	 */
+	private suspend fun performCheckinsUpload(timeBetweenOnsetAndUploadRequest: Int): Long? {
 		val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
-		if (isFake) {
-			userUploadRepository.fakeUserUpload(timeBetweenOnsetAndUploadRequest, authorizationHeader)
-		} else {
-			userUploadRepository.userUpload(getUploadVenueInfos(), timeBetweenOnsetAndUploadRequest, authorizationHeader)
-		}
+		val uploadVenueInfos = getUploadVenueInfos()
+		userUploadRepository.userUpload(uploadVenueInfos, timeBetweenOnsetAndUploadRequest, authorizationHeader)
+		return uploadVenueInfos.minOfOrNull { it.intervalStartMs }
+	}
+
+	private suspend fun performFakeCheckinsUpload(timeBetweenOnsetAndUploadRequest: Int) {
+		val authorizationHeader = getAuthorizationHeader(secureStorage.lastCheckinInformToken)
+		userUploadRepository.fakeUserUpload(timeBetweenOnsetAndUploadRequest, authorizationHeader)
 	}
 
 	private suspend fun loadOnsetDate(covidcode: String) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index 4e3a631b4..fbc2211c4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -213,7 +213,7 @@ class ReportsFragment : Fragment() {
 				}
 			}
 			State.POSITIVE_TESTED -> {
-				val oldestSharedKeyDateMillis = secureStorage.positiveReportOldestSharedKey
+				val oldestSharedKeyDateMillis = secureStorage.positiveReportOldestSharedKeyOrCheckin
 				binding.reportsInfected.apply {
 					faqButton.setOnClickListener { showFaq() }
 					cardEncountersFaqWhoIsNotifiedContainer.isVisible = oldestSharedKeyDateMillis > 0L
@@ -256,6 +256,7 @@ class ReportsFragment : Fragment() {
 				tracingViewModel.appStatusLiveData.value?.resetInfectionStatus(context)
 				secureStorage.isolationEndDialogTimestamp = -1L
 				secureStorage.positiveReportOldestSharedKey = -1L
+				secureStorage.positiveReportOldestSharedKeyOrCheckin = -1L
 				parentFragmentManager.popBackStack()
 			}
 			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 91d27eef4..868693e6b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -78,6 +78,9 @@ public class SecureStorage {
 	private static final String KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG = "KEY_CROWD_NOTIFIER_LAST_KEY_BUNDLE_TAG";
 	private static final String KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD = "KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD";
 	private static final String KEY_ONLY_PARTIAL_ONBOARDING_DONE = "KEY_ONLY_PARTIAL_ONBOARDING_DONE";
+	private static final String KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN =
+			"KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN";
+
 
 	private static SecureStorage instance;
 
@@ -384,6 +387,14 @@ public void setPositiveReportOldestSharedKey(long setPositiveReportOldestSharedK
 		prefs.edit().putLong(KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY, setPositiveReportOldestSharedKey).apply();
 	}
 
+	public long getPositiveReportOldestSharedKeyOrCheckin() {
+		return prefs.getLong(KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN, -1L);
+	}
+
+	public void setPositiveReportOldestSharedKeyOrCheckin(long oldestSharedKeyOrCheckin) {
+		prefs.edit().putLong(KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN, oldestSharedKeyOrCheckin).apply();
+	}
+
 	private synchronized SharedPreferences initializeSharedPreferences(@NonNull Context context) {
 		try {
 			return createEncryptedSharedPreferences(context);

From fb05e6d15c2eaf818ef0dcaf3334792b2f151267 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 19:26:20 +0200
Subject: [PATCH 136/207] Implemented Error Popup when entering Covidcode while
 checked in

---
 .../ch/admin/bag/dp3t/home/HomeFragment.java  |  17 ++-
 common/src/main/res/values-bs/strings.xml     |   9 ++
 common/src/main/res/values-de/strings.xml     |   9 ++
 common/src/main/res/values-es/strings.xml     |   9 ++
 common/src/main/res/values-fr/strings.xml     | 114 ++++++++++--------
 common/src/main/res/values-hr/strings.xml     |   9 ++
 common/src/main/res/values-it/strings.xml     |   9 ++
 common/src/main/res/values-pt/strings.xml     |   9 ++
 common/src/main/res/values-rm/strings.xml     |   9 ++
 common/src/main/res/values-sq/strings.xml     |   9 ++
 common/src/main/res/values-sr/strings.xml     |   9 ++
 common/src/main/res/values-ti/strings.xml     |   9 ++
 common/src/main/res/values-tr/strings.xml     |   9 ++
 common/src/main/res/values/strings.xml        |   9 ++
 14 files changed, 185 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 30a30ad50..8ef96b738 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -472,13 +472,26 @@ private void setupCovidCodeCard() {
 				covidCodeTitle.setText(R.string.home_covidcode_card_title);
 				covidCodeText.setText(R.string.home_covidcode_card_text);
 				covidCodeButton.setOnClickListener(v -> {
-					Intent intent = new Intent(getActivity(), InformActivity.class);
-					startActivity(intent);
+					if (crowdNotifierViewModel.isCheckedIn().getValue()) {
+						showCannotEnterCovidcodeWhileCheckedInDialog();
+					} else {
+						Intent intent = new Intent(getActivity(), InformActivity.class);
+						startActivity(intent);
+					}
 				});
 			}
 		});
 	}
 
+	private void showCannotEnterCovidcodeWhileCheckedInDialog() {
+		new AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+				.setMessage(R.string.error_cannot_enter_covidcode_while_checked_in)
+				.setPositiveButton(R.string.checkout_button_title, (dialog, id) -> showCheckOutFragment())
+				.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss())
+				.create()
+				.show();
+	}
+
 	private void showCheckOutFragment() {
 		requireActivity().getSupportFragmentManager().beginTransaction()
 				.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter,
diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index 6d709a2ab..7c2af5ec0 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -1753,4 +1753,13 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 09fb2a557..5a48570be 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -1836,4 +1836,13 @@ Dieser Titel wird beim Check-in angezeigt."</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"Für diesen Check-In gilt eine maximale Check-in Dauer von {DURATION}. Bitte überprüfen Sie nochmals Ihre Angabe."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"Licht an"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"Licht aus"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Sie sind noch eingecheckt. Bitte checken Sie aus bevor Sie den Covidcode eingeben."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 77773d607..6f4f5669d 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -1745,4 +1745,13 @@ Posibles utilizaciones:
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 057cc8715..e3e171ce9 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -260,7 +260,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Suivez les consignes reçues sur l'isolement."</string>
-    <string name="tracing_ended_title">"Contacts et connexion désactivés"</string>
+    <string name="tracing_ended_title">"Contacts et check-ins désactivés"</string>
     <string name="tracing_ended_text">"Aucune contact n’est sauvegardé."</string>
     <string name="exposed_info_contact_hotline">"Contactez"</string>
     <string name="meldung_homescreen_positive_info_line1">"Suivez"</string>
@@ -624,7 +624,7 @@ Ceci permet de garantir que seuls les cas confirmés sont déclarés dans l'appl
     <string name="inform_detail_faq2_title">"Qu'est-ce qui est envoyé ?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"Seules les clés privées de votre application et les identifiants codés de vos connexions sont transmises, aucune donnée personnelle.
+    <string name="inform_detail_faq2_text">"Seules les clés privées de votre application et les identifiants codés de vos check-ins sont transmises, aucune donnée personnelle.
 
 Ainsi, d’autres utilisateurs de l’application SwissCovid apprennent qu’il y a un risque d’infection.
 "</string>
@@ -1426,16 +1426,16 @@ Appelez :"</string>
     <string name="meldungen_detail_free_test_tomorrow">"Dans 1 jour"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Rappel de déconnexion"</string>
+    <string name="checkout_reminder_title">"Rappel de check-out"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
     <string name="checkout_reminder_text">"Souhaitez-vous vous déconnecter ?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Déconnexion automatique"</string>
+    <string name="auto_checkout_title">"Check-out automatique"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"Il y a eu une déconnexion automatique."</string>
+    <string name="auto_checkout_body">"Il y a eu un check-out automatique."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
     <string name="qrscanner_scan_qr_text">"Scanner le code QR et se connecter"</string>
@@ -1459,7 +1459,7 @@ Appelez :"</string>
     <string name="done_button">"Fin"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Rappel de déconnexion"</string>
+    <string name="checkin_set_reminder">"Rappel de check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
     <string name="reminder_option_off">"Arrêter"</string>
@@ -1477,10 +1477,10 @@ Appelez :"</string>
     <string name="qr_scanner_no_camera_permission">"L'application doit avoir accès à l'appareil photo pour pouvoir scanner le code QR."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"Mes connexions"</string>
+    <string name="diary_title">"Mes check-ins"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title">"Connexion"</string>
+    <string name="checkin_button_title">"Check-in"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
     <string name="NSCameraUsageDescription">"L’appareil photo est nécessaire pour scanner le code QR."</string>
@@ -1492,19 +1492,19 @@ Appelez :"</string>
     <string name="face_id_reason_text">"Veuillez vous authentifier pour accéder au journal"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Déconnexion"</string>
+    <string name="checkout_button_title">"Check-out"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Connexion"</string>
+    <string name="module_checkins_title">"Check-in"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Connexion"</string>
+    <string name="checkin_title">"Check-in"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
     <string name="checkins_create_qr_code">"Créer un code QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Proposer des connexions ?"</string>
+    <string name="events_title">"Créer un code check-in?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Se connecter "</string>
@@ -1513,7 +1513,7 @@ Appelez :"</string>
     <string name="checkin_reminder_settings_alert_title">"Le rappel n’a pas pu être activé."</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"Afin de recevoir un rappel de déconnexion, vous devez autoriser la fonction \\"Notifications\\" dans les paramètres de l’application."</string>
+    <string name="checkin_reminder_settings_alert_message">"Afin de recevoir un rappel de check-out, vous devez autoriser la fonction \\"Notifications\\" dans les paramètres de l’application."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
     <string name="checkin_reminder_option_open_settings">"Adapter"</string>
@@ -1528,7 +1528,7 @@ Appelez :"</string>
     <string name="empty_diary_text">"Si vous scannez un code QR SwissCovid pour vous connecter sur place, une donnée est automatiquement enregistrée."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid doit avoir accès à l’appareil photo de votre smartphone. L’appareil photo est uniquement utilisé pour scanner les codes QR."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid doit avoir accès à l’appareil photo de votre smartphone. L’appareil photo est uniquement utilisé pour scanner les QR codes."</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
     <string name="camera_permission_dialog_action">"Autoriser l’accès à l’appareil photo"</string>
@@ -1550,14 +1550,14 @@ Appelez :"</string>
     <string name="error_title">"Erreur"</string>
     <string name="qr_scanner_error_code_not_yet_valid">"Le code QR n’est pas encore valable."</string>
     <string name="qr_scanner_error_code_not_valid_anymore">"Le code QR n’est plus valable."</string>
-    <string name="error_already_checked_in">"Votre connexion a déjà été établie."</string>
+    <string name="error_already_checked_in">"Votre check-in a déjà été établie."</string>
     <string name="error_update_text">"Ce code QR n'est pas compatible avec la version installée de l’application. Veuillez mettre à jour l’application."</string>
     <string name="error_update_title">"Mise à jour requise"</string>
     <string name="error_action_update">"Mettre à jour "</string>
     <string name="ongoing_notification_checkout_quick_action">"Déconnecter"</string>
     <string name="reminder_notification_snooze_action">"Fonction de rappel"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Notification de connexion permanente"</string>
-    <string name="ongoing_notification_title">"Connexion activée depuis {TIME} heures."</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Notification de check-in permanente"</string>
+    <string name="ongoing_notification_title">"Check-in activé depuis {TIME} heures."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
     <string name="checkout_save_button_title">"Sauvegarder"</string>
@@ -1566,19 +1566,19 @@ Appelez :"</string>
     <string name="scan_qr_code_button_title">"Scanner le code QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Connexion désactivée"</string>
+    <string name="checkin_ended_title">"Check-in désactivée"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Pas de connexion possible actuellement"</string>
+    <string name="checkin_ended_text">"Pas de check-in possible actuellement"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scannez un code QR SwissCovid pour vous connecter sur place."</string>
+    <string name="checkin_detail_checked_out_text">"Scannez un QR code SwissCovid pour vous connecter sur place."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
     <string name="checkin_detail_diary_text">"Si vous scannez un code QR SwissCovid pour vous connecter sur place, une donnée est automatiquement enregistrée."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"Connexion effectuée"</string>
+    <string name="checkin_checked_in">"Check-in effectué"</string>
     <string name="checkout_from_to_date">"Du {DATE1} au {DATE2}"</string>
     <string name="inform_detail_covidcode_info_button">"Plus d’informations sur le code COVID"</string>
 
@@ -1595,13 +1595,13 @@ Appelez :"</string>
     <string name="print_button_title">"Imprimer"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scannez un code QR SwissCovid pour vous connecter sur place."</string>
+    <string name="module_checkins_description">"Scannez un QR code SwissCovid pour vous connecter sur place."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Partager les données de connexion"</string>
+    <string name="inform_share_checkins_title">"Partager les données de check-ins"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"Si vous partagez vos données de connexion, l’application peut notifier les personnes qui étaient connectées au même endroit et à la même heure."</string>
+    <string name="inform_share_checkins_subtitle">"Si vous partagez vos données de check-in, l’application peut notifier les personnes qui étaient connectées au même endroit et à la même heure."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all">"Sélectionner tous"</string>
@@ -1626,7 +1626,7 @@ Appelez :"</string>
     <string name="home_covidcode_card_title">"Test positif ?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Réactiver contacts et connexions."</string>
+    <string name="home_end_isolation_card_text">"Réactiver contacts et check-ins."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
     <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
@@ -1638,25 +1638,25 @@ Appelez :"</string>
     <string name="events_card_subtitle">"Créez un code QR permettant aux utilisateurs de se connecter sur place."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Souhaitez-vous vraiment supprimer le code QR ?"</string>
+    <string name="delete_qr_code_dialog">"Souhaitez-vous vraiment supprimer le QR code?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Auto-connexion"</string>
+    <string name="self_checkin_button_title">"Auto-check-in"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scannez un code QR SwissCovid pour vous connecter sur place."</string>
+    <string name="checkin_overview_checkins_explanation">"Scannez un QR code SwissCovid pour vous connecter sur place."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
     <string name="checkout_overlapping_alert_title">"Sauvegarde impossible"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"Les heures sélectionnées coïncident avec d’autres connexions dans votre journal. Vérifiez encore une fois votre saisie."</string>
+    <string name="checkout_overlapping_alert_description">"Les heures sélectionnées coïncident avec d’autres check-ins dans votre journal. Vérifiez encore une fois votre saisie."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"Les données de connexion sélectionnées ont été transmises. Toutes les personnes qui étaient connectées au même endroit à la même heure seront notifiées."</string>
+    <string name="inform_send_thankyou_text_checkins">"Les données de check-in sélectionnées ont été transmises. Toutes les personnes qui étaient connectées au même endroit à la même heure seront notifiées."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"Connexion SwissCovid"</string>
+    <string name="pdf_headline">"SwissCovid Check-in"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
     <string name="pdf_slogan">"Se connecter sans enregistrer de données"</string>
@@ -1680,19 +1680,19 @@ Appelez :"</string>
     <string name="home_end_isolation_card_title">"Fin de l’isolement ?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Souhaitez-vous proposer des connexions ?"</string>
-    <string name="checkin_footer_title1">"À quoi sert la fonction de connexion ?"</string>
-    <string name="checkin_footer_subtitle1">"La fonction de connexion sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
+    <string name="events_card_title">"Souhaitez-vous créer un code de check-in?"</string>
+    <string name="checkin_footer_title1">"À quoi sert la fonction de check-in?"</string>
+    <string name="checkin_footer_subtitle1">"La fonction de check-in sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
     <string name="checkin_footer_title2">"Pas de sauvegarde centralisée des données"</string>
-    <string name="checkin_footer_subtitle2">"La fonction de connexion SwissCovid ne nécessite pas la saisie de coordonnées comme le nom, l’adresse ou le numéro de téléphone et elle n’enregistre pas les données de géolocalisation. La liste des connexions est enregistrée localement sur votre smartphone. Les données locales sont effacées après 14 jours."</string>
+    <string name="checkin_footer_subtitle2">"La fonction des SwissCovid check-ins ne nécessite pas la saisie de coordonnées comme le nom, l’adresse ou le numéro de téléphone et elle n’enregistre pas les données de géolocalisation. La liste des check-ins est enregistrée localement sur votre smartphone. Les données locales sont effacées après 14 jours."</string>
     <string name="events_empty_state_title">"Créer un code QR"</string>
     <string name="events_empty_state_subtitle">"Au moyen du code QR SwissCovid, il est possible de se connecter sur place sans devoir enregistrer ses données."</string>
     <string name="events_info_box_title">"Cette fonction ne remplace pas la collecte obligatoire des coordonnées."</string>
-    <string name="events_info_box_text">"La connexion SwissCovid ne remplace la collecte des coordonnées prescrite par l’« ordonnance COVID-19 situation particulière »."</string>
-    <string name="events_footer_title1">"Où la fonction de connexion peut-elle être utilisée ?"</string>
-    <string name="events_footer_title2">"À quoi sert la fonction de connexion ?"</string>
-    <string name="events_footer_subtitle1">"La fonction de connexion SwissCovid sera utile lors de rencontres dans des lieux où la collecte des coordonnées n’est pas obligatoire. Il peut s’agir – de rencontres privées – d’événements organisés par des associations – de rassemblements dans le cadre professionnel, p. ex. salles de réunion, bureaux, cantines, etc."</string>
-    <string name="events_footer_subtitle2">"La fonction de connexion sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
+    <string name="events_info_box_text">"La check-ins SwissCovid ne remplace la collecte des coordonnées prescrite par l’« ordonnance COVID-19 situation particulière »."</string>
+    <string name="events_footer_title1">"Où la fonction de check-in peut-elle être utilisée?"</string>
+    <string name="events_footer_title2">"À quoi sert la fonction de check-in?"</string>
+    <string name="events_footer_subtitle1">"La fonction de check-in SwissCovid sera utile lors de rencontres dans des lieux où la collecte des coordonnées n’est pas obligatoire. Il peut s’agir – de rencontres privées – d’événements organisés par des associations – de rassemblements dans le cadre professionnel, p. ex. salles de réunion, bureaux, cantines, etc."</string>
+    <string name="events_footer_subtitle2">"La fonction de check-in sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle">"Situations à risque"</string>
@@ -1701,28 +1701,29 @@ Appelez :"</string>
     <string name="meldung_detail_exposed_list_card_title_encounters">"Contacts"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin">"Connexion"</string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
     <string name="meldung_detail_exposed_list_card_whattodo_button">"Que dois-je faire ?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Connexion positive"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Check-in positif"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Connexions / contacts positifs"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Check-ins / contacts positifs"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"Code QR de l’utilisateur"</string>
+    <string name="venue_type_user_qr_code">"QR code de l’utilisateur"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Code QR de traçage des contacts"</string>
+    <string name="venue_type_contact_tracing_qr_code">"QR code de traçage des contacts"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"Après un test positif, la fonction de connexion est automatiquement désactivée. Elle peut être réactivée après la fin de l’isolement."</string>
+    <string name="checkin_ended_text_detailed">"Après un test positif, la fonction de check-in est automatiquement désactivée. Elle peut être réactivée après la fin de l’isolement."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Saisissez un titre qui décrit le lieu ou l’événement. Ce titre s’affichera lors de la connexion."</string>
+    <string name="checkins_create_qr_code_subtitle">"Saisissez un titre qui décrit le lieu ou l’événement. 
+Ce titre s’affichera lors du check-in."</string>
     <string name="checkin_report_heading">"Que pouvez-vous faire ?"</string>
     <string name="checkin_report_title1">"Protéger les contacts"</string>
     <string name="checkin_report_title2">"Observer les symptômes"</string>
@@ -1732,21 +1733,21 @@ Appelez :"</string>
     <string name="checkin_report_subtitle3">"Faites-vous immédiatement tester si vous présentez des symptômes. Même en l’absence de symptômes il peut être utile et recommandé de se faire tester pour le coronavirus."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Connexion"</string>
+    <string name="meldung_detail_checkin_title">"Check-in"</string>
     <string name="not_thank_you_screen_title">"Pas de données transmises"</string>
     <string name="not_thank_you_screen_text1">"Aucune clé privée n’a été transmise."</string>
     <string name="not_thank_you_screen_back_button">"Retour"</string>
     <string name="not_thank_you_screen_dont_send_button">"Ne pas transmettre de données"</string>
-    <string name="not_thank_you_screen_text2">"Aucune donnée de connexion n’a été transmise."</string>
+    <string name="not_thank_you_screen_text2">"Aucune donnée de check-in n’a été transmise."</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
     <string name="inform_share_checkins_send_button_title">"Partager la sélection"</string>
     <string name="inform_share_checkins_not_send_button">"Ne rien partager"</string>
     <string name="onboarding_checkin_title">"Se connecter sans enregistrer de données"</string>
-    <string name="onboarding_checkin_heading">"Connexions"</string>
-    <string name="onboarding_checkin_text1">"La fonction de connexion SwissCovid vous permet de vous connecter via l’application dans un lieu particulier ou lors d’une rencontre."</string>
+    <string name="onboarding_checkin_heading">"Check-ins"</string>
+    <string name="onboarding_checkin_text1">"La fonction de SwissCovid check-in vous permet de vous connecter via l’application dans un lieu particulier ou lors d’une rencontre."</string>
     <string name="onboarding_checkin_text2">"Votre présence est seulement enregistrée dans votre application. Il n’est pas nécessaire de saisir vos coordonnées dans l’application."</string>
-    <string name="checkin_updateboarding_text">"La fonction de connexion SwissCovid vous permet de vous connecter via l’application dans un lieu particulier ou lors d’une rencontre. Votre présence est seulement enregistrée dans votre application. Il n’est pas nécessaire de saisir vos coordonnées dans l’application. À cette fin, les conditions d’utilisation et la déclaration de protection des données ont été mises à jour."</string>
+    <string name="checkin_updateboarding_text">"La fonction de SwissCovid check-in vous permet de vous connecter via l’application dans un lieu particulier ou lors d’une rencontre. Votre présence est seulement enregistrée dans votre application. Il n’est pas nécessaire de saisir vos coordonnées dans l’application. À cette fin, les conditions d’utilisation et la déclaration de protection des données ont été mises à jour."</string>
     <string name="onboarding_gaen_button_dont_activate">"Passer à l'étape suivante "</string>
 
     <!-- Hide from diary warning text -->
@@ -1776,4 +1777,13 @@ Appelez :"</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 1fd361d7a..3fda32aec 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -1751,4 +1751,13 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 5e6fc52bc..c31223e43 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -1788,4 +1788,13 @@ Possibili luoghi d'impiego:
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index 800bfe8d2..80ef32410 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -1755,4 +1755,13 @@ Este título vai ser indicado no check-in."</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index 3de7f0790..233257bac 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -1753,4 +1753,13 @@ Possible locations:
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 8912c8f0d..56c10eda6 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -1756,4 +1756,13 @@ Ky titull shfaqet gjatë Check-in."</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index a4162b5f0..3f34b1491 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -1751,4 +1751,13 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index db660c206..ddccd13f7 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -1739,4 +1739,13 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index 52a2456e7..5995220f6 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -1739,4 +1739,13 @@ Bu başlık check-in sırasında gösterilir."</string>
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index db87b7d88..82920899c 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1777,4 +1777,13 @@ Possible locations:
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
     <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+
+    <!-- turn camera light on -->
+    <string name="accessibility_camera_light_on">"turn light on"</string>
+
+    <!-- turn camera light off -->
+    <string name="accessibility_camera_light_off">"turn light off"</string>
+
+    <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
+    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
 </resources>
\ No newline at end of file

From 881e676da75627849517ee78e3cf6029df433811 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 19:37:04 +0200
Subject: [PATCH 137/207] Set QR Code title length to max 60 letters

---
 app/src/main/res/layout/fragment_generate_qr_code.xml | 1 +
 common/src/main/res/values-bs/strings.xml             | 2 +-
 common/src/main/res/values-fr/strings.xml             | 2 +-
 common/src/main/res/values-hr/strings.xml             | 2 +-
 common/src/main/res/values-it/strings.xml             | 2 +-
 common/src/main/res/values-pt/strings.xml             | 2 +-
 common/src/main/res/values-sq/strings.xml             | 2 +-
 common/src/main/res/values-sr/strings.xml             | 2 +-
 common/src/main/res/values-tr/strings.xml             | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/fragment_generate_qr_code.xml b/app/src/main/res/layout/fragment_generate_qr_code.xml
index 387feac47..8fb7d683f 100644
--- a/app/src/main/res/layout/fragment_generate_qr_code.xml
+++ b/app/src/main/res/layout/fragment_generate_qr_code.xml
@@ -81,6 +81,7 @@
 					android:layout_height="wrap_content"
 					android:hint="@string/web_generator_title_placeholder"
 					android:inputType="textNoSuggestions"
+					android:maxLength="60"
 					android:textColor="@color/blue_main"
 					android:textStyle="bold" />
 
diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index 7c2af5ec0..d791324c9 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -1434,7 +1434,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_set_reminder">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Isključeno"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index e3e171ce9..4d1349dc3 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -1462,7 +1462,7 @@ Appelez :"</string>
     <string name="checkin_set_reminder">"Rappel de check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Arrêter"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Veuillez vous authentifier pour accéder au journal"</string>
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 3fda32aec..1db1217cc 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -1432,7 +1432,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_set_reminder">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Isključeno"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index c31223e43..b28692262 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -1468,7 +1468,7 @@ Chiama il seguente numero:"</string>
     <string name="checkin_set_reminder">"Promemoria check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Disattiva"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Autenticati per accedere al diario"</string>
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index 80ef32410..f1132129b 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -1435,7 +1435,7 @@ Ligue para:"</string>
     <string name="checkin_set_reminder">"Lembrete de checkout"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Desligado"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Autentique-se para ter acesso ao diário"</string>
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 56c10eda6..2400b7e9d 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -1435,7 +1435,7 @@ Atëherë na telefononi këtu:"</string>
     <string name="checkin_set_reminder">"Kujtesa e Check-out"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Fikur"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Autentifikohuni për aksesin në ditar"</string>
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index 3f34b1491..76921071d 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -1432,7 +1432,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_set_reminder">"Podsećanje na prijavu"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Isključeno"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index 5995220f6..f9dc0e63e 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -1418,7 +1418,7 @@ O halde şu numarayı arayın:"</string>
     <string name="checkin_set_reminder">"Check-out hatırlatması"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Kapalı"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"Günlüğe erişim için kendinizi yetkilendirin"</string>

From 036d1951e195722d57098ed2a635557e1c463c2a Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 19:45:30 +0200
Subject: [PATCH 138/207] Remove subtitle from generated QR-Code List

---
 .../checkin/generateqrcode/QrCodeAdapter.kt   |  1 -
 app/src/main/res/layout/item_qr_code.xml      | 25 +++++--------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index 4d63c35d9..a05bfa4b7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -61,7 +61,6 @@ class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView
 			item as EventItem
 			binding.apply {
 				qrCodeName.text = item.venueInfo.title
-				qrCodeLocation.setText(item.venueInfo.getSubtitle())
 				root.setOnClickListener { onClickListener.onQrCodeClicked(item.venueInfo) }
 				qrCodeDelete.setOnClickListener { onClickListener.onDeleteQrCodeClicked(item.venueInfo) }
 			}
diff --git a/app/src/main/res/layout/item_qr_code.xml b/app/src/main/res/layout/item_qr_code.xml
index 235a74c92..8d933421f 100644
--- a/app/src/main/res/layout/item_qr_code.xml
+++ b/app/src/main/res/layout/item_qr_code.xml
@@ -11,6 +11,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="@dimen/spacing_large"
+		android:gravity="center_vertical"
 		android:orientation="horizontal">
 
 		<ImageView
@@ -19,29 +20,15 @@
 			android:layout_marginVertical="@dimen/spacing_large"
 			android:src="@drawable/ic_qr_code" />
 
-		<LinearLayout
+		<TextView
+			android:id="@+id/qr_code_name"
+			style="@style/NextStep.Text.Title"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="@dimen/spacing_medium_large"
 			android:layout_marginVertical="@dimen/spacing_large"
 			android:layout_weight="1"
-			android:orientation="vertical"
-			android:paddingHorizontal="@dimen/spacing_medium_large">
-
-			<TextView
-				android:id="@+id/qr_code_name"
-				style="@style/NextStep.Text.Title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				tools:text="UB E21.7" />
-
-			<TextView
-				android:id="@+id/qr_code_location"
-				style="@style/NextStep.Text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				tools:text="Sitzungsraum" />
-
-		</LinearLayout>
+			tools:text="UB E21.7" />
 
 		<ImageView
 			android:id="@+id/qr_code_delete"

From d43c6b82f0f82558de47f73cb43a08f8cd6d3ca3 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 1 Jun 2021 19:57:44 +0200
Subject: [PATCH 139/207] Add Signature Check to Checkin Trace Keys Repository

---
 .../bag/dp3t/checkin/networking/TraceKeysRepository.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
index 61aaad22f..a66829f52 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/TraceKeysRepository.java
@@ -3,13 +3,16 @@
 import android.content.Context;
 
 import java.io.IOException;
+import java.security.PublicKey;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.crowdnotifier.android.sdk.model.DayDate;
 import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
 import org.dpppt.android.sdk.DP3T;
+import org.dpppt.android.sdk.backend.SignatureVerificationInterceptor;
 import org.dpppt.android.sdk.backend.UserAgentInterceptor;
+import org.dpppt.android.sdk.util.SignatureUtil;
 import org.jetbrains.annotations.NotNull;
 
 import ch.admin.bag.dp3t.BuildConfig;
@@ -37,6 +40,10 @@ public TraceKeysRepository(Context context) {
 		OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder();
 		okHttpBuilder.networkInterceptors().add(new UserAgentInterceptor(DP3T.getUserAgent()));
 
+		PublicKey signaturePublicKey = SignatureUtil.getPublicKeyFromBase64OrThrow(BuildConfig.BUCKET_PUBLIC_KEY);
+		okHttpBuilder.addInterceptor(new SignatureVerificationInterceptor(signaturePublicKey));
+
+
 		Retrofit bucketRetrofit = new Retrofit.Builder()
 				.baseUrl(baseUrl)
 				.client(okHttpBuilder.build())

From 7da169a6480ff66d69b0c6263bd385e4cfb1603a Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 1 Jun 2021 22:00:07 +0200
Subject: [PATCH 140/207] Implemented Error Popup when entering Covidcode while
 checked in (info tab)

---
 .../admin/bag/dp3t/infotab/InfoTabFragment.kt | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
index fa9ff0cee..a2b01e5a6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
@@ -6,17 +6,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.databinding.FragmentInfoTabBinding
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.inform.InformActivity
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.travel.TravelFragment
 import ch.admin.bag.dp3t.travel.TravelUtils
 import ch.admin.bag.dp3t.util.UrlUtil
-import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 import ch.admin.bag.dp3t.whattodo.WtdInfolineAccessabilityDialogFragment
 import ch.admin.bag.dp3t.whattodo.WtdPositiveTestFragment
@@ -24,7 +27,6 @@ import ch.admin.bag.dp3t.whattodo.WtdSymptomsFragment
 
 class InfoTabFragment : Fragment() {
 
-
 	companion object {
 		@JvmStatic
 		fun newInstance() = InfoTabFragment()
@@ -33,6 +35,7 @@ class InfoTabFragment : Fragment() {
 	private lateinit var binding: FragmentInfoTabBinding
 	private val secureStorage by lazy { SecureStorage.getInstance(requireContext()) }
 	private val tracingViewModel: TracingViewModel by activityViewModels()
+	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentInfoTabBinding.inflate(inflater).apply {
@@ -54,11 +57,32 @@ class InfoTabFragment : Fragment() {
 				showFragment(WtdPositiveTestFragment.newInstance())
 			}
 			wtdInformButton.setOnClickListener {
-				startActivity(Intent(activity, InformActivity::class.java))
+				if (crowdNotifierViewModel.isCheckedIn.value == true) {
+					showCannotEnterCovidcodeWhileCheckedInDialog()
+				} else {
+					startActivity(Intent(activity, InformActivity::class.java))
+				}
 			}
 		}
 	}
 
+	private fun showCannotEnterCovidcodeWhileCheckedInDialog() {
+		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.error_cannot_enter_covidcode_while_checked_in)
+			.setPositiveButton(R.string.checkout_button_title) { dialog, id -> showCheckOutFragment() }
+			.setNegativeButton(R.string.cancel) { dialog, id -> dialog.dismiss() }
+			.create()
+			.show()
+	}
+
+	private fun showCheckOutFragment() {
+		requireActivity().supportFragmentManager.beginTransaction()
+			.setCustomAnimations(R.anim.modal_slide_enter, R.anim.modal_slide_exit, R.anim.modal_pop_enter, R.anim.modal_pop_exit)
+			.replace(R.id.main_fragment_container, CheckOutFragment.newInstance())
+			.addToBackStack(CheckOutFragment::class.java.canonicalName)
+			.commit()
+	}
+
 	private fun fillContentFromConfigServer() {
 		val textModel = secureStorage.getWhatToDoPositiveTestTexts(getString(R.string.language_key)) ?: return
 		binding.frameCardTest.apply {

From 7c4c3d94e98e9b49cf1510cc72630b924a88aae0 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 2 Jun 2021 12:15:38 +0200
Subject: [PATCH 141/207] Set SwissCovidLocationData version to 4

---
 .../ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 8e350d905..c4ede0a6d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -30,7 +30,7 @@ private const val ONE_MINUTE_IN_MILLIS = 60 * 1000L
 private const val ONE_HOUR_IN_MILLIS = 60 * ONE_MINUTE_IN_MILLIS
 private const val AUTOMATIC_CHECKOUT_DELAY_MS = 12 * ONE_HOUR_IN_MILLIS
 private const val CHECKOUT_WARNING_DELAY_MS = 8 * ONE_HOUR_IN_MILLIS
-private const val SWISSCOVID_LOCATION_DATA_VERSION = 1
+private const val SWISSCOVID_LOCATION_DATA_VERSION = 4
 private const val QR_CODE_VALIDITY_DURATION_MS = 100000 * 24 * ONE_HOUR_IN_MILLIS // 100'000 days
 private val REMINDER_DELAY_OPTIONS_MS =
 	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120, 240).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, 120 and 240 minutes

From c77e218465aa860a28648fee36a3b900a2a81968 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 2 Jun 2021 14:53:39 +0200
Subject: [PATCH 142/207] Fix Onboarding Don't keep activities issue

---
 .../java/ch/admin/bag/dp3t/MainActivity.kt    | 15 ++--
 .../OnboardingActivityResultContract.kt       | 32 +++++++++
 .../bag/dp3t/util/BetterActivityResult.kt     | 71 -------------------
 3 files changed, 38 insertions(+), 80 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index 0e924ca5e..5dc568a5b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -30,13 +30,13 @@ import ch.admin.bag.dp3t.checkin.utils.ErrorDialog
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
 import ch.admin.bag.dp3t.inform.InformActivity
 import ch.admin.bag.dp3t.networking.ConfigWorker.Companion.scheduleConfigWorkerIfOutdated
-import ch.admin.bag.dp3t.onboarding.OnboardingActivity
+import ch.admin.bag.dp3t.onboarding.OnboardingActivityArgs
+import ch.admin.bag.dp3t.onboarding.OnboardingActivityResultContract
 import ch.admin.bag.dp3t.onboarding.OnboardingSlidePageAdapter.Companion.UPDATE_BOARDING_VERSION
 import ch.admin.bag.dp3t.onboarding.OnboardingType
 import ch.admin.bag.dp3t.reports.ReportsFragment
 import ch.admin.bag.dp3t.reports.ReportsOverviewFragment
 import ch.admin.bag.dp3t.storage.SecureStorage
-import ch.admin.bag.dp3t.util.BetterActivityResult
 import ch.admin.bag.dp3t.util.NotificationUtil
 import ch.admin.bag.dp3t.util.UrlUtil
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
@@ -62,7 +62,9 @@ class MainActivity : FragmentActivity() {
 	private val tracingViewModel: TracingViewModel by viewModels()
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by viewModels()
 
-	private val activityLauncher = BetterActivityResult.registerActivityForResult(this)
+	private val onboardingLauncher = registerForActivityResult(OnboardingActivityResultContract()) {
+		onOnboardingFinished(it.onboardingType, it.activityResult, it.instantAppUrl)
+	}
 
 	private val autoCheckoutBroadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
 		override fun onReceive(context: Context, intent: Intent) {
@@ -119,12 +121,7 @@ class MainActivity : FragmentActivity() {
 	}
 
 	fun launchOnboarding(onboardingType: OnboardingType, instantAppQrCodeUrl: String? = null) {
-		val intent = Intent(this, OnboardingActivity::class.java).apply {
-			putExtra(OnboardingActivity.ARG_ONBOARDING_TYPE, onboardingType)
-		}
-		activityLauncher.launch(intent) { activityResult ->
-			onOnboardingFinished(onboardingType, activityResult, instantAppQrCodeUrl)
-		}
+		onboardingLauncher.launch(OnboardingActivityArgs(onboardingType, instantAppQrCodeUrl))
 	}
 
 	private fun onOnboardingFinished(onboardingType: OnboardingType, activityResult: ActivityResult, qrCodeUrl: String? = null) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
new file mode 100644
index 000000000..05e560587
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
@@ -0,0 +1,32 @@
+package ch.admin.bag.dp3t.onboarding
+
+import android.content.Context
+import android.content.Intent
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContract
+
+private const val ARG_INSTANT_APP_URL = "ARG_INSTANT_APP_URL"
+
+class OnboardingActivityResultContract : ActivityResultContract<OnboardingActivityArgs, OnboardingActivityResult>() {
+
+	override fun createIntent(context: Context, input: OnboardingActivityArgs): Intent {
+		return Intent(context, OnboardingActivity::class.java).apply {
+			putExtra(OnboardingActivity.ARG_ONBOARDING_TYPE, input.onboardingType)
+			putExtra(ARG_INSTANT_APP_URL, input.instantAppUrl)
+		}
+	}
+
+	override fun parseResult(resultCode: Int, intent: Intent?): OnboardingActivityResult {
+		val onboardingType = intent?.getSerializableExtra(OnboardingActivity.ARG_ONBOARDING_TYPE) as OnboardingType
+		val instantAppUrl = intent.getStringExtra(ARG_INSTANT_APP_URL)
+		return OnboardingActivityResult(ActivityResult(resultCode, intent), onboardingType, instantAppUrl)
+	}
+}
+
+data class OnboardingActivityArgs(val onboardingType: OnboardingType, val instantAppUrl: String? = null)
+
+data class OnboardingActivityResult(
+	val activityResult: ActivityResult,
+	val onboardingType: OnboardingType,
+	val instantAppUrl: String? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt b/app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt
deleted file mode 100644
index 03b16b1bc..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/util/BetterActivityResult.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package ch.admin.bag.dp3t.util
-
-import android.content.Intent
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultCaller
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-
-
-class BetterActivityResult<Input, Result> private constructor(
-	caller : ActivityResultCaller,
-	contract : ActivityResultContract<Input, Result>,
-	var onActivityResult : ((Result) -> Unit)?,
-) {
-
-	private val launcher : ActivityResultLauncher<Input> =
-		caller.registerForActivityResult(contract) { onActivityResult?.invoke(it) }
-
-	/**
-	 * Launch activity, same as [ActivityResultLauncher.launch] except that it
-	 * allows a callback
-	 * executed after receiving a result from the target activity.
-	 */
-	/**
-	 * Same as [.launch] with last parameter set to `null`.
-	 */
-	@JvmOverloads
-	fun launch(
-		input : Input,
-		onActivityResult : ((Result) -> Unit)? = this.onActivityResult,
-	) {
-		this.onActivityResult = onActivityResult
-		launcher.launch(input)
-	}
-
-	companion object {
-		/**
-		 * Register activity result using a [ActivityResultContract] and an in-place
-		 * activity result callback like
-		 * the default approach. You can still customise callback using [.launch].
-		 */
-		fun <Input, Result> registerForActivityResult(
-			caller : ActivityResultCaller,
-			contract : ActivityResultContract<Input, Result>,
-			onActivityResult : ((Result) -> Unit)?,
-		) : BetterActivityResult<Input, Result> {
-			return BetterActivityResult(caller, contract, onActivityResult)
-		}
-
-		/**
-		 * Same as [.registerForActivityResult] except
-		 * the last argument is set to `null`.
-		 */
-		fun <Input, Result> registerForActivityResult(
-			caller : ActivityResultCaller,
-			contract : ActivityResultContract<Input, Result>,
-		) : BetterActivityResult<Input, Result> {
-			return registerForActivityResult(caller, contract, null)
-		}
-
-		/**
-		 * Specialised method for launching new activities.
-		 */
-		fun registerActivityForResult(
-			caller : ActivityResultCaller,
-		) : BetterActivityResult<Intent, ActivityResult> {
-			return registerForActivityResult(caller, StartActivityForResult())
-		}
-	}
-}
\ No newline at end of file

From 598b6775a7dfebf7cc930e3eca87bcda43cdd00e Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Wed, 2 Jun 2021 18:02:37 +0200
Subject: [PATCH 143/207] Don't sync Checkin Trace Keys during Isolation

---
 .../checkin/networking/CrowdNotifierKeyLoadWorker.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
index 34767bfc1..d48d79e16 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
@@ -13,6 +13,7 @@
 import org.crowdnotifier.android.sdk.CrowdNotifier;
 import org.crowdnotifier.android.sdk.model.ExposureEvent;
 import org.crowdnotifier.android.sdk.model.ProblematicEventInfo;
+import org.dpppt.android.sdk.DP3T;
 
 import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
@@ -20,6 +21,7 @@
 import ch.admin.bag.dp3t.util.NotificationUtil;
 
 import static ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper.autoCheckoutIfNecessary;
+import static org.dpppt.android.sdk.InfectionStatus.INFECTED;
 
 
 public class CrowdNotifierKeyLoadWorker extends Worker {
@@ -54,6 +56,11 @@ public CrowdNotifierKeyLoadWorker(@NonNull Context context, @NonNull WorkerParam
 	@Override
 	public Result doWork() {
 		Log.d(LOG_TAG, "Started KeyLoadWorker");
+		if (DP3T.getStatus(getApplicationContext()).getInfectionStatus() == INFECTED) {
+			Log.d(LOG_TAG, "KeyLoadWorker: Network Request not executed");
+			return Result.success();
+		}
+
 		List<ProblematicEventInfo> problematicEventInfos = new TraceKeysRepository(getApplicationContext()).loadTraceKeys();
 		if (problematicEventInfos == null) {
 			Log.d(LOG_TAG, "KeyLoadWorker failure");

From 95d3dcfd3a88e735f5fbd817b3d9ab0bd1337639 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 3 Jun 2021 11:18:03 +0200
Subject: [PATCH 144/207] Update Prod Master Public Key

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e002c9cab..3fe2ea086 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -101,7 +101,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
-			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"mAofNDGOKcmVJt4fo7kWruvFRee2g0irAfIdjH6EFyd6vHY_uTb6ZXOf9eFVzTUEiZLDLL-Q2w8kZkPscWyXi3X59zuqeI25qloOF-sowHo1_-HiH7Z_4COOA030mm8J"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
@@ -115,7 +115,7 @@ android {
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
-			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
+			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"mAofNDGOKcmVJt4fo7kWruvFRee2g0irAfIdjH6EFyd6vHY_uTb6ZXOf9eFVzTUEiZLDLL-Q2w8kZkPscWyXi3X59zuqeI25qloOF-sowHo1_-HiH7Z_4COOA030mm8J"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]

From f8ff1920901f6506c2af92c0dfc868ef6a24e32a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 3 Jun 2021 13:35:46 +0200
Subject: [PATCH 145/207] add build script to build app and compare with
 another apk, including also a verison to build the instant app bundle

---
 app/build.gradle           |  19 +---------------
 build.gradle               |  17 ++++++++++++++
 buildAndCompare.sh         |  44 +++++++++++++++++++++++++++++++++++++
 instant/build.gradle       |  18 +++++++++++++++
 instant/proguard-rules.pro |   6 ++++-
 instant/testKeystore       | Bin 0 -> 2226 bytes
 6 files changed, 85 insertions(+), 19 deletions(-)
 create mode 100755 buildAndCompare.sh
 create mode 100644 instant/testKeystore

diff --git a/app/build.gradle b/app/build.gradle
index 3fe2ea086..25ae7a27f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,23 +17,6 @@ plugins {
 
 apply from: 'backend_certs.gradle'
 
-ext.readProperty = { paramName -> readPropertyWithDefault(paramName, null) }
-ext.readPropertyWithDefault = { paramName, defaultValue ->
-	if (project.hasProperty(paramName)) {
-		return project.getProperties().get(paramName)
-	} else {
-		Properties properties = new Properties()
-		if (project.rootProject.file('local.properties').exists()) {
-			properties.load(project.rootProject.file('local.properties').newDataInputStream())
-		}
-		if (properties.getProperty(paramName) != null) {
-			return properties.getProperty(paramName)
-		} else {
-			return defaultValue
-		}
-	}
-}
-
 android {
 	compileSdkVersion 30
 	buildToolsVersion "29.0.3"
@@ -126,7 +109,7 @@ android {
 		release {
 			storeFile file(readPropertyWithDefault('keystoreFile', 'testKeystore'))
 			storePassword readProperty('keystorePassword')
-			keyAlias 'keyAlias'
+			keyAlias readPropertyWithDefault('keyAlias', 'keyAlias')
 			keyPassword readProperty('keyAliasPassword')
 		}
 	}
diff --git a/build.gradle b/build.gradle
index 29b62a76a..27a9521ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,23 @@
 buildscript {
 	ext {
 		kotlinVersion = '1.4.31'
+		
+		readProperty = { paramName -> readPropertyWithDefault(paramName, null) }
+		readPropertyWithDefault = { paramName, defaultValue ->
+			if (project.hasProperty(paramName)) {
+				return project.getProperties().get(paramName)
+			} else {
+				Properties properties = new Properties()
+				if (project.rootProject.file('local.properties').exists()) {
+					properties.load(project.rootProject.file('local.properties').newDataInputStream())
+				}
+				if (properties.getProperty(paramName) != null) {
+					return properties.getProperty(paramName)
+				} else {
+					return defaultValue
+				}
+			}
+		}
 	}
 	repositories {
 		google()
diff --git a/buildAndCompare.sh b/buildAndCompare.sh
new file mode 100755
index 000000000..f4baf2104
--- /dev/null
+++ b/buildAndCompare.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+echo "Which app would you like to build (type 'app' or 'instant')?"
+read appName
+
+echo Please enter KeystoreFile name:
+read keystoreFile
+
+echo Please enter Keystore Password:
+read -s keystorePassword
+
+echo Please enter KeyAlias:
+read keyAlias
+
+echo Please enter KeyAlias Password:
+read -s keyAliasPassword
+
+echo Please enter Build Timestamp:
+read buildTimestamp
+
+#make sure we have a full clean build
+rm -rf $appName/build
+rm -rf .gradle
+
+docker build -t swisscovid-builder .
+currentPath=`pwd`
+
+if [[ $appName -eq 'app' ]] ; then
+  command='assembleProdRelease'
+else
+  command='bundleProdRelease'
+fi
+docker run --rm -v $currentPath:/home/swisscovid -w /home/swisscovid swisscovid-builder gradle $appName:assembleProdRelease -PkeystorePassword=$keystorePassword -PkeyAlias=$keyAlias -PkeyAliasPassword=$keyAliasPassword -PkeystoreFile=$keystoreFile -PbuildTimestamp=$buildTimestamp
+
+
+if [[ $appName -eq 'app' ]] ; then
+  cp $appName/build/outputs/apk/prod/release/$appName-prod-release.apk $appName-built.apk
+
+  if [[ $# -eq 1 ]] ; then
+    echo Comparing the built APK with the reference:
+    python apkdiff.py $appName-built.apk $1
+  fi
+fi
\ No newline at end of file
diff --git a/instant/build.gradle b/instant/build.gradle
index b7abc581d..def7bd2b8 100644
--- a/instant/build.gradle
+++ b/instant/build.gradle
@@ -54,6 +54,24 @@ android {
 		viewBinding true
 	}
 
+	signingConfigs {
+		release {
+			storeFile file(readPropertyWithDefault('keystoreFile', 'testKeystore'))
+			storePassword readProperty('keystorePassword')
+			keyAlias readPropertyWithDefault('keyAlias', 'keyAlias')
+			keyPassword readProperty('keyAliasPassword')
+		}
+	}
+
+	buildTypes {
+		release {
+			shrinkResources false
+			setMinifyEnabled true
+			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+			signingConfig signingConfigs.release
+		}
+	}
+
 }
 
 dependencies {
diff --git a/instant/proguard-rules.pro b/instant/proguard-rules.pro
index 481bb4348..0c4a60b13 100644
--- a/instant/proguard-rules.pro
+++ b/instant/proguard-rules.pro
@@ -18,4 +18,8 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+-dontobfuscate
+
+-keep class com.sun.jna.** { *; }
\ No newline at end of file
diff --git a/instant/testKeystore b/instant/testKeystore
new file mode 100644
index 0000000000000000000000000000000000000000..d11949b7a8789b8dc792e736711b48b378ebba29
GIT binary patch
literal 2226
zcmcgt`8N~{7oNq;Fk>4dV+mt;Wp6AaYY15e<CTyl#y*y@We9KC^~ri-Y{{A}O9&NF
z%2*0XcqJoCNcLSceZKd6@A=-p;QQhJ@I2?<bMAfaJ<nyXG1mY90O&M;e+8?r$4!zS
znG|wL1no4N3IPBR5H6O5iQ|OAWuZV8pbQ8J1VR8Tu`DZ(dXhcs@J_lECo5fh`ckdG
zPY>{qQiXv^-U{f^%;>$^x%d*qk@hO@8Kyy9@8c2vFLy4vkn$Gd3&J~xx43OEavSO6
zsqiqH&ptXBYdu+pQURl)4l>E`^6!)W^i_V_pScJi^BAH3Fe;H9&w__MNqNn;SkvkA
zx~K5=u+wyBTASR9)a46KSPQlM_Q$~k3w{&RiZYq~A3PsKh%0>N61nqIxtlmDLYP~i
ztW2G6=8D17K9ePtnyTN0&dVB%bW2w$+#lWOd^->-FHrnmdacG}a`1ff@galB{-s3l
z2j*6TR*P3+_=+v%BupK!!F9<AV|dW<l@#P~fE8#l8-5)~F2So(ChVgw-p*@Ha=852
zy6bi6$0S${3|@n?Ee9ZThWk8&wXW117+MXf-s6dB=$g29_*;|+-13dF{?fy*^o!{Z
zP+EsqK&`5HMu$(Y=|eRhsLXy+ZAC6KXT07joOD+pu;of;bdmYy2A+xFarTNCE8@Rc
z3%D>(tJ_KL%g!NrKf>p-cQN@S5skzzlgb*;R1YNktM^2afrWH+?f6vL3)Q>7^sUmU
zyid3|r_vE7ZX7J`<Ldx8jz^`~JVfU$I4>Jj`ZWK>VmMDX^QD*4T;mQ4H}YJu*Ot@H
zah#bUrE)h$5b{c(z5)2eCUK+{4nJe+b^ezp!n8b@a6C<{Pip5kt$lW6tDT=XOQ|l}
zcd8Sd(u`bOp<3PzOCv0SbHL3Ll?Ou|^5f@c&pK4S+7|1b+UTNMeV_H}Hu4KpzVVR|
z{8U*xMdTR7uP_iA_2iLtGwnkAzB$jFZ4A*jT2%ZUuawKQSO#PL=$BSoY1_ac#8pR^
zZEmeYiEH^05p~Y2XNPME+W%G~=rU`06A4!e-m4z$zy7?wLZ;o&GHB`ufYWXdoUA?D
zc!nEOS!nXfQXyPLYbSWj(oXGpad+7oO=9<=aY>W($NYo!;%_RcRKiANQ}nI&8ra4p
zRpCQO$8Pr}(a$xxFydXBUEqS0!Cbh5*<&UnD?XK)MJ=A`&yGlOukFj!D~XUz6Hm>)
zcD7r3aWeMf{HEFc$uN+2oPd{OMFP4#k@JxwC)%q}MzA2LaMqWk82$p7B6OXRKZi}I
zKc}OUSkN%4f5=k>SfTPkXnFCm%_s?4+n}l@?NUq5Q|<GzKmI)S*S+oygh90y#sl@u
zZ&q|h$rwbNx@-E+z`7&SM_091GX}x_U+Sn;vJOc=+JyGQ_tAI`i}IN4(FV3pnSsJ|
z?-asCi|s2B2|p{F8w~uyS+_9q$Jq<3YVkL%*5IZuhurUORpq$t>f5UzBrcex0>qTo
z`K`WNggj>vwBYC+vz}3i>GI92MhP^cnbOl`Y#x@9bt6&mILI=3)@k_7QTDD@OSRiP
zn=3X?b%&BLm2OVg?Kt7vWbq_-F)mGhD1z854`+r#e&*cKTHd&}*Z*9=1Kxpj?D1BC
zXuDxK1}BnUV3C@8noZvrEl8=nTkNQKnBS-&bcGc138_crGlprK7nH6Z!c{P9FPcny
zpSEj?pZ%VP7=fUS*kMV?_(OG7xsV%+N>dDZv}h*qcU!e2E%n1>lf6}%ehP*u0&0Al
zM-32pWjHWri&-q&U&dA@>~m^3aBG&M@=$Yyw@--Qgg9XRP;T2m@4vheVyA$|sRICD
zFI+6x4HpX{6oWxP5QxQzWHgE6fU?OX8Ydob0D%Yy0OzWRz_CHWS6QGakiM}Z_o;uL
z0#<gI{p*fkvYYqc4D5f5Fiz+{IdBy3RabIQs0YS`LJ6RfZjb{g7(JuE3lJ!n9>qO4
zfb5PFL31eKaCn>=P93kLgttd?sNheb(tqLqrH5D`_MfAleg<$XkPCo|1;RnGKp>#K
z=6OsF(dU337G@FxMiYhizFpZE({aZ3&RhJ8uqCL`xLN)q3?Y|VqO}OQyf-@P;(UC6
zdq6(YK~7q%X|X(=w)D0%O~<!Y*{6|Jj)vUqlakzyld`r2B`wvR>wvJI1Z<3f#_eg*
z&K@>8VVcU@q6MwLe?PRQ%_PWhS06`4t|YJj+}xJV4s3CGIiCh7mj9Hdf!z|jlO@e&
zxhMhJF{jtqdLW{We*$tnHPU>Fu9l0uqnBJ(l?>(M6`^a|$?Uu@8X}#^{Z`e8U(|Ym
z<}cVEp&#m*x}@Klw(EKjPsR}XKl-f`uru<6XDLG94N)<%oeZjwLn@G-ItBs*0l+db
zoG4ECbh*NuEPO1yoVcH@d3l+%i)d6e?L$W9!`)Yg{}l1`eojRM0z~NjvR3G?V=MO9
z-|oVs%^&FYEz2LvS5f%%+lJ-fJ!QA15vuha+LEo@KRz(_3enM{#U~y+xw3);j)-;-
zXK_JcS3-V&wIkJM!~q|NJkUrY&U-3>;=1m{Uv25Z{W8qu#yrz8byMC=j{0*8UTa~J
zfh2lfVaxhOHn=e~1R}fAa@C7uGtnB3S=TfL%K}&<{1|-KJabnm4;4kG-$~e35o4G(
z!};RdMJ)?1;yIjV6$f9+Pu`!y%0E5(MDIvCj5BO9QW5h^A%ShLpR>OQ?bxa53>`i}
zHK*UV&{`Eo_1J|X*tQNORiwlV-@GxFroJkX*h!dWym9o3Xz?jp_T87uFah_@2ZywU
JG#dpO{2RIr&({C|

literal 0
HcmV?d00001


From 2832916fd1e06980673f34e9477d9a5c9612b8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 3 Jun 2021 13:52:02 +0200
Subject: [PATCH 146/207] update build tools version in Dockerfile and optimize
 build script

---
 Dockerfile         | 4 ++--
 app/build.gradle   | 1 -
 buildAndCompare.sh | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 777679f88..803636bd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 FROM gradle:6.6.1-jdk8
 
 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
-ENV ANDROID_BUILD_TOOLS_VERSION 29.0.3
+ENV ANDROID_BUILD_TOOLS_VERSION 30.0.1
 ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV ANDROID_VERSION 29
+ENV ANDROID_VERSION 30
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
 RUN mkdir "$ANDROID_HOME" .android && \
diff --git a/app/build.gradle b/app/build.gradle
index 25ae7a27f..51f29e688 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,6 @@ apply from: 'backend_certs.gradle'
 
 android {
 	compileSdkVersion 30
-	buildToolsVersion "29.0.3"
 
 	defaultConfig {
 		applicationId "ch.admin.bag.dp3t"
diff --git a/buildAndCompare.sh b/buildAndCompare.sh
index f4baf2104..0d67ea335 100755
--- a/buildAndCompare.sh
+++ b/buildAndCompare.sh
@@ -16,8 +16,10 @@ read keyAlias
 echo Please enter KeyAlias Password:
 read -s keyAliasPassword
 
-echo Please enter Build Timestamp:
-read buildTimestamp
+if [[ $appName -eq 'app' ]] ; then
+  echo Please enter Build Timestamp:
+  read buildTimestamp
+fi
 
 #make sure we have a full clean build
 rm -rf $appName/build

From 96baa7b46fe53fd7b55656a35e84c22953badaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 3 Jun 2021 13:58:57 +0200
Subject: [PATCH 147/207] fix build script

---
 buildAndCompare.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/buildAndCompare.sh b/buildAndCompare.sh
index 0d67ea335..27be1ed96 100755
--- a/buildAndCompare.sh
+++ b/buildAndCompare.sh
@@ -16,7 +16,7 @@ read keyAlias
 echo Please enter KeyAlias Password:
 read -s keyAliasPassword
 
-if [[ $appName -eq 'app' ]] ; then
+if [ "$appName" = "app" ] ; then
   echo Please enter Build Timestamp:
   read buildTimestamp
 fi
@@ -28,15 +28,17 @@ rm -rf .gradle
 docker build -t swisscovid-builder .
 currentPath=`pwd`
 
-if [[ $appName -eq 'app' ]] ; then
+if [ "$appName" = "app" ] ; then
   command='assembleProdRelease'
+  echo building an apk
 else
   command='bundleProdRelease'
+  echo building an app bundle
 fi
 docker run --rm -v $currentPath:/home/swisscovid -w /home/swisscovid swisscovid-builder gradle $appName:assembleProdRelease -PkeystorePassword=$keystorePassword -PkeyAlias=$keyAlias -PkeyAliasPassword=$keyAliasPassword -PkeystoreFile=$keystoreFile -PbuildTimestamp=$buildTimestamp
 
 
-if [[ $appName -eq 'app' ]] ; then
+if [ "$appName" = "app" ] ; then
   cp $appName/build/outputs/apk/prod/release/$appName-prod-release.apk $appName-built.apk
 
   if [[ $# -eq 1 ]] ; then

From 0bf26c328d201260304b722f62e3aed648f9e5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 3 Jun 2021 14:10:19 +0200
Subject: [PATCH 148/207] fix build script

---
 buildAndCompare.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/buildAndCompare.sh b/buildAndCompare.sh
index 27be1ed96..1a24b9020 100755
--- a/buildAndCompare.sh
+++ b/buildAndCompare.sh
@@ -30,12 +30,10 @@ currentPath=`pwd`
 
 if [ "$appName" = "app" ] ; then
   command='assembleProdRelease'
-  echo building an apk
 else
   command='bundleProdRelease'
-  echo building an app bundle
 fi
-docker run --rm -v $currentPath:/home/swisscovid -w /home/swisscovid swisscovid-builder gradle $appName:assembleProdRelease -PkeystorePassword=$keystorePassword -PkeyAlias=$keyAlias -PkeyAliasPassword=$keyAliasPassword -PkeystoreFile=$keystoreFile -PbuildTimestamp=$buildTimestamp
+docker run --rm -v $currentPath:/home/swisscovid -w /home/swisscovid swisscovid-builder gradle $appName:$command -PkeystorePassword=$keystorePassword -PkeyAlias=$keyAlias -PkeyAliasPassword=$keyAliasPassword -PkeystoreFile=$keystoreFile -PbuildTimestamp=$buildTimestamp
 
 
 if [ "$appName" = "app" ] ; then

From afd5cd0cd8b38f6de1a006087cbbd876c0d563db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?=
 <30999902+simonroesch@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:11:08 +0200
Subject: [PATCH 149/207] Update README.md

---
 README.md | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 3b6ddec41..44e15bf86 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,15 @@
-# SwissCovid: DP3T Android App for Switzerland
+# SwissCovid Android App
 
 [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://github.com/DP-3T/dp3t-app-android-ch/blob/master/LICENSE)
 ![Android Build](https://github.com/DP-3T/dp3t-app-android-ch/workflows/Android%20Build/badge.svg)
 
+SwissCovid is the official contact tracing app of Switzerland. The SwissCovid 2.0 app uses two types of contact tracing to prevent the spread of COVID-19. The app can be installed from the [Google Play Store](https://play.google.com/store/apps/details?id=ch.admin.bag.dp3t).
 
-## DP3T
-The Decentralised Privacy-Preserving Proximity Tracing (DP-3T) project is an open protocol for COVID-19 proximity tracing using Bluetooth Low Energy functionality on mobile devices that ensures personal data and computation stays entirely on an individual's phone. It was produced by a core team of over 25 scientists and academic researchers from across Europe. It has also been scrutinized and improved by the wider community.
+With proximity tracing close contacts are detected using the bluetooth technology. For this the [DP3T Android SDK](https://github.com/DP-3T/dp3t-sdk-android) is used that builds on top of the Google & Apple Exposure Notifications. This feature is called SwissCovid encounters.
 
-DP-3T is a free-standing effort started at EPFL and ETHZ that produced this protocol and that is implementing it in an open-sourced app and server.
+With presence tracing people that are at the same venue at the same time are detected. For this the [CrowdNotifier Android SDK](https://github.com/CrowdNotifier/crowdnotifier-sdk-android) is used that provides a secure, decentralized, privacy-preserving presence tracing system. This feature is called SwissCovid Check-in.
 
-
-## Introduction
-This is a COVID-19 tracing client using the [DP3T Android SDK](https://github.com/DP-3T/dp3t-sdk-android). It is based on the previously released demo app, but uses the newest version of the SDK. This project will be released as the official COVID-19 tracing solution for Switzerland, therefore UX, messages and flows are optimized for this specific case. Nevertheless, the source code should be a solid foundation to build a similar app for other countries and demostrate how the SDK can be used in a real app.
-The app design, UX and implementation was done by [Ubique](https://www.ubique.ch?app=github).
-<p align="center">
-<img src="documentation/screenshots/en/screenshot1.png" width="20%">
-<img src="documentation/screenshots/en/screenshot2.png" width="20%">
-<img src="documentation/screenshots/en/screenshot3.png" width="20%">
-<img src="documentation/screenshots/en/screenshot4.png" width="20%">
-</p>
+Please see the [SwissCovid documentation repository](https://github.com/SwissCovid/swisscovid-doc) for more details.
 
 ## Contribution Guide
 
@@ -29,18 +20,19 @@ Bugs or potential problems should be reported using Github issues. We welcome al
 Platform independent UX and design discussions should be reported in [dp3t-ux-screenflows-ch](https://github.com/DP-3T/dp3t-ux-screenflows-ch)
 
 ## Repositories
-* Android SDK & Calibration app: [dp3t-sdk-android](https://github.com/DP-3T/dp3t-sdk-android)
-* iOS SDK & Calibration app: [dp3t-sdk-ios](https://github.com/DP-3T/dp3t-sdk-ios)
-* Android App: [dp3t-app-android](https://github.com/DP-3T/dp3t-app-android-ch)
-* iOS App: [dp3t-app-ios](https://github.com/DP-3T/dp3t-app-ios-ch)
-* Backend SDK: [dp3t-sdk-backend](https://github.com/DP-3T/dp3t-sdk-backend)
-* UX & Screenflows [dp3t-ux-screenflows-ch](https://github.com/DP-3T/dp3t-ux-screenflows-ch)
-
-
-## Further Documentation
-The full set of documents for DP3T is at https://github.com/DP-3T/documents. Please refer to the technical documents and whitepapers for a description of the implementation.
-
-A description of the usage of the Google Exposure Notifcation API can be found [here](https://github.com/DP-3T/dp3t-sdk-android/blob/master/EXPOSURE_NOTIFICATION_API_USAGE.md).
+* Android App: [swisscovid-app-android](https://github.com/SwissCovid/swisscovid-app-android)
+* iOS App: [swisscovid-app-ios](https://github.com/SwissCovid/swisscovid-app-ios)
+* CovidCode Web-App: [CovidCode-UI](https://github.com/admin-ch/CovidCode-UI)
+* CovidCode Backend: [CovidCode-Service](https://github.com/admin-ch/CovidCode-service)
+* Config Backend: [swisscovid-config-backend](https://github.com/SwissCovid/swisscovid-config-backend)
+* Additional Info Backend: [swisscovid-additionalinfo-backend](https://github.com/SwissCovid/swisscovid-additionalinfo-backend)
+* QR Code Landingpage: [swisscovid-qr-landingpage](https://github.com/SwissCovid/swisscovid-qr-landingpage)
+* DP3T Android SDK & Calibration app: [dp3t-sdk-android](https://github.com/DP-3T/dp3t-sdk-android)
+* DP3T iOS SDK & Calibration app: [dp3t-sdk-ios](https://github.com/DP-3T/dp3t-sdk-ios)
+* DP3T Backend SDK: [dp3t-sdk-backend](https://github.com/DP-3T/dp3t-sdk-backend)
+* CrowdNotifier Android SDK: [crowdnotifier-sdk-android](https://github.com/CrowdNotifier/crowdnotifier-sdk-android)
+* CrowdNotifier iOS SDK: [crowdnotifier-sdk-ios](https://github.com/CrowdNotifier/crowdnotifier-sdk-ios)
+* CrowdNotifier Backend: [swisscovid-cn-backend](https://github.com/SwissCovid/swisscovid-cn-backend)
 
 ## Installation and Building
 

From 1425410a8a677670572abd32e0087708dd629a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?=
 <30999902+simonroesch@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:12:52 +0200
Subject: [PATCH 150/207] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 44e15bf86..a2f091288 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # SwissCovid Android App
 
-[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://github.com/DP-3T/dp3t-app-android-ch/blob/master/LICENSE)
-![Android Build](https://github.com/DP-3T/dp3t-app-android-ch/workflows/Android%20Build/badge.svg)
+[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://github.com/SwissCovid/swisscovid-app-android/blob/master/LICENSE)
+![Android Build](https://github.com/SwissCovid/swisscovid-app-android/workflows/Android%20Build/badge.svg)
 
-SwissCovid is the official contact tracing app of Switzerland. The SwissCovid 2.0 app uses two types of contact tracing to prevent the spread of COVID-19. The app can be installed from the [Google Play Store](https://play.google.com/store/apps/details?id=ch.admin.bag.dp3t).
+SwissCovid is the official contact tracing app of Switzerland. The app can be installed from the [Google Play Store](https://play.google.com/store/apps/details?id=ch.admin.bag.dp3t). The SwissCovid 2.0 app uses two types of contact tracing to prevent the spread of COVID-19.
 
 With proximity tracing close contacts are detected using the bluetooth technology. For this the [DP3T Android SDK](https://github.com/DP-3T/dp3t-sdk-android) is used that builds on top of the Google & Apple Exposure Notifications. This feature is called SwissCovid encounters.
 

From bdf4ec1a849c9bdc7416b4771b96a7f523ea1a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?=
 <30999902+simonroesch@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:23:32 +0200
Subject: [PATCH 151/207] Update README.md

---
 README.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a2f091288..c7a986f34 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,15 @@
-# SwissCovid Android App
+<h1 align="center">SwissCovid Android App</h1>
+<br />
+<div align="center">
+  <img width="180" height="180" src="app/src/main/ic_launcher-playstore.png" />
+  <br />
+  <div>
+    <!-- App Store -->
+    <a href="https://play.google.com/store/apps/details?id=ch.admin.bag.dp3t">
+      <img height="40" src="https://bag-coronavirus.ch/wp-content/uploads/2020/04/play-store.png" alt="Download on the PlayStore" />
+    </a>
+  </div>
+</div>
 
 [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://github.com/SwissCovid/swisscovid-app-android/blob/master/LICENSE)
 ![Android Build](https://github.com/SwissCovid/swisscovid-app-android/workflows/Android%20Build/badge.svg)

From 7d7ac9d9215d86fb0a8d293407b14bca5fb7cae1 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Fri, 4 Jun 2021 07:55:56 +0200
Subject: [PATCH 152/207] Change Ongoing Checkin Notification Icon

---
 .../checkin/utils/NotificationHelper.java     |  2 +-
 app/src/main/res/drawable/ic_qr_small.xml     | 60 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_qr_small.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
index 6e3e14fe1..1d4f1ab55 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/NotificationHelper.java
@@ -128,7 +128,7 @@ public void startOngoingNotification(long startTime, VenueInfo venueInfo) {
 		createNotificationChannel(CHANNEL_ID_ONGOING_CHECK_IN,
 				context.getString(R.string.android_ongoing_checkin_notification_channel_name), true, IMPORTANCE_LOW);
 		Notification ongoingNotification = new NotificationCompat.Builder(context, CHANNEL_ID_ONGOING_CHECK_IN)
-				.setSmallIcon(R.drawable.ic_notification)
+				.setSmallIcon(R.drawable.ic_qr_small)
 				.setContentTitle(context.getString(R.string.ongoing_notification_title)
 						.replace("{TIME}", StringUtil.getHourMinuteTimeString(startTime, ":")))
 				.setContentText(venueInfo.getTitle())
diff --git a/app/src/main/res/drawable/ic_qr_small.xml b/app/src/main/res/drawable/ic_qr_small.xml
new file mode 100644
index 000000000..74b0e00f3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qr_small.xml
@@ -0,0 +1,60 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,7L1,7C0.4,7 0,6.6 0,6L0,1C0,0.4 0.4,0 1,0L6,0C6.6,0 7,0.4 7,1L7,6C7,6.6 6.6,7 6,7ZM2,5L5,5L5,2L2,2L2,5Z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M6,16L1,16C0.4,16 0,15.6 0,15L0,10C0,9.4 0.4,9 1,9L6,9C6.6,9 7,9.4 7,10L7,15C7,15.6 6.6,16 6,16ZM2,14L5,14L5,11L2,11L2,14Z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M15,7L10,7C9.4,7 9,6.6 9,6L9,1C9,0.4 9.4,0 10,0L15,0C15.6,0 16,0.4 16,1L16,6C16,6.6 15.6,7 15,7ZM11,5L14,5L14,2L11,2L11,5Z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3,3h1v1h-1z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3,12h1v1h-1z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9,14h7v2h-7z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M16,13L14,13L14,11L11,11L11,9L15,9C15.6,9 16,9.4 16,10L16,13Z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M12,12h1v1h-1z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M12,3h1v1h-1z"
+      android:strokeWidth="1"
+      android:fillColor="#F7F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>

From d220a1c6d65514af9ac61eaf7ef4f1af28a08859 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 10 Jun 2021 13:18:24 +0200
Subject: [PATCH 153/207] Some refactoring

---
 .../checkinflow/QrCodeScannerFragment.java    | 275 ------------------
 .../checkinflow/QrCodeScannerFragment.kt      | 227 +++++++++++++++
 .../admin/bag/dp3t/infotab/InfoTabFragment.kt |   4 +-
 .../res/layout/fragment_qr_code_scanner.xml   |   4 +-
 instant/src/main/AndroidManifest.xml          |   5 +-
 5 files changed, 232 insertions(+), 283 deletions(-)
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
deleted file mode 100644
index 83af1d99d..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package ch.admin.bag.dp3t.checkin.checkinflow;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.TextView;
-import androidx.annotation.ColorRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.camera.core.Camera;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.ImageAnalysis;
-import androidx.camera.core.Preview;
-import androidx.camera.core.TorchState;
-import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.camera.view.PreviewView;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import org.crowdnotifier.android.sdk.CrowdNotifier;
-import org.crowdnotifier.android.sdk.model.VenueInfo;
-import org.crowdnotifier.android.sdk.utils.QrUtils;
-
-import ch.admin.bag.dp3t.BuildConfig;
-import ch.admin.bag.dp3t.R;
-import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel;
-import ch.admin.bag.dp3t.checkin.models.CheckInState;
-import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
-import ch.admin.bag.dp3t.checkin.utils.ErrorDialog;
-import ch.admin.bag.dp3t.checkin.utils.ErrorHelper;
-
-public class QrCodeScannerFragment extends Fragment implements QrCodeAnalyzer.Listener {
-
-	public final static String TAG = QrCodeScannerFragment.class.getCanonicalName();
-	private static final int PERMISSION_REQUEST_CAMERA = 13;
-	private static final long MIN_ERROR_VISIBILITY = 1000L;
-
-	private CrowdNotifierViewModel viewModel;
-	private PreviewView previewView;
-	private ListenableFuture<ProcessCameraProvider> cameraProviderFuture;
-	private ExecutorService cameraExecutor;
-	private ImageButton flashButton;
-	private TextView invalidCodeText;
-	private View topLeftIndicator;
-	private View topRightIndicator;
-	private View bottomRightIndicator;
-	private View bottomLeftIndicator;
-	private View errorView;
-	private View mainView;
-	private boolean isQRScanningEnabled = true;
-	private long lastUIErrorUpdate = 0L;
-
-	public QrCodeScannerFragment() { super(R.layout.fragment_qr_code_scanner); }
-
-	public static QrCodeScannerFragment newInstance() {
-		return new QrCodeScannerFragment();
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		viewModel = new ViewModelProvider(requireActivity()).get(CrowdNotifierViewModel.class);
-		cameraExecutor = Executors.newSingleThreadExecutor();
-		super.onCreate(savedInstanceState);
-	}
-
-	@Override
-	public void onResume() {
-		isQRScanningEnabled = true;
-		super.onResume();
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		if (ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.CAMERA) !=
-				PackageManager.PERMISSION_GRANTED) {
-			CameraPermissionExplanationDialog dialog = new CameraPermissionExplanationDialog(requireContext());
-			dialog.setOnCancelListener(v -> refreshView(false));
-			dialog.setGrantCameraAccessClickListener(
-					v -> requestPermissions(new String[] { Manifest.permission.CAMERA }, PERMISSION_REQUEST_CAMERA));
-			dialog.show();
-		} else {
-			startCameraAndQrAnalyzer();
-		}
-	}
-
-	@Override
-	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		previewView = view.findViewById(R.id.camera_preview);
-		flashButton = view.findViewById(R.id.fragment_qr_scanner_flash_button);
-		invalidCodeText = view.findViewById(R.id.qr_code_scanner_invalid_code_text);
-		topLeftIndicator = view.findViewById(R.id.qr_code_scanner_top_left_indicator);
-		topRightIndicator = view.findViewById(R.id.qr_code_scanner_top_right_indicator);
-		bottomLeftIndicator = view.findViewById(R.id.qr_code_scanner_bottom_left_indicator);
-		bottomRightIndicator = view.findViewById(R.id.qr_code_scanner_bottom_right_indicator);
-		errorView = view.findViewById(R.id.fragment_qr_scanner_error_view);
-		mainView = view.findViewById(R.id.fragment_qr_scanner_main_view);
-		Toolbar toolbar = view.findViewById(R.id.fragment_qr_scanner_toolbar);
-
-		toolbar.setNavigationOnClickListener(v -> getActivity().getSupportFragmentManager().popBackStack());
-	}
-
-
-	private void setupFlashButton(Camera camera) {
-
-		if (!camera.getCameraInfo().hasFlashUnit()) {
-			flashButton.setVisibility(View.GONE);
-		} else {
-			flashButton.setVisibility(View.VISIBLE);
-		}
-
-		camera.getCameraInfo().getTorchState().observe(getViewLifecycleOwner(), v -> {
-			if (v == TorchState.ON) {
-				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_on));
-			} else {
-				flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_off));
-			}
-		});
-
-		flashButton.setOnClickListener(v ->
-				camera.getCameraControl().enableTorch(camera.getCameraInfo().getTorchState().getValue() == TorchState.OFF));
-	}
-
-	private void startCameraAndQrAnalyzer() {
-		cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext());
-		cameraProviderFuture.addListener(() -> {
-			try {
-				ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
-				Preview preview = new Preview.Builder().build();
-				preview.setSurfaceProvider(previewView.getSurfaceProvider());
-
-				ImageAnalysis imageAnalyzer = new ImageAnalysis.Builder().build();
-				imageAnalyzer.setAnalyzer(cameraExecutor, new QrCodeAnalyzer(this));
-
-				CameraSelector cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
-
-				cameraProvider.unbindAll();
-				Camera camera = cameraProvider.bindToLifecycle(getViewLifecycleOwner(), cameraSelector, preview, imageAnalyzer);
-				setupFlashButton(camera);
-			} catch (ExecutionException e) {
-				Log.d(TAG, "Error starting camera " + e.getMessage());
-				throw new RuntimeException(e);
-			} catch (InterruptedException e) {
-				Log.w("QR Analysis Interrupted", e.getMessage());
-				Thread.currentThread().interrupt();
-			}
-		}, ContextCompat.getMainExecutor(requireContext()));
-	}
-
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		cameraExecutor.shutdown();
-	}
-
-	@Override
-	public void noQRCodeFound() {
-		if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NO_CODE_FOUND));
-	}
-
-	@Override
-	public synchronized void onQRCodeFound(String qrCodeData) {
-		if (!isQRScanningEnabled) return;
-		try {
-			VenueInfo venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX);
-			isQRScanningEnabled = false;
-			if (getActivity() != null) getActivity().runOnUiThread(() -> viewModel.setCheckInState(
-					new CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)));
-			showCheckInFragment();
-			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.VALID));
-		} catch (QrUtils.QRException e) {
-			handleInvalidQRCodeExceptions(e);
-		}
-	}
-
-	private void handleInvalidQRCodeExceptions(QrUtils.QRException e) {
-		if (e instanceof QrUtils.InvalidQRCodeVersionException) {
-			if (getActivity() != null) getActivity().runOnUiThread(() -> {
-				isQRScanningEnabled = false;
-				ErrorDialog errorDialog = new ErrorDialog(requireContext(), CrowdNotifierErrorState.UPDATE_REQUIRED);
-				errorDialog.setOnDismissListener(v -> isQRScanningEnabled = true);
-				errorDialog.setOnCancelListener(v -> isQRScanningEnabled = true);
-				errorDialog.show();
-			});
-		} else if (e instanceof QrUtils.NotYetValidException) {
-			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NOT_YET_VALID));
-		} else if (e instanceof QrUtils.NotValidAnymoreException) {
-			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.NOT_VALID_ANYMORE));
-		} else {
-			if (getActivity() != null) getActivity().runOnUiThread(() -> indicateInvalidQrCode(QRScannerState.INVALID_FORMAT));
-		}
-	}
-
-	private void indicateInvalidQrCode(QRScannerState qrScannerState) {
-		long currentTime = System.currentTimeMillis();
-		if (lastUIErrorUpdate > currentTime - MIN_ERROR_VISIBILITY && qrScannerState == QRScannerState.NO_CODE_FOUND) {
-			return;
-		}
-		lastUIErrorUpdate = currentTime;
-		int color = R.color.primary;
-		if (qrScannerState == QRScannerState.VALID || qrScannerState == QRScannerState.NO_CODE_FOUND) {
-			invalidCodeText.setVisibility(View.INVISIBLE);
-		} else {
-			invalidCodeText.setVisibility(View.VISIBLE);
-			color = R.color.status_red;
-		}
-
-		if (qrScannerState == QRScannerState.INVALID_FORMAT) {
-			invalidCodeText.setText(R.string.qrscanner_error);
-		} else if (qrScannerState == QRScannerState.NOT_VALID_ANYMORE) {
-			invalidCodeText.setText(R.string.qr_scanner_error_code_not_valid_anymore);
-		} else if (qrScannerState == QRScannerState.NOT_YET_VALID) {
-			invalidCodeText.setText(R.string.qr_scanner_error_code_not_yet_valid);
-		}
-		setIndicatorColor(topLeftIndicator, color);
-		setIndicatorColor(topRightIndicator, color);
-		setIndicatorColor(bottomLeftIndicator, color);
-		setIndicatorColor(bottomRightIndicator, color);
-	}
-
-	private void setIndicatorColor(View indicator, @ColorRes int color) {
-		LayerDrawable drawable = (LayerDrawable) indicator.getBackground();
-		GradientDrawable stroke = (GradientDrawable) drawable.findDrawableByLayerId(R.id.indicator);
-		if (getContext() == null) return;
-		stroke.setStroke(getResources().getDimensionPixelSize(R.dimen.qr_scanner_indicator_stroke_width),
-				getResources().getColor(color, null));
-	}
-
-	private void showCheckInFragment() {
-		requireActivity().getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-				.replace(R.id.main_fragment_container, CheckInFragment.newInstance(false))
-				.addToBackStack(CheckInFragment.class.getCanonicalName())
-				.commitAllowingStateLoss();
-	}
-
-	private void refreshView(boolean cameraPermissionGranted) {
-		if (cameraPermissionGranted) {
-			mainView.setVisibility(View.VISIBLE);
-			errorView.setVisibility(View.GONE);
-			startCameraAndQrAnalyzer();
-		} else {
-			errorView.setVisibility(View.VISIBLE);
-			ErrorHelper.updateErrorView(errorView, CrowdNotifierErrorState.CAMERA_ACCESS_DENIED, null, getContext());
-			mainView.setVisibility(View.GONE);
-		}
-	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-		if (requestCode == PERMISSION_REQUEST_CAMERA) {
-			refreshView(grantResults.length >= 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
-		}
-	}
-
-	enum QRScannerState {
-		NO_CODE_FOUND, VALID, INVALID_FORMAT, NOT_YET_VALID, NOT_VALID_ANYMORE
-	}
-
-}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
new file mode 100644
index 000000000..a8039cc89
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
@@ -0,0 +1,227 @@
+package ch.admin.bag.dp3t.checkin.checkinflow
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.LayerDrawable
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.ColorRes
+import androidx.camera.core.*
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.BuildConfig
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.models.CheckInState
+import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState
+import ch.admin.bag.dp3t.checkin.utils.ErrorDialog
+import ch.admin.bag.dp3t.checkin.utils.ErrorHelper
+import ch.admin.bag.dp3t.databinding.FragmentQrCodeScannerBinding
+import ch.admin.bag.dp3t.extensions.showFragment
+import org.crowdnotifier.android.sdk.CrowdNotifier
+import org.crowdnotifier.android.sdk.utils.QrUtils.*
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+private const val PERMISSION_REQUEST_CAMERA = 13
+private const val MIN_ERROR_VISIBILITY = 1000L
+
+class QrCodeScannerFragment : Fragment(), QrCodeAnalyzer.Listener {
+
+
+	companion object {
+		val TAG = QrCodeScannerFragment::class.java.canonicalName
+
+		@JvmStatic
+		fun newInstance(): QrCodeScannerFragment = QrCodeScannerFragment()
+	}
+
+
+	private val viewModel: CrowdNotifierViewModel by activityViewModels()
+
+	private var cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
+
+	private var isQRScanningEnabled = true
+	private var lastUIErrorUpdate = 0L
+
+	private lateinit var binding: FragmentQrCodeScannerBinding
+
+	override fun onResume() {
+		isQRScanningEnabled = true
+		super.onResume()
+	}
+
+	override fun onStart() {
+		super.onStart()
+		if (ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.CAMERA) !=
+			PackageManager.PERMISSION_GRANTED
+		) {
+			val dialog = CameraPermissionExplanationDialog(requireContext())
+			dialog.setOnCancelListener { refreshView(false) }
+			dialog.setGrantCameraAccessClickListener {
+				requestPermissions(arrayOf(Manifest.permission.CAMERA), PERMISSION_REQUEST_CAMERA)
+			}
+			dialog.show()
+		} else {
+			startCameraAndQrAnalyzer()
+		}
+	}
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentQrCodeScannerBinding.inflate(inflater)
+		return binding.apply {
+			fragmentQrScannerToolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+		}.root
+	}
+
+	private fun setupFlashButton(camera: Camera) {
+		binding.apply {
+			flashButton.isVisible = camera.cameraInfo.hasFlashUnit()
+
+			camera.cameraInfo.torchState.observe(viewLifecycleOwner, { v: Int ->
+				if (v == TorchState.ON) {
+					flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_on))
+				} else {
+					flashButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_light_off))
+				}
+			})
+			flashButton.setOnClickListener { camera.cameraControl.enableTorch(camera.cameraInfo.torchState.value == TorchState.OFF) }
+		}
+	}
+
+	private fun startCameraAndQrAnalyzer() {
+		val cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext())
+		cameraProviderFuture.addListener({
+			try {
+				val cameraProvider = cameraProviderFuture.get()
+				val preview = Preview.Builder().build()
+				preview.setSurfaceProvider(binding.cameraPreview.surfaceProvider)
+				val imageAnalyzer = ImageAnalysis.Builder().build()
+				imageAnalyzer.setAnalyzer(cameraExecutor, QrCodeAnalyzer(this))
+				val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
+				cameraProvider.unbindAll()
+				val camera = cameraProvider.bindToLifecycle(viewLifecycleOwner, cameraSelector, preview, imageAnalyzer)
+				setupFlashButton(camera)
+			} catch (e: ExecutionException) {
+				Log.d(TAG, "Error starting camera " + e.message)
+				throw RuntimeException(e)
+			} catch (e: InterruptedException) {
+				Log.w("QR Analysis Interrupted", e.message!!)
+				Thread.currentThread().interrupt()
+			}
+		}, ContextCompat.getMainExecutor(requireContext()))
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		cameraExecutor.shutdown()
+	}
+
+	override fun noQRCodeFound() {
+		activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.NO_CODE_FOUND) }
+	}
+
+	@Synchronized
+	override fun onQRCodeFound(qrCodeData: String) {
+		if (!isQRScanningEnabled) return
+		try {
+			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX)
+			isQRScanningEnabled = false
+			activity?.runOnUiThread {
+				viewModel.checkInState = CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
+			}
+			showFragment(CheckInFragment.newInstance(isSelfCheckin = false))
+			activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.VALID) }
+		} catch (e: QRException) {
+			handleInvalidQRCodeExceptions(e)
+		}
+	}
+
+	private fun handleInvalidQRCodeExceptions(e: QRException) {
+		when (e) {
+			is InvalidQRCodeVersionException -> {
+				activity?.runOnUiThread {
+					isQRScanningEnabled = false
+					val errorDialog = ErrorDialog(requireContext(), CrowdNotifierErrorState.UPDATE_REQUIRED)
+					errorDialog.setOnDismissListener { isQRScanningEnabled = true }
+					errorDialog.setOnCancelListener { isQRScanningEnabled = true }
+					errorDialog.show()
+				}
+			}
+			is NotYetValidException -> activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.NOT_YET_VALID) }
+			is NotValidAnymoreException -> activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.NOT_VALID_ANYMORE) }
+			else -> activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.INVALID_FORMAT) }
+
+		}
+	}
+
+	private fun indicateInvalidQrCode(qrScannerState: QRScannerState) {
+		binding.apply {
+			val currentTime = System.currentTimeMillis()
+			if (lastUIErrorUpdate > currentTime - MIN_ERROR_VISIBILITY && qrScannerState == QRScannerState.NO_CODE_FOUND) {
+				return
+			}
+			lastUIErrorUpdate = currentTime
+			var color = R.color.primary
+			if (qrScannerState == QRScannerState.VALID || qrScannerState == QRScannerState.NO_CODE_FOUND) {
+				qrCodeScannerInvalidCodeText.visibility = View.INVISIBLE
+			} else {
+				qrCodeScannerInvalidCodeText.visibility = View.VISIBLE
+				color = R.color.status_red
+			}
+			when (qrScannerState) {
+				QRScannerState.INVALID_FORMAT -> qrCodeScannerInvalidCodeText.setText(R.string.qrscanner_error)
+				QRScannerState.NOT_VALID_ANYMORE -> qrCodeScannerInvalidCodeText.setText(R.string.qr_scanner_error_code_not_valid_anymore)
+				QRScannerState.NOT_YET_VALID -> qrCodeScannerInvalidCodeText.setText(R.string.qr_scanner_error_code_not_yet_valid)
+				else -> Unit
+			}
+			setIndicatorColor(qrCodeScannerTopLeftIndicator, color)
+			setIndicatorColor(qrCodeScannerTopRightIndicator, color)
+			setIndicatorColor(qrCodeScannerBottomLeftIndicator, color)
+			setIndicatorColor(qrCodeScannerBottomRightIndicator, color)
+		}
+	}
+
+	private fun setIndicatorColor(indicator: View, @ColorRes color: Int) {
+		val drawable = indicator.background as LayerDrawable
+		val stroke = drawable.findDrawableByLayerId(R.id.indicator) as GradientDrawable
+		if (context == null) return
+		stroke.setStroke(
+			resources.getDimensionPixelSize(R.dimen.qr_scanner_indicator_stroke_width),
+			resources.getColor(color, null)
+		)
+	}
+
+	private fun refreshView(cameraPermissionGranted: Boolean) {
+		binding.apply {
+			fragmentQrScannerMainView.isVisible = cameraPermissionGranted
+			fragmentQrScannerErrorView.isVisible = !cameraPermissionGranted
+
+			if (cameraPermissionGranted) {
+				startCameraAndQrAnalyzer()
+			} else {
+				ErrorHelper.updateErrorView(fragmentQrScannerErrorView, CrowdNotifierErrorState.CAMERA_ACCESS_DENIED, null, context)
+			}
+		}
+	}
+
+	override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+		if (requestCode == PERMISSION_REQUEST_CAMERA) {
+			refreshView(grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)
+		}
+	}
+
+	internal enum class QRScannerState {
+		NO_CODE_FOUND, VALID, INVALID_FORMAT, NOT_YET_VALID, NOT_VALID_ANYMORE
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
index a2b01e5a6..17d29baf6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/infotab/InfoTabFragment.kt
@@ -69,8 +69,8 @@ class InfoTabFragment : Fragment() {
 	private fun showCannotEnterCovidcodeWhileCheckedInDialog() {
 		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(R.string.error_cannot_enter_covidcode_while_checked_in)
-			.setPositiveButton(R.string.checkout_button_title) { dialog, id -> showCheckOutFragment() }
-			.setNegativeButton(R.string.cancel) { dialog, id -> dialog.dismiss() }
+			.setPositiveButton(R.string.checkout_button_title) { _, _ -> showCheckOutFragment() }
+			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
 			.create()
 			.show()
 	}
diff --git a/app/src/main/res/layout/fragment_qr_code_scanner.xml b/app/src/main/res/layout/fragment_qr_code_scanner.xml
index 49123747c..767ad577f 100644
--- a/app/src/main/res/layout/fragment_qr_code_scanner.xml
+++ b/app/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -174,12 +174,12 @@
 			android:id="@+id/space3"
 			android:layout_width="match_parent"
 			android:layout_height="0dp"
-			app:layout_constraintBottom_toTopOf="@id/fragment_qr_scanner_flash_button"
+			app:layout_constraintBottom_toTopOf="@id/flash_button"
 			app:layout_constraintTop_toBottomOf="@id/qr_code_scanner_invalid_code_text"
 			app:layout_constraintVertical_weight="5" />
 
 		<ImageButton
-			android:id="@+id/fragment_qr_scanner_flash_button"
+			android:id="@+id/flash_button"
 			android:layout_width="@dimen/button_height"
 			android:layout_height="@dimen/button_height"
 			android:layout_margin="@dimen/spacing_large"
diff --git a/instant/src/main/AndroidManifest.xml b/instant/src/main/AndroidManifest.xml
index 5c548c288..b09a79621 100644
--- a/instant/src/main/AndroidManifest.xml
+++ b/instant/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:dist="http://schemas.android.com/apk/distribution"
-	xmlns:tools="http://schemas.android.com/tools"
 	package="ch.admin.bag.dp3t"
 	android:targetSandboxVersion="2">
 
@@ -14,9 +13,7 @@
 		android:label="@string/app_name"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/NextStepTheme"
-		tools:ignore="UnusedAttribute"
-		tools:replace="android:fullBackupContent">
+		android:theme="@style/NextStepTheme">
 
 		<activity
 			android:name=".InstantActivity"

From b321addb1439f14a686c3711ec4d73d15369db45 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 10 Jun 2021 14:00:40 +0200
Subject: [PATCH 154/207] Update Crowdnotifier SDK

---
 app/build.gradle                              |  8 +--
 .../java/ch/admin/bag/dp3t/MainActivity.kt    |  7 +--
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  3 +-
 .../checkinflow/QrCodeScannerFragment.kt      |  2 +-
 .../dp3t/checkin/generateqrcode/PdfCreator.kt |  4 +-
 .../checkin/generateqrcode/QRCodeViewModel.kt |  2 +-
 .../CrowdNotifierKeyLoadWorker.java           |  3 +-
 common/build.gradle                           |  2 +-
 instant/build.gradle                          |  8 +--
 instant/src/main/AndroidManifest.xml          |  2 +-
 .../java/ch/admin/bag/dp3t/InstantFragment.kt | 49 ++++++++++---------
 11 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 51f29e688..c58fd6d4e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-d.bfs.admin.ch/"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr-d.swisscovid.ch"'
 			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"lW5voTRVR-jgYMiWLd04hjvyyFQG7QOyBLw0D7XbASlqlg0AviQMqgjbABZk9PcCip27szrqFyv_1YtKZE8eyzt7vtN4qKfJdWrItLRzRtjb83piN3cDt_yNo7siohQV"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
@@ -67,7 +67,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt-a.bfs.admin.ch/"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr-a.swisscovid.ch"'
 			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"RHk4TO95YVnihWuCSVnbQ3ow-AcO-BXZ9caWeO_GP7o-vEiowJXTkKSUAf77n4oAmzshDvFVLkQFsA72JfBcaC8QSIT9owk83tnDuwpUuDfFgiBq_KXqcA2UcxaInmQS"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
@@ -82,7 +82,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr.swisscovid.ch"'
 			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"mAofNDGOKcmVJt4fo7kWruvFRee2g0irAfIdjH6EFyd6vHY_uTb6ZXOf9eFVzTUEiZLDLL-Q2w8kZkPscWyXi3X59zuqeI25qloOF-sowHo1_-HiH7Z_4COOA030mm8J"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
@@ -96,7 +96,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
 			buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
 			buildConfigField 'String', 'PUBLISHED_CROWDNOTIFIER_KEYS_BASE_URL', '"https://www.pt.bfs.admin.ch/"'
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr.swisscovid.ch"'
 			buildConfigField "String", "QR_MASTER_PUBLIC_KEY_BASE_64", '"mAofNDGOKcmVJt4fo7kWruvFRee2g0irAfIdjH6EFyd6vHY_uTb6ZXOf9eFVzTUEiZLDLL-Q2w8kZkPscWyXi3X59zuqeI25qloOF-sowHo1_-HiH7Z_4COOA030mm8J"'
 			buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
 			buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index 5dc568a5b..f2b5a0c8f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -213,9 +213,10 @@ class MainActivity : FragmentActivity() {
 
 	private fun checkValidCheckInIntent() {
 		val qrCodeData = intent.dataString ?: return
-		if (!qrCodeData.startsWith(BuildConfig.ENTRY_QR_CODE_PREFIX)) return
+
+		if (Uri.parse(qrCodeData).host != BuildConfig.ENTRY_QR_CODE_HOST) return
 		try {
-			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX)
+			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_HOST)
 			if (crowdNotifierViewModel.isCheckedIn.value == true) {
 				ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
 			} else {
@@ -232,7 +233,7 @@ class MainActivity : FragmentActivity() {
 
 	private fun checkIn(qrCodeUrl: String) {
 		try {
-			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, BuildConfig.ENTRY_QR_CODE_PREFIX)
+			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, BuildConfig.ENTRY_QR_CODE_HOST)
 			if (crowdNotifierViewModel.isCheckedIn.value == true) {
 				ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
 			} else {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 2fc8a1247..eeccb4f1f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -35,7 +35,6 @@
 public class CrowdNotifierViewModel extends AndroidViewModel {
 
 	private static final long MAX_DURATION_WITHOUT_SUCCESSFUL_DOWNLOAD = 24 * 60 * 60 * 1000L;
-	private static final long MIN_EXPOSURE_OVERLAP = 15 * 1000L * 60;
 
 	private final MutableLiveData<List<ExposureEvent>> exposures = new MutableLiveData<>();
 	private final MutableLiveData<Long> timeSinceCheckIn = new MutableLiveData<>(0L);
@@ -130,7 +129,7 @@ public void refreshTraceKeys() {
 				traceKeyLoadingState.setValue(LoadingState.FAILURE);
 			} else {
 				SecureStorage.getInstance(getApplication()).setLastSuccessfulCheckinDownload(System.currentTimeMillis());
-				CrowdNotifier.checkForMatches(traceKeys, MIN_EXPOSURE_OVERLAP,getApplication());
+				CrowdNotifier.checkForMatches(traceKeys, getApplication());
 				refreshExposures();
 				traceKeyLoadingState.setValue(LoadingState.SUCCESS);
 			}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
index a8039cc89..29916e72f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
@@ -134,7 +134,7 @@ class QrCodeScannerFragment : Fragment(), QrCodeAnalyzer.Listener {
 	override fun onQRCodeFound(qrCodeData: String) {
 		if (!isQRScanningEnabled) return
 		try {
-			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_PREFIX)
+			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_HOST)
 			isQRScanningEnabled = false
 			activity?.runOnUiThread {
 				viewModel.checkInState = CheckInState(false, venueInfo, System.currentTimeMillis(), System.currentTimeMillis(), 0)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
index a5cd1eb6b..9e0c86514 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
@@ -19,8 +19,8 @@ private const val PDF_QR_CODE_MAX_PIXEL_SIZE = 310
 
 fun createEntryPdf(venueInfo: VenueInfo, context: Context): PdfDocument {
 
-	val bitmap =
-		QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX)).renderToMaxSizeBitmap(PDF_QR_CODE_MAX_PIXEL_SIZE)
+	val bitmap = QrCode.create(venueInfo.toQrCodeString("https://" + BuildConfig.ENTRY_QR_CODE_HOST))
+		.renderToMaxSizeBitmap(PDF_QR_CODE_MAX_PIXEL_SIZE)
 
 	val document = PdfDocument()
 	val pageInfo = PdfDocument.PageInfo.Builder(PDF_WIDTH, PDF_HEIGHT, 1).create() // A4 size
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index c4ede0a6d..5be8f2dcc 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -102,7 +102,7 @@ class QRCodeViewModel(application: Application) : AndroidViewModel(application)
 	fun generateQrCodeBitmapAndPdf(venueInfo: VenueInfo, qrCodeSize: Int) = viewModelScope.launch(Dispatchers.IO) {
 		launch(Dispatchers.IO) {
 			selectedQrCodeBitmap.postValue(
-				QrCode.create(venueInfo.toQrCodeString(BuildConfig.ENTRY_QR_CODE_PREFIX))
+				QrCode.create(venueInfo.toQrCodeString("https://" + BuildConfig.ENTRY_QR_CODE_HOST))
 					.renderToBitmap(max(qrCodeSize, MAX_QR_CODE_PIXEL_SIZE))
 			)
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
index d48d79e16..b5f8d46af 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/CrowdNotifierKeyLoadWorker.java
@@ -30,7 +30,6 @@ public class CrowdNotifierKeyLoadWorker extends Worker {
 	private static final String WORK_TAG = "ch.admin.bag.dp3t.checkin.networking.CrowdNotifierKeyLoadWorker";
 	private static final int DAYS_TO_KEEP_VENUE_VISITS = 14;
 	private static final int REPEAT_INTERVAL_MINUTES = 120;
-	private static final long MIN_EXPOSURE_OVERLAP = 15 * 1000L * 60;
 	private static final String LOG_TAG = "KeyLoadWorker";
 
 	public static void startKeyLoadWorker(Context context) {
@@ -68,7 +67,7 @@ public Result doWork() {
 			return Result.retry();
 		}
 		List<ExposureEvent> exposures =
-				CrowdNotifier.checkForMatches(problematicEventInfos, MIN_EXPOSURE_OVERLAP, getApplicationContext());
+				CrowdNotifier.checkForMatches(problematicEventInfos, getApplicationContext());
 		if (!exposures.isEmpty()) {
 			showExposureNotification();
 		}
diff --git a/common/build.gradle b/common/build.gradle
index 269feaf6f..6c438284f 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
-	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0-dev-14'
+	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0.0-dev-17'
 	api 'com.google.android.gms:play-services-instantapps:17.0.0'
 
 }
\ No newline at end of file
diff --git a/instant/build.gradle b/instant/build.gradle
index def7bd2b8..e0d8c2282 100644
--- a/instant/build.gradle
+++ b/instant/build.gradle
@@ -20,21 +20,21 @@ android {
 	productFlavors {
 		dev {
 			manifestPlaceholders = [qrCodeHostName: "qr-d.swisscovid.ch"]
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-d.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr-d.swisscovid.ch"'
 			applicationIdSuffix '.dev'
 		}
 		abnahme {
 			manifestPlaceholders = [qrCodeHostName: "qr-a.swisscovid.ch"]
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr-a.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr-a.swisscovid.ch"'
 			applicationIdSuffix '.abnahme'
 		}
 		prod {
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr.swisscovid.ch"'
 		}
 		log {
 			manifestPlaceholders = [qrCodeHostName: "qr.swisscovid.ch"]
-			buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://qr.swisscovid.ch"'
+			buildConfigField "String", "ENTRY_QR_CODE_HOST", '"qr.swisscovid.ch"'
 		}
 	}
 
diff --git a/instant/src/main/AndroidManifest.xml b/instant/src/main/AndroidManifest.xml
index b09a79621..ac7b966ec 100644
--- a/instant/src/main/AndroidManifest.xml
+++ b/instant/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
 			can not be set to something dynamic such as ${qrCodeHostName}, otherwise the Play Console upload will fail.-->
 			<meta-data
 				android:name="default-url"
-				android:value="https://qr.swisscovid.ch/" />
+				android:value="https://qr-playstore-try.swisscovid.ch/" />
 
 		</activity>
 
diff --git a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
index bce2e4f3d..555213712 100644
--- a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
+++ b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
@@ -1,6 +1,7 @@
 package ch.admin.bag.dp3t
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -21,8 +22,11 @@ import java.nio.charset.StandardCharsets
 
 
 private const val REQUEST_CODE_INSTALL = 1
-private const val QR_URL_PREFIX = BuildConfig.ENTRY_QR_CODE_PREFIX
-private const val QR_URL_PREFIX_WITH_VERSION = "$QR_URL_PREFIX?v="
+
+// Note: https://qr-playstore-try.swisscovid.ch is defined as the default url in the Manifest. When clicking on "Try now" in the Playstore
+// the Instant App is started with this url and some parameters, e.g.:
+// https://qr-playstore-try.swisscovid.ch/?referrer=utm_source%3D(not%2520set)%26utm_medium%3D(not%2520set)
+private const val PLAYSTORE_TRY_NOW_HOST = "qr-playstore-try.swisscovid.ch"
 
 class InstantFragment : Fragment() {
 
@@ -47,34 +51,28 @@ class InstantFragment : Fragment() {
 	}
 
 	private fun showVenueInfo(qrCodeUrl: String?) {
-		// If the instant app is started without a url (should never happen) or with the default url, don't show any QR Code
-		// information nor error.
-		// Note: https://qr.swisscovid.ch is defined as the default url in the Manifest. When clicking on "Try now" in the Playstore
-		// the Instant App is started with this url and some parameters, e.g.:
-		// https://qr.swisscovid.ch/?referrer=utm_source%3D(not%2520set)%26utm_medium%3D(not%2520set)
-
-		binding.apply {
-			if (qrCodeUrl == null || !qrCodeUrl.startsWith(QR_URL_PREFIX_WITH_VERSION)) {
-				title.setText(R.string.app_name)
-				installButton.setText(R.string.playservices_install)
-				return
-			}
-			try {
-				val venueInfo: VenueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, QR_URL_PREFIX)
+		try {
+			val venueInfo: VenueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, BuildConfig.ENTRY_QR_CODE_HOST)
+			binding.apply {
 				title.text = venueInfo.title
 				subtitle.setText(venueInfo.getSubtitle())
-			} catch (e: QRException) {
-				handleInvalidQRCodeExceptions(e)
 			}
+		} catch (e: QRException) {
+			handleInvalidQRCodeExceptions(e, qrCodeUrl)
 		}
 	}
 
-	private fun handleInvalidQRCodeExceptions(e: QRException) {
+	private fun handleInvalidQRCodeExceptions(e: QRException, qrCodeUrl: String?) {
 		binding.apply {
-			errorView.isVisible = true
-			illu.isVisible = false
 			title.setText(R.string.app_name)
 			installButton.setText(R.string.playservices_install)
+
+			// If the instant app is started without a url (should never happen) or with the default url, don't show any QR Code
+			// information nor error.
+			if (qrCodeUrl == null || Uri.parse(qrCodeUrl).host == PLAYSTORE_TRY_NOW_HOST) return
+
+			errorView.isVisible = true
+			illu.isVisible = false
 			when (e) {
 				is NotYetValidException ->
 					ErrorHelper.updateErrorView(errorView, CrowdNotifierErrorState.QR_CODE_NOT_YET_VALID, null, context, false)
@@ -94,16 +92,21 @@ class InstantFragment : Fragment() {
 	}
 
 	private fun storeInstantAppCookie(qrCodeUrl: String?) {
+
 		val pmc: PackageManagerCompat = InstantApps.getPackageManagerCompat(requireContext())
-		val cookieContent: ByteArray? = if (qrCodeUrl == null || !qrCodeUrl.startsWith(QR_URL_PREFIX_WITH_VERSION)) {
+		val hasValidVenueInfo =
+			runCatching { CrowdNotifier.getVenueInfo(qrCodeUrl, BuildConfig.ENTRY_QR_CODE_HOST) }.getOrNull() != null
+		val cookieContent: ByteArray? = if (qrCodeUrl == null || !hasValidVenueInfo) {
 			null
 		} else {
 			qrCodeUrl.toByteArray(StandardCharsets.UTF_8)
 		}
 		if (cookieContent == null || cookieContent.size <= pmc.instantAppCookieMaxSize) {
 			pmc.instantAppCookie = cookieContent
+			Log.d(TAG, "Instant Cookie saved: $qrCodeUrl")
+		} else {
+			Log.d(TAG, "No instant cookie saved: $qrCodeUrl")
 		}
 	}
 
-
 }
\ No newline at end of file

From 89d630a7c30f2dcd0ea764d393c4ab154a3e8558 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Thu, 10 Jun 2021 14:27:50 +0200
Subject: [PATCH 155/207] Fix automatic Check-In after Instant-App Update

---
 app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt         | 5 ++---
 .../java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt | 6 +++++-
 .../bag/dp3t/onboarding/OnboardingActivityResultContract.kt | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index f2b5a0c8f..91883acbf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -141,12 +141,11 @@ class MainActivity : FragmentActivity() {
 		}
 	}
 
-	// If there is an url in the instant app cookies, show the instant app onboarding
 	private fun checkForInstantAppUrl(): String? {
 		val pmc = InstantApps.getPackageManagerCompat(this)
 		val instantAppCookie = pmc.instantAppCookie
-		if (instantAppCookie != null && instantAppCookie.size > 0) {
-			// If there is an url in the instant app cookies, show the instant app onboarding
+		if (instantAppCookie != null && instantAppCookie.isNotEmpty()) {
+			// If there is an url in the instant app cookies, retun it and reset it to null
 			val url = String(instantAppCookie, StandardCharsets.UTF_8)
 			pmc.instantAppCookie = null
 			return url
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt
index f17e46d2a..fd8ef22fd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivity.kt
@@ -25,6 +25,7 @@ class OnboardingActivity : FragmentActivity() {
 
 	companion object {
 		const val ARG_ONBOARDING_TYPE = "ARG_ONBOARDING_TYPE"
+		const val ARG_INSTANT_APP_URL = "ARG_INSTANT_APP_URL"
 	}
 
 	private lateinit var splashboarding: View
@@ -65,7 +66,10 @@ class OnboardingActivity : FragmentActivity() {
 		if (currentItem < pagerAdapter.itemCount - 1) {
 			viewPager.setCurrentItem(currentItem + 1, true)
 		} else {
-			setResult(RESULT_OK, Intent().putExtra(ARG_ONBOARDING_TYPE, intent.getSerializableExtra(ARG_ONBOARDING_TYPE)))
+			val resultIntent = Intent()
+				.putExtra(ARG_ONBOARDING_TYPE, intent.getSerializableExtra(ARG_ONBOARDING_TYPE))
+				.putExtra(ARG_INSTANT_APP_URL, intent.getStringExtra(ARG_INSTANT_APP_URL))
+			setResult(RESULT_OK, resultIntent)
 			finish()
 			overridePendingTransition(R.anim.fragment_open_enter, R.anim.fragment_open_exit)
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
index 05e560587..41d40779c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
@@ -4,8 +4,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContract
-
-private const val ARG_INSTANT_APP_URL = "ARG_INSTANT_APP_URL"
+import ch.admin.bag.dp3t.onboarding.OnboardingActivity.Companion.ARG_INSTANT_APP_URL
 
 class OnboardingActivityResultContract : ActivityResultContract<OnboardingActivityArgs, OnboardingActivityResult>() {
 

From 9794cc01abffc5983d17fc5844140880b6d4ea76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 11 Jun 2021 11:39:53 +0200
Subject: [PATCH 156/207] update version number

---
 app/build.gradle     | 2 +-
 instant/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c58fd6d4e..9f5d5d348 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 20000
+		versionCode 20001
 		versionName "2.0.0"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 
diff --git a/instant/build.gradle b/instant/build.gradle
index e0d8c2282..89dab3917 100644
--- a/instant/build.gradle
+++ b/instant/build.gradle
@@ -10,7 +10,7 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 1
+		versionCode 2
 		versionName "2.0.0"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 

From 15f33512a002a240ab6dbc597f45006eeed78010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 13 Jun 2021 10:54:56 +0200
Subject: [PATCH 157/207] translation update

---
 common/src/main/res/values-bs/strings.xml |   3 +
 common/src/main/res/values-de/strings.xml |  11 +-
 common/src/main/res/values-es/strings.xml |   3 +
 common/src/main/res/values-fr/strings.xml |  21 +-
 common/src/main/res/values-hr/strings.xml |   3 +
 common/src/main/res/values-it/strings.xml |   5 +-
 common/src/main/res/values-pt/strings.xml |   3 +
 common/src/main/res/values-rm/strings.xml | 403 +++++++++++-----------
 common/src/main/res/values-sq/strings.xml |   3 +
 common/src/main/res/values-sr/strings.xml |   3 +
 common/src/main/res/values-ti/strings.xml |   3 +
 common/src/main/res/values-tr/strings.xml |   3 +
 common/src/main/res/values/strings.xml    |  40 ++-
 13 files changed, 271 insertions(+), 233 deletions(-)

diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index d791324c9..44fa8d0f8 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -1762,4 +1762,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 5a48570be..12e21b29e 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -1538,7 +1538,7 @@ Dann rufen Sie hier an:"</string>
     <string name="checkins_create_qr_code">"QR-Code erstellen"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Check-ins anbieten?"</string>
+    <string name="events_title">"Check-ins anbieten"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Jetzt einchecken"</string>
@@ -1611,7 +1611,7 @@ Dann rufen Sie hier an:"</string>
     <string name="checkin_detail_checked_out_text">"Scannen Sie einen SwissCovid-QR-Code, um sich vor Ort einzuchecken."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"Wenn Sie einen Swiss-Covid-QR-Code scannen, um sich vor Ort einzuchecken, wird hier automatisch ein Eintrag angelegt."</string>
+    <string name="checkin_detail_diary_text">"Wenn Sie einen SwissCovid-QR-Code scannen, um sich vor Ort einzuchecken, wird hier automatisch ein Eintrag angelegt."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <!-- Fuzzy -->
@@ -1675,7 +1675,7 @@ Dann rufen Sie hier an:"</string>
     <string name="checkin_overview_isolation_text">"Sie können nicht mehr einchecken, wenn Sie positiv getestet wurden."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Erstellen Sie einen QR-Code, mit dem sich Personen vor Ort einchecken können."</string>
+    <string name="events_card_subtitle">"Erstellen Sie einen SwissCovid-QR-Code, mit dem sich Personen vor Ort einchecken können."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen?"</string>
@@ -1721,7 +1721,7 @@ zu hinterlassen"</string>
     <string name="home_end_isolation_card_title">"Isolation beenden?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Sie möchten Check-ins anbieten?"</string>
+    <string name="events_card_title">"Sie möchten QR-Codes erstellen?"</string>
 
     <!-- Fuzzy -->
     <string name="checkin_footer_title1">"Warum eine Check-in-Funktion?"</string>
@@ -1845,4 +1845,7 @@ Dieser Titel wird beim Check-in angezeigt."</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in">"Sie sind noch eingecheckt. Bitte checken Sie aus bevor Sie den Covidcode eingeben."</string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty">"Meine QR-Codes"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 6f4f5669d..a236171d7 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -1754,4 +1754,7 @@ Posibles utilizaciones:
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 4d1349dc3..fb7cf3e9e 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -70,10 +70,10 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="NSBluetoothAlwaysUsageDescription">"Les contacts sont détectés en arrière-plan via Bluetooth (faible consommation)."</string>
 
     <!-- Inform: Titel der Code abschicken Seite -->
-    <string name="inform_code_title">"Entrer le code COVID"</string>
+    <string name="inform_code_title">"Saisir le code COVID"</string>
 
     <!-- Inform: Code eingeben Subtext -->
-    <string name="inform_code_text">"Entrez le code COVID reçu."</string>
+    <string name="inform_code_text">"Saisissez le code COVID reçu."</string>
 
     <!-- Inform: Code eingeben kein Code Button Text -->
     <string name="inform_code_no_code">"Besoin d'aide ?"</string>
@@ -197,7 +197,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <string name="inform_detail_box_title">"Avertir d’une infection possible"</string>
 
     <!-- Inform Detail Weisse Box Button -->
-    <string name="inform_detail_box_button">"Entrer le code COVID"</string>
+    <string name="inform_detail_box_button">"Saisir le code COVID"</string>
 
     <!-- Informieren Detail Weisse Box Text -->
     <string name="inform_detail_box_text">"En saisissant le code COVID, vous indiquez à l'application que vous avez été testé positif au nouveau coronavirus."</string>
@@ -261,7 +261,7 @@ Ainsi, vous contribuez à interrompre les chaînes de transmission."</string>
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Suivez les consignes reçues sur l'isolement."</string>
     <string name="tracing_ended_title">"Contacts et check-ins désactivés"</string>
-    <string name="tracing_ended_text">"Aucune contact n’est sauvegardé."</string>
+    <string name="tracing_ended_text">"Aucun contact n’est sauvegardé."</string>
     <string name="exposed_info_contact_hotline">"Contactez"</string>
     <string name="meldung_homescreen_positive_info_line1">"Suivez"</string>
     <string name="meldung_homescreen_positive_info_line2">"Consignes sur l’isolement"</string>
@@ -1504,7 +1504,7 @@ Appelez :"</string>
     <string name="checkins_create_qr_code">"Créer un code QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Créer un code check-in?"</string>
+    <string name="events_title">"Créer un code check-in"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Se connecter "</string>
@@ -1566,7 +1566,7 @@ Appelez :"</string>
     <string name="scan_qr_code_button_title">"Scanner le code QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in désactivée"</string>
+    <string name="checkin_ended_title">"Check-in désactivé"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
     <string name="checkin_ended_text">"Pas de check-in possible actuellement"</string>
@@ -1623,7 +1623,7 @@ Appelez :"</string>
     <string name="remove_diary_warning_hide_title">"Masquer uniquement et maintenir en vigueur les notifications ?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Test positif ?"</string>
+    <string name="home_covidcode_card_title">"Test positif?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
     <string name="home_end_isolation_card_text">"Réactiver contacts et check-ins."</string>
@@ -1686,9 +1686,9 @@ Appelez :"</string>
     <string name="checkin_footer_title2">"Pas de sauvegarde centralisée des données"</string>
     <string name="checkin_footer_subtitle2">"La fonction des SwissCovid check-ins ne nécessite pas la saisie de coordonnées comme le nom, l’adresse ou le numéro de téléphone et elle n’enregistre pas les données de géolocalisation. La liste des check-ins est enregistrée localement sur votre smartphone. Les données locales sont effacées après 14 jours."</string>
     <string name="events_empty_state_title">"Créer un code QR"</string>
-    <string name="events_empty_state_subtitle">"Au moyen du code QR SwissCovid, il est possible de se connecter sur place sans devoir enregistrer ses données."</string>
+    <string name="events_empty_state_subtitle">"Avec un code QR SwissCovid, il est possible de se connecter sur place sans devoir enregistrer ses données."</string>
     <string name="events_info_box_title">"Cette fonction ne remplace pas la collecte obligatoire des coordonnées."</string>
-    <string name="events_info_box_text">"La check-ins SwissCovid ne remplace la collecte des coordonnées prescrite par l’« ordonnance COVID-19 situation particulière »."</string>
+    <string name="events_info_box_text">"Les check-ins SwissCovid ne remplacent pas la collecte des coordonnées prescrite par l’« ordonnance COVID-19 situation particulière »."</string>
     <string name="events_footer_title1">"Où la fonction de check-in peut-elle être utilisée?"</string>
     <string name="events_footer_title2">"À quoi sert la fonction de check-in?"</string>
     <string name="events_footer_subtitle1">"La fonction de check-in SwissCovid sera utile lors de rencontres dans des lieux où la collecte des coordonnées n’est pas obligatoire. Il peut s’agir – de rencontres privées – d’événements organisés par des associations – de rassemblements dans le cadre professionnel, p. ex. salles de réunion, bureaux, cantines, etc."</string>
@@ -1786,4 +1786,7 @@ Ce titre s’affichera lors du check-in."</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 1db1217cc..922868ef6 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -1760,4 +1760,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index b28692262..1d028b091 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -1510,7 +1510,7 @@ Chiama il seguente numero:"</string>
     <string name="checkins_create_qr_code">"Crea codice QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offrire i check-in?"</string>
+    <string name="events_title">"Offrire i check-in"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Fai il check-in ora"</string>
@@ -1797,4 +1797,7 @@ Possibili luoghi d'impiego:
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index f1132129b..87bb3a5ec 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -1764,4 +1764,7 @@ Este título vai ser indicado no check-in."</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index 233257bac..e910a738e 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -103,7 +103,7 @@ Uschia gidais Vus da franar chadainas d'infecziun."</string>
     <string name="meldungen_meldung_title">"Eventuala infecziun"</string>
 
     <!-- Text im Meldung Detail -->
-    <string name="meldungen_meldung_text">"Ina infecziun è pussaivla."</string>
+    <string name="meldungen_meldung_text">"Igl è pussaivel che Vus essas As infectada/infectà."</string>
 
     <!-- Titel ob Tracing aktiv -->
     <string name="tracing_active_title">"App activa"</string>
@@ -193,7 +193,7 @@ Uschia gidais Vus da franar chadainas d'infecziun."</string>
     <string name="inform_detail_box_subtitle">"Cun il code covid..."</string>
 
     <!-- Inform Detai Weisse Box Titel -->
-    <string name="inform_detail_box_title">"Franar chadainas d'infecziun"</string>
+    <string name="inform_detail_box_title">"Avertir en cas d'ina eventuala infecziun"</string>
 
     <!-- Inform Detail Weisse Box Button -->
     <string name="inform_detail_box_button">"Endatar il code covid"</string>
@@ -226,8 +226,8 @@ Uschia gidais Vus da franar chadainas d'infecziun."</string>
     <string name="symptom_detail_navigation_title">"Sintoms"</string>
     <string name="tracing_turned_off_title">"Tracing deactivà"</string>
     <string name="tracing_turned_off_text">"Activai il tracing per far funcziunar l'app."</string>
-    <string name="bluetooth_turned_off_title">"Bluetooth off"</string>
-    <string name="bluetooth_turned_off_text">"Activai bluetooth sin Voss apparat per far funcziunar il tracing."</string>
+    <string name="bluetooth_turned_off_title">"Deactivà Bluetooth"</string>
+    <string name="bluetooth_turned_off_text">"Activai Bluetooth sin Voss apparat per ch'il tracing anonim funcziunia."</string>
     <string name="bluetooth_turn_on_button_title">"Activar bluetooth"</string>
     <string name="bluetooth_permission_error_title">"Refusà l’activaziun bluetooth"</string>
     <string name="bluetooth_permission_error_text">"Permettai l’activaziun da bluetooth per far funcziunar il tracing."</string>
@@ -259,11 +259,11 @@ Uschia gidais Vus da franar chadainas d'infecziun."</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
     <string name="meldung_detail_positive_test_box_text">"Observai las instrucziuns davart l'isolaziun che Vus avais retschavì"</string>
-    <string name="tracing_ended_title">"Tracing terminà"</string>
-    <string name="tracing_ended_text">"I na vegnan arcunads pli nagins inscunters."</string>
+    <string name="tracing_ended_title">"Deactivà inscunters e registraziuns"</string>
+    <string name="tracing_ended_text">"I na vegnan arcunads nagins inscunters"</string>
     <string name="exposed_info_contact_hotline">"Contactai la"</string>
     <string name="meldung_homescreen_positive_info_line1">"Observai la"</string>
-    <string name="meldung_homescreen_positive_info_line2">"Instrucziuns davart l'autoisolaziun"</string>
+    <string name="meldung_homescreen_positive_info_line2">"Instrucziuns davart l'isolaziun"</string>
 
     <!-- Meldung Detail Exposed Neue Meldung -->
     <string name="meldung_detail_exposed_new_meldung">"Nov avis"</string>
@@ -273,7 +273,7 @@ Uschia gidais Vus da franar chadainas d'infecziun."</string>
     <string name="meldung_homescreen_positiv_title">"Testada/testà en moda positiva"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
-    <string name="meldung_detail_exposed_subtitle">"Ina infecziun è pussaivla."</string>
+    <string name="meldung_detail_exposed_subtitle">"Igl è pussaivel che Vus essas As infectada/infectà."</string>
 
     <!-- Meldung auf Homescreen: Positiv getestet -->
     <string name="meldung_homescreen_positiv_text">"Vus essas vegnida testada/vegnì testà en moda positiva sin il coronavirus."</string>
@@ -330,7 +330,7 @@ Infoline SwissCovid
     <string name="onboarding_prinzip_text1">"Cun l'app SwissCovid pon tuts gidar da franar la derasaziun dal coronavirus."</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text2">"L'app As infurmescha, sche Vus essas stada exponida/stà exponì al coronavirus."</string>
+    <string name="onboarding_prinzip_text2">"L'app As avertescha, sche Vus essas stada exponida/stà exponì potenzialmain al coronavirus."</string>
 
     <!-- Onboarding Privacy: Titel oben -->
     <string name="onboarding_privacy_heading">"Privacy by Design"</string>
@@ -345,7 +345,7 @@ Infoline SwissCovid
     <string name="onboarding_privacy_text2">"Las IDs casualas arcunadas restan sin Voss telefon mobil e vegnan stizzadas suenter 14 dis."</string>
 
     <!-- Onboarding Begegnungen: Titel oben -->
-    <string name="onboarding_begegnungen_heading">"Co funcziuna l'app?"</string>
+    <string name="onboarding_begegnungen_heading">"Inscunters"</string>
 
     <!-- Onboarding Begegnungen: Titel -->
     <string name="onboarding_begegnungen_title">"Identifitgar inscunters grazia a bluetooth"</string>
@@ -363,7 +363,7 @@ Infoline SwissCovid
     <string name="onboarding_meldung_title">"Avis en cas d'ina eventuala infecziun"</string>
 
     <!-- Onboarding Meldung: Text -->
-    <string name="onboarding_meldung_text1">"L'app As infurmescha, sche Vus essas stada exponida/stà exponì potenzialmain al coronavirus."</string>
+    <string name="onboarding_meldung_text1">"L'app As avertescha, sche Vus essas stada exponida/stà exponì potenzialmain al coronavirus."</string>
 
     <!-- Onboarding Meldung: Text -->
     <string name="onboarding_meldung_text2">"Cun il cumportament gist pudais Vus interrumper chadainas d'infecziun e proteger autras persunas."</string>
@@ -396,7 +396,7 @@ Infoline SwissCovid
     <string name="onboarding_push_title">"Permetter communicaziuns"</string>
 
     <!-- Onboarding Mitteilungen: Text -->
-    <string name="onboarding_push_text">"Per vegnir infurmada/infurmà da l'app stuais Vus permetter communicaziuns."</string>
+    <string name="onboarding_push_text">"Per che l'app possia avertir Vus, stuais Vus permetter messadis."</string>
 
     <!-- Onboarding Mitteilungen: Button -->
     <string name="onboarding_push_button">"Permetter communicaziuns"</string>
@@ -419,7 +419,7 @@ Resguardai las directivas davart l'isolaziun che Vus avais retschavì."</string>
     <string name="onboarding_go_title">"L'app è installada"</string>
 
     <!-- Text auf dem letzten Onboarding Screen -->
-    <string name="onboarding_go_text">"Grazia fitg che Vus gidais d'interrumper chadainas d'infecziun."</string>
+    <string name="onboarding_go_text">"Grazia fitg che Vus gidais a franar la derasaziun dal coronavirus."</string>
 
     <!-- Button-Label auf dem letzten Onboarding screen -->
     <string name="onboarding_go_button">"Cumenzar"</string>
@@ -446,7 +446,7 @@ Resguardai las directivas davart l'isolaziun che Vus avais retschavì."</string>
     <string name="meldung_detail_new_contact_title">"Nov suspect"</string>
 
     <!-- Meldungen Detail: Text -->
-    <string name="meldung_detail_new_contact_subtitle">"Ina infecziun è pussaivla."</string>
+    <string name="meldung_detail_new_contact_subtitle">"Igl è pussaivel che Vus essas As infectada/infectà."</string>
 
     <!-- Fehler mit Uhrzeit Titel -->
     <string name="time_inconsistency_title">"Sbagl ura"</string>
@@ -582,9 +582,9 @@ ll diever da la battaria s'augmenta qua tras mo levamain."</string>
     <string name="meldungen_nomeldungen_faq1_title">"Tge èn avis?"</string>
 
     <!-- Meldungen: Keine Meldungen FAQ Text -->
-    <string name="meldungen_nomeldungen_faq1_text">"L'app verifitgescha regularmain, sche autras utilisadras ed auters utilisaders che Vus avais scuntrà han annunzià in test positiv.
+    <string name="meldungen_nomeldungen_faq1_text">"L'app controllescha regularmain, sche autras utilisadras ed auters utilisaders che Vus avais inscuntrà u ch'èn stads registrads en il medem lieu han annunzià in test positiv.
 
-En cas d'ina eventuala infecziun vegnis Vus orientada/orientà cun ina communicaziun sin il visur bloccà."</string>
+En cas d'ina eventuala infecziun, As infurmescha in messadi sin il visur bloccà."</string>
 
     <!-- Meldungen Detail Weisse Box Texte Unten -->
     <string name="meldungen_detail_explanation_text3">"L'infoline SwissCovid As cusseglia davart la pussaivladad d'in test gratuit."</string>
@@ -623,9 +623,9 @@ Uschia vegn garantì ch'i vegnian annunziads sur l'app mo ils cas confermads."</
     <string name="inform_detail_faq2_title">"Tge vegn tramess?"</string>
 
     <!-- Inform Detail FAQ Text -->
-    <string name="inform_detail_faq2_text">"I vegnan tramessas mo las clavs privatas da Vossa app, naginas datas persunalas.
+    <string name="inform_detail_faq2_text">"I vegnan tramessas mo las clavs privatas da Vossa app e las IDs codadas da Vossas registraziuns, naginas datas persunalas.
 
-Uschia vegnan autras utilisadras ed auters utilisaders da l'app SwissCovid a savair ch'ina infecziun è pussaivla."</string>
+Uschia vegnan autras utilisadras ed auters utilisaders da l'app SwissCovid a savair ch’ellas u els èn eventualmain s’infectadas/s’infectads."</string>
 
     <!-- Telefonnummer der Infoline -->
     <string name="infoline_tel_number">"+41 58 387 77 78"</string>
@@ -634,10 +634,10 @@ Uschia vegnan autras utilisadras ed auters utilisaders da l'app SwissCovid a sav
     <string name="faq_button_url">"https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/faq-kontakte-downloads/haeufig-gestellte-fragen.html?faq-url=/de/categories/swisscovid-app"</string>
 
     <!-- Informieren Flow: Titel erster Screen -->
-    <string name="inform_code_intro_title">"Infurmaziun impurtanta"</string>
+    <string name="inform_code_intro_title">"Infurmaziun davart l'endataziun"</string>
 
     <!-- Informieren-Flow: Erster Screen Text -->
-    <string name="inform_code_intro_text">"Cumbain ch'i na vegnan tramessas naginas datas davart Vossa persuna, èsi pussaivel ch'insatgi sa regorda da l'inscunter a maun da la data."</string>
+    <string name="inform_code_intro_text">"Malgrà ch'i na vegnan tramessas naginas datas persunalas, èsi pussaivel ch'insatgi sa regorda – a maun da la data – da l'inscunter cun Vus."</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
     <string name="inform_code_intro_button">"D'accord"</string>
@@ -668,7 +668,7 @@ Pussaivels èn er ils suandants sintoms:
     <string name="meldungen_positive_tested_faq1_title">"Pertge è il tracing deactivà?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ Text -->
-    <string name="meldungen_positive_tested_faq1_text">"Suenter in test positiv vegn il tracing deactivà automaticamain en l'app. Il tracing po puspè vegnir activà, uschespert che Vus avais terminà l'isolaziun."</string>
+    <string name="meldungen_positive_tested_faq1_text">"Suenter in test positiv vegn il tracing en l'app deactivà automaticamain. Il tracing po puspè vegnir activà, uschespert che Vus avais terminà l'isolaziun."</string>
 
     <!-- Sprache Abkürzung (BITTE NICHT ÄNDERN) -->
     <string name="language_key">"rm"</string>
@@ -708,7 +708,7 @@ Pussaivels èn er ils suandants sintoms:
     <string name="onboarding_gaen_title">"Activar tracing"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, iOS -->
-    <string name="onboarding_gaen_text_ios">"Per pudair utilisar l'app, ston vegnir activadas communicaziuns da contact COVID-19."</string>
+    <string name="onboarding_gaen_text_ios">"Per pudair identifitgar inscunters èsi necessari d'activar la funcziun da tracing."</string>
 
     <!-- Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library -->
     <string name="onboarding_gaen_button_activate">"Activar"</string>
@@ -740,7 +740,7 @@ Pussaivels èn er ils suandants sintoms:
     <!-- Meldung im Löschen Dialog nach Isolation-Beenden, kommt auch auf Homescreen-Popup -->
     <string name="delete_infection_dialog">"Vulais Vus propi stizzar l’avis?"</string>
     <string name="android_onboarding_battery_permission_title">"Ignorar l'optimaziun da l'accu"</string>
-    <string name="android_onboarding_battery_permission_text">"Per pudair identifitgar ils inscunters d’in cuntin, sto l'optimaziun da l'accu esser deactivada per questa app."</string>
+    <string name="android_onboarding_battery_permission_text">"Per che l'app funcziunia sto l'optimaziun da l'accu esser deactivada."</string>
     <string name="android_onboarding_battery_permission_button">"Permetter"</string>
     <string name="android_onboarding_battery_permission_button_deactivated">"OK"</string>
     <string name="android_onboarding_battery_permission_info_1_title">"Mo per questa app"</string>
@@ -762,7 +762,7 @@ Pussaivels èn er ils suandants sintoms:
     <string name="tracing_permission_error_title_ios">"Deactivà communicaziuns da contact COVID-19 "</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
-    <string name="tracing_permission_error_text_ios">"Activai communicaziuns da contact COVID-19 per ch'il tracing funcziunia."</string>
+    <string name="tracing_permission_error_text_ios">"Activai {TRACING_SETTING_TEXT} per ch'il tracing anonim funcziunia."</string>
 
     <!-- Error-Meldung, wenn der Benutzer während des Informieren-Flows bei GApple das Key-Sharing nicht erlaubt. -->
     <string name="user_cancelled_key_sharing_error">"La communicaziun n'ha betg pudì vegnir tramessa. Permettai per plaschair da cundivider Vossas IDs casualas cun l'app SwissCovid."</string>
@@ -804,11 +804,10 @@ Sch'i na stat actualmain a disposiziun nagina actualisaziun sin Voss apparat, em
     <string name="tracing_active_tracking_always_info">"SwissCovid resta activ, er sche l'app vegn serrada."</string>
 
     <!-- title in splash screen of onboarding -->
-    <string name="oboarding_splashscreen_title">"SwissCovid 
-fraina 
-chadainas d'infecziun.
+    <string name="oboarding_splashscreen_title">"SwissCovid –
+infurmescha svelt en cas d'ina ristga d'infecziun.
 "</string>
-    <string name="inform_detail_faq3_text">"Cumbain ch'i na vegnan tramessas naginas datas davart Vossa persuna, èsi pussaivel ch'insatgi sa regorda da l'inscunter a maun da la data."</string>
+    <string name="inform_detail_faq3_text">"Malgrà ch'i na vegnan tramessas naginas datas persunalas, èsi pussaivel ch'insatgi sa regordav– a maun da la data – da l'inscunter cun Vus."</string>
     <string name="inform_detail_faq3_title">"Rest jau anonima/anonim?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
@@ -818,7 +817,7 @@ chadainas d'infecziun.
     <string name="tracing_setting_text_android">"Communicaziuns COVID-19"</string>
 
     <!-- Text auf der Onboarding Page für die Permission der Exposure-Library, Android -->
-    <string name="onboarding_gaen_text_android">"Per pudair utilisar l'app, ston vegnir activadas communicaziuns COVID-19"</string>
+    <string name="onboarding_gaen_text_android">"Per pudair identifitgar inscunters sto vegnir activada la funcziun da tracing."</string>
 
     <!-- Onboarding Disclaimer Screen: AppName Title -->
     <string name="onboarding_disclaimer_heading">"SwissCovid"</string>
@@ -912,7 +911,7 @@ Schwarzenburgstrasse 157
     <string name="travel_title">"Viadis"</string>
 
     <!-- Info text that is displayed  on the Home Travel Card. -->
-    <string name="travel_home_description">"SwissCovid funcziuna en ils suandants pajais:"</string>
+    <string name="travel_home_description">"Inscunters SwissCovid funcziuna en ils suandants pajais:"</string>
 
     <!-- First title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_1">"Tge vul quai dir?"</string>
@@ -1223,9 +1222,8 @@ Per che er las viagiaturas ed ils viagiaturs da l'exteriur possian vegnir infurm
     <string name="delete_infection_dialog_finish_button">"Terminar"</string>
 
     <!-- Text der nach der Eingabe des Covidcodes angezeigt wird. -->
-    <string name="tracing_ended_info">"I na vegnan arcunads pli nagins inscunters.
-
-Il tracing po puspè vegnir activà suenter l'isolaziun."</string>
+    <string name="tracing_ended_info">"I na vegnan arcunads pli nagins novs inscunters ed i n'è betg pli pussaivel da far novas registraziuns.
+Tuttas duas funcziuns pon vegnir reactivadas uschespert che Vus avais terminà l'isolaziun."</string>
     <string name="testlocation_url_canton_aargau">"https://www.ag.ch/de/themen_1/coronavirus_2/coronavirus.jsp"</string>
     <string name="testlocation_url_canton_appenzell_ausserrhoden">"https://www.ar.ch/verwaltung/departement-gesundheit-und-soziales/amt-fuer-gesundheit/informationsseite-coronavirus/"</string>
     <string name="testlocation_url_canton_appenzell_innerrhoden">"https://www.ai.ch/themen/gesundheit-alter-und-soziales/gesundheitsfoerderung-und-praevention/uebertragbare-krankheiten/coronavirus"</string>
@@ -1257,7 +1255,7 @@ Il tracing po puspè vegnir activà suenter l'isolaziun."</string>
     <string name="testlocation_url_country_liechtenstein">"https://www.llv.li/inhalt/118724/amtsstellen/coronavirus"</string>
 
     <!-- text for info box pop up for the hearing impaired -->
-    <string name="hearing_impaired_info">"Essas Vus senza udida u avais Vus in impediment d'udida e na pudais betg telefonar a la Infoline coronavirus?
+    <string name="hearing_impaired_info">"Essas Vus senza udida u avais Vus in impediment d'udida e na pudais betg telefonar?
 
 Alura tramettai in e-mail a covid-support@medgate.ch"</string>
 
@@ -1312,8 +1310,8 @@ Il temp è in factur decisiv en il cumbat cunter il coronavirus: pli curt ch'il
     <string name="stats_cases_current_description">"La grafica mussa las infecziuns novas annunziadas dals ultims 28 dis. Quai dat ina survista dal svilup actual."</string>
 
     <!-- Inform Detail: Infobox Text -->
-    <string name="inform_detail_infobox1_text">"Vus avais in test positiv (test da PCR u test svelt d'antigens) e n'avais suenter 4 uras anc betg retschavì in code covid?
-Alura contactai la Infoline coronavirus:"</string>
+    <string name="inform_detail_infobox1_text">"Avais Vus in test positiv (test da PCR u test svelt d'antigens) e n'avais suenter 4 uras anc betg retschavì in code covid?
+Alura telefonai qua:"</string>
 
     <!-- Inform Detail: Infobox Title -->
     <string name="inform_detail_infobox1_title">"Anc nagin code covid?"</string>
@@ -1337,7 +1335,7 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="travel_screen_compatible_countries">"Pajais cumpatibels:"</string>
 
     <!-- Informieren Flow: Erster Screen Reise-Infotext -->
-    <string name="inform_code_travel_text">"Per che er las viagiaturas ed ils viagiaturs da l'exteriur possian vegnir infurmads, vegnan cundivididas las clavs privatas cun las apps da corona dals pajais cumpatibels."</string>
+    <string name="inform_code_travel_text">"Per che er las viagiaturas ed ils viagiaturs da l'exteriur possian vegnir infurmads suenter in inscunter, vegnan cundivididas las clavs privatas cun las apps da corona dals pajais cumpatibels."</string>
 
     <!-- Überschrift der "eingegebene Covidcodes" Statistikbox -->
     <string name="stats_covidcodes_total_header">"total"</string>
@@ -1352,13 +1350,13 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="meldungen_positive_tested_faq2_title">"Tgi vegn infurmà?"</string>
 
     <!-- Meldungen: Positiv getestet FAQ 2 Text (Benachrichtigung) -->
-    <string name="meldungen_positive_tested_faq2_text">"I vegnan infurmads tut ils contacts durant il spazi da temp da Vossa fasa d'infecziun dals {ONSET_DATE} fin a l'endataziun dal code covid, sch'i era pussaivel da s'infectar sin basa da la distanza e da la durada."</string>
+    <string name="meldungen_positive_tested_faq2_text">"I vegnan infurmads tut ils contacts durant il spazi da temp da Vossa fasa contagiusa dals {ONSET_DATE} fin a l'endataziun dal code covid, sch'igl existiva ina ristga d'infecziun – sin basa da la distanza e da la durada u sche Vus essas stada registrada/stà registrà en il medem lieu."</string>
 
     <!-- Informieren: Danke Text Onset Date -->
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – oz"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"Uschia gidais Vus a franar las chadainas da transmissiun."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"Uschia gidais Vus d'avertir auters d'ina eventuala infecziun."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Las clavs privatas da Vossa app èn vegnidas tramessas per il suandant spazi da temp:"</string>
@@ -1397,357 +1395,357 @@ Alura contactai la Infoline coronavirus:"</string>
     <string name="meldungen_detail_free_test_tomorrow">"En 1 di"</string>
 
     <!-- Check-Ins: Titel vom Reminder Push -->
-    <string name="checkout_reminder_title">"Check-out reminder"</string>
+    <string name="checkout_reminder_title">"Pro memoria sortida"</string>
 
     <!-- Check-Ins: Check-out Reminder Push Text -->
-    <string name="checkout_reminder_text">"Do you want to check out?"</string>
+    <string name="checkout_reminder_text">"Vulais Vus sortir?"</string>
 
     <!-- Check-Ins: Auto-Checkout Push Titel -->
-    <string name="auto_checkout_title">"Automatic check-out"</string>
+    <string name="auto_checkout_title">"Sortir automaticamain"</string>
 
     <!-- Check-Ins: Auto-checkout Push Text -->
-    <string name="auto_checkout_body">"You were checked out automatically."</string>
+    <string name="auto_checkout_body">"Vus essas sortida/sortì automaticamain."</string>
 
     <!-- Check-Ins: Qr-Scanner Text -->
-    <string name="qrscanner_scan_qr_text">"Scan QR code and check in"</string>
+    <string name="qrscanner_scan_qr_text">"Scannar il code QR e sa registrar"</string>
 
     <!-- Check-Ins: Fehler beim QR-Code scannen -->
-    <string name="qrscanner_error">"No valid QR code!"</string>
+    <string name="qrscanner_error">"Il code QR n'è betg valaivel!"</string>
 
     <!-- Check-Ins: Anpassung Check-In Datumwahl von -->
-    <string name="datepicker_from">"From"</string>
+    <string name="datepicker_from">"Da"</string>
 
     <!-- Check-Ins: Datumsauswahl bis -->
-    <string name="datepicker_to">"To"</string>
+    <string name="datepicker_to">"Fin"</string>
 
     <!-- Check-Ins: Notiz hinzufügen zu Check-In -->
-    <string name="edit_mode_addcomment">"Add note"</string>
+    <string name="edit_mode_addcomment">"Agiuntar ina notizia"</string>
 
     <!-- Check-Ins: Notiz zu Check-In Placeholder Text -->
-    <string name="edit_mode_comment_placeholder">"e.g. who were you with?"</string>
+    <string name="edit_mode_comment_placeholder">"p.ex. Cun tgi essas Vus stada/stà là?"</string>
 
     <!-- Fertig Button Text -->
-    <string name="done_button">"Done"</string>
+    <string name="done_button">"Finì"</string>
 
     <!-- Check-Ins: Titel für Erinnerung -->
-    <string name="checkin_set_reminder">"Check-out reminder"</string>
+    <string name="checkin_set_reminder">"Pro memoria sortida"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Off"</string>
+    <string name="reminder_option_off">"Deactivà"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
-    <string name="authenticate_for_diary">"Authentication needed to access the diary"</string>
+    <string name="authenticate_for_diary">"As autentifitgai per avair access al diari"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
     <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"{MINUTES}'"</string>
+    <string name="reminder_option_minutes">"{MINUTES} min"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
-    <string name="qr_scanner_no_camera_permission">"The app needs to access the camera to be able to scan the QR code."</string>
+    <string name="qr_scanner_no_camera_permission">"Per pudair scannar il code QR dovra l'app access a la camera."</string>
 
     <!-- Check-Ins: Tagebuch Titel -->
-    <string name="diary_title">"My check-ins"</string>
+    <string name="diary_title">"Mias registraziuns"</string>
 
     <!-- Check-Ins: Button Titel zum Einchecken -->
-    <string name="checkin_button_title">"Check-in"</string>
+    <string name="checkin_button_title">"Registraziun"</string>
 
     <!-- Check-Ins: iOS Kamera Erlaubnis Text -->
-    <string name="NSCameraUsageDescription">"The camera is needed to scan the QR code."</string>
+    <string name="NSCameraUsageDescription">"La camera è necessaria per scannar il code QR."</string>
 
     <!-- Check-Ins: FaceID Text um Tagebuch anzuschauen -->
-    <string name="NSFaceIDUsageDescription">"Allow Face ID to securely access your diary."</string>
+    <string name="NSFaceIDUsageDescription">"Permettai Face-ID per pudair acceder a moda segira a Voss diari."</string>
 
     <!-- Check-Ins: Text der angezeigt wieso FaceId gebraucht wird -->
-    <string name="face_id_reason_text">"Authentication needed to access the diary"</string>
+    <string name="face_id_reason_text">"As autentifitgai per avair access al diari"</string>
 
     <!-- Check-Ins: Check-Out Button Title -->
-    <string name="checkout_button_title">"Check-out"</string>
+    <string name="checkout_button_title">"Sortida"</string>
 
     <!-- Check-Ins: Titel Modul auf Homescreen -->
-    <string name="module_checkins_title">"Check-in"</string>
+    <string name="module_checkins_title">"Registraziun"</string>
 
     <!-- Check-Ins: Titel vom Check-In Screen -->
-    <string name="checkin_title">"Check-in"</string>
+    <string name="checkin_title">"Registraziun"</string>
 
     <!-- Check-Ins: QR-Code erstellen Titel -->
-    <string name="checkins_create_qr_code">"Generate QR code"</string>
+    <string name="checkins_create_qr_code">"Crear in code QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Porscher registraziuns?"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
-    <string name="check_in_now_button_title">"Check in now"</string>
+    <string name="check_in_now_button_title">"Sa registrar ussa"</string>
 
     <!-- Check-Ins: Reminder Fehlermeldung Titel -->
-    <string name="checkin_reminder_settings_alert_title">"The reminder could not be set"</string>
+    <string name="checkin_reminder_settings_alert_title">"I n'è betg stà pussaivel d'activar il pro memoria"</string>
 
     <!-- Check-Ins: Erinnerungen Fehlermeldung Text -->
-    <string name="checkin_reminder_settings_alert_message">"To receive check-out reminders, you need to allow \\"notifications\\" in the app settings."</string>
+    <string name="checkin_reminder_settings_alert_message">"Per survegnir in pro memoria da sortir stuais Vus permetter \\"messadis\\" en las configuraziuns da l'app."</string>
 
     <!-- Check-Ins: Reminder Popup Anpassen -->
-    <string name="checkin_reminder_option_open_settings">"Customise"</string>
+    <string name="checkin_reminder_option_open_settings">"Adattar"</string>
 
     <!-- Check-Ins: Bearbeiten von Check-Ins Titel -->
-    <string name="edit_controller_title">"Edit"</string>
+    <string name="edit_controller_title">"Modifitgar"</string>
 
     <!-- Check-Ins: Tagebuch leeres Tagbuch Titel -->
-    <string name="empty_diary_title">"No entries available yet"</string>
+    <string name="empty_diary_title">"Anc naginas endataziuns avant maun"</string>
 
     <!-- Check-Ins: Tagebuch leer, Text -->
-    <string name="empty_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="empty_diary_text">"Sche Vus scannais in code QR da SwissCovid per As registrar al lieu, vegn arcunada qua automaticamain in'endataziun."</string>
 
     <!-- Check-Ins: Kamera Erlaubnis Text -->
-    <string name="camera_permission_dialog_text">"SwissCovid needs to access your device's camera. The camera is only used to scan QR codes."</string>
+    <string name="camera_permission_dialog_text">"SwissCovid dovra l'access a la camera da Voss apparat. La camera vegn mo duvrada per scannar ils codes QR.
+"</string>
 
     <!-- Check-Ins: Button Titel, welcher in einem Popup erscheint um die Camera Permission Abfrage zu erklären -->
-    <string name="camera_permission_dialog_action">"Allow access to camera"</string>
+    <string name="camera_permission_dialog_action">"Permetter l'access a la camera"</string>
 
     <!-- Check-Ins: Veranstaltung Titel Placeholder -->
-    <string name="web_generator_title_placeholder">"e.g. room or event name"</string>
+    <string name="web_generator_title_placeholder">"p.ex. stanza u num da l'occurrenza"</string>
 
     <!-- Check-Ins: Veranstaltungen Detail PDF Button -->
-    <string name="show_pdf_button">"Print PDF"</string>
+    <string name="show_pdf_button">"Stampar il PDF"</string>
     <string name="bottom_nav_tab_info">"Info"</string>
-    <string name="error_network_title">"Network error"</string>
-    <string name="error_network_text">"Check your internet connection."</string>
-    <string name="error_action_retry">"Try again"</string>
-    <string name="error_notification_deactivated_title">"Notifications deactivated"</string>
-    <string name="error_notification_deactivated_text">"Modify your settings to be informed straight away if you receive a notification."</string>
-    <string name="error_action_change_settings">"Modify settings"</string>
-    <string name="error_camera_permission_title">"No access to camera"</string>
-    <string name="error_camera_permission_text">"The app needs to access the camera to be able to scan the QR code."</string>
-    <string name="error_title">"Error"</string>
-    <string name="qr_scanner_error_code_not_yet_valid">"QR code not yet valid"</string>
-    <string name="qr_scanner_error_code_not_valid_anymore">"QR code no longer valid"</string>
-    <string name="error_already_checked_in">"You are already checked in."</string>
-    <string name="error_update_text">"This QR code is not compatible with the installed version of the app. Please update the app to continue."</string>
-    <string name="error_update_title">"Update required"</string>
-    <string name="error_action_update">"Update now"</string>
-    <string name="ongoing_notification_checkout_quick_action">"Check out"</string>
+    <string name="error_network_title">"Sbagl da la rait"</string>
+    <string name="error_network_text">"Controllai Vossa colliaziun d'internet."</string>
+    <string name="error_action_retry">"Empruvar danovamain"</string>
+    <string name="error_notification_deactivated_title">"Deactivà messadis"</string>
+    <string name="error_notification_deactivated_text">"Midai las configuraziuns per vegnir infurmada/infurmà directamain en cas d'in avis."</string>
+    <string name="error_action_change_settings">"Midar las configuraziuns"</string>
+    <string name="error_camera_permission_title">"Nagin access a la camera"</string>
+    <string name="error_camera_permission_text">"L'app dovra access a la camera per pudair scannar il code QR."</string>
+    <string name="error_title">"Sbagl"</string>
+    <string name="qr_scanner_error_code_not_yet_valid">"Il code QR n'è anc betg valaivel"</string>
+    <string name="qr_scanner_error_code_not_valid_anymore">"Il code QR n'è betg pli valaivel"</string>
+    <string name="error_already_checked_in">"Vus essas gia As registrada/registrà."</string>
+    <string name="error_update_text">"Quest code QR n'è betg cumpatibel cun la versiun da l'app installada. Per plaschair actualisar l'app per cuntinuar."</string>
+    <string name="error_update_title">"In update è necessari"</string>
+    <string name="error_action_update">"Actualisar ussa"</string>
+    <string name="ongoing_notification_checkout_quick_action">"Sortir "</string>
     <string name="reminder_notification_snooze_action">"Snooze"</string>
-    <string name="android_ongoing_checkin_notification_channel_name">"Permanent check-in notification"</string>
-    <string name="ongoing_notification_title">"You have been checked in since {TIME}."</string>
+    <string name="android_ongoing_checkin_notification_channel_name">"Avis permanent da sa registrar"</string>
+    <string name="ongoing_notification_title">"Vus essas As registrada/registrà dapi las {TIME}."</string>
 
     <!-- Check-Ins: Sichern Button bei Check-out -->
-    <string name="checkout_save_button_title">"Save"</string>
+    <string name="checkout_save_button_title">"Arcunar"</string>
 
     <!-- Check-Ins: QR-Code scannen Button -->
-    <string name="scan_qr_code_button_title">"Scan QR code"</string>
+    <string name="scan_qr_code_button_title">"Scannar il code QR"</string>
 
     <!-- Titel der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_title">"Check-in deactivated"</string>
+    <string name="checkin_ended_title">"Deactivà la registraziun"</string>
 
     <!-- Text der Infobox auf dem Homescreen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text">"Check-in is not possible at the moment"</string>
+    <string name="checkin_ended_text">"Actualmain n'èsi betg pussaivel da sa registrar"</string>
 
     <!-- Text im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_text">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_detail_checked_out_text">"Scannai in code QR da SwissCovid per As registrar al lieu."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"If you scan a SwissCovid QR code to check in on site, an entry will automatically be created here."</string>
+    <string name="checkin_detail_diary_text">"Sche Vus scannais in code QR da SwissCovid per As registrar al lieu, vegn arcunada qua automaticamain in'endataziun."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
-    <string name="checkin_checked_in">"You're checked in"</string>
-    <string name="checkout_from_to_date">"{DATE1} to {DATE2}"</string>
-    <string name="inform_detail_covidcode_info_button">"More about the Covidcode"</string>
+    <string name="checkin_checked_in">"Vus essas As registrada/registrà"</string>
+    <string name="checkout_from_to_date">"{DATE1} fin {DATE2}"</string>
+    <string name="inform_detail_covidcode_info_button">"Dapli davart il code covid"</string>
 
     <!-- Check-Ins: Button Entfernen um Check-In zu löschen -->
-    <string name="remove_from_diary_button">"Remove entry"</string>
+    <string name="remove_from_diary_button">"Stizzar l'endataziun"</string>
 
     <!-- Check-Ins: QR-Code löschen Titel Button -->
-    <string name="delete_button_title">"Delete"</string>
+    <string name="delete_button_title">"Stizzar"</string>
 
     <!-- Check-Ins: Teile QR-Code Button Titel -->
-    <string name="share_button_title">"Share"</string>
+    <string name="share_button_title">"Cundivider"</string>
 
     <!-- Check-Ins: Drucken Button auf PDF-Detailseite -->
-    <string name="print_button_title">"Print"</string>
+    <string name="print_button_title">"Stampar"</string>
 
     <!-- Check-Ins: Beschreibung Modul auf Homescreen -->
-    <string name="module_checkins_description">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="module_checkins_description">"Scannai in code QR da SwissCovid per As registrar al lieu."</string>
 
     <!-- Titel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_title">"Share check-in entries"</string>
+    <string name="inform_share_checkins_title">"Cundivider las endataziuns da registraziun"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"Sche Vus cundividais Vossas endataziuns da registraziun, po l'app infurmar persunas ch'èn stadas registradas il medem mument en il medem lieu."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
-    <string name="inform_dont_send_button_title">"Don't send"</string>
-    <string name="inform_dont_share_button_title">"Don't share"</string>
-    <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_share_checkins_select_all">"Selecziunar tuttas"</string>
+    <string name="inform_dont_send_button_title">"Betg trametter"</string>
+    <string name="inform_dont_share_button_title">"Betg cundivider"</string>
+    <string name="inform_really_not_share_title">"Propi betg cundivider?"</string>
+    <string name="inform_really_not_share_subtitle">"Cun cundivider Vossas clavs privatas gidais Vus SwissCovid ad infurmar autras persunas potenzialmain infectadas ed ad impedir in'ulteriura derasaziun dal virus. Sche Vus na cundividais betg Vossas clavs privatas, na vegnan avertidas naginas persunas potenzialmain infectadas."</string>
 
     <!-- Remove from Diary Warning view title -->
-    <string name="remove_diary_warning_title">"Remove entry"</string>
+    <string name="remove_diary_warning_title">"Stizzar l'endataziun"</string>
 
     <!-- Remove from diary warning view explanation text -->
-    <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
+    <string name="remove_diary_warning_text">"Vossa endataziun vegn stizzada definitivamain da la glista."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Stizzar dal tuttafatg"</string>
 
     <!-- Hide from diary warning title -->
-    <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
+    <string name="remove_diary_warning_hide_title">"Mo zuppentar e vegnir infurmada/infurmà vinavant?"</string>
 
     <!-- Titel auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_title">"Tested positive?"</string>
+    <string name="home_covidcode_card_title">"Survegnì in resultat positiv?"</string>
 
     <!-- Text auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_text">"Reactivate encounters and check-in"</string>
+    <string name="home_end_isolation_card_text">"Puspè activar inscunters e registraziuns."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES} min"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
-    <string name="checkin_overview_isolation_text">"You can no longer check in if you have tested positive."</string>
+    <string name="checkin_overview_isolation_text">"Vus na pudais betg pli As registrar, sche Vus avais survegnì in resultat positiv."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
+    <string name="events_card_subtitle">"Creai in code QR, cun il qual persunas pon sa registrar al lieu."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Vulais Vus propi stizzar il code QR?"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
-    <string name="self_checkin_button_title">"Self check-in"</string>
+    <string name="self_checkin_button_title">"Autoregistraziun"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer nicht eingecheckt ist. -->
-    <string name="checkin_overview_checkins_explanation">"Scan a SwissCovid QR code to check in on site."</string>
+    <string name="checkin_overview_checkins_explanation">"Scannai in code QR da SwissCovid per As registrar al lieu."</string>
 
     <!-- Popup Titel wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_title">"Saving not possible"</string>
+    <string name="checkout_overlapping_alert_title">"Betg pussaivel d'arcunar"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns sich die neu gewählte Zeit mit vorhandenen aus dem Tagebuch überschneidet -->
-    <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
+    <string name="checkout_overlapping_alert_description">"Ils temps che Vus avais selecziunà coincidan cun autras registraziuns da Voss diari. Per plaschair controllar anc ina giada Vossas indicaziuns."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"Las endataziuns da las registraziuns che Vus avais selecziunà èn vegnidas tramessas. Tut las persunas ch'èn stadas registradas il medem mument en il medem lieu vegnan infurmadas."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
-    <string name="pdf_headline">"SwissCovid check-in"</string>
+    <string name="pdf_headline">"Registraziun SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Slogan -->
-    <string name="pdf_slogan">"Check in without leaving any data"</string>
+    <string name="pdf_slogan">"Sa registrar senza inditgar datas"</string>
 
     <!-- SwissCovid QR Code PDF: Erklärungstext unter dem Slogan -->
-    <string name="pdf_explanation">"The SwissCovid app lets you simply check in with us without leaving behind your data. If there is a risk of infection, you will be rapidly notified in the app."</string>
+    <string name="pdf_explanation">"Cun l'app SwissCovid pudais Vus As registrar tar nus a moda simpla e senza inditgar Vossas datas. En cas d'ina situaziun da ristga As infurmescha l'app sveltamain."</string>
 
     <!-- SwissCovid QR Code PDF: App Bezeichnung neben dem App Icon -->
-    <string name="pdf_swisscovid_app">"SwissCovid app"</string>
+    <string name="pdf_swisscovid_app">"App SwissCovid"</string>
 
     <!-- SwissCovid QR Code PDF: Download Hinweis neben dem App Icon -->
-    <string name="pdf_download_app">"Download now"</string>
+    <string name="pdf_download_app">"Telechargiar ussa"</string>
 
     <!-- Title im Check-Ins-Screen im nicht eingecheckten Zustand -->
-    <string name="checkin_detail_checked_out_title">"Check in without leaving 
-data"</string>
+    <string name="checkin_detail_checked_out_title">"Sa registrar senza inditgar datas"</string>
 
     <!-- Text auf der "CovidCode eingeben"-Card auf dem Home Screen -->
-    <string name="home_covidcode_card_text">"Enter your Covidcode here to alert others."</string>
+    <string name="home_covidcode_card_text">"Endatai qua Voss code covid per avertir autras persunas."</string>
 
     <!-- Titel auf der "Isolation beenden"-Card auf dem Home Screen -->
-    <string name="home_end_isolation_card_title">"Isolation ended?"</string>
+    <string name="home_end_isolation_card_title">"Terminar l'isolaziun?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
-    <string name="checkin_footer_title2">"No central data storage"</string>
-    <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
-    <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
-    <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
-    <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
-    <string name="events_footer_title1">"Where can check-ins be used?"</string>
-    <string name="events_footer_title2">"Why a check-in function?"</string>
-    <string name="events_footer_subtitle1">"SwissCovid check-ins can be used where people gather but where there is no obligation to record contact details. 
-
-Possible locations:
-– Private events
-– Club meetings or events
-– Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_card_title">"Vulais Vus porscher registraziuns?"</string>
+    <string name="checkin_footer_title1">"Pertge dovri ina funcziun da sa registrar?"</string>
+    <string name="checkin_footer_subtitle1">"La funcziun da sa registrar senza endatar las datas da contact cumplettescha l'app SwissCovid. Cun agid da questa funcziun na pudais Vus avertir betg mo stretgs contacts en cas d'in resultat positiv, mabain er las persunas ch'èn stadas registradas il medem mument en il medem lieu."</string>
+    <string name="checkin_footer_title2">"Las datas na vegnan betg arcunadas en moda centrala."</string>
+    <string name="checkin_footer_subtitle2">"Per las registraziuns da SwissCovid na stuais Vus inditgar naginas datas persunalas sco il num, l'adressa u il numer da telefon ed i na vegnan arcunadas naginas datas da GPS davart la posiziun. La glista da las registraziuns vegn arcunada localmain sin Voss smartphone. Suenter 14 dis vegnan las datas localas puspè stizzadas."</string>
+    <string name="events_empty_state_title">"Creai in code QR"</string>
+    <string name="events_empty_state_subtitle">"Cun in code QR da SwissCovid pon persunas sa registrar al lieu senza inditgar lur datas."</string>
+    <string name="events_info_box_title">"Na remplazza betg la registraziun obligatorica da datas da contact"</string>
+    <string name="events_info_box_text">"Las registraziuns da SwissCovid na remplazzan betg l'obligaziun da registrar las datas da contact prescritta en l'Ordinaziun davart COVID-19 situaziun speziala."</string>
+    <string name="events_footer_title1">"En tge situaziuns pon ins duvrar la funcziun da sa registrar?"</string>
+    <string name="events_footer_title2">"Pertge dovri ina funcziun da sa registrar?"</string>
+    <string name="events_footer_subtitle1">"Registraziuns da SwissCovid pon vegnir en funcziun là, nua che persunas s'inscuntran, ma i na dat nagina obligaziun da registrar las datas da contact.
+
+Quai pon esser p.ex.:
+- occurrenzas privatas
+- occurrenzas d'uniuns
+- reuniuns en l'ambient professiunal sco p.ex. stanzas da seduta, biros, cantinas, etc."</string>
+    <string name="events_footer_subtitle2">"La funcziun da sa registrar senza endatar las datas da contact cumplettescha l'app SwissCovid. Cun agid da questa funcziun na pudais Vus avertir betg mo stretgs contacts en cas d'in resultat positiv, mabain er las persunas ch'èn stadas registradas il medem mument en il medem lieu."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
-    <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
+    <string name="meldung_detail_exposed_list_card_subtitle">"Situaziun da ristga"</string>
 
     <!-- Title vom Encounters Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_encounters">"Encounters"</string>
+    <string name="meldung_detail_exposed_list_card_title_encounters">"Inscunters"</string>
 
     <!-- Title vom CheckIn Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_title_checkin">"Check-in"</string>
+    <string name="meldung_detail_exposed_list_card_title_checkin">"Registraziun"</string>
 
     <!-- Was soll ich tun? Button im Meldungen Card in der Liste aller Meldungen -->
-    <string name="meldung_detail_exposed_list_card_whattodo_button">"What should I do?"</string>
+    <string name="meldung_detail_exposed_list_card_whattodo_button">"Tge duai jau far?"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: An einem Check-In einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_checkin_exposed">"Positive check-in"</string>
+    <string name="debug_state_setting_option_checkin_exposed">"Registraziun positiva"</string>
 
     <!-- Debug: Einstellungs-Option zum überschreiben des App-Zustands: Auf verschiedener Weise einem positiven Kontakt ausgesetzt -->
-    <string name="debug_state_setting_option_mutiple_exposed">"Positive check-ins/contacts"</string>
+    <string name="debug_state_setting_option_mutiple_exposed">"Registraziuns positivas/contacts positivs"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_user_qr_code">"User QR code"</string>
+    <string name="venue_type_user_qr_code">"Code QR utilisadra/utilisader"</string>
 
     <!-- Anzeigename für User QR Codes -->
-    <string name="venue_type_contact_tracing_qr_code">"Contact tracing QR code"</string>
+    <string name="venue_type_contact_tracing_qr_code">"Code QR contact tracing"</string>
 
     <!-- Text der Module im Check-ins Screen, wenn aufgrund von Isolation keine Checkins mehr möglich sind -->
-    <string name="checkin_ended_text_detailed">"The check-in function is automatically deactivated after a positive test result. It can be reactivated after the end of isolation."</string>
+    <string name="checkin_ended_text_detailed">"Suenter in test positiv vegn la funcziun da sa registrar deactivada automaticamain. Ella po puspè vegnir activada, uschespert che Vus avais terminà l'isolaziun."</string>
 
     <!-- Check-Ins: QR-Code erstellen subtitel -->
-    <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
-    <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
-    <string name="checkin_report_title2">"Look out for symptoms"</string>
-    <string name="checkin_report_title3">"Get tested"</string>
-    <string name="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."</string>
-    <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="checkins_create_qr_code_subtitle">"Tscherni in titel che descriva pli detagliadamain il lieu u Vossa occurrenza. Il titel vegn mussà tar la registraziun."</string>
+    <string name="checkin_report_heading">"Tge pudais Vus far?"</string>
+    <string name="checkin_report_title1">"Proteger contacts"</string>
+    <string name="checkin_report_title2">"Far stim da sintoms"</string>
+    <string name="checkin_report_title3">"Laschar far in test"</string>
+    <string name="checkin_report_subtitle1">"Vus pudais gia esser infectusa u infectus senza badar quai. Observai las mesiras d'igiena e da protecziun vertentas e protegi Vossa famiglia, Vossas amias e Voss amis sco er Voss conturn."</string>
+    <string name="checkin_report_subtitle2">"Survegliai Voss stadi da sanadad."</string>
+    <string name="checkin_report_subtitle3">"Faschai immediatamain in test, sche Vus avais sintoms. In test dal coronavirus è raschunaivel e vegn cusseglià, er sche Vus n'avais nagins sintoms."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
-    <string name="meldung_detail_checkin_title">"Check-in"</string>
-    <string name="not_thank_you_screen_title">"No data sent"</string>
-    <string name="not_thank_you_screen_text1">"No private key was sent."</string>
-    <string name="not_thank_you_screen_back_button">"Back"</string>
-    <string name="not_thank_you_screen_dont_send_button">"Don't send data"</string>
-    <string name="not_thank_you_screen_text2">"No check-in entries were sent."</string>
+    <string name="meldung_detail_checkin_title">"Registraziun"</string>
+    <string name="not_thank_you_screen_title">"I n’èn vegnidas tramessas naginas datas"</string>
+    <string name="not_thank_you_screen_text1">"I n’èn vegnidas tramessas naginas clavs privatas"</string>
+    <string name="not_thank_you_screen_back_button">"Enavos"</string>
+    <string name="not_thank_you_screen_dont_send_button">"Trametter naginas datas"</string>
+    <string name="not_thank_you_screen_text2">"I n’èn vegnidas tramessas naginas endataziuns da registraziuns"</string>
 
     <!-- Button text, um ausgewählte Checkins zu senden -->
-    <string name="inform_share_checkins_send_button_title">"Share selection"</string>
-    <string name="inform_share_checkins_not_send_button">"Don't share anything"</string>
-    <string name="onboarding_checkin_title">"Check in without leaving data"</string>
-    <string name="onboarding_checkin_heading">"Check-ins"</string>
-    <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
-    <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
-    <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
+    <string name="inform_share_checkins_send_button_title">"Cundivider la selecziun"</string>
+    <string name="inform_share_checkins_not_send_button">"Cundivider nagut"</string>
+    <string name="onboarding_checkin_title">"Sa registrar senza inditgar datas"</string>
+    <string name="onboarding_checkin_heading">"Registraziuns"</string>
+    <string name="onboarding_checkin_text1">"Cun las registraziuns da SwissCovid pudais Vus As registrar cun l'app en in lieu u a chaschun d'in inscunter."</string>
+    <string name="onboarding_checkin_text2">"Vossa preschientscha vegn arcunada mo en l'app. Vus na stuais inditgar naginas datas persunalas en l'app."</string>
+    <string name="checkin_updateboarding_text">"Cun las registraziuns da SwissCovid pudais Vus As registrar cun l'app en in lieu u a chaschun d'in inscunter. Vossa preschientscha vegn arcunada mo en l'app. Vus na stuais inditgar naginas datas persunalas en l'app. Las cundiziuns d'utilisaziun e la decleraziun davart la protecziun da datas èn vegnidas actualisadas en quest connex."</string>
+    <string name="onboarding_gaen_button_dont_activate">"Sursiglir"</string>
 
     <!-- Hide from diary warning text -->
-    <string name="remove_diary_warning_hide_text">"The entry is stored in encrypted form in the background of the app for 14 days. This means that you can still be notified if there is a possibility of infection."</string>
+    <string name="remove_diary_warning_hide_text">"L'endataziun vegn arcunada durant 14 dis a moda codada davosvart en l'app. Uschia èsi tuttina pussaivel d'As infurmar en cas d'ina eventuala infecziun."</string>
 
     <!-- CheckIn ausblenden -->
-    <string name="remove_diary_warning_hide_button">"Hide only"</string>
-    <string name="checkin_set_reminder_explanation">"The app can remind you to check out at the right time."</string>
+    <string name="remove_diary_warning_hide_button">"Mo zuppentar"</string>
+    <string name="checkin_set_reminder_explanation">"L'app As po regurdar il dretg mument da puspè sortir."</string>
 
     <!-- Remove from diary warning title -->
-    <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
+    <string name="remove_diary_remove_now_title">"U stizzar dal tuttafatg?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
-    <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
+    <string name="remove_diary_remove_now_text">"L'endataziun vegn stizzada dal tuttafatg. I n'è betg pli pussaivel d'As avertir."</string>
+    <string name="not_thank_you_screen_text3">"Nagin na vegn infurmà."</string>
 
     <!-- Link Text zu Informationen übers Testen -->
-    <string name="checkin_report_link">"What do I need to know about testing?"</string>
-    <string name="instant_app_install_action">"Install app and check in"</string>
-    <string name="partial_onboarding_box_text">"Complete the app configuration to be able to use the tracing function."</string>
-    <string name="partial_onboarding_box_action">"Complete now"</string>
-    <string name="partial_onboarding_done_title">"Configuration complete"</string>
-    <string name="partial_onboarding_done_text">"Thank you for helping stop the spread of coronavirus."</string>
-    <string name="web_slogan">"Find out fast if you're at risk of infection."</string>
+    <string name="checkin_report_link">"Tge stoss jau savair davart il tests?"</string>
+    <string name="instant_app_install_action">"Installar l'app e sa registrar"</string>
+    <string name="partial_onboarding_box_text">"Terminai las configuraziuns da l'app per pudair far diever da la funcziun da tracing."</string>
+    <string name="partial_onboarding_box_action">"Terminar ussa"</string>
+    <string name="partial_onboarding_done_title">"La configuraziun è terminada"</string>
+    <string name="partial_onboarding_done_text">"Grazia fitg che Vus gidais a franar la derasaziun dal coronavirus."</string>
+    <string name="web_slogan">"Infurmescha svelt en cas d'ina ristga d'infecziun"</string>
 
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
@@ -1762,4 +1760,7 @@ Possible locations:
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 2400b7e9d..c5e1fc49a 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -1765,4 +1765,7 @@ Ky titull shfaqet gjatë Check-in."</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index 76921071d..a6cb51139 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -1760,4 +1760,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index ddccd13f7..1880d8172 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -1748,4 +1748,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index f9dc0e63e..d29961e62 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -1748,4 +1748,7 @@ Bu başlık check-in sırasında gösterilir."</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 82920899c..5e31ed1d8 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -221,7 +221,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="symptom_detail_box_text">"The FOPH recommends that anyone with COVID-19 symptoms should get tested. Call your doctor or your healthcare facility to schedule an appointment."</string>
 
     <!-- Informieren Titel in NavigationBar/Toolbar -->
-    <string name="inform_detail_navigation_title">"Tested positive"</string>
+    <string name="inform_detail_navigation_title">"Positive test"</string>
 
     <!-- Symptome Detail: NavigationBar/Toolbar Titel -->
     <string name="symptom_detail_navigation_title">"Symptoms"</string>
@@ -247,7 +247,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="no_meldungen_box_text">"Follow the government recommendations on hygiene and social distancing."</string>
 
     <!-- Meldung Detail: Positiv Getestet Titel -->
-    <string name="meldung_detail_positive_tested_title">"Tested positive"</string>
+    <string name="meldung_detail_positive_tested_title">"Positive test"</string>
 
     <!-- Meldung Detail: Positiv Getestet Subtitel -->
     <string name="meldung_detail_positive_tested_subtitle">"You have tested positive for the coronavirus."</string>
@@ -259,7 +259,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="meldung_detail_positive_test_box_title">"Isolation"</string>
 
     <!-- Meldung Detail Positiv Getestet Weisse Box Text -->
-    <string name="meldung_detail_positive_test_box_text">"Follow the instructions you receive on isolation."</string>
+    <string name="meldung_detail_positive_test_box_text">"Follow the instructions you received on isolation."</string>
     <string name="tracing_ended_title">"Encounters and check-in deactivated"</string>
     <string name="tracing_ended_text">"No encounters registered"</string>
     <string name="exposed_info_contact_hotline">"Contact the"</string>
@@ -271,7 +271,7 @@ Thank you for helping to break the chain of infection."</string>
 
     <!-- Meldung Detail Exposed Titel -->
     <string name="meldung_detail_exposed_title">"Potential infection"</string>
-    <string name="meldung_homescreen_positiv_title">"Tested positive"</string>
+    <string name="meldung_homescreen_positiv_title">"Positive test"</string>
 
     <!-- Meldung Detail Exposed Subtitel -->
     <string name="meldung_detail_exposed_subtitle">"You may have been infected"</string>
@@ -408,12 +408,12 @@ Infoline SwissCovid
     <string name="onboarding_push_gtk_text1">"In the event of a potential infection, you will receive a message on the lock screen."</string>
 
     <!-- Code senden: Abschluss Gute Besserung -->
-    <string name="inform_send_getwell_title">"Get well soon!"</string>
+    <string name="inform_send_getwell_title">"Take care and..."</string>
 
     <!-- Code senden: Abschluss Gute Besserung -->
-    <string name="inform_send_getwell_text">"Get well soon! 
+    <string name="inform_send_getwell_text">"get well soon! 
 
-Follow the instructions  you have received on isolation."</string>
+Follow the instructions you have received on isolation."</string>
 
     <!-- Titel auf dem letzen Onboarding Screen -->
     <string name="onboarding_go_title">"The app is ready to go"</string>
@@ -643,7 +643,7 @@ This tells other SwissCovid app users that they may have been infected."</string
     <string name="inform_code_intro_text">"Although no personal data relating to you is sent out, it may well be that someone remembers their encounter with you from the date."</string>
 
     <!-- Inform-Flow: Erster Screen Button -->
-    <string name="inform_code_intro_button">"Agree"</string>
+    <string name="inform_code_intro_button">"Agreed"</string>
 
     <!-- Symptome: FAQ Titel -->
     <string name="symptom_faq1_title">"What are the symptoms of COVID-19?"</string>
@@ -811,7 +811,7 @@ If no update is currently available on your device, please try again later."</st
     <string name="oboarding_splashscreen_title">"SwissCovid –
 find out fast if you're at risk of infection."</string>
     <string name="inform_detail_faq3_text">"Yes, but although no personal data is sent out, it may well be that someone remembers their encounter with you from the date."</string>
-    <string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
+    <string name="inform_detail_faq3_title">"Do I stay anonymous?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
     <string name="meldungen_detail_explanation_text4">"When the first symptoms appear, phone a doctor or health centre."</string>
@@ -1382,7 +1382,7 @@ If so, call this number:"</string>
     <string name="inform_send_thankyou_text_onsetdate">"{ONSET_DATE} – today"</string>
 
     <!-- Informieren: Danke Text Abschluss -->
-    <string name="inform_send_thankyou_text_stop_infection_chains">"In this way you are helping alert others to a possible infection."</string>
+    <string name="inform_send_thankyou_text_stop_infection_chains">"In this way you are helping to alert others should there be a risk of infection."</string>
 
     <!-- Informieren: Danke Text Onset Date Einleitung -->
     <string name="inform_send_thankyou_text_onsetdate_info">"Your app's private key was sent for the following period:"</string>
@@ -1499,7 +1499,7 @@ If so, call this number:"</string>
     <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins?"</string>
+    <string name="events_title">"Offer check-ins"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Check in now"</string>
@@ -1596,14 +1596,14 @@ If so, call this number:"</string>
     <string name="inform_share_checkins_title">"Share check-in entries"</string>
 
     <!-- Untertitel im "Covidcode flow", wo man check ins wählen kann, welche geshared werden sollen. -->
-    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location at the same time."</string>
+    <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location and time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
     <string name="inform_share_checkins_select_all">"Select all"</string>
     <string name="inform_dont_send_button_title">"Don't send"</string>
     <string name="inform_dont_share_button_title">"Don't share"</string>
     <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
-    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
+    <string name="inform_really_not_share_subtitle">"Sharing your private key helps SwissCovid to notify other people who may be infected and helps to stop the virus spreading. If you don't share your private key, people who may be infected will not be notified."</string>
 
     <!-- Remove from Diary Warning view title -->
     <string name="remove_diary_warning_title">"Remove entry"</string>
@@ -1648,7 +1648,7 @@ If so, call this number:"</string>
     <string name="checkout_overlapping_alert_description">"The times you selected clash with other check-ins in your diary. Please check your entry."</string>
 
     <!-- Informieren: Danke Text Checkins Teil -->
-    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location at the same time will be notified."</string>
+    <string name="inform_send_thankyou_text_checkins">"The check-in entries you selected have been sent. Everyone who was checked in at the same location and time will be notified."</string>
 
     <!-- SwissCovid QR Code PDF: Headline über dem Slogan -->
     <string name="pdf_headline">"SwissCovid check-in"</string>
@@ -1677,12 +1677,12 @@ data"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
     <string name="events_card_title">"Do you want to offer check-ins?"</string>
-    <string name="checkin_footer_title1">"Why a check-in function?"</string>
+    <string name="checkin_footer_title1">"Why a check-in feature?"</string>
     <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
     <string name="checkin_footer_title2">"No central data storage"</string>
     <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
     <string name="events_empty_state_title">"Generate a QR code"</string>
-    <string name="events_empty_state_subtitle">"Using a SwissCovid QR code, people can check in on site without leaving their data."</string>
+    <string name="events_empty_state_subtitle">"With a SwissCovid QR code, people can check in on site without leaving their data."</string>
     <string name="events_info_box_title">"No substitute for mandatory recording of contact details"</string>
     <string name="events_info_box_text">"SwissCovid check-ins are no substitute for the obligation to record contact details provided for in the COVID-19 Ordinance Special Situation. "</string>
     <string name="events_footer_title1">"Where can check-ins be used?"</string>
@@ -1725,7 +1725,8 @@ Possible locations:
     <!-- Check-Ins: QR-Code erstellen subtitel -->
     <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
     <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"Protect your contacts"</string>
+    <string name="checkin_report_title1">"
+Protect your contacts"</string>
     <string name="checkin_report_title2">"Look out for symptoms"</string>
     <string name="checkin_report_title3">"Get tested"</string>
     <string name="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."</string>
@@ -1746,7 +1747,7 @@ Possible locations:
     <string name="onboarding_checkin_title">"Check in without leaving data"</string>
     <string name="onboarding_checkin_heading">"Check-ins"</string>
     <string name="onboarding_checkin_text1">"With SwissCovid check-ins you can check in to a location or meeting using the app."</string>
-    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data. "</string>
+    <string name="onboarding_checkin_text2">"Your presence is only stored in the app. You don’t have to leave behind any personal data."</string>
     <string name="checkin_updateboarding_text">"With SwissCovid check-ins you can check in to a location or meeting using the app. Your presence is only stored in the app. You don't have to leave behind any personal data. The terms of use and privacy policy have been updated."</string>
     <string name="onboarding_gaen_button_dont_activate">"Skip"</string>
 
@@ -1786,4 +1787,7 @@ Possible locations:
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
     <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+
+    <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
+    <string name="events_card_title_events_not_empty"></string>
 </resources>
\ No newline at end of file

From e4adec1f156867ea1f105f33edbb1d6f1989c048 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 14 Jun 2021 09:17:32 +0200
Subject: [PATCH 158/207] Fix Instant App Default URL issue

---
 instant/src/main/AndroidManifest.xml              |  2 +-
 .../java/ch/admin/bag/dp3t/InstantFragment.kt     | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/instant/src/main/AndroidManifest.xml b/instant/src/main/AndroidManifest.xml
index ac7b966ec..58bf3de4e 100644
--- a/instant/src/main/AndroidManifest.xml
+++ b/instant/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
 			can not be set to something dynamic such as ${qrCodeHostName}, otherwise the Play Console upload will fail.-->
 			<meta-data
 				android:name="default-url"
-				android:value="https://qr-playstore-try.swisscovid.ch/" />
+				android:value="https://qr.swisscovid.ch/try-now/" />
 
 		</activity>
 
diff --git a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
index 555213712..3da9d2353 100644
--- a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
+++ b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
@@ -23,11 +23,6 @@ import java.nio.charset.StandardCharsets
 
 private const val REQUEST_CODE_INSTALL = 1
 
-// Note: https://qr-playstore-try.swisscovid.ch is defined as the default url in the Manifest. When clicking on "Try now" in the Playstore
-// the Instant App is started with this url and some parameters, e.g.:
-// https://qr-playstore-try.swisscovid.ch/?referrer=utm_source%3D(not%2520set)%26utm_medium%3D(not%2520set)
-private const val PLAYSTORE_TRY_NOW_HOST = "qr-playstore-try.swisscovid.ch"
-
 class InstantFragment : Fragment() {
 
 	companion object {
@@ -67,9 +62,13 @@ class InstantFragment : Fragment() {
 			title.setText(R.string.app_name)
 			installButton.setText(R.string.playservices_install)
 
-			// If the instant app is started without a url (should never happen) or with the default url, don't show any QR Code
-			// information nor error.
-			if (qrCodeUrl == null || Uri.parse(qrCodeUrl).host == PLAYSTORE_TRY_NOW_HOST) return
+			// Note: https://qr.swisscovid.ch/try-now/ is defined as the default url in the Manifest. When clicking on
+			// "Try now" in the Playstore the Instant App is started with this url and some parameters, e.g.:
+			// https://qr.swisscovid.ch/try-now/?referrer=utm_source%3D(not%2520set)%26utm_medium%3D(not%2520set)
+
+			// If the instant app is started without a url (should never happen) or the default url, don't show any
+			// QR Code error information.
+			if (qrCodeUrl == null || Uri.parse(qrCodeUrl).path?.contains("try-now") == true) return
 
 			errorView.isVisible = true
 			illu.isVisible = false

From da3764af9e1b47f650ed0c0b40821473fe4eae3a Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 14 Jun 2021 16:10:11 +0200
Subject: [PATCH 159/207] Add 30 mins to checkout time before user upload

---
 app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index ba43c9865..9217b9cb1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -43,6 +43,7 @@ private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
 private const val UPLOAD_REQUEST_TIME_PADDING = 5000L
+private const val CHECKOUT_TIME_PADDING_MS = 30 * 60 * 1000L
 private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
 private const val KEY_HAS_SHARED_CHECKINS = "KEY_HAS_SHARED_CHECKINS"
@@ -258,7 +259,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 			it.isSelected
 		}.map {
 			CrowdNotifier.generateUserUploadInfo(
-				it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime
+				it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime + CHECKOUT_TIME_PADDING_MS
 			)
 		}.flatten().map {
 			it.toUploadVenueInfo()

From 591c4d34c403a20a787e76e5321866e887c2b6cf Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 15 Jun 2021 17:13:53 +0200
Subject: [PATCH 160/207] show dialog if checkout time is before checkin time

---
 .../bag/dp3t/checkin/checkinflow/CheckOutFragment.kt  | 11 ++++++-----
 .../bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt  | 11 ++++++-----
 common/src/main/res/values-bs/strings.xml             |  3 +++
 common/src/main/res/values-de/strings.xml             |  3 +++
 common/src/main/res/values-es/strings.xml             |  3 +++
 common/src/main/res/values-fr/strings.xml             |  3 +++
 common/src/main/res/values-hr/strings.xml             |  3 +++
 common/src/main/res/values-it/strings.xml             |  3 +++
 common/src/main/res/values-pt/strings.xml             |  3 +++
 common/src/main/res/values-rm/strings.xml             |  3 +++
 common/src/main/res/values-sq/strings.xml             |  3 +++
 common/src/main/res/values-sr/strings.xml             |  3 +++
 common/src/main/res/values-ti/strings.xml             |  3 +++
 common/src/main/res/values-tr/strings.xml             |  3 +++
 common/src/main/res/values/strings.xml                |  3 +++
 15 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index bcf492396..1f2710f79 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -76,11 +76,12 @@ class CheckOutFragment : Fragment() {
 	}
 
 	private fun performCheckout() {
-		checkInState.run {
-			if (checkInTime > checkOutTime) {
-				// swap arrival and departure time
-				checkInTime = checkOutTime.also { checkOutTime = checkInTime }
-			}
+		if (checkInState.checkInTime > checkInState.checkOutTime) {
+			CheckinTimeHelper.showSavingNotPossibleDialog(
+				getString(R.string.checkout_inverse_time_alert_description),
+				requireContext()
+			)
+			return
 		}
 
 		val hasOverlapWithOtherCheckin =
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 31526f59a..66206e995 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -60,11 +60,12 @@ class EditDiaryEntryFragment : Fragment() {
 	}
 
 	private fun performSave() {
-		diaryEntry.run {
-			if (arrivalTime > departureTime) {
-				// swap arrival and departure time
-				arrivalTime = departureTime.also { departureTime = arrivalTime }
-			}
+		if (diaryEntry.arrivalTime > diaryEntry.departureTime) {
+			CheckinTimeHelper.showSavingNotPossibleDialog(
+				getString(R.string.checkout_inverse_time_alert_description),
+				requireContext()
+			)
+			return
 		}
 
 		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(diaryEntry, requireContext())
diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index 44fa8d0f8..9bf725522 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -1765,4 +1765,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 12e21b29e..d677db99e 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -1848,4 +1848,7 @@ Dieser Titel wird beim Check-in angezeigt."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty">"Meine QR-Codes"</string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description">"Ihre gewählte Checkout-Zeit liegt vor der Check-In-Zeit. Bitte überprüfen Sie nochmals Ihre Angabe."</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index a236171d7..814f881f4 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -1757,4 +1757,7 @@ Posibles utilizaciones:
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index fb7cf3e9e..7001b8d7b 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -1789,4 +1789,7 @@ Ce titre s’affichera lors du check-in."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 922868ef6..3f73a6c87 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -1763,4 +1763,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 1d028b091..74eb93f25 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -1800,4 +1800,7 @@ Possibili luoghi d'impiego:
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index 87bb3a5ec..23bc5498e 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -1767,4 +1767,7 @@ Este título vai ser indicado no check-in."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index e910a738e..271c197e2 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -1763,4 +1763,7 @@ Quai pon esser p.ex.:
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index c5e1fc49a..bd37827cc 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -1768,4 +1768,7 @@ Ky titull shfaqet gjatë Check-in."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index a6cb51139..167d44f8b 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -1763,4 +1763,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index 1880d8172..3b973a109 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -1751,4 +1751,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index d29961e62..1f2123f89 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -1751,4 +1751,7 @@ Bu başlık check-in sırasında gösterilir."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 5e31ed1d8..d8ffe3da8 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1790,4 +1790,7 @@ Protect your contacts"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
     <string name="events_card_title_events_not_empty"></string>
+
+    <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
+    <string name="checkout_inverse_time_alert_description"></string>
 </resources>
\ No newline at end of file

From 4da31e26e80d26330c4e5f46238e9c426beff10a Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 15 Jun 2021 17:58:46 +0200
Subject: [PATCH 161/207] removed 'save' option at checkout, merged duplicate
 logic

---
 .../checkin/checkinflow/CheckOutFragment.kt   | 79 +++++--------------
 .../dp3t/checkin/diary/CheckinTimeHelper.kt   | 12 +--
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   |  4 +-
 .../diary/DiaryRecyclerViewAdapter.java       |  4 +-
 .../checkin/diary/EditCheckinBaseFragment.kt  | 68 ++++++++++++++++
 .../checkin/diary/EditDiaryEntryFragment.kt   | 66 +++-------------
 .../bag/dp3t/checkin/models/CheckInState.kt   | 13 +--
 .../bag/dp3t/checkin/models/DiaryEntry.java   | 23 ++++--
 .../dp3t/checkin/storage/DiaryStorage.java    |  2 +-
 .../bag/dp3t/checkin/utils/CheckInRecord.kt   | 10 +++
 .../admin/bag/dp3t/inform/CheckinAdapter.kt   |  2 +-
 .../admin/bag/dp3t/inform/InformViewModel.kt  |  6 +-
 12 files changed, 146 insertions(+), 143 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index 1f2710f79..c18d5375d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -1,31 +1,26 @@
 package ch.admin.bag.dp3t.checkin.checkinflow
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
-import ch.admin.bag.dp3t.checkin.diary.CheckinTimeHelper
+import ch.admin.bag.dp3t.checkin.diary.EditCheckinBaseFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
 import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
-import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
-class CheckOutFragment : Fragment() {
+class CheckOutFragment : EditCheckinBaseFragment() {
 
 	companion object {
-		private val TAG = CheckOutFragment::class.java.canonicalName
-
 		@JvmStatic
 		fun newInstance() = CheckOutFragment()
 	}
@@ -35,6 +30,9 @@ class CheckOutFragment : Fragment() {
 	private lateinit var venueInfo: VenueInfo
 	private lateinit var checkInState: CheckInState
 
+	override val checkinRecord: CheckInRecord
+		get() = checkInState
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		checkIfAutoCheckoutHappened()
@@ -53,69 +51,28 @@ class CheckOutFragment : Fragment() {
 		}
 	}
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
-			checkoutTitle.text = venueInfo.title
-			checkoutSubtitle.setText(venueInfo.getSubtitle())
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		FragmentCheckOutAndEditBinding.bind(view).apply {
+			toolbarDoneButton.isVisible = false
 
-			toolbarDoneButton.setOnClickListener { performCheckout() }
-			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			checkoutPrimaryButton.setText(R.string.checkout_button_title)
-			checkoutPrimaryButton.setOnClickListener { performCheckout() }
-
-			checkoutTimeArrival.setDateTime(checkInState.checkInTime)
-			checkoutTimeArrival.setOnDateTimeChangedListener {
-				checkInState.checkInTime = checkoutTimeArrival.getSelectedUnixTimestamp()
-			}
-
-			checkoutTimeDeparture.setDateTime(checkInState.checkOutTime)
-			checkoutTimeDeparture.setOnDateTimeChangedListener {
-				checkInState.checkOutTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
-			}
-		}.root
-	}
-
-	private fun performCheckout() {
-		if (checkInState.checkInTime > checkInState.checkOutTime) {
-			CheckinTimeHelper.showSavingNotPossibleDialog(
-				getString(R.string.checkout_inverse_time_alert_description),
-				requireContext()
-			)
-			return
-		}
-
-		val hasOverlapWithOtherCheckin =
-			CheckinTimeHelper.checkForOverlap(checkInState.checkInTime, checkInState.checkOutTime, requireContext())
-		if (hasOverlapWithOtherCheckin) {
-			CheckinTimeHelper.showSavingNotPossibleDialog(
-				getString(R.string.checkout_overlapping_alert_description),
-				requireContext()
-			)
-			return
-		}
-
-		val checkinDuration = checkInState.checkOutTime - checkInState.checkInTime
-		val maxCheckinTime = checkInState.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
-		if (checkinDuration > maxCheckinTime) {
-			val dialogText = CheckinTimeHelper.getMaxCheckinTimeExceededMessage(maxCheckinTime, requireContext())
-			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
-			return
+			checkoutPrimaryButton.setOnClickListener { performSave() }
 		}
+	}
 
+	override fun saveEntry() {
 		CrowdNotifierReminderHelper.removeAllReminders(context)
-		saveEntry()
-		val notificationHelper = NotificationHelper.getInstance(context)
-		notificationHelper.stopOngoingNotification()
-		notificationHelper.removeReminderNotification()
-		popBackToHomeFragment()
-	}
 
-	private fun saveEntry() {
 		val checkIn = checkInState.checkInTime
 		val checkOut = checkInState.checkOutTime
 		val id = CrowdNotifier.addCheckIn(checkIn, checkOut, venueInfo, context)
 		DiaryStorage.getInstance(context).addEntry(DiaryEntry(id, checkIn, checkOut, venueInfo))
 		viewModel.checkInState = null
+
+		val notificationHelper = NotificationHelper.getInstance(context)
+		notificationHelper.stopOngoingNotification()
+		notificationHelper.removeReminderNotification()
+		popBackToHomeFragment()
 	}
 
 	private fun popBackToHomeFragment() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
index e9c1c6199..d0324493f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
@@ -5,22 +5,18 @@ import androidx.appcompat.app.AlertDialog
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
 import ch.admin.bag.dp3t.util.StringUtil
 
 object CheckinTimeHelper {
 
-	fun checkForOverlap(diaryEntry: DiaryEntry, context: Context): Boolean {
+	fun checkForOverlap(diaryEntry: CheckInRecord, context: Context): Boolean {
 		val otherCheckins = DiaryStorage.getInstance(context).entries.filter { it.id != diaryEntry.id }
-		return checkForOverlap(otherCheckins, diaryEntry.arrivalTime, diaryEntry.departureTime)
-	}
-
-	fun checkForOverlap(arrivalTime: Long, departureTime: Long, context: Context): Boolean {
-		val otherCheckins = DiaryStorage.getInstance(context).entries
-		return checkForOverlap(otherCheckins, arrivalTime, departureTime)
+		return checkForOverlap(otherCheckins, diaryEntry.checkInTime, diaryEntry.checkOutTime)
 	}
 
 	private fun checkForOverlap(checkins: List<DiaryEntry>, arrivalTime: Long, departureTime: Long): Boolean {
-		return checkins.any { it.departureTime > arrivalTime && departureTime > it.arrivalTime }
+		return checkins.any { it.checkOutTime > arrivalTime && departureTime > it.checkInTime }
 	}
 
 	fun showSavingNotPossibleDialog(message: String, context: Context) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 528837c93..69c604afd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -41,13 +41,13 @@ class DiaryFragment : Fragment() {
 			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { exposures ->
 				val items = ArrayList<VenueVisitRecyclerItem>()
 				val diaryEntries = DiaryStorage.getInstance(context).entries.sortedByDescending {
-					it.arrivalTime
+					it.checkInTime
 				}
 				val isEmpty = diaryEntries.isEmpty()
 				checkinDiaryEmptyView.isVisible = isEmpty
 				var daysAgoString = ""
 				for (diaryEntry in diaryEntries) {
-					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.arrivalTime, requireContext())
+					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.checkInTime, requireContext())
 					if (newDaysAgoString != daysAgoString) {
 						daysAgoString = newDaysAgoString
 						items.add(ItemVenueVisitDayHeader(daysAgoString))
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index 0f41767e5..3aaae6761 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -106,8 +106,8 @@ public void bind(ItemVenueVisit item) {
 			VenueInfo venueInfo = item.getDiaryEntry().getVenueInfo();
 			nameTextView.setText(venueInfo.getTitle());
 			locationTextView.setText(CommonVenueInfoExtensionsKt.getSubtitle(venueInfo));
-			String start = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getArrivalTime(), ":");
-			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getDepartureTime(), ":");
+			String start = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getCheckInTime(), ":");
+			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getCheckOutTime(), ":");
 			timeTextView.setText(start + " — " + end);
 			if (item.getExposure() == null) {
 				statusIcon.setVisibility(View.GONE);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt
new file mode 100644
index 000000000..de9790087
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt
@@ -0,0 +1,68 @@
+package ch.admin.bag.dp3t.checkin.diary
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
+import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
+import ch.admin.bag.dp3t.extensions.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
+
+abstract class EditCheckinBaseFragment : Fragment() {
+
+	abstract val checkinRecord: CheckInRecord
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
+			checkoutTitle.text = checkinRecord.venueInfo.title
+			checkoutSubtitle.setText(checkinRecord.venueInfo.getSubtitle())
+
+			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+
+			checkoutTimeArrival.setDateTime(checkinRecord.checkInTime)
+			checkoutTimeArrival.setOnDateTimeChangedListener {
+				checkinRecord.checkInTime = checkoutTimeArrival.getSelectedUnixTimestamp()
+			}
+
+			checkoutTimeDeparture.setDateTime(checkinRecord.checkOutTime)
+			checkoutTimeDeparture.setOnDateTimeChangedListener {
+				checkinRecord.checkOutTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
+			}
+		}.root
+	}
+
+	fun performSave() {
+		if (checkinRecord.checkInTime > checkinRecord.checkOutTime) {
+			CheckinTimeHelper.showSavingNotPossibleDialog(
+				getString(R.string.checkout_inverse_time_alert_description),
+				requireContext()
+			)
+			return
+		}
+
+		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(checkinRecord, requireContext())
+		if (hasOverlapWithOtherCheckin) {
+			CheckinTimeHelper.showSavingNotPossibleDialog(
+				getString(R.string.checkout_overlapping_alert_description),
+				requireContext()
+			)
+			return
+		}
+
+		val checkinDuration = checkinRecord.checkOutTime - checkinRecord.checkInTime
+		val maxCheckinTime = checkinRecord.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
+		if (checkinDuration > maxCheckinTime) {
+			val dialogText = CheckinTimeHelper.getMaxCheckinTimeExceededMessage(maxCheckinTime, requireContext())
+			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
+			return
+		}
+
+		saveEntry()
+	}
+
+	abstract fun saveEntry()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 66206e995..6530f830d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -1,20 +1,16 @@
 package ch.admin.bag.dp3t.checkin.diary
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
-import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 import org.crowdnotifier.android.sdk.CrowdNotifier
 
-class EditDiaryEntryFragment : Fragment() {
+class EditDiaryEntryFragment : EditCheckinBaseFragment() {
 
 	companion object {
 		private val TAG = EditDiaryEntryFragment::class.java.canonicalName
@@ -30,6 +26,9 @@ class EditDiaryEntryFragment : Fragment() {
 	private lateinit var diaryStorage: DiaryStorage
 	private lateinit var diaryEntry: DiaryEntry
 
+	override val checkinRecord: CheckInRecord
+		get() = diaryEntry
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		diaryStorage = DiaryStorage.getInstance(requireContext())
@@ -37,63 +36,22 @@ class EditDiaryEntryFragment : Fragment() {
 		diaryEntry = diaryStorage.getDiaryEntryWithId(diaryEntryId)
 	}
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
-			checkoutTitle.text = diaryEntry.venueInfo.title
-			checkoutSubtitle.setText(diaryEntry.venueInfo.getSubtitle())
-
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		FragmentCheckOutAndEditBinding.bind(view).apply {
 			toolbarDoneButton.setOnClickListener { performSave() }
-			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+
 			checkoutPrimaryButton.setText(R.string.remove_from_diary_button)
 			checkoutPrimaryButton.setOnClickListener { hideInDiary() }
-
-			checkoutTimeArrival.setDateTime(diaryEntry.arrivalTime)
-			checkoutTimeArrival.setOnDateTimeChangedListener {
-				diaryEntry.arrivalTime = checkoutTimeArrival.getSelectedUnixTimestamp()
-			}
-
-			checkoutTimeDeparture.setDateTime(diaryEntry.departureTime)
-			checkoutTimeDeparture.setOnDateTimeChangedListener {
-				diaryEntry.departureTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
-			}
-		}.root
-	}
-
-	private fun performSave() {
-		if (diaryEntry.arrivalTime > diaryEntry.departureTime) {
-			CheckinTimeHelper.showSavingNotPossibleDialog(
-				getString(R.string.checkout_inverse_time_alert_description),
-				requireContext()
-			)
-			return
 		}
-
-		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(diaryEntry, requireContext())
-		if (hasOverlapWithOtherCheckin) {
-			CheckinTimeHelper.showSavingNotPossibleDialog(
-				getString(R.string.checkout_overlapping_alert_description),
-				requireContext()
-			)
-			return
-		}
-
-		val checkinDuration = diaryEntry.departureTime - diaryEntry.arrivalTime
-		val maxCheckinTime = diaryEntry.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
-		if (checkinDuration > maxCheckinTime) {
-			val dialogText = CheckinTimeHelper.getMaxCheckinTimeExceededMessage(maxCheckinTime, requireContext())
-			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
-			return
-		}
-
-		saveEntry()
-		requireActivity().supportFragmentManager.popBackStack()
 	}
 
-	private fun saveEntry() {
+	override fun saveEntry() {
 		diaryEntry.run {
-			CrowdNotifier.updateCheckIn(id, arrivalTime, departureTime, venueInfo, context)
+			CrowdNotifier.updateCheckIn(id, checkInTime, checkOutTime, venueInfo, context)
 		}
 		diaryStorage.updateEntry(diaryEntry)
+
+		requireActivity().supportFragmentManager.popBackStack()
 	}
 
 	private fun hideInDiary() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
index 3c9536242..a917ee21e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
@@ -1,11 +1,14 @@
 package ch.admin.bag.dp3t.checkin.models
 
+import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 data class CheckInState(
 	var isCheckedIn: Boolean,
-	val venueInfo: VenueInfo,
-	var checkInTime: Long,
-	var checkOutTime: Long,
-	var selectedReminderDelay: Long
-)
+	override val venueInfo: VenueInfo,
+	override var checkInTime: Long,
+	override var checkOutTime: Long,
+	var selectedReminderDelay: Long,
+) : CheckInRecord {
+	override val id: Long? = null // must be null
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
index c180564a2..c485caa82 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
@@ -1,11 +1,15 @@
 package ch.admin.bag.dp3t.checkin.models;
 
 import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
+import ch.admin.bag.dp3t.checkin.utils.CheckInRecord;
+
 @Keep
-public class DiaryEntry {
+public class DiaryEntry implements CheckInRecord {
+
 	private long id;
 	private long arrivalTime;
 	private long departureTime;
@@ -18,27 +22,34 @@ public DiaryEntry(long id, long arrivalTime, long departureTime, VenueInfo venue
 		this.venueInfo = venueInfo;
 	}
 
-	public long getId() {
+	@Override
+	@NonNull
+	public Long getId() {
 		return id;
 	}
 
-	public long getArrivalTime() {
+	@Override
+	public long getCheckInTime() {
 		return arrivalTime;
 	}
 
-	public long getDepartureTime() {
+	@Override
+	public long getCheckOutTime() {
 		return departureTime;
 	}
 
+	@Override
 	public VenueInfo getVenueInfo() {
 		return venueInfo;
 	}
 
-	public void setArrivalTime(long arrivalTime) {
+	@Override
+	public void setCheckInTime(long arrivalTime) {
 		this.arrivalTime = arrivalTime;
 	}
 
-	public void setDepartureTime(long departureTime) {
+	@Override
+	public void setCheckOutTime(long departureTime) {
 		this.departureTime = departureTime;
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java
index 78bc28a04..576ca52e2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/storage/DiaryStorage.java
@@ -105,7 +105,7 @@ public void removeEntriesBefore(int maxDaysToKeep) {
 		DayDate lastDateToKeep = new DayDate().subtractDays(maxDaysToKeep);
 		Iterator<DiaryEntry> iterator = exposureList.iterator();
 		while (iterator.hasNext()) {
-			if (new DayDate(iterator.next().getDepartureTime()).isBefore(lastDateToKeep)) {
+			if (new DayDate(iterator.next().getCheckOutTime()).isBefore(lastDateToKeep)) {
 				iterator.remove();
 			}
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt
new file mode 100644
index 000000000..5744afb92
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt
@@ -0,0 +1,10 @@
+package ch.admin.bag.dp3t.checkin.utils
+
+import org.crowdnotifier.android.sdk.model.VenueInfo
+
+interface CheckInRecord {
+	val venueInfo: VenueInfo
+	var checkInTime: Long
+	var checkOutTime: Long
+	val id: Long?
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
index 561141758..320b1960c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
@@ -31,7 +31,7 @@ class CheckinAdapter : RecyclerView.Adapter<CheckinAdapter.CheckinViewHolder>()
 				checkinTitle.text = selectableCheckinItem.diaryEntry.venueInfo.title
 				checkinDetail1.setText(selectableCheckinItem.diaryEntry.venueInfo.getSubtitle())
 				checkinDetail2.text =
-					StringUtil.getReportDateString(selectableCheckinItem.diaryEntry.departureTime, true, true, root.context)
+					StringUtil.getReportDateString(selectableCheckinItem.diaryEntry.checkOutTime, true, true, root.context)
 				checkbox.isChecked = selectableCheckinItem.isSelected
 				setStroke(selectableCheckinItem.isSelected)
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 9217b9cb1..489373dad 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -159,8 +159,8 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 
 	fun getSelectableCheckinItems(): List<SelectableCheckinItem> {
 		return diaryStorage.entries.filter {
-			it.venueInfo.getSwissCovidLocationData().type == VenueType.USER_QR_CODE && it.departureTime >= onsetDate ?: 0
-					&& it.departureTime > System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS
+			it.venueInfo.getSwissCovidLocationData().type == VenueType.USER_QR_CODE && it.checkOutTime >= onsetDate ?: 0
+					&& it.checkOutTime > System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS
 		}.map {
 			SelectableCheckinItem(it, isSelected = selectedDiaryEntryIds.contains(it.id))
 		}
@@ -259,7 +259,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 			it.isSelected
 		}.map {
 			CrowdNotifier.generateUserUploadInfo(
-				it.diaryEntry.venueInfo, it.diaryEntry.arrivalTime, it.diaryEntry.departureTime + CHECKOUT_TIME_PADDING_MS
+				it.diaryEntry.venueInfo, it.diaryEntry.checkInTime, it.diaryEntry.checkOutTime + CHECKOUT_TIME_PADDING_MS
 			)
 		}.flatten().map {
 			it.toUploadVenueInfo()

From 58564cb5aaab2389a46c1c119a9fc3754134076b Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 15 Jun 2021 23:15:15 +0200
Subject: [PATCH 162/207] code cleanup

---
 .../dp3t/checkin/EditCheckinBaseFragment.kt   | 82 +++++++++++++++++++
 .../checkin/checkinflow/CheckOutFragment.kt   |  6 +-
 .../dp3t/checkin/diary/CheckinTimeHelper.kt   | 35 --------
 .../checkin/diary/EditCheckinBaseFragment.kt  | 68 ---------------
 .../checkin/diary/EditDiaryEntryFragment.kt   |  7 +-
 .../bag/dp3t/checkin/models/CheckInState.kt   |  3 +-
 .../CheckinInfo.kt}                           |  4 +-
 .../bag/dp3t/checkin/models/DiaryEntry.java   |  4 +-
 8 files changed, 92 insertions(+), 117 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
 delete mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt
 rename app/src/main/java/ch/admin/bag/dp3t/checkin/{utils/CheckInRecord.kt => models/CheckinInfo.kt} (68%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt
new file mode 100644
index 000000000..f1e8669e7
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt
@@ -0,0 +1,82 @@
+package ch.admin.bag.dp3t.checkin
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.models.CheckinInfo
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
+import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
+import ch.admin.bag.dp3t.extensions.getSubtitle
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
+import ch.admin.bag.dp3t.util.StringUtil
+
+abstract class EditCheckinBaseFragment : Fragment() {
+
+	abstract val checkinInfo: CheckinInfo
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
+			checkoutTitle.text = checkinInfo.venueInfo.title
+			checkoutSubtitle.setText(checkinInfo.venueInfo.getSubtitle())
+
+			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
+
+			checkoutTimeArrival.setDateTime(checkinInfo.checkInTime)
+			checkoutTimeArrival.setOnDateTimeChangedListener {
+				checkinInfo.checkInTime = checkoutTimeArrival.getSelectedUnixTimestamp()
+			}
+
+			checkoutTimeDeparture.setDateTime(checkinInfo.checkOutTime)
+			checkoutTimeDeparture.setOnDateTimeChangedListener {
+				checkinInfo.checkOutTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
+			}
+		}.root
+	}
+
+	fun performSave() {
+		val context = requireContext()
+
+		if (checkinInfo.checkInTime > checkinInfo.checkOutTime) {
+			showSavingNotPossibleDialog(getString(R.string.checkout_inverse_time_alert_description), context)
+			return
+		}
+
+		val hasOverlapWithOtherCheckin = checkForOverlap(checkinInfo, context)
+		if (hasOverlapWithOtherCheckin) {
+			showSavingNotPossibleDialog(getString(R.string.checkout_overlapping_alert_description), context)
+			return
+		}
+
+		val checkinDuration = checkinInfo.checkOutTime - checkinInfo.checkInTime
+		val maxCheckinTime = checkinInfo.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
+		if (checkinDuration > maxCheckinTime) {
+			val maxDurationString = StringUtil.getShortDurationStringWithUnits(maxCheckinTime, context)
+			val dialogText = context.getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
+			showSavingNotPossibleDialog(dialogText, context)
+			return
+		}
+
+		saveEntry()
+	}
+
+	abstract fun saveEntry()
+
+	private fun checkForOverlap(diaryEntry: CheckinInfo, context: Context): Boolean {
+		val otherCheckins = DiaryStorage.getInstance(context).entries.filter { it.id != diaryEntry.id }
+		return otherCheckins.any { it.checkOutTime > diaryEntry.checkInTime && diaryEntry.checkOutTime > it.checkInTime }
+	}
+
+	private fun showSavingNotPossibleDialog(message: String, context: Context) {
+		AlertDialog.Builder(context, R.style.NextStep_AlertDialogStyle)
+			.setTitle(R.string.checkout_overlapping_alert_title)
+			.setMessage(message)
+			.setNegativeButton(R.string.android_button_ok) { dialog, _ -> dialog.dismiss() }
+			.show()
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
index c18d5375d..a2e9828f4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckOutFragment.kt
@@ -7,11 +7,11 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
-import ch.admin.bag.dp3t.checkin.diary.EditCheckinBaseFragment
+import ch.admin.bag.dp3t.checkin.EditCheckinBaseFragment
 import ch.admin.bag.dp3t.checkin.models.CheckInState
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
-import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
+import ch.admin.bag.dp3t.checkin.models.CheckinInfo
 import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper
 import ch.admin.bag.dp3t.checkin.utils.NotificationHelper
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
@@ -30,7 +30,7 @@ class CheckOutFragment : EditCheckinBaseFragment() {
 	private lateinit var venueInfo: VenueInfo
 	private lateinit var checkInState: CheckInState
 
-	override val checkinRecord: CheckInRecord
+	override val checkinInfo: CheckinInfo
 		get() = checkInState
 
 	override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
deleted file mode 100644
index d0324493f..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/CheckinTimeHelper.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package ch.admin.bag.dp3t.checkin.diary
-
-import android.content.Context
-import androidx.appcompat.app.AlertDialog
-import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.checkin.models.DiaryEntry
-import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
-import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
-import ch.admin.bag.dp3t.util.StringUtil
-
-object CheckinTimeHelper {
-
-	fun checkForOverlap(diaryEntry: CheckInRecord, context: Context): Boolean {
-		val otherCheckins = DiaryStorage.getInstance(context).entries.filter { it.id != diaryEntry.id }
-		return checkForOverlap(otherCheckins, diaryEntry.checkInTime, diaryEntry.checkOutTime)
-	}
-
-	private fun checkForOverlap(checkins: List<DiaryEntry>, arrivalTime: Long, departureTime: Long): Boolean {
-		return checkins.any { it.checkOutTime > arrivalTime && departureTime > it.checkInTime }
-	}
-
-	fun showSavingNotPossibleDialog(message: String, context: Context) {
-		AlertDialog.Builder(context, R.style.NextStep_AlertDialogStyle)
-			.setTitle(R.string.checkout_overlapping_alert_title)
-			.setMessage(message)
-			.setNegativeButton(R.string.android_button_ok) { dialog, _ -> dialog.dismiss() }
-			.show()
-	}
-
-	fun getMaxCheckinTimeExceededMessage(maxCheckinTime: Long, context: Context): String {
-		val maxDurationString = StringUtil.getShortDurationStringWithUnits(maxCheckinTime, context)
-		return context.getString(R.string.checkout_too_long_alert_text).replace("{DURATION}", maxDurationString)
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt
deleted file mode 100644
index de9790087..000000000
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditCheckinBaseFragment.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package ch.admin.bag.dp3t.checkin.diary
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
-import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
-import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
-
-abstract class EditCheckinBaseFragment : Fragment() {
-
-	abstract val checkinRecord: CheckInRecord
-
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
-			checkoutTitle.text = checkinRecord.venueInfo.title
-			checkoutSubtitle.setText(checkinRecord.venueInfo.getSubtitle())
-
-			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
-
-			checkoutTimeArrival.setDateTime(checkinRecord.checkInTime)
-			checkoutTimeArrival.setOnDateTimeChangedListener {
-				checkinRecord.checkInTime = checkoutTimeArrival.getSelectedUnixTimestamp()
-			}
-
-			checkoutTimeDeparture.setDateTime(checkinRecord.checkOutTime)
-			checkoutTimeDeparture.setOnDateTimeChangedListener {
-				checkinRecord.checkOutTime = checkoutTimeDeparture.getSelectedUnixTimestamp()
-			}
-		}.root
-	}
-
-	fun performSave() {
-		if (checkinRecord.checkInTime > checkinRecord.checkOutTime) {
-			CheckinTimeHelper.showSavingNotPossibleDialog(
-				getString(R.string.checkout_inverse_time_alert_description),
-				requireContext()
-			)
-			return
-		}
-
-		val hasOverlapWithOtherCheckin = CheckinTimeHelper.checkForOverlap(checkinRecord, requireContext())
-		if (hasOverlapWithOtherCheckin) {
-			CheckinTimeHelper.showSavingNotPossibleDialog(
-				getString(R.string.checkout_overlapping_alert_description),
-				requireContext()
-			)
-			return
-		}
-
-		val checkinDuration = checkinRecord.checkOutTime - checkinRecord.checkInTime
-		val maxCheckinTime = checkinRecord.venueInfo.getSwissCovidLocationData().automaticCheckoutDelaylMs
-		if (checkinDuration > maxCheckinTime) {
-			val dialogText = CheckinTimeHelper.getMaxCheckinTimeExceededMessage(maxCheckinTime, requireContext())
-			CheckinTimeHelper.showSavingNotPossibleDialog(dialogText, requireContext())
-			return
-		}
-
-		saveEntry()
-	}
-
-	abstract fun saveEntry()
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
index 6530f830d..6fe7e513d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/EditDiaryEntryFragment.kt
@@ -4,17 +4,16 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.os.bundleOf
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.checkin.EditCheckinBaseFragment
+import ch.admin.bag.dp3t.checkin.models.CheckinInfo
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
-import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
 import org.crowdnotifier.android.sdk.CrowdNotifier
 
 class EditDiaryEntryFragment : EditCheckinBaseFragment() {
 
 	companion object {
-		private val TAG = EditDiaryEntryFragment::class.java.canonicalName
-
 		private const val ARG_DIARY_ENTRY_ID = "ARG_DIARY_ENTRY_ID"
 
 		@JvmStatic
@@ -26,7 +25,7 @@ class EditDiaryEntryFragment : EditCheckinBaseFragment() {
 	private lateinit var diaryStorage: DiaryStorage
 	private lateinit var diaryEntry: DiaryEntry
 
-	override val checkinRecord: CheckInRecord
+	override val checkinInfo: CheckinInfo
 		get() = diaryEntry
 
 	override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
index a917ee21e..ce305b81a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckInState.kt
@@ -1,6 +1,5 @@
 package ch.admin.bag.dp3t.checkin.models
 
-import ch.admin.bag.dp3t.checkin.utils.CheckInRecord
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 data class CheckInState(
@@ -9,6 +8,6 @@ data class CheckInState(
 	override var checkInTime: Long,
 	override var checkOutTime: Long,
 	var selectedReminderDelay: Long,
-) : CheckInRecord {
+) : CheckinInfo {
 	override val id: Long? = null // must be null
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckinInfo.kt
similarity index 68%
rename from app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt
rename to app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckinInfo.kt
index 5744afb92..9fbe21290 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CheckInRecord.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/CheckinInfo.kt
@@ -1,8 +1,8 @@
-package ch.admin.bag.dp3t.checkin.utils
+package ch.admin.bag.dp3t.checkin.models
 
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
-interface CheckInRecord {
+interface CheckinInfo {
 	val venueInfo: VenueInfo
 	var checkInTime: Long
 	var checkOutTime: Long
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
index c485caa82..fbf36696f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/models/DiaryEntry.java
@@ -5,10 +5,8 @@
 
 import org.crowdnotifier.android.sdk.model.VenueInfo;
 
-import ch.admin.bag.dp3t.checkin.utils.CheckInRecord;
-
 @Keep
-public class DiaryEntry implements CheckInRecord {
+public class DiaryEntry implements CheckinInfo {
 
 	private long id;
 	private long arrivalTime;

From f9eec3f21b2cf9fa5449bf651bc61b947a0efa39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 17 Jun 2021 11:15:08 +0200
Subject: [PATCH 163/207] also clean common build folder before release build
 and increase version number for instant app

---
 buildAndCompare.sh   | 1 +
 instant/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildAndCompare.sh b/buildAndCompare.sh
index 1a24b9020..86b126b2a 100755
--- a/buildAndCompare.sh
+++ b/buildAndCompare.sh
@@ -23,6 +23,7 @@ fi
 
 #make sure we have a full clean build
 rm -rf $appName/build
+rm -rf common/build
 rm -rf .gradle
 
 docker build -t swisscovid-builder .
diff --git a/instant/build.gradle b/instant/build.gradle
index 89dab3917..679fd7f1f 100644
--- a/instant/build.gradle
+++ b/instant/build.gradle
@@ -10,7 +10,7 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 2
+		versionCode 3
 		versionName "2.0.0"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 

From 09f0a0e8a1a90de83fbf03706b4a3fa0d8faeb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 17 Jun 2021 11:49:37 +0200
Subject: [PATCH 164/207] reactivate tracing after ending isolation if it was
 enabled before entering the covidcode

---
 .../java/ch/admin/bag/dp3t/home/HomeFragment.java  | 10 ++--------
 .../ch/admin/bag/dp3t/inform/InformFragment.kt     |  4 ++++
 .../ch/admin/bag/dp3t/reports/ReportsFragment.kt   |  9 +++------
 .../ch/admin/bag/dp3t/storage/SecureStorage.java   | 12 +++++++++++-
 .../admin/bag/dp3t/util/TracingStatusHelper.java   | 14 ++++++++++++++
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
index 8ef96b738..d718e2029 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/home/HomeFragment.java
@@ -456,10 +456,7 @@ private void setupCovidCodeCard() {
 					AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle);
 					builder.setMessage(R.string.delete_infection_dialog)
 							.setPositiveButton(R.string.delete_infection_dialog_finish_button, (dialog, id) -> {
-								tracingStatusInterface.resetInfectionStatus(getContext());
-								secureStorage.setIsolationEndDialogTimestamp(-1L);
-								secureStorage.setPositiveReportOldestSharedKey(-1L);
-								secureStorage.setPositiveReportOldestSharedKeyOrCheckin(-1L);
+								TracingStatusHelper.resetStateAfterIsolation(getActivity(), tracingViewModel);
 							})
 							.setNegativeButton(R.string.cancel, (dialog, id) -> {
 								//do nothing
@@ -553,10 +550,7 @@ public void onChanged(TracingStatusInterface tracingStatusInterface) {
 							.setTitle(R.string.homescreen_isolation_ended_popup_title)
 							.setMessage(R.string.homescreen_isolation_ended_popup_text)
 							.setPositiveButton(R.string.answer_yes, (dialog, which) -> {
-								tracingStatusInterface.resetInfectionStatus(getContext());
-								secureStorage.setIsolationEndDialogTimestamp(-1L);
-								secureStorage.setPositiveReportOldestSharedKey(-1L);
-								secureStorage.setPositiveReportOldestSharedKeyOrCheckin(-1L);
+								TracingStatusHelper.resetStateAfterIsolation(getActivity(), tracingViewModel);
 							})
 							.setNegativeButton(R.string.answer_no, (dialog, which) -> {
 								long newTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index de0f6a317..228c423f4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -22,7 +22,9 @@ import ch.admin.bag.dp3t.inform.views.ChainedEditText
 import ch.admin.bag.dp3t.inform.views.ChainedEditText.ChainedEditTextListener
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
+import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.PhoneUtil
+import org.dpppt.android.sdk.DP3T
 
 private const val REGEX_CODE_PATTERN = "\\d{" + ChainedEditText.NUM_CHARACTERS + "}"
 
@@ -84,6 +86,8 @@ class InformFragment : TraceKeyShareBaseFragment() {
 		informViewModel.loadOnsetDate().observe(viewLifecycleOwner) {
 			setLoadingViewVisible(it.status == Status.LOADING)
 			if (it.status == Status.SUCCESS) {
+				val secureStorage = SecureStorage.getInstance(context)
+				secureStorage.exposureNotifcationsActiveBeforeEnteringCovidcode = DP3T.isTracingEnabled(requireContext())
 				askUserToEnableTracingIfNecessary { tracingEnabled ->
 					if (tracingEnabled) {
 						showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
index fbc2211c4..0b4c8c0bf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.kt
@@ -222,7 +222,7 @@ class ReportsFragment : Fragment() {
 					val faqText = getString(R.string.meldungen_positive_tested_faq2_text).replace("{ONSET_DATE}", formattedDate)
 					val formattedText = StringUtil.makePartiallyBold(faqText, formattedDate)
 					cardEncountersFaqWhoIsNotified.text = formattedText
-					deleteReports.setOnClickListener { showDeleteReportConfirmationDialog() }
+					deleteReports.setOnClickListener { showEndIsolationConfirmationDialog() }
 					deleteReports.isVisible = tracingStatusInterface.canInfectedStatusBeReset(requireContext())
 				}
 			}
@@ -249,14 +249,11 @@ class ReportsFragment : Fragment() {
 		setupHeader(state)
 	}
 
-	private fun showDeleteReportConfirmationDialog() {
+	private fun showEndIsolationConfirmationDialog() {
 		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(R.string.delete_infection_dialog)
 			.setPositiveButton(R.string.delete_infection_dialog_finish_button) { _, _ ->
-				tracingViewModel.appStatusLiveData.value?.resetInfectionStatus(context)
-				secureStorage.isolationEndDialogTimestamp = -1L
-				secureStorage.positiveReportOldestSharedKey = -1L
-				secureStorage.positiveReportOldestSharedKeyOrCheckin = -1L
+				TracingStatusHelper.resetStateAfterIsolation(activity, tracingViewModel)
 				parentFragmentManager.popBackStack()
 			}
 			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 868693e6b..fc25b00f1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -31,11 +31,11 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
 import ch.admin.bag.dp3t.networking.models.InfoBoxModelCollection;
 import ch.admin.bag.dp3t.networking.models.TestLocationModel;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsCollection;
 import ch.admin.bag.dp3t.networking.models.WhatToDoPositiveTestTextsModel;
-import ch.admin.bag.dp3t.checkin.models.CheckInState;
 
 public class SecureStorage {
 
@@ -80,6 +80,8 @@ public class SecureStorage {
 	private static final String KEY_ONLY_PARTIAL_ONBOARDING_DONE = "KEY_ONLY_PARTIAL_ONBOARDING_DONE";
 	private static final String KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN =
 			"KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN";
+	private static final String KEY_EXPOSURE_NOTIFICATIONS_ACTIVE_BEFORE_ENTERING_COVIDCODE =
+			"KEY_EXPOSURE_NOTIFICATIONS_ACTIVE_BEFORE_ENTERING_COVIDCODE";
 
 
 	private static SecureStorage instance;
@@ -395,6 +397,14 @@ public void setPositiveReportOldestSharedKeyOrCheckin(long oldestSharedKeyOrChec
 		prefs.edit().putLong(KEY_POSITIVE_REPORT_OLDEST_SHARED_KEY_OR_CHECKIN, oldestSharedKeyOrCheckin).apply();
 	}
 
+	public boolean getExposureNotifcationsActiveBeforeEnteringCovidcode() {
+		return prefs.getBoolean(KEY_EXPOSURE_NOTIFICATIONS_ACTIVE_BEFORE_ENTERING_COVIDCODE, false);
+	}
+
+	public void setExposureNotifcationsActiveBeforeEnteringCovidcode(boolean active) {
+		prefs.edit().putBoolean(KEY_EXPOSURE_NOTIFICATIONS_ACTIVE_BEFORE_ENTERING_COVIDCODE, active).apply();
+	}
+
 	private synchronized SharedPreferences initializeSharedPreferences(@NonNull Context context) {
 		try {
 			return createEncryptedSharedPreferences(context);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
index 9e1ef9885..de977eb2a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/TracingStatusHelper.java
@@ -9,6 +9,7 @@
  */
 package ch.admin.bag.dp3t.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Paint;
@@ -22,6 +23,8 @@
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState;
 import ch.admin.bag.dp3t.home.model.TracingState;
+import ch.admin.bag.dp3t.storage.SecureStorage;
+import ch.admin.bag.dp3t.viewmodel.TracingViewModel;
 
 public class TracingStatusHelper {
 
@@ -112,4 +115,15 @@ public static void showTracingDeactivated(View tracingErrorView, boolean isHomeF
 		}
 	}
 
+	public static void resetStateAfterIsolation(Activity activity, TracingViewModel tracingViewModel) {
+		tracingViewModel.getTracingStatusInterface().resetInfectionStatus(activity);
+		SecureStorage secureStorage = SecureStorage.getInstance(activity);
+		secureStorage.setIsolationEndDialogTimestamp(-1L);
+		secureStorage.setPositiveReportOldestSharedKey(-1L);
+		secureStorage.setPositiveReportOldestSharedKeyOrCheckin(-1L);
+		if (secureStorage.getExposureNotifcationsActiveBeforeEnteringCovidcode()) {
+			tracingViewModel.enableTracing(activity, () -> {}, (e) -> {}, () -> {});
+		}
+	}
+
 }

From b7e3e78725f0c0b116b086995f49e33c28c054d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 17 Jun 2021 14:16:54 +0200
Subject: [PATCH 165/207] remove user upload brand

---
 .../bag/dp3t/checkin/EditCheckinBaseFragment.kt      |  2 --
 .../bag/dp3t/checkin/checkinflow/CheckInFragment.kt  |  2 --
 .../dp3t/checkin/diary/DiaryRecyclerViewAdapter.java |  3 ---
 .../bag/dp3t/checkin/generateqrcode/PdfCreator.kt    |  2 --
 .../bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt |  1 -
 .../dp3t/checkin/generateqrcode/QrCodeFragment.kt    |  1 -
 .../java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt  |  2 --
 app/src/main/res/layout/fragment_check_in.xml        |  9 ---------
 .../main/res/layout/fragment_check_out_and_edit.xml  |  9 ---------
 app/src/main/res/layout/fragment_qr_code.xml         | 10 ----------
 app/src/main/res/layout/item_checkin_venue_visit.xml |  8 --------
 app/src/main/res/layout/item_selectable_checkin.xml  | 12 +-----------
 app/src/main/res/layout/pdf_qr_code.xml              | 11 +----------
 .../bag/dp3t/extensions/CommonVenueInfoExtensions.kt |  5 -----
 14 files changed, 2 insertions(+), 75 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt
index f1e8669e7..183083e98 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/EditCheckinBaseFragment.kt
@@ -11,7 +11,6 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.CheckinInfo
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage
 import ch.admin.bag.dp3t.databinding.FragmentCheckOutAndEditBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 import ch.admin.bag.dp3t.util.StringUtil
 
@@ -22,7 +21,6 @@ abstract class EditCheckinBaseFragment : Fragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		return FragmentCheckOutAndEditBinding.inflate(inflater, container, false).apply {
 			checkoutTitle.text = checkinInfo.venueInfo.title
-			checkoutSubtitle.setText(checkinInfo.venueInfo.getSubtitle())
 
 			toolbarCancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 30d57a842..d1bc4e3e2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -19,7 +19,6 @@ import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
 import ch.admin.bag.dp3t.extensions.getReminderDelayOptions
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import com.google.android.material.button.MaterialButton
 
 private const val ARG_IS_SELF_CHECKIN = "ARG_IS_SELF_CHECKIN"
@@ -59,7 +58,6 @@ class CheckInFragment : Fragment() {
 			val venueInfo = viewModel.checkInState?.venueInfo ?: return root
 
 			titleTextview.text = venueInfo.title
-			subtitleTextview.setText(venueInfo.getSubtitle())
 			checkInButton.setOnClickListener {
 				viewModel.performCheckinAndSetReminders(venueInfo, viewModel.selectedReminderDelay)
 				popBackToHomeFragment()
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index 3aaae6761..09e1750a6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -91,21 +91,18 @@ public static class VenueVisitViewHolder extends RecyclerView.ViewHolder {
 
 		private final TextView timeTextView;
 		private final TextView nameTextView;
-		private final TextView locationTextView;
 		private final ImageView statusIcon;
 
 		public VenueVisitViewHolder(View itemView) {
 			super(itemView);
 			this.timeTextView = itemView.findViewById(R.id.item_diary_entry_time);
 			this.nameTextView = itemView.findViewById(R.id.item_diary_entry_name);
-			this.locationTextView = itemView.findViewById(R.id.item_diary_entry_location);
 			this.statusIcon = itemView.findViewById(R.id.item_diary_entry_status_icon);
 		}
 
 		public void bind(ItemVenueVisit item) {
 			VenueInfo venueInfo = item.getDiaryEntry().getVenueInfo();
 			nameTextView.setText(venueInfo.getTitle());
-			locationTextView.setText(CommonVenueInfoExtensionsKt.getSubtitle(venueInfo));
 			String start = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getCheckInTime(), ":");
 			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getCheckOutTime(), ":");
 			timeTextView.setText(start + " — " + end);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
index 9e0c86514..0cd9532f2 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/PdfCreator.kt
@@ -8,7 +8,6 @@ import android.view.View
 import androidx.annotation.ColorInt
 import ch.admin.bag.dp3t.BuildConfig
 import ch.admin.bag.dp3t.R
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.databinding.PdfQrCodeBinding
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
@@ -47,7 +46,6 @@ fun createEntryPdf(venueInfo: VenueInfo, context: Context): PdfDocument {
 
 		val pdfView = PdfQrCodeBinding.inflate(LayoutInflater.from(context)).apply {
 			title.text = venueInfo.title
-			subtitle.setText(venueInfo.getSubtitle())
 		}.root
 
 		pdfView.measure(
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index 97ad023c2..f26af2a77 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -14,7 +14,6 @@ import ch.admin.bag.dp3t.databinding.ItemEventsExplanationBinding
 import ch.admin.bag.dp3t.databinding.ItemEventsFooterBinding
 import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
 import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeAdapter.QrCodeBaseViewHolder>() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
index 1e8b9808e..8a26ea46d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeFragment.kt
@@ -47,7 +47,6 @@ class QrCodeFragment : Fragment() {
 			cancelButton.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 			val venueInfo = QRCodePayload.parseFrom(arguments?.get(KEY_VENUE_INFO) as ByteString).toVenueInfo()
 			titleTextview.text = venueInfo.title
-			subtitleTextview.setText(venueInfo.getSubtitle())
 			qrCodeImageview.visibility = View.INVISIBLE
 			qrCodeLoadingProgressbar.isVisible = true
 			shareButton.isEnabled = false
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
index 320b1960c..57b50c069 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/CheckinAdapter.kt
@@ -6,7 +6,6 @@ import androidx.recyclerview.widget.RecyclerView
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
 import ch.admin.bag.dp3t.databinding.ItemSelectableCheckinBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
 import ch.admin.bag.dp3t.util.StringUtil
 
@@ -29,7 +28,6 @@ class CheckinAdapter : RecyclerView.Adapter<CheckinAdapter.CheckinViewHolder>()
 		fun bind(selectableCheckinItem: SelectableCheckinItem) {
 			binding.apply {
 				checkinTitle.text = selectableCheckinItem.diaryEntry.venueInfo.title
-				checkinDetail1.setText(selectableCheckinItem.diaryEntry.venueInfo.getSubtitle())
 				checkinDetail2.text =
 					StringUtil.getReportDateString(selectableCheckinItem.diaryEntry.checkOutTime, true, true, root.context)
 				checkbox.isChecked = selectableCheckinItem.isSelected
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index 74b66b9a2..e2ef3bf72 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -73,15 +73,6 @@
 				android:gravity="center"
 				tools:text="Cyber Cafe SV" />
 
-			<TextView
-				android:id="@+id/subtitle_textview"
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_very_small"
-				android:gravity="center"
-				tools:text="Lausanne" />
-
 			<Space
 				android:layout_width="match_parent"
 				android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_check_out_and_edit.xml b/app/src/main/res/layout/fragment_check_out_and_edit.xml
index e96ab9c75..b36e99bc8 100644
--- a/app/src/main/res/layout/fragment_check_out_and_edit.xml
+++ b/app/src/main/res/layout/fragment_check_out_and_edit.xml
@@ -61,15 +61,6 @@
 				android:gravity="center"
 				tools:text="Cyber Cafe SV" />
 
-			<TextView
-				android:id="@+id/checkout_subtitle"
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_very_small"
-				android:gravity="center"
-				tools:text="Lausanne" />
-
 			<TextView
 				style="@style/NextStep.Text.Bold"
 				android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_qr_code.xml b/app/src/main/res/layout/fragment_qr_code.xml
index 19d706e61..523d14fd4 100644
--- a/app/src/main/res/layout/fragment_qr_code.xml
+++ b/app/src/main/res/layout/fragment_qr_code.xml
@@ -47,16 +47,6 @@
 				android:gravity="center_horizontal"
 				tools:text="Reuss Ubique" />
 
-			<TextView
-				android:id="@+id/subtitle_textview"
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_small"
-				android:gravity="center_horizontal"
-				android:textStyle="normal"
-				tools:text="Office space" />
-
 			<androidx.constraintlayout.widget.ConstraintLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_checkin_venue_visit.xml b/app/src/main/res/layout/item_checkin_venue_visit.xml
index be587e508..55e856f22 100644
--- a/app/src/main/res/layout/item_checkin_venue_visit.xml
+++ b/app/src/main/res/layout/item_checkin_venue_visit.xml
@@ -48,14 +48,6 @@
 				android:layout_height="wrap_content"
 				tools:text="Meeting Room IP32" />
 
-			<TextView
-				android:id="@+id/item_diary_entry_location"
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/spacing_tiny_small"
-				tools:text="EPFL Campus, Lausanne" />
-
 			<TextView
 				android:id="@+id/item_diary_entry_time"
 				style="@style/NextStep.Text"
diff --git a/app/src/main/res/layout/item_selectable_checkin.xml b/app/src/main/res/layout/item_selectable_checkin.xml
index 6606806de..cb531b7d0 100644
--- a/app/src/main/res/layout/item_selectable_checkin.xml
+++ b/app/src/main/res/layout/item_selectable_checkin.xml
@@ -26,16 +26,6 @@
 			app:layout_constraintTop_toTopOf="parent"
 			tools:text="Checkin 1" />
 
-		<TextView
-			android:id="@+id/checkin_detail1"
-			style="@style/NextStep.Text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/spacing_very_small"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/checkin_title"
-			tools:text="Office space" />
-
 		<TextView
 			android:id="@+id/checkin_detail2"
 			style="@style/NextStep.Text"
@@ -43,7 +33,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/spacing_very_small"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/checkin_detail1"
+			app:layout_constraintTop_toBottomOf="@id/checkin_title"
 			tools:text="Test test" />
 
 		<com.google.android.material.checkbox.MaterialCheckBox
diff --git a/app/src/main/res/layout/pdf_qr_code.xml b/app/src/main/res/layout/pdf_qr_code.xml
index f267effb9..a04eb6d35 100644
--- a/app/src/main/res/layout/pdf_qr_code.xml
+++ b/app/src/main/res/layout/pdf_qr_code.xml
@@ -19,16 +19,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		tools:text="Title" />
 
-	<TextView
-		android:id="@+id/subtitle"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:fontFamily="@font/inter_light"
-		android:gravity="center_horizontal"
-		android:textColor="@android:color/black"
-		android:textSize="13px"
-		app:layout_constraintTop_toBottomOf="@id/title"
-		tools:text="Subtitle" />
+
 
 	<LinearLayout
 		android:layout_width="match_parent"
diff --git a/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt b/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt
index 08d85983e..9ada72779 100644
--- a/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt
+++ b/common/src/main/java/ch/admin/bag/dp3t/extensions/CommonVenueInfoExtensions.kt
@@ -16,8 +16,3 @@ fun VenueInfo.getSwissCovidLocationData(): SwissCovidLocationData {
 		}
 	}
 }
-
-@StringRes
-fun VenueInfo.getSubtitle(): Int {
-	return getSwissCovidLocationData().type.getNameRes()
-}

From 6cfce92b1f2664d9826f58eb0d039382cc357764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 17 Jun 2021 14:32:39 +0200
Subject: [PATCH 166/207] add dynamic title to create qr-code card (depending
 on if you already created a QR-Code)

---
 .../bag/dp3t/checkin/CheckinOverviewFragment.kt     | 13 ++++++++++++-
 .../generateqrcode/EventsOverviewFragment.kt        |  3 ++-
 app/src/main/res/layout/card_generate_qr_code.xml   |  1 +
 .../main/res/layout/fragment_events_overview.xml    |  3 +--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
index efcec4d52..d69868b98 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CheckinOverviewFragment.kt
@@ -15,9 +15,10 @@ import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.checkinflow.QrCodeScannerFragment
 import ch.admin.bag.dp3t.checkin.diary.DiaryFragment
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
+import ch.admin.bag.dp3t.checkin.generateqrcode.QRCodeViewModel
 import ch.admin.bag.dp3t.databinding.FragmentCheckinOverviewBinding
-import ch.admin.bag.dp3t.util.StringUtil
 import ch.admin.bag.dp3t.extensions.showFragment
+import ch.admin.bag.dp3t.util.StringUtil
 import ch.admin.bag.dp3t.viewmodel.TracingViewModel
 
 class CheckinOverviewFragment : Fragment() {
@@ -31,6 +32,7 @@ class CheckinOverviewFragment : Fragment() {
 
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by activityViewModels()
 	private val tracingViewModel: TracingViewModel by activityViewModels()
+	private val qrCodeViewModel: QRCodeViewModel by activityViewModels()
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		return FragmentCheckinOverviewBinding.inflate(inflater).apply {
@@ -60,6 +62,15 @@ class CheckinOverviewFragment : Fragment() {
 				checkinTime.text = StringUtil.getShortDurationString(duration)
 			}
 
+			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner) {
+				qrCodeGenerate.evemtsCardTitle.text =
+					if (it.isEmpty()) {
+						getString(R.string.events_card_title)
+					} else {
+						getString(R.string.events_card_title_events_not_empty)
+					}
+			}
+
 			qrCodeGenerate.root.setOnClickListener { showFragment(EventsOverviewFragment.newInstance()) }
 
 		}.root
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index a26e132d1..ea84d2d4f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
@@ -38,12 +37,14 @@ class EventsOverviewFragment : Fragment() {
 			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner) { events ->
 				if (events.isEmpty()) {
 					adapter.setItems(listOf(ExplanationItem(showOnlyInfobox = false), FooterItem()))
+					eventsToolbar.title = getString(R.string.checkins_create_qr_code)
 				} else {
 					adapter.setItems(events.map { EventItem(it) }.toMutableList<EventOverviewItem>().apply {
 						add(0, GenerateQrCodeButtonItem())
 						add(ExplanationItem(showOnlyInfobox = true))
 						add(FooterItem())
 					})
+					eventsToolbar.title = getString(R.string.events_card_title_events_not_empty)
 				}
 			}
 		}.root
diff --git a/app/src/main/res/layout/card_generate_qr_code.xml b/app/src/main/res/layout/card_generate_qr_code.xml
index 55ff88dd2..6fc850ee1 100644
--- a/app/src/main/res/layout/card_generate_qr_code.xml
+++ b/app/src/main/res/layout/card_generate_qr_code.xml
@@ -29,6 +29,7 @@
 
 			<TextView
 				style="@style/NextStep.Text.Title"
+				android:id="@+id/evemts_card_title"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="@dimen/spacing_medium"
diff --git a/app/src/main/res/layout/fragment_events_overview.xml b/app/src/main/res/layout/fragment_events_overview.xml
index 3f6b08a9c..6cc4a1ffd 100644
--- a/app/src/main/res/layout/fragment_events_overview.xml
+++ b/app/src/main/res/layout/fragment_events_overview.xml
@@ -20,8 +20,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		app:navigationContentDescription="@string/android_accessibility_back_button"
-		app:navigationIcon="@drawable/ic_arrow_back"
-		app:title="@string/events_title" />
+		app:navigationIcon="@drawable/ic_arrow_back" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/qr_list"

From 43c1cfcdf814c84e14167d482c34e5b5ce5e360a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 17 Jun 2021 14:35:39 +0200
Subject: [PATCH 167/207] translation update

---
 common/src/main/res/values-bs/strings.xml | 34 +++++++++++++++-
 common/src/main/res/values-de/strings.xml | 48 ++++++++++++++++++-----
 common/src/main/res/values-es/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-fr/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-hr/strings.xml | 34 +++++++++++++++-
 common/src/main/res/values-it/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-pt/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-rm/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-sq/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-sr/strings.xml | 34 +++++++++++++++-
 common/src/main/res/values-ti/strings.xml | 32 ++++++++++++++-
 common/src/main/res/values-tr/strings.xml | 34 +++++++++++++++-
 common/src/main/res/values/strings.xml    | 32 ++++++++++++++-
 13 files changed, 415 insertions(+), 25 deletions(-)

diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index 9bf725522..c7090d619 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -957,7 +957,7 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="share_app_body">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
+    <string name="share_app_message">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1547,7 +1547,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_detail_checked_out_text">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"Ako skenirate Swiss-Covid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
+    <string name="checkin_detail_diary_text">"Ako skenirate SwissCovid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in">"Prijavljeni ste"</string>
@@ -1768,4 +1768,34 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index d677db99e..40b97c6be 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -945,7 +945,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"Was bedeutet das?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Wenn Sie in einem der kompatiblen Länder unterwegs sind, müssen Sie keine andere Corona-App installieren.
+    <string name="travel_screen_explanation_text_1">"Wenn Sie in einem der kompatiblen Länder unterwegs sind, müssen Sie für Begegnungen keine andere Corona-App installieren.
 
 SwissCovid überprüft die in den kompatiblen Ländern veröffentlichten privaten Schlüssel. So können Sie auch bei einer möglichen Ansteckung im Ausland gewarnt werden."</string>
 
@@ -984,10 +984,10 @@ Damit auch Reisende aus dem Ausland gewarnt werden können, geschieht das unabh
     <string name="share_app_button">"App teilen"</string>
 
     <!-- Fuzzy -->
-    <string name="share_app_body">"Wenn möglichst viele die SwissCovid App nutzen, können wir Infektionsketten frühzeitig unterbrechen."</string>
+    <string name="share_app_body">"Wenn möglichst viele Ihrer Kontakte die SwissCovid App nutzen, können Sie bei einem Ansteckungsrisiko schnell informiert werden."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Wenn möglichst viele die SwissCovid App nutzen, können wir Infektionsketten frühzeitig unterbrechen."</string>
+    <string name="share_app_message">"Mit der SwissCovid App können alle dazu beitragen, die Verbreitung des Coronavirus einzudämmen."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1393,7 +1393,7 @@ Dann rufen Sie hier an:"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
     <!-- Fuzzy -->
-    <string name="travel_screen_info">"Unterwegs im Ausland? In diesen Ländern funktioniert SwissCovid."</string>
+    <string name="travel_screen_info">"Unterwegs im Ausland? In diesen Ländern funktioniert SwissCovid-Begegnungen."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Kompatible Länder:"</string>
@@ -1426,7 +1426,7 @@ Dann rufen Sie hier an:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Die privaten Schlüssel Ihrer App wurden für den folgenden Zeitraum gesendet:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Beim Eingeben eines Covidcodes muss das Tracing aktiviert sein, damit Ihre privaten Schlüssel geteilt werden können."</string>
+    <string name="android_inform_tracing_enabled_explanation">"Bitte Tracing aktivieren, um automatisch erkannte Begegnungen zu teilen und andere zu warnen."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <!-- Fuzzy -->
@@ -1538,7 +1538,7 @@ Dann rufen Sie hier an:"</string>
     <string name="checkins_create_qr_code">"QR-Code erstellen"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Check-ins anbieten"</string>
+    <string name="events_title">"QR-Codes erstellen"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Jetzt einchecken"</string>
@@ -1642,7 +1642,7 @@ Dann rufen Sie hier an:"</string>
     <string name="inform_share_checkins_subtitle">"Wenn Sie Ihre Check-in-Einträge teilen, kann die App Personen benachrichtigen, die zum gleichen Zeitpunkt am gleichen Ort eingecheckt haben."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Alle auswählen"</string>
+    <string name="inform_share_checkins_select_all">"Alle passenden auswählen"</string>
     <string name="inform_dont_send_button_title">"Nicht senden"</string>
     <string name="inform_dont_share_button_title">"Nicht teilen"</string>
     <string name="inform_really_not_share_title">"Wirklich nicht teilen?"</string>
@@ -1678,7 +1678,7 @@ Dann rufen Sie hier an:"</string>
     <string name="events_card_subtitle">"Erstellen Sie einen SwissCovid-QR-Code, mit dem sich Personen vor Ort einchecken können."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen?"</string>
+    <string name="delete_qr_code_dialog">"Möchten Sie den QR Code wirklich löschen? Gedruckte QR-Codes bleiben weiterhin gültig."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Self Check-In"</string>
@@ -1784,7 +1784,7 @@ Dieser Titel wird beim Check-in angezeigt."</string>
     <string name="checkin_report_title3">"Testen lassen"</string>
     <string name="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."</string>
     <string name="checkin_report_subtitle2">"Überwachen Sie Ihren Gesundheitszustand."</string>
-    <string name="checkin_report_subtitle3">"Lassen Sie sich beim Auftreten von Symptomen sofort testen. Auch wenn keine Symptome auftreten, ist ein Corona-Test sinnvoll und empfohlen."</string>
+    <string name="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."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <!-- Fuzzy -->
@@ -1851,4 +1851,34 @@ Dieser Titel wird beim Check-in angezeigt."</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description">"Ihre gewählte Checkout-Zeit liegt vor der Check-In-Zeit. Bitte überprüfen Sie nochmals Ihre Angabe."</string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title">"Neue Funktion: Check-in"</string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text">"Danke für die Nutzung von SwissCovid. Mit der neusten App-Version können Sie sich vor Ort einchecken, ohne Daten zu hinterlassen."</string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title">"Aktuell"</string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min">"Nochmals erinnern (30min)"</string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h">"Nochmals erinnern (1h)"</string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h">"Nochmals erinnern (2h)"</string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now">"Jetzt auschecken"</string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text">"Bitte benutzen Sie zum Scannen dieses QR-Codes die App \"COVID Certificate\"."</string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app">"App öffnen"</string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app">"App installieren"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 814f881f4..32be7b664 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -950,7 +950,7 @@ Al fin de poder alertar también a los viajeros del extranjero, esto ocurre inde
     <string name="share_app_body">"Si un gran número de personas activan la app SwissCovid, es posible interrumpir las cadenas de contagio a tiempo."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Si un gran número de personas activan la app SwissCovid, es posible interrumpir las cadenas de contagio a tiempo."</string>
+    <string name="share_app_message">"Con la aplicación Swiss Covid, todos podemos contribuir a contener la propagación del virus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1760,4 +1760,34 @@ Posibles utilizaciones:
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 7001b8d7b..e1e028d59 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -959,7 +959,7 @@ d'ouvrir un site internet."</string>
     <string name="share_app_body">"Si un maximum de personnes activent l'application SwissCovid, nous pouvons interrompre rapidement les chaînes d'infection."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Si un maximum de personnes activent l'application SwissCovid, nous pouvons interrompre rapidement les chaînes d'infection."</string>
+    <string name="share_app_message">"Grâce à l'application SwissCovid, tout le monde peut contribuer à endiguer la propagation du virus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://ofsp-coronavirus.ch/application-swisscovid/#download"</string>
@@ -1792,4 +1792,34 @@ Ce titre s’affichera lors du check-in."</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 3f73a6c87..d5f166f1e 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -955,7 +955,7 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="share_app_body">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
+    <string name="share_app_message">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1545,7 +1545,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_detail_checked_out_text">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"Ako skenirate Swiss-Covid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
+    <string name="checkin_detail_diary_text">"Ako skenirate SwissCovid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in">"Prijavljeni ste"</string>
@@ -1766,4 +1766,34 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 74eb93f25..6b46f070b 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -964,7 +964,7 @@ Affinché anche i viaggiatori all'estero possano essere avvisati, la condivision
     <string name="share_app_body">"Quante più persone attivano l'app SwissCovid, tanto più è possibile interrompere precocemente le catene di infezione."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Quante più persone attivano l'app SwissCovid, tanto più è possibile interrompere precocemente le catene di infezione."</string>
+    <string name="share_app_message">"Con l'app SwissCovid tutti possono contribuire a contenere la diffusione del coronavirus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://ufsp-coronavirus.ch/app-swisscovid/#download"</string>
@@ -1803,4 +1803,34 @@ Possibili luoghi d'impiego:
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index 23bc5498e..c98cee1da 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -958,7 +958,7 @@ Isto acontece independentemente de ter estado no estrangeiro ou não para que os
     <string name="share_app_body">"Quanto mais pessoas ativarem a app SwissCovid, mais cedo conseguiremos interromper as cadeias de transmissão."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Quanto mais pessoas ativarem a app SwissCovid, mais cedo conseguiremos interromper as cadeias de transmissão."</string>
+    <string name="share_app_message">"Com a app Swiss Covid, todos podem ajudar a conter a propagação do coronavírus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1770,4 +1770,34 @@ Este título vai ser indicado no check-in."</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index 271c197e2..aefaf24ee 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -955,7 +955,7 @@ Per che er las viagiaturas ed ils viagiaturs da l'exteriur possian vegnir infurm
     <string name="share_app_body">"Sche uschè bleras persunas sco pussaivel activeschan l'app SwissCovid, pudain nus interrumper ad uras las chadainas d'infecziun."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Sche uschè bleras persunas sco pussaivel activeschan l'app SwissCovid, pudain nus interrumper ad uras las chadainas d'infecziun."</string>
+    <string name="share_app_message">"Cun l'app SwissCovid pon tuts gidar da franar la derasaziun dal coronavirus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1766,4 +1766,34 @@ Quai pon esser p.ex.:
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index bd37827cc..045884a3c 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -958,7 +958,7 @@ Në mënyrë që udhëtarët nga jashtë shtetit të mund të paralajmërohen, k
     <string name="share_app_body">"Kur aplikacionin \"SwissCovid\" e aktivizojnë sa më shumë persona të jetë e mundur, atëherë ne mund ta ndërpresim më herët zinxhirin e infektimit."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Kur aplikacionin \"SwissCovid\" e aktivizojnë sa më shumë persona të jetë e mundur, atëherë ne mund ta ndërpresim më herët zinxhirin e infektimit."</string>
+    <string name="share_app_message">"Me aplikacionin Swiss Covid të gjithë ne mund të ndihmojmë për të frenuar përhapjen e koronavirusin."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1771,4 +1771,34 @@ Ky titull shfaqet gjatë Check-in."</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index 167d44f8b..df52ffb10 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -955,7 +955,7 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="share_app_body">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
+    <string name="share_app_message">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1545,7 +1545,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_detail_checked_out_text">"Skenirajte SwissCovid-QR kod, kako biste se prijavili na nekoj lokaciji."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"Ako skenirate Swiss-Covid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
+    <string name="checkin_detail_diary_text">"Ako skenirate SwissCovid-QR kod, da biste se prijavili na nekoj lokaciji, ovde se automatski uređuje unos."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in">"Prijavljeni ste"</string>
@@ -1766,4 +1766,34 @@ U tom slučaju kontaktirajte nas ovde:"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index 3b973a109..d275f7240 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -941,7 +941,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="share_app_body">"ብዝተኻእለ መጠን ብዙሓት ንSwissCovid ኤፕ እንድሕር ወሊዖሞ፣ ናይ ልበዳ ሰንሰለታት ብኣጋኡ ከነቋርጾም ንኽእል ኢና።"</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"ብዝተኻእለ መጠን ብዙሓት ንSwissCovid ኤፕ እንድሕር ወሊዖሞ፣ ናይ ልበዳ ሰንሰለታት ብኣጋኡ ከነቋርጾም ንኽእል ኢና።"</string>
+    <string name="share_app_message">"ብስዊስኮድ ኣፕ ዝርግሐ ናይ ኮሮናቫይረስ ንኽዕገት እጃምኩም ተበርክቱ።"</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1754,4 +1754,34 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index 1f2123f89..435f29272 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -941,7 +941,7 @@ Yurt dışı seyahatlerinden gelen kişilerin de uyarılabilmesi için bu, sizin
     <string name="share_app_body">"SwissCovid uygulaması ne kadar çok kişi tarafından kullanılırsa, enfeksiyon zinciri o kadar erken kırılabilir."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"SwissCovid uygulaması ne kadar çok kişi tarafından kullanılırsa, enfeksiyon zinciri o kadar erken kırılabilir."</string>
+    <string name="share_app_message">"SwissCovid uygulaması ile Korona virüsünün yayılımını sınırlandırmaya yardımcı olabilirsiniz."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1531,7 +1531,7 @@ O halde şu numarayı arayın:"</string>
     <string name="checkin_detail_checked_out_text">"Bulunduğunuz yere check-in yapmak için bir SwissCovid kare kodunu tarayın."</string>
 
     <!-- Text im Check-Ins-Screen, im Tagebuch-Modul -->
-    <string name="checkin_detail_diary_text">"Bir yere check-in yapmak için bir Swiss-Covid kare kodunu taradığınızda buraya otomatik olarak bir kayıt oluşturulur."</string>
+    <string name="checkin_detail_diary_text">"Bir yere check-in yapmak için bir SwissCovid kare kodunu taradığınızda buraya otomatik olarak bir kayıt oluşturulur."</string>
 
     <!-- Label im Checkin-Modul im eingecheckten Zustand -->
     <string name="checkin_checked_in">"Check-in yaptınız"</string>
@@ -1754,4 +1754,34 @@ Bu başlık check-in sırasında gösterilir."</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index d8ffe3da8..3b6b48869 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -957,7 +957,7 @@ To enable travellers from abroad to also receive alerts, this happens regardless
     <string name="share_app_body">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
+    <string name="share_app_message">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://foph-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1793,4 +1793,34 @@ Protect your contacts"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
     <string name="checkout_inverse_time_alert_description"></string>
+
+    <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_title"></string>
+
+    <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
+    <string name="update_notification_checkin_feature_text"></string>
+
+    <!-- Titel für aktuellen Check-in im Tagebuch -->
+    <string name="diary_current_title"></string>
+
+    <!-- Snooze Option um 30min später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_30min"></string>
+
+    <!-- Snooze Option um 1h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_1h"></string>
+
+    <!-- Snooze Option um 2h später an Checkout zu erinnern -->
+    <string name="ios_snooze_option_2h"></string>
+
+    <!-- Notification Quickaction um jetzt auszuchecken -->
+    <string name="ios_notification_checkout_now"></string>
+
+    <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
+    <string name="covid_certificate_alert_text"></string>
+
+    <!-- Button um Covid Certificate App zu öffnen -->
+    <string name="covid_certificate_open_app"></string>
+
+    <!-- Button um Covid Certificate App zu installieren -->
+    <string name="covid_certificate_install_app"></string>
 </resources>
\ No newline at end of file

From 19a6610f57e163c8f915c668e32d65d4565922bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 17 Jun 2021 14:42:12 +0200
Subject: [PATCH 168/207] remove share header froms tats tab

---
 app/src/main/res/layout/fragment_stats.xml | 28 +++-------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
index ac057d2f0..881dd6d82 100644
--- a/app/src/main/res/layout/fragment_stats.xml
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -150,39 +150,16 @@
 					android:background="@color/divider"
 					app:layout_constraintTop_toBottomOf="@id/stats_more" />
 
-				<TextView
-					android:id="@+id/share_app_supertitle"
-					style="@style/NextStep.Text.Blue"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_larger"
-					android:text="@string/share_app_supertitle"
-					app:layout_constraintEnd_toEndOf="parent"
-					app:layout_constraintStart_toStartOf="parent"
-					app:layout_constraintTop_toBottomOf="@id/divider" />
-
-				<TextView
-					android:id="@+id/share_app_title"
-					style="@style/NextStep.Text.Title.Dark"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginStart="@dimen/spacing_very_large"
-					android:layout_marginEnd="@dimen/spacing_very_large"
-					android:paddingTop="@dimen/spacing_very_small"
-					android:text="@string/share_app_title"
-					app:layout_constraintEnd_toEndOf="parent"
-					app:layout_constraintStart_toStartOf="parent"
-					app:layout_constraintTop_toBottomOf="@id/share_app_supertitle" />
-
 				<ImageView
 					android:id="@+id/share_app_image"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginStart="@dimen/spacing_larger"
+					android:layout_marginTop="@dimen/spacing_larger"
 					android:layout_marginEnd="@dimen/spacing_larger"
 					android:layout_marginBottom="@dimen/spacing_medium_large"
 					android:src="@drawable/stats_share_app"
-					app:layout_constraintTop_toBottomOf="@id/share_app_title" />
+					app:layout_constraintTop_toBottomOf="@id/divider" />
 
 				<Button
 					android:id="@+id/share_app_button"
@@ -202,6 +179,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginStart="@dimen/spacing_huge"
 					android:layout_marginEnd="@dimen/spacing_huge"
+					android:gravity="center"
 					android:paddingTop="@dimen/spacing_medium_large"
 					android:paddingBottom="@dimen/spacing_very_large"
 					android:text="@string/share_app_body"

From 4f6dd13c8f0f9d34824b415dd0650839ad4612ba Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Thu, 17 Jun 2021 22:34:16 +0200
Subject: [PATCH 169/207] show keyboard automatically on create qr screen

---
 .../dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
index 87b65ff5e..2a9bd9749 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/GenerateQrCodeFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
+import androidx.core.view.doOnLayout
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -28,6 +29,12 @@ class GenerateQrCodeFragment : Fragment() {
 			qrCodeGenerate.setOnClickListener { generateQrCode(titleEditText.text.toString()) }
 			qrCodeGenerate.isEnabled = !titleEditText.text.isNullOrBlank()
 			titleEditText.doOnTextChanged { text, _, _, _ -> qrCodeGenerate.isEnabled = !text.isNullOrBlank() }
+
+			titleEditText.doOnLayout {
+				it.requestFocus()
+				val imm = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+				imm.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
+			}
 		}
 		return binding.root
 	}

From a40461b8e24b3df1e386243252af38753b0560a3 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Fri, 18 Jun 2021 00:27:25 +0200
Subject: [PATCH 170/207] show current checkin in diary

---
 .../dp3t/checkin/CrowdNotifierViewModel.java  |  1 +
 .../bag/dp3t/checkin/diary/DiaryFragment.kt   | 25 +++++-
 .../diary/DiaryRecyclerViewAdapter.java       | 83 +++++++++++++++++--
 .../diary/items/ItemVenueVisitCurrent.java    | 22 +++++
 .../diary/items/VenueVisitRecyclerItem.java   |  2 +-
 .../item_checkin_venue_visit_current.xml      | 43 ++++++++++
 6 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitCurrent.java
 create mode 100644 app/src/main/res/layout/item_checkin_venue_visit_current.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index eeccb4f1f..07adf72ad 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -219,6 +219,7 @@ public void performCheckinAndSetReminders(VenueInfo venueInfo, long selectedRemi
 	public void onCleared() {
 		super.onCleared();
 		LocalBroadcastManager.getInstance(getApplication()).unregisterReceiver(broadcastReceiver);
+		handler.removeCallbacks(timeUpdateRunnable);
 	}
 
 	public enum LoadingState {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 69c604afd..2852c62cb 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -7,8 +7,11 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
+import ch.admin.bag.dp3t.checkin.checkinflow.CheckOutFragment
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit
+import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitCurrent
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem
 import ch.admin.bag.dp3t.checkin.models.DiaryEntry
@@ -38,6 +41,26 @@ class DiaryFragment : Fragment() {
 			val recyclerAdapter = DiaryRecyclerViewAdapter()
 			checkinDiaryRecyclerView.adapter = recyclerAdapter
 
+			crowdNotifierViewModel.isCheckedIn.observe(viewLifecycleOwner) { isCheckedIn ->
+				if (isCheckedIn) {
+					recyclerAdapter.setCurrentCheckinData(
+						ItemVenueVisitDayHeader(getString(R.string.diary_current_title)),
+						ItemVenueVisitCurrent(crowdNotifierViewModel.checkInState)
+					) {
+						showFragment(CheckOutFragment.newInstance(), modalAnimation = true)
+					}
+					crowdNotifierViewModel.startCheckInTimer()
+				} else {
+					recyclerAdapter.setCurrentCheckinDataNone()
+				}
+			}
+
+			crowdNotifierViewModel.timeSinceCheckIn.observe(viewLifecycleOwner) { time ->
+				if (time > 0) {
+					recyclerAdapter.updateCurrentCheckinData()
+				}
+			}
+
 			crowdNotifierViewModel.exposures.observe(viewLifecycleOwner) { exposures ->
 				val items = ArrayList<VenueVisitRecyclerItem>()
 				val diaryEntries = DiaryStorage.getInstance(context).entries.sortedByDescending {
@@ -56,7 +79,7 @@ class DiaryFragment : Fragment() {
 						onDiaryEntryClicked(diaryEntry, getExposureWithId(exposures, diaryEntry.id))
 					})
 				}
-				recyclerAdapter.setData(items)
+				recyclerAdapter.setDiaryData(items)
 			}
 		}.root
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index 3aaae6761..db8fa1b77 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -15,23 +15,34 @@
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisit;
+import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitCurrent;
 import ch.admin.bag.dp3t.checkin.diary.items.ItemVenueVisitDayHeader;
 import ch.admin.bag.dp3t.checkin.diary.items.VenueVisitRecyclerItem;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
 import ch.admin.bag.dp3t.extensions.CommonVenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.util.StringUtil;
 
 public class DiaryRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private final List<VenueVisitRecyclerItem> items = new ArrayList<>();
+	private final List<VenueVisitRecyclerItem> currentCheckinItems = new ArrayList<>();
+	private final List<VenueVisitRecyclerItem> diaryItems = new ArrayList<>();
+	private Runnable onCheckoutListener;
+
+	private VenueVisitRecyclerItem getItem(int position) {
+		if (position < currentCheckinItems.size()) {
+			return currentCheckinItems.get(position);
+		} else {
+			return diaryItems.get(position - currentCheckinItems.size());
+		}
+	}
 
 	@Override
-	public int getItemViewType(int position) { return items.get(position).getViewType().ordinal(); }
+	public int getItemViewType(int position) { return getItem(position).getViewType().ordinal(); }
 
 	@NonNull
 	@Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 		VenueVisitRecyclerItem.ViewType type = VenueVisitRecyclerItem.ViewType.values()[viewType];
-
 		switch (type) {
 			case DAY_HEADER:
 				return new DayHeaderViewHolder(
@@ -40,6 +51,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 			case VENUE:
 				return new VenueVisitViewHolder(
 						LayoutInflater.from(parent.getContext()).inflate(R.layout.item_checkin_venue_visit, parent, false));
+			case CURRENT:
+				return new VenueVisitCurrentViewHolder(
+						LayoutInflater.from(parent.getContext()).inflate(R.layout.item_checkin_venue_visit_current, parent, false));
 			default:
 				throw new IllegalArgumentException();
 		}
@@ -47,8 +61,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 
 	@Override
 	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		VenueVisitRecyclerItem item = items.get(position);
-
+		VenueVisitRecyclerItem item = getItem(position);
 		switch (item.getViewType()) {
 			case DAY_HEADER:
 				((DayHeaderViewHolder) holder).bind((ItemVenueVisitDayHeader) item);
@@ -56,17 +69,47 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 			case VENUE:
 				((VenueVisitViewHolder) holder).bind((ItemVenueVisit) item);
 				break;
+			case CURRENT:
+				((VenueVisitCurrentViewHolder) holder).bind((ItemVenueVisitCurrent) item);
+				break;
 		}
 	}
 
 	@Override
 	public int getItemCount() {
-		return items.size();
+		return currentCheckinItems.size() + diaryItems.size();
+	}
+
+	public void setCurrentCheckinData(ItemVenueVisitDayHeader headerItem, ItemVenueVisitCurrent checkinItem, Runnable onCheckoutListener) {
+		this.onCheckoutListener = onCheckoutListener;
+
+		boolean hadCheckin = !currentCheckinItems.isEmpty();
+		if (hadCheckin) {
+			notifyItemChanged(1, checkinItem);
+		} else {
+			currentCheckinItems.add(headerItem);
+			currentCheckinItems.add(checkinItem);
+			notifyItemRangeInserted(0, currentCheckinItems.size());
+		}
+	}
+
+	public void updateCurrentCheckinData() {
+		if (!currentCheckinItems.isEmpty()) {
+			notifyItemChanged(1, currentCheckinItems.get(1));
+		}
+	}
+
+	public void setCurrentCheckinDataNone() {
+		int itemsToRemove = currentCheckinItems.size();
+		if (itemsToRemove > 0) {
+			currentCheckinItems.clear();
+			notifyItemRangeRemoved(0, itemsToRemove);
+		}
 	}
 
-	public void setData(List<VenueVisitRecyclerItem> items) {
-		this.items.clear();
-		this.items.addAll(items);
+	public void setDiaryData(List<VenueVisitRecyclerItem> items) {
+		diaryItems.clear();
+		diaryItems.addAll(items);
 		notifyDataSetChanged();
 	}
 
@@ -119,4 +162,26 @@ public void bind(ItemVenueVisit item) {
 
 	}
 
+
+	public class VenueVisitCurrentViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextView nameTextView;
+		private final TextView timeTextView;
+
+		public VenueVisitCurrentViewHolder(View itemView) {
+			super(itemView);
+			nameTextView = itemView.findViewById(R.id.item_diary_current_name);
+			timeTextView = itemView.findViewById(R.id.item_diary_current_time);
+			itemView.findViewById(R.id.item_diary_checkout_button).setOnClickListener(v -> onCheckoutListener.run());
+		}
+
+		public void bind(ItemVenueVisitCurrent item) {
+			CheckInState checkInState = item.getCheckInState();
+			nameTextView.setText(checkInState.getVenueInfo().getTitle());
+			long duration = System.currentTimeMillis() - checkInState.getCheckInTime();
+			timeTextView.setText(StringUtil.getShortDurationString(duration));
+		}
+
+	}
+
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitCurrent.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitCurrent.java
new file mode 100644
index 000000000..d0d1509fb
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/ItemVenueVisitCurrent.java
@@ -0,0 +1,22 @@
+package ch.admin.bag.dp3t.checkin.diary.items;
+
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+
+public class ItemVenueVisitCurrent extends VenueVisitRecyclerItem {
+
+	private final CheckInState checkInState;
+
+	public ItemVenueVisitCurrent(CheckInState checkInState) {
+		this.checkInState = checkInState;
+	}
+
+	public CheckInState getCheckInState() {
+		return checkInState;
+	}
+
+	@Override
+	public ViewType getViewType() {
+		return ViewType.CURRENT;
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java
index b648735b3..e1457c220 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/items/VenueVisitRecyclerItem.java
@@ -3,7 +3,7 @@
 public abstract class VenueVisitRecyclerItem {
 
 	public enum ViewType {
-		VENUE, DAY_HEADER
+		VENUE, DAY_HEADER, CURRENT
 	}
 
 	public abstract ViewType getViewType();
diff --git a/app/src/main/res/layout/item_checkin_venue_visit_current.xml b/app/src/main/res/layout/item_checkin_venue_visit_current.xml
new file mode 100644
index 000000000..82fb77908
--- /dev/null
+++ b/app/src/main/res/layout/item_checkin_venue_visit_current.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/NextStep.Card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginVertical="@dimen/spacing_very_small">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/spacing_large"
+		android:layout_marginVertical="@dimen/spacing_medium"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/item_diary_current_name"
+			style="@style/NextStep.Text.Bold.Blue"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			tools:text="Meeting Room IP32" />
+
+		<TextView
+			android:id="@+id/item_diary_current_time"
+			style="@style/NextStep.Text.Blue"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_tiny_small"
+			tools:text="28:42" />
+
+		<Button
+			android:id="@+id/item_diary_checkout_button"
+			style="@style/NextStep.Button.Outlined"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/spacing_medium_large"
+			android:layout_marginBottom="@dimen/spacing_small"
+			android:text="@string/checkout_button_title" />
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>

From 8d80d7dbdd1e4f292e981120480f58cb8b6fecbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 18 Jun 2021 07:47:37 +0200
Subject: [PATCH 171/207] make sure that auto-checkout does not create overlaps
 in checkins

---
 .../ch/admin/bag/dp3t/AutoCheckoutTest.java   | 145 ++++++++++++++++++
 .../utils/CrowdNotifierReminderHelper.java    |  33 +++-
 2 files changed, 174 insertions(+), 4 deletions(-)
 create mode 100644 app/src/androidTest/java/ch/admin/bag/dp3t/AutoCheckoutTest.java

diff --git a/app/src/androidTest/java/ch/admin/bag/dp3t/AutoCheckoutTest.java b/app/src/androidTest/java/ch/admin/bag/dp3t/AutoCheckoutTest.java
new file mode 100644
index 000000000..b8ad970ab
--- /dev/null
+++ b/app/src/androidTest/java/ch/admin/bag/dp3t/AutoCheckoutTest.java
@@ -0,0 +1,145 @@
+package ch.admin.bag.dp3t;
+
+import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.io.IOException;
+
+import org.crowdnotifier.android.sdk.model.VenueInfo;
+import org.crowdnotifier.android.sdk.utils.QrUtils;
+import org.dpppt.android.sdk.internal.logger.LogLevel;
+import org.dpppt.android.sdk.internal.logger.Logger;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
+import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
+import ch.admin.bag.dp3t.checkin.utils.CrowdNotifierReminderHelper;
+import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
+import ch.admin.bag.dp3t.storage.SecureStorage;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(AndroidJUnit4.class)
+public class AutoCheckoutTest {
+
+	Context context;
+	DiaryStorage diaryStorage;
+	VenueInfo checkinVenueInfo;
+
+	@Before
+	public void setup() throws IOException, QrUtils.InvalidQRCodeFormatException {
+		context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+		Logger.init(context, LogLevel.DEBUG);
+		diaryStorage = DiaryStorage.getInstance(context);
+		diaryStorage.clear();
+
+		checkinVenueInfo = QrUtils.getVenueInfoFromQrCode("CAQSFAgEEgRUZXN0IL3drYYGKL29nZ4mGoYBCAQSYJVub6E0VUfo4GDIli3dOIY78shUBu0DsgS8NA-12wEpapYNAL4kDKoI2wAWZPT3Aoqdu7M66hcr_9WLSmRPHss7e77TeKinyXVqyLS0c0bY2_N6Yjd3A7f8jaO7IqIUFRogzt1hjKGnZoXWLtf-Oqmx755rZDjLagUig00M4lBkfFAiHwgEIIDo3Q0ogNzMFDDg1AMwgN3bATCAurcDMID07gY");
+	}
+
+	@Test
+	public void checkAutoCheckoutWithEmptyDiary(){
+
+		long checkinTime = System.currentTimeMillis()-13*60*60*1000L;
+		CheckInState checkInState = new CheckInState(true, checkinVenueInfo, checkinTime, -1, -1);
+		CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
+
+		// There should be exactly one entry in the diary
+		assertEquals(1, diaryStorage.getEntries().size());
+		assertEquals(checkinTime, diaryStorage.getEntries().get(0).getCheckInTime());
+		assertEquals(checkinTime+ VenueInfoExtensionsKt.getAutoCheckoutDelay(checkinVenueInfo), diaryStorage.getEntries().get(0).getCheckOutTime());
+	}
+
+	@Test
+	public void checkAutoCheckoutWithoutOverlap(){
+
+		long checkinTime = System.currentTimeMillis()-13*60*60*1000L;
+
+		diaryStorage.addEntry(new DiaryEntry(0, checkinTime-60*60*1000L, checkinTime, checkinVenueInfo));
+
+		CheckInState checkInState = new CheckInState(true, checkinVenueInfo, checkinTime, -1, -1);
+		CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
+
+		// There should be exactly one entry in the diary
+		assertEquals(2, diaryStorage.getEntries().size());
+		assertEquals(checkinTime, diaryStorage.getEntries().get(1).getCheckInTime());
+		assertEquals(checkinTime+ VenueInfoExtensionsKt.getAutoCheckoutDelay(checkinVenueInfo), diaryStorage.getEntries().get(1).getCheckOutTime());
+	}
+
+	@Test
+	public void checkAutoCheckoutWithOneOverlap(){
+
+		long checkinTime = System.currentTimeMillis()-13*60*60*1000L;
+		long overlapCheckin = checkinTime+60*60*1000L;
+		long overlapCheckout = overlapCheckin+60*60*1000L;
+
+		diaryStorage.addEntry(new DiaryEntry(0, overlapCheckin, overlapCheckout, checkinVenueInfo));
+
+		CheckInState checkInState = new CheckInState(true, checkinVenueInfo, checkinTime, -1, -1);
+		CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
+
+		// There should be exactly one entry in the diary
+		assertEquals(3, diaryStorage.getEntries().size());
+		assertEquals(checkinTime, diaryStorage.getEntries().get(1).getCheckInTime());
+		assertEquals(overlapCheckin, diaryStorage.getEntries().get(1).getCheckOutTime());
+		assertEquals(overlapCheckout, diaryStorage.getEntries().get(2).getCheckInTime());
+		assertEquals(checkinTime+ VenueInfoExtensionsKt.getAutoCheckoutDelay(checkinVenueInfo), diaryStorage.getEntries().get(2).getCheckOutTime());
+	}
+
+	@Test
+	public void checkAutoCheckoutWithTwoOverlapsNoGap(){
+
+		long checkinTime = System.currentTimeMillis()-13*60*60*1000L;
+		long overlap1Checkin = checkinTime+60*60*1000L;
+		long overlap1Checkout = overlap1Checkin+60*60*1000L;
+		long overlap2Checkin = overlap1Checkout;
+		long overlap2Checkout = overlap1Checkout+2*60*60*1000L;
+
+
+		diaryStorage.addEntry(new DiaryEntry(0, overlap1Checkin, overlap1Checkout, checkinVenueInfo));
+		diaryStorage.addEntry(new DiaryEntry(1, overlap2Checkin, overlap2Checkout, checkinVenueInfo));
+
+		CheckInState checkInState = new CheckInState(true, checkinVenueInfo, checkinTime, -1, -1);
+		CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
+
+		// There should be exactly one entry in the diary
+		assertEquals(4, diaryStorage.getEntries().size());
+		assertEquals(checkinTime, diaryStorage.getEntries().get(2).getCheckInTime());
+		assertEquals(overlap1Checkin, diaryStorage.getEntries().get(2).getCheckOutTime());
+		assertEquals(overlap2Checkout, diaryStorage.getEntries().get(3).getCheckInTime());
+		assertEquals(checkinTime+ VenueInfoExtensionsKt.getAutoCheckoutDelay(checkinVenueInfo), diaryStorage.getEntries().get(3).getCheckOutTime());
+
+	}
+
+	@Test
+	public void checkAutoCheckoutWithTwoOverlapsWithGap(){
+
+		long checkinTime = System.currentTimeMillis()-13*60*60*1000L;
+		long overlap1Checkin = checkinTime+60*60*1000L;
+		long overlap1Checkout = overlap1Checkin+60*60*1000L;
+		long overlap2Checkin = overlap1Checkout+60*60*1000L;
+		long overlap2Checkout = overlap1Checkout+2*60*60*1000L;
+
+
+		diaryStorage.addEntry(new DiaryEntry(0, overlap1Checkin, overlap1Checkout, checkinVenueInfo));
+		diaryStorage.addEntry(new DiaryEntry(1, overlap2Checkin, overlap2Checkout, checkinVenueInfo));
+
+		CheckInState checkInState = new CheckInState(true, checkinVenueInfo, checkinTime, -1, -1);
+		CrowdNotifierReminderHelper.autoCheckoutIfNecessary(context, checkInState);
+
+		// There should be exactly one entry in the diary
+		assertEquals(5, diaryStorage.getEntries().size());
+		assertEquals(checkinTime, diaryStorage.getEntries().get(2).getCheckInTime());
+		assertEquals(overlap1Checkin, diaryStorage.getEntries().get(2).getCheckOutTime());
+		assertEquals(overlap1Checkout, diaryStorage.getEntries().get(3).getCheckInTime());
+		assertEquals(overlap2Checkin, diaryStorage.getEntries().get(3).getCheckOutTime());
+		assertEquals(overlap2Checkout, diaryStorage.getEntries().get(4).getCheckInTime());
+		assertEquals(checkinTime+ VenueInfoExtensionsKt.getAutoCheckoutDelay(checkinVenueInfo), diaryStorage.getEntries().get(4).getCheckOutTime());
+
+	}
+
+}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
index b5e5cf3b6..44871950e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/utils/CrowdNotifierReminderHelper.java
@@ -8,14 +8,17 @@
 import android.content.Intent;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.crowdnotifier.android.sdk.CrowdNotifier;
 
 import ch.admin.bag.dp3t.BuildConfig;
+import ch.admin.bag.dp3t.checkin.models.CheckInState;
+import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
 import ch.admin.bag.dp3t.checkin.storage.DiaryStorage;
 import ch.admin.bag.dp3t.extensions.VenueInfoExtensionsKt;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.checkin.models.DiaryEntry;
-import ch.admin.bag.dp3t.checkin.models.CheckInState;
 
 public class CrowdNotifierReminderHelper extends BroadcastReceiver {
 
@@ -120,8 +123,30 @@ public static boolean autoCheckoutIfNecessary(Context context, CheckInState chec
 		notificationHelper.showAutoCheckoutNotification();
 		long checkIn = checkInState.getCheckInTime();
 		long checkOut = checkIn + autoCheckoutDelay;
-		long id = CrowdNotifier.addCheckIn(checkIn, checkOut, checkInState.getVenueInfo(), context);
-		DiaryStorage.getInstance(context).addEntry(new DiaryEntry(id, checkIn, checkOut, checkInState.getVenueInfo()));
+
+		DiaryStorage diaryStorage = DiaryStorage.getInstance(context);
+		List<DiaryEntry> existingDiaryEntries = diaryStorage.getEntries();
+		Collections.sort(existingDiaryEntries, (a, b) -> Long.compare(a.getCheckInTime(), b.getCheckInTime()));
+		for (DiaryEntry existingEntry : existingDiaryEntries) {
+			if (existingEntry.getCheckInTime() < checkOut && existingEntry.getCheckOutTime() > checkIn) {
+				long beforeEntryCheckin = checkIn;
+				long beforeEntryCheckout = existingEntry.getCheckInTime();
+				if (beforeEntryCheckin < beforeEntryCheckout) {
+					long id =
+							CrowdNotifier.addCheckIn(beforeEntryCheckin, beforeEntryCheckout, checkInState.getVenueInfo(),
+									context);
+					diaryStorage.addEntry(new DiaryEntry(id, beforeEntryCheckin, beforeEntryCheckout,
+							checkInState.getVenueInfo()));
+				}
+				checkIn = existingEntry.getCheckOutTime();
+			}
+		}
+
+		if (checkIn < checkOut) {
+			long id = CrowdNotifier.addCheckIn(checkIn, checkOut, checkInState.getVenueInfo(), context);
+			diaryStorage.addEntry(new DiaryEntry(id, checkIn, checkOut, checkInState.getVenueInfo()));
+		}
+
 		SecureStorage storage = SecureStorage.getInstance(context);
 		storage.setCheckInState(null);
 		LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(ACTION_DID_AUTO_CHECKOUT));

From 96d9b32cd74c1ff11d9bd122b2fb8ffa0ec058b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 18 Jun 2021 07:53:24 +0200
Subject: [PATCH 172/207] fix instant app build

---
 .../src/main/java/ch/admin/bag/dp3t/InstantFragment.kt    | 4 +---
 instant/src/main/res/layout/fragment_instant.xml          | 8 --------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
index 3da9d2353..3d8b4d776 100644
--- a/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
+++ b/instant/src/main/java/ch/admin/bag/dp3t/InstantFragment.kt
@@ -9,10 +9,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import ch.admin.bag.dp3t.checkin.utils.ErrorHelper
 import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState
+import ch.admin.bag.dp3t.checkin.utils.ErrorHelper
 import ch.admin.bag.dp3t.databinding.FragmentInstantBinding
-import ch.admin.bag.dp3t.extensions.getSubtitle
 import com.google.android.gms.instantapps.InstantApps
 import com.google.android.gms.instantapps.PackageManagerCompat
 import org.crowdnotifier.android.sdk.CrowdNotifier
@@ -50,7 +49,6 @@ class InstantFragment : Fragment() {
 			val venueInfo: VenueInfo = CrowdNotifier.getVenueInfo(qrCodeUrl, BuildConfig.ENTRY_QR_CODE_HOST)
 			binding.apply {
 				title.text = venueInfo.title
-				subtitle.setText(venueInfo.getSubtitle())
 			}
 		} catch (e: QRException) {
 			handleInvalidQRCodeExceptions(e, qrCodeUrl)
diff --git a/instant/src/main/res/layout/fragment_instant.xml b/instant/src/main/res/layout/fragment_instant.xml
index baa401403..c73fe70ff 100644
--- a/instant/src/main/res/layout/fragment_instant.xml
+++ b/instant/src/main/res/layout/fragment_instant.xml
@@ -27,14 +27,6 @@
 				android:gravity="center_horizontal"
 				tools:text="Reuss Ubique" />
 
-			<TextView
-				android:id="@+id/subtitle"
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_horizontal"
-				tools:text="User Upload Code" />
-
 			<ImageView
 				android:id="@+id/illu"
 				android:layout_width="wrap_content"

From 5ac0d664d2ca9520565068f2a043871e022a33ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 18 Jun 2021 08:07:06 +0200
Subject: [PATCH 173/207] add delay logic to fake worker

---
 .../java/ch/admin/bag/dp3t/inform/InformViewModel.kt |  2 +-
 .../java/ch/admin/bag/dp3t/networking/FakeWorker.kt  | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 489373dad..672f08492 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -12,6 +12,7 @@ import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
 import ch.admin.bag.dp3t.networking.AuthCodeRepository
+import ch.admin.bag.dp3t.networking.FakeWorker.Companion.UPLOAD_REQUEST_TIME_PADDING
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
@@ -42,7 +43,6 @@ import kotlin.math.max
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
-private const val UPLOAD_REQUEST_TIME_PADDING = 5000L
 private const val CHECKOUT_TIME_PADDING_MS = 30 * 60 * 1000L
 private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
index d5f0fd510..deb44b9b4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
@@ -21,9 +21,11 @@ import org.dpppt.android.sdk.DP3T
 import org.dpppt.android.sdk.DP3TKotlin
 import org.dpppt.android.sdk.internal.logger.Logger
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
+import java.security.SecureRandom
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.max
+import kotlin.math.roundToInt
 
 class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
 
@@ -39,6 +41,8 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 		private const val FACTOR_HOUR_MILLIS = 60 * 60 * 1000L
 		private const val FACTOR_DAY_MILLIS = 24 * FACTOR_HOUR_MILLIS
 		private const val MAX_DELAY_HOURS: Long = 48
+		private const val MAX_USER_INTERACTION_DELAY: Long = 3 * 60 * 1000L
+		const val UPLOAD_REQUEST_TIME_PADDING = 5000L
 
 		private val isWorkInProgress = AtomicBoolean(false)
 
@@ -150,7 +154,10 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 			//Execute Onset Date Request
 			authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
 
-			//TODO: Insert Delay
+			val timeBetweenOnsetAndUploadRequest = (SecureRandom().nextDouble() * MAX_USER_INTERACTION_DELAY).roundToInt()
+			val paddedDelay =
+				timeBetweenOnsetAndUploadRequest + UPLOAD_REQUEST_TIME_PADDING - timeBetweenOnsetAndUploadRequest % UPLOAD_REQUEST_TIME_PADDING
+			delay(paddedDelay)
 
 			//Execute Access Token Request
 			val accessTokenResponse = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
@@ -159,8 +166,7 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 			DP3TKotlin.sendFakeInfectedRequest(context, ExposeeAuthMethodAuthorization(getAuthorizationHeader(dp3tAccessToken)))
 			//Execute Checkin UserUpload Request
 			val checkinAccessToken = accessTokenResponse.checkInAccessToken.accessToken
-			//TODO: Replace this with random delay
-			UserUploadRepository().fakeUserUpload(0, getAuthorizationHeader(checkinAccessToken))
+			UserUploadRepository().fakeUserUpload(timeBetweenOnsetAndUploadRequest, getAuthorizationHeader(checkinAccessToken))
 			true
 		} catch (e: Throwable) {
 			Logger.e(TAG, "fake request failed", e)

From dea3b2d2bb70ed76c53be45bed8839863dda9583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 18 Jun 2021 08:12:13 +0200
Subject: [PATCH 174/207] update dp3t sdk

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9f5d5d348..96d379fe0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,7 +154,7 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 	implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
-	def dp3t_sdk_version = '2.3.0-dev-8'
+	def dp3t_sdk_version = '2.3.0-dev-10'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
 	abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
@@ -168,7 +168,7 @@ dependencies {
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
 	implementation 'androidx.viewpager2:viewpager2:1.0.0'
-	implementation 'androidx.security:security-crypto:1.0.0-rc03'
+	implementation 'androidx.security:security-crypto:1.0.0'
 	implementation 'androidx.work:work-runtime-ktx:2.5.0'
 	implementation "androidx.datastore:datastore:1.0.0-beta01"
 

From 1177792303bd5fea0671f14ca4f6ad4342cb5b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 18 Jun 2021 09:57:00 +0200
Subject: [PATCH 175/207] change fake delay logic to add a random 5s delay for
 real uploads instead of padding to 5s intervals

---
 .../main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt   | 6 ++++--
 .../main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt    | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 672f08492..1d1eda052 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -12,7 +12,6 @@ import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
 import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.SelectableCheckinItem
 import ch.admin.bag.dp3t.networking.AuthCodeRepository
-import ch.admin.bag.dp3t.networking.FakeWorker.Companion.UPLOAD_REQUEST_TIME_PADDING
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
 import ch.admin.bag.dp3t.networking.errors.ResponseError
 import ch.admin.bag.dp3t.networking.models.AuthenticationCodeRequestModel
@@ -31,6 +30,7 @@ import org.dpppt.android.sdk.internal.AppConfigManager
 import org.dpppt.android.sdk.models.DayDate
 import org.dpppt.android.sdk.models.ExposeeAuthMethodAuthorization
 import retrofit2.HttpException
+import java.security.SecureRandom
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.CancellationException
@@ -39,10 +39,12 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 import kotlin.math.max
+import kotlin.math.roundToLong
 
 private const val TIMEOUT_VALID_CODE = 1000L * 60 * 5
 private const val MAX_EXPOSURE_AGE_MILLIS = 10 * 24 * 60 * 60 * 1000L
 private const val ISOLATION_DURATION_DAYS = 14L
+private const val UPLOAD_REQUEST_TIME_PADDING = 5000L
 private const val CHECKOUT_TIME_PADDING_MS = 30 * 60 * 1000L
 private const val KEY_COVIDCODE = "KEY_COVIDCODE"
 private const val KEY_HAS_SHARED_DP3T_KEYS = "KEY_HAS_SHARED_DP3T_KEYS"
@@ -106,7 +108,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		emit(Resource.loading(data = null))
 		val onsetResponseTime = onsetResponseTime ?: System.currentTimeMillis()
 		val timeBetweenOnsetAndUploadRequest = (System.currentTimeMillis() - onsetResponseTime).toInt()
-		delay(UPLOAD_REQUEST_TIME_PADDING - (System.currentTimeMillis() - onsetResponseTime) % UPLOAD_REQUEST_TIME_PADDING)
+		delay((SecureRandom().nextDouble() * UPLOAD_REQUEST_TIME_PADDING).roundToLong())
 		var oldestSharedKey: Long? = null
 		var oldestSharedCheckin: Long? = null
 		try {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
index deb44b9b4..1e08dc07a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
@@ -42,7 +42,6 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 		private const val FACTOR_DAY_MILLIS = 24 * FACTOR_HOUR_MILLIS
 		private const val MAX_DELAY_HOURS: Long = 48
 		private const val MAX_USER_INTERACTION_DELAY: Long = 3 * 60 * 1000L
-		const val UPLOAD_REQUEST_TIME_PADDING = 5000L
 
 		private val isWorkInProgress = AtomicBoolean(false)
 
@@ -155,9 +154,7 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 			authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
 
 			val timeBetweenOnsetAndUploadRequest = (SecureRandom().nextDouble() * MAX_USER_INTERACTION_DELAY).roundToInt()
-			val paddedDelay =
-				timeBetweenOnsetAndUploadRequest + UPLOAD_REQUEST_TIME_PADDING - timeBetweenOnsetAndUploadRequest % UPLOAD_REQUEST_TIME_PADDING
-			delay(paddedDelay)
+			delay(timeBetweenOnsetAndUploadRequest.toLong())
 
 			//Execute Access Token Request
 			val accessTokenResponse = authCodeRepository.getAccessToken(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))

From 8dfc6315cfce1d97e7db440216642864c3321e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 00:34:06 +0200
Subject: [PATCH 176/207] update translations and adapt to new string
 identifier

---
 .../dp3t/inform/TraceKeyShareBaseFragment.kt  |  2 +-
 common/src/main/res/values-bs/strings.xml     | 47 ++++++++--------
 common/src/main/res/values-de/strings.xml     |  3 +-
 common/src/main/res/values-es/strings.xml     | 53 +++++++++---------
 common/src/main/res/values-fr/strings.xml     | 49 +++++++++--------
 common/src/main/res/values-hr/strings.xml     | 47 ++++++++--------
 common/src/main/res/values-it/strings.xml     | 49 +++++++++--------
 common/src/main/res/values-pt/strings.xml     | 53 +++++++++---------
 common/src/main/res/values-rm/strings.xml     | 43 ++++++++-------
 common/src/main/res/values-sq/strings.xml     | 55 ++++++++++---------
 common/src/main/res/values-sr/strings.xml     | 47 ++++++++--------
 common/src/main/res/values-ti/strings.xml     | 53 +++++++++---------
 common/src/main/res/values-tr/strings.xml     | 55 ++++++++++---------
 common/src/main/res/values/strings.xml        | 47 ++++++++--------
 14 files changed, 308 insertions(+), 295 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index 542cca462..1e57e2a99 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -94,7 +94,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 
 	private fun showEnableTracingDialog(continuation: (isEnabled: Boolean) -> Unit) {
 		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
-			.setMessage(R.string.android_inform_tracing_enabled_explanation)
+			.setMessage(R.string.inform_tracing_enabled_explanation)
 			.setOnCancelListener { continuation(false) }
 			.setNegativeButton(R.string.cancel) { _, _ -> continuation(false) }
 			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(continuation) }
diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index c7090d619..58e354d29 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -954,7 +954,7 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="share_app_supertitle">"Zajedno…"</string>
     <string name="share_app_title">"Sprečimo širenje infekcije"</string>
     <string name="share_app_button">"Deli aplikaciju"</string>
-    <string name="share_app_body">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
+    <string name="share_app_body">"Ako većina vaših kontakata koristi aplikaciju SwissCovid, možete brzo biti obavešteni u slučaju rizika od zaraze."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
@@ -1365,7 +1365,8 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Privatni ključevi vaše aplikacije poslati su za sledeći period:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Prilikom unosa kovid šifre mora se aktivirati praćenje (tracing) kako bi vaši privatni ključevi mogli da se dele."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Prilikom unosa kovid šifre mora se aktivirati praćenje (tracing) kako bi vaši privatni ključevi mogli da se dele."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Kada pritisnete \"{BUTTON_TITLE}\" napuštate aplikaciju i dolazite na internet stranicu SwissCovid vodiča. Pri tome se podaci poslednjeg susreta sa mogućim zaražavanjem šalju internet stranici."</string>
@@ -1476,7 +1477,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkins_create_qr_code">"Napraviti QR kod"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Ponuditi prijave?"</string>
+    <string name="events_title">"Napravite QR kodove"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Sada se prijaviti"</string>
@@ -1576,7 +1577,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="inform_share_checkins_subtitle">"Kada delite unose prijave, aplikacija može istovremeno da obavesti lica, koja su se prijavila na istoj lokaciji."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Izabrati sve"</string>
+    <string name="inform_share_checkins_select_all">"Izaberite sve što odgovara"</string>
     <string name="inform_dont_send_button_title">"Ne slati"</string>
     <string name="inform_dont_share_button_title">"Ne deliti"</string>
     <string name="inform_really_not_share_title">"Zaista ne deliti?"</string>
@@ -1610,7 +1611,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="events_card_subtitle">"Napravite QR kod, pomoću kojeg lica mogu da se prijave na lokaciji."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? "</string>
+    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? Štampani QR kodovi ostaju i dalje na snazi."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Samostalno prijavljivanje"</string>
@@ -1654,7 +1655,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="home_end_isolation_card_title">"Kraj izolacije?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Želite da ponudite prijave?"</string>
+    <string name="events_card_title">"Da li želite da napravite QR kodove?"</string>
     <string name="checkin_footer_title1">"Čemu služi funkcija prijave?"</string>
     <string name="checkin_footer_subtitle1">"Funkcija prijave bez unošenja podataka o kontaktima povećava funkcije aplikacije SwissCovid. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istom mestu."</string>
     <string name="checkin_footer_title2">"Nema centralnog čuvanja podataka"</string>
@@ -1706,7 +1707,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_report_title3">"Vršiti testiranje"</string>
     <string name="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."</string>
     <string name="checkin_report_subtitle2">"Proveravajte svoje zdravsveno stanje."</string>
-    <string name="checkin_report_subtitle3">"Odmah se testirajte ako imate simptome. Čak i ako nema simptoma, test korone je važan i  preporučuje se."</string>
+    <string name="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."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Prijava"</string>
@@ -1752,50 +1753,50 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Ova prijava važi maksimalno u trajanju od {DURATION}. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Uključiti svetlo"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Isključiti svetlo"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Još uvek ste prijavljeni. Molimo odjavite se pre unosa Covid koda."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Moji QR kodovi"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Odabrano vreme za odjavu nalazi se je pre vremena za prijavu. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nova funkcija: prijava"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Hvala vam što koristite SwissCovid. Sa najnovijom verzijom aplikacije možete da se prijavite na lokaciji bez ostavljanja podataka."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Trenutno"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Podsetiti ponovo (30min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Podsetiti ponovo (1h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Podsetiti ponovo (2h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Sada se odjaviti"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Molimo koristite aplikaciju \"COVID certifikat\" za skeniranje ovog QR koda."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Otvoriti aplikaciju"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Instalirati aplikaciju"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 40b97c6be..8497b9ae7 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -1426,7 +1426,8 @@ Dann rufen Sie hier an:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Die privaten Schlüssel Ihrer App wurden für den folgenden Zeitraum gesendet:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Bitte Tracing aktivieren, um automatisch erkannte Begegnungen zu teilen und andere zu warnen."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Bitte Tracing aktivieren, um automatisch erkannte Begegnungen zu teilen und andere zu warnen."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <!-- Fuzzy -->
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 32be7b664..5850a5238 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -912,7 +912,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"¿Y esto qué significa?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Si está usted de viaje en uno de los países compatibles no es necesario descargar otra aplicación contra el coronavirus.
+    <string name="travel_screen_explanation_text_1">"Si está usted de viaje en uno de los países compatibles, no es necesario descargar otra aplicación para los contactos.
 
 SwissCovid analiza las claves privadas difundidas en los países compatibles. Así, la aplicación le avisa de un posible contagio incluso estando en el extranjero."</string>
 
@@ -947,7 +947,7 @@ Al fin de poder alertar también a los viajeros del extranjero, esto ocurre inde
     <string name="share_app_supertitle">"Juntos…"</string>
     <string name="share_app_title">"evitamos los contagios"</string>
     <string name="share_app_button">"Compartir la aplicación"</string>
-    <string name="share_app_body">"Si un gran número de personas activan la app SwissCovid, es posible interrumpir las cadenas de contagio a tiempo."</string>
+    <string name="share_app_body">"Cuantas más personas de entre sus contractos utilicen la app SwissCovid, más rápidamente será informado de un riesgo de contagio."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Con la aplicación Swiss Covid, todos podemos contribuir a contener la propagación del virus."</string>
@@ -1324,7 +1324,7 @@ Llame a este número:"</string>
     <string name="answer_no">"No"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"¿En el extranjero? SwissCovid funciona en estos países."</string>
+    <string name="travel_screen_info">"¿En el extranjero? SwissCovid-Contactos funciona en estos países."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Países compatibles:"</string>
@@ -1357,7 +1357,8 @@ Llame a este número:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Las claves privadas de su aplicación se han enviado para el periodo siguiente:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"El rastreo debe estar activado al introducir el código Covid para permitir el intercambio de las claves privadas."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"El rastreo debe estar activado al introducir el código Covid para permitir el intercambio de las claves privadas."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Al pulsar \"{BUTTON_TITLE}\", abandonará la app para ir a la página web de la Guía SwissCovid. En este proceso, también se transmitirán a la página web los datos de los últimos contactos en los que posiblemente haya habido contagio."</string>
@@ -1468,7 +1469,7 @@ Llame a este número:"</string>
     <string name="checkins_create_qr_code">"Generar código QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"¿Quiere ofrecer Check-in a otros?"</string>
+    <string name="events_title">"Generar códigos QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Check-in ahora"</string>
@@ -1568,7 +1569,7 @@ Llame a este número:"</string>
     <string name="inform_share_checkins_subtitle">"Al compartir los registros de Check-in, la aplicación puede informar a personas que se registraron al mismo tiempo en el mismo sitio."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Seleccionar todos"</string>
+    <string name="inform_share_checkins_select_all">"Seleccionar todo lo apropiado"</string>
     <string name="inform_dont_send_button_title">"No enviar"</string>
     <string name="inform_dont_share_button_title">"No compartir"</string>
     <string name="inform_really_not_share_title">"¿Seguro que no quiere compartir?"</string>
@@ -1599,10 +1600,10 @@ Llame a este número:"</string>
     <string name="checkin_overview_isolation_text">"No puede usted hacer un registro de entrada si ha dado positivo en el test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Genere un código QR para permitir que las personas puedan registrase in situ."</string>
+    <string name="events_card_subtitle">"Genere un código QR-SwissCovid para permitir que las personas puedan registrase in situ."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"¿Seguro que quiere eliminar el código QR?"</string>
+    <string name="delete_qr_code_dialog">"¿Seguro que quiere eliminar el código QR? Los códigos QR impresos mantienen su vigencia."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Auto Check-in"</string>
@@ -1644,7 +1645,7 @@ Llame a este número:"</string>
     <string name="home_end_isolation_card_title">"¿Finalizado el aislamiento?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"¿Quiere usted ofrecer Check-in a otros?"</string>
+    <string name="events_card_title">"¿Quiere usted generar códigos QR?"</string>
     <string name="checkin_footer_title1">"¿Por qué una función Check-in?"</string>
     <string name="checkin_footer_subtitle1">"La función Check-in sin registro de datos de contacto es una ampliación de la app SwissCovid. En caso de dar positivo en un test, esta función le permite alertar no solo a los contactos estrechos, sino también a personas que se registraron al mismo tiempo en el mismo lugar que usted."</string>
     <string name="checkin_footer_title2">"Sin almacenamiento centralizado de datos"</string>
@@ -1698,7 +1699,7 @@ Posibles utilizaciones:
     <string name="checkin_report_title3">"Hacer el test"</string>
     <string name="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."</string>
     <string name="checkin_report_subtitle2">"Vigile su estado de salud."</string>
-    <string name="checkin_report_subtitle3">"Ante la aparición de síntomas haga el test inmediatamente. Incluso si no tiene síntomas, es oportuno y recomendable hacer el test de Covid-19."</string>
+    <string name="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."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
@@ -1744,50 +1745,50 @@ Posibles utilizaciones:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Este Check-In tiene una duración máxima de {DURATION}. Por favor, compruebe los datos introducidos."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Luz encendida"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Luz apagada"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Aún no ha hecho el Check-in. Dése de baja antes de introducir el código Covid."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Mis códigos QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"La hora de Chek-out seleccionada es anterior a la de Check-in. Por favor, compruebe los datos introducidos."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nueva función: Check-in"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Gracias por utilizar SwissCovid. Con la nueva versión de la aplicación puede usted registrarse en un lugar sin dejar ningún dato."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Ahora"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Volver a recordar (30 min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Volver a recordar (1 h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Volver a recordar (2 h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Check-out ahora"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Para escanear este código QR utilice la aplicación \"COVID Certificate\"."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Abrir la aplicación"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Instalar la aplicación"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index e1e028d59..de75bea25 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -920,7 +920,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"Qu'est-ce que cela signifie ?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Si vous voyagez dans un des pays compatibles, vous n'avez pas besoin d'installer une autre application. 
+    <string name="travel_screen_explanation_text_1">"Si vous voyagez dans un des pays compatibles, vous n'avez pas besoin d'installer une autre application pour les contacts. 
 
 SwissCovid vérifie les clés privées publiées dans les pays compatibles. Ainsi, vous serez averti d'une infection possible à l'étranger également."</string>
 
@@ -956,7 +956,7 @@ d'ouvrir un site internet."</string>
     <string name="share_app_supertitle">"Ensemble…"</string>
     <string name="share_app_title">"empêcher les contaminations"</string>
     <string name="share_app_button">"Partager l'application"</string>
-    <string name="share_app_body">"Si un maximum de personnes activent l'application SwissCovid, nous pouvons interrompre rapidement les chaînes d'infection."</string>
+    <string name="share_app_body">"Si de nombreuses personnes utilisent l'application SwissCovid autour de vous, vous pourrez être alerté rapidement lors d'un risque d'infection."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Grâce à l'application SwissCovid, tout le monde peut contribuer à endiguer la propagation du virus."</string>
@@ -1360,7 +1360,7 @@ Appelez :"</string>
     <string name="answer_no">"Non"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"En voyage à l'étranger ? SwissCovid fonctionne dans ces pays."</string>
+    <string name="travel_screen_info">"En voyage à l'étranger ? Les contacts SwissCovid fonctionnent dans ces pays."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Pays compatibles :"</string>
@@ -1393,7 +1393,8 @@ Appelez :"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Les clés privées de votre application ont été envoyées pour la période suivante :"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Le traçage doit être activé lors de la saisie d'un code COVID, afin que les clés privées puissent être envoyées."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Le traçage doit être activé lors de la saisie d'un code COVID, afin que les clés privées puissent être envoyées."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"En cliquant sur \"{BUTTON_TITLE}\", vous quitterez l'application et serez redirigé sur le site du guide SwissCovid. Les dates de vos derniers contacts avec des personnes potentiellement infectées seront alors transmises au site."</string>
@@ -1504,7 +1505,7 @@ Appelez :"</string>
     <string name="checkins_create_qr_code">"Créer un code QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Créer un code check-in"</string>
+    <string name="events_title">"Créer un code QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Se connecter "</string>
@@ -1604,7 +1605,7 @@ Appelez :"</string>
     <string name="inform_share_checkins_subtitle">"Si vous partagez vos données de check-in, l’application peut notifier les personnes qui étaient connectées au même endroit et à la même heure."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Sélectionner tous"</string>
+    <string name="inform_share_checkins_select_all">"Tout sélectionner"</string>
     <string name="inform_dont_send_button_title">"Ne pas transmettre"</string>
     <string name="inform_dont_share_button_title">"Ne pas partager"</string>
     <string name="inform_really_not_share_title">"Ne voulez-vous vraiment pas partager les données ?"</string>
@@ -1635,7 +1636,7 @@ Appelez :"</string>
     <string name="checkin_overview_isolation_text">"Vous ne pouvez plus vous connecter après un test positif."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Créez un code QR permettant aux utilisateurs de se connecter sur place."</string>
+    <string name="events_card_subtitle">"Créez un code QR SwissCovid permettant aux utilisateurs de se connecter sur place."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog">"Souhaitez-vous vraiment supprimer le QR code?"</string>
@@ -1680,7 +1681,7 @@ Appelez :"</string>
     <string name="home_end_isolation_card_title">"Fin de l’isolement ?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Souhaitez-vous créer un code de check-in?"</string>
+    <string name="events_card_title">"Vous souhaitez créer un code QR ?"</string>
     <string name="checkin_footer_title1">"À quoi sert la fonction de check-in?"</string>
     <string name="checkin_footer_subtitle1">"La fonction de check-in sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
     <string name="checkin_footer_title2">"Pas de sauvegarde centralisée des données"</string>
@@ -1776,50 +1777,50 @@ Ce titre s’affichera lors du check-in."</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Cette connextion dure au maximum {DURATION}. Veuillez revérifier les informations saisies."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Allumer la lampe de poche"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Éteindre la lampe de poche"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Vous êtes encore connecté. Veuillez vous déconnecter avant de saisir le code COVID."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Mes codes QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"L'heure de déconnextion est antérieure à l'heure de connexion. Veuillez vérifier les informations saisies."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nouvelle fonction : connexion"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Merci d'utiliser SwissCovid. La dernière version de l'application vous permet de vous connecter sur place sans devoir laisser de données."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Actuellement"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Me rappeler (30 min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Me rappeler (1 h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Me rappeler (2 h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Se déconnecter maintenant"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Veuillez utiliser l'application COVID Certificate pour scanner ce code QR."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Ouvrir l'application"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Installer l'application"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index d5f166f1e..778c7b003 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -952,7 +952,7 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="share_app_supertitle">"Zajedno…"</string>
     <string name="share_app_title">"Sprečimo širenje infekcije"</string>
     <string name="share_app_button">"Deli aplikaciju"</string>
-    <string name="share_app_body">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
+    <string name="share_app_body">"Ako većina vaših kontakata koristi aplikaciju SwissCovid, možete brzo biti obavešteni u slučaju rizika od zaraze."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
@@ -1363,7 +1363,8 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Privatni ključevi vaše aplikacije poslati su za sledeći period:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Prilikom unosa kovid šifre mora se aktivirati praćenje (tracing) kako bi vaši privatni ključevi mogli da se dele."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Prilikom unosa kovid šifre mora se aktivirati praćenje (tracing) kako bi vaši privatni ključevi mogli da se dele."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Kada pritisnete \"{BUTTON_TITLE}\" napuštate aplikaciju i dolazite na internet stranicu SwissCovid vodiča. Pri tome se podaci poslednjeg susreta sa mogućim zaražavanjem šalju internet stranici."</string>
@@ -1474,7 +1475,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkins_create_qr_code">"Napraviti QR kod"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Ponuditi prijave?"</string>
+    <string name="events_title">"Napravite QR kodove"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Sada se prijaviti"</string>
@@ -1574,7 +1575,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="inform_share_checkins_subtitle">"Kada delite unose prijave, aplikacija može istovremeno da obavesti lica, koja su se prijavila na istoj lokaciji."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Izabrati sve"</string>
+    <string name="inform_share_checkins_select_all">"Izaberite sve što odgovara"</string>
     <string name="inform_dont_send_button_title">"Ne slati"</string>
     <string name="inform_dont_share_button_title">"Ne deliti"</string>
     <string name="inform_really_not_share_title">"Zaista ne deliti?"</string>
@@ -1608,7 +1609,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="events_card_subtitle">"Napravite QR kod, pomoću kojeg lica mogu da se prijave na lokaciji."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? "</string>
+    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? Štampani QR kodovi ostaju i dalje na snazi."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Samostalno prijavljivanje"</string>
@@ -1652,7 +1653,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="home_end_isolation_card_title">"Kraj izolacije?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Želite da ponudite prijave?"</string>
+    <string name="events_card_title">"Da li želite da napravite QR kodove?"</string>
     <string name="checkin_footer_title1">"Čemu služi funkcija prijave?"</string>
     <string name="checkin_footer_subtitle1">"Funkcija prijave bez unošenja podataka o kontaktima povećava funkcije aplikacije SwissCovid. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istom mestu."</string>
     <string name="checkin_footer_title2">"Nema centralnog čuvanja podataka"</string>
@@ -1704,7 +1705,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_report_title3">"Vršiti testiranje"</string>
     <string name="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."</string>
     <string name="checkin_report_subtitle2">"Proveravajte svoje zdravsveno stanje."</string>
-    <string name="checkin_report_subtitle3">"Odmah se testirajte ako imate simptome. Čak i ako nema simptoma, test korone je važan i  preporučuje se."</string>
+    <string name="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."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Prijava"</string>
@@ -1750,50 +1751,50 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Ova prijava važi maksimalno u trajanju od {DURATION}. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Uključiti svetlo"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Isključiti svetlo"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Još uvek ste prijavljeni. Molimo odjavite se pre unosa Covid koda."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Moji QR kodovi"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Odabrano vreme za odjavu nalazi se je pre vremena za prijavu. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nova funkcija: prijava"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Hvala vam što koristite SwissCovid. Sa najnovijom verzijom aplikacije možete da se prijavite na lokaciji bez ostavljanja podataka."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Trenutno"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Podsetiti ponovo (30min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Podsetiti ponovo (1h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Podsetiti ponovo (2h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Sada se odjaviti"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Molimo koristite aplikaciju \"COVID certifikat\" za skeniranje ovog QR koda."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Otvoriti aplikaciju"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Instalirati aplikaciju"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 6b46f070b..617f3c713 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -926,7 +926,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"Cosa significa?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Se ti trovi in un Paese compatibile non devi installare una nuova app di tracciamento.
+    <string name="travel_screen_explanation_text_1">"Se ti trovi in un Paese compatibile non devi installare una nuova app di tracciamento per gli incontri.
 
 L'app SwissCovid verifica le chiavi private pubblicate nei Paesi compatibili. In questo modo ti può avvisare anche in caso di possibile contagio all'estero."</string>
 
@@ -961,7 +961,7 @@ Affinché anche i viaggiatori all'estero possano essere avvisati, la condivision
     <string name="share_app_supertitle">"Insieme…"</string>
     <string name="share_app_title">"impediamo i contagi"</string>
     <string name="share_app_button">"Condividi l'app"</string>
-    <string name="share_app_body">"Quante più persone attivano l'app SwissCovid, tanto più è possibile interrompere precocemente le catene di infezione."</string>
+    <string name="share_app_body">"Se il maggior numero possibile dei tuoi contatti utilizza l'app SwisCovid, in caso di rischio di contagio puoi essere informato rapidamente."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Con l'app SwissCovid tutti possono contribuire a contenere la diffusione del coronavirus."</string>
@@ -1366,7 +1366,7 @@ Chiama il seguente numero:"</string>
     <string name="answer_no">"No"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"Vi trovate all'estero? L'app SwissCovid funziona nei seguenti Paesi."</string>
+    <string name="travel_screen_info">"Ti trovi all'estero? L'app SwissCovid funziona nei seguenti Paesi per gli incontri."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Paesi compatibili:"</string>
@@ -1399,7 +1399,8 @@ Chiama il seguente numero:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Le chiavi private della tua app sono state inviate per il seguente periodo:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Al momento dell'immissione di un codice Covid il tracciamento deve essere attivato affinché sia possibile condividere le tue chiavi private."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Al momento dell'immissione di un codice Covid il tracciamento deve essere attivato affinché sia possibile condividere le tue chiavi private."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Premendo il pulsante \"{BUTTON_TITLE}\" si esce dall'app e si passa al sito web della guida SwissCovid. I dati degli ultimi incontri con persone potenzialmente infette vengono trasmessi al sito web."</string>
@@ -1510,7 +1511,7 @@ Chiama il seguente numero:"</string>
     <string name="checkins_create_qr_code">"Crea codice QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offrire i check-in"</string>
+    <string name="events_title">"Creare codici QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Fai il check-in ora"</string>
@@ -1610,7 +1611,7 @@ Chiama il seguente numero:"</string>
     <string name="inform_share_checkins_subtitle">"Se condividi le tue voci di check-in, l'app potrà informare le persone che hanno fatto il check-in nello stesso luogo e nello stesso momento."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Seleziona tutto"</string>
+    <string name="inform_share_checkins_select_all">"Seleziona tutti quelli adatti"</string>
     <string name="inform_dont_send_button_title">"Non inviare"</string>
     <string name="inform_dont_share_button_title">"Non condividere"</string>
     <string name="inform_really_not_share_title">"Non condividere?"</string>
@@ -1641,7 +1642,7 @@ Chiama il seguente numero:"</string>
     <string name="checkin_overview_isolation_text">"Se sei risultato positivo al test, non puoi più fare il check-in."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Crea un codice QR per consentire alle persone di fare il check-in sul posto"</string>
+    <string name="events_card_subtitle">"Crea un codice QR SwissCovid con il quale le persone possono fare il check-in sul posto"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog">"Eliminare il codice QR?"</string>
@@ -1687,7 +1688,7 @@ senza lasciare dati"</string>
     <string name="home_end_isolation_card_title">"Terminare l'isolamento?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Vuoi offrire i check-in?"</string>
+    <string name="events_card_title">"Creare codici QR?"</string>
     <string name="checkin_footer_title1">"Perché una funzione check-in?"</string>
     <string name="checkin_footer_subtitle1">"La funzione check-in senza registrazione dei dati di contatto completa l'app SwissCovid. Con questa funzione, in caso di test positivo puoi avvisare non solo i contatti stretti, ma anche le persone che hanno fatto il check-in nello stesso luogo e nello stesso momento."</string>
     <string name="checkin_footer_title2">"Nessun salvataggio centralizzato dei dati"</string>
@@ -1787,50 +1788,50 @@ Possibili luoghi d'impiego:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Per questo check-in vige una durata massima di {DURATION}. Controlla il dato immesso."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Accendi la torcia"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Spegni la torcia"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Il tuo check-in è ancora attivo. Fai il check-out prima di immettere il codice COVID."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"I miei codici QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"L'orario di check-out che hai selezionato è anteriore all'orario di check-in. Controlla il dato immesso."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nuova funzione: check-in"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Grazie per utilizzare l'app SwissCovid. Con la versione più recente dell'app puoi fare il check-in sul posto senza lasciare dati."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Attuali"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Ricordamelo più tardi (30min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Ricordamelo più tardi (1h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Ricordamelo più tardi (2h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Fai il check-out"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Utilizza l'app \"Covid Certificate\" per scansionare questo codice QR."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Apri l'app"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Installa l'app"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index c98cee1da..787b58eec 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -920,9 +920,9 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"O que significa isto?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Se viajar para um dos países compatíveis, não necessita de instalar mais nenhum app de coronavírus.
+    <string name="travel_screen_explanation_text_1">"Se viajar para um dos países compatíveis, não necessita de instalar mais nenhum aplicativo de coronavírus.
 
-A SwissCovid verifica as chaves privadas divulgadas nos países compatíveis para que possa ser alertado de um possível contágio, mesmo no estrangeiro."</string>
+O SwissCovid verifica as chaves privadas divulgadas nos países compatíveis para que possa ser alertado dum possível contágio, mesmo no estrangeiro."</string>
 
     <!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_2">"O que acontece quando insiro o código COVID?"</string>
@@ -955,7 +955,7 @@ Isto acontece independentemente de ter estado no estrangeiro ou não para que os
     <string name="share_app_supertitle">"Juntos…"</string>
     <string name="share_app_title">"prevenimos o contágio "</string>
     <string name="share_app_button">"Partilhar a app"</string>
-    <string name="share_app_body">"Quanto mais pessoas ativarem a app SwissCovid, mais cedo conseguiremos interromper as cadeias de transmissão."</string>
+    <string name="share_app_body">"Se o maior número possível dos seus contactos usar o aplicativo SwissCovid, você pode ser informado rapidamente em caso de risco de contágio."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Com a app Swiss Covid, todos podem ajudar a conter a propagação do coronavírus."</string>
@@ -1333,7 +1333,7 @@ Ligue para:"</string>
     <string name="answer_no">"Não"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"Está no estrangeiro? A SwissCovid funciona nestes países."</string>
+    <string name="travel_screen_info">"Está no estrangeiro? O SwissCovid funciona nestes países."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Países compatíveis:"</string>
@@ -1366,7 +1366,8 @@ Ligue para:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Os códigos privados do seu aplicativo foram enviados para o seguinte período:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Ao introduzir um código Covid, o rastreamento deve estar ativado para que seja possível compartilhar os seus códigos privados."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Ao introduzir um código Covid, o rastreamento deve estar ativado para que seja possível compartilhar os seus códigos privados."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Ao premir \"{BUTTON_TITLE}\" você sai do aplicativo e vai para o website do Guia SwissCovid. Nisso, os dados dos últimos encontros com possibilidade de infecção do website também são enviados."</string>
@@ -1477,7 +1478,7 @@ Ligue para:"</string>
     <string name="checkins_create_qr_code">"Criar um código QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Oferecer check-ins?"</string>
+    <string name="events_title">"Gerar códigos QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Fazer check-in agora"</string>
@@ -1577,7 +1578,7 @@ Ligue para:"</string>
     <string name="inform_share_checkins_subtitle">"Se compartilhar os seus registos de check-in, o aplicativo pode informar pessoas que fizeram check-in no mesmo lugar e na mesma altura."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Selecionar todos"</string>
+    <string name="inform_share_checkins_select_all">"Selecionar todos os correspondentes"</string>
     <string name="inform_dont_send_button_title">"Não enviar"</string>
     <string name="inform_dont_share_button_title">"Não compartilhar"</string>
     <string name="inform_really_not_share_title">"Realmente não deseja compartilhar?"</string>
@@ -1611,7 +1612,7 @@ Ligue para:"</string>
     <string name="events_card_subtitle">"Gere um código QR com o qual pessoas podem fazer check-in no local."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Realmente deseja apagar o código QR?"</string>
+    <string name="delete_qr_code_dialog">"Realmente deseja apagar o código QR? Os códigos QR impressos continuam válidos."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Check-in próprio"</string>
@@ -1653,7 +1654,7 @@ Ligue para:"</string>
     <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Terminar o isolamento?"</string>
+    <string name="events_card_title">"Deseja gerar códigos QR?"</string>
     <string name="checkin_footer_title1">"Porque uma função de check-in?"</string>
     <string name="checkin_footer_subtitle1">"A função de check-in sem recolha de dados de contacto amplia o aplicativo SwissCovid. Com esta função você pode não só alertar contactos próximos, mas também pessoas que fizeram check-in no mesmo lugar e na mesma altura, em caso de teste positivo."</string>
     <string name="checkin_footer_title2">"Nenhum armazenamento de dados centralizado"</string>
@@ -1708,7 +1709,7 @@ Este título vai ser indicado no check-in."</string>
     <string name="checkin_report_title3">"Deixar testar-se"</string>
     <string name="checkin_report_subtitle1">"Você já pode ser contagioso, sem percebê-lo. Observe as medidas de higiene e proteção vigentes e proteja a sua família, os amigos e o seu ambiente."</string>
     <string name="checkin_report_subtitle2">"Observe o seu estado de saúde."</string>
-    <string name="checkin_report_subtitle3">"Deixe testar-se imediatamente se aparecerem sintomas. Mesmo se não aparecerem sintomas, um teste de corona é conveniente e recomendado."</string>
+    <string name="checkin_report_subtitle3">"Deixe testar-se imediatamente se aparecerem sintomas. Mesmo se não aparecerem sintomas e se você ainda não tiver sido completamente vacinado, um teste de corona é conveniente e recomendado."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
@@ -1754,50 +1755,50 @@ Este título vai ser indicado no check-in."</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"A este check-in aplica-se uma duração máxima de check-in de {DURATION}. Por favor, verifique a sua introdução."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Acender a luz"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Apagar a luz"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Você ainda não fez check-out. Por favor, faça check-out antes de introduzir o código Covid."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Meus códigos QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"A sua hora de check-out selecionada é antes da sua hora de check-in. Por favor, verifique a sua introdução."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nova função: Check-in"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Agradecemos a utilização do SwissCovid. Com a última versão do aplicativo você pode fazer check-in no local sem deixar dados."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Atual"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Lembrar novamente (30min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Lembrar novamente (1h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Lembrar novamente (2h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Fazer check-out agora"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Por favor, use o aplicativo \"Certificado COVID\" para ler este código QR."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Abrir o aplicativo"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Instalar o aplicativo"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index aefaf24ee..894ce771e 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -917,7 +917,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"Tge vul quai dir?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Sche Vus essas (en gir) en in pajais cumpatibel, na stuais Vus betg installar in'autra app da corona.
+    <string name="travel_screen_explanation_text_1">"Sche Vus essas en in pajais cumpatibel, na stuais Vus betg installar in'autra app da corona.
 
 SwissCovid verifitgescha las clavs privatas ch'èn vegnidas publitgadas en ils pajais cumpatibels. Uschia pudais Vus vegnir infurmada resp. infurmà er en cas d'ina eventuala infecziun a l'exteriur."</string>
 
@@ -952,7 +952,7 @@ Per che er las viagiaturas ed ils viagiaturs da l'exteriur possian vegnir infurm
     <string name="share_app_supertitle">"Impedir…"</string>
     <string name="share_app_title">"cuminaivlamain infecziuns"</string>
     <string name="share_app_button">"Cundivider l'app"</string>
-    <string name="share_app_body">"Sche uschè bleras persunas sco pussaivel activeschan l'app SwissCovid, pudain nus interrumper ad uras las chadainas d'infecziun."</string>
+    <string name="share_app_body">"Sche uschè blers da Voss contacts sco pussaivel dovran l'app SwissCovid, pudais Vus vegnir infurmada u infurmà svelt en cas d'ina ristga d'infecziun."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Cun l'app SwissCovid pon tuts gidar da franar la derasaziun dal coronavirus."</string>
@@ -1362,7 +1362,8 @@ Alura telefonai qua:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Las clavs privatas da Vossa app èn vegnidas tramessas per il suandant spazi da temp:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Per che Vossas clavs privatas possian vegnir cundivididas sto il tracing esser activà cun endatar in code covid."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Per che Vossas clavs privatas possian vegnir cundivididas sto il tracing esser activà cun endatar in code covid."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Sche Vus schmatgais sin \"{BUTTON_TITLE}\", bandunais Vus l'app e midais a la pagina d'internet dal mussavia SwissCovid. Uschia vegnan tramessas a la pagina d'internet er las datas dals ultims inscunters d'eventualas infecziuns."</string>
@@ -1473,7 +1474,7 @@ Alura telefonai qua:"</string>
     <string name="checkins_create_qr_code">"Crear in code QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Porscher registraziuns?"</string>
+    <string name="events_title">"Crear codes QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Sa registrar ussa"</string>
@@ -1650,7 +1651,7 @@ Alura telefonai qua:"</string>
     <string name="home_end_isolation_card_title">"Terminar l'isolaziun?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Vulais Vus porscher registraziuns?"</string>
+    <string name="events_card_title">"Vulais Vus crear codes QR?"</string>
     <string name="checkin_footer_title1">"Pertge dovri ina funcziun da sa registrar?"</string>
     <string name="checkin_footer_subtitle1">"La funcziun da sa registrar senza endatar las datas da contact cumplettescha l'app SwissCovid. Cun agid da questa funcziun na pudais Vus avertir betg mo stretgs contacts en cas d'in resultat positiv, mabain er las persunas ch'èn stadas registradas il medem mument en il medem lieu."</string>
     <string name="checkin_footer_title2">"Las datas na vegnan betg arcunadas en moda centrala."</string>
@@ -1750,50 +1751,50 @@ Quai pon esser p.ex.:
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Per questa registraziun vala ina durada da registraziun maximala da {DURATION}. Verifitgai per plaschair anc ina giada Vossa indicaziun."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Activar la glisch da giaglioffa"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Deactivar la glisch da giaglioffa"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Vus essas anc registrada u registrà. Sorti per plaschair avant che Vus endatais il code COVID."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Mes codes QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Voss temp da sortida tschernì è avant il temp da registraziun. Verifitgai per plaschair anc ina giada Vossa indicaziun."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nova funcziun: Registraziun"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Grazia fitg che Vus duvrais SwissCovid. Cun la versiun da l'app la pli nova pudais Vus As registrar al lieu, senza inditgar datas."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Actual"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Regurdar danovamain (30 min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Regurdar danovamain (1 ura)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Regurdar danovamain (2 uras)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Sortir ussa"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Duvrai per plaschair l'app «COVID Certificate» per scannar quest code QR."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Avrir l'app"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Installar l'app"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 045884a3c..9f962b83e 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -920,9 +920,9 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"Cfarë do të thotë kjo?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Nëse do të udhëtoni në një nga shtetet e përfshira, nuk keni nevojë të instaloni asnjë aplikacion tjetër për koronavirusin.
+    <string name="travel_screen_explanation_text_1">"Nëse jeni duke udhëtuar në një nga vendet e pajtueshme, nuk duhet të instaloni asnjë aplikacion tjetër korona (Corona-App) për kontaktet. 
 
-SwissCovid kontrollon kodet e identifikimit në mënyrë rastësore që janë krijuar në shtetet e përfshira. Në këtë mënyrë, ju mund të paralajmëroheni edhe për një infeksion të mundshëm jashtë vendit."</string>
+SwissCovid kontrollon çelësat personal të publikuara në vendet e pajtueshme. Kështu edhe ju mund të paralajmëroheni për një infektim të mundshëm jashtë shtetit."</string>
 
     <!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_2">"Çfarë ndodh kur regjistron kodin Covid?"</string>
@@ -955,7 +955,7 @@ Në mënyrë që udhëtarët nga jashtë shtetit të mund të paralajmërohen, k
     <string name="share_app_supertitle">"Së bashku…"</string>
     <string name="share_app_title">"të parandalojmë infektimet"</string>
     <string name="share_app_button">"Shpërndaj aplikacionin"</string>
-    <string name="share_app_body">"Kur aplikacionin \"SwissCovid\" e aktivizojnë sa më shumë persona të jetë e mundur, atëherë ne mund ta ndërpresim më herët zinxhirin e infektimit."</string>
+    <string name="share_app_body">"Nëse shumë nga kontaktet tuaja përdorin mundësisht aplikacionin SwissCovid, atëherë mund të informoheni shpejt për një rrezik të infektimit."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Me aplikacionin Swiss Covid të gjithë ne mund të ndihmojmë për të frenuar përhapjen e koronavirusin."</string>
@@ -1333,7 +1333,7 @@ Atëherë na telefononi këtu:"</string>
     <string name="answer_no">"Jo"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"Udhëtim jashtë shtetit? SwissCovid punon në këto shtete."</string>
+    <string name="travel_screen_info">"Udhëtim jashtë shtetit? Në këto vende funksionojnëkontaktet e SwissCovid."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Shtetet e përfshira:"</string>
@@ -1366,7 +1366,8 @@ Atëherë na telefononi këtu:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Çelësat privatë të aplikacionit tuaj janë dërguar për periudhën kohore vijuese:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Kur futni një kod Covid, gjurmimi duhet të aktivizohet në mënyrë që çelësat tuaj privatë të mund të shpërndahen."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Kur futni një kod Covid, gjurmimi duhet të aktivizohet në mënyrë që çelësat tuaj privatë të mund të shpërndahen."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Nëse shtypni \"{BUTTON_TITLE}\", dilni nga aplikacioni dhe kaloni në faqen e internetit të udhëzuesit SwissCovid. Të dhënat e takimeve të fundit të infektimeve të mundshme dërgohen gjithashtu në faqen e internetit."</string>
@@ -1477,7 +1478,7 @@ Atëherë na telefononi këtu:"</string>
     <string name="checkins_create_qr_code">"Krijoni kodin QR"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Ofroni Check-ins?"</string>
+    <string name="events_title">"Krijoni kodin QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Kontrollohuni tani"</string>
@@ -1577,7 +1578,7 @@ Atëherë na telefononi këtu:"</string>
     <string name="inform_share_checkins_subtitle">"Nëse shpërndani shënimet tuaja të Check-in, atëherë aplikacioni njofton personat, të cilët janë kontrolluar në të njëjtën kohë në të njëjtin vend."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Zgjidhni të gjitha"</string>
+    <string name="inform_share_checkins_select_all">"Zgjidhni gjithçka që përshtatet"</string>
     <string name="inform_dont_send_button_title">"Mos dërgoni"</string>
     <string name="inform_dont_share_button_title">"Mos shpërndani"</string>
     <string name="inform_really_not_share_title">"Vërtet të mos shpërndani?"</string>
@@ -1608,10 +1609,10 @@ Atëherë na telefononi këtu:"</string>
     <string name="checkin_overview_isolation_text">"Ju nuk mund të kontrolloheni më, sepse keni dalë pozitiv në test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Krijoni një kod QR, me të cilin të kontrolloni personat në vend."</string>
+    <string name="events_card_subtitle">"Krijoni një kod QR përSwissCovid, me të cilin mund të kontrolloni personat në vend."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Dëshironi vërtet ta fshini kodin QR?"</string>
+    <string name="delete_qr_code_dialog">"Dëshironi vërtet ta fshini kodin QR? Kodet e printuara QR mbeten gjithsesi të vlefshme."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Self Check-In"</string>
@@ -1654,7 +1655,7 @@ Atëherë na telefononi këtu:"</string>
     <string name="home_end_isolation_card_title">"Keni përfunduar izolimin?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Dëshironi të ofroni Check-ins?"</string>
+    <string name="events_card_title">"Dëshironi të krijoni një kod QR?"</string>
     <string name="checkin_footer_title1">"Përse duhet një funksion i Check-in?"</string>
     <string name="checkin_footer_subtitle1">"Aplikacioni SwissCovid zgjeron funksionin e Check-in pa futjen e të dhënave të kontaktit. Me këtë funksion, në rastin kur keni dalë pozitiv në test, ju jo vetëm që mund të informoni kontaktet e afërta, por edhe personat që janë kontrolluar në të njëjtën kohë në të njëjtin vend."</string>
     <string name="checkin_footer_title2">"Asnjë ruajtje qendrore e të dhënave"</string>
@@ -1709,7 +1710,7 @@ Ky titull shfaqet gjatë Check-in."</string>
     <string name="checkin_report_title3">"Kryeni testin"</string>
     <string name="checkin_report_subtitle1">"Ju tashmë mund të jeni i infektuar pa e vënë re. Mbani parasysh masat e higjienës dhe të mbrojtjes dhe mbroni familjen tuaj, miqtë tuaj dhe mjedisin tuaj rrethues."</string>
     <string name="checkin_report_subtitle2">"Mbikëqyrni gjendjen tuaj shëndetësore."</string>
-    <string name="checkin_report_subtitle3">"Testohuni menjëherë gjatë shfaqjes së simptomave. Edhe nëse nuk shfaqet asnjë simptomë, testi i koronës është i arsyeshëm dhe i rekomandueshëm."</string>
+    <string name="checkin_report_subtitle3">"Testohuni menjëherë gjatë shfaqjes së simptomave. Edhe nëse nuk shfaqet asnjë simptomë dhe nuk jeni akoma i vaksinuar plotësisht, testi i koronës është i arsyeshëm dhe i rekomandueshëm."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-In"</string>
@@ -1755,50 +1756,50 @@ Ky titull shfaqet gjatë Check-in."</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Për këtë Check-In vlen kohëzgjatja maksimale e Check-in e {DURATION}. Kontrolloni edhe njëherë të dhënat tuaja."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Ndizni dritën"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Fikni dritën"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Ju jeni akoma i regjistruar. Kontrolloni përpara se të futni kodin Covid."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Kodi im QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Koha juaj e zgjedhur Checkout është përpara kohës së Check-In. Kontrolloni edhe njëherë të dhënat tuaja."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Funksion i ri: Check-In"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Faleminderit për përdorimin e SwissCovid. Me versionin më të ri të aplikacionit mund të regjistroheni në vend pa lënë asnjë të dhënë."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Aktuale"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Kujtohuni përsëri (30 min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Kujtohuni përsëri (1 orë)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Kujtohuni përsëri (2 orë)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Kontrollohuni tani"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Për skanimin e këtij kodi QR përdorni aplikacionin ''COVID Certificate (Certifikata e COVID)''."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Hapni aplikacionin"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Instaloni aplikacionin"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index df52ffb10..6e71c5c7e 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -952,7 +952,7 @@ Da bi putnici u inostranstvu mogli da se upozore, to se dešava nezavisno od tog
     <string name="share_app_supertitle">"Zajedno…"</string>
     <string name="share_app_title">"Sprečimo širenje infekcije"</string>
     <string name="share_app_button">"Deli aplikaciju"</string>
-    <string name="share_app_body">"Ako što više nas aktivira aplikaciju SwissCovid, moći ćemo pravovremeno da prekinemo lanac širenja infekcije."</string>
+    <string name="share_app_body">"Ako većina vaših kontakata koristi aplikaciju SwissCovid, možete brzo biti obavešteni u slučaju rizika od zaraze."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"Pomoću aplikacije Swiss Covid svi možemo da pomognemo u suzbijanju širenja virusa korona."</string>
@@ -1363,7 +1363,8 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Privatni ključevi vaše aplikacije poslati su za sledeći period:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Prilikom unosa kovid šifre mora se aktivirati praćenje (tracing) kako bi vaši privatni ključevi mogli da se dele."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Prilikom unosa kovid šifre mora se aktivirati praćenje (tracing) kako bi vaši privatni ključevi mogli da se dele."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"Kada pritisnete \"{BUTTON_TITLE}\" napuštate aplikaciju i dolazite na internet stranicu SwissCovid vodiča. Pri tome se podaci poslednjeg susreta sa mogućim zaražavanjem šalju internet stranici."</string>
@@ -1474,7 +1475,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkins_create_qr_code">"Napraviti QR kod"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Ponuditi prijave?"</string>
+    <string name="events_title">"Napravite QR kodove"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Sada se prijaviti"</string>
@@ -1574,7 +1575,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="inform_share_checkins_subtitle">"Kada delite unose prijave, aplikacija može istovremeno da obavesti lica, koja su se prijavila na istoj lokaciji."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Izabrati sve"</string>
+    <string name="inform_share_checkins_select_all">"Izaberite sve što odgovara"</string>
     <string name="inform_dont_send_button_title">"Ne slati"</string>
     <string name="inform_dont_share_button_title">"Ne deliti"</string>
     <string name="inform_really_not_share_title">"Zaista ne deliti?"</string>
@@ -1608,7 +1609,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="events_card_subtitle">"Napravite QR kod, pomoću kojeg lica mogu da se prijave na lokaciji."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? "</string>
+    <string name="delete_qr_code_dialog">"Želite li zaista da izbrišete QR kod? Štampani QR kodovi ostaju i dalje na snazi."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Samostalno prijavljivanje"</string>
@@ -1652,7 +1653,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="home_end_isolation_card_title">"Kraj izolacije?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Želite da ponudite prijave?"</string>
+    <string name="events_card_title">"Da li želite da napravite QR kodove?"</string>
     <string name="checkin_footer_title1">"Čemu služi funkcija prijave?"</string>
     <string name="checkin_footer_subtitle1">"Funkcija prijave bez unošenja podataka o kontaktima povećava funkcije aplikacije SwissCovid. Pomoću ove funkcije, u slučaju pozitivnog testa, možete ne samo da upozorite bliske kontakte, već i lica koja su se istovremeno prijavila na istom mestu."</string>
     <string name="checkin_footer_title2">"Nema centralnog čuvanja podataka"</string>
@@ -1704,7 +1705,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="checkin_report_title3">"Vršiti testiranje"</string>
     <string name="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."</string>
     <string name="checkin_report_subtitle2">"Proveravajte svoje zdravsveno stanje."</string>
-    <string name="checkin_report_subtitle3">"Odmah se testirajte ako imate simptome. Čak i ako nema simptoma, test korone je važan i  preporučuje se."</string>
+    <string name="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."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Prijava"</string>
@@ -1750,50 +1751,50 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Ova prijava važi maksimalno u trajanju od {DURATION}. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Uključiti svetlo"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Isključiti svetlo"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Još uvek ste prijavljeni. Molimo odjavite se pre unosa Covid koda."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Moji QR kodovi"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Odabrano vreme za odjavu nalazi se je pre vremena za prijavu. Molimo vas da ponovo proverite svoje podatke."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Nova funkcija: prijava"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Hvala vam što koristite SwissCovid. Sa najnovijom verzijom aplikacije možete da se prijavite na lokaciji bez ostavljanja podataka."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Trenutno"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Podsetiti ponovo (30min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Podsetiti ponovo (1h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Podsetiti ponovo (2h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Sada se odjaviti"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Molimo koristite aplikaciju \"COVID certifikat\" za skeniranje ovog QR koda."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Otvoriti aplikaciju"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Instalirati aplikaciju"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-ti/strings.xml b/common/src/main/res/values-ti/strings.xml
index d275f7240..903cc54c5 100644
--- a/common/src/main/res/values-ti/strings.xml
+++ b/common/src/main/res/values-ti/strings.xml
@@ -903,7 +903,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"እዚ እንታይ ማለት፧"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"ንስኹም ኣብ ሓደ ካብቶም ተቓደውቲ ሃገራት እንተትግዕዙ ኮይንኩም፣ ካልእ ኮሮና ኤፕ ከተምጽኡ ኣየድልየኩምን።
+    <string name="travel_screen_explanation_text_1">"ንስኹም ኣብ ሓደ ካብቶም ተቓደውቲ ሃገራት እንተትግዕዙ ኮይንኩም፣ ንምርኽኻብሲ ካልእ ኮሮና ኤፕ ከተምጽኡ ኣየድልየኩምን።
 
 SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገሑ ግላውያን መፋትሕ ይቈጻጸር። ንስኹም ዋላ ኣብ ክፍጸም ዝኽእል ልበዳ ኣብ ወጻኢ ክትጥንቐቑ ትኽእሉ ኢኹም።"</string>
 
@@ -938,7 +938,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="share_app_supertitle">"ብሓባር…"</string>
     <string name="share_app_title">"ልበዳታት ምውጋድ"</string>
     <string name="share_app_button">"ነቲ ኤፕ ምኽፋል"</string>
-    <string name="share_app_body">"ብዝተኻእለ መጠን ብዙሓት ንSwissCovid ኤፕ እንድሕር ወሊዖሞ፣ ናይ ልበዳ ሰንሰለታት ብኣጋኡ ከነቋርጾም ንኽእል ኢና።"</string>
+    <string name="share_app_body">"ብዝተኻእለ መጠን ብዙሓት ካብ ፈለጥትኹም ነቲ ኤፕ ዝጥቐሙሉ ኮይኖም፣ ኣብ ናይ ልበዳ ርከሳ ብቕልጡፍ ክትሕበሩ ትኽእሉ።"</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"ብስዊስኮድ ኣፕ ዝርግሐ ናይ ኮሮናቫይረስ ንኽዕገት እጃምኩም ተበርክቱ።"</string>
@@ -1316,7 +1316,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="answer_no">"ኣይፋል"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"ኣብ ወጻኢ ምግዓዝ፧ ኣብዚኦም ሃገራት SwissCovid ይሰርሕ እዩ።"</string>
+    <string name="travel_screen_info">"ኣብ ወጻኢ ምግዓዝ፧ ኣብዚኦም ሃገራት ምርኽኻብ SwissCovid ይሰርሕ እዩ።"</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"ተቓደውቲ ሃገራት፥"</string>
@@ -1349,7 +1349,8 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="inform_send_thankyou_text_onsetdate_info">"ግላውያን መፋትሕ ናይ ኤፕኩም ንዝስዕብ እዋን ተሰዲዶም ኔሮም፥"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"ኣብ ምእታው ኮቪድ-ኮድ እቲ ምክትታል ክውላዕ ኣለዎ፣ ግላዊ መፍትሕኩም ክካፈል መታን ክከኣል።"</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"ኣብ ምእታው ኮቪድ-ኮድ እቲ ምክትታል ክውላዕ ኣለዎ፣ ግላዊ መፍትሕኩም ክካፈል መታን ክከኣል።"</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"መጠወቒ \"{BUTTON_TITLE}\" ትጥውቕዎ እንተኾይንኩም፣ ካብቲ ኤፕ ትወጽኡ ከምኡ'ውን ናብቲ መርበብ ኢንተርነት መምርሒ SwissCovid ክትቕይሩ። ሽዑ ሓበሬታ/ዳታ ናይ ተፈጺሞም ዝኾኑ ልበዳታት ናይቲ ዝሓለፈ ምርኽኻብ ካብቲ መርበብ ኢንተርነት እንተላይ ይስደዱ።"</string>
@@ -1460,7 +1461,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="checkins_create_qr_code">"QR-ኮድ ምፍጣር"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"ቸክ-ኢን ምቕራብ"</string>
+    <string name="events_title">"ምፍጣር ኮድ QR"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"ሕጂ ቸክ-ኢን ምእታው"</string>
@@ -1560,7 +1561,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="inform_share_checkins_subtitle">"ናይ ቸክ-ኢን መዝገባትኩም እንድሕር ኣካፊልኩም፣ እቲ ኤፕ ኣብ ማዕረ ግዜ ኣብ ሽዑ ቦታ ኔሮም ዝነበሩ ሰባት ክሕብሮም ይኽእል።"</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"ኩሉ ምምራጽ"</string>
+    <string name="inform_share_checkins_select_all">"ኩሉ ብቑዕ ዝኾነ ምምራጽ"</string>
     <string name="inform_dont_send_button_title">"ኣይትስደድ"</string>
     <string name="inform_dont_share_button_title">"ዘይምክፍፋል"</string>
     <string name="inform_really_not_share_title">"ናይ ብሓቂ ብዘይ ምክፍፋል፧"</string>
@@ -1591,10 +1592,10 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="checkin_overview_isolation_text">"ፖዚቲቭ ቸክ-ኢን እንድሕር ጌርኩም፣ ክትኣትዉ ኣይትኽእሉን ኢኹም።"</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"ኮድ QR ምስፈጠርካዮ ብእኡ ሰባት ኣብቲ ቦታ ክኣትዉ ይኽእሉ።"</string>
+    <string name="events_card_subtitle">"ኮድ QR SwissCovid ምስፈጠርካዮ ብእኡ ሰባት ኣብቲ ቦታ ክኣትዉ ይኽእሉ።"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"ነቲ ኮድ QR ናይብሓቂ ክትድምሥዎ ደሊኹም ዶ፧"</string>
+    <string name="delete_qr_code_dialog">"ነቲ ኮድ QR ናይብሓቂ ክትድምስሱዎ ደሊኹም ዶ፧ ዝተሓተሙ ኮዳት QR ቀጺሎም ብቑዓት እዮም።"</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"ባዕልኻ እትገብር ቸክ-ኢን"</string>
@@ -1637,7 +1638,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="home_end_isolation_card_title">"ግላለ ምዝዛም፧"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"ቸክ-ኢን ከተቕርቡ ደሊኹም ዶ፧"</string>
+    <string name="events_card_title">"ኮዳት QR ብሓድሽ ክትፈጥሩ ደሊኹም፧"</string>
     <string name="checkin_footer_title1">"ስለምንታይ ናይ ቸክ-ኢን ኣገባብ፧"</string>
     <string name="checkin_footer_subtitle1">"ናይ ቸክ-ኢን ኣገባብ ብዘይ ምሓዝ ሓበሬታ ርክብ ነቲ SwissCovid ኤፕ ይውስኾ። ምስዚ ኣገባብ‘ዚ ፖዚቲቭ እንተ ደኣ ተመርሚርኩም፣ ጥራይ ቀረባ ርክባት ዘይኮነ ዋላ ውን ኣብ ማዕረ ግዜን ማዕረ ቦታን ኣትዮም ዝነበርይ ሰባት ከተጠንቅቕዎም ትኽእሉ።"</string>
     <string name="checkin_footer_title2">"ማእከላዊ ዕቃበ ዳታ የለን"</string>
@@ -1692,7 +1693,7 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <string name="checkin_report_title3">"ምምርማር"</string>
     <string name="checkin_report_subtitle1">"ድሮ ተላጋቢ ክትኮኑ ትኽእሉ ከይተገንዘብኩም። እቶም ብቑዓት ናይ ጽሬትን ምክልኻልን ስጉምትታት ተኸተሉ ከምኡውን ስድራኹምን ኣዕሩኽትኹምን ከባብኹምን ኣስተውዕሉ።"</string>
     <string name="checkin_report_subtitle2">"መርገጽ ጥዕናኹም ተኸታተሉ።"</string>
-    <string name="checkin_report_subtitle3">"ኣብ ምቕልቓል ምልክታት ብዝቐልጠፈ ተመርመሩ። ዋላ ምልክታት ዘይቕልቀሉ እንተኾይኖም፣ መርመራ ኮሮና ጤቓምን ዝምረጽን እዩ።"</string>
+    <string name="checkin_report_subtitle3">"ኣብ ምቕልቓል ምልክታት ብዝቐልጠፈ ተመርመሩ። ዋላ ምልክታት ዘይቕልቀሉ እንተኾይኖም ኮምኡውን ገና ብምልኡ ዘይተኸተብኩም እንተኾይንኩም፣ መርመራ ኮሮና እንተላይ ጤቓምን ዝምረጽን እዩ።"</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"ቸክ-ኢን"</string>
@@ -1738,50 +1739,50 @@ SwissCovid ነቶም ኣብቶም ተቓደውቲ ሃገራት ዝተዘርገ
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"ነዚ ቸክ-ኢን እዋኑ ልዕሊ {DURATION} ክወስድ የብሉን። እንደገና ዝሃብኩም ሓበሬታ ተቈጻጸሩ ብኽብረትኩም።"</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"ልቺ ምውላዕ"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"ልቺ ምጥፋእ"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"ገና ኣቲኹም ኣለኹም። ኮቪድኮድ ቅድሚ ትህቡ ብኽብረትኩም ውጹ።"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"ናተይ ኮዳት QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"ዝመረጽኩም ቸክ-ኣውት ግዜ ቅድሚ ቸክ-ኢን ግዜ እዩ ዘሎ። እቲ ዝሃብኩም ሓበሬታ እንደገና ተቈጻጸሩ ብኽብረትኩም።"</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"ሓድሽ ኣገባብ፥ ቸክ-ኢን"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"ናይ ምጥቓም SwissCovid ነመስግነኩም። በቲ ሓድሽ ቨርዝዮን ኤፕ ዝኾነ ሓበሬታ ከይገደፍኩም ኣብቲ ቦታ ቸክ-ኢን/ክትኣትዉ ትኽእሉ።"</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"ሕጂ"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"እንደገና ኣዘክር (30 ደቓይቕ)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"እንደገና ኣዘክር (1 ሰዓት)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"እንደገና ኣዘክር (2 ሰዓት)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"ሕጂ ቸክ-ኣውት/ምውጻእ"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"ነዚ QR-ኮድ ስኬን ንክትገብርዎ እቲ \"COVID Certificate\" ዝብሃል ኤፕ ተጠቐምሉ ብኽብረትኩም።"</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"ኤፕ ምኽፋት"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"ኤፕ ምትካል"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index 435f29272..712bc0705 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -903,9 +903,9 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"Bunun anlamı nedir?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"Uyumlu ülkelerin birinde seyahat ettiğinizde, başka bir Korona uygulamasını kurmak zorunda kalmazsınız.
+    <string name="travel_screen_explanation_text_1">"Uyumlu ülkelerden birinde seyahat ediyorsanız karşılaşmalar için başka bir Corona uygulaması kurmanıza gerek kalmaz.
 
-SwissCovid uyumlu ülkelerde yayınlanan özel kodlar kontrol eder. Böylece yurt dışındaki olası bir bulaşı durumunda da uyarılabilirsiniz."</string>
+SwissCovid uyumlu ülkelerde yayınlanmış olan kişisel kodu kontrol eder. Böylece yurt dışında da olası bir bulaşma halinde uyarı alabilirsiniz."</string>
 
     <!-- Second title for the travel feauter explenation at the bottom of the travel screen. -->
     <string name="travel_screen_explanation_title_2">"Covid kodu girildiğinde neler olur?"</string>
@@ -938,7 +938,7 @@ Yurt dışı seyahatlerinden gelen kişilerin de uyarılabilmesi için bu, sizin
     <string name="share_app_supertitle">"Birlikte…"</string>
     <string name="share_app_title">"Bulaşma riskini ortadan kaldıralım. "</string>
     <string name="share_app_button">"Uygulamayı paylaş"</string>
-    <string name="share_app_body">"SwissCovid uygulaması ne kadar çok kişi tarafından kullanılırsa, enfeksiyon zinciri o kadar erken kırılabilir."</string>
+    <string name="share_app_body">"Temasta olduğunuz kişilerin olabildiğince fazlası SwissCovid uygulamasını kullanıyorsa, olası bir bulaşma durumunda hızlıca bilgi alabilirsiniz."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"SwissCovid uygulaması ile Korona virüsünün yayılımını sınırlandırmaya yardımcı olabilirsiniz."</string>
@@ -1316,7 +1316,7 @@ O halde şu numarayı arayın:"</string>
     <string name="answer_no">"Hayır"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"Yurt dışı seyahatinde misiniz? SwissCovid bu ülkelerde çalışır."</string>
+    <string name="travel_screen_info">"Yurt dışında seyahat mi ediyorsunuz? Bu ülkelerde SwissCovid karşılaşmalar çalışır."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Uyumlu ülkeler:"</string>
@@ -1349,7 +1349,8 @@ O halde şu numarayı arayın:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Uygulamanızın özel anahtarları şu zaman aralığı için gönderildi:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"Bir Covid kodu girerken, özel anahtarlarınızın paylaşılabilmesi için izleme etkinleştirilmiş olmalıdır."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"Bir Covid kodu girerken, özel anahtarlarınızın paylaşılabilmesi için izleme etkinleştirilmiş olmalıdır."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"\"{BUTTON_TITLE}\" üzerine basarsanız, uygulamadan çıkıp SwissCovid rehberinin web sitesine gidersiniz. Bu esnada olası bulaşmalara ait son karşılaşmaların verileri de web sitesine gönderilir."</string>
@@ -1460,7 +1461,7 @@ O halde şu numarayı arayın:"</string>
     <string name="checkins_create_qr_code">"Kare kod oluşturun"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Check-in’leri öner?"</string>
+    <string name="events_title">"Kare kodlar oluşturun"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Şimdi check-in yap"</string>
@@ -1560,7 +1561,7 @@ O halde şu numarayı arayın:"</string>
     <string name="inform_share_checkins_subtitle">"Check-in kayıtlarınızı paylaştığınızda, uygulama aynı zaman aralığında aynı yerde check-in yapmış olan kişileri bu durum hakkında bilgilendirebilir."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Tümünü seç"</string>
+    <string name="inform_share_checkins_select_all">"Uygun olanların hepsini seçin"</string>
     <string name="inform_dont_send_button_title">"Gönderme"</string>
     <string name="inform_dont_share_button_title">"Paylaşma"</string>
     <string name="inform_really_not_share_title">"Gerçekten paylaşılmasın mı?"</string>
@@ -1591,10 +1592,10 @@ O halde şu numarayı arayın:"</string>
     <string name="checkin_overview_isolation_text">"Test sonucunuz pozitif ise artık check-in yapamazsınız."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Kişilerin ilgili yere check-in yapabileceği bir kare kod oluşturun."</string>
+    <string name="events_card_subtitle">"Kişilerin yerinde check-in yapabileceği bir SwissCovid kare kod oluşturun."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Kare kodu gerçekten silmek istiyor musunuz?"</string>
+    <string name="delete_qr_code_dialog">"Kare kodu gerçekten silmek istiyor musunuz? Yazdırılmış QR kodlar geçerliliğini korur."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Kendi kendine check-in"</string>
@@ -1637,7 +1638,7 @@ bırakmadan check-in yap"</string>
     <string name="home_end_isolation_card_title">"İzolasyonu sonlandır?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Check-in’leri önermek mi istiyorsunuz?"</string>
+    <string name="events_card_title">"Kare kodlar mı oluşturmak istiyorsunuz?"</string>
     <string name="checkin_footer_title1">"Bir check-in uygulaması neden gerekli?"</string>
     <string name="checkin_footer_subtitle1">"İletişim verileri olmadan çalışan check-in fonksiyonu SwissCovid uygulamasının kapsamını genişletiyor. Bu fonksiyon ile testinizin pozitif sonuçlanması halinde sadece yakın temasta bulunduğunuz kişileri değil, aynı zaman aralığında aynı yerde check-in yapmış olan kişileri de uyarabilirsiniz."</string>
     <string name="checkin_footer_title2">"Merkezi veri kaydı yok"</string>
@@ -1692,7 +1693,7 @@ Bu başlık check-in sırasında gösterilir."</string>
     <string name="checkin_report_title3">"Test yaptırın"</string>
     <string name="checkin_report_subtitle1">"Henüz kendiniz fark etmeden de hastalığı bulaştırabilirsiniz. Geçerli hijyen ve koruma önlemlerini dikkate alın ve ailenizi, arkadaşlarınızı ve çevrenizi koruyun."</string>
     <string name="checkin_report_subtitle2">"Sağlık durumunuzu gözetim altında tutun."</string>
-    <string name="checkin_report_subtitle3">"Kendinizde semptomların varlığını gözlemlediğinizde hemen test yaptırın. Semptomlar olmadığında da bir korona testi mantıklıdır ve tavsiye edilmektedir."</string>
+    <string name="checkin_report_subtitle3">"Kendinizde semptomların varlığını gözlemlediğinizde hemen test yaptırın. Semptomlar olmadığında ve ilgili tüm aşıları olmadıysanız da bir korona testi mantıklıdır ve tavsiye edilmektedir."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
@@ -1738,50 +1739,50 @@ Bu başlık check-in sırasında gösterilir."</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"Bu check-in için maksimum {DURATION}’lik bir check-in süresi geçerlidir. Lütfen girişinizi bir kez daha kontrol edin."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Işık açık"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Işık kapalı"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"Hala check-in yapmış durumdasınız. Lütfen Covid kodunu girmeden önce check-out yapın."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"Kare kodlarım"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Seçmiş olduğunuz check-out saati check-in saatinizden önce. Lütfen girişlerinizi bir kez daha kontrol edin."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"Yeni fonksiyon: Check-in"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"SwissCovid’i kullandığınız için teşekkür ederiz. Bu en yeni uygulama versiyonu ile geride veri bırakmadan yerinde check-in yapabilirsiniz."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Güncel"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Yeniden hatırlat (30dak)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Yeniden hatırlar (1s)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Yeniden hatırlar (2s)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Şimdi check-out yap"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Lütfen bu kare kodu okutmak için “COVID Certificate” uygulamasını kullanın."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Uygulamayı aç"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Uygulamayı kur"</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 3b6b48869..5760010ef 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -919,7 +919,7 @@ Schwarzenburgstrasse 157
     <string name="travel_screen_explanation_title_1">"What does that mean?"</string>
 
     <!-- First text for the travel feauter explenation at the bottom of the travel screen. -->
-    <string name="travel_screen_explanation_text_1">"You don’t have to install another app if you’re travelling in one of the compatible countries.
+    <string name="travel_screen_explanation_text_1">"You don’t have to install another app for encounters if you’re travelling in one of the compatible countries.
 
 SwissCovid checks private keys published in the compatible countries. This means that you can also receive alerts of possible infection abroad."</string>
 
@@ -954,7 +954,7 @@ To enable travellers from abroad to also receive alerts, this happens regardless
     <string name="share_app_supertitle">"Together…"</string>
     <string name="share_app_title">"against the spread of Covid"</string>
     <string name="share_app_button">"Share app"</string>
-    <string name="share_app_body">"If as many people as possible activate the SwissCovid app, we can break infection chains early."</string>
+    <string name="share_app_body">"If as many of your contacts as possible use the SwissCovid app you can be notified rapidly if there is a risk of infection."</string>
 
     <!-- Text der geteilt wird -->
     <string name="share_app_message">"By using the SwissCovid app, we can all help to contain the spread of the coronavirus."</string>
@@ -1355,7 +1355,7 @@ If so, call this number:"</string>
     <string name="answer_no">"No"</string>
 
     <!-- Text in der Infobox auf dem Reisen-Screen -->
-    <string name="travel_screen_info">"Travelling abroad? SwissCovid works in these countries."</string>
+    <string name="travel_screen_info">"Travelling abroad? SwissCovid encounters works in these countries."</string>
 
     <!-- Überschrift der Liste der kompatiblen Länder auf dem Reisen-Screen -->
     <string name="travel_screen_compatible_countries">"Compatible countries:"</string>
@@ -1388,7 +1388,8 @@ If so, call this number:"</string>
     <string name="inform_send_thankyou_text_onsetdate_info">"Your app's private key was sent for the following period:"</string>
 
     <!-- Dialogtext wenn ein Covidcode eingegeben wird während das Tracing deaktiviert ist -->
-    <string name="android_inform_tracing_enabled_explanation">"When you enter a Covidcode, tracing needs to be activated so that your private key can be shared."</string>
+    <!-- Fuzzy -->
+    <string name="inform_tracing_enabled_explanation">"When you enter a Covidcode, tracing needs to be activated so that your private key can be shared."</string>
 
     <!-- Leitfaden Info Popup Text -->
     <string name="leitfaden_infopopup_text">"If you press \"{BUTTON_TITLE}\", you leave the app and switch to the SwissCovid Guide website. The data on recent encounters with potentially infected people is sent to the website."</string>
@@ -1499,7 +1500,7 @@ If so, call this number:"</string>
     <string name="checkins_create_qr_code">"Generate QR code"</string>
 
     <!-- Veranstaltungen-Screen Titel -->
-    <string name="events_title">"Offer check-ins"</string>
+    <string name="events_title">"Generate QR codes"</string>
 
     <!-- Check-Ins: Jetzt einchecken Button Titel -->
     <string name="check_in_now_button_title">"Check in now"</string>
@@ -1599,7 +1600,7 @@ If so, call this number:"</string>
     <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location and time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all"</string>
+    <string name="inform_share_checkins_select_all">"Select all suitable??"</string>
     <string name="inform_dont_send_button_title">"Don't send"</string>
     <string name="inform_dont_share_button_title">"Don't share"</string>
     <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
@@ -1676,7 +1677,7 @@ data"</string>
     <string name="home_end_isolation_card_title">"Isolation ended?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Do you want to offer check-ins?"</string>
+    <string name="events_card_title">"Want to generate QR codes?"</string>
     <string name="checkin_footer_title1">"Why a check-in feature?"</string>
     <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
     <string name="checkin_footer_title2">"No central data storage"</string>
@@ -1777,50 +1778,50 @@ Protect your contacts"</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"For this check-in a maximum check-in duration of {DURATION} applies. Please check your input again."</string>
+    <string name="checkout_too_long_alert_text">"The maximum duration of this check-in is {DURATION}. Please check your entry again."</string>
 
     <!-- turn camera light on -->
-    <string name="accessibility_camera_light_on">"turn light on"</string>
+    <string name="accessibility_camera_light_on">"Light on"</string>
 
     <!-- turn camera light off -->
-    <string name="accessibility_camera_light_off">"turn light off"</string>
+    <string name="accessibility_camera_light_off">"Light off"</string>
 
     <!-- Popup Text, welcher erscheint, wenn man den Covidcode eingeben will, man aber noch eingecheckt ist. -->
-    <string name="error_cannot_enter_covidcode_while_checked_in"></string>
+    <string name="error_cannot_enter_covidcode_while_checked_in">"You are still checked in. Please check out before you enter the COVID code."</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. Wird angezeigt falls bereits ein QR Code erstellt wurde -->
-    <string name="events_card_title_events_not_empty"></string>
+    <string name="events_card_title_events_not_empty">"My QR codes"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description"></string>
+    <string name="checkout_inverse_time_alert_description">"Your selected check-out time is before the check-in time. Please check your entry again."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_title"></string>
+    <string name="update_notification_checkin_feature_title">"New function: check-in"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text"></string>
+    <string name="update_notification_checkin_feature_text">"Thanks for using SwissCovid. With the latest version of the app you can check in at a venue without leaving a data trail."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
-    <string name="diary_current_title"></string>
+    <string name="diary_current_title">"Current"</string>
 
     <!-- Snooze Option um 30min später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_30min"></string>
+    <string name="ios_snooze_option_30min">"Remind again [oder: Snooze??] (30min)"</string>
 
     <!-- Snooze Option um 1h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_1h"></string>
+    <string name="ios_snooze_option_1h">"Remind again [oder: Snooze??] (1h)"</string>
 
     <!-- Snooze Option um 2h später an Checkout zu erinnern -->
-    <string name="ios_snooze_option_2h"></string>
+    <string name="ios_snooze_option_2h">"Remind again [oder: Snooze??] (2h)"</string>
 
     <!-- Notification Quickaction um jetzt auszuchecken -->
-    <string name="ios_notification_checkout_now"></string>
+    <string name="ios_notification_checkout_now">"Check out now"</string>
 
     <!-- Hinweis falls fälschlicherweise ein Covid-Zertifikat mit SwissCovid gescannt wird. -->
-    <string name="covid_certificate_alert_text"></string>
+    <string name="covid_certificate_alert_text">"Please use the COVID Certificate app to scan this QR code."</string>
 
     <!-- Button um Covid Certificate App zu öffnen -->
-    <string name="covid_certificate_open_app"></string>
+    <string name="covid_certificate_open_app">"Open app"</string>
 
     <!-- Button um Covid Certificate App zu installieren -->
-    <string name="covid_certificate_install_app"></string>
+    <string name="covid_certificate_install_app">"Install app"</string>
 </resources>
\ No newline at end of file

From fb3c261b6c3ddb6c018d1ba411243e249ab512d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 00:47:17 +0200
Subject: [PATCH 177/207] new data-protection-statement and terms-of-use

---
 .../de/data_protection_statement.html         | 57 ++++++++----
 .../assets/disclaimer/de/terms_of_use.html    | 26 +++---
 .../en/data_protection_statement.html         | 55 ++++++++----
 .../assets/disclaimer/en/terms_of_use.html    | 29 +++---
 .../fr/data_protection_statement.html         | 90 +++++++++++++++----
 .../assets/disclaimer/fr/terms_of_use.html    | 39 +++++---
 .../it/data_protection_statement.html         | 58 ++++++++----
 .../assets/disclaimer/it/terms_of_use.html    | 31 ++++---
 8 files changed, 267 insertions(+), 118 deletions(-)

diff --git a/app/src/main/assets/disclaimer/de/data_protection_statement.html b/app/src/main/assets/disclaimer/de/data_protection_statement.html
index 35a21b3b2..85e393105 100644
--- a/app/src/main/assets/disclaimer/de/data_protection_statement.html
+++ b/app/src/main/assets/disclaimer/de/data_protection_statement.html
@@ -11,13 +11,14 @@
  Datenschutzerklärung des Bundesamtes für Gesundheit BAG im Zusammenhang mit der Nutzung der «SwissCovid-App»
 </p>
 <p>
- Version: 9. April 2021
+ Version: 1. Juli 2021
 </p>
 <p>
  In dieser Datenschutzerklärung erläutert das Bundesamt für Gesundheit (BAG), inwieweit es hinsichtlich der Nutzung der Applikation «SwissCovid-App» (nachfolgend App) in der Schweiz Personendaten bearbeitet. Das ist keine abschliessende Beschreibung; allenfalls regeln andere Datenschutzerklärungen, ähnliche Dokumente, Nutzungsbedingungen oder Anwendungsprogramme spezifische Sachverhalte.
 </p>
 <p>
- Das Datenschutzrecht regelt die Bearbeitung von Personendaten. Die Bundesgesetzgebung über den Datenschutz ist auf die Datenbearbeitung anwendbar. Die Datenschutzerklärung steht zudem im Einklang mit dem Epidemiengesetz vom 28. September 2012 (EpG; SR 818.101) und der Verordnung vom 24. Juni 2020 über das Proximity-Tracing-System für das Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25).
+ Das Datenschutzrecht regelt die Bearbeitung von Personendaten. Die Bundesgesetzgebung über den Datenschutz ist auf die Bearbeitung von Personendaten anwendbar. Die Datenschutzerklärung steht zudem im Einklang mit dem Epidemiengesetz vom 28. September 2012 (EpG; SR 818.101), der Verordnung vom 24. Juni 2020 über das Proximity-Tracing-System für das Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25),
+ dem Bundesgesetz über die gesetzlichen Grundlagen für Verordnungen des Bundesrates zur Bewältigung der Covid-19-Epidemie vom 25. September 2020 (Covid-19-Gesetz; SR 818.102) sowie der Verordnung über ein Warnsystem zu Covid-19 für Veranstaltungen vom 1. Juli 2021.
 </p>
 <p>
  Unter Personendaten werden alle Angaben verstanden, die sich auf eine bestimmte oder bestimmbare Person beziehen. Bearbeiten meint jeden Umgang mit Personendaten, unabhängig von den angewandten Mitteln und Verfahren, insbesondere das Beschaffen, Aufbewahren, Verwenden, Umarbeiten, Bekanntgeben, Archivieren oder Vernichten der Daten.
@@ -48,23 +49,27 @@ <h1>
  Erhebung und Bearbeitung von Personendaten
 </h1>
 <p>
- Das gesamte App-System ist darauf ausgerichtet, dass der Benutzer und die Benutzerin der App nicht bestimmbar sind. Die Bearbeitung von Personendaten wird minimiert. So sind keinerlei technische Rückschlüsse auf Personen, Standorte oder Geräte möglich. Ortsangaben werden keine erfasst, sondern lediglich verschlüsselte Daten betreffend die Kontakt-Ereignisse. Diese werden technisch vor Missbrauch geschützt. Das BAG kann keine Rückschlüsse auf die Benutzerinnen und Benutzer der App ziehen. Die App schützt die Daten der Benutzerinnen und Benutzer so, dass über weite Strecken kein Personenbezug hergestellt werden kann. Dennoch ist ein Personenbezug nicht absolut auszuschliessen. So besteht eine gewisse Wahrscheinlichkeit, dass bei der Benachrichtigung
+ Das gesamte App-System ist darauf ausgerichtet, dass der Benutzer und die Benutzerin der App nicht bestimmbar sind. Die Bearbeitung von Personendaten wird minimiert. So sind keinerlei technische Rückschlüsse auf Personen, Standorte oder Geräte möglich. Ortsangaben werden bei den Begegnungen via Proximity-Tracing keine erfasst, sondern lediglich verschlüsselte Daten betreffend die Kontakt-Ereignisse. Beim Warnsystem werden nur verschlüsselte Daten über Veranstaltungen und über Ansteckungsgefahren an diesen Veranstaltungen erfasst. Diese Daten werden technisch vor Missbrauch geschützt. Das BAG kann keine Rückschlüsse auf die Benutzerinnen und Benutzer der App ziehen und die Daten nicht entschlüsseln. Die App schützt die Daten der Benutzerinnen und Benutzer so, dass über weite Strecken kein Personenbezug hergestellt werden kann. Dennoch ist ein Personenbezug nicht absolut auszuschliessen. So besteht insb. beim Proximity-Tracing-System eine gewisse Wahrscheinlichkeit, dass bei der Benachrichtigung
  <em>
  </em>
- einer möglicherweise gefährdeten Person, diese aufgrund ihrer Erinnerung an ihre Sozialkontakte der letzten Tage allenfalls Rückschlüsse auf die Identität der infizierten Person ziehen kann. Durch die Benutzung der App können somit potenziell auch Personen identifiziert werden. Die Benachrichtigung umfasst weiter Verhaltensempfehlungen des BAG, die Information, dass die Benutzerin oder der Benutzer potenziell dem Coronavirus ausgesetzt war, die Angabe, an welchen Tagen dies der Fall war sowie den Hinweis, dass das BAG einen Leitfaden (Web-Formular) und eine Infoline zur kostenlosen Beratung betreibt. Verlässt die Benutzerin oder der Benutzer die App, um den Leitfaden auszufüllen, werden die in der App genannten Tage, an welchen die Möglichkeit einer Ansteckung bestand, automatisch an den Leitfaden übermittelt.
+ einer möglicherweise gefährdeten Person diese aufgrund ihrer Erinnerung an ihre Sozialkontakte der letzten Tage allenfalls Rückschlüsse auf die Identität der infizierten Person ziehen kann. Durch die Benutzung der App können somit potenziell auch Personen identifiziert werden. Die Benachrichtigung aufgrund eines engen Kontaktes mit einer positiv getesteten Nutzerin / einem positiv getesteten Nutzer umfasst weiter Verhaltensempfehlungen des BAG, die Information, dass die Benutzerin oder der Benutzer potenziell dem Coronavirus ausgesetzt war, die Angabe, an welchen Tagen dies der Fall war sowie den Hinweis, dass das BAG einen Leitfaden (Web-Formular) und eine Infoline zur kostenlosen Beratung betreibt. Verlässt die Benutzerin oder der Benutzer die App, um den Leitfaden auszufüllen, werden die in der App genannten Tage, an welchen die Möglichkeit einer Ansteckung bestand, automatisch an den Leitfaden übermittelt. Die Benachrichtigung aufgrund der Check-in Funktion umfasst die obengenannten Punkte, jedoch wird hier kein Leitfaden oder eine Infoline angeboten; der primäre Inhalt der Benachrichtigung ist es, sich testen zu lassen.
 </p>
 <ul>
  <li>
-  Das App-System gliedert sich in zwei Komponenten:
+  Das App-System gliedert sich in drei Komponenten:
  </li>
  <li>
-  ein System zur Verwaltung der Annäherungsdaten, bestehend aus einer Software, die von den Benutzerinnen und Benutzern auf ihren Mobiltelefonen installiert wird, und einem Backend (VA-Backend);
+  ein System zur Verwaltung der Annäherungsdaten,
+  bestehend aus einer Software, die von den Benutzerinnen und Benutzern auf ihren Mobiltelefonen installiert wird, und einem Backend (VA-Backend);
  </li>
  <li>
   ein System zur Verwaltung von Codes zur Freischaltung der Benachrichtigungen (Codeverwaltungssystem), bestehend aus einem webbasierten Frontend und einem Backend.
  </li>
  <li>
-  Die beiden Backends unterstehen als zentrale Server direkt der Kontrolle des BAG und werden technisch vom Bundesamt für Informatik und Kommunikation (BIT) betrieben. Die Codeverwaltungs-Frontends laufen auf Geräten der für die Generierung des Freischaltcodes («Covidcodes») berechtigten Fachpersonen.
+  ein System zur Verwaltung der Veranstaltungen, bestehend aus einer Software, die von den Benutzerinnen und Benutzern auf ihren Mobiltelefonen installiert wird, und einem Backend (Veranstaltungs-Backend).
+ </li>
+ <li>
+  Die drei Backends unterstehen als zentrale Server direkt der Kontrolle des BAG und werden technisch vom Bundesamt für Informatik und Kommunikation (BIT) betrieben. Die Codeverwaltungs-Frontends laufen auf Geräten der für die Generierung des Freischaltcodes («Covidcodes») berechtigten Fachpersonen.
  </li>
 </ul>
 <p>
@@ -78,7 +83,10 @@ <h1>
   die Signalstärke;
  </li>
  <li>
-  das Datum und die geschätzte Dauer der Annäherung.
+  das Datum und die geschätzte Dauer der Annäherung;
+ </li>
+ <li>
+  die Veranstaltungs-Identifizierungscodes mit dem jeweiligen Datum, Dauer des Aufenthaltes und Bezeichnung der Veranstaltung.
  </li>
 </ul>
 <p>
@@ -107,7 +115,21 @@ <h1>
  </li>
 </ul>
 <p>
- Darüber hinaus kann das App-System mit entsprechenden ausländischen Systemen verbunden werden, wenn im betreffenden Staat ein angemessener Schutz der Persönlichkeit gewährleistet wird (durch die Gesetzgebung oder hinreichende Garantien, insbesondere durch Vertrag). Ausländische Systeme gelten dann als «entsprechend», wenn sie nach den folgenden Grundsätzen des App-Systems ausgestaltet sind:
+ Das Veranstaltungs-Backend besteht aus einer Liste mit folgenden Daten:
+</p>
+<ul>
+ <li>
+  die Veranstaltungs-Identifizierungscodes der infizierten Teilnehmenden, die in dem Zeitraum aktuell waren, in dem eine Ansteckung von anderen Personen an einer Veranstaltung möglich war;
+ </li>
+ <li>
+  dem Datum jedes Veranstaltungs-Identifizierungscodes;
+ </li>
+ <li>
+  dem verschlüsselten relevanten Zeitraum des infizierten Teilnehmenden pro Veranstaltungs-Identifizierungscode.
+ </li>
+</ul>
+<p>
+ Darüber hinaus kann das Proximity-Tracing-System mit entsprechenden ausländischen Systemen verbunden werden, wenn im betreffenden Staat ein angemessener Schutz der Persönlichkeit gewährleistet wird (durch die Gesetzgebung oder hinreichende Garantien, insbesondere durch Vertrag). Ausländische Systeme gelten dann als «entsprechend», wenn sie nach den folgenden Grundsätzen des App-Systems ausgestaltet sind:
 </p>
 <ul>
  <li>
@@ -132,8 +154,8 @@ <h1>
  Zwecke und Rechtsgrundlagen
 </h1>
 <p>
- Das vom BAG betriebene App-System und das Verbindungssystem stützt sich auf das EpG und die VPTS.
- Die App und die mit ihr einhergehenden Datenbearbeitungen bezwecken ausschliesslich, die Benutzerinnen und Benutzer, die potenziell dem Coronavirus ausgesetzt waren, unter Wahrung des Datenschutzes zu benachrichtigen sowie Statistiken aus Daten der beiden Backends im Zusammenhang mit dem Coronavirus zu erstellen.
+ Das vom BAG betriebene App-System und das Verbindungssystem stützt sich auf das EpG, die VPTS, das Covid-19-Gesetz sowie die VWV.
+ Die App und die mit ihr einhergehenden Datenbearbeitungen bezwecken ausschliesslich, die Benutzerinnen und Benutzer, die potenziell dem Coronavirus ausgesetzt waren, unter Wahrung des Datenschutzes zu benachrichtigen sowie Statistiken aus Daten der drei Backends im Zusammenhang mit dem Coronavirus zu erstellen.
 </p>
 <p>
  Das Verbindungssystem dient dazu, dass eine solche Benachrichtigung auch zwischen verbundenen nationalen Apps möglich ist. Damit können Benutzerinnen und Benutzer der App auch dann benachrichtigt werden, wenn sie eine Annäherung zu infizierten Benutzerinnen und Benutzern einer ausländischen App gehabt haben (z.B. zu Grenzgängern und Touristen im Inland oder Kontakten im Ausland). Umgekehrt können auch Benutzerinnen und Benutzer einer verbundenen ausländischen App benachrichtigt werden bei Annäherungen zu infizierten Benutzerinnen und Benutzern der App.
@@ -144,20 +166,20 @@ <h1>
  Datenweitergabe
 </h1>
 <p>
- Die Liste mit den Daten des VA-Backends wird der App im Abrufverfahren zur Verfügung gestellt. Soweit das BAG für diesen Service Dritte im In- oder Ausland beauftragt, verpflichten sich diese vertraglich, die Vorgaben nach Artikel 60a EpG und der VPTS einzuhalten. Davon ausgenommen ist die Regelung betreffend den Quellcode nach Artikel 60
+ Die Liste mit den Daten des VA-Backends sowie des Veranstaltungs-Backends wird der App im Abrufverfahren zur Verfügung gestellt. Soweit das BAG für diesen Service Dritte im In- oder Ausland beauftragt, verpflichten sich diese vertraglich, die Vorgaben nach Artikel 60a EpG, der VPTS, Artikel 3 Absatz 7 Buchstabe a Covid-19-Gesetz und der VWV einzuhalten. Davon ausgenommen ist die Regelung betreffend den Quellcode nach Artikel 60
  <em>
   a
  </em>
- Absatz 5 Buchstabe e EpG. Das BAG kontrolliert die Einhaltung der Vorgaben. Bei der Ausführung des Auftrags anfallende Randdaten dürfen die beauftragten Dritten nicht für eigene Zwecke nutzen. Diese Daten werden nur vom BAG bzw. vom BIT ausgewertet (vgl. Ziffer 8).
+ Absatz 5 Buchstabe e EpG und Artikel 15 VWV. Das BAG kontrolliert die Einhaltung der Vorgaben. Bei der Ausführung des Auftrags anfallende Randdaten dürfen die beauftragten Dritten nicht für eigene Zwecke nutzen. Diese Daten werden nur vom BAG bzw. vom BIT ausgewertet (vgl. Ziffer 8).
 </p>
 <p>
  Die Liste mit den privaten Schlüsseln der infizierten Benutzerinnen und Benutzer des VA-Backends wird zudem regelmässig für eine grenzüberschreitende Benachrichtigung an das Verbindungssystem übermittelt. Sodann laden die verbundenen ausländischen Systeme (zurzeit: die deutsche Corona-Warn-App) diese privaten Schlüssel herunter und stellen sie ihren Apps zum Abruf zur Verfügung (siehe Ziffer 2).
 </p>
 <p>
- Das BAG stellt dem Bundesamt für Statistik (BFS) periodisch den aktuellen Bestand der in beiden Backends vorhandenen Daten in anonymisierter Form für statistische Auswertungen zur Verfügung. Die Daten des Verbindungssystems können dem BFS und der zuständigen ausländischen Stelle zu Statistikzwecken in vollständig anonymisierter Form bekanntgegeben werden. Das BIT führt im Auftrag des BAG den Betrieb der gesamten Software durch und stellt den notwendigen technischen Support-Service bereit. Das BIT hat lediglich Zugriff auf Daten, soweit dies für die beschriebenen Zwecke und die Tätigkeit der betreffenden Mitarbeiter erforderlich ist. Diese sind im Umgang mit den Daten zu Vertraulichkeit verpflichtet.
+ Das BAG stellt dem Bundesamt für Statistik (BFS) periodisch den aktuellen Bestand der in den drei Backends vorhandenen Daten in anonymisierter Form für statistische Auswertungen zur Verfügung. Die Daten des Verbindungssystems können dem BFS und der zuständigen ausländischen Stelle zu Statistikzwecken in vollständig anonymisierter Form bekanntgegeben werden. Das BIT führt im Auftrag des BAG den Betrieb der gesamten Software durch und stellt den notwendigen technischen Support-Service bereit. Das BIT hat lediglich Zugriff auf Daten, soweit dies für die beschriebenen Zwecke und die Tätigkeit der betreffenden Mitarbeiter erforderlich ist. Diese sind im Umgang mit den Daten zu Vertraulichkeit verpflichtet.
 </p>
 <p>
- Die App verwendet eine Schnittstelle zum Betriebssystem des Mobiltelefons der Benutzerin oder des Benutzers, welche die Bearbeitung von Daten durch Apple oder Google bedingt. Die über die Schnittstelle genutzten Funktionen der Betriebssysteme müssen die Vorgaben von Artikel 60a EpG und der VPTS erfüllen. Davon ausgenommen ist die Regelung betreffend den Quellcode nach Artikel 60
+ Die App verwendet für das Proximity-Tracing-System eine Schnittstelle zum Betriebssystem des Mobiltelefons der Benutzerin oder des Benutzers, welche die Bearbeitung von Daten durch Apple oder Google bedingt. Die über die Schnittstelle genutzten Funktionen der Betriebssysteme müssen die Vorgaben von Artikel 60a EpG und der VPTS erfüllen. Davon ausgenommen ist die Regelung betreffend den Quellcode nach Artikel 60
  <em>
   a
  </em>
@@ -173,6 +195,9 @@ <h1>
  <li>
   die Daten des Systems zur Verwaltung der Annäherungsdaten (sowohl auf den Mobiltelefonen als auch im VA-Backend): 14 Tage nach ihrer Erfassung;
  </li>
+ <li>
+  die Daten des Systems zur Verwaltung der Veranstaltungen (sowohl auf den Mobiltelefonen als auch im Veranstaltungs-Backend): 14 Tage nach ihrer Erfassung;
+ </li>
  <li>
   die Daten des Codeverwaltungssystems: 24 Stunden nach ihrer Erfassung;
  </li>
@@ -202,7 +227,7 @@ <h1>
  Weiteres
 </h1>
 <p>
- Es werden Protokolle über Zugriffe auf das VA-Backend und das Codeverwaltungssystem zu den in den Artikeln 57
+ Es werden Protokolle über Zugriffe auf das VA-Backend, das Veranstaltungs-Backend und das Codeverwaltungssystem zu den in den Artikeln 57
  <em>
   l
  </em>
diff --git a/app/src/main/assets/disclaimer/de/terms_of_use.html b/app/src/main/assets/disclaimer/de/terms_of_use.html
index 2151227e3..5b7da35b3 100644
--- a/app/src/main/assets/disclaimer/de/terms_of_use.html
+++ b/app/src/main/assets/disclaimer/de/terms_of_use.html
@@ -7,7 +7,6 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <strong>
  1.
  Geltungsbereich und Zweck
@@ -18,7 +17,7 @@
 </p>
 <p>
  1.2
- Die App des Bundesamtes für Gesundheit (BAG) stützt sich auf das Epidemiengesetz vom 28. September 2012 (EpG; SR 818.101) und die Verordnung vom 24. Juni 2020 über das Proximity-Tracing-System für das Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25).
+ Die App des Bundesamtes für Gesundheit (BAG) stützt sich auf das Epidemiengesetz vom 28. September 2012 (EpG; SR 818.101), die Verordnung vom 24. Juni 2020 über das Proximity-Tracing-System für das Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25), dem Bundesgesetz über die gesetzlichen Grundlagen für Verordnungen des Bundesrates zur Bewältigung der Covid-19-Epidemie vom 25. September 2020 (Covid-19-Gesetz; SR 818.102) sowie der Verordnung über ein Warnsystem zu Covid-19 für Veranstaltungen vom 1. Juli 2021.
 </p>
 <p>
  1.3
@@ -34,7 +33,7 @@
 </p>
 <p>
  2.2
- Die Nutzung der App ist nicht auf ein geografisches Gebiet beschränkt. Allerdings können Warnungen nur erfolgen, wenn die ausländische App mit der SwissCovid-App interoperabel ist. Zum gegenwärtigen Zeitpunkt ist lediglich die in Deutschland genutzte Corona-Warn-App interoperabel.
+ Die Nutzung der App ist nicht auf ein geografisches Gebiet beschränkt. Allerdings können Warnungen nur erfolgen, wenn die ausländische App mit der SwissCovid-App interoperabel ist. Zum gegenwärtigen Zeitpunkt ist lediglich die in Deutschland genutzte Corona-Warn-App mit dem Proximity-Tracing-System der SwissCovid-App interoperabel.
 </p>
 <p>
  2.3
@@ -46,18 +45,18 @@
 </strong>
 <p>
  3.1
- Mittels der App werden Benutzerinnen und Benutzer informiert, wenn sie mit mindestens einer nachweislich infizierten Benutzerin oder einem nachweislich infizierten Benutzer der SwissCovid-App oder anderen interoperablen Apps in relevantem Kontakt waren.
+ Mittels der App werden Benutzerinnen und Benutzer informiert, wenn sie mit mindestens einer nachweislich infizierten Benutzerin oder einem nachweislich infizierten Benutzer der SwissCovid-App oder anderen interoperablen Apps in relevantem Kontakt waren. Dieser relevante Kontakt kann aufgrund des Proximity-Tracings oder aufgrund der Teilnahme an einer Veranstaltung eruiert werden.
 </p>
 <p>
  3.2
- Voraussetzung für das Funktionieren der App ist die Aktivierung von Bluetooth.
+ Voraussetzung für das Proximity-Tracing-System der App ist die Aktivierung von Bluetooth. Für das Warnsystem braucht es hingegen kein Bluetooth.
 </p>
 <p>
  3.3
- Die App erfüllt unter Verwendung einer Schnittstelle zum Betriebssystem des Mobiltelefons der Benutzerin oder des Benutzers folgende Funktionen:
+ Die App erfüllt – beim Proximity-Tracing-System unter Verwendung einer Schnittstelle zum Betriebssystem des Mobiltelefons der Benutzerin oder des Benutzers – folgende Funktionen:
 </p>
 <p>
- Das Betriebssystem generiert jeden Tag einen neuen privaten Schlüssel, der keine Rückschlüsse auf die App, das Mobiltelefon und die Benutzerinnen und Benutzer ermöglicht. Innerhalb der Reichweite von Bluetooth tauscht das Betriebssystem mit allen kompatiblen und aktiven Apps einen mindestens halbstündlich wechselnden Identifizierungscode (sog. «random ID») aus, der aus einem aktuellen privaten Schlüssel abgeleitet wird, aber nicht auf diesen Schlüssel zurückgeführt werden kann und ebenfalls keine Rückschlüsse auf die App, das Mobiltelefon und deren Benutzerinnen und Benutzer ermöglicht.
+ Proximity-Tracing-System: Das Betriebssystem generiert jeden Tag einen neuen privaten Schlüssel, der keine Rückschlüsse auf die App, das Mobiltelefon und die Benutzerinnen und Benutzer ermöglicht. Innerhalb der Reichweite von Bluetooth tauscht das Betriebssystem mit allen kompatiblen und aktiven Apps einen mindestens halbstündlich wechselnden Identifizierungscode (sog. «random ID») aus, der aus einem aktuellen privaten Schlüssel abgeleitet wird, aber nicht auf diesen Schlüssel zurückgeführt werden kann und ebenfalls keine Rückschlüsse auf die App, das Mobiltelefon und deren Benutzerinnen und Benutzer ermöglicht.
 </p>
 <p>
  Das Betriebssystem speichert auf dem Mobiltelefon die empfangenen Identifizierungscodes, die Signalstärke, das Datum und die geschätzte Dauer der Annäherung.
@@ -65,21 +64,24 @@
 <p>
  Die App ruft periodisch eine Liste der privaten Schlüssel der infizierten Benutzerinnen und Benutzer der SwissCovid-App und anderen interoperablen Apps ab und lässt vom Betriebssystem überprüfen, ob mindestens ein lokal gespeicherter Identifizierungscode mit einem privaten Schlüssel der Liste generiert wurde. Ist dies der Fall und bestand zu mindestens einem Mobiltelefon einer infizierten Benutzerin oder einem infizierten Benutzer der SwissCovid-App oder anderen interoperablen Apps eine Annährung von 1,5 Metern oder weniger und erreicht die Summe der Dauer aller solchen Annäherungen innerhalb eines Tages 15 Minuten, so gibt die App die Benachrichtigung aus. Der Abstand wird anhand der Stärke der empfangenen Signale geschätzt.
 </p>
+<p>
+ Warnsystem für Veranstaltungen: Die Organisatorin oder der Organisator einer Veranstaltung generiert in seiner App einen QR-Code. Besucherinnen und Besucher der Veranstaltung können mit ihrer App den gezeigten QR-Code scannen und sind so an der Veranstaltung eingecheckt.
+</p>
 <p>
  3.4
- Ist eine Infektion bei einer Benutzerin oder einem Benutzer nachgewiesen, generieren zugriffsberechtigte Fachpersonen (z.B. behandelnde Ärztinnen und Ärzte oder Apothekerinnen und Apotheker) einen einmaligen und zeitlich begrenzt gültigen Freischaltcode («Covidcode») und geben diesen der infizierten Benutzerin oder dem infizierten Benutzer bekannt. Diese oder dieser kann den Freischaltcode in ihre oder seine App freiwillig eingeben. Die Benachrichtigung bzw. die Eingabe des Freischaltcodes erfolgt nur mit der ausdrücklichen Einwilligung der infizierten Benutzerin oder des infizierten Benutzers.
+ Die App speichert auf dem Mobiltelefon die Veranstaltungs-Identifizierungscodes mit dem jeweiligen Datum, die Dauer des Aufenthaltes und die Bezeichnung der Veranstaltung. Sie ruft periodisch vom Veranstaltungs-Backend im Abrufverfahren die Liste der Veranstaltungs-Identifizierungscodes der infizierten teilnehmenden Personen ab. Sie gleicht die Veranstaltungs-Identifizierungscodes mit den von ihr lokal gespeicherten Veranstaltungs-Identifizierungscodes ab. Ergibt der Abgleich eine Übereinstimmung, so gibt die App die Benachrichtigung aus.Ist eine Infektion bei einer Benutzerin oder einem Benutzer nachgewiesen, generieren zugriffsberechtigte Fachpersonen (z.B. behandelnde Ärztinnen und Ärzte oder Apothekerinnen und Apotheker) einen einmaligen und zeitlich begrenzt gültigen Freischaltcode («Covidcode») und geben diesen der infizierten Benutzerin oder dem infizierten Benutzer bekannt. Diese oder dieser kann den Freischaltcode in ihre oder seine App freiwillig eingeben. Die Benachrichtigung bzw. die Eingabe des Freischaltcodes erfolgt nur mit der ausdrücklichen Einwilligung der infizierten Benutzerin oder des infizierten Benutzers. Die infizierte Benutzerin oder der infizierte Benutzer kann ausserdem wählen, ob sie oder er sowohl die engen Kontakte aufgrund des Proximity-Tracing-Systems als auch die Kontakte aufgrund der Teilnahme an einer Veranstaltung warnen will. Darüber hinaus kann sie oder er auch entscheiden, ob er für jede Veranstaltung, an welcher er im relevanten Zeitraum teilgenommen hat, eine Benachrichtigung auslösen will oder nur für einzelne.
 </p>
 <p>
  Die anderen Benutzerinnen und Benutzer der SwissCovid-App
  <br/>
- oder anderen interoperablen Apps, welche in der infektiösen Zeitspanne eine Annährung gemäss Ziffer 3.3 zu der infizierten Benutzerin oder dem infizierten Benutzer hatten, werden durch die eigenen Apps benachrichtigt.
+ oder anderer interoperabler Apps, welche in der infektiösen Zeitspanne eine Annährung gemäss Ziffer 3.3 zu der infizierten Benutzerin oder dem infizierten Benutzer hatten oder gleichzeitig an derselben Veranstaltung teilgenommen haben, werden durch die eigenen Apps benachrichtigt.
 </p>
 <p>
- Die benachrichtigten Benutzerinnen und Benutzer erfahren, dass eine Annährung stattgefunden hat bzw. dass sie potenziell dem Coronavirus ausgesetzt waren und an welchen Tagen dies der Fall war. Sie erfahren nicht, welcher Benutzer oder welche Benutzerin infiziert ist und die Benachrichtigung ausgelöst hat. Die Benachrichtigung der SwissCovid-App umfasst weiter Verhaltensempfehlungen des BAG sowie den Hinweis, dass das BAG einen Leitfaden (Web-Formular) und eine Infoline zur kostenlosen Beratung betreibt. Verlässt man die App, um den Leitfaden auszufüllen, werden die in der App genannten Tage, an welchen eine Möglichkeit der Ansteckung bestand, automatisch an den Leitfaden übermittelt.
+ Die benachrichtigten Benutzerinnen und Benutzer erfahren, dass eine Annährung stattgefunden hat bzw. dass sie potenziell dem Coronavirus ausgesetzt waren und an welchen Tagen dies der Fall war. Sie erfahren nicht, welcher Benutzer oder welche Benutzerin infiziert ist und die Benachrichtigung ausgelöst hat. Die Benachrichtigung der SwissCovid-App aufgrund eines engen Kontaktes mit einer positiv getesteten Nutzerin / einem positiv getesteten Nutzer umfasst weiter Verhaltensempfehlungen des BAG sowie den Hinweis, dass das BAG einen Leitfaden (Web-Formular) und eine Infoline zur kostenlosen Beratung betreibt. Verlässt man die App, um den Leitfaden auszufüllen, werden die in der App genannten Tage, an welchen eine Möglichkeit der Ansteckung bestand, automatisch an den Leitfaden übermittelt. Die Benachrichtigung aufgrund des Warnsystems umfasst die obengenannten Punkte, jedoch wird hier kein Leitfaden und keine Infoline angeboten, die primäre Empfehlung ist es, sich testen zu lassen.
 </p>
 <p>
  3.5
- Bei Eingabe des Freischaltcodes werden die Benutzerinnen und Benutzer darauf aufmerksam gemacht, mit welchen Ländern (vgl. Ziffer 2.2) die App interoperabel ist. Es wird darauf hingewiesen, dass – wenn das Feld «Einverstanden» gedrückt und der Freischaltcode in die App eingegeben wird – die privaten Schlüssel nicht nur innerhalb der SwissCovid-App geteilt werden, sondern auch mit allen anderen interoperablen Apps (zurzeit die deutsche Corona-Warn-App). Die privaten Schlüssel können nur mit allen interoperablen Apps oder gar nicht geteilt werden, was dem sogenannten «One-World-Prinzip» entspricht.
+ Bei Eingabe des Freischaltcodes werden die Benutzerinnen und Benutzer darauf aufmerksam gemacht, mit welchen Ländern (vgl. Ziffer 2.2) die App interoperabel ist. Es wird darauf hingewiesen, dass – wenn das Feld «Einverstanden» gedrückt und der Freischaltcode in die App eingegeben wird – die privaten Schlüssel des Proximity-Tracing-Systems nicht nur innerhalb der SwissCovid-App geteilt werden, sondern auch mit allen anderen interoperablen Apps (zurzeit die deutsche Corona-Warn-App). Die privaten Schlüssel können nur mit allen interoperablen Apps oder gar nicht geteilt werden, was dem sogenannten «One-World-Prinzip» entspricht.
 </p>
 <p>
  3.6
@@ -186,7 +188,7 @@
 </p>
 <p>
  7.3
- Spätestens beim Ausserkrafttreten der in Ziffer 1.2. aufgeführten Verordnung deaktiviert das BAG die App und fordert die Benutzerinnen und Benutzer auf, diese auf dem Mobiltelefon zu deinstallieren.
+ Spätestens beim Ausserkrafttreten der in Ziffer 1.2. aufgeführten Verordnungen deaktiviert das BAG die App und fordert die Benutzerinnen und Benutzer auf, diese auf dem Mobiltelefon zu deinstallieren.
 </p>
 <strong>
  8.
diff --git a/app/src/main/assets/disclaimer/en/data_protection_statement.html b/app/src/main/assets/disclaimer/en/data_protection_statement.html
index d786e9cda..57c7db91e 100644
--- a/app/src/main/assets/disclaimer/en/data_protection_statement.html
+++ b/app/src/main/assets/disclaimer/en/data_protection_statement.html
@@ -7,18 +7,18 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <p>
  Data Protection Statement of the Federal Office of Public Health FOPH in connection with the use of the “SwissCovid app”
 </p>
 <p>
- Version: 9 April 2021
+ Version: 1 July 2021
 </p>
 <p>
  In this Data Protection Statement, the Federal Office of Public Health (FOPH) explains to what extent it will process personal data in connection with the use of the application “SwissCovid app” (hereafter app) in Switzerland. This account is not exhaustive; specific matters may be governed by other data protection statements, similar documents, terms and conditions of use, or applications.
 </p>
 <p>
- The processing of personal data is governed by data protection legislation. The federal legislation on data protection is applicable to the data processing. In addition, the Data Protection Statement is in line with the Epidemics Act of 28 September 2012 (EpG; SR 818.101) and the Ordinance of 24 June 2020 on the Proximity Tracing System for the Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25).
+ The processing of personal data is governed by data protection legislation. The federal legislation on data protection is applicable to the processing of personal data. In addition, the Data Protection Statement is in line with the Epidemics Act of 28 September 2012 (EpG; CC 818.101), the Ordinance of 24 June 2020 on the Proximity Tracing System for the Coronavirus SARS-CoV-2 (VPTS; CC 818.101.25),
+ the Federal Act on the Statutory Principles for Federal Council Ordinances on Combating the COVID-19 Epidemic of 25 September 2020 (COVID-19 Act; CC 818.102) and the Ordinance on a COVID-19 Warning System for Events of 1 July 2021.
 </p>
 <p>
  “Personal data” means all information relating to an identified or identifiable person. “Processing” means any operation with personal data, irrespective of the means applied and the procedure, and in particular the collection, storage, use, revision, disclosure, archiving or destruction of data.
@@ -44,20 +44,23 @@ <h1>
  Collection and processing of personal data
 </h1>
 <p>
- The entire app system is designed to ensure that the app user is not identifiable. The processing of personal data is kept to a minimum. Data cannot be traced back by technical means to persons, locations or devices. What is collected is not location data, but merely encrypted data concerning proximity (contact) events. This is protected by technical means against misuse. The FOPH cannot draw any conclusions concerning app users. The app protects users’ data in such a way that it cannot, at a distance, be connected to specific persons. Connection to a specific person cannot, however, be ruled out altogether. There is a certain likelihood that, when someone is notified of a possible exposure, their recollection of social contacts over recent days may allow them to deduce the identity of the infected individual. As a result of using the app, persons may thus potentially be identified. The notification also contains the behavioural recommendations of the FOPH, the information that the user may potentially have been exposed to the coronavirus, the dates on which this was the case and it draws attention to a guide (web form) as well as the Infoline offering free advice operated by the FOPH. If the user leaves the app in order to complete the guide, the dates named in the app on which an infection may have taken place are automatically transferred to the guide.
+ The entire app system is designed to ensure that the app user is not identifiable. The processing of personal data is kept to a minimum. Data cannot be traced back by technical means to persons, locations or devices. What is collected via proximity tracing in the event of contacts is not location data, but merely encrypted data concerning proximity (contact) events. For the warning system only encrypted data about events and threats of infection at these events are collected. This data is protected by technical means against misuse. The FOPH cannot draw any conclusions concerning app users or decrypt the data. The app protects users’ data in such a way that it cannot, at a distance, be connected to specific persons. Connection to a specific person cannot, however, be ruled out altogether. In particular with the proximity tracing system, there is a certain likelihood that, when someone is notified of a possible exposure, their recollection of social contacts over recent days may allow them to deduce the identity of the infected individual. As a result of using the app, persons may thus potentially be identified. The notification on the basis of a close contact with a user who has tested negative also contains the behavioural recommendations of the FOPH, the information that the user may potentially have been exposed to the coronavirus, the dates on which this was the case and it draws attention to a guide (web form) as well as the Infoline offering free advice operated by the FOPH. If the user leaves the app in order to complete the guide, the dates named in the app on which an infection may have taken place are automatically transferred to the guide. Notifications on the basis of the check-in function cover the above-mentioned points, although here no guide or infoline is offered; the primary content of the notification is the recommendation to have a test.
 </p>
 <ul>
  <li>
-  The app system has two components:
+  The app system has three components:
  </li>
  <li>
   a proximity data management system, comprising software installed by users on their mobile phones and a back end (PM back end);
  </li>
  <li>
-  a system for the management of codes for the activation of notifications (code management system), comprising a web-based front end and a back end.
+  a system for the management of codes for the activation of notifications (code management system), comprising a web-based front end and a back end;
  </li>
  <li>
-  Both of the back ends, as central servers, are under the direct control of the FOPH and are operated technically by the Federal Office of Information Technology, Systems and Telecommunication (FOITT). The code management front ends run on the devices of the experts authorised to generate the activation code (Covid code).
+  a system for the management of events, comprising software installed by users on their mobile phones and a back end (event back end).
+ </li>
+ <li>
+  The three back ends, as central servers, are under the direct control of the FOPH and are operated technically by the Federal Office of Information Technology, Systems and Telecommunication (FOITT). The code management front ends run on the devices of the experts authorised to generate the activation code (Covid code).
  </li>
 </ul>
 <p>
@@ -71,7 +74,10 @@ <h1>
   the signal strength;
  </li>
  <li>
-  the date and the estimated duration of proximity.
+  the date and the estimated duration of proximity;
+ </li>
+ <li>
+  the event identification codes with the relevant date, duration of attendance and designation of the event.
  </li>
 </ul>
 <p>
@@ -100,7 +106,21 @@ <h1>
  </li>
 </ul>
 <p>
- The app system can also be connected to corresponding foreign systems if adequate protection of privacy is assured in the country in question (by means of corresponding legislation or sufficient guarantees, in particular in the form of an agreement). Foreign systems are considered to be “corresponding” if they are designed according to the following principles of the app system:
+ The event back end contains a list with the following data:
+</p>
+<ul>
+ <li>
+  the event identification codes for the infected participants that were current at the time infection by other people at an event was possible;
+ </li>
+ <li>
+  the date of each event identification code;
+ </li>
+ <li>
+  the encrypted relevant period for the infected participant for each event identification code.
+ </li>
+</ul>
+<p>
+ The proximity tracing system can also be connected to corresponding foreign systems if adequate protection of privacy is assured in the country in question (by means of corresponding legislation or sufficient guarantees, in particular in the form of an agreement). Foreign systems are considered to be “corresponding” if they are designed according to the following principles of the app system:
 </p>
 <ul>
  <li>
@@ -125,7 +145,7 @@ <h1>
  Purposes and legal basis
 </h1>
 <p>
- The app system operated by the FOPH and the connection system are based on the EpG and the VPTS. The exclusive purposes of the app and the associated data processing are, in a privacy-preserving manner, to notify users potentially exposed to the coronavirus and to produce coronavirus-related statistics using data from the two back end systems.
+ The app system operated by the FOPH and the connection system are based on the EpG, the VPTS, the COVID-19 Act and the VWV. The exclusive purposes of the app and the associated data processing are, in a privacy-preserving manner, to notify users potentially exposed to the coronavirus and to produce coronavirus-related statistics using data from the three back end systems.
 </p>
 <p>
  The connection system serves to ensure that such a notification is also possible between connected national apps. This means that users of the app can also be notified if they have been in proximity to an infected user of a foreign app (e.g. cross-border commuters and tourists in Switzerland or contacts abroad). Conversely, users of a connected foreign app can also be notified if they have been in proximity to infected users of the app.
@@ -136,15 +156,15 @@ <h1>
  Data transfer
 </h1>
 <p>
- The PM back end data list is made available to the app (or front end) in the retrieval process. Insofar as the FOPH engages third parties in Switzerland or abroad to provide this service, they undertake contractually to comply with the requirements of Article 60
+ The list of data in the PM and event back end systems is made available to the app (or front end) in the retrieval process. Insofar as the FOPH engages third parties in Switzerland or abroad to provide this service, they undertake contractually to comply with the requirements of Article 60
  <em>
   a
  </em>
- EpG and the VPTS, with the exception of the provisions concerning the source code specified in Article 60
+ EpG, the VPTS, Article 3 paragraph 7 letter a COVID-19 Act and the VWV, with the exception of the provisions concerning the source code specified in Article 60
  <em>
   a
  </em>
- paragraph 5 letter e EpG. The FOPH monitors compliance with the legal requirements. The third parties engaged are not permitted to use non-core data arising in the execution of this task for their own purposes. This data will only be analysed by the FOPH or the FOITT (cf. Section 8).
+ paragraph 5 letter e EpG and Article 15 VWV. The FOPH monitors compliance with the legal requirements. The third parties engaged are not permitted to use non-core data arising in the execution of this task for their own purposes. This data will only be analysed by the FOPH or the FOITT (cf. Section 8).
 </p>
 <p>
  The list with the private keys of the infected users of the PM back end is also regularly transmitted to the connection system for a cross-border notification. The connected foreign systems (currently: the German Corona-Warn-App) then download these private keys and make them available to their apps for retrieval (see
@@ -154,10 +174,10 @@ <h1>
  ).
 </p>
 <p>
- The FOPH will periodically make available to the Federal Statistical Office (FSO), in an anonymised form, the data currently held in the two back end systems, for purposes of statistical analysis. The data of the connection system can be disclosed to the FSO and the responsible foreign body for statistical purposes in a completely anonymised form. The FOITT operates the entire software on behalf of the FOPH and provides the necessary technical support service. The FOITT has access to data only insofar as this is necessary for the purposes described and the activities of the employees concerned. They are bound by confidentiality in the management of the data.
+ The FOPH will periodically make available to the Federal Statistical Office (FSO), in an anonymised form, the data currently held in the three back end systems, for purposes of statistical analysis. The data of the connection system can be disclosed to the FSO and the responsible foreign body for statistical purposes in a completely anonymised form. The FOITT operates the entire software on behalf of the FOPH and provides the necessary technical support service. The FOITT has access to data only insofar as this is necessary for the purposes described and the activities of the employees concerned. They are bound by confidentiality in the management of the data.
 </p>
 <p>
- The app uses an interface to the operating system of the user’s mobile phone, which entails the processing of data by Apple or Google. The operating system functions used via the interface must comply with the requirements of Article 60
+ For the proximity tracing system the app uses an interface to the operating system of the user’s mobile phone, which entails the processing of data by Apple or Google. The operating system functions used via the interface must comply with the requirements of Article 60
  <em>
   a
  </em>
@@ -177,6 +197,9 @@ <h1>
  <li>
   data in the proximity data management system (both on mobile phones and in the PM back end): 14 days after capture;
  </li>
+ <li>
+  data in the event management system (both on mobile phones and in the event back end): 14 days after their collection;
+ </li>
  <li>
   data in the code management system: 24 hours after capture;
  </li>
@@ -206,7 +229,7 @@ <h1>
  Other information
 </h1>
 <p>
- PM back end and code management system access events are logged for the purposes specified in Articles 57
+ PM back end, event back end and code management system access events are logged for the purposes specified in Articles 57
  <em>
   l
  </em>
diff --git a/app/src/main/assets/disclaimer/en/terms_of_use.html b/app/src/main/assets/disclaimer/en/terms_of_use.html
index 92aa2d2cf..f5bc6e64b 100644
--- a/app/src/main/assets/disclaimer/en/terms_of_use.html
+++ b/app/src/main/assets/disclaimer/en/terms_of_use.html
@@ -7,7 +7,6 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <strong>
  1.
  Scope and purpose
@@ -18,7 +17,7 @@
 </p>
 <p>
  1.2
- The Federal Office of Public Health (FOPH) app is based on the Epidemics Act of 28 September 2012 (EpG; SR 818.101) and the Ordinance of 24 June 2020 on the Proximity Tracing System for the Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25).
+ The Federal Office of Public Health (FOPH) app is based on the Epidemics Act of 28 September 2012 (EpG; SR 818.101) and the Ordinance of 24 June 2020 on the Proximity Tracing System for the Coronavirus SARS-CoV-2 (VPTS; SR 818.101.25), the Federal Act on the Statutory Principles for Federal Council Ordinances on Combating the COVID-19 Epidemic (COVID-19 Act; CC 818.102) and the Ordinance on a COVID-19 Warning System for Events of 24 June 2021.
 </p>
 <p>
  1.3
@@ -34,7 +33,7 @@
 </p>
 <p>
  2.2
- The use of the app is not restricted to a geographic region. However, warnings can only be issued if the foreign app is interoperable with the SwissCovid app. At present, only the Corona-Warn-App used in Germany is interoperable.
+ The use of the app is not restricted to a geographic region. However, warnings can only be issued if the foreign app is interoperable with the SwissCovid app. At present, only the Corona-Warn-App used in Germany is interoperable with the SwissCovid app’s proximity tracing system.
 </p>
 <p>
  2.3
@@ -46,18 +45,18 @@
 </strong>
 <p>
  3.1
- Via the app, users are informed if they have been in relevant contact with at least one user of the SwissCovid app or other interoperable apps who has confirmed to have been infected.
+ Via the app, users are informed if they have been in relevant contact with at least one user of the SwissCovid app or other interoperable apps who has confirmed to have been infected. This relevant contact can be identified on the basis of proximity tracing or participation at an event.
 </p>
 <p>
  3.2
- The activation of Bluetooth is required for the operation of the app.
+ The activation of Bluetooth is required for the operation of the app’s proximity tracing system. Bluetooth is not required, however, for the warning system.
 </p>
 <p>
  3.3
- Using an interface to the operating system of the user’s mobile phone, the app fulfils the following functions:
+ The app – in the case of the proximity tracing system using an interface to the operating system of the user’s mobile phone – fulfils the following functions:
 </p>
 <p>
- Each day, the operating system generates a new private key, which cannot be connected to the app, the mobile phone or users. Within the range of Bluetooth, the operating system exchanges with all compatible, running apps an identification code (random ID), changing at least every 30 minutes, which is derived from a current private key but cannot be traced back to this key and likewise cannot be connected to the app, the mobile phone or users.
+ Proximity tracing system: Each day, the operating system generates a new private key, which cannot be connected to the app, the mobile phone or users. Within the range of Bluetooth, the operating system exchanges with all compatible, running apps an identification code (random ID), changing at least every 30 minutes, which is derived from a current private key but cannot be traced back to this key and likewise cannot be connected to the app, the mobile phone or users.
 </p>
 <p>
  On the mobile phone, the operating system stores the identification codes received, the signal strength, the date and the estimated duration of proximity.
@@ -65,19 +64,25 @@
 <p>
  The app periodically retrieves a list of the private keys of users of the SwissCovid app and other interoperable apps known to be infected and allows the operating system to check whether at least one locally stored identification code was generated by a private key included in the list. If this is the case, and if proximity of 1.5 metres or less to the mobile phone of at least one infected user of the SwissCovid app or another interoperable app was registered, and if the duration of all such proximity events within one day amounts to at least 15 minutes, then the app issues a notification. Proximity is estimated on the basis of the strength of the signals received.
 </p>
+<p>
+ Warning system for events: The organiser of an event generates a QR code in their app. People attending the event can use their app to scan the displayed QR code and are thus checked in to the event.
+</p>
+<p>
+ The app saves on the mobile phone the event identification codes with the relevant date, duration of attendance and designation of the event. It periodically retrieves from the event back end the list of event identification codes of the infected participants. It compares these event participation codes with the event participation codes stored locally by the app. If there is a match, the app issues the notification.
+</p>
 <p>
  3.4
- If an infection is confirmed in a user, experts with access rights (e.g. attending physicians or pharmacists) generate a unique activation code (Covid code), valid for a limited period, which they disclose to the infected user. This user can voluntarily enter the activation code in the app. Notification, or entry of the activation code, occurs only with the explicit consent of the infected user.
+ If an infection is confirmed in a user, experts with access rights (e.g. attending physicians or pharmacists) generate a unique activation code (Covid code), valid for a limited period, which they disclose to the infected user. This user can voluntarily enter the activation code in the app. Notification, or entry of the activation code, occurs only with the explicit consent of the infected user. The infected user can also choose whether they want to warn close contacts on the basis of the proximity tracing system and contacts on the basis of participation in an event. In addition, they can decide whether they want to trigger a notification for every event they attended during the relevant period or only for individual events.
 </p>
 <p>
- Other users of the SwissCovid app or other interoperable apps who came into proximity, as defined in Section 3.3, with the infected user during the infectious period are notified by their own apps.
+ Other users of the SwissCovid app or other interoperable apps who came into proximity, as defined in Section 3.3, with the infected user during the infectious period or participated in the same event at the same time are notified by their own apps.
 </p>
 <p>
- The users thus notified learn that a proximity event has occurred, i.e. that they have potentially been exposed to the coronavirus, and on what dates this was the case. They are not told which user has been infected and has triggered the notification. The notification of the SwissCovid app also contains the behavioural recommendations of the FOPH and draws attention to a guide (web form) as well as the Infoline offering free advice operated by the FOPH. If the user leaves the app in order to complete the guide, the dates named in the app on which an infection may have taken place are automatically transferred to the guide.
+ The users thus notified learn that a proximity event has occurred, i.e. that they have potentially been exposed to the coronavirus, and on what dates this was the case. They are not told which user has been infected and has triggered the notification. The notification of the SwissCovid app on the basis of close contact with a user who has tested positive also contains the behavioural recommendations of the FOPH and draws attention to a guide (web form) as well as the Infoline offering free advice operated by the FOPH. If the user leaves the app in order to complete the guide, the dates named in the app on which an infection may have taken place are automatically transferred to the guide. Notifications on the basis of the check-in function cover the above-mentioned points, although here no guide or infoline is offered; the primary content of the notification is [the recommendation to have a test.
 </p>
 <p>
  3.5
- Upon entering the activation code, users are made aware of with which countries (see Section 2.2) the app is interoperable. Reference is made to the fact that – if the “Accept” field is tapped and the activation code is entered in the app – the private keys will not only be shared within the SwissCovid app, but rather also with other interoperable apps (currently: the German Corona-Warn-App). The private keys can only be shared with all interoperable apps or not at all, in keeping with the “one world principle”.
+ Upon entering the activation code, users are made aware of with which countries (see Section 2.2) the app is interoperable. Reference is made to the fact that – if the “Accept” field is tapped and the activation code is entered in the app – the proximity tracing system’s private keys will not only be shared within the SwissCovid app, but rather also with other interoperable apps (currently: the German Corona-Warn-App). The private keys can only be shared with all interoperable apps or not at all, in keeping with the “one world principle”.
 </p>
 <p>
  3.6
@@ -184,7 +189,7 @@
 </p>
 <p>
  7.3
- At the latest when the Ordinance mentioned in Section 1.2 is no longer in force, the FOPH will deactivate the app and request users to uninstall it from their mobile phone.
+ At the latest when the ordinances mentioned in Section 1.2 is no longer in force, the FOPH will deactivate the app and request users to uninstall it from their mobile phone.
 </p>
 <strong>
  8.
diff --git a/app/src/main/assets/disclaimer/fr/data_protection_statement.html b/app/src/main/assets/disclaimer/fr/data_protection_statement.html
index bb47bf275..f6beb8f70 100644
--- a/app/src/main/assets/disclaimer/fr/data_protection_statement.html
+++ b/app/src/main/assets/disclaimer/fr/data_protection_statement.html
@@ -7,26 +7,29 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <p>
  Utilisation de l’application SwissCovid: déclaration de confidentialité de l’Office fédéral de la santé publique
 </p>
 <p>
- Version : 9 avril 2021
+ Version : 1 juillet 2021
 </p>
 <p>
  Dans la présente déclaration de confidentialité, l’Office fédéral de la santé publique (OFSP) explique dans quelle mesure il traite les données personnelles en lien avec l’utilisation de l’application SwissCovid (ci-après « l’application ») en suisse. Il ne s’agit pas d’un descriptif exhaustif ; certains éléments spécifiques peuvent être réglés dans des déclarations de confidentialité supplémentaires, des documents similaires, des conditions d’utilisation ou des programmes d’application.
 </p>
 <p>
- La législation sur la protection des données règle le traitement de données personnelles. La législation fédérale sur la protection des données s’applique au traitement des données. La déclaration de confidentialité est en outre conforme à la loi du 28 septembre 2012 sur les épidémies (LEp ; RS
+ La législation sur la protection des données règle le traitement de données personnelles. Dans ce domaine, la législation fédérale sur la protection des données s’applique. La déclaration de confidentialité est en outre conforme à la loi du 28 septembre 2012 sur les épidémies (LEp ; RS
  <em>
   818.101
  </em>
- ) et l’ordonnance du 24 juin 2020 sur le système de traçage de proximité pour le coronavirus SARS-CoV-2 (OSTP ; RS
+ ), à l’ordonnance du 24 juin 2020 sur le système de traçage de proximité pour le coronavirus SARS-CoV-2 (OSTP ; RS
  <em>
   818.101.25
  </em>
- ).
+ ), à la loi fédérale du 25 septembre 2020 sur les bases légales des ordonnances du Conseil fédéral visant à surmonter l’épidémie de COVID-19 (loi COVID-19 ; RS
+ <em>
+  808.102
+ </em>
+ ) et à l’ordonnance du 24 juin 2021 sur un système d’alerte COVID-19 pour les manifestations.
 </p>
 <p>
  On entend par données personnelles toutes les informations qui se rapportent à une personne identifiée ou identifiable. Par traitement, on entend toute opération relative à des données personnelles – quels que soient les moyens et procédés utilisés – notamment la collecte, la conservation, l’exploitation, la modification, la communication, l’archivage ou la destruction de données.
@@ -56,11 +59,15 @@ <h1>
  Collecte et traitement de données personnelles
 </h1>
 <p>
- Tout le système de l’application est conçu de manière à ce que ses utilisateurs ne soient pas identifiables. Le traitement de données personnelles est réduit au minimum. Ainsi, aucune indication technique sur les personnes, les lieux ou les appareils n’est possible. Les géolocalisations ne sont pas enregistrées ; seules des données cryptées relatives aux contacts ayant eu lieu sont saisies. Ces données sont techniquement protégées de toute utilisation abusive. L’OFSP ne peut tirer aucune conclusion concernant les utilisateurs de l’application. Cette dernière protège les données des utilisateurs de telle sorte qu’aucun lien ne peut être établi avec une personne précise sur de longues distances. Un rattachement à un individu ne peut toutefois pas être totalement exclu. Il existe en effet une certaine probabilité qu’une personne alertée d’un possible risque d’infection puisse éventuellement tirer des conclusions sur l’identité de la personne infectée, en se remémorant les contacts sociaux qu’elle a eus au cours des derniers jours. Les personnes qui utilisent l’application sont donc potentiellement identifiables. La notification inclut les règles de conduite recommandées par l’OFSP, l’information selon laquelle la personne a pu être exposée au coronavirus, la mention des jours où cela s’est produit ainsi que l’indication que l’OFSP propose un guide (formulaire en ligne) et une infoline de conseil gratuit. Lorsque l’utilisateur quitte l’application pour remplir le guide, les jours d’infection potentielle indiqués dans l’application sont automatiquement transmis au guide.
+ Tout le système de l’application est conçu de manière à ce que ses utilisateurs ne soient pas identifiables. Le traitement de données personnelles est réduit au minimum. Ainsi, aucune indication technique sur les personnes, les lieux ou les appareils n’est possible. Les géolocalisations ne sont pas enregistrées lors d’un contact via traçage de proximité ; seules des données cryptées relatives aux contacts ayant eu lieu sont saisies. Le système d’alerte n’enregistre que des données cryptées concernant les manifestations et les risques d’infections qu’elles présentent. Ces données sont techniquement protégées de toute utilisation abusive. L’OFSP ne peut tirer aucune conclusion concernant les utilisateurs de l’application ni décrypter les données. Cette dernière protège les données des utilisateurs de telle sorte qu’aucun lien ne peut être établi avec une personne précise sur de longues distances. Un rattachement à un individu ne peut toutefois pas être totalement exclu, en particulier pour le système de traçage de proximité. Il existe en effet une certaine probabilité qu’une personne alertée d’un possible risque d’infection puisse éventuellement tirer des conclusions sur l’identité de la personne infectée, en se remémorant les contacts sociaux qu’elle a eus au cours des derniers jours. Les personnes qui utilisent l’application sont donc potentiellement identifiables. La notification déclenchée par un contact étroit avec un utilisateur testé positif inclut les règles de conduite recommandées par l’OFSP, l’information selon laquelle la personne a pu être exposée au coronavirus, la mention des jours où cela s’est produit ainsi que l’indication que l’OFSP propose un guide (formulaire en ligne) et une infoline de conseil gratuit. Lorsque l’utilisateur quitte l’application pour remplir le guide, les jours d’infection potentielle indiqués dans l’application sont automatiquement transmis au guide. La notification due à la fonction
+ <em>
+  Check-in
+ </em>
+ comprend les points ci-dessus, à l’exception du renvoi au guide et à l’infoline ; cette notification vise principalement à inciter la personne contactée à se faire tester.
 </p>
 <ul>
  <li>
-  Le système de l’application se divise en deux composantes :
+  Le système de l’application se divise en trois composantes :
  </li>
  <li>
   un système pour gérer les données relatives aux situations de rapprochement, comprenant un logiciel que les utilisateurs installent sur leur téléphone portable ainsi qu’un
@@ -82,10 +89,21 @@ <h1>
   <em>
    backend web
   </em>
-  .
+  ;
+ </li>
+ <li>
+  un système pour gérer les manifestations, comprenant un logiciel que les utilisateurs installent sur leur téléphone portable ainsi qu’un
+  <em>
+   backend
+  </em>
+  (
+  <em>
+   backend
+  </em>
+  manifestations).
  </li>
  <li>
-  Les deux
+  Les trois
   <em>
    backends
   </em>
@@ -107,7 +125,10 @@ <h1>
   la puissance du signal ;
  </li>
  <li>
-  la date et la durée estimée de la situation de rapprochement.
+  la date et la durée estimée de la situation de rapprochement ;
+ </li>
+ <li>
+  le code d’identification de la manifestation avec sa date, sa durée et sa description.
  </li>
 </ul>
 <p>
@@ -140,7 +161,25 @@ <h1>
  </li>
 </ul>
 <p>
- En outre, le système de l’application peut être relié à d’autres systèmes étrangers correspondants si un niveau adéquat de protection de la personnalité est assuré dans l’État concerné (par la législation ou par des garanties suffisantes, notamment contractuelles). Les systèmes étrangers sont ainsi réputés « correspondants » s’ils sont configurés suivant les principes ci-après du système de l’application :
+ Le
+ <em>
+  backend
+ </em>
+ manifestations comprend une liste des données suivantes :
+</p>
+<ul>
+ <li>
+  le code d’identification de la manifestation où les participants infectés s’étaient rendus alors qu’ils auraient pu transmettre le virus ;
+ </li>
+ <li>
+  la date de chaque code d’identification de la manifestation ;
+ </li>
+ <li>
+  la période cryptée pertinente du participant infecté par code d’identification de la manifestation.
+ </li>
+</ul>
+<p>
+ En outre, le système de traçage de proximité peut être relié à d’autres systèmes étrangers correspondants si un niveau adéquat de protection de la personnalité est assuré dans l’État concerné (par la législation ou par des garanties suffisantes, notamment contractuelles). Les systèmes étrangers sont ainsi réputés « correspondants » s’ils sont configurés suivant les principes ci-après du système de l’application :
 </p>
 <ul>
  <li>
@@ -173,7 +212,7 @@ <h1>
  Buts et bases légales
 </h1>
 <p>
- Le système d’application exploité par l’OFSP ainsi que le système de liaison se fondent sur la LEp et l’OSTP. L’application et le traitement des données entrantes par ce moyen servent exclusivement à informer les utilisateurs potentiellement exposés au coronavirus, tout en respectant la protection des données, et à établir des statistiques en lien avec le coronavirus à l’aide de données issues des deux
+ Le système d’application exploité par l’OFSP ainsi que le système de liaison se fondent sur la LEp, l’OSTP, la loi COVID-19 et l’OSAM. L’application et le traitement des données entrantes par ce moyen servent exclusivement à informer les utilisateurs potentiellement exposés au coronavirus, tout en respectant la protection des données, et à établir des statistiques en lien avec le coronavirus à l’aide de données issues des trois
  <em>
   backends
  </em>
@@ -190,7 +229,11 @@ <h1>
  <em>
   backend
  </em>
- GR est mise à la disposition de l’application (ou
+ GR et du
+ <em>
+  backend
+ </em>
+ manifestations est mise à la disposition de l’application (ou
  <em>
   frontend
  </em>
@@ -198,11 +241,11 @@ <h1>
  <em>
   a
  </em>
- LEp et de l’OSTP. En est exclue la réglementation concernant le code source en vertu de l’art. 60
+ LEp, de l’OSTP, de l’art. 3, al. 7, let. a, de la loi COVID-19 et de l’OSAM. En est exclue la réglementation concernant le code source en vertu de l’art. 60
  <em>
   a
  </em>
- , al. 5, let. e, LEp. L’OFSP contrôle le respect des prescriptions. Les tiers mandatés n’ont pas le droit d’utiliser à des fins personnelles les données secondaires générées durant l’exécution du contrat. Ces données sont analysées seulement par l’OFSP ou par l’OFIT (cf. ch. 8).
+ , al. 5, let. e, LEp et de l’art. 15 OSAM. L’OFSP contrôle le respect des prescriptions. Les tiers mandatés n’ont pas le droit d’utiliser à des fins personnelles les données secondaires générées durant l’exécution du contrat. Ces données sont analysées seulement par l’OFSP ou par l’OFIT (cf. ch. 8).
 </p>
 <p>
  La liste contenant les clés privées des utilisateurs infectés du
@@ -212,14 +255,14 @@ <h1>
  GR est en outre régulièrement transmise au système de liaison pour une information transfrontalière. Ensuite les systèmes étrangers reliés (actuellement l’application Corona-Warn utilisée en Allemagne) téléchargent ces clés privées et les tiennent à disposition de leurs applications pour extraction (cf. ch. 2).
 </p>
 <p>
- L’OFSP met régulièrement à la disposition de l’Office fédéral de la statistique (OFS) le stock actuel de données existantes dans les deux
+ L’OFSP met régulièrement à la disposition de l’Office fédéral de la statistique (OFS) le stock actuel de données existantes dans les trois
  <em>
   backends
  </em>
  sous forme anonymisée. Les données du système de liaison peuvent être communiquées sous forme anonymisée à l’OFS et au service étranger compétent à des fins de statistiques. L’OFIT gère le logiciel dans son ensemble sur mandat de l’OFSP et fournit le service de soutien technique requis. L’OFIT a uniquement accès à des données lorsque cela s’avère nécessaire pour les buts et les activités spécifiques des collaborateurs concernés. Ces derniers sont tenus à la confidentialité lorsqu’ils traitent les données.
 </p>
 <p>
- L’application utilise une interface reliée au système d’exploitation du téléphone portable de l’utilisateur, qui nécessite le traitement des données par Apple ou Google. Les fonctionnalités des systèmes d’exploitation utilisées par l’interface doivent remplir les prescriptions de l’art. 60
+ Pour le système de traçage de proximité, l’application utilise une interface reliée au système d’exploitation du téléphone portable de l’utilisateur, qui nécessite le traitement des données par Apple ou Google. Les fonctionnalités des systèmes d’exploitation utilisées par l’interface doivent remplir les prescriptions de l’art. 60
  <em>
   a
  </em>
@@ -245,6 +288,13 @@ <h1>
   </em>
   GR) : 14 jours après leur saisie ;
  </li>
+ <li>
+  données du système servant à gérer les manifestations (aussi bien dans le téléphone portable que dans le
+  <em>
+   backend
+  </em>
+  manifestations) : 14 jours après leur saisie ;
+ </li>
  <li>
   données du système des codes : 24 heures après leur saisie ;
  </li>
@@ -282,7 +332,11 @@ <h1>
  <em>
   backend
  </em>
- GR et au système de contrôle du code source sont enregistrés pour les buts fixés aux art. 57
+ GR, au
+ <em>
+  backend
+ </em>
+ manifestations et au système de contrôle du code source sont enregistrés pour les buts fixés aux art. 57
  <em>
   l
  </em>
diff --git a/app/src/main/assets/disclaimer/fr/terms_of_use.html b/app/src/main/assets/disclaimer/fr/terms_of_use.html
index c5ce324a1..f0541b163 100644
--- a/app/src/main/assets/disclaimer/fr/terms_of_use.html
+++ b/app/src/main/assets/disclaimer/fr/terms_of_use.html
@@ -7,7 +7,6 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <strong>
  1.
  Champ d’application et objet
@@ -21,11 +20,15 @@
 <em>
  818.101
 </em>
-) et sur l’ordonnance du 24 juin 2020 sur le système de traçage de proximité pour le coronavirus SARS-CoV-2 (RS
+), l’ordonnance du 24 juin 2020 sur le système de traçage de proximité pour le coronavirus SARS-CoV-2 (RS
 <em>
  818.101.25
 </em>
-).
+), la loi fédérale du 25 septembre 2020 sur les bases légales des ordonnances du Conseil fédéral visant à surmonter l’épidémie de COVID-19 (loi COVID-19 ; RS
+<em>
+ 818.102
+</em>
+) et l’ordonnance du 24 juin 2021 sur un système d’alerte COVID-19 pour les manifestations.
 <p>
  1.3
  L’application vise à informer les utilisateurs qui pourraient avoir été exposés au virus et à établir des statistiques en rapport avec le coronavirus.
@@ -40,7 +43,7 @@
 </p>
 <p>
  2.2
- L’utilisation de l’application n’est pas limitée à une zone géographique. Toutefois, des alertes sont possibles uniquement si l’application étrangère est interopérable avec l’application SwissCovid. Actuellement, seule l’application Corona-Warn utilisée en Allemagne remplit cette condition.
+ L’utilisation de l’application n’est pas limitée à une zone géographique. Toutefois, des alertes sont possibles uniquement si l’application étrangère est interopérable avec l’application SwissCovid. Actuellement, seule l’application Corona-Warn utilisée en Allemagne est compatible avec le système de traçage de proximité de l’application SwissCovid.
 </p>
 <p>
  2.3
@@ -52,18 +55,18 @@
 </strong>
 <p>
  3.1
- L’application informe les utilisateurs lorsqu’ils ont été en contact avec au moins un utilisateur de l’application SwissCovid ou d’une autre application interopérable dont l’infection a été confirmée.
+ L’application informe les utilisateurs lorsqu’ils ont été en contact avec au moins un utilisateur de l’application SwissCovid ou d’une autre application interopérable dont l’infection a été confirmée. Ce contact peut être déterminé sur la base du traçage de proximité ou de la participation à une manifestation.
 </p>
 <p>
  3.2
- Le Bluetooth doit être activé pour que l’application fonctionne.
+ Le Bluetooth doit être activé pour que le système de traçage de proximité fonctionne. En revanche, le système d’alerte n’a pas besoin du Bluetooth.
 </p>
 <p>
  3.3
- L’application remplit les fonctions suivantes en utilisant une interface liée au système d’exploitation du téléphone portable de l’utilisateur :
+ L’application remplit les fonctions suivantes en utilisant, pour le système de traçage de proximité, une interface liée au système d’exploitation du téléphone portable de l’utilisateur :
 </p>
 <p>
- Le système d’exploitation génère chaque jour une nouvelle clé privée qui ne permet pas de remonter jusqu’à l’application, le téléphone portable ou à l’utilisateur. Dans le rayon de portée du Bluetooth, le système d’exploitation échange avec toutes les applications compatibles et actives un code d’identification (ID aléatoire) qui change au moins toutes les demi-heures, qui est généré à partir de la clé privée actuelle mais qui ne permet ni d’identifier la clé, ni de remonter jusqu’à l’application, au téléphone portable ou à l’utilisateur.
+ Système de traçage de proximité : le système d’exploitation génère chaque jour une nouvelle clé privée qui ne permet pas de remonter jusqu’à l’application, le téléphone portable ou à l’utilisateur. Dans le rayon de portée du Bluetooth, le système d’exploitation échange avec toutes les applications compatibles et actives un code d’identification (ID aléatoire) qui change au moins toutes les demi-heures, qui est généré à partir de la clé privée actuelle mais qui ne permet ni d’identifier la clé, ni de remonter jusqu’à l’application, au téléphone portable ou à l’utilisateur.
 </p>
 <p>
  Le système d’exploitation enregistre les codes d’identification reçus, la puissance du signal, la date et la durée approximative du rapprochement.
@@ -71,17 +74,27 @@
 <p>
  À intervalles réguliers, l’application extrait la liste des clés privées des utilisateurs infectés de l’application SwissCovid ou d’autres applications interopérables, et le système d’exploitation contrôle si au moins un code d’identification enregistré localement a été généré avec une clé privée. Si tel est le cas et qu’un rapprochement d’un mètre et demi ou moins a été établi avec au moins un téléphone mobile d’au moins un utilisateur infecté de l’application SwissCovid ou d’autres applications interopérables et que la durée totale de ces rapprochements atteint ou dépasse les quinze minutes au cours de la même journée, l’application envoie une information. La distance est évaluée en fonction de l’intensité du signal reçu.
 </p>
+<p>
+ Système d’alerte pour les manifestations : l’organisateur d’une manifestation génère un code QR dans son application. Les visiteurs de la manifestation peuvent scanner le code QR présenté avec leur application et indiquent ainsi avoir participé à la manifestation.
+</p>
+<p>
+ L’application enregistre sur le téléphone portable le code d’identification de la manifestation avec sa date, sa durée et sa description. Depuis le
+ <em>
+  backend
+ </em>
+ manifestations, elle consulte régulièrement les codes d’identification de la manifestation chez les participants infectés. Elle compare ces codes avec ceux qu’elle a stocké localement. Si deux codes sont les mêmes, elle envoie alors une notification.
+</p>
 <p>
  3.4
- Si une infection est attestée chez un utilisateur, les professionnels disposant des droits d’accès (p. ex. les médecins traitants ou les pharmaciens) génèrent un code d’autorisation unique et temporaire (code COVID) et le communiquent à l’utilisateur infecté. Ce dernier peut saisir de manière volontaire le code d’autorisation dans son application. La notification et la saisie du code d’autorisation ne se font qu’avec le consentement explicite de la personne infectée.
+ Si une infection est attestée chez un utilisateur, les professionnels disposant des droits d’accès (p. ex. les médecins traitants ou les pharmaciens) génèrent un code d’autorisation unique et temporaire (code COVID) et le communiquent à l’utilisateur infecté. Ce dernier peut saisir de manière volontaire le code d’autorisation dans son application. La notification et la saisie du code d’autorisation ne se font qu’avec le consentement explicite de la personne infectée. Cette dernière peut par ailleurs choisir si elle souhaite alerter non seulement les contacts étroits détectés par le système de traçage de proximité mais également ceux détectés en raison de leur présence à une manifestation. Elle peut aussi décider de déclencher une notification pour toutes les manifestations auxquelles elle a participé pendant la période concernée ou seulement pour certaines d’entre elles.
 </p>
 <p>
- L’application informe les autres utilisateurs de l’application SwissCovid ou d'autres applications interopérables qui se sont trouvés en rapprochement selon le ch. 3.3 avec l’utilisateur infecté durant la période potentiellement infectieuse.
+ L’application informe les autres utilisateurs de l’application SwissCovid ou d'autres applications interopérables qui se sont trouvés en rapprochement selon le ch. 3.3 avec l’utilisateur infecté durant la période potentiellement infectieuse ou qui ont participé à une manifestation au même moment.
 </p>
 <p>
- Les utilisateurs informés apprennent qu’un rapprochement a eu lieu ou qu’ils ont potentiellement été exposés au coronavirus ainsi que les jours où cela s’est produit. Ils n’apprennent pas quel utilisateur est infecté et a déclenché la notification. Celle-ci comprend les règles de conduite recommandées par l’OFSP, l'indication que l'OFSP propose un guide (formulaire en ligne) ainsi qu'une infoline de conseil gratuit. Lorsqu'on quitte l’application pour remplir le guide, les jours d’infection potentielle indiqués dans l’application sont automatiquement transmis au guide.
+ Les utilisateurs informés apprennent qu’un rapprochement a eu lieu ou qu’ils ont potentiellement été exposés au coronavirus ainsi que les jours où cela s’est produit. Ils n’apprennent pas quel utilisateur est infecté et a déclenché la notification. La notification due à un contact étroit avec un utilisateur testé positif comprend les règles de conduite recommandées par l’OFSP, l'indication que l'OFSP propose un guide (formulaire en ligne) ainsi qu'une infoline de conseil gratuit. Lorsqu'on quitte l’application pour remplir le guide, les jours d’infection potentielle indiqués dans l’application sont automatiquement transmis au guide. La notification due au système d’alerte comprend les points ci-dessus, à l’exception du renvoi au guide et à l’infoline ; cette notification vise principalement à recommander à la personne contactée à se faire tester.
 </p>
-Lors de la saisie des codes d’autorisation, les utilisateurs sont informés des pays avec lesquels l’application est interopérable (cf. ch. 2.2). Il leur est précisé que s’ils appuient sur le champ « D’accord » et qu’ils saisissent le code d’autorisation dans l’application, les clés privées ne sont pas seulement partagées dans l’application SwissCovid mais également avec toutes les autres applications interopérables (actuellement l’application allemande Corona-Warn). Suivant le principe
+Lors de la saisie des codes d’autorisation, les utilisateurs sont informés des pays avec lesquels l’application est interopérable (cf. ch. 2.2). Il leur est précisé que s’ils appuient sur le champ « D’accord » et qu’ils saisissent le code d’autorisation dans l’application, les clés privées du système de traçage ce proximité ne sont pas seulement partagées dans l’application SwissCovid mais également avec toutes les autres applications interopérables (actuellement l’application allemande Corona-Warn). Suivant le principe
 <em>
  One World
 </em>
@@ -192,7 +205,7 @@
 </p>
 <p>
  7.3
- Au plus tard au moment du retrait de l’ordonnance mentionnée au ch. 1.2, l’OFSP désactive l’application et prie les utilisateurs de la désinstaller de leur téléphone portable.
+ Au plus tard au moment du retrait des ordonnances mentionnées au ch. 1.2, l’OFSP désactive l’application et prie les utilisateurs de la désinstaller de leur téléphone portable.
 </p>
 <strong>
  8.
diff --git a/app/src/main/assets/disclaimer/it/data_protection_statement.html b/app/src/main/assets/disclaimer/it/data_protection_statement.html
index 5273b02c4..eac51f22b 100644
--- a/app/src/main/assets/disclaimer/it/data_protection_statement.html
+++ b/app/src/main/assets/disclaimer/it/data_protection_statement.html
@@ -7,18 +7,17 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <p>
  Informativa sulla protezione dei dati dell’Ufficio federale della sanità pubblica UFSP in relazione all’utilizzo dell’«app SwissCovid»
 </p>
 <p>
- Versione: 9 aprile 2021
+ Versione: 1° luglio 2021
 </p>
 <p>
  Nella presente informativa sulla protezione dei dati l’Ufficio federale della sanità pubblica (UFSP) spiega in che misura tratterà dati personali nel quadro dell’utilizzo dell’applicazione «app SwissCovid» (di seguito app) in Svizzera. Non si tratta di una descrizione esaustiva; alcuni aspetti specifici possono essere regolamentati da altre informative sulla protezione dei dati, documenti analoghi, condizioni di utilizzo o programmi di applicazione.
 </p>
 <p>
- Il trattamento dei dati personali è disciplinato dal diritto sulla protezione dei dati; al trattamento dei dati si applica la legislazione federale in materia. La presente informativa è inoltre conforme alla legge del 28 settembre 2012 sulle epidemie (LEp; RS 818.101) e all’ordinanza del 24 giugno 2020 sul sistema di tracciamento della prossimità per il coronavirus SARS-CoV-2 (OSTP; RS 818.101.25).
+ Il trattamento dei dati personali è disciplinato dal diritto sulla protezione dei dati; al trattamento dei dati personali si applica la legislazione federale in materia. La presente informativa è inoltre conforme alla legge del 28 settembre 2012 sulle epidemie (LEp; RS 818.101), all’ordinanza del 24 giugno 2020 sul sistema di tracciamento della prossimità per il coronavirus SARS-CoV-2 (OSTP; RS 818.101.25), alla legge federale del 25 settembre 2020 sulle basi legali delle ordinanze del Consiglio federale volte a far fronte all’epidemia di COVID-19 (legge COVID-19; RS 818.102) nonché all’ordinanza del 24 giugno 2021 su un sistema di allerta COVID-19 per le manifestazioni.
 </p>
 <p>
  Per dati personali s’intendono tutte le informazioni relative a una persona identificata o identificabile. Il trattamento indica qualsiasi operazione relativa a dati personali, indipendentemente dai mezzi e dalle procedure impiegati, segnatamente la raccolta, la conservazione, l’utilizzazione, la modificazione, la comunicazione, l’archiviazione o la distruzione di dati.
@@ -48,20 +47,23 @@ <h1>
  Raccolta e trattamento dei dati personali
 </h1>
 <p>
- L’intero sistema dell’app è concepito in modo tale che l’utente non sia identificabile. Il trattamento dei dati personali è ridotto al minimo, per cui non è in alcun modo tecnicamente possibile risalire a persone, luoghi o dispositivi. Non vengono rilevati dati sulla posizione, ma soltanto informazioni crittografate riguardanti i contatti avvenuti, protette tecnicamente da usi impropri. L’UFSP non può risalire agli utenti dell’app, che ne protegge i dati impedendo di stabilire un collegamento con una data persona sulle lunghe distanze. Un collegamento a una data persona non può tuttavia essere completamente escluso. Esiste infatti una certa probabilità che una persona informata di essere potenzialmente a rischio possa risalire all’identità della persona contagiata ricostruendo i contatti sociali avuti nei giorni precedenti. L’utilizzo dell’app potrebbe quindi permettere l’identificazione di persone. La notifica include le raccomandazioni di comportamento dell’UFSP, l’informazione che l’utente è stato potenzialmente esposto al coronavirus, l’indicazione dei giorni in cui lo è stato, la segnalazione che l’UFSP gestisce una guida (modulo web) e una linea di consulenza telefonica gratuita. Se l’utente esce dall’app per compilare il modulo web, i giorni menzionati nell’app nei quali c’è stata la possibilità di contagio vengono trasmessi automaticamente al modulo.
+ L’intero sistema dell’app è concepito in modo tale che l’utente non sia identificabile. Il trattamento dei dati personali è ridotto al minimo, per cui non è in alcun modo tecnicamente possibile risalire a persone, luoghi o dispositivi. Non vengono registrati dati sulla posizione degli incontri rilevati tramite tracciamento di prossimità, ma soltanto informazioni criptate riguardanti i contatti avvenuti. Il sistema di allerta registra solo dati criptati sulle manifestazioni e sui rischi di contagio in occasione di tali manifestazioni. Questi dati sono protetti tecnicamente da usi impropri. L’UFSP non può risalire agli utenti dell’app né decrittare i dati, che l’app protegge impedendo di stabilire un collegamento con una data persona sulle lunghe distanze. Un collegamento a una data persona non può tuttavia essere completamente escluso. Esiste infatti una certa probabilità, in particolare con il sistema di tracciamento della prossimità, che una persona informata di essere potenzialmente a rischio possa risalire all’identità della persona contagiata ricostruendo i contatti sociali avuti nei giorni precedenti. L’utilizzo dell’app potrebbe quindi permettere l’identificazione di persone. La notifica in base a un contatto stretto con un utente risultato positivo al test include le raccomandazioni di comportamento dell’UFSP, l’informazione che l’utente è stato potenzialmente esposto al coronavirus, l’indicazione dei giorni in cui lo è stato, la segnalazione che l’UFSP gestisce una guida (modulo web) e una linea di consulenza telefonica gratuita. Se l’utente esce dall’app per compilare il modulo web, i giorni menzionati nell’app nei quali c’è stata la possibilità di contagio vengono trasmessi automaticamente al modulo. La notifica in base alla funzione di check-in include i punti precedentemente menzionati, ma non l’offerta di una guida, né di una linea di consulenza telefonica, e verte principalmente sulla raccomandazione di sottoporsi al test.
 </p>
 <ul>
  <li>
-  Il sistema dell’app è costituito da due componenti:
+  Il sistema dell’app è costituito da tre componenti:
  </li>
  <li>
   un sistema di gestione dei dati di prossimità, costituito da un software che viene installato dagli utenti sul proprio telefono cellulare e da un back end (back end GP);
  </li>
  <li>
-  un sistema di gestione dei codici di attivazione delle informazioni (sistema di gestione dei codici), costituito da un front end e un back end basati sul web.
+  un sistema di gestione dei codici di attivazione delle informazioni (sistema di gestione dei codici), costituito da un front end e un back end basati sul web;
  </li>
  <li>
-  Entrambi i back end, che fungono da server centrali, sono sotto il controllo diretto dell’UFSP e sono tecnicamente gestiti dall’Ufficio federale dell’informatica e della telecomunicazione (UFIT). I front end per la gestione dei codici funzionano sui dispositivi degli specialisti autorizzati a generare il codice di attivazione (codice Covid).
+  un sistema di gestione delle manifestazioni, costituito da un software che viene installato dagli utenti sul proprio telefono cellulare e da un back end (back end manifestazioni).
+ </li>
+ <li>
+  I tre back end, che fungono da server centrali, sono sotto il controllo diretto dell’UFSP e sono tecnicamente gestiti dall’Ufficio federale dell’informatica e della telecomunicazione (UFIT). I front end per la gestione dei codici funzionano sui dispositivi degli specialisti autorizzati a generare il codice di attivazione (codice Covid).
  </li>
 </ul>
 <p>
@@ -69,13 +71,16 @@ <h1>
 </p>
 <ul>
  <li>
-  codici di identificazione (cosiddetti ID casuali) ricevuti da altri telefoni cellulari con l’app attivata;
+  i codici di identificazione (cosiddetti ID casuali) ricevuti da altri telefoni cellulari con l’app attivata;
  </li>
  <li>
-  potenza del segnale;
+  la potenza del segnale;
  </li>
  <li>
-  data e durata stimata della prossimità.
+  la data e la durata stimata della prossimità;
+ </li>
+ <li>
+  i codici di identificazione delle manifestazioni con la rispettiva data, la durata della permanenza e la designazione della manifestazione.
  </li>
 </ul>
 <p>
@@ -104,7 +109,21 @@ <h1>
  </li>
 </ul>
 <p>
- Inoltre, il sistema dell’app può essere collegato a sistemi esteri corrispondenti se nello Stato in questione è garantita un’adeguata protezione della personalità (grazie alla legislazione o a sufficienti garanzie, in particolare contrattuali). I sistemi esteri sono considerati «corrispondenti» se sono concepiti in base ai seguenti principi del sistema dell’app:
+ Il back end manifestazioni è costituito da un elenco con i seguenti dati:
+</p>
+<ul>
+ <li>
+  i codici di identificazione delle manifestazioni dei partecipanti infetti rilevanti nel periodo in cui è stato possibile un contagio di altre persone durante una manifestazione;
+ </li>
+ <li>
+  la data di ogni codice di identificazione della manifestazione;
+ </li>
+ <li>
+  il periodo rilevante criptato del partecipante infetto per ogni codice di identificazione della manifestazione.
+ </li>
+</ul>
+<p>
+ Inoltre, il sistema di tracciamento della prossimità può essere collegato a sistemi esteri corrispondenti se nello Stato in questione è garantita un’adeguata protezione della personalità (grazie alla legislazione o a sufficienti garanzie, in particolare contrattuali). I sistemi esteri sono considerati «corrispondenti» se sono concepiti in base ai seguenti principi del sistema dell’app:
 </p>
 <ul>
  <li>
@@ -129,7 +148,7 @@ <h1>
  Scopi e basi giuridiche
 </h1>
 <p>
- Il sistema dell’app gestito dall’UFSP e il sistema di collegamento si fondano sulla LEp e sull’OSTP. L’app e i relativi dati trattati servono unicamente a informare, nel rispetto della protezione dei dati, gli utenti che sono stati potenzialmente esposti al coronavirus e a elaborare statistiche in relazione al coronavirus a partire dai dati dei due back end.
+ Il sistema dell’app gestito dall’UFSP e il sistema di collegamento si fondano sulla LEp, sull’OSTP, sulla legge COVID-19 e sull’OSAM. L’app e i relativi dati trattati servono unicamente a informare, nel rispetto della protezione dei dati, gli utenti che sono stati potenzialmente esposti al coronavirus e a elaborare statistiche in relazione al coronavirus a partire dai dati dei tre back end.
 </p>
 <p>
  Il sistema di collegamento fa sì che una simile informazione sia possibile anche tra app nazionali collegate. In tal modo, gli utenti dell’app possono essere informati anche se si sono trovati in prossimità di utenti infetti di un’app estera (p. es. frontalieri e turisti in Svizzera o contatti all’estero). Viceversa, anche gli utenti di un’app estera collegata possono essere informati se si sono trovati in prossimità di utenti infetti dell’app.
@@ -140,24 +159,24 @@ <h1>
  Trasmissione dei dati
 </h1>
 <p>
- L’elenco con i dati del back end GP viene messo a disposizione dell’app mediante procedura di richiamo. Laddove l’UFSP commissioni tali servizi a terzi situati in Svizzera o all’estero, questi ultimi s’impegnano contrattualmente a rispettare le prescrizioni dell’articolo 60
+ L’elenco con i dati del back end GP e del back end manifestazioni viene messo a disposizione dell’app mediante procedura di richiamo. Laddove l’UFSP commissioni tali servizi a terzi situati in Svizzera o all’estero, questi ultimi s’impegnano contrattualmente a rispettare le prescrizioni dell’articolo 60
  <em>
   a
  </em>
- LEp e dell’OSTP; è fatta salva la disposizione sul codice sorgente di cui all’articolo 60
+ LEp, dell’OSTP, dell’articolo 3 capoverso 7 lettera a legge COVID-19 nonché dell’OSAM; è fatta salva la disposizione sul codice sorgente di cui all’articolo 60
  <em>
   a
  </em>
- capoverso 5 lettera e LEp. L’UFSP controlla che questi terzi rispettino le prescrizioni e non utilizzino per scopi propri i metadati generati durante l’esecuzione del mandato. Questi dati sono analizzati soltanto dall’UFSP o dall’UFIT (cfr. n. 8).
+ capoverso 5 lettera e LEp e all’articolo 15 OSAM. L’UFSP controlla che questi terzi rispettino le prescrizioni e non utilizzino per scopi propri i metadati generati durante l’esecuzione del mandato. Questi dati sono analizzati soltanto dall’UFSP o dall’UFIT (cfr. n. 8).
 </p>
 <p>
  L’elenco delle chiavi private degli utenti infetti del back end GP è inoltre trasmesso regolarmente al sistema di collegamento ai fini dell’informazione transfrontaliera. I sistemi esteri collegati (attualmente: la Corona-Warn-App tedesca) scaricano quindi queste chiavi private e le mettono a disposizione delle proprie app affinché possano richiamarle (cfr. n. 2).
 </p>
 <p>
- L’UFSP mette periodicamente a disposizione dell’Ufficio federale di statistica (UST) per valutazioni statistiche l’attuale raccolta di dati disponibili nei due back end in forma anonimizzata. I dati del sistema di collegamento possono essere resi noti in forma completamente anonimizzata all’UST e al competente servizio estero a fini statistici. L’UFIT gestisce su incarico dell’UFSP tutti i software e fornisce il servizio di assistenza tecnica necessario. L’UFIT ha accesso solo ai dati necessari agli scopi descritti e all’attività dei collaboratori interessati, che sono tenuti a utilizzare i dati con riservatezza.
+ L’UFSP mette periodicamente a disposizione dell’Ufficio federale di statistica (UST) per valutazioni statistiche l’attuale raccolta di dati disponibili nei tre back end in forma anonimizzata. I dati del sistema di collegamento possono essere resi noti in forma completamente anonimizzata all’UST e al competente servizio estero a fini statistici. L’UFIT gestisce su incarico dell’UFSP tutti i software e fornisce il servizio di assistenza tecnica necessario. L’UFIT ha accesso solo ai dati necessari agli scopi descritti e all’attività dei collaboratori interessati, che sono tenuti a utilizzare i dati con riservatezza.
 </p>
 <p>
- L’app utilizza un’interfaccia verso il sistema operativo del telefono cellulare dell’utente che elabora dati attraverso Apple o Google. Le funzioni dei sistemi operativi utilizzate tramite l’interfaccia devono adempiere le prescrizioni di cui all’articolo 60
+ Per il sistema di tracciamento della prossimità, l’app utilizza un’interfaccia verso il sistema operativo del telefono cellulare dell’utente che elabora dati attraverso Apple o Google. Le funzioni dei sistemi operativi utilizzate tramite l’interfaccia devono adempiere le prescrizioni di cui all’articolo 60
  <em>
   a
  </em>
@@ -177,6 +196,9 @@ <h1>
  <li>
   dati del sistema di gestione dei dati di prossimità (sia nei telefoni cellulari sia nel back end GP): 14 giorni dopo la loro registrazione;
  </li>
+ <li>
+  dati del sistema di gestione delle manifestazioni (sia nei telefoni cellulari sia nel back end manifestazioni): 14 giorni dopo la loro registrazione;
+ </li>
  <li>
   dati del sistema di gestione dei codici: 24 ore dopo la loro registrazione;
  </li>
@@ -207,7 +229,7 @@ <h1>
  Varie
 </h1>
 <p>
- Vengono memorizzati i registri degli accessi al back end GP e al sistema di gestione dei codici per gli scopi previsti agli articoli 57
+ Vengono memorizzati i registri degli accessi al back end GP, al back end manifestazioni e al sistema di gestione dei codici per gli scopi previsti agli articoli 57
  <em>
   l
  </em>
diff --git a/app/src/main/assets/disclaimer/it/terms_of_use.html b/app/src/main/assets/disclaimer/it/terms_of_use.html
index 8223a8e96..9cd394a22 100644
--- a/app/src/main/assets/disclaimer/it/terms_of_use.html
+++ b/app/src/main/assets/disclaimer/it/terms_of_use.html
@@ -7,7 +7,6 @@
   ~
   ~ SPDX-License-Identifier: MPL-2.0
   -->
-
 <strong>
  1.
  Campo di applicazione e scopo
@@ -18,7 +17,7 @@
 </p>
 <p>
  1.2
- L’app dell’Ufficio federale della sanità pubblica (UFSP) si basa sulla legge del 28 settembre 2012 (LEp; RS 818.101) e sull’ordinanza del 24 giugno 2020 sul sistema di tracciamento della prossimità per il coronavirus SARS-CoV-2 (OSTP; RS 818.101.25).
+ L’app dell’Ufficio federale della sanità pubblica (UFSP) si basa sulla legge del 28 settembre 2012 (LEp; RS 818.101), sull’ordinanza del 24 giugno 2020 sul sistema di tracciamento della prossimità per il coronavirus SARS-CoV-2 (OSTP; RS 818.101.25), sulla legge federale del 25 settembre 2020 sulle basi legali delle ordinanze del Consiglio federale volte a far fronte all’epidemia di COVID-19 (legge COVID-19; RS 818.102) nonché sull’ordinanza del 24 giugno 2021 su un sistema di allerta COVID-19 per le manifestazioni.
 </p>
 <p>
  1.3
@@ -34,7 +33,7 @@
 </p>
 <p>
  2.2
- L’utilizzo dell’app non è limitato a una regione geografica. Tuttavia, le segnalazioni possono aver luogo soltanto se l’app estera è interoperabile con l’app SwissCovid. Al momento attuale lo è soltanto la Corona-Warn-App impiegata in Germania.
+ L’utilizzo dell’app non è limitato a una regione geografica. Tuttavia, le segnalazioni possono aver luogo soltanto se l’app estera è interoperabile con l’app SwissCovid. Al momento attuale soltanto la Corona-Warn-App impiegata in Germania è interoperabile con il sistema di tracciamento della prossimità dell’app SwissCovid.
 </p>
 <p>
  2.3
@@ -46,38 +45,44 @@
 </strong>
 <p>
  3.1
- L’app informa gli utenti che sono entrati in stretto contatto con almeno un utente dell’app SwissCovid o delle altre app interoperabili risultato contagiato.
+ L’app informa gli utenti che sono entrati in stretto contatto con almeno un utente dell’app SwissCovid o delle altre app interoperabili risultato infetto. Questo contatto rilevante può essere ricostruito in base al tracciamento della prossimità o alla partecipazione a una manifestazione.
 </p>
 <p>
  3.2
- Affinché l’app funzioni è necessario che il Bluetooth sia attivo.
+ Il sistema di tracciamento della prossimità dell’app presuppone l’attivazione del Bluetooth; per il sistema di allerta ciò non è invece necessario.
 </p>
 <p>
  3.3
- Mediante l’utilizzazione di un’interfaccia verso il sistema operativo del telefono cellulare dell’utente, l’app adempie le seguenti funzioni.
+ Con il sistema di tracciamento della prossimità e mediante l’utilizzazione di un’interfaccia verso il sistema operativo del telefono cellulare dell’utente, l’app adempie le seguenti funzioni.
 </p>
 <p>
- Il sistema operativo genera ogni giorno una nuova chiave privata che non consente di risalire in alcun modo all’app, al telefono cellulare o agli utenti. Scambia un codice d’identificazione (cosiddetto “random ID”) che cambia almeno una volta ogni mezz’ora con tutte le app compatibili e attive che si trovano entro la portata di Bluetooth. Tale codice deriva da una chiave privata aggiornata, ma non è riconducibile alla stessa e di conseguenza nemmeno all’app, al telefono cellulare e al suo utente.
+ Sistema di tracciamento della prossimità: il sistema operativo genera ogni giorno una nuova chiave privata che non consente di risalire in alcun modo all’app, al telefono cellulare o agli utenti. Scambia un codice d’identificazione (cosiddetto “random ID”) che cambia almeno una volta ogni mezz’ora con tutte le app compatibili e attive che si trovano entro la portata di Bluetooth. Tale codice deriva da una chiave privata aggiornata, ma non è riconducibile alla stessa e di conseguenza nemmeno all’app, al telefono cellulare e al suo utente.
 </p>
 <p>
  Il sistema operativo memorizza sul telefono cellulare i codici d’identificazione ricevuti, la potenza del segnale, la data e la durata stimata della prossimità.
 </p>
 <p>
- L’app richiama periodicamente un elenco delle chiavi private degli utenti contagiati dell’app SwissCovid e delle altre app interoperabili e controlla con il suo sistema operativo se almeno un codice d’identificazione memorizzato localmente è stato generato con una chiave privata dell’elenco. Se ciò si verifica nonché la prossimità da almeno un telefono cellulare di un utente dell’app SwissCovid o delle altre app interoperabili contagiato è pari o inferiore a 1,5 metri e la somma della durata di tutte queste prossimità in un giorno raggiunge i quindici minuti, l’app ne informa l’utente. La distanza è stimata in base alla potenza del segnale ricevuto.
+ L’app richiama periodicamente un elenco delle chiavi private degli utenti infetti dell’app SwissCovid e delle altre app interoperabili e controlla con il suo sistema operativo se almeno un codice d’identificazione memorizzato localmente è stato generato con una chiave privata dell’elenco. Se ciò si verifica nonché la prossimità da almeno un telefono cellulare di un utente dell’app SwissCovid o delle altre app interoperabili infetto è pari o inferiore a 1,5 metri e la somma della durata di tutte queste prossimità in un giorno raggiunge i quindici minuti, l’app ne informa l’utente. La distanza è stimata in base alla potenza del segnale ricevuto.
+</p>
+<p>
+ Sistema di allerta per le manifestazioni: l’organizzatore di una manifestazione genera nella propria app un codice QR che i visitatori della manifestazione possono scansionare per effettuare il check-in alla manifestazione.
+</p>
+<p>
+ L’app memorizza sul telefono cellulare il codice di identificazione della manifestazione con la rispettiva data, la durata della permanenza e la designazione della manifestazione. Richiama periodicamente dal back end delle manifestazioni l’elenco dei codici di identificazione delle manifestazioni dei partecipanti infetti. Confronta tali codici con i codici di identificazione delle manifestazioni che ha memorizzato localmente. Se da tale confronto emerge una corrispondenza, genera una notifica.
 </p>
 <p>
  3.4
- In caso di contagio accertato di un utente, il personale specialistico avente diritto di accesso (p. es. medici curanti o farmacisti) genera un codice di attivazione (codice Covid) univoco e la cui validità è limitata nel tempo e lo comunica all’utente contagiato, che può immetterlo nell’app su base volontaria. La notifica ovvero l’inserimento del codice di attivazione richiedono il consenso esplicito dell'utente contagiato.
+ In caso di infezione accertata di un utente, il personale specialistico avente diritto di accesso (p. es. medici curanti o farmacisti) genera un codice di attivazione (codice Covid) univoco e la cui validità è limitata nel tempo e lo comunica all’utente infetto, che può immetterlo nell’app su base volontaria. La notifica ovvero l’inserimento del codice di attivazione richiedono il consenso esplicito dell’utente infetto. L’utente infetto può scegliere se allertare sia i contatti stretti in base al sistema di tracciamento della prossimità sia i contatti in base alla partecipazione a una manifestazione. Può inoltre decidere se generare una notifica per tutte le manifestazioni alle quali ha partecipato nel periodo rilevante o solo per alcune.
 </p>
 <p>
- Gli altri utenti dell’app SwissCovid o delle altre app interoperabili che sono stati in prossimità secondo il numero 3.3 con l’utente contagiato durante il periodo di contagiosità vengono informati dalla loro app.
+ Gli altri utenti dell’app SwissCovid o delle altre app interoperabili che sono stati in prossimità secondo il numero 3.3 con l’utente infetto durante il periodo di infettività o che hanno partecipato nello stesso momento alla medesima manifestazione vengono informati dalla loro app.
 </p>
 <p>
- Viene loro comunicato che vi è stata una prossimità ovvero che sono stati potenzialmente esposti al coronavirus e le date in cui tale episodio si è verificato. Non viene comunicato loro quale utente è risultato contagiato e ha attivato la notifica dell’app SwissCovid. Quest’ultima comprende anche le raccomandazioni di comportamento dell’UFSP nonché l’informazione che l’UFSP gestisce una guida (modulo web) e una linea di consulenza telefonica gratuita. Se l’utente esce dall’app per compilare il modulo web, i giorni menzionati nell’app nei quali c’è stata la possibilità di contagio vengono trasmessi automaticamente al modulo.
+ Viene loro comunicato che vi è stata una prossimità ovvero che sono stati potenzialmente esposti al coronavirus e le date in cui tale episodio si è verificato. Non viene comunicato loro quale utente è risultato infetto e ha attivato la notifica dell’app SwissCovid. La notifica in base a un contratto stretto con un utente risultato positivo al test comprende anche le raccomandazioni di comportamento dell’UFSP nonché l’informazione che l’UFSP gestisce una guida (modulo web) e una linea di consulenza telefonica gratuita. Se l’utente esce dall’app per compilare il modulo web, i giorni menzionati nell’app nei quali c’è stata la possibilità di contagio vengono trasmessi automaticamente al modulo. La notifica in base al sistema di allerta include i punti precedentemente menzionati, ma non l’offerta di una guida, né di una linea di consulenza telefonica, e verte principalmente sulla raccomandazione di sottoporsi al test.
 </p>
 <p>
  3.5
- Al momento dell’immissione del codice di attivazione, agli utenti viene comunicato con quali Paesi è interoperabile l’app (cfr. n. 2.2). Viene inoltre segnalato che, premendo il pulsante «Accetta» e immettendo il codice di attivazione nell’app, le chiavi private vengono condivise non soltanto all’interno dell’app SwissCovid, ma anche con tutte le app interoperabili (attualmente la Corona-Warn-App tedesca). Le chiavi private possono solo essere condivise con tutte le app interoperabili o non essere condivise affatto, secondo il «principio one world».
+ Al momento dell’immissione del codice di attivazione, agli utenti viene comunicato con quali Paesi è interoperabile l’app (cfr. n. 2.2). Viene inoltre segnalato che, premendo il pulsante «Accetta» e immettendo il codice di attivazione nell’app, le chiavi private del sistema di tracciamento della prossimità vengono condivise non soltanto all’interno dell’app SwissCovid, ma anche con tutte le app interoperabili (attualmente la Corona-Warn-App tedesca). Le chiavi private possono solo essere condivise con tutte le app interoperabili o non essere condivise affatto, secondo il «principio one world».
 </p>
 <p>
  3.6
@@ -184,7 +189,7 @@
 </p>
 <p>
  7.3
- Al più tardi quando l’ordinanza indicata al numero 1.2 sarà abrogata, l’UFSP disattiverà l’app e inviterà gli utenti a disinstallarla dal proprio telefono cellulare.
+ Al più tardi quando le ordinanze indicate al numero 1.2 saranno abrogate, l’UFSP disattiverà l’app e inviterà gli utenti a disinstallarla dal proprio telefono cellulare.
 </p>
 <strong>
  8.

From 69a41cbfb6d497d65bfadbd546c8409ad7a1a6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 00:52:47 +0200
Subject: [PATCH 178/207] do not add user-interaction-delay in fakeworker
 test-mode

---
 .../androidTest/java/ch/admin/bag/dp3t/FakeWorkerTest.java | 4 ++++
 .../main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt   | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ch/admin/bag/dp3t/FakeWorkerTest.java b/app/src/androidTest/java/ch/admin/bag/dp3t/FakeWorkerTest.java
index 661676f38..afd5a5beb 100644
--- a/app/src/androidTest/java/ch/admin/bag/dp3t/FakeWorkerTest.java
+++ b/app/src/androidTest/java/ch/admin/bag/dp3t/FakeWorkerTest.java
@@ -330,6 +330,10 @@ public long currentTimeMillis() {
 			return System.currentTimeMillis() + clockOffset;
 		}
 
+		public int getUserInteractionDelay() {
+			return 0;
+		}
+
 	}
 
 	private long setTDummyToDaysFromNow(int daysFromNow) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
index 1e08dc07a..24b4c21f7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/FakeWorker.kt
@@ -153,7 +153,7 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 			//Execute Onset Date Request
 			authCodeRepository.getOnsetDate(AuthenticationCodeRequestModel(FAKE_AUTH_CODE, 1))
 
-			val timeBetweenOnsetAndUploadRequest = (SecureRandom().nextDouble() * MAX_USER_INTERACTION_DELAY).roundToInt()
+			val timeBetweenOnsetAndUploadRequest = clock.getUserInteractionDelay()
 			delay(timeBetweenOnsetAndUploadRequest.toLong())
 
 			//Execute Access Token Request
@@ -178,6 +178,7 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 	interface Clock {
 		fun syncInterval(): Long
 		fun currentTimeMillis(): Long
+		fun getUserInteractionDelay(): Int
 	}
 
 	class ClockImpl : Clock {
@@ -189,6 +190,10 @@ class FakeWorker(context: Context, workerParams: WorkerParameters) : CoroutineWo
 		override fun currentTimeMillis(): Long {
 			return System.currentTimeMillis()
 		}
+
+		override fun getUserInteractionDelay(): Int {
+			return (SecureRandom().nextDouble() * MAX_USER_INTERACTION_DELAY).roundToInt()
+		}
 	}
 
 }

From 984dc8be7d8d14b5de133d28951c2b9f34b75c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 01:00:51 +0200
Subject: [PATCH 179/207] make sure checkins are sorted correctly in selection
 view as well as for the upload

---
 .../admin/bag/dp3t/inform/InformViewModel.kt  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 672f08492..b1512eacd 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -163,6 +163,8 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 					&& it.checkOutTime > System.currentTimeMillis() - MAX_EXPOSURE_AGE_MILLIS
 		}.map {
 			SelectableCheckinItem(it, isSelected = selectedDiaryEntryIds.contains(it.id))
+		}.sortedByDescending {
+			it.diaryEntry.checkInTime
 		}
 	}
 
@@ -255,15 +257,18 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 	}
 
 	private fun getUploadVenueInfos(): List<UploadVenueInfo> {
-		return getSelectableCheckinItems().filter {
-			it.isSelected
-		}.map {
-			CrowdNotifier.generateUserUploadInfo(
-				it.diaryEntry.venueInfo, it.diaryEntry.checkInTime, it.diaryEntry.checkOutTime + CHECKOUT_TIME_PADDING_MS
-			)
-		}.flatten().map {
-			it.toUploadVenueInfo()
-		}
+		return getSelectableCheckinItems()
+			.filter {
+				it.isSelected
+			}
+			.reversed() //checkins need to be sorted in ascending time order for upload
+			.map {
+				CrowdNotifier.generateUserUploadInfo(
+					it.diaryEntry.venueInfo, it.diaryEntry.checkInTime, it.diaryEntry.checkOutTime + CHECKOUT_TIME_PADDING_MS
+				)
+			}.flatten().map {
+				it.toUploadVenueInfo()
+			}
 	}
 
 	private fun getAuthorizationHeader(accessToken: String): String {

From bdcc4b8fd2616a904c446512bccb194c3db16ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 22:10:47 +0200
Subject: [PATCH 180/207] make sure upload payload has always the same size

---
 .../bag/dp3t/checkin/networking/UserUploadRepository.kt     | 2 +-
 .../java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt | 2 +-
 common/src/main/proto/App.proto                             | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
index a9c81e9c8..26c971a7b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/networking/UserUploadRepository.kt
@@ -63,7 +63,7 @@ class UserUploadRepository {
 			.setNotificationKey(ByteString.copyFrom(getRandomByteArray(32)))
 			.setIntervalStartMs(random.nextLong())
 			.setIntervalEndMs(random.nextLong())
-			.setFake(true)
+			.setFake(ByteString.copyFrom(ByteArray(1) { 1 }))
 			.build()
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt
index 87e708b0f..a58f3771a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/UserUploadInfoExtensions.kt
@@ -11,6 +11,6 @@ fun UserUploadInfo.toUploadVenueInfo(): UploadVenueInfo {
 		.setNotificationKey(ByteString.copyFrom(notificationKey))
 		.setIntervalStartMs(intervalStartMs)
 		.setIntervalEndMs(intervalEndMs)
-		.setFake(false)
+		.setFake(ByteString.copyFrom(ByteArray(1) { 0 }))
 		.build()
 }
\ No newline at end of file
diff --git a/common/src/main/proto/App.proto b/common/src/main/proto/App.proto
index 19732ac79..611d45c66 100644
--- a/common/src/main/proto/App.proto
+++ b/common/src/main/proto/App.proto
@@ -56,9 +56,9 @@ message UserUploadPayload {
 message UploadVenueInfo {
   bytes preId = 1;
   bytes timeKey = 2;
-  int64 intervalStartMs = 3;
-  int64 intervalEndMs = 4;
+  fixed64 intervalStartMs = 3;
+  fixed64 intervalEndMs = 4;
   bytes notificationKey = 5;
-  bool fake = 6;
+  bytes fake = 6;
 }
 

From 0c763ee20e1adc1596ade14cbddaa5ce4336cce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 23:21:21 +0200
Subject: [PATCH 181/207] show update notification to promote new checkin
 feature. show notification only if enable in config service, user will see
 update-boarding when opening the app and time is between 8am and 8pm

---
 .../admin/bag/dp3t/debug/DebugFragment.java   |  4 +-
 .../admin/bag/dp3t/networking/ConfigWorker.kt | 46 ++++++++++++++++++-
 .../models/ConfigResponseModel.java           |  5 ++
 .../onboarding/OnboardingSlidePageAdapter.kt  |  1 +
 .../admin/bag/dp3t/storage/SecureStorage.java |  9 ++++
 .../admin/bag/dp3t/util/NotificationUtil.java |  1 +
 6 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index e688c0bba..6afd39244 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -108,7 +108,9 @@ private void setupSdkViews(View view) {
 		});
 
 		view.findViewById(R.id.debug_button_reset_update_boarding).setOnClickListener(v -> {
-			SecureStorage.getInstance(requireContext()).setLastShownUpdateBoardingVersion(0);
+			SecureStorage secureStorage = SecureStorage.getInstance(requireContext());
+			secureStorage.setLastShownUpdateBoardingVersion(0);
+			secureStorage.setCheckInUpdateNotificationShown(false);
 			getActivity().finish();
 		});
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
index 86152449d..9b4732233 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
@@ -18,9 +18,11 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.work.*
 import ch.admin.bag.dp3t.BuildConfig
+import ch.admin.bag.dp3t.MainActivity
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.debug.DebugFragment
 import ch.admin.bag.dp3t.networking.errors.ResponseError
+import ch.admin.bag.dp3t.onboarding.OnboardingSlidePageAdapter.Companion.CHECKIN_UPDATE_BOARDIN_VERSION
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.NotificationUtil
 import org.dpppt.android.sdk.DP3T
@@ -30,6 +32,7 @@ import org.dpppt.android.sdk.internal.history.HistoryEntry
 import org.dpppt.android.sdk.internal.history.HistoryEntryType
 import org.dpppt.android.sdk.internal.logger.Logger
 import java.io.IOException
+import java.time.LocalDateTime
 import java.util.concurrent.TimeUnit
 
 class ConfigWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
@@ -95,6 +98,15 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine
 				}
 			} else {
 				cancelNotification(context)
+
+				if (config.isCheckInUpdateNotificationEnabled && !secureStorage.checkInUpdateNotificationShown
+					&& secureStorage.onboardingCompleted && secureStorage.lastShownUpdateBoardingVersion < CHECKIN_UPDATE_BOARDIN_VERSION
+					&& !secureStorage.forceUpdateLiveData.hasObservers()
+					&& (8..19).contains(LocalDateTime.now().hour)
+				) {
+					secureStorage.checkInUpdateNotificationShown = true
+					showCheckInUpdateNotification(context);
+				}
 			}
 		}
 
@@ -115,7 +127,7 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine
 				.setAutoCancel(true)
 				.build()
 			val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-			if(DebugFragment.EXISTS){
+			if (DebugFragment.EXISTS) {
 				HistoryDatabase.getInstance(context).addEntry(
 					HistoryEntry(
 						HistoryEntryType.NOTIFICATION, "Showing update required notification", false,
@@ -130,6 +142,38 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine
 			val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 			notificationManager.cancel(NotificationUtil.NOTIFICATION_ID_UPDATE)
 		}
+
+		private fun showCheckInUpdateNotification(context: Context) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				NotificationUtil.createNotificationChannel(context)
+			}
+
+			val intent = Intent(context, MainActivity::class.java)
+			intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
+			val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+			val notification = NotificationCompat.Builder(context, NotificationUtil.NOTIFICATION_CHANNEL_ID)
+				.setContentTitle(context.getString(R.string.update_notification_checkin_feature_title))
+				.setContentText(context.getString(R.string.update_notification_checkin_feature_text))
+				.setStyle(
+					NotificationCompat.BigTextStyle()
+						.bigText(context.getString(R.string.update_notification_checkin_feature_text))
+				)
+				.setPriority(NotificationCompat.PRIORITY_HIGH)
+				.setSmallIcon(R.drawable.ic_begegnungen)
+				.setContentIntent(pendingIntent)
+				.setAutoCancel(true)
+				.build()
+			val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+			if (DebugFragment.EXISTS) {
+				HistoryDatabase.getInstance(context).addEntry(
+					HistoryEntry(
+						HistoryEntryType.NOTIFICATION, "Showing update notification for checkin feature", false,
+						System.currentTimeMillis()
+					)
+				)
+			}
+			notificationManager.notify(NotificationUtil.NOTIFICATION_ID_CHECKIN_UPDATE, notification)
+		}
 	}
 
 	override suspend fun doWork(): Result {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java b/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java
index 07eaf0c80..205fe5f67 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/models/ConfigResponseModel.java
@@ -21,6 +21,7 @@ public class ConfigResponseModel {
 	private Map<String, List<TestLocationModel>> testLocations;
 	private List<String> interOpsCountries;
 	private Map<String, String> testInformationUrls;
+	private boolean checkInUpdateNotificationEnabled;
 
 	public boolean getDoForceUpdate() {
 		return forceUpdate;
@@ -55,4 +56,8 @@ public Map<String, String> getTestInformationUrls() {
 		return testInformationUrls;
 	}
 
+	public boolean isCheckInUpdateNotificationEnabled() {
+		return checkInUpdateNotificationEnabled;
+	}
+
 }
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
index 4943b8199..0c71b37db 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
@@ -20,6 +20,7 @@ class OnboardingSlidePageAdapter(fragmentActivity: FragmentActivity, onboardingT
 	companion object {
 		// Increment this number for each new Update Boarding
 		const val UPDATE_BOARDING_VERSION = 2
+		const val CHECKIN_UPDATE_BOARDIN_VERSION = 2
 	}
 
 	private val onboardingScreens = when (onboardingType) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index fc25b00f1..f4aa90c43 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -52,6 +52,7 @@ public class SecureStorage {
 	private static final String KEY_ONBOARDING_COMPLETED = "onboarding_completed";
 	private static final String KEY_UPDATE_BOARDING_VERSION = "update_boarding_version";
 	private static final String KEY_LAST_SHOWN_CONTACT_ID = "last_shown_contact_id";
+	private static final String KEY_CHECK_IN_UPDATE_NOTIFICATION_SHOWN = "check_in_update_notification_shown";
 
 	//KEY_LEITFADEN_OPEN_PENDING key value is kept to old value to avoid migration issues
 	private static final String KEY_LEITFADEN_OPEN_PENDING = "hotline_call_pending";
@@ -189,6 +190,14 @@ public void setLastSuccessfulCheckinDownload(long time) {
 		prefs.edit().putLong(KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD, time).apply();
 	}
 
+	public boolean getCheckInUpdateNotificationShown() {
+		return prefs.getBoolean(KEY_CHECK_IN_UPDATE_NOTIFICATION_SHOWN, false);
+	}
+
+	public void setCheckInUpdateNotificationShown(boolean shown) {
+		prefs.edit().putBoolean(KEY_CHECK_IN_UPDATE_NOTIFICATION_SHOWN, shown).apply();
+	}
+
 	public long getLastSuccessfulCheckinDownload() {
 		return prefs.getLong(KEY_LAST_SUCCESSFUL_CHECKIN_DOWNLOAD, System.currentTimeMillis());
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
index 6bc1db941..02cdef94c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationUtil.java
@@ -37,6 +37,7 @@ public class NotificationUtil {
 	public static final int NOTIFICATION_ID_CONTACT = 42;
 	public static final int NOTIFICATION_ID_UPDATE = 43;
 	public static final int NOTIFICATION_ID_REMINDER = 44;
+	public static final int NOTIFICATION_ID_CHECKIN_UPDATE = 45;
 
 	public static void generateContactNotification(Context context) {
 

From d272a180cdef6ed6190ac0acee29d1aff38d5e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 23:23:11 +0200
Subject: [PATCH 182/207] fix crash on backpress in onboarding

---
 app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt   |  6 +++++-
 .../onboarding/OnboardingActivityResultContract.kt    | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index 91883acbf..a2b7fc5e5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -63,7 +63,11 @@ class MainActivity : FragmentActivity() {
 	private val crowdNotifierViewModel: CrowdNotifierViewModel by viewModels()
 
 	private val onboardingLauncher = registerForActivityResult(OnboardingActivityResultContract()) {
-		onOnboardingFinished(it.onboardingType, it.activityResult, it.instantAppUrl)
+		if (it != null) {
+			onOnboardingFinished(it.onboardingType, it.activityResult, it.instantAppUrl)
+		} else {
+			finish()
+		}
 	}
 
 	private val autoCheckoutBroadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
index 41d40779c..71b95f2e4 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingActivityResultContract.kt
@@ -6,7 +6,7 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContract
 import ch.admin.bag.dp3t.onboarding.OnboardingActivity.Companion.ARG_INSTANT_APP_URL
 
-class OnboardingActivityResultContract : ActivityResultContract<OnboardingActivityArgs, OnboardingActivityResult>() {
+class OnboardingActivityResultContract : ActivityResultContract<OnboardingActivityArgs, OnboardingActivityResult?>() {
 
 	override fun createIntent(context: Context, input: OnboardingActivityArgs): Intent {
 		return Intent(context, OnboardingActivity::class.java).apply {
@@ -15,9 +15,12 @@ class OnboardingActivityResultContract : ActivityResultContract<OnboardingActivi
 		}
 	}
 
-	override fun parseResult(resultCode: Int, intent: Intent?): OnboardingActivityResult {
-		val onboardingType = intent?.getSerializableExtra(OnboardingActivity.ARG_ONBOARDING_TYPE) as OnboardingType
-		val instantAppUrl = intent.getStringExtra(ARG_INSTANT_APP_URL)
+	override fun parseResult(resultCode: Int, intent: Intent?): OnboardingActivityResult? {
+		val onboardingType = intent?.getSerializableExtra(OnboardingActivity.ARG_ONBOARDING_TYPE) as OnboardingType?
+		if (onboardingType == null) {
+			return null
+		}
+		val instantAppUrl = intent?.getStringExtra(ARG_INSTANT_APP_URL)
 		return OnboardingActivityResult(ActivityResult(resultCode, intent), onboardingType, instantAppUrl)
 	}
 }

From ae7501e80144def16f511a120e004a84976b1f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 23:24:06 +0200
Subject: [PATCH 183/207] update version codes for release

---
 app/build.gradle     | 2 +-
 instant/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 96d379fe0..b310849cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 20001
+		versionCode 20002
 		versionName "2.0.0"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 
diff --git a/instant/build.gradle b/instant/build.gradle
index 679fd7f1f..b4823f4cc 100644
--- a/instant/build.gradle
+++ b/instant/build.gradle
@@ -10,7 +10,7 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 3
+		versionCode 4
 		versionName "2.0.0"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 

From 36cbf35b84868e9dec6584a955b8fc1533e4e17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Sun, 20 Jun 2021 23:47:02 +0200
Subject: [PATCH 184/207] show checkout screen if qr-code of current check-in
 is rescanned (outside the app)

---
 app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index 91883acbf..c6a95fa21 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -217,7 +217,11 @@ class MainActivity : FragmentActivity() {
 		try {
 			val venueInfo = CrowdNotifier.getVenueInfo(qrCodeData, BuildConfig.ENTRY_QR_CODE_HOST)
 			if (crowdNotifierViewModel.isCheckedIn.value == true) {
-				ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
+				if (crowdNotifierViewModel.checkInState.venueInfo == venueInfo) {
+					showCheckOutFragment()
+				} else {
+					ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
+				}
 			} else {
 				crowdNotifierViewModel.checkInState = CheckInState(
 					false, venueInfo, System.currentTimeMillis(),

From 00eb30aae22385649aec80885de81c64133e70ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 21 Jun 2021 00:18:10 +0200
Subject: [PATCH 185/207] fix flow for users who have tracing not enabled

---
 .../ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt    | 8 +++++++-
 .../ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
index fb37d464a..1f6e4d8f3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/ReallyNotShareFragment.kt
@@ -24,7 +24,13 @@ class ReallyNotShareFragment : TraceKeyShareBaseFragment() {
 			(requireActivity() as InformActivity).allowBackButton(false)
 			tryAgainButton.setOnClickListener {
 				tryAgainButton.isEnabled = false
-				showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+				askUserToEnableTracingIfNecessary { isEnabled ->
+					if (isEnabled) {
+						showShareTEKsPopup(onSuccess = ::onUserGrantedTEKSharing, onError = ::onUserDidNotGrantTEKSharing)
+					} else {
+						onUserDidNotGrantTEKSharing()
+					}
+				}
 			}
 			dontSendButton.paintFlags = dontSendButton.paintFlags or Paint.UNDERLINE_TEXT_FLAG
 			dontSendButton.setOnClickListener {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index 542cca462..7a91b90c5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -96,7 +96,7 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 		AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(R.string.android_inform_tracing_enabled_explanation)
 			.setOnCancelListener { continuation(false) }
-			.setNegativeButton(R.string.cancel) { _, _ -> continuation(false) }
+			.setNegativeButton(R.string.meldung_in_app_alert_ignore_button) { _, _ -> continuation(false) }
 			.setPositiveButton(R.string.activate_tracing_button) { _, _ -> enableTracing(continuation) }
 			.show()
 	}

From 96a459505a830e83585a621e7130067e5f055e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 21 Jun 2021 00:22:18 +0200
Subject: [PATCH 186/207] align title in statistics info popup with ios

---
 app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java
index 26d5b186c..a0f5cc8b6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java
@@ -181,7 +181,7 @@ private void setupShareAppButton() {
 	private void setupInfoButtons() {
 		covidcodesInfoButton.setOnClickListener(v -> {
 			ArrayList<StatsDetailsSection> sections = new ArrayList<>();
-			sections.add(new StatsDetailsSection(getString(R.string.stats_covidcodes_total_label),
+			sections.add(new StatsDetailsSection(getString(R.string.stats_covidcodes_total_header),
 					getString(R.string.stats_covidcodes_total_description)));
 			sections.add(new StatsDetailsSection(getString(R.string.stats_covidcodes_0to2days_label),
 					getString(R.string.stats_covidcodes_0to2days_description)));

From 2a3c85e47f7d985c1b54a65bbab130dc53b00c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 21 Jun 2021 00:28:04 +0200
Subject: [PATCH 187/207] clear saved covidcode after successfull upload

---
 app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
index 672f08492..c5e4217ff 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformViewModel.kt
@@ -154,6 +154,7 @@ class InformViewModel(application: Application, private val state: SavedStateHan
 		appConfigManager.iAmInfectedIsResettable = true
 		DP3T.stop(getApplication())
 		secureStorage.positiveReportOldestSharedKeyOrCheckin = listOfNotNull(oldestSharedKey, oldestSharedCheckin).minOrNull() ?: -1
+		secureStorage.clearInformTimeAndCodeAndToken()
 		emit(Resource.success(data = null))
 	}
 

From 40eeb2ab6f999992ed061a7ad908799958aaad58 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 21 Jun 2021 11:42:29 +0200
Subject: [PATCH 188/207] Remove fourth reminder option from QR-Code

---
 .../bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt      | 2 +-
 .../ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
index 5be8f2dcc..76039d075 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QRCodeViewModel.kt
@@ -33,7 +33,7 @@ private const val CHECKOUT_WARNING_DELAY_MS = 8 * ONE_HOUR_IN_MILLIS
 private const val SWISSCOVID_LOCATION_DATA_VERSION = 4
 private const val QR_CODE_VALIDITY_DURATION_MS = 100000 * 24 * ONE_HOUR_IN_MILLIS // 100'000 days
 private val REMINDER_DELAY_OPTIONS_MS =
-	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120, 240).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, 120 and 240 minutes
+	listOf(if (BuildConfig.IS_FLAVOR_DEV) 1 else 30, 60, 120).map { it * ONE_MINUTE_IN_MILLIS } // 30, 60, and 120 minutes
 private const val MAX_QR_CODE_PIXEL_SIZE = 1000
 const val QR_CODE_PDF_FILE_NAME = "swisscovid-qr-code.pdf"
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
index 0d69000fe..6483f00f7 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/VenueInfoExtensions.kt
@@ -26,11 +26,11 @@ fun VenueInfo.getReminderDelayOptions(context: Context): List<ReminderOption> {
 		.sorted()
 		.map { ReminderOption(it) }
 		.distinctBy { it.getDisplayString(context) }
-		.take(4)
+		.take(3)
 		.toList()
 	return if (filteredResult.isEmpty()) {
-		//Fallback if reminderDelayOptionsMsList is empty (30, 60, 120 and 240 minutes)
-		listOf(30, 60, 120, 240).map { ReminderOption(it * ONE_MINUTE_IN_MILLIS) }
+		//Fallback if reminderDelayOptionsMsList is empty (30, 60, and 120 minutes)
+		listOf(30, 60, 120).map { ReminderOption(it * ONE_MINUTE_IN_MILLIS) }
 	} else {
 		filteredResult
 	}

From c0d671bec249fc42372642c34c9a279fbcdf36e6 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 21 Jun 2021 12:08:37 +0200
Subject: [PATCH 189/207] Update SDK

---
 common/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build.gradle b/common/build.gradle
index 6c438284f..bdde20e99 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
-	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0.0-dev-17'
+	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0.0-dev-18'
 	api 'com.google.android.gms:play-services-instantapps:17.0.0'
 
 }
\ No newline at end of file

From 99af5999140cb0cd20e1e8d9e2768e8e75791ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 21 Jun 2021 13:03:20 +0200
Subject: [PATCH 190/207] fix typo

---
 .../main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt    | 4 ++--
 .../admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
index 9b4732233..5c3330433 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/networking/ConfigWorker.kt
@@ -22,7 +22,7 @@ import ch.admin.bag.dp3t.MainActivity
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.debug.DebugFragment
 import ch.admin.bag.dp3t.networking.errors.ResponseError
-import ch.admin.bag.dp3t.onboarding.OnboardingSlidePageAdapter.Companion.CHECKIN_UPDATE_BOARDIN_VERSION
+import ch.admin.bag.dp3t.onboarding.OnboardingSlidePageAdapter.Companion.CHECKIN_UPDATE_BOARDING_VERSION
 import ch.admin.bag.dp3t.storage.SecureStorage
 import ch.admin.bag.dp3t.util.NotificationUtil
 import org.dpppt.android.sdk.DP3T
@@ -100,7 +100,7 @@ class ConfigWorker(context: Context, workerParams: WorkerParameters) : Coroutine
 				cancelNotification(context)
 
 				if (config.isCheckInUpdateNotificationEnabled && !secureStorage.checkInUpdateNotificationShown
-					&& secureStorage.onboardingCompleted && secureStorage.lastShownUpdateBoardingVersion < CHECKIN_UPDATE_BOARDIN_VERSION
+					&& secureStorage.onboardingCompleted && secureStorage.lastShownUpdateBoardingVersion < CHECKIN_UPDATE_BOARDING_VERSION
 					&& !secureStorage.forceUpdateLiveData.hasObservers()
 					&& (8..19).contains(LocalDateTime.now().hour)
 				) {
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
index 0c71b37db..bb5ccc1db 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingSlidePageAdapter.kt
@@ -20,7 +20,7 @@ class OnboardingSlidePageAdapter(fragmentActivity: FragmentActivity, onboardingT
 	companion object {
 		// Increment this number for each new Update Boarding
 		const val UPDATE_BOARDING_VERSION = 2
-		const val CHECKIN_UPDATE_BOARDIN_VERSION = 2
+		const val CHECKIN_UPDATE_BOARDING_VERSION = 2
 	}
 
 	private val onboardingScreens = when (onboardingType) {

From ae698becf15146c3083004baca22c8fa3e7a05ad Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 21 Jun 2021 14:51:25 +0200
Subject: [PATCH 191/207] Handle Covid Certificate QR Codes

---
 app/src/main/AndroidManifest.xml              |  4 ++
 .../checkinflow/QrCodeScannerFragment.kt      | 49 +++++++++++++++++--
 .../extensions/PackageManagerExtensions.kt    | 12 +++++
 3 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/ch/admin/bag/dp3t/extensions/PackageManagerExtensions.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3f43bfa3..322e73cd1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,10 @@
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.CAMERA" />
 
+	<queries>
+		<package android:name="ch.admin.bag.covidcertificate.wallet"/>
+	</queries>
+
 	<application
 		android:name="ch.admin.bag.dp3t.MainApplication"
 		android:allowBackup="false"
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
index 29916e72f..c88938892 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
@@ -1,15 +1,18 @@
 package ch.admin.bag.dp3t.checkin.checkinflow
 
 import android.Manifest
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.LayerDrawable
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.ColorRes
+import androidx.appcompat.app.AlertDialog
 import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.app.ActivityCompat
@@ -25,6 +28,7 @@ import ch.admin.bag.dp3t.checkin.models.CrowdNotifierErrorState
 import ch.admin.bag.dp3t.checkin.utils.ErrorDialog
 import ch.admin.bag.dp3t.checkin.utils.ErrorHelper
 import ch.admin.bag.dp3t.databinding.FragmentQrCodeScannerBinding
+import ch.admin.bag.dp3t.extensions.isPackageInstalled
 import ch.admin.bag.dp3t.extensions.showFragment
 import org.crowdnotifier.android.sdk.CrowdNotifier
 import org.crowdnotifier.android.sdk.utils.QrUtils.*
@@ -34,6 +38,10 @@ import java.util.concurrent.Executors
 
 private const val PERMISSION_REQUEST_CAMERA = 13
 private const val MIN_ERROR_VISIBILITY = 1000L
+private const val COVID_CERT_PACKAGE_NAME = "ch.admin.bag.covidcertificate.wallet"
+private const val COVID_CERT_PLAYSTORE_DEEP_LINK = "https://play.google.com/store/apps/details?id=$COVID_CERT_PACKAGE_NAME"
+private const val COVID_CERT_DEEPLINK_PREFIX = "covidcert://"
+private const val COVID_CERT_QRCODE_PREFIX = "HC1:"
 
 class QrCodeScannerFragment : Fragment(), QrCodeAnalyzer.Listener {
 
@@ -142,11 +150,11 @@ class QrCodeScannerFragment : Fragment(), QrCodeAnalyzer.Listener {
 			showFragment(CheckInFragment.newInstance(isSelfCheckin = false))
 			activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.VALID) }
 		} catch (e: QRException) {
-			handleInvalidQRCodeExceptions(e)
+			handleInvalidQRCodeExceptions(e, qrCodeData)
 		}
 	}
 
-	private fun handleInvalidQRCodeExceptions(e: QRException) {
+	private fun handleInvalidQRCodeExceptions(e: QRException, qrCodeData: String) {
 		when (e) {
 			is InvalidQRCodeVersionException -> {
 				activity?.runOnUiThread {
@@ -159,11 +167,44 @@ class QrCodeScannerFragment : Fragment(), QrCodeAnalyzer.Listener {
 			}
 			is NotYetValidException -> activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.NOT_YET_VALID) }
 			is NotValidAnymoreException -> activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.NOT_VALID_ANYMORE) }
-			else -> activity?.runOnUiThread { indicateInvalidQrCode(QRScannerState.INVALID_FORMAT) }
-
+			else -> activity?.runOnUiThread {
+				if (qrCodeData.startsWith(COVID_CERT_QRCODE_PREFIX)) {
+					showCovidCertificateAlert(qrCodeData)
+				} else {
+					indicateInvalidQrCode(QRScannerState.INVALID_FORMAT)
+				}
+			}
 		}
 	}
 
+	private fun showCovidCertificateAlert(qrCodeData: String) {
+		val context = context ?: return
+		isQRScanningEnabled = false
+		AlertDialog.Builder(context, R.style.NextStep_AlertDialogStyle)
+			.setMessage(R.string.covid_certificate_alert_text)
+			.apply {
+				if (context.packageManager.isPackageInstalled(COVID_CERT_PACKAGE_NAME)) {
+					setPositiveButton(R.string.covid_certificate_open_app) { _, _ ->
+						val intent = Intent(Intent.ACTION_VIEW, Uri.parse("$COVID_CERT_DEEPLINK_PREFIX$qrCodeData"))
+						if (intent.resolveActivity(context.packageManager) != null) {
+							startActivity(intent)
+						} else {
+							startActivity(context.packageManager.getLaunchIntentForPackage(COVID_CERT_PACKAGE_NAME))
+						}
+					}
+				} else {
+					setPositiveButton(R.string.covid_certificate_install_app) { _, _ ->
+						startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(COVID_CERT_PLAYSTORE_DEEP_LINK)))
+					}
+				}
+			}
+			.setOnDismissListener { isQRScanningEnabled = true }
+			.setOnCancelListener { isQRScanningEnabled = true }
+			.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+			.show()
+
+	}
+
 	private fun indicateInvalidQrCode(qrScannerState: QRScannerState) {
 		binding.apply {
 			val currentTime = System.currentTimeMillis()
diff --git a/app/src/main/java/ch/admin/bag/dp3t/extensions/PackageManagerExtensions.kt b/app/src/main/java/ch/admin/bag/dp3t/extensions/PackageManagerExtensions.kt
new file mode 100644
index 000000000..d007ad8d5
--- /dev/null
+++ b/app/src/main/java/ch/admin/bag/dp3t/extensions/PackageManagerExtensions.kt
@@ -0,0 +1,12 @@
+package ch.admin.bag.dp3t.extensions
+
+import android.content.pm.PackageManager
+
+fun PackageManager.isPackageInstalled(packageName: String): Boolean {
+	return try {
+		getPackageInfo(packageName, 0)
+		true
+	} catch (e: PackageManager.NameNotFoundException) {
+		false
+	}
+}
\ No newline at end of file

From 4ab605ca7e73ca8fbd146d5eca2097e91329ee93 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Mon, 21 Jun 2021 15:17:46 +0200
Subject: [PATCH 192/207] Use Date instead of "X days ago" in Diary Fragment

---
 .../admin/bag/dp3t/checkin/diary/DiaryFragment.kt  |  4 ++--
 .../java/ch/admin/bag/dp3t/util/DateUtils.java     | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
index 2852c62cb..1bb6fc321 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryFragment.kt
@@ -20,7 +20,7 @@ import ch.admin.bag.dp3t.databinding.FragmentCheckinDiaryBinding
 import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.reports.CheckinReportItem
 import ch.admin.bag.dp3t.reports.ReportsFragment
-import ch.admin.bag.dp3t.util.StringUtil
+import ch.admin.bag.dp3t.util.DateUtils
 import org.crowdnotifier.android.sdk.model.ExposureEvent
 import java.util.*
 
@@ -70,7 +70,7 @@ class DiaryFragment : Fragment() {
 				checkinDiaryEmptyView.isVisible = isEmpty
 				var daysAgoString = ""
 				for (diaryEntry in diaryEntries) {
-					val newDaysAgoString: String = StringUtil.getDaysAgoString(diaryEntry.checkInTime, requireContext())
+					val newDaysAgoString: String = DateUtils.getFormattedWeekdayWithDate(diaryEntry.checkInTime, requireContext())
 					if (newDaysAgoString != daysAgoString) {
 						daysAgoString = newDaysAgoString
 						items.add(ItemVenueVisitDayHeader(daysAgoString))
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java b/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java
index afd7ab5b6..c4182fd92 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/DateUtils.java
@@ -9,6 +9,8 @@
  */
 package ch.admin.bag.dp3t.util;
 
+import android.content.Context;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -20,6 +22,8 @@
 
 import org.dpppt.android.sdk.models.DayDate;
 
+import ch.admin.bag.dp3t.R;
+
 public class DateUtils {
 
 	private static final DateFormat DATE_TIME_FORMAT = SimpleDateFormat.getDateTimeInstance();
@@ -73,6 +77,16 @@ public static String getFormattedDateWrittenMonth(long date, TimeZone timezone)
 		return sdf.format(new Date(date));
 	}
 
+	public static String getFormattedWeekdayWithDate(long timestamp, Context context) {
+		int daysDiff = getDaysDiff(timestamp);
+		if (daysDiff == 0) {
+			return context.getString(R.string.date_today);
+		} else {
+			SimpleDateFormat sdf = new SimpleDateFormat("EEEE, dd.MM.", new Locale(context.getString(R.string.language_key)));
+			return sdf.format(new Date(timestamp));
+		}
+	}
+
 	public static Date getParsedDateStats(String date) {
 		if (date == null) {
 			return null;

From cba239a212238736971f3deb359601dece1503f7 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Mon, 21 Jun 2021 12:57:21 +0200
Subject: [PATCH 193/207] option to change checkin time

---
 .../java/ch/admin/bag/dp3t/MainActivity.kt    |  2 +-
 .../dp3t/checkin/CrowdNotifierViewModel.java  | 10 ++---
 .../checkin/checkinflow/CheckInFragment.kt    | 32 ++++++++++++++-
 app/src/main/res/layout/fragment_check_in.xml | 39 +++++++++++++++----
 4 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
index cd8bbb693..d9551cd2e 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.kt
@@ -244,7 +244,7 @@ class MainActivity : FragmentActivity() {
 			if (crowdNotifierViewModel.isCheckedIn.value == true) {
 				ErrorDialog(this, CrowdNotifierErrorState.ALREADY_CHECKED_IN).show()
 			} else {
-				crowdNotifierViewModel.performCheckinAndSetReminders(venueInfo, 0)
+				crowdNotifierViewModel.performCheckinAndSetReminders(venueInfo, System.currentTimeMillis(), 0)
 			}
 		} catch (e: QRException) {
 			handleInvalidQRCodeExceptions(e)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
index 07adf72ad..6c0456e0b 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/CrowdNotifierViewModel.java
@@ -203,15 +203,15 @@ public void setSelectedReminderDelay(long selectedReminderDelay) {
 		storage.setCheckInState(checkInState);
 	}
 
-	public void performCheckinAndSetReminders(VenueInfo venueInfo, long selectedReminderDelay) {
+	public void performCheckinAndSetReminders(VenueInfo venueInfo, long checkinTime, long selectedReminderDelay) {
 		long currentTime = System.currentTimeMillis();
-		setCheckInState(new CheckInState(true, venueInfo, currentTime, currentTime, selectedReminderDelay));
+		setCheckInState(new CheckInState(true, venueInfo, checkinTime, checkinTime, selectedReminderDelay));
 		startCheckInTimer();
-		NotificationHelper.getInstance(getApplication()).startOngoingNotification(currentTime, venueInfo);
+		NotificationHelper.getInstance(getApplication()).startOngoingNotification(checkinTime, venueInfo);
 		CrowdNotifierReminderHelper
-				.setCheckoutWarning(currentTime, VenueInfoExtensionsKt.getCheckoutWarningDelay(venueInfo), getApplication());
+				.setCheckoutWarning(checkinTime, VenueInfoExtensionsKt.getCheckoutWarningDelay(venueInfo), getApplication());
 		CrowdNotifierReminderHelper
-				.setAutoCheckOut(currentTime, VenueInfoExtensionsKt.getAutoCheckoutDelay(venueInfo), getApplication());
+				.setAutoCheckOut(checkinTime, VenueInfoExtensionsKt.getAutoCheckoutDelay(venueInfo), getApplication());
 		CrowdNotifierReminderHelper.setReminder(currentTime + selectedReminderDelay, getApplication());
 	}
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index d1bc4e3e2..ce10417bf 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -1,5 +1,6 @@
 package ch.admin.bag.dp3t.checkin.checkinflow
 
+import android.app.TimePickerDialog
 import android.os.Bundle
 import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
@@ -12,6 +13,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.MutableLiveData
 import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
@@ -20,6 +22,8 @@ import ch.admin.bag.dp3t.checkin.models.ReminderOption
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
 import ch.admin.bag.dp3t.extensions.getReminderDelayOptions
 import com.google.android.material.button.MaterialButton
+import java.text.SimpleDateFormat
+import java.util.*
 
 private const val ARG_IS_SELF_CHECKIN = "ARG_IS_SELF_CHECKIN"
 
@@ -37,6 +41,8 @@ class CheckInFragment : Fragment() {
 
 	private val viewModel: CrowdNotifierViewModel by activityViewModels()
 
+	private var selectedCheckinTime = MutableLiveData(System.currentTimeMillis())
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		checkIfAutoCheckoutHappened()
@@ -59,10 +65,18 @@ class CheckInFragment : Fragment() {
 
 			titleTextview.text = venueInfo.title
 			checkInButton.setOnClickListener {
-				viewModel.performCheckinAndSetReminders(venueInfo, viewModel.selectedReminderDelay)
+				viewModel.performCheckinAndSetReminders(venueInfo, selectedCheckinTime.value!!, viewModel.selectedReminderDelay)
 				popBackToHomeFragment()
 			}
 
+			selectedCheckinTime.observe(viewLifecycleOwner) { selectedTime ->
+				val formattedTime = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT).format(Date(selectedTime))
+				checkinTime.text = getString(R.string.date_today) + ", " + formattedTime
+			}
+			checkinTime.setOnClickListener {
+				selectCheckinTime()
+			}
+
 			reminderToggleGroup.removeAllViews()
 			val reminderOptions = venueInfo.getReminderDelayOptions(requireContext()).toMutableList()
 			reminderOptions.add(0, ReminderOption(0L))
@@ -92,6 +106,22 @@ class CheckInFragment : Fragment() {
 		}.root
 	}
 
+	private fun selectCheckinTime() {
+		val cal = Calendar.getInstance()
+		cal.timeInMillis = selectedCheckinTime.value!!
+		TimePickerDialog(
+			requireContext(),
+			{ _, hourOfDay, minute ->
+				cal.set(Calendar.HOUR_OF_DAY, hourOfDay)
+				cal.set(Calendar.MINUTE, minute)
+				selectedCheckinTime.value = cal.timeInMillis.coerceAtMost(System.currentTimeMillis())
+			},
+			cal.get(Calendar.HOUR_OF_DAY),
+			cal.get(Calendar.MINUTE),
+			true
+		).show()
+	}
+
 	private fun popBackToHomeFragment() {
 		if (requireArguments().getBoolean(ARG_IS_SELF_CHECKIN)) {
 			requireActivity().supportFragmentManager.popBackStack(CheckinOverviewFragment::class.java.canonicalName, 0)
diff --git a/app/src/main/res/layout/fragment_check_in.xml b/app/src/main/res/layout/fragment_check_in.xml
index e2ef3bf72..eb5070e02 100644
--- a/app/src/main/res/layout/fragment_check_in.xml
+++ b/app/src/main/res/layout/fragment_check_in.xml
@@ -57,13 +57,6 @@
 				android:layout_height="0dp"
 				android:layout_weight="2" />
 
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:layout_marginTop="@dimen/spacing_large"
-				android:src="@drawable/ic_illu_check_in" />
-
 			<TextView
 				android:id="@+id/title_textview"
 				style="@style/NextStep.Text.SplashTitle"
@@ -73,6 +66,38 @@
 				android:gravity="center"
 				tools:text="Cyber Cafe SV" />
 
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginHorizontal="@dimen/spacing_large"
+				android:layout_marginTop="@dimen/spacing_large"
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/button_radius">
+
+				<TextView
+					style="@style/NextStep.Text.Bold"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:text="@string/checkin_title"
+					android:textAllCaps="true" />
+
+				<TextView
+					android:id="@+id/checkin_time"
+					style="@style/NextStep.Text.Title.Blue"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:layout_marginTop="@dimen/spacing_medium"
+					android:layout_marginBottom="@dimen/spacing_large"
+					android:background="@color/grey_light_medium"
+					android:foreground="?selectableItemBackground"
+					android:gravity="center"
+					android:padding="@dimen/spacing_medium"
+					android:text="Today, 12:34" />
+
+			</LinearLayout>
+
 			<Space
 				android:layout_width="match_parent"
 				android:layout_height="0dp"

From 103a5288c29a0f6379668408d7680cea13056d73 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Mon, 21 Jun 2021 18:25:06 +0200
Subject: [PATCH 194/207] custom checkout reminder option

---
 .../checkin/checkinflow/CheckInFragment.kt    | 90 ++++++++++++++++++-
 .../java/ch/admin/bag/dp3t/util/StringUtil.kt |  4 +-
 .../drawable/reminder_toggle_stroke_color.xml |  5 ++
 .../drawable/reminder_toggle_text_color.xml   |  2 +-
 .../res/layout/dialog_reminder_duration.xml   | 71 +++++++++++++++
 app/src/main/res/values/app_styles.xml        |  7 +-
 common/src/main/res/drawable/ic_stopwatch.xml | 10 +++
 7 files changed, 179 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/reminder_toggle_stroke_color.xml
 create mode 100644 app/src/main/res/layout/dialog_reminder_duration.xml
 create mode 100644 common/src/main/res/drawable/ic_stopwatch.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index ce10417bf..9ab724e31 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -1,6 +1,8 @@
 package ch.admin.bag.dp3t.checkin.checkinflow
 
 import android.app.TimePickerDialog
+import android.content.res.ColorStateList
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
@@ -8,6 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -19,10 +22,19 @@ import ch.admin.bag.dp3t.checkin.CheckinOverviewFragment
 import ch.admin.bag.dp3t.checkin.CrowdNotifierViewModel
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventsOverviewFragment
 import ch.admin.bag.dp3t.checkin.models.ReminderOption
+import ch.admin.bag.dp3t.databinding.DialogReminderDurationBinding
 import ch.admin.bag.dp3t.databinding.FragmentCheckInBinding
 import ch.admin.bag.dp3t.extensions.getReminderDelayOptions
+import ch.admin.bag.dp3t.extensions.getSwissCovidLocationData
+import ch.admin.bag.dp3t.util.StringUtil
+import ch.admin.bag.dp3t.util.StringUtil.toHoursString
+import ch.admin.bag.dp3t.util.StringUtil.toMinutesString
+import ch.admin.bag.dp3t.util.UiUtils
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
+import com.shawnlin.numberpicker.NumberPicker
 import java.text.SimpleDateFormat
+import java.time.Duration
 import java.util.*
 
 private const val ARG_IS_SELF_CHECKIN = "ARG_IS_SELF_CHECKIN"
@@ -41,8 +53,15 @@ class CheckInFragment : Fragment() {
 
 	private val viewModel: CrowdNotifierViewModel by activityViewModels()
 
+	private val maxCheckinDuration: Duration
+		get() =
+			viewModel.checkInState?.venueInfo?.getSwissCovidLocationData()?.automaticCheckoutDelaylMs?.let { Duration.ofMillis(it) }
+				?: Duration.ofHours(24)
+
 	private var selectedCheckinTime = MutableLiveData(System.currentTimeMillis())
 
+	private lateinit var customReminderButton: MaterialButton
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		checkIfAutoCheckoutHappened()
@@ -80,21 +99,38 @@ class CheckInFragment : Fragment() {
 			reminderToggleGroup.removeAllViews()
 			val reminderOptions = venueInfo.getReminderDelayOptions(requireContext()).toMutableList()
 			reminderOptions.add(0, ReminderOption(0L))
+
 			for (option in reminderOptions) {
 				val toggleButton =
 					MaterialButton(ContextThemeWrapper(requireContext(), R.style.NextStep_ToggleButton), null, 0)
 				toggleButton.text = option.getDisplayString(requireContext())
-				toggleButton.tag = option.delayMillis
 				reminderToggleGroup.addView(toggleButton, LinearLayout.LayoutParams(0, WRAP_CONTENT, 1f))
 				if (viewModel.selectedReminderDelay == option.delayMillis) {
 					reminderToggleGroup.check(toggleButton.id)
 				}
+				toggleButton.addOnCheckedChangeListener { _, isChecked ->
+					if (isChecked) {
+						viewModel.selectedReminderDelay = option.delayMillis
+					}
+				}
 			}
 
-			reminderToggleGroup.addOnButtonCheckedListener { toggleGroup, checkedId, isChecked ->
+			customReminderButton =
+				MaterialButton(ContextThemeWrapper(requireContext(), R.style.NextStep_ToggleButton), null, 0)
+			customReminderButton.apply {
+				icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_stopwatch)
+				iconTint = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.anthracite))
+				iconTintMode = PorterDuff.Mode.SRC_IN
+				iconSize = UiUtils.dpToPx(resources, 16)
+				iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START
+				iconPadding = 0
+			}
+			reminderToggleGroup.addView(customReminderButton, LinearLayout.LayoutParams(0, WRAP_CONTENT, 1f))
+			customReminderButton.addOnCheckedChangeListener { _, isChecked ->
 				if (isChecked) {
-					viewModel.selectedReminderDelay = toggleGroup.findViewById<View>(checkedId).tag as Long
+					showCustomReminderDialog()
 				}
+				invalidateCustomReminderDelayButtonLabel(isChecked)
 			}
 
 			toolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
@@ -111,10 +147,13 @@ class CheckInFragment : Fragment() {
 		cal.timeInMillis = selectedCheckinTime.value!!
 		TimePickerDialog(
 			requireContext(),
+			R.style.NextStep_AlertDialogStyle,
 			{ _, hourOfDay, minute ->
 				cal.set(Calendar.HOUR_OF_DAY, hourOfDay)
 				cal.set(Calendar.MINUTE, minute)
-				selectedCheckinTime.value = cal.timeInMillis.coerceAtMost(System.currentTimeMillis())
+				selectedCheckinTime.value = cal.timeInMillis
+					.coerceAtLeast(System.currentTimeMillis() - maxCheckinDuration.toMillis())
+					.coerceAtMost(System.currentTimeMillis())
 			},
 			cal.get(Calendar.HOUR_OF_DAY),
 			cal.get(Calendar.MINUTE),
@@ -122,6 +161,49 @@ class CheckInFragment : Fragment() {
 		).show()
 	}
 
+	private fun showCustomReminderDialog() {
+		BottomSheetDialog(requireContext()).apply {
+			setContentView(DialogReminderDurationBinding.inflate(layoutInflater, null, false).apply {
+				dialogCancel.setOnClickListener { dismiss() }
+				dialogDone.setOnClickListener {
+					viewModel.selectedReminderDelay =
+						Duration.ofHours(dialogHourPicker.value.toLong()).plusMinutes(dialogMinutePicker.value.toLong()).toMillis()
+					invalidateCustomReminderDelayButtonLabel(true)
+					dismiss()
+				}
+
+				dialogHourPicker.apply {
+					minValue = 0
+					maxValue = maxCheckinDuration.toHours().toInt() - 1
+					wrapSelectorWheel = false
+					formatter = NumberPicker.Formatter { it.toLong().toHoursString(context) }
+
+					value = (viewModel.selectedReminderDelay / 1000L / 60L / 60L).toInt()
+						.coerceAtMost(dialogHourPicker.maxValue)
+				}
+				dialogMinutePicker.apply {
+					minValue = 0
+					maxValue = 59
+					wrapSelectorWheel = true
+					formatter = NumberPicker.Formatter { it.toLong().toMinutesString(context) }
+
+					value = (viewModel.selectedReminderDelay / 1000L / 60L % 60L).toInt()
+				}
+			}.root)
+			show()
+		}
+	}
+
+	private fun invalidateCustomReminderDelayButtonLabel(isChecked: Boolean) {
+		if (isChecked) {
+			customReminderButton.text = StringUtil.getShortDurationStringWithUnits(viewModel.selectedReminderDelay, requireContext())
+			customReminderButton.icon = null
+		} else {
+			customReminderButton.text = null
+			customReminderButton.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_stopwatch)
+		}
+	}
+
 	private fun popBackToHomeFragment() {
 		if (requireArguments().getBoolean(ARG_IS_SELF_CHECKIN)) {
 			requireActivity().supportFragmentManager.popBackStack(CheckinOverviewFragment::class.java.canonicalName, 0)
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt
index 38ae7a517..2c55bbe8c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/StringUtil.kt
@@ -88,11 +88,11 @@ object StringUtil {
 		}
 	}
 
-	private fun Long.toHoursString(context: Context): String {
+	fun Long.toHoursString(context: Context): String {
 		return context.getString(R.string.reminder_option_hours).replace("{HOURS}", this.toString())
 	}
 
-	private fun Long.toMinutesString(context: Context): String {
+	fun Long.toMinutesString(context: Context): String {
 		return context.getString(R.string.reminder_option_minutes).replace("{MINUTES}", this.toString())
 	}
 
diff --git a/app/src/main/res/drawable/reminder_toggle_stroke_color.xml b/app/src/main/res/drawable/reminder_toggle_stroke_color.xml
new file mode 100644
index 000000000..18533db95
--- /dev/null
+++ b/app/src/main/res/drawable/reminder_toggle_stroke_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/primary" android:state_checked="true" />
+	<item android:color="@color/grey_dark" />
+</selector>
diff --git a/app/src/main/res/drawable/reminder_toggle_text_color.xml b/app/src/main/res/drawable/reminder_toggle_text_color.xml
index 18533db95..b353a5a2a 100644
--- a/app/src/main/res/drawable/reminder_toggle_text_color.xml
+++ b/app/src/main/res/drawable/reminder_toggle_text_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="@color/primary" android:state_checked="true" />
-	<item android:color="@color/grey_dark" />
+	<item android:color="@color/anthracite" />
 </selector>
diff --git a/app/src/main/res/layout/dialog_reminder_duration.xml b/app/src/main/res/layout/dialog_reminder_duration.xml
new file mode 100644
index 000000000..55973aedc
--- /dev/null
+++ b/app/src/main/res/layout/dialog_reminder_duration.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@color/white"
+	android:elevation="@dimen/modal_elevation"
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/dialog_cancel"
+			style="@style/NextStep.Text.Blue"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/cancel" />
+
+		<TextView
+			android:id="@+id/dialog_done"
+			style="@style/NextStep.Text.Bold.Blue"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			android:layout_marginHorizontal="@dimen/spacing_very_small"
+			android:layout_marginVertical="@dimen/spacing_very_small"
+			android:background="@drawable/ripple_button"
+			android:paddingHorizontal="@dimen/spacing_large"
+			android:paddingVertical="@dimen/spacing_small"
+			android:text="@string/done_button" />
+
+	</FrameLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:orientation="horizontal">
+
+		<com.shawnlin.numberpicker.NumberPicker
+			android:id="@+id/dialog_hour_picker"
+			style="@style/NextStep.DateTimePicker"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:descendantFocusability="blocksDescendants"
+			app:np_wheelItemCount="5" />
+
+		<Space
+			android:layout_width="5dp"
+			android:layout_height="0dp" />
+
+		<com.shawnlin.numberpicker.NumberPicker
+			android:id="@+id/dialog_minute_picker"
+			style="@style/NextStep.DateTimePicker"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:descendantFocusability="blocksDescendants"
+			app:np_wheelItemCount="5" />
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/app_styles.xml b/app/src/main/res/values/app_styles.xml
index 1ffb6f391..54941c7a4 100644
--- a/app/src/main/res/values/app_styles.xml
+++ b/app/src/main/res/values/app_styles.xml
@@ -29,16 +29,17 @@
 	</style>
 
 	<style name="NextStep.ToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_width">0dp</item>
+		<item name="android:minWidth">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:textAllCaps">false</item>
 		<item name="android:paddingEnd">0dp</item>
 		<item name="android:paddingStart">0dp</item>
 		<item name="android:backgroundTint">@drawable/reminder_toggle_background_color</item>
-		<item name="strokeColor">@drawable/reminder_toggle_text_color</item>
+		<item name="strokeColor">@drawable/reminder_toggle_stroke_color</item>
 		<item name="android:textColor">@drawable/reminder_toggle_text_color</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:minWidth">0dp</item>
+		<item name="android:foreground">?selectableItemBackgroundBorderless</item>
 	</style>
 
 	<style name="NextStep.RadioButton.Reminder" parent="Widget.MaterialComponents.CompoundButton.RadioButton">
diff --git a/common/src/main/res/drawable/ic_stopwatch.xml b/common/src/main/res/drawable/ic_stopwatch.xml
new file mode 100644
index 000000000..3c3690d39
--- /dev/null
+++ b/common/src/main/res/drawable/ic_stopwatch.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M12.4733,1.535l2,2.002 -0.933,0.934 -0.534,-0.534 -0.466,0.467c2.333,2.136 2.8,5.606 1.133,8.342 -1.867,3.204 -6,4.205 -9.134,2.27C1.4053,13.08 0.4053,9.075 2.2723,5.872c1.867,-3.204 6,-4.205 9.2,-2.27l0.601,-0.6 -0.533,-0.534 0.933,-0.934zM8.0063,4.605c-2.6,0 -4.667,2.068 -4.667,4.671s2.066,4.672 4.667,4.672c2.6,0 4.667,-2.07 4.667,-4.672L8.0063,9.276zM10.0063,0v1.335L8.6733,1.335v0.667c-0.467,-0.067 -0.867,-0.067 -1.334,0v-0.667L6.0063,1.335L6.0063,0h4z"
+      android:fillColor="#5094BF"
+      android:fillType="nonZero"/>
+</vector>

From 752c71fe59118dc65dcdae0abf1fb4ffc312a2de Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Mon, 21 Jun 2021 18:27:14 +0200
Subject: [PATCH 195/207] updated translations

---
 common/src/main/res/values-bs/strings.xml |  6 +++---
 common/src/main/res/values-es/strings.xml | 16 ++++++++--------
 common/src/main/res/values-hr/strings.xml |  6 +++---
 common/src/main/res/values-rm/strings.xml |  6 +++---
 common/src/main/res/values-sr/strings.xml |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
index 58e354d29..ea3367882 100644
--- a/common/src/main/res/values-bs/strings.xml
+++ b/common/src/main/res/values-bs/strings.xml
@@ -1441,10 +1441,10 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours">"časovi {HOURS} h"</string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"minute {MINUTES}'"</string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
     <string name="qr_scanner_no_camera_permission">"Aplikaciji je potreban pristup kameri, da bi se skenirao QR kod."</string>
@@ -1602,7 +1602,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="home_end_isolation_card_text">"Kontakte i prijave ponovo aktivirati. "</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"časovi {HOURS} h minute {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"Ne možete ponovo da se prijavite ako imate pozitivan test."</string>
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 5850a5238..27f3ccdf1 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -327,7 +327,7 @@ Infoline SwissCovid
     <string name="onboarding_prinzip_title">"Anticiparnos al virus"</string>
 
     <!-- Onboarding Prinzip Text -->
-    <string name="onboarding_prinzip_text1">"Con la aplicación Swiss Covid, todos podemos contribuir a contener la propagación del virus."</string>
+    <string name="onboarding_prinzip_text1">"Con la aplicación SwissCovid, todos podemos contribuir a contener la propagación del virus."</string>
 
     <!-- Onboarding Prinzip Text -->
     <string name="onboarding_prinzip_text2">"La aplicación le avisa si ha estado usted potencialmente expuesto al coronavirus."</string>
@@ -755,7 +755,7 @@ Pueden aparecer también los síntomas siguientes:
 
     <!-- Fehler-Titel, wenn Tracing deaktiviert wurde im System, iOS -->
     <!-- Fuzzy -->
-    <string name="tracing_permission_error_title_ios">"Notificaciones de exposición a la COVID-19 desactivado desactivado"</string>
+    <string name="tracing_permission_error_title_ios">"Notificaciones de exposición a la COVID-19 desactivado"</string>
 
     <!-- Fehler-Text, wenn Tracing deaktiviert wurde im System, iOS -->
     <string name="tracing_permission_error_text_ios">"Active {TRACING_SETTING_TEXT} para que el rastreo anónimo pueda funcionar."</string>
@@ -937,7 +937,7 @@ Al fin de poder alertar también a los viajeros del extranjero, esto ocurre inde
     <string name="infoline_coronavirus_number">"+41 58 387 77 80"</string>
 
     <!-- Text beim Bluetooth Control iOS 14 -->
-    <string name="tracing_setting_text_ios_14_0">"Exposure Notifications"</string>
+    <string name="tracing_setting_text_ios_14_0">"Notificaciones de exposición"</string>
     <string name="bottom_nav_tab_home">"SwissCovid"</string>
     <string name="bottom_nav_tab_stats">"Datos"</string>
     <string name="stats_title">"ya utilizan SwissCovid"</string>
@@ -950,7 +950,7 @@ Al fin de poder alertar también a los viajeros del extranjero, esto ocurre inde
     <string name="share_app_body">"Cuantas más personas de entre sus contractos utilicen la app SwissCovid, más rápidamente será informado de un riesgo de contagio."</string>
 
     <!-- Text der geteilt wird -->
-    <string name="share_app_message">"Con la aplicación Swiss Covid, todos podemos contribuir a contener la propagación del virus."</string>
+    <string name="share_app_message">"Con la aplicación SwissCovid, todos podemos contribuir a contener la propagación del virus."</string>
 
     <!-- URL die geteilt wird -->
     <string name="share_app_url">"https://bag-coronavirus.ch/swisscovid-app/#download"</string>
@@ -1436,7 +1436,7 @@ Llame a este número:"</string>
     <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"{HOURS} h"</string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
     <string name="qr_scanner_no_camera_permission">"La app debe acceder a la cámara del dispositivo para poder escanear el código QR."</string>
@@ -1653,10 +1653,10 @@ Llame a este número:"</string>
     <string name="events_empty_state_title">"Genere un código QR"</string>
     <string name="events_empty_state_subtitle">"Con un código QR SwissCovid es posible registrarse in situ sin necesidad de dejar datos personales."</string>
     <string name="events_info_box_title">"No sustituye el registro obligatorio de los datos de contacto"</string>
-    <string name="events_info_box_text">"Los Check-in SwissCovid nos sustituyen el registro obligatorio de los datos de contacto estipulado en la «Ordenanza Covid-19, situación particular». "</string>
+    <string name="events_info_box_text">"Los Check-in SwissCovid no sustituyen el registro obligatorio de los datos de contacto estipulado en la «Ordenanza Covid-19, situación particular»."</string>
     <string name="events_footer_title1">"¿Dónde utilizar los Check-in?"</string>
     <string name="events_footer_title2">"¿Por qué una función Check-in?"</string>
-    <string name="events_footer_subtitle1">"Los Check-in SwissCovid puede utilizarse allí donde las personas se reúnen pero el registro de los datos de contacto no es obligatorio.
+    <string name="events_footer_subtitle1">"Los Check-in SwissCovid pueden utilizarse allí donde las personas se reúnen pero el registro de los datos de contacto no es obligatorio.
 
 Posibles utilizaciones:
 – eventos privados
@@ -1715,7 +1715,7 @@ Posibles utilizaciones:
     <string name="onboarding_checkin_title">"Check-in sin dejar datos"</string>
     <string name="onboarding_checkin_heading">"Registros de Check-in"</string>
     <string name="onboarding_checkin_text1">"La función Check-in SwissCovid le permite registrarse con la aplicación en un lugar o en un evento."</string>
-    <string name="onboarding_checkin_text2">"Su presencia solo queda registra en la aplicación. No es necesario indicar datos personales en la app."</string>
+    <string name="onboarding_checkin_text2">"Su presencia solo queda registrada en la aplicación. No es necesario indicar datos personales en la app."</string>
     <string name="checkin_updateboarding_text">"La función Check-in SwissCovid le permite registrarse con la aplicación en un lugar o en un evento. Su presencia solo queda registrada en la aplicación. No es necesario indicar datos personales en la app. A estos efectos se han actualizado las condiciones de uso y la política de privacidad."</string>
     <string name="onboarding_gaen_button_dont_activate">"Omitir"</string>
 
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 778c7b003..60f899322 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -1439,10 +1439,10 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours">"časovi {HOURS} h"</string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"minute {MINUTES}'"</string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
     <string name="qr_scanner_no_camera_permission">"Aplikaciji je potreban pristup kameri, da bi se skenirao QR kod."</string>
@@ -1600,7 +1600,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="home_end_isolation_card_text">"Kontakte i prijave ponovo aktivirati. "</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"časovi {HOURS} h minute {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"Ne možete ponovo da se prijavite ako imate pozitivan test."</string>
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index 894ce771e..eb15bf047 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -1432,7 +1432,7 @@ Alura telefonai qua:"</string>
     <string name="checkin_set_reminder">"Pro memoria sortida"</string>
 
     <!-- Check-Ins: Erinnerung Option Aus -->
-    <string name="reminder_option_off">"Deactivà"</string>
+    <string name="reminder_option_off">"Off"</string>
 
     <!-- Check-Ins: Tagebuch Zugriff Text -->
     <string name="authenticate_for_diary">"As autentifitgai per avair access al diari"</string>
@@ -1441,7 +1441,7 @@ Alura telefonai qua:"</string>
     <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"{MINUTES} min"</string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
     <string name="qr_scanner_no_camera_permission">"Per pudair scannar il code QR dovra l'app access a la camera."</string>
@@ -1600,7 +1600,7 @@ Alura telefonai qua:"</string>
     <string name="home_end_isolation_card_text">"Puspè activar inscunters e registraziuns."</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES} min"</string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"Vus na pudais betg pli As registrar, sche Vus avais survegnì in resultat positiv."</string>
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index 6e71c5c7e..f33a54e36 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -1439,10 +1439,10 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="authenticate_for_diary">"Identifikujte se, kako biste pristupili dnevniku"</string>
 
     <!-- Check-Ins: Errinnerungsoption Stunden -->
-    <string name="reminder_option_hours">"časovi {HOURS} h"</string>
+    <string name="reminder_option_hours">"{HOURS} h"</string>
 
     <!-- Check-Ins: Errinnerungsoption Minuten -->
-    <string name="reminder_option_minutes">"minute {MINUTES}'"</string>
+    <string name="reminder_option_minutes">"{MINUTES}'"</string>
 
     <!-- Check-Ins: Fehler wenn Kamera-Erlaubnis nicht gegeben -->
     <string name="qr_scanner_no_camera_permission">"Aplikaciji je potreban pristup kameri, da bi se skenirao QR kod."</string>
@@ -1600,7 +1600,7 @@ U tom slučaju kontaktirajte nas ovde:"</string>
     <string name="home_end_isolation_card_text">"Kontakte i prijave ponovo aktivirati. "</string>
 
     <!-- Check-Ins: Erinnerungsoption Stunden & Minuten -->
-    <string name="reminder_option_hours_minutes">"časovi {HOURS} h minute {MINUTES}'"</string>
+    <string name="reminder_option_hours_minutes">"{HOURS} h {MINUTES}'"</string>
 
     <!-- Text, welcher im Checkin-Overview Screen erscheint, wenn der Benutzer sich in Isolation befindet. -->
     <string name="checkin_overview_isolation_text">"Ne možete ponovo da se prijavite ako imate pozitivan test."</string>

From 7a3ac1ac7e323a14210480e7000e8e452d69da62 Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Mon, 21 Jun 2021 18:35:08 +0200
Subject: [PATCH 196/207] fixed timepicker dialog colors

---
 app/src/main/res/values/app_styles.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values/app_styles.xml b/app/src/main/res/values/app_styles.xml
index 54941c7a4..f2abdd03b 100644
--- a/app/src/main/res/values/app_styles.xml
+++ b/app/src/main/res/values/app_styles.xml
@@ -57,9 +57,13 @@
 	</style>
 
 	<style name="NextStep.AlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+		<item name="android:colorPrimary">@color/colorPrimary</item>
+		<item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
 		<item name="android:colorAccent">@color/blue_main</item>
 		<item name="android:textColor">@color/dark_main</item>
 		<item name="android:textColorPrimary">@color/dark_main</item>
+		<item name="android:textColorSecondary">@color/dark_main</item>
+		<item name="android:colorControlActivated">@color/blue_main</item>
 		<item name="buttonBarPositiveButtonStyle">@style/NextStep.Button.AlertDialog</item>
 		<item name="buttonBarNegativeButtonStyle">@style/NextStep.Button.AlertDialog</item>
 		<item name="android:fontFamily">@font/inter_light</item>

From c64a20cb44838be27f2b0da47d64e1eb1160c384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 21 Jun 2021 22:20:10 +0200
Subject: [PATCH 197/207] new translations

---
 common/src/main/res/values-fr/strings.xml |  4 ++--
 common/src/main/res/values-it/strings.xml |  4 ++--
 common/src/main/res/values/strings.xml    | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index de75bea25..2d29ce5ae 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -1639,7 +1639,7 @@ Appelez :"</string>
     <string name="events_card_subtitle">"Créez un code QR SwissCovid permettant aux utilisateurs de se connecter sur place."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Souhaitez-vous vraiment supprimer le QR code?"</string>
+    <string name="delete_qr_code_dialog">"Souhaitez-vous vraiment supprimer le QR code? Les codes QR imprimés restent valides."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Auto-check-in"</string>
@@ -1731,7 +1731,7 @@ Ce titre s’affichera lors du check-in."</string>
     <string name="checkin_report_title3">"Se faire tester"</string>
     <string name="checkin_report_subtitle1">"Il est possible d’être contagieux sans le savoir. Respectez les règles d’hygiène et de conduite pour protéger votre famille, vos amis et tout votre entourage."</string>
     <string name="checkin_report_subtitle2">"Surveillez votre état de santé."</string>
-    <string name="checkin_report_subtitle3">"Faites-vous immédiatement tester si vous présentez des symptômes. Même en l’absence de symptômes il peut être utile et recommandé de se faire tester pour le coronavirus."</string>
+    <string name="checkin_report_subtitle3">"Faites-vous immédiatement tester si vous présentez des symptômes. Même en l’absence de symptômes, il peut être utile et recommandé de se faire tester pour le coronavirus si vous n'êtes pas encore complètement vacciné."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 617f3c713..f1f3cbff5 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -1645,7 +1645,7 @@ Chiama il seguente numero:"</string>
     <string name="events_card_subtitle">"Crea un codice QR SwissCovid con il quale le persone possono fare il check-in sul posto"</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Eliminare il codice QR?"</string>
+    <string name="delete_qr_code_dialog">"Eliminare il codice QR? I codici QR stampati restano validi."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Self check-in"</string>
@@ -1742,7 +1742,7 @@ Possibili luoghi d'impiego:
     <string name="checkin_report_title3">"Fai il test"</string>
     <string name="checkin_report_subtitle1">"Potresti già essere contagioso senza accorgertene. Rispetta le misure d'igiene e di protezione vigenti e proteggi la tua famiglia, i tuoi amici e il tuo ambiente."</string>
     <string name="checkin_report_subtitle2">"Sorveglia il tuo stato di salute."</string>
-    <string name="checkin_report_subtitle3">"In caso di sintomi fai subito il test. Il test è raccomandato anche in assenza di stintomi."</string>
+    <string name="checkin_report_subtitle3">"In caso di sintomi fai subito il test. Per chi non è ancora completamente vaccinato, il test è opportuno e raccomandato anche in assenza di sintomi."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 5760010ef..ce19bf2bc 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1613,7 +1613,7 @@ If so, call this number:"</string>
     <string name="remove_diary_warning_text">"Your entry will be permanently removed from the list."</string>
 
     <!-- Remove from diary warning view remove button title -->
-    <string name="remove_diary_remove_now_button">"Completely remove"</string>
+    <string name="remove_diary_remove_now_button">"Remove completely"</string>
 
     <!-- Hide from diary warning title -->
     <string name="remove_diary_warning_hide_title">"Only hide and keep receiving notifications?"</string>
@@ -1634,7 +1634,7 @@ If so, call this number:"</string>
     <string name="events_card_subtitle">"Generate a QR code that people can use to check in on site."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code?"</string>
+    <string name="delete_qr_code_dialog">"Are you sure you want to delete the QR code? Printed QR codes will remain valid."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Self check-in"</string>
@@ -1679,7 +1679,7 @@ data"</string>
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
     <string name="events_card_title">"Want to generate QR codes?"</string>
     <string name="checkin_footer_title1">"Why a check-in feature?"</string>
-    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="checkin_footer_subtitle1">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert not only close contacts, but also people who were checked in at the same location at the same time."</string>
     <string name="checkin_footer_title2">"No central data storage"</string>
     <string name="checkin_footer_subtitle2">"For the SwissCovid check-ins, you don't have to enter personal details, such as name, address or phone number, and no GPS location data is recorded. The list of check-ins is stored locally on your device. The local data is deleted after 14 days. "</string>
     <string name="events_empty_state_title">"Generate a QR code"</string>
@@ -1694,7 +1694,7 @@ Possible locations:
 – Private events
 – Club meetings or events
 – Gatherings in professional settings, e.g. meeting rooms, offices, canteens"</string>
-    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert people who were checked in at the same location at the same time, as well as close contacts."</string>
+    <string name="events_footer_subtitle2">"The SwissCovid app has been upgraded to include the check-in function without entering contact details. If you test positive, this function lets you alert not only close contacts, but also people who were checked in at the same location at the same time."</string>
 
     <!-- Subtitle vom Meldungen Card in der Liste aller Meldungen. -->
     <string name="meldung_detail_exposed_list_card_subtitle">"Risk situation"</string>
@@ -1732,7 +1732,7 @@ Protect your contacts"</string>
     <string name="checkin_report_title3">"Get tested"</string>
     <string name="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."</string>
     <string name="checkin_report_subtitle2">"Monitor your state of health."</string>
-    <string name="checkin_report_subtitle3">"If you develop symptoms, get tested immediately. Even if you don't have symptoms, a coronavirus test is advisable and recommended."</string>
+    <string name="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."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Check-in"</string>
@@ -1763,7 +1763,7 @@ Protect your contacts"</string>
     <string name="remove_diary_remove_now_title">"Or remove completely?"</string>
 
     <!-- Remove from diary warning text -->
-    <string name="remove_diary_remove_now_text">"The entry was removed completely. You can no longer be alerted."</string>
+    <string name="remove_diary_remove_now_text">"The entry will be removed completely. You will no longer be alerted."</string>
     <string name="not_thank_you_screen_text3">"Nobody will be notified."</string>
 
     <!-- Link Text zu Informationen übers Testen -->

From ccce070468073f0330a6556f400c2b35acfdc875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 21 Jun 2021 22:57:45 +0200
Subject: [PATCH 198/207] make sure the user can recover from errors on upload

---
 .../main/java/ch/admin/bag/dp3t/inform/InformFragment.kt | 9 +++++++--
 .../ch/admin/bag/dp3t/inform/InformIntroFragment.java    | 2 +-
 .../admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt   | 8 +++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
index 228c423f4..cca0b3039 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformFragment.kt
@@ -32,9 +32,14 @@ class InformFragment : TraceKeyShareBaseFragment() {
 
 	companion object {
 		private const val TAG = "InformFragment"
+		private const val ARG_BACK_ALLOWED = "ARG_BACK_ALLOWED"
 
 		@JvmStatic
-		fun newInstance() = InformFragment()
+		fun newInstance(backAllowed: Boolean): InformFragment {
+			val informFragment = InformFragment()
+			informFragment.arguments = Bundle().apply { putBoolean(ARG_BACK_ALLOWED, backAllowed) }
+			return informFragment
+		}
 	}
 
 	private lateinit var binding: FragmentInformBinding
@@ -47,7 +52,7 @@ class InformFragment : TraceKeyShareBaseFragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
 		binding = FragmentInformBinding.inflate(inflater)
 		return binding.apply {
-			(requireActivity() as InformActivity).allowBackButton(true)
+			(requireActivity() as InformActivity).allowBackButton(arguments?.getBoolean(ARG_BACK_ALLOWED) ?: true)
 			covidcodeInput.addTextChangedListener(object : ChainedEditTextListener {
 				override fun onTextChanged(input: String) {
 					val matchesRegex = input.matches(REGEX_CODE_PATTERN.toRegex())
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java b/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
index 58ad7293b..560a4dc46 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/InformIntroFragment.java
@@ -58,7 +58,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			getParentFragmentManager()
 					.beginTransaction()
 					.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
-					.replace(R.id.inform_fragment_container, InformFragment.newInstance())
+					.replace(R.id.inform_fragment_container, InformFragment.newInstance(true))
 					.addToBackStack(InformFragment.class.getCanonicalName())
 					.commit();
 		});
diff --git a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
index 7f0fa8405..ed1d8b361 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/inform/TraceKeyShareBaseFragment.kt
@@ -6,6 +6,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import ch.admin.bag.dp3t.R
+import ch.admin.bag.dp3t.extensions.showFragment
 import ch.admin.bag.dp3t.inform.models.Resource
 import ch.admin.bag.dp3t.inform.models.Status
 import ch.admin.bag.dp3t.networking.errors.InvalidCodeError
@@ -84,7 +85,12 @@ abstract class TraceKeyShareBaseFragment : Fragment() {
 	protected fun showErrorDialog(error: InformRequestError, addErrorCode: String? = null) {
 		val errorDialogBuilder = AlertDialog.Builder(requireContext(), R.style.NextStep_AlertDialogStyle)
 			.setMessage(error.errorMessage)
-			.setPositiveButton(R.string.android_button_ok) { _, _ -> }
+			.setPositiveButton(R.string.android_button_ok) { _, _ ->
+				showFragment(
+					InformFragment.newInstance(false),
+					R.id.inform_fragment_container
+				)
+			}
 		val errorCode = error.getErrorCode(addErrorCode)
 		val errorCodeView = layoutInflater.inflate(R.layout.view_dialog_error_code, view as ViewGroup?, false) as TextView
 		errorCodeView.text = errorCode

From f64f5c88c1470d416d6baae6ccd971ad933425cf Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 22 Jun 2021 11:48:44 +0200
Subject: [PATCH 199/207] Fix checkin screen time format

---
 .../admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 9ab724e31..c8002b243 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -33,7 +33,6 @@ import ch.admin.bag.dp3t.util.UiUtils
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.shawnlin.numberpicker.NumberPicker
-import java.text.SimpleDateFormat
 import java.time.Duration
 import java.util.*
 
@@ -89,7 +88,7 @@ class CheckInFragment : Fragment() {
 			}
 
 			selectedCheckinTime.observe(viewLifecycleOwner) { selectedTime ->
-				val formattedTime = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT).format(Date(selectedTime))
+				val formattedTime = StringUtil.getHourMinuteTimeString(selectedTime, ":")
 				checkinTime.text = getString(R.string.date_today) + ", " + formattedTime
 			}
 			checkinTime.setOnClickListener {
@@ -196,7 +195,8 @@ class CheckInFragment : Fragment() {
 
 	private fun invalidateCustomReminderDelayButtonLabel(isChecked: Boolean) {
 		if (isChecked) {
-			customReminderButton.text = StringUtil.getShortDurationStringWithUnits(viewModel.selectedReminderDelay, requireContext())
+			customReminderButton.text =
+				StringUtil.getShortDurationStringWithUnits(viewModel.selectedReminderDelay, requireContext())
 			customReminderButton.icon = null
 		} else {
 			customReminderButton.text = null

From 93c88300d3b93144b91d31a0f0c83d46bf1a0b09 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 22 Jun 2021 13:08:11 +0200
Subject: [PATCH 200/207] Change Covid Cert Deep Link

---
 .../admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
index c88938892..63c55060f 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/QrCodeScannerFragment.kt
@@ -39,7 +39,7 @@ import java.util.concurrent.Executors
 private const val PERMISSION_REQUEST_CAMERA = 13
 private const val MIN_ERROR_VISIBILITY = 1000L
 private const val COVID_CERT_PACKAGE_NAME = "ch.admin.bag.covidcertificate.wallet"
-private const val COVID_CERT_PLAYSTORE_DEEP_LINK = "https://play.google.com/store/apps/details?id=$COVID_CERT_PACKAGE_NAME"
+private const val COVID_CERT_PLAYSTORE_DEEP_LINK = "market://details?id=$COVID_CERT_PACKAGE_NAME"
 private const val COVID_CERT_DEEPLINK_PREFIX = "covidcert://"
 private const val COVID_CERT_QRCODE_PREFIX = "HC1:"
 

From d59b2f515dbf41b7f73370df82c170f1aa7d4b99 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 22 Jun 2021 13:58:59 +0200
Subject: [PATCH 201/207] Add Faq Button to QR-Codes Overview

---
 .../generateqrcode/EventsOverviewFragment.kt  |  9 ++++++++-
 .../checkin/generateqrcode/QrCodeAdapter.kt   | 15 +++++++++++----
 .../checkin/generateqrcode/QrCodeItems.kt     |  5 +++++
 app/src/main/res/layout/item_faq_button.xml   | 19 +++++++++++++++++++
 4 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout/item_faq_button.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
index ea84d2d4f..33052570d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/EventsOverviewFragment.kt
@@ -10,6 +10,8 @@ import ch.admin.bag.dp3t.R
 import ch.admin.bag.dp3t.databinding.FragmentEventsOverviewBinding
 import ch.admin.bag.dp3t.extensions.showFragment
 import org.crowdnotifier.android.sdk.model.VenueInfo
+import ch.admin.bag.dp3t.util.UrlUtil
+
 
 class EventsOverviewFragment : Fragment() {
 
@@ -31,18 +33,23 @@ class EventsOverviewFragment : Fragment() {
 				override fun onQrCodeClicked(qrCodeItem: VenueInfo) {
 					showFragment(QrCodeFragment.newInstance(qrCodeItem), modalAnimation = true)
 				}
+
+				override fun onFaqClicked() {
+					UrlUtil.openUrl(context, getString(R.string.faq_button_url))
+				}
 			})
 
 			qrList.adapter = adapter
 			qrCodeViewModel.generatedQrCodesLiveData.observe(viewLifecycleOwner) { events ->
 				if (events.isEmpty()) {
-					adapter.setItems(listOf(ExplanationItem(showOnlyInfobox = false), FooterItem()))
+					adapter.setItems(listOf(ExplanationItem(showOnlyInfobox = false), FooterItem(), FaqButtonItem()))
 					eventsToolbar.title = getString(R.string.checkins_create_qr_code)
 				} else {
 					adapter.setItems(events.map { EventItem(it) }.toMutableList<EventOverviewItem>().apply {
 						add(0, GenerateQrCodeButtonItem())
 						add(ExplanationItem(showOnlyInfobox = true))
 						add(FooterItem())
+						add(FaqButtonItem())
 					})
 					eventsToolbar.title = getString(R.string.events_card_title_events_not_empty)
 				}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
index f26af2a77..a0ec3dea5 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeAdapter.kt
@@ -8,12 +8,10 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EVENT
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_EXPLANATION
+import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_FAQ_BUTTON
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_FOOTER
 import ch.admin.bag.dp3t.checkin.generateqrcode.EventOverviewItem.Companion.TYPE_GENERATE_QR_CODE_BUTTON
-import ch.admin.bag.dp3t.databinding.ItemEventsExplanationBinding
-import ch.admin.bag.dp3t.databinding.ItemEventsFooterBinding
-import ch.admin.bag.dp3t.databinding.ItemGenerateQrCodeBinding
-import ch.admin.bag.dp3t.databinding.ItemQrCodeBinding
+import ch.admin.bag.dp3t.databinding.*
 import org.crowdnotifier.android.sdk.model.VenueInfo
 
 class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView.Adapter<QrCodeAdapter.QrCodeBaseViewHolder>() {
@@ -32,6 +30,7 @@ class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView
 			TYPE_EVENT -> EventViewHolder(ItemQrCodeBinding.inflate(inflater, parent, false))
 			TYPE_EXPLANATION -> ExplanationViewHolder(ItemEventsExplanationBinding.inflate(inflater, parent, false))
 			TYPE_FOOTER -> SimpleViewHolder(ItemEventsFooterBinding.inflate(inflater, parent, false))
+			TYPE_FAQ_BUTTON -> FaqViewHolder(ItemFaqButtonBinding.inflate(inflater, parent, false))
 			else -> throw IllegalArgumentException("invalid view type")
 		}
 	}
@@ -58,6 +57,13 @@ class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView
 
 	}
 
+	inner class FaqViewHolder(private val binding: ItemFaqButtonBinding) : QrCodeBaseViewHolder(binding.root) {
+		override fun bind(item: EventOverviewItem) {
+			binding.faqButton.setOnClickListener { onClickListener.onFaqClicked() }
+		}
+
+	}
+
 	inner class EventViewHolder(private val binding: ItemQrCodeBinding) : QrCodeBaseViewHolder(binding.root) {
 		override fun bind(item: EventOverviewItem) {
 			item as EventItem
@@ -90,6 +96,7 @@ class QrCodeAdapter(private val onClickListener: OnClickListener) : RecyclerView
 interface OnClickListener {
 	fun generateQrCode()
 	fun onQrCodeClicked(qrCodeItem: VenueInfo)
+	fun onFaqClicked()
 }
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
index aa5149bfa..ab2548def 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/generateqrcode/QrCodeItems.kt
@@ -8,6 +8,7 @@ abstract class EventOverviewItem {
 		const val TYPE_EXPLANATION = 1
 		const val TYPE_FOOTER = 2
 		const val TYPE_GENERATE_QR_CODE_BUTTON = 3
+		const val TYPE_FAQ_BUTTON = 4
 	}
 
 	abstract val type: Int
@@ -25,6 +26,10 @@ class FooterItem : EventOverviewItem() {
 	override val type = TYPE_FOOTER
 }
 
+class FaqButtonItem: EventOverviewItem() {
+	override val type = TYPE_FAQ_BUTTON
+}
+
 class GenerateQrCodeButtonItem : EventOverviewItem() {
 	override val type = TYPE_GENERATE_QR_CODE_BUTTON
 }
diff --git a/app/src/main/res/layout/item_faq_button.xml b/app/src/main/res/layout/item_faq_button.xml
new file mode 100644
index 000000000..f46314abd
--- /dev/null
+++ b/app/src/main/res/layout/item_faq_button.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center_horizontal"
+	android:layout_marginVertical="@dimen/spacing_very_large"
+	android:gravity="center_horizontal">
+
+	<Button
+		android:id="@+id/faq_button"
+		style="@style/NextStep.Button.Outlined"
+		android:layout_width="match_parent"
+		android:layout_marginHorizontal="@dimen/spacing_large"
+		android:layout_height="wrap_content"
+		android:drawableRight="@drawable/ic_launch_blue"
+		android:paddingStart="@dimen/padding_start_icon_button"
+		android:text="@string/faq_button_title" />
+
+</LinearLayout>
\ No newline at end of file

From f1d93a8fc0de23db81d1f9c52c5ce0eec2970b01 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 22 Jun 2021 14:05:42 +0200
Subject: [PATCH 202/207] Fix wrong string usage in Numbers-Tab Popup

---
 app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java
index a0f5cc8b6..072b3b593 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/stats/StatsFragment.java
@@ -204,7 +204,7 @@ private void setupInfoButtons() {
 					getString(R.string.stats_cases_current_description)));
 			sections.add(new StatsDetailsSection(getString(R.string.stats_cases_7day_average_label),
 					getString(R.string.stats_cases_7day_average_description)));
-			sections.add(new StatsDetailsSection(getString(R.string.stats_cases_rel_prev_week_label),
+			sections.add(new StatsDetailsSection(getString(R.string.stats_cases_rel_prev_week_popup_header),
 					getString(R.string.stats_cases_rel_prev_week_description)));
 			StatsDetailsDialogFragment fragment = StatsDetailsDialogFragment.newInstance(
 					R.color.purple_main,

From b5dc7cf8a26508ef6208958995a9ead76241c4c7 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 22 Jun 2021 14:26:00 +0200
Subject: [PATCH 203/207] Other minor UI fixes

---
 .../admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
index fdd05d49b..811bdd86c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/diary/DiaryRecyclerViewAdapter.java
@@ -148,7 +148,7 @@ public void bind(ItemVenueVisit item) {
 			nameTextView.setText(venueInfo.getTitle());
 			String start = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getCheckInTime(), ":");
 			String end = StringUtil.getHourMinuteTimeString(item.getDiaryEntry().getCheckOutTime(), ":");
-			timeTextView.setText(start + " — " + end);
+			timeTextView.setText(start + " – " + end);
 			if (item.getExposure() == null) {
 				statusIcon.setVisibility(View.GONE);
 			} else {

From b588249007490750712e2abe1df14689ed3c60ab Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 22 Jun 2021 15:26:53 +0200
Subject: [PATCH 204/207] improved custom checkout reminder option

---
 .../dp3t/checkin/checkinflow/CheckInFragment.kt | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
index 9ab724e31..057df2c5c 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
+++ b/app/src/main/java/ch/admin/bag/dp3t/checkin/checkinflow/CheckInFragment.kt
@@ -60,6 +60,7 @@ class CheckInFragment : Fragment() {
 
 	private var selectedCheckinTime = MutableLiveData(System.currentTimeMillis())
 
+	private var selectedReminderButton: MaterialButton? = null
 	private lateinit var customReminderButton: MaterialButton
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -107,10 +108,12 @@ class CheckInFragment : Fragment() {
 				reminderToggleGroup.addView(toggleButton, LinearLayout.LayoutParams(0, WRAP_CONTENT, 1f))
 				if (viewModel.selectedReminderDelay == option.delayMillis) {
 					reminderToggleGroup.check(toggleButton.id)
+					selectedReminderButton = toggleButton
 				}
-				toggleButton.addOnCheckedChangeListener { _, isChecked ->
+				toggleButton.addOnCheckedChangeListener { button, isChecked ->
 					if (isChecked) {
 						viewModel.selectedReminderDelay = option.delayMillis
+						selectedReminderButton = button
 					}
 				}
 			}
@@ -129,8 +132,9 @@ class CheckInFragment : Fragment() {
 			customReminderButton.addOnCheckedChangeListener { _, isChecked ->
 				if (isChecked) {
 					showCustomReminderDialog()
+				} else {
+					invalidateCustomReminderDelayButtonLabel(isChecked)
 				}
-				invalidateCustomReminderDelayButtonLabel(isChecked)
 			}
 
 			toolbar.setNavigationOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
@@ -164,10 +168,13 @@ class CheckInFragment : Fragment() {
 	private fun showCustomReminderDialog() {
 		BottomSheetDialog(requireContext()).apply {
 			setContentView(DialogReminderDurationBinding.inflate(layoutInflater, null, false).apply {
-				dialogCancel.setOnClickListener { dismiss() }
+				dialogCancel.setOnClickListener {
+					cancel()
+				}
 				dialogDone.setOnClickListener {
 					viewModel.selectedReminderDelay =
 						Duration.ofHours(dialogHourPicker.value.toLong()).plusMinutes(dialogMinutePicker.value.toLong()).toMillis()
+					selectedReminderButton = customReminderButton
 					invalidateCustomReminderDelayButtonLabel(true)
 					dismiss()
 				}
@@ -190,6 +197,10 @@ class CheckInFragment : Fragment() {
 					value = (viewModel.selectedReminderDelay / 1000L / 60L % 60L).toInt()
 				}
 			}.root)
+			setOnCancelListener {
+				// select previous option
+				selectedReminderButton?.isChecked = true
+			}
 			show()
 		}
 	}

From e836013c1da4c5dde231ffed9501c9cb173bdaaa Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@ubique.ch>
Date: Tue, 22 Jun 2021 13:38:30 +0200
Subject: [PATCH 205/207] Remove CE Block from Impressum and Onboarding

---
 .../main/assets/impressum/bs/impressum.html   | 27 -----------
 .../main/assets/impressum/de/impressum.html   | 27 -----------
 .../main/assets/impressum/en/impressum.html   | 27 -----------
 .../main/assets/impressum/es/impressum.html   | 27 -----------
 .../main/assets/impressum/fr/impressum.html   | 27 -----------
 .../main/assets/impressum/hr/impressum.html   | 27 -----------
 .../assets/impressum/img/ce-marking-dark.svg  |  5 --
 .../main/assets/impressum/img/ce-marking.svg  |  5 --
 .../img/manufacturer-iso-icon-dark.svg        |  3 --
 .../impressum/img/manufacturer-iso-icon.svg   |  3 --
 .../main/assets/impressum/it/impressum.html   | 27 -----------
 .../main/assets/impressum/pt/impressum.html   | 27 -----------
 .../main/assets/impressum/rm/impressum.html   | 27 -----------
 .../main/assets/impressum/sq/impressum.html   | 27 -----------
 .../main/assets/impressum/sr/impressum.html   | 27 -----------
 .../main/assets/impressum/ti/impressum.html   | 27 -----------
 .../main/assets/impressum/tr/impressum.html   | 27 -----------
 .../OnboardingDisclaimerFragment.java         | 12 -----
 .../ch/admin/bag/dp3t/util/AssetUtil.java     |  4 --
 .../layout/fragment_onboarding_disclaimer.xml | 48 -------------------
 20 files changed, 431 deletions(-)
 delete mode 100644 app/src/main/assets/impressum/img/ce-marking-dark.svg
 delete mode 100644 app/src/main/assets/impressum/img/ce-marking.svg
 delete mode 100644 app/src/main/assets/impressum/img/manufacturer-iso-icon-dark.svg
 delete mode 100644 app/src/main/assets/impressum/img/manufacturer-iso-icon.svg

diff --git a/app/src/main/assets/impressum/bs/impressum.html b/app/src/main/assets/impressum/bs/impressum.html
index 25d8899cc..877ba8633 100644
--- a/app/src/main/assets/impressum/bs/impressum.html
+++ b/app/src/main/assets/impressum/bs/impressum.html
@@ -105,33 +105,6 @@ <h1>Licence i zasluge</h1>
         <p><strong>Upozorenje: Ova aplikacija vas ne štiti od infekcije virusom COVID-19.</strong></p>
         <p>Ova aplikacija je namenjena za praćenje kontakata i za upozoravanje korisnika o mogućem kontaktu sa osobama koje su inficirane virusom COVID-19. Ona nije dijagnostička alatka. Pažljivo pročitajte uputstva na svakom ekranu aplikacije.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/de/impressum.html b/app/src/main/assets/impressum/de/impressum.html
index d12831f43..5d6e51069 100644
--- a/app/src/main/assets/impressum/de/impressum.html
+++ b/app/src/main/assets/impressum/de/impressum.html
@@ -105,33 +105,6 @@ <h1>Lizenzen &amp; Credits</h1>
         <p><strong>Warnung: Diese App schützt Sie nicht vor einer COVID-19-Infektion.</strong></p>
         <p>Die App dient dem Proximity Tracing und zur Warnung der Benutzer vor einer möglichen Ansteckung nach einer Begegnung mit einer mit COVID-19 infizierten Person. Es ist auch kein diagnostisches Werkzeug. Bitte lesen Sie die Anweisungen, die in jedem App-Screen enthalten sind, sorgfältig durch.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/en/impressum.html b/app/src/main/assets/impressum/en/impressum.html
index 817d40af3..d77237831 100644
--- a/app/src/main/assets/impressum/en/impressum.html
+++ b/app/src/main/assets/impressum/en/impressum.html
@@ -105,33 +105,6 @@ <h1>Licences &amp; credits</h1>
         <p><strong>Warning: This app does not protect you from COVID-19 infection.</strong></p>
         <p>The app is intended for proximity tracing and to warn users of potential exposure to someone infected by COVID-19. It is not a diagnostic tool either. Please read the instructions provided in each app screen carefully.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/es/impressum.html b/app/src/main/assets/impressum/es/impressum.html
index 5d7dd8017..c9ed9ec10 100644
--- a/app/src/main/assets/impressum/es/impressum.html
+++ b/app/src/main/assets/impressum/es/impressum.html
@@ -105,33 +105,6 @@ <h1>Licencias y créditos</h1>
         <p><strong>Advertencia: Esta aplicación no le protege de una infección con COVID-19.</strong></p>
         <p>La aplicación está pensada para el rastreo de proximidad y para advertir a los usuarios de un posible riesgo de exposición a una persona contagiada con el COVID-19. No se trata de un instrumento de diagnóstico. Lea cuidadosamente las instrucciones dadas en todas las pantallas.  </p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/fr/impressum.html b/app/src/main/assets/impressum/fr/impressum.html
index 8dda0886c..8078e6097 100644
--- a/app/src/main/assets/impressum/fr/impressum.html
+++ b/app/src/main/assets/impressum/fr/impressum.html
@@ -105,33 +105,6 @@ <h1>Licences et crédits</h1>
         <p><strong>Avertissement : cette application ne vous protège pas contre une infection par le COVID-19.</strong></p>
         <p>L&#39;application est destinée au traçage de proximité et à avertir les utilisateurs d&#39;un contact potentiel avec une personne infectée par le COVID-19. Il ne s&#39;agit pas non plus d&#39;un outil de diagnostic. Veuillez lire attentivement les instructions qui apparaissent dans chaque fenêtre de l&#39;application.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/hr/impressum.html b/app/src/main/assets/impressum/hr/impressum.html
index 1c8725cee..53761194a 100644
--- a/app/src/main/assets/impressum/hr/impressum.html
+++ b/app/src/main/assets/impressum/hr/impressum.html
@@ -105,33 +105,6 @@ <h1>Licence i zasluge</h1>
         <p><strong>Upozorenje: Ova aplikacija vas ne štiti od infekcije virusom COVID-19.</strong></p>
         <p>Ova aplikacija je namenjena za praćenje kontakata i za upozoravanje korisnika o mogućem kontaktu sa osobama koje su inficirane virusom COVID-19. Ona nije dijagnostička alatka. Pažljivo pročitajte uputstva na svakom ekranu aplikacije.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/img/ce-marking-dark.svg b/app/src/main/assets/impressum/img/ce-marking-dark.svg
deleted file mode 100644
index 1a17bc62b..000000000
--- a/app/src/main/assets/impressum/img/ce-marking-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="23" viewBox="0 0 32 23">
-    <g>
-        <path fill="#ffffff" d="M12.764.053c-.27-.024-.544-.039-.818-.05C5.497-.142.15 4.888.003 11.238c-.147 6.35 4.962 11.614 11.41 11.759.53.012 1.06-.011 1.587-.068l-.038-3.488c-3.052.475-6.115-.788-7.913-3.263-1.798-2.475-2.023-5.737-.581-8.428C5.91 5.059 8.77 3.4 11.86 3.463c.315.006.629.031.94.076L12.765.053zM30.522 19.537c-3.71-.093-6.895-2.621-7.764-6.164l6.79.02V9.697l-6.826-.021c.875-3.711 4.287-6.306 8.165-6.21.314.006.628.031.939.074L31.798.051c-.271-.024-.544-.04-.822-.048-4.183-.093-8.1 2.013-10.272 5.524-2.174 3.51-2.274 7.893-.264 11.496 2.01 3.604 5.825 5.88 10.008 5.973.512.013 1.024-.006 1.534-.057L32 19.445c-.489.075-.983.106-1.478.092z"/>
-    </g>
-</svg>
diff --git a/app/src/main/assets/impressum/img/ce-marking.svg b/app/src/main/assets/impressum/img/ce-marking.svg
deleted file mode 100644
index 5bc450e68..000000000
--- a/app/src/main/assets/impressum/img/ce-marking.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="23" viewBox="0 0 32 23">
-    <g>
-        <path d="M12.764.053c-.27-.024-.544-.039-.818-.05C5.497-.142.15 4.888.003 11.238c-.147 6.35 4.962 11.614 11.41 11.759.53.012 1.06-.011 1.587-.068l-.038-3.488c-3.052.475-6.115-.788-7.913-3.263-1.798-2.475-2.023-5.737-.581-8.428C5.91 5.059 8.77 3.4 11.86 3.463c.315.006.629.031.94.076L12.765.053zM30.522 19.537c-3.71-.093-6.895-2.621-7.764-6.164l6.79.02V9.697l-6.826-.021c.875-3.711 4.287-6.306 8.165-6.21.314.006.628.031.939.074L31.798.051c-.271-.024-.544-.04-.822-.048-4.183-.093-8.1 2.013-10.272 5.524-2.174 3.51-2.274 7.893-.264 11.496 2.01 3.604 5.825 5.88 10.008 5.973.512.013 1.024-.006 1.534-.057L32 19.445c-.489.075-.983.106-1.478.092z"/>
-    </g>
-</svg>
diff --git a/app/src/main/assets/impressum/img/manufacturer-iso-icon-dark.svg b/app/src/main/assets/impressum/img/manufacturer-iso-icon-dark.svg
deleted file mode 100644
index 2b19bca26..000000000
--- a/app/src/main/assets/impressum/img/manufacturer-iso-icon-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="46" height="35" viewBox="0 0 46 35">
-    <path fill="#ffffff" d="M0 35L0 18.161 5.001 11.46 10.986 19.217 17.211 11.46 23.313 19.217 29.292 11.46 35.27 19.217 35.27 0 46 0 46 35z"/>
-</svg>
diff --git a/app/src/main/assets/impressum/img/manufacturer-iso-icon.svg b/app/src/main/assets/impressum/img/manufacturer-iso-icon.svg
deleted file mode 100644
index 9faffa655..000000000
--- a/app/src/main/assets/impressum/img/manufacturer-iso-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="46" height="35" viewBox="0 0 46 35">
-    <path d="M0 35L0 18.161 5.001 11.46 10.986 19.217 17.211 11.46 23.313 19.217 29.292 11.46 35.27 19.217 35.27 0 46 0 46 35z"/>
-</svg>
diff --git a/app/src/main/assets/impressum/it/impressum.html b/app/src/main/assets/impressum/it/impressum.html
index cc51e45eb..45b918ce1 100644
--- a/app/src/main/assets/impressum/it/impressum.html
+++ b/app/src/main/assets/impressum/it/impressum.html
@@ -105,33 +105,6 @@ <h1>Licenze e riconoscimenti</h1>
         <p><strong>Attenzione: questa app non ti protegge dalla COVID-19.</strong></p>
         <p>Questa app serve per il tracciamento di prossimità e per avvertire gli utenti che sono stati potenzialmente esposti a una persona infetta da COVID-19. Non è nemmeno uno strumento diagnostico. Leggi attentamente le istruzioni fornite da ciascuna schermata dell&#39;app.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/pt/impressum.html b/app/src/main/assets/impressum/pt/impressum.html
index 19af8bba4..b1082f4a3 100644
--- a/app/src/main/assets/impressum/pt/impressum.html
+++ b/app/src/main/assets/impressum/pt/impressum.html
@@ -105,33 +105,6 @@ <h1>Licenças e créditos</h1>
         <p><strong>Aviso: Esta app não o protege de uma infeção com COVID-19.</strong></p>
         <p>A app destina-se a rastrear contactos e advertir os utilizadores de um possível contacto com uma pessoa infetada com COVID-19. Também não se trata de uma ferramenta de diagnóstico. Leia cuidadosamente as instruções apresentadas em todos os ecrãs da app.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/rm/impressum.html b/app/src/main/assets/impressum/rm/impressum.html
index d8472f231..8a188dcd3 100644
--- a/app/src/main/assets/impressum/rm/impressum.html
+++ b/app/src/main/assets/impressum/rm/impressum.html
@@ -105,33 +105,6 @@ <h1>Licenzas &amp; credits</h1>
         <p><strong>Avertiment: Quest&#39;app n&#39;As protegia betg d&#39;ina infecziun cun COVID-19.</strong></p>
         <p>L&#39;app è concepida per la reconstrucziun dals contacts e per avertir ils utilisaders en cas d&#39;ina exposiziun potenziala ad ina persuna infectada cun COVID-19. Ella n&#39;è betg in instrument diagnostic. Per plaschair legi cun attenziun  las instrucziuns en mintga visur da l&#39;app.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/sq/impressum.html b/app/src/main/assets/impressum/sq/impressum.html
index 8d4b1596b..8425bfc5c 100644
--- a/app/src/main/assets/impressum/sq/impressum.html
+++ b/app/src/main/assets/impressum/sq/impressum.html
@@ -105,33 +105,6 @@ <h1>Licencat dhe mirënjohjet</h1>
         <p><strong>Paralajmërim: Ky aplikacion nuk ju mbron nga infektimi me COVID 19.</strong></p>
         <p>Aplikacioni shërben për gjurmimin Proximity dhe për paralajmërimin e përdoruesit nga një infektim i mundshëm pas një kontakti me një person të infektuar me COVID 19. Gjithashtu nuk është mjet diagnostikues. Lexoni me kujdes udhëzimet, të cilat janë në çdo ekran të aplikacionit.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/sr/impressum.html b/app/src/main/assets/impressum/sr/impressum.html
index 830e1b170..c2cf11a48 100644
--- a/app/src/main/assets/impressum/sr/impressum.html
+++ b/app/src/main/assets/impressum/sr/impressum.html
@@ -105,33 +105,6 @@ <h1>Licence i zasluge</h1>
         <p><strong>Upozorenje: Ova aplikacija vas ne štiti od infekcije virusom COVID-19.</strong></p>
         <p>Ova aplikacija je namenjena za praćenje kontakata i za upozoravanje korisnika o mogućem kontaktu sa osobama koje su inficirane virusom COVID-19. Ona nije dijagnostička alatka. Pažljivo pročitajte uputstva na svakom ekranu aplikacije.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/ti/impressum.html b/app/src/main/assets/impressum/ti/impressum.html
index b01d249a4..d16a6aef4 100644
--- a/app/src/main/assets/impressum/ti/impressum.html
+++ b/app/src/main/assets/impressum/ti/impressum.html
@@ -105,33 +105,6 @@ <h1>ሕጋዊ ፍቓድ &amp; ኣበርክቶ</h1>
         <p><strong>መጠንቀቕታ:-  እዚ ኣፕ ካብ ሕማም ኮቪድ-19 ኣይከላኸለልኩምን እዩ። </strong></p>
         <p>እቲ ኣፕ ንምክትታል ምቅርራብን የገልግል።  ከምኡውን ንተጠቀምቲ ኣፕ ካብ ተኽእሎ ምልካፍ ብሕማም ድሕሪ ምስ ብኮቪድ-19 ዝሓመመ ሰብ ምርኻቦም  የጠንቅቖም። ናይ ነጸርታ መሳርሒ ውን ኣይኮነን። ኣብ ነፍስወከፍ ስክሪን ናይ ኣፕ ዝርከቡ መምርሒታት ብግቡእ ኣንብቦብዎም።</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/assets/impressum/tr/impressum.html b/app/src/main/assets/impressum/tr/impressum.html
index 4f63388ca..dbf9b6e8b 100644
--- a/app/src/main/assets/impressum/tr/impressum.html
+++ b/app/src/main/assets/impressum/tr/impressum.html
@@ -105,33 +105,6 @@ <h1>Lisanslar &amp; Krediler</h1>
         <p><strong>Uyarı: Bu uygulama sizi KOVİD-19 enfeksiyonundan korumaz.</strong></p>
         <p>Uygulama, yakınlığı izlemek ve kullanıcıları KOVİD-19 ile enfekte olmuş bir kişiyle karşılaştıktan sonra olası bir enfeksiyona karşı uyarmak için kullanılır. Aynı zamanda bir teşhis aracı değildir. Lütfen uygulama ekranında bulunan talimatları dikkatlice okuyun.</p>
     </div>
-    <div class="flexbox">
-        <div class="gray-box">
-            <picture>
-                <source srcset="../img/manufacturer-iso-icon-dark.svg" media="(prefers-color-scheme: dark)">
-                <img src="../img/manufacturer-iso-icon.svg" class="iso-icon" alt="">
-            </picture>
-        </div>
-        <div class="gray-box stretch">
-            <p>Bundesamt für Gesundheit BAG</p>
-            <p>Schwarzenburgstrasse 157</p>
-            <p>3097 Liebefeld, Switzerland</p>
-        </div>
-    </div>
-    <div class="gray-box">
-        <div class="flexbox">
-            <div class="stretch">
-                <p>SwissCovid App Version {APPVERSION}</p>
-                <p>Release Date: {RELEASEDATE}</p>
-            </div>
-            <div>
-                <picture>
-                    <source srcset="../img/ce-marking-dark.svg" media="(prefers-color-scheme: dark)">
-                    <img src="../img/ce-marking.svg" class="ce-icon" alt="CE marking">
-                </picture>
-            </div>
-        </div>
-    </div>
     <div class="build">{BUILD}</div>
 </footer>
 </body>
diff --git a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingDisclaimerFragment.java b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingDisclaimerFragment.java
index 56c0c1e28..7fa55855d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingDisclaimerFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/onboarding/OnboardingDisclaimerFragment.java
@@ -20,11 +20,6 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import ch.admin.bag.dp3t.BuildConfig;
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.util.AssetUtil;
 import ch.admin.bag.dp3t.util.UlTagHandler;
@@ -44,13 +39,6 @@ public OnboardingDisclaimerFragment() {
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 
-		SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy", Locale.ENGLISH);
-		sdf.setTimeZone(TimeZone.getTimeZone("Europe/Zurich"));
-		String versionText = getString(R.string.onboarding_disclaimer_app_version) + " " + BuildConfig.VERSION_NAME + "\n" +
-				getString(R.string.onboarding_disclaimer_release_version) + " " + sdf.format(BuildConfig.BUILD_TIME);
-		TextView versionInfo = view.findViewById(R.id.onboarding_disclaimer_version_info);
-		versionInfo.setText(versionText);
-
 		TextView termsOfUseTextview = view.findViewById(R.id.terms_of_use_textview);
 		TextView dataProtectionTextView = view.findViewById(R.id.data_protection_textview);
 		termsOfUseTextview.setText(Html.fromHtml(AssetUtil.getTermsOfUse(getContext()), null, new UlTagHandler()));
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java b/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java
index 1c2383cc0..27e7cef53 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/AssetUtil.java
@@ -34,8 +34,6 @@ public class AssetUtil {
 	private static final String FILE_NAME_IMPRESSUM = "impressum.html";
 
 	private static final String REPLACE_STRING_VERSION = "{VERSION}";
-	private static final String REPLACE_STRING_APPVERSION = "{APPVERSION}";
-	private static final String REPLACE_STRING_RELEASEDATE = "{RELEASEDATE}";
 	private static final String REPLACE_STRING_BUILDNR = "{BUILD}";
 
 	public static String getImpressumBaseUrl(Context context) {
@@ -97,10 +95,8 @@ public static String loadImpressumHtmlFile(Context context, String filename) {
 							.append(" / ")
 							.append(BuildConfig.FLAVOR);
 			impressum = impressum.replace(REPLACE_STRING_VERSION, versionString);
-			impressum = impressum.replace(REPLACE_STRING_APPVERSION, BuildConfig.VERSION_NAME);
 			SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
 			sdf.setTimeZone(TimeZone.getTimeZone("Europe/Zurich"));
-			impressum = impressum.replace(REPLACE_STRING_RELEASEDATE, sdf.format(BuildConfig.BUILD_TIME));
 			impressum = impressum.replace(REPLACE_STRING_BUILDNR, buildString);
 			return impressum;
 		} catch (IOException e) {
diff --git a/app/src/main/res/layout/fragment_onboarding_disclaimer.xml b/app/src/main/res/layout/fragment_onboarding_disclaimer.xml
index 15b08da86..8ba7b1719 100644
--- a/app/src/main/res/layout/fragment_onboarding_disclaimer.xml
+++ b/app/src/main/res/layout/fragment_onboarding_disclaimer.xml
@@ -267,54 +267,6 @@
 
 			</LinearLayout>
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:paddingLeft="@dimen/spacing_small"
-				android:paddingRight="@dimen/spacing_small"
-				android:paddingBottom="@dimen/spacing_tiny_small">
-
-				<ImageView
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:background="@color/grey_light_medium"
-					android:padding="@dimen/spacing_small"
-					android:src="@drawable/ic_manufacturer_iso_icon" />
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="@dimen/spacing_tiny_small"
-					android:background="@color/grey_light_medium"
-					android:padding="@dimen/spacing_small"
-					android:text="@string/onboarding_disclaimer_manufacturer" />
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:paddingLeft="@dimen/spacing_small"
-				android:paddingRight="@dimen/spacing_small"
-				android:paddingBottom="@dimen/spacing_tiny_small">
-
-				<TextView
-					android:id="@+id/onboarding_disclaimer_version_info"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:background="@color/grey_light_medium"
-					android:padding="@dimen/spacing_small" />
-
-				<ImageView
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:background="@color/grey_light_medium"
-					android:paddingRight="@dimen/spacing_medium_large"
-					android:src="@drawable/ic_ce_marking" />
-
-			</LinearLayout>
-
 		</LinearLayout>
 	</ScrollView>
 

From a4a2c90b4c62bb1425c291b64a81fc3fcd563f5a Mon Sep 17 00:00:00 2001
From: Florian Buenzli <buenzli@ubique.ch>
Date: Tue, 22 Jun 2021 17:03:55 +0200
Subject: [PATCH 206/207] updated translations

---
 common/src/main/res/values-fr/strings.xml | 8 ++++----
 common/src/main/res/values-rm/strings.xml | 4 ++--
 common/src/main/res/values-sq/strings.xml | 2 +-
 common/src/main/res/values/strings.xml    | 7 +++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 2d29ce5ae..621a0d73c 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -1681,7 +1681,7 @@ Appelez :"</string>
     <string name="home_end_isolation_card_title">"Fin de l’isolement ?"</string>
 
     <!-- Titel auf der Card, welche zum Screen führt, wo man eigene QR Codes erstellen kann. -->
-    <string name="events_card_title">"Vous souhaitez créer un code QR ?"</string>
+    <string name="events_card_title">"Souhaitez-vous créer un code QR?"</string>
     <string name="checkin_footer_title1">"À quoi sert la fonction de check-in?"</string>
     <string name="checkin_footer_subtitle1">"La fonction de check-in sans enregistrement des coordonnées complète l’application SwissCovid. En cas de test positif, elle vous permet d’avertir non seulement vos proches, mais aussi les personnes qui étaient présentes au même endroit au même moment."</string>
     <string name="checkin_footer_title2">"Pas de sauvegarde centralisée des données"</string>
@@ -1777,7 +1777,7 @@ Ce titre s’affichera lors du check-in."</string>
     <!-- Info URL for testing -->
     <!-- Fuzzy -->
     <string name="test_info_url">"https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/testen.html"</string>
-    <string name="checkout_too_long_alert_text">"Cette connextion dure au maximum {DURATION}. Veuillez revérifier les informations saisies."</string>
+    <string name="checkout_too_long_alert_text">"Cette connexion dure au maximum {DURATION}. Veuillez revérifier les informations saisies."</string>
 
     <!-- turn camera light on -->
     <string name="accessibility_camera_light_on">"Allumer la lampe de poche"</string>
@@ -1792,13 +1792,13 @@ Ce titre s’affichera lors du check-in."</string>
     <string name="events_card_title_events_not_empty">"Mes codes QR"</string>
 
     <!-- Popup Beschreibung wenn beim Checkout oder Editieren von CheckIns die Checkin-Zeit nach der Checkout-Zeit liegt -->
-    <string name="checkout_inverse_time_alert_description">"L'heure de déconnextion est antérieure à l'heure de connexion. Veuillez vérifier les informations saisies."</string>
+    <string name="checkout_inverse_time_alert_description">"L'heure de déconnexion est antérieure à l'heure de connexion. Veuillez vérifier les informations saisies."</string>
 
     <!-- Titel für die Notification die SwissCovid 2.0 ankündigt -->
     <string name="update_notification_checkin_feature_title">"Nouvelle fonction : connexion"</string>
 
     <!-- Text für die Notification die SwissCovid 2.0 ankündigt -->
-    <string name="update_notification_checkin_feature_text">"Merci d'utiliser SwissCovid. La dernière version de l'application vous permet de vous connecter sur place sans devoir laisser de données."</string>
+    <string name="update_notification_checkin_feature_text">"Merci d'utiliser SwissCovid. La dernière version de l'application vous permet de vous connecter sur place de façon anonyme."</string>
 
     <!-- Titel für aktuellen Check-in im Tagebuch -->
     <string name="diary_current_title">"Actuellement"</string>
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
index eb15bf047..a06284fcb 100644
--- a/common/src/main/res/values-rm/strings.xml
+++ b/common/src/main/res/values-rm/strings.xml
@@ -1609,7 +1609,7 @@ Alura telefonai qua:"</string>
     <string name="events_card_subtitle">"Creai in code QR, cun il qual persunas pon sa registrar al lieu."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
-    <string name="delete_qr_code_dialog">"Vulais Vus propi stizzar il code QR?"</string>
+    <string name="delete_qr_code_dialog">"Vulais Vus propi stizzar il code QR? Ils codes QR stampads restan vinavant valaivels."</string>
 
     <!-- Self-Check-In Button Titel im QR-Code Screen -->
     <string name="self_checkin_button_title">"Autoregistraziun"</string>
@@ -1705,7 +1705,7 @@ Quai pon esser p.ex.:
     <string name="checkin_report_title3">"Laschar far in test"</string>
     <string name="checkin_report_subtitle1">"Vus pudais gia esser infectusa u infectus senza badar quai. Observai las mesiras d'igiena e da protecziun vertentas e protegi Vossa famiglia, Vossas amias e Voss amis sco er Voss conturn."</string>
     <string name="checkin_report_subtitle2">"Survegliai Voss stadi da sanadad."</string>
-    <string name="checkin_report_subtitle3">"Faschai immediatamain in test, sche Vus avais sintoms. In test dal coronavirus è raschunaivel e vegn cusseglià, er sche Vus n'avais nagins sintoms."</string>
+    <string name="checkin_report_subtitle3">"Faschai immediatamain in test, sche Vus avais sintoms. In test dal coronavirus è raschunaivel e vegn cusseglià, er sche Vus n'avais nagins sintoms e sche Vus n'essas anc betg vaccinada u vaccinà cumplettamain."</string>
 
     <!-- Titel von CheckIn Meldungen Screen. -->
     <string name="meldung_detail_checkin_title">"Registraziun"</string>
diff --git a/common/src/main/res/values-sq/strings.xml b/common/src/main/res/values-sq/strings.xml
index 9f962b83e..b1814b968 100644
--- a/common/src/main/res/values-sq/strings.xml
+++ b/common/src/main/res/values-sq/strings.xml
@@ -1609,7 +1609,7 @@ Atëherë na telefononi këtu:"</string>
     <string name="checkin_overview_isolation_text">"Ju nuk mund të kontrolloheni më, sepse keni dalë pozitiv në test."</string>
 
     <!-- Veranstaltungen-Card Text im Infotab -->
-    <string name="events_card_subtitle">"Krijoni një kod QR përSwissCovid, me të cilin mund të kontrolloni personat në vend."</string>
+    <string name="events_card_subtitle">"Krijoni një kod QR për SwissCovid, me të cilin mund të kontrolloni personat në vend."</string>
 
     <!-- Dialog Text beim Löschen eines erstellten QR Codes. -->
     <string name="delete_qr_code_dialog">"Dëshironi vërtet ta fshini kodin QR? Kodet e printuara QR mbeten gjithsesi të vlefshme."</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index ce19bf2bc..2304f7b59 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -95,7 +95,7 @@ Thank you for helping to break the chain of infection."</string>
     <string name="meldungen_no_meldungen_title">"No reports"</string>
 
     <!-- Push deaktiviert Titel -->
-    <string name="push_deactivated_title">"Messages deactivated"</string>
+    <string name="push_deactivated_title">"Notifications deactivated"</string>
 
     <!-- Push deaktiviert Text -->
     <string name="push_deactivated_text">"Change the settings to receive information directly in the event of a report."</string>
@@ -1600,7 +1600,7 @@ If so, call this number:"</string>
     <string name="inform_share_checkins_subtitle">"If you share check-in entries, the app can notify people who were checked in at the same location and time."</string>
 
     <!-- Button text, um alle Checkins zu selektieren -->
-    <string name="inform_share_checkins_select_all">"Select all suitable??"</string>
+    <string name="inform_share_checkins_select_all">"Select all suitable"</string>
     <string name="inform_dont_send_button_title">"Don't send"</string>
     <string name="inform_dont_share_button_title">"Don't share"</string>
     <string name="inform_really_not_share_title">"Are you sure you don't want to share?"</string>
@@ -1726,8 +1726,7 @@ Possible locations:
     <!-- Check-Ins: QR-Code erstellen subtitel -->
     <string name="checkins_create_qr_code_subtitle">"Enter a title that describes the location or your event in more detail. This title will be displayed on check-in."</string>
     <string name="checkin_report_heading">"What can you do?"</string>
-    <string name="checkin_report_title1">"
-Protect your contacts"</string>
+    <string name="checkin_report_title1">"Protect your contacts"</string>
     <string name="checkin_report_title2">"Look out for symptoms"</string>
     <string name="checkin_report_title3">"Get tested"</string>
     <string name="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."</string>

From a0ab877f9f12c881fb07e102e199ca133f58aa21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Wed, 23 Jun 2021 08:56:01 +0200
Subject: [PATCH 207/207] use release version of sdks

---
 app/build.gradle    | 2 +-
 common/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b310849cb..2ff71f802 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,7 +154,7 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 	implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
-	def dp3t_sdk_version = '2.3.0-dev-10'
+	def dp3t_sdk_version = '2.3.0'
 	devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
 	abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
 	prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
diff --git a/common/build.gradle b/common/build.gradle
index bdde20e99..5834ebb95 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 	implementation 'com.google.protobuf:protobuf-lite:3.0.1'
-	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0.0-dev-18'
+	api 'org.crowdnotifier:crowdnotifier-sdk-android:4.0.0'
 	api 'com.google.android.gms:play-services-instantapps:17.0.0'
 
 }
\ No newline at end of file