From 6c118de41fd4de6bb85fa97bf670af9b07ceaaf2 Mon Sep 17 00:00:00 2001
From: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Date: Sun, 7 Jun 2020 16:21:11 +0200
Subject: [PATCH] Feature: Toolbar (#254)
* replaced custom header with toolbar
* removed fadingScrollView
* toolbar
* excluded translation from lint for dev
* main header
* fixed id
* icon fix
* added navigation to risk details
---
.../information/InformationAboutFragment.kt | 2 +-
.../information/InformationContactFragment.kt | 2 +-
.../ui/information/InformationFragment.kt | 2 +-
.../information/InformationLegalFragment.kt | 2 +-
.../information/InformationPrivacyFragment.kt | 2 +-
.../InformationTechnicalFragment.kt | 2 +-
.../information/InformationTermsFragment.kt | 2 +-
.../ui/main/MainOverviewFragment.kt | 2 +-
.../ui/main/MainShareFragment.kt | 2 +-
.../ui/riskdetails/RiskDetailsFragment.kt | 2 +-
.../ui/settings/SettingsFragment.kt | 2 +-
.../settings/SettingsNotificationFragment.kt | 2 +-
.../ui/settings/SettingsResetFragment.kt | 2 +-
.../ui/settings/SettingsTracingFragment.kt | 2 +-
.../submission/SubmissionContactFragment.kt | 2 +-
.../SubmissionDispatcherFragment.kt | 2 +-
.../ui/submission/SubmissionDoneFragment.kt | 2 +-
.../ui/submission/SubmissionIntroFragment.kt | 2 +-
...ssionResultPositiveOtherWarningFragment.kt | 2 +-
.../ui/submission/SubmissionTanFragment.kt | 2 +-
.../SubmissionTestResultFragment.kt | 2 +-
.../util/formatter/FormatterRiskHelper.kt | 8 +--
.../src/main/res/drawable/ic_close_dark.xml | 12 ++++
.../src/main/res/drawable/ic_close_light.xml | 12 ++++
.../main/res/layout/fragment_information.xml | 1 -
.../res/layout/fragment_information_about.xml | 1 -
.../layout/fragment_information_contact.xml | 1 -
.../res/layout/fragment_information_legal.xml | 1 -
.../layout/fragment_information_privacy.xml | 1 -
.../layout/fragment_information_technical.xml | 1 -
.../res/layout/fragment_information_terms.xml | 1 -
.../src/main/res/layout/fragment_main.xml | 37 +++++------
.../res/layout/fragment_main_overview.xml | 1 -
.../main/res/layout/fragment_main_share.xml | 1 -
.../main/res/layout/fragment_risk_details.xml | 26 +++++++-
.../src/main/res/layout/fragment_settings.xml | 1 -
.../fragment_settings_notifications.xml | 1 -
.../res/layout/fragment_settings_reset.xml | 1 -
.../res/layout/fragment_settings_tracing.xml | 1 -
.../src/main/res/layout/include_header.xml | 64 ++++++-------------
.../main/res/layout/include_onboarding.xml | 1 -
.../src/main/res/layout/include_risk_card.xml | 28 ++++----
.../res/layout/include_risk_card_header.xml | 27 +-------
.../res/layout/include_submission_contact.xml | 1 -
.../res/layout/include_submission_intro.xml | 1 -
...lude_submission_positive_other_warning.xml | 1 -
.../layout/include_submission_test_result.xml | 1 -
.../src/main/res/values/dimens.xml | 6 +-
.../src/main/res/values/strings.xml | 2 +
.../src/main/res/values/styles.xml | 8 +--
50 files changed, 133 insertions(+), 157 deletions(-)
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_close_dark.xml
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_close_light.xml
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt
index 95a418227..4fb3f4ea0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt
@@ -39,7 +39,7 @@ class InformationAboutFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.informationAboutHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationAboutHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt
index 88f37c5fd..595fb2df0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt
@@ -41,7 +41,7 @@ class InformationContactFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.informationContactHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationContactHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
binding.informationContactNavigationRowPhone.navigationRow.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt
index 80e7e541c..8e44bce61 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt
@@ -74,7 +74,7 @@ class InformationFragment : BaseFragment() {
InformationFragmentDirections.actionInformationFragmentToInformationTechnicalFragment()
)
}
- binding.informationHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt
index 16abadd8c..298e5275c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt
@@ -39,7 +39,7 @@ class InformationLegalFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.informationLegalHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationLegalHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt
index b3ab39e4c..75e3d7483 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt
@@ -39,7 +39,7 @@ class InformationPrivacyFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.informationPrivacyHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationPrivacyHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt
index 9ce43c29f..d28274e6a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt
@@ -39,7 +39,7 @@ class InformationTechnicalFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.informationTechnicalHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationTechnicalHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt
index 8189f1240..1a9674741 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt
@@ -39,7 +39,7 @@ class InformationTermsFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.informationTermsHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.informationTermsHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt
index 40502e586..28b9c00ba 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt
@@ -43,7 +43,7 @@ class MainOverviewFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.mainOverviewHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.mainOverviewHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt
index 8ba1bb2e6..d8cad38c4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt
@@ -51,7 +51,7 @@ class MainShareFragment : BaseFragment() {
binding.mainShareButton.setOnClickListener {
ShareHelper.shareText(this, getString(R.string.main_share_message), null)
}
- binding.mainShareHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.mainShareHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt
index 893a95287..3c753af57 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt
@@ -71,7 +71,7 @@ class RiskDetailsFragment : BaseFragment() {
RiskDetailsFragmentDirections.actionRiskDetailsFragmentToSettingsTracingFragment()
)
}
- binding.riskDetailsRiskCard.riskCardHeader.riskCardHeaderButtonBack.setOnClickListener {
+ binding.riskDetailsToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt
index f7aab9c19..4f5c8b560 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt
@@ -63,7 +63,7 @@ class SettingsFragment : BaseFragment() {
val tracingRow = binding.settingsTracing.settingsRow
val notificationRow = binding.settingsNotifications.settingsRow
val resetRow = binding.settingsReset
- val goBack = binding.settingsHeader.headerButtonBack.buttonIcon
+ val goBack = binding.settingsHeader.headerToolbar
resetRow.setOnClickListener {
doNavigate(
SettingsFragmentDirections.actionSettingsFragmentToSettingsResetFragment()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
index 2344f7009..862b943ef 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
@@ -68,7 +68,7 @@ class SettingsNotificationFragment : Fragment() {
// Settings
val settingsRow = binding.settingsNavigationRowSystem.navigationRow
val goBack =
- binding.settingsNotificationsHeader.headerButtonBack.buttonIcon
+ binding.settingsNotificationsHeader.headerToolbar
// Update Risk
updateRiskNotificationSwitch.setOnCheckedChangeListener { _, _ ->
// android calls this listener also on start, so it has to be verified if the user pressed the switch
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
index 4e8397913..13e05292e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
@@ -55,7 +55,7 @@ class SettingsResetFragment : BaseFragment() {
binding.settingsResetButtonCancel.setOnClickListener {
(activity as MainActivity).goBack()
}
- binding.settingsResetHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.settingsResetHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt
index bde273bd1..0eb9d83e9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt
@@ -108,7 +108,7 @@ class SettingsTracingFragment : BaseFragment(),
}
}
}
- binding.settingsTracingHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.settingsTracingHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
binding.settingsTracingStatusBluetooth.tracingStatusCardButton.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt
index 0d1693898..27886c702 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt
@@ -39,7 +39,7 @@ class SubmissionContactFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.submissionContactHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.submissionContactHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
binding.submissionContactButtonCall.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
index 4178eea3b..73bf2aa35 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
@@ -40,7 +40,7 @@ class SubmissionDispatcherFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.submissionDispatcherHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.submissionDispatcherHeader.headerToolbar.setNavigationOnClickListener {
(activity as MainActivity).goBack()
}
binding.submissionDispatcherQr.dispatcherCard.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt
index 330c86d79..60c9300d9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt
@@ -36,7 +36,7 @@ class SubmissionDoneFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.submissionDoneHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.submissionDoneHeader.headerToolbar.setNavigationOnClickListener {
doNavigate(
SubmissionDoneFragmentDirections.actionSubmissionDoneFragmentToMainFragment()
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt
index 219457cb2..0dc26e99b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt
@@ -36,7 +36,7 @@ class SubmissionIntroFragment : BaseFragment() {
}
private fun setButtonOnClickListener() {
- binding.submissionIntroHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.submissionIntroHeader.headerToolbar.setNavigationOnClickListener {
doNavigate(SubmissionIntroFragmentDirections.actionSubmissionIntroFragmentToMainFragment())
}
binding.submissionIntroButtonNext.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt
index 028722347..401edf152 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt
@@ -148,7 +148,7 @@ class SubmissionResultPositiveOtherWarningFragment : BaseFragment(),
binding.submissionPositiveOtherWarningButtonNext.setOnClickListener {
initiateWarningOthers()
}
- binding.submissionPositiveOtherWarningHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.submissionPositiveOtherWarningHeader.headerToolbar.setNavigationOnClickListener {
navigateToSubmissionResultFragment()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
index 628771094..7a6036caa 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
@@ -95,7 +95,7 @@ class SubmissionTanFragment : BaseFragment() {
binding.submissionTanInput.listener = { tan -> viewModel.tan.value = tan }
binding.submissionTanButtonEnter.setOnClickListener { storeTanAndContinue() }
- binding.submissionTanHeader.headerButtonBack.buttonIcon.setOnClickListener { navigateToDispatchScreen() }
+ binding.submissionTanHeader.headerToolbar.setNavigationOnClickListener { navigateToDispatchScreen() }
submissionViewModel.registrationState.observeEvent(viewLifecycleOwner, {
if (ApiRequestState.SUCCESS == it) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt
index 3037b5b61..ca4d2d67f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt
@@ -134,7 +134,7 @@ class SubmissionTestResultFragment : BaseFragment() {
)
}
- binding.submissionTestResultHeader.headerButtonBack.buttonIcon.setOnClickListener {
+ binding.submissionTestResultHeader.headerToolbar.setNavigationOnClickListener {
doNavigate(
SubmissionTestResultFragmentDirections.actionSubmissionResultFragmentToMainFragment()
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
index 743c2af94..9b0914336 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
@@ -352,12 +352,12 @@ fun formatStableIconColor(riskLevelScore: Int?): Int =
* @param riskLevelScore
* @return
*/
-fun formatStableBackButtonColor(riskLevelScore: Int?): ColorStateList? {
+fun formatStableBackButtonIcon(riskLevelScore: Int?): Drawable? {
val appContext = CoronaWarnApplication.getAppContext()
- return if (!isTracingOffRiskLevel(riskLevelScore)) {
- appContext.getColorStateList(R.color.button_back)
+ return if (isTracingOffRiskLevel(riskLevelScore)) {
+ appContext.getDrawable(R.drawable.ic_close_dark)
} else {
- appContext.getColorStateList(R.color.button_back_stable)
+ appContext.getDrawable(R.drawable.ic_close_light)
}
}
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_close_dark.xml b/Corona-Warn-App/src/main/res/drawable/ic_close_dark.xml
new file mode 100644
index 000000000..6b3c8307a
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_close_dark.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:fillColor="#000000"
+ android:fillType="nonZero"
+ android:pathData="M14.2843,13l-1.2843,1.2843l5.7157,5.7157l-5.7157,5.7157l1.2843,1.2843l5.7157,-5.7157l5.7157,5.7157l1.2843,-1.2843l-5.7157,-5.7157l5.7157,-5.7157l-1.2843,-1.2843l-5.7157,5.7157z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_close_light.xml b/Corona-Warn-App/src/main/res/drawable/ic_close_light.xml
new file mode 100644
index 000000000..a0fd695b6
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_close_light.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M14.2843,13l-1.2843,1.2843l5.7157,5.7157l-5.7157,5.7157l1.2843,1.2843l5.7157,-5.7157l5.7157,5.7157l1.2843,-1.2843l-5.7157,-5.7157l5.7157,-5.7157l-1.2843,-1.2843l-5.7157,5.7157z"
+ android:strokeWidth="1"
+ android:strokeColor="#00FFFFFF" />
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information.xml b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
index da08ae6e6..2d53533aa 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
@@ -25,7 +25,6 @@
app:title="@{@string/information_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
index 4cbf10f9e..84ccd0944 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
@@ -19,7 +19,6 @@
app:title="@{@string/information_about_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
index c11640c3c..4af0b82da 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
@@ -19,7 +19,6 @@
app:title="@{@string/information_contact_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
index 80b58e39d..8cfe965dd 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
@@ -26,7 +26,6 @@
app:title="@{@string/information_legal_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml
index 056e50cc3..32ab4e322 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml
@@ -26,7 +26,6 @@
app:title="@{@string/information_privacy_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
index 19c059272..d0a5668bd 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
@@ -26,7 +26,6 @@
app:title="@{@string/information_technical_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_terms.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_terms.xml
index 4fdffed28..214347b3d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_terms.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_terms.xml
@@ -19,7 +19,6 @@
app:title="@{@string/information_terms_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main.xml b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
index eaa120b82..1e6f77490 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
@@ -34,20 +34,18 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/main_header"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/header"
+ android:layout_margin="@dimen/spacing_small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/guideline_top">
+ app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/main_header_logo"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/guideline_start"
android:importantForAccessibility="no"
- android:paddingTop="@dimen/spacing_tiny"
- android:paddingBottom="@dimen/spacing_tiny"
android:scaleType="fitStart"
android:src="@drawable/ic_main_header"
app:layout_constraintBottom_toBottomOf="parent"
@@ -60,7 +58,6 @@
layout="@layout/include_button_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/spacing_small"
app:icon="@{@drawable/ic_main_share}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/main_header_options_menu"
@@ -71,7 +68,6 @@
layout="@layout/include_button_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/guideline_back"
app:icon="@{@drawable/ic_main_settings}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -82,9 +78,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/main_tracing"
style="@style/buttonTracing"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -93,11 +88,10 @@
<TextView
android:id="@+id/main_tracing_headline"
style="@style/bodyButton"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@{FormatterSettingsHelper.formatTracingDescription(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -117,9 +111,9 @@
<include
android:id="@+id/main_tracing_divider"
layout="@layout/include_divider"
- android:layout_width="0dp"
- android:layout_height="@dimen/card_divider"
- app:layout_constraintEnd_toStartOf="parent"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_tracing" />
@@ -128,7 +122,7 @@
layout="@layout/include_risk_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:visibility="@{FormatterSubmissionHelper.formatShowRiskStatusCard(submissionViewModel.deviceUiState)}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
@@ -140,7 +134,7 @@
<include
android:id="@+id/main_test_positive"
layout="@layout/include_submission_status_card_positive"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:visibility="@{FormatterSubmissionHelper.formatShowSubmissionStatusPositiveCard(submissionViewModel.deviceUiState)}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
@@ -186,8 +180,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
- app:constraint_referenced_ids="main_test, main_test_done, main_test_positive, main_risk"
- />
+ app:constraint_referenced_ids="main_test, main_test_done, main_test_positive, main_risk" />
<include
android:id="@+id/main_about"
@@ -211,28 +204,28 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_start" />
+ app:layout_constraintGuide_begin="@dimen/spacing_small" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
+ app:layout_constraintGuide_end="@dimen/spacing_small" />
<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" />
+ app:layout_constraintGuide_end="@dimen/spacing_small" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- app:layout_constraintGuide_begin="@dimen/guideline_top" />
+ app:layout_constraintGuide_begin="@dimen/spacing_small" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
index ea311e025..7bbf40dd2 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
@@ -19,7 +19,6 @@
app:title="@{@string/main_overview_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml b/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml
index caa6b91e1..762f9f74c 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml
@@ -27,7 +27,6 @@
app:title="@{@string/main_share_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
index 72b5d8ce5..3e5f3ad20 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
@@ -24,8 +24,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/risk_details_app_bar_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="@style/AppTheme.AppBarOverlay"
+ app:elevation="0dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/risk_details_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="@{FormatterRiskHelper.formatRiskShape(true)}"
+ android:backgroundTint="@{FormatterRiskHelper.formatRiskColor(tracingViewModel.riskLevel)}"
+ app:navigationIcon="@{FormatterRiskHelper.formatStableBackButtonIcon(tracingViewModel.riskLevel)}"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:title="@string/risk_details_title"
+ app:titleTextColor="@{FormatterRiskHelper.formatStableTextColor(tracingViewModel.riskLevel)}" />
+
+ </com.google.android.material.appbar.AppBarLayout>
+
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/spacing_normal"
@@ -33,7 +55,7 @@
app:layout_constraintBottom_toTopOf="@+id/risk_details_button_enable_tracing"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toBottomOf="@+id/risk_details_app_bar_layout">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
index 6810f17bb..f2deb4cc8 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
@@ -33,7 +33,6 @@
app:title="@{@string/settings_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
index 7f7b1d630..c0fac9104 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
@@ -30,7 +30,6 @@
app:title="@{@string/settings_notifications_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml
index b0ed452fa..70c2a7be4 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml
@@ -19,7 +19,6 @@
app:title="@{@string/settings_reset_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
index 7d2d230a8..abc951602 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
@@ -35,7 +35,6 @@
app:title="@{@string/settings_tracing_title}" />
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
diff --git a/Corona-Warn-App/src/main/res/layout/include_header.xml b/Corona-Warn-App/src/main/res/layout/include_header.xml
index 6e9a9fe87..d831a38b7 100644
--- a/Corona-Warn-App/src/main/res/layout/include_header.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_header.xml
@@ -1,7 +1,6 @@
<?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">
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
@@ -18,48 +17,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include
- android:id="@+id/header_button_back"
- layout="@layout/include_button_icon"
- android:layout_width="wrap_content"
+ <com.google.android.material.appbar.AppBarLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:icon="@{icon}"
- app:layout_constraintBottom_toBottomOf="@id/header_title"
- app:layout_constraintStart_toStartOf="@id/guideline_back"
- app:layout_constraintTop_toTopOf="@id/header_title" />
-
- <TextView
- android:id="@+id/header_title"
- style="@style/headline6"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/guideline_body_title"
- android:text="@{title}"
+ android:theme="@style/AppTheme.AppBarOverlay"
+ android:background="@color/colorSemanticHighRisk"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintTop_toTopOf="@id/guideline_top"
- 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" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_top"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_begin="@dimen/guideline_top" />
-
+ app:elevation="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/header_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="@color/colorBackground"
+ app:navigationIcon="@{icon}"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:title="@{title}"
+ app:titleTextColor="@color/colorTextPrimary1" />
+
+
+ </com.google.android.material.appbar.AppBarLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
index 4da20ae85..065e9dc6c 100644
--- a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
@@ -33,7 +33,6 @@
</data>
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
index 4155aa9fa..5eabb5178 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
@@ -32,7 +32,7 @@
<include
android:id="@+id/risk_card_header"
layout="@layout/include_risk_card_header"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
<!-- Loading State -->
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:visibility="@{FormatterHelper.formatVisibility(tracingViewModel.isRefreshing)}"
@@ -64,7 +64,7 @@
<TextView
style="@style/subtitle"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
android:text="@string/risk_card_loading_body"
@@ -87,7 +87,7 @@
<TextView
android:id="@+id/risk_card_body"
style="@style/subtitle"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@{FormatterRiskHelper.formatRiskBody(tracingViewModel.riskLevel)}"
@@ -101,7 +101,7 @@
<include
android:id="@+id/risk_card_row_saved_risk"
layout="@layout/include_risk_card_row"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatRiskSavedRisk(tracingViewModel.riskLevel, tracingViewModel.riskLevelScoreLastSuccessfulCalculated))}"
@@ -116,7 +116,7 @@
<include
android:id="@+id/risk_card_row_contact"
layout="@layout/include_risk_card_row"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatRiskContact(tracingViewModel.riskLevel, tracingViewModel.matchedKeyCount))}"
@@ -130,7 +130,7 @@
<include
android:id="@+id/risk_card_row_contact_last"
layout="@layout/include_risk_card_row"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatRiskContactLast(tracingViewModel.riskLevel, tracingViewModel.daysSinceLastExposure))}"
@@ -179,7 +179,7 @@
<TextView
android:id="@+id/risk_card_row_saved_days_body"
style="@style/subtitle"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
android:text="@{FormatterRiskHelper.formatRiskActiveTracingDaysInRetentionPeriod(tracingViewModel.riskLevel, showDetails, tracingViewModel.activeTracingDaysInRetentionPeriod)}"
@@ -194,7 +194,7 @@
<include
android:id="@+id/risk_card_row_time_fetched"
layout="@layout/include_risk_card_row"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatTimeFetched(tracingViewModel.riskLevel, tracingViewModel.riskLevelScoreLastSuccessfulCalculated, tracingViewModel.lastTimeDiagnosisKeysFetched))}"
@@ -208,7 +208,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/risk_card_next_update"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatNextUpdate(tracingViewModel.riskLevel, settingsViewModel.isBackgroundJobEnabled()))}"
@@ -219,7 +219,7 @@
<include
android:id="@+id/risk_card_next_update_divider"
layout="@layout/include_divider"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -227,7 +227,7 @@
<TextView
style="@style/body2"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@{FormatterRiskHelper.formatNextUpdate(tracingViewModel.riskLevel, settingsViewModel.isBackgroundJobEnabled())}"
@@ -241,7 +241,7 @@
<Button
android:id="@+id/risk_card_button_enable_tracing"
style="@style/buttonPrimary"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/risk_details_button_enable_tracing"
@@ -253,7 +253,7 @@
<Button
android:id="@+id/risk_card_button_update"
style="@style/buttonLight"
- android:layout_width="0dp"
+ android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:enabled="@{FormatterRiskHelper.formatButtonUpdateEnabled(settingsViewModel.isManualKeyRetrievalEnabled())}"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
index ee0b7536a..4b625854d 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
@@ -23,31 +23,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/risk_card_header_button_back"
- style="@style/buttonIcon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/spacing_small"
- android:backgroundTint="@{FormatterRiskHelper.formatStableBackButtonColor(tracingViewModel.riskLevel)}"
- android:visibility="@{FormatterRiskHelper.formatRiskButtonBackVisibility(showDetails)}"
- app:layout_constraintBottom_toTopOf="@+id/risk_card_header_headline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <ImageView
- android:layout_width="@dimen/icon_size_button"
- android:layout_height="@dimen/icon_size_button"
- android:contentDescription="@string/lorem_ipsum"
- android:src="@drawable/ic_close"
- android:tint="@{FormatterRiskHelper.formatStableIconColor(tracingViewModel.riskLevel)}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
<TextView
android:id="@+id/risk_card_header_headline"
style="@style/headline5"
@@ -59,7 +34,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/risk_card_header_icon"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/risk_card_header_button_back" />
+ app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/risk_card_header_icon"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
index 6173a8279..504cd1c50 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml b/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
index 3b015e2c1..06ae9ec33 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
index 9faffe421..7e71f6d2a 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml b/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
index f28092392..b08af9be3 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
@@ -13,7 +13,6 @@
<ScrollView
- style="@style/fadingScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml
index b7a0fb655..9bb11cf83 100644
--- a/Corona-Warn-App/src/main/res/values/dimens.xml
+++ b/Corona-Warn-App/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
<dimen name="spacing_large">48dp</dimen>
<dimen name="spacing_normal">24dp</dimen>
<dimen name="spacing_small">16dp</dimen>
- <dimen name="spacing_tiny">6dp</dimen>
+ <dimen name="spacing_tiny">8dp</dimen>
<dimen name="spacing_mega_tiny">3dp</dimen>
<!-- font sizes -->
@@ -19,7 +19,7 @@
<dimen name="font_line_spacing_extra">4sp</dimen>
<!-- header height -->
- <dimen name="header">50dp</dimen>
+ <dimen name="header">40dp</dimen>
<!-- elevation -->
<dimen name="elevation_strong">10dp</dimen>
@@ -54,7 +54,7 @@
<dimen name="radius_button">@dimen/spacing_tiny</dimen>
<dimen name="radius_card">4dp</dimen>
<dimen name="icon_size">20dp</dimen>
- <dimen name="icon_size_risk_card">35dp</dimen>
+ <dimen name="icon_size_risk_card">40dp</dimen>
<dimen name="icon_size_main_card">35dp</dimen>
<dimen name="icon_size_main_card_end">35dp</dimen>
<dimen name="icon_size_button">40dp</dimen>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 229669dc8..070c1c2b3 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -290,6 +290,8 @@
Risk Details
###################################### -->
+ <!-- XHED: risk details - page title, in toolbar -->
+ <string name="risk_details_title">Ihr Risikostatus</string>
<!-- XHED: risk details - headline, how a user should act -->
<string name="risk_details_headline_behavior">Verhalten</string>
<!-- XHED: risk details - multiline headline, bold, how to act correct -->
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index 44d3f74cc..263640fb3 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -65,10 +65,10 @@
<item name="android:textColor">@color/colorTextPrimary1</item>
<item name="android:background">@drawable/rectangle</item>
<item name="android:backgroundTint">@color/button_main_tracing</item>
- <item name="android:paddingStart">@dimen/button_padding_start_end</item>
- <item name="android:paddingTop">@dimen/button_padding_top_bottom</item>
- <item name="android:paddingEnd">@dimen/button_padding_start_end</item>
- <item name="android:paddingBottom">@dimen/button_padding_top_bottom</item>
+ <item name="android:paddingStart">@dimen/spacing_small</item>
+ <item name="android:paddingTop">@dimen/spacing_tiny</item>
+ <item name="android:paddingEnd">@dimen/spacing_small</item>
+ <item name="android:paddingBottom">@dimen/spacing_tiny</item>
</style>
<style name="switchBase" parent="@style/Widget.AppCompat.CompoundButton.Switch">
--
GitLab