diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
index a572c8d0efb35a675a40549100c5ff419d2abf99..a0278cf0be4357544ec41100f71490aed5685499 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
@@ -2,6 +2,7 @@ package de.rki.coronawarnapp.contactdiary.ui.onboarding
import android.os.Bundle
import android.view.View
+import android.view.accessibility.AccessibilityEvent
import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
@@ -31,7 +32,7 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin
vm.onNextButtonClick()
}
- contactDiaryOnboardingHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ toolbar.setNavigationOnClickListener {
vm.onBackButtonPress()
}
@@ -68,4 +69,9 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin
fun onboardingComplete() {
settings.isOnboarded.update { true }
}
+
+ override fun onResume() {
+ super.onResume()
+ binding.contentContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
+ }
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
index 21a608d5d0a1ecea628872564718107418bba099..318e441cf2294cede6f37e4d438af3853fd0425f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
@@ -2,6 +2,7 @@ package de.rki.coronawarnapp.contactdiary.ui.overview
import android.os.Bundle
import android.view.View
+import android.view.accessibility.AccessibilityEvent
import androidx.core.app.ShareCompat
import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
@@ -34,7 +35,7 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr
binding.apply {
contactDiaryOverviewRecyclerview.adapter = adapter
- contactDiaryOverviewHeader.contactDiaryHeaderButtonBack.buttonIcon.setOnClickListener {
+ toolbar.setNavigationOnClickListener {
vm.onBackButtonPress()
}
}
@@ -62,6 +63,11 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr
}
}
+ override fun onResume() {
+ super.onResume()
+ binding.contentContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
+ }
+
private fun exportLocationsAndPersons(exportString: String) {
Timber.d("exportLocationsAndPersons(exportString=$exportString)")
activity?.let { activity ->
@@ -79,10 +85,6 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr
}
private fun setupToolbar() {
-
- binding.contactDiaryOverviewHeader.contactDiaryHeaderOptionsMenu.buttonIcon.apply {
- contentDescription = getString(R.string.button_menu)
- setOnClickListener { contactDiaryOverviewMenu.showMenuFor(it) }
- }
+ contactDiaryOverviewMenu.setupMenu(binding.toolbar)
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt
index e2f3d0b2bd72c7b86bba303b86e86e5569a97a75..f4f6607ea102ac94ccfa9eed012ddf26535cd12b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt
@@ -1,8 +1,6 @@
package de.rki.coronawarnapp.contactdiary.ui.overview
-import android.content.Context
-import android.view.View
-import android.widget.PopupMenu
+import androidx.appcompat.widget.Toolbar
import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
import de.rki.coronawarnapp.R
@@ -14,14 +12,14 @@ import javax.inject.Inject
class ContactDiaryOverviewMenu @Inject constructor(
private val contactDiaryOverviewFragment: ContactDiaryOverviewFragment
) {
- private val context: Context = contactDiaryOverviewFragment.requireContext()
+
private val navController: NavController
get() = contactDiaryOverviewFragment.findNavController()
private val vm: ContactDiaryOverviewViewModel by contactDiaryOverviewFragment.cwaViewModels {
contactDiaryOverviewFragment.viewModelFactory }
- // TODO(Move this to ContactDiaryOverviewFragment)
- fun showMenuFor(view: View) = PopupMenu(context, view).apply {
- inflate(R.menu.menu_contact_diary_overview)
+
+ fun setupMenu(toolbar: Toolbar) = toolbar.apply {
+ inflateMenu(R.menu.menu_contact_diary_overview)
setOnMenuItemClickListener {
when (it.itemId) {
R.id.menu_contact_diary_information -> {
@@ -48,5 +46,5 @@ class ContactDiaryOverviewMenu @Inject constructor(
else -> contactDiaryOverviewFragment.onOptionsItemSelected(it)
}
}
- }.show()
+ }
}
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
index 96e4f21e5261cb0ba0104aa0dda0229a7cfd3171..86f18b40f376b7b7f9549cbce8de5d4ab66e677f 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
@@ -6,19 +6,17 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:contentDescription="@string/settings_title"
android:focusable="true">
<androidx.appcompat.widget.Toolbar
android:id="@+id/contact_diary_day_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:background="@drawable/contact_diary_background"
android:elevation="@dimen/elevation_weak"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:navigationIcon="@drawable/ic_back"
+ style="@style/CWAToolbar.BackArrow"
tools:title="Mittwoch, 23.12.2020" />
<com.google.android.material.tabs.TabLayout
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
index 70d299eca27a57ead804135e6dca1fb5aaf3c145..676b33aaded966c25aa479e9a6965550a44cf224 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
@@ -11,11 +11,10 @@
android:id="@+id/toolbar"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:background="@drawable/contact_diary_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:navigationIcon="@drawable/ic_close"
+ style="@style/CWAToolbar.Close"
app:title="@string/contact_diary_edit_locations_title" />
<androidx.constraintlayout.widget.Group
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
index b3886248af9a5d2c528d9ba1cb1f573137de2fbe..b555a066468164c4527eef398461de1f13bae006 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
@@ -11,11 +11,10 @@
android:id="@+id/toolbar"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:background="@drawable/contact_diary_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:navigationIcon="@drawable/ic_close"
+ style="@style/CWAToolbar.Close"
app:title="@string/contact_diary_edit_persons_title" />
<androidx.constraintlayout.widget.Group
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
index 0646bfc712fec4faf3c48b806dfe3e6b591df843..d06d551e6daec476cb364715d444af84e5805cd0 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
@@ -5,20 +5,21 @@
xmlns:tools="http://schemas.android.com/tools">
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/contact_diary_onboarding_background">
+ android:background="@drawable/contact_diary_onboarding_background"
+ android:focusable="true">
- <include
- android:id="@+id/contact_diary_onboarding_header"
- layout="@layout/include_header"
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- app:icon="@{@drawable/ic_close}"
+ style="@style/CWAToolbar.Close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:title="@{@string/contact_diary_title}" />
+ app:title="@string/contact_diary_title" />
<ScrollView
android:layout_width="@dimen/match_constraint"
@@ -27,7 +28,7 @@
app:layout_constraintBottom_toTopOf="@id/contact_diary_onboarding_next_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/contact_diary_onboarding_header">
+ app:layout_constraintTop_toBottomOf="@id/toolbar">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -74,7 +75,7 @@
<include
android:id="@+id/contact_diary_onboarding_first_section"
- layout="@layout/include_contact_diary_onboarding_row"
+ layout="@layout/contact_diary_onboarding_row"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -87,7 +88,7 @@
<include
android:id="@+id/contact_diary_onboarding_second_section"
- layout="@layout/include_contact_diary_onboarding_row"
+ layout="@layout/contact_diary_onboarding_row"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -100,7 +101,7 @@
<include
android:id="@+id/contact_diary_onboarding_third_section"
- layout="@layout/include_contact_diary_onboarding_row"
+ layout="@layout/contact_diary_onboarding_row"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -113,7 +114,7 @@
<include
android:id="@+id/contact_diary_onboarding_fourth_section"
- layout="@layout/include_contact_diary_onboarding_row"
+ layout="@layout/contact_diary_onboarding_row"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -126,7 +127,7 @@
<include
android:id="@+id/contact_diary_onboarding_fifth_section"
- layout="@layout/include_contact_diary_onboarding_row"
+ layout="@layout/contact_diary_onboarding_row"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -139,7 +140,7 @@
<include
android:id="@+id/contact_diary_onboarding_privacy_card"
- layout="@layout/include_contact_diary_privacy_card"
+ layout="@layout/contact_diary_privacy_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/guideline_card"
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_diary_onboarding_row.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_row.xml
similarity index 100%
rename from Corona-Warn-App/src/main/res/layout/include_contact_diary_onboarding_row.xml
rename to Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_row.xml
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
index 6501048b32973886d95c41742103a4ae1b0fe495..2a4ff782c3c9699fb9ec4d4c872dce3790e70af0 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
@@ -4,19 +4,22 @@
xmlns:tools="http://schemas.android.com/tools">
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/content_container"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:contentDescription="@string/contact_diary_overview_title">
- <include
- android:id="@+id/contact_diary_overview_header"
- layout="@layout/include_contact_diary_overview_header"
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- app:icon="@{@drawable/ic_back}"
+ android:background="@color/colorBackground"
+ app:popupTheme="@style/CWAToolbar.Menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:title="@{@string/contact_diary_overview_header}" />
+ app:title="@string/contact_diary_overview_header"
+ style="@style/CWAToolbar.BackArrow"/>
<TextView
android:id="@+id/onboarding_headline"
@@ -24,15 +27,13 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
- android:accessibilityHeading="true"
android:focusable="true"
android:text="@string/contact_diary_overview_title"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
- app:layout_constraintTop_toBottomOf="@+id/contact_diary_overview_header"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar"
tools:text="Kontakt-Tagebuch" />
-
<TextView
android:id="@+id/contact_diary_overview_subtitle"
style="@style/subtitleMedium"
@@ -46,7 +47,6 @@
app:layout_constraintTop_toBottomOf="@+id/onboarding_headline"
tools:text="Tragen Sie ein, mit wem Sie sich getroffen haben und wo Sie gewesen sind." />
-
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contact_diary_overview_recyclerview"
android:layout_width="@dimen/match_constraint"
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_diary_privacy_card.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_privacy_card.xml
similarity index 100%
rename from Corona-Warn-App/src/main/res/layout/include_contact_diary_privacy_card.xml
rename to Corona-Warn-App/src/main/res/layout/contact_diary_privacy_card.xml
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_diary_header.xml b/Corona-Warn-App/src/main/res/layout/include_contact_diary_header.xml
deleted file mode 100644
index 57692ef4bad594b5f9c28305892a8939f8c63a6c..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/res/layout/include_contact_diary_header.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-
- <data>
-
- <variable
- name="icon"
- type="android.graphics.drawable.Drawable" />
-
- <variable
- name="title"
- type="String" />
- </data>
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/header_main"
- android:paddingTop="@dimen/spacing_tiny"
- android:background="@drawable/contact_diary_background"
- android:paddingBottom="@dimen/spacing_tiny">
-
- <include
- android:id="@+id/header_button_back"
- layout="@layout/include_button_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:icon="@{icon}"
- app:iconDescription="@{@string/accessibility_back}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="@id/guideline_back"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/header_title"
- style="@style/headline6"
- android:accessibilityHeading="true"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/guideline_body_title"
- android:text="@{title}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="@string/settings_title" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_start"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_start" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_end"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_end="@dimen/guideline_end" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_back"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_back" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_header.xml b/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_header.xml
deleted file mode 100644
index b748919f8a2531540eb11e4d78e5fb951636f267..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_header.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-
- <data>
-
- <variable
- name="icon"
- type="android.graphics.drawable.Drawable" />
-
- <variable
- name="title"
- type="String" />
- </data>
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/header_main"
- android:id="@+id/contact_diary_header"
- android:paddingTop="@dimen/spacing_tiny"
- android:paddingBottom="@dimen/spacing_tiny">
-
- <include
- android:id="@+id/contact_diary_header_button_back"
- layout="@layout/include_button_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:icon="@{icon}"
- app:iconDescription="@{@string/accessibility_back}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="@id/guideline_back"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/contact_diary_header_title"
- style="@style/headline6"
- android:layout_width="@dimen/match_constraint"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/guideline_body_title"
- android:accessibilityHeading="true"
- android:text="@{title}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/contact_diary_header_options_menu"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="@string/settings_title" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_start"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_start" />
-
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_back"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_back" />
-
- <include
- android:id="@+id/contact_diary_header_options_menu"
- layout="@layout/include_button_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/spacing_small"
- android:focusable="true"
- app:icon="@{@drawable/ic_main_settings}"
- app:iconDescription="@{@string/button_menu}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
index 52d155bb37cdcc1e113f0f795856f0f7f5343980..e87b2c52adbe648d0eb24deae7345ab22cc320c8 100644
--- a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
@@ -60,7 +60,7 @@
<!-- XTXT: Subtitle for contact diary overview screen -->
<string name="contact_diary_overview_subtitle">"Write down the people you have met and places you have visited."</string>
<!-- XTXT: Header for contact diary overview screen -->
- <string name="contact_diary_overview_header">"Start Page"</string>
+ <string name="contact_diary_overview_header">Start Page</string>
<!-- XTXT: content description of contact journal image on home screen -->
<string name="contact_diary_homescreen_card_image_content_description">"A closed book with a bookmark"</string>
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index 0215fd02e959da28ba1d5552f75c8fefda004b14..07955e84cc3dea96049bd7a9a1ffee7b16a9a8e9 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -66,6 +66,16 @@
<item name="android:tint">@color/colorTextPrimary1</item>
</style>
+ <style name="CWAToolbar.BackArrow">
+ <item name="navigationIcon">@drawable/ic_back</item>
+ <item name="navigationContentDescription">@string/accessibility_back</item>
+ </style>
+
+ <style name="CWAToolbar.Close">
+ <item name="navigationIcon">@drawable/ic_close</item>
+ <item name="navigationContentDescription">@string/accessibility_close</item>
+ </style>
+
<!-- Default dialog -->
<style name="dialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<item name="buttonBarPositiveButtonStyle">@style/dialogPositiveButtonStyle</item>