From baa3e1300dd22cd139cc8c3f656e289e21f6f9f0 Mon Sep 17 00:00:00 2001 From: harambasicluka <64483219+harambasicluka@users.noreply.github.com> Date: Thu, 4 Jun 2020 19:38:13 +0200 Subject: [PATCH 01/24] Feature: Illustration strings for a18y (#171) * settings polish and added final strings * added illustration descriptions --- .../util/formatter/FormatterSettingsHelper.kt | 41 ++++++++++++++++- .../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 + .../res/layout/fragment_main_overview.xml | 1 + .../main/res/layout/fragment_main_share.xml | 1 + .../main/res/layout/fragment_onboarding.xml | 1 + .../fragment_onboarding_notifications.xml | 1 + .../layout/fragment_onboarding_privacy.xml | 1 + .../res/layout/fragment_onboarding_test.xml | 1 + .../layout/fragment_onboarding_tracing.xml | 1 + .../fragment_settings_notifications.xml | 4 +- .../res/layout/fragment_settings_reset.xml | 4 +- .../res/layout/fragment_settings_tracing.xml | 1 + .../layout/include_information_details.xml | 6 ++- .../main/res/layout/include_onboarding.xml | 6 ++- .../src/main/res/values/strings.xml | 44 ++++++++++++++++++- 20 files changed, 111 insertions(+), 8 deletions(-) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt index aff12f2ac96..9194931d5c1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt @@ -105,7 +105,6 @@ fun formatNotificationsDescription(notifications: Boolean): String = formatText( /** * Formats the tracing body depending on the tracing status and the days since last exposure. * - * @param tracing * @param activeTracingDaysInRetentionPeriod * @return String */ @@ -117,6 +116,46 @@ fun formatTracingStatusBody(activeTracingDaysInRetentionPeriod: Long): String { return resources.getQuantityString(R.plurals.settings_tracing_status_body_active, days, days) } +/** + * Formats the settings notifications details illustration description depending on notifications status + * + * @param notifications + * @return + */ +fun formatNotificationIllustrationText(notifications: Boolean): String = + formatText( + notifications, + R.string.settings_notifications_illustration_description_active, + R.string.settings_notifications_illustration_description_inactive + ) + +/** + * Format the settings tracing content description for the header illustration + * + * @param tracing + * @param bluetooth + * @param connection + * @return String + */ +fun formatTracingIllustrationText( + tracing: Boolean, + bluetooth: Boolean, + connection: Boolean +): String { + val appContext = CoronaWarnApplication.getAppContext() + return when (tracingStatusHelper(tracing, bluetooth, connection)) { + TracingStatusHelper.CONNECTION -> + appContext.getString(R.string.settings_tracing_connection_illustration_description_inactive) + TracingStatusHelper.BLUETOOTH -> + appContext.getString(R.string.settings_tracing_bluetooth_illustration_description_inactive) + TracingStatusHelper.TRACING_ACTIVE -> + appContext.getString(R.string.settings_tracing_illustration_description_active) + TracingStatusHelper.TRACING_INACTIVE -> + appContext.getString(R.string.settings_tracing_illustration_description_inactive) + else -> "" + } +} + /*Styler*/ /** * Formats the settings icon color depending on flag provided 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 155009e579b..707b00daa06 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 @@ -39,6 +39,7 @@ android:layout_height="wrap_content" app:headline="@{@string/information_about_headline}" app:illustration="@{@drawable/ic_information_illustration_about}" + app:illustrationDescription="@{@string/information_about_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 54f23216215..8e84d3badd7 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 @@ -40,6 +40,7 @@ app:body="@{@string/information_contact_body}" app:headline="@{@string/information_contact_headline}" app:illustration="@{@drawable/ic_information_illustration_contact}" + app:illustrationDescription="@{@string/information_contact_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 03fda1730c7..9b4c6f6a339 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 @@ -39,6 +39,7 @@ android:layout_height="wrap_content" app:headline="@{@string/information_legal_headline}" app:illustration="@{@drawable/ic_information_illustration_legal}" + app:illustrationDescription="@{@string/information_legal_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 fe958e6ffb0..5dc93cced5b 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 @@ -39,6 +39,7 @@ android:layout_height="wrap_content" app:headline="@{@string/information_privacy_headline}" app:illustration="@{@drawable/ic_information_illustration_privacy}" + app:illustrationDescription="@{@string/information_privacy_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 0f90814a25f..885c5dd204c 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 @@ -39,6 +39,7 @@ android:layout_height="wrap_content" app:headline="@{@string/information_technical_headline}" app:illustration="@{@drawable/ic_information_illustration_technical}" + app:illustrationDescription="@{@string/information_technical_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 f01bbfcc3f6..4fdffed28f0 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 @@ -39,6 +39,7 @@ android:layout_height="wrap_content" app:headline="@{@string/information_terms_headline}" app:illustration="@{@drawable/ic_information_illustration_terms}" + app:illustrationDescription="@{@string/information_terms_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 2b6dd7ba3d3..4bc3d8aef38 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 @@ -38,6 +38,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" app:illustration="@{@drawable/ic_main_illustration_overview}" + app:illustrationDescription="@{@string/main_overview_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 d364e5d2ae4..caa6b91e12a 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 @@ -49,6 +49,7 @@ app:body="@{@string/main_share_body}" app:headline="@{@string/main_share_headline}" app:illustration="@{@drawable/ic_main_illustration_share}" + app:illustrationDescription="@{@string/main_share_illustration_description}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml index 9fe27530db2..3fe9aefa85f 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml @@ -18,6 +18,7 @@ app:bodyEmphasized="@{@string/onboarding_body_emphasized}" app:headline="@{@string/onboarding_headline}" app:illustration="@{@drawable/ic_onboarding_illustration_together}" + app:illustrationDescription="@{@string/onboarding_illustration_description}" app:layout_constraintBottom_toTopOf="@+id/onboarding_button_next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml index dcad119a22b..4fac97a464b 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml @@ -24,6 +24,7 @@ app:body="@{@string/onboarding_notifications_body}" app:headline="@{@string/onboarding_notifications_headline}" app:illustration="@{@drawable/ic_onboarding_illustration_notification}" + app:illustrationDescription="@{@string/onboarding_notifications_illustration_description}" app:layout_constraintBottom_toTopOf="@+id/onboarding_button_next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml index 8cc273636c2..d210d80596e 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml @@ -25,6 +25,7 @@ app:bodyEmphasized="@{@string/onboarding_privacy_body_emphasized}" app:headline="@{@string/onboarding_privacy_headline}" app:illustration="@{@drawable/ic_onboarding_illustration_privacy}" + app:illustrationDescription="@{@string/onboarding_privacy_illustration_description}" app:layout_constraintBottom_toTopOf="@+id/onboarding_button_next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml index 13f45ca11dc..ccf9f02b0ba 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml @@ -24,6 +24,7 @@ app:body="@{@string/onboarding_test_body}" app:headline="@{@string/onboarding_test_headline}" app:illustration="@{@drawable/ic_onboarding_illustration_test}" + app:illustrationDescription="@{@string/onboarding_test_illustration_description}" app:layout_constraintBottom_toTopOf="@+id/onboarding_button_next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml index a8a4f608bf6..b2186938007 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml @@ -25,6 +25,7 @@ app:bodyEmphasized="@{@string/onboarding_tracing_body_emphasized}" app:headline="@{@string/onboarding_tracing_headline}" app:illustration="@{@drawable/ic_onboarding_illustration_tracing}" + app:illustrationDescription="@{@string/onboarding_tracing_illustration_description}" app:layout_constraintBottom_toTopOf="@+id/onboarding_button_next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" 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 c3130193878..7f7b1d630bb 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 @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -52,6 +51,7 @@ app:body="@{FormatterSettingsHelper.formatNotificationsDescription(settingsViewModel.isNotificationsEnabled())}" app:headline="@{FormatterSettingsHelper.formatNotificationsTitle(settingsViewModel.isNotificationsEnabled())}" app:illustration="@{FormatterSettingsHelper.formatNotificationImage(settingsViewModel.isNotificationsEnabled())}" + app:illustrationDescription="@{FormatterSettingsHelper.formatNotificationIllustrationText(settingsViewModel.isNotificationsEnabled())}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 b3d4f8ec0fe..0c76491c61d 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 @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> 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 8d7461b9102..5859c7b3e4e 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 @@ -55,6 +55,7 @@ android:layout_height="wrap_content" app:headline="@{@string/settings_tracing_headline}" app:illustration="@{FormatterSettingsHelper.formatTracingStatusImage(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}" + app:illustrationDescription="@{FormatterSettingsHelper.formatTracingIllustrationText(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/Corona-Warn-App/src/main/res/layout/include_information_details.xml b/Corona-Warn-App/src/main/res/layout/include_information_details.xml index 2a56e45954a..51369af74de 100644 --- a/Corona-Warn-App/src/main/res/layout/include_information_details.xml +++ b/Corona-Warn-App/src/main/res/layout/include_information_details.xml @@ -11,6 +11,10 @@ name="illustration" type="android.graphics.drawable.Drawable" /> + + @@ -28,8 +32,8 @@ android:id="@+id/information_details_header_illustration" android:layout_width="0dp" android:layout_height="wrap_content" - android:importantForAccessibility="no" android:src="@{illustration}" + android:contentDescription="@{illustrationDescription}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" 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 86846602985..aecd930e413 100644 --- a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml +++ b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml @@ -11,6 +11,10 @@ name="illustration" type="android.graphics.drawable.Drawable" /> + + @@ -41,7 +45,7 @@ android:id="@+id/onboarding_illustration" android:layout_width="0dp" android:layout_height="wrap_content" - android:contentDescription="@string/onboarding_image_description" + android:contentDescription="@{illustrationDescription}" android:src="@{illustration}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 67c0ffa1160..db519c5e987 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -209,7 +209,8 @@ Download-Link versenden Gemeinsam Corona bekämpfen\nIch bin dabei. Du auch?\nhttps://www.coronawarn.app/\n - + + Ein Mann teilt die Corona-Warn-App mit vier anderen Personen. Die Zufallscodes sind zufällig erzeugte Zahlen- und Buchstabenkombinationen. Sie werden zwischen benachbarten Smartphones ausgetauscht. Zufallskennungen lassen sich nicht einer bestimmten Person zuordnen und werden nach 14 Tagen automatisch gelöscht. Eine Corona-positiv getestete Person kann ihre Zufallscodes der letzten bis zu 14 Tage freiwillig mit anderen CWA-Nutzern teilen. + + Ein Smartphone zeigt unterschiedliche Inhalte, die von eins bis drei nummeriert sind. Die App merkt sich Begegnungen zwischen Menschen, indem ihre Smartphones verschlüsselte Zufallscodes austauschen. Und zwar ohne dabei auf persönliche Daten zuzugreifen. + + Eine vielfältige Gruppe in einer Stadt benutzt Smartphones. Datenschutz Verantwortliche Stelle im Sinne des Art. 4 Abs. 7 DSGVO: \n \n Robert Koch-Institut\nNordufer 20\n13353 Berlin @string/lorem_ipsum @string/lorem_ipsum + + Eine Frau mit einem Handy benutzt die Corona-Warn-App, ein Vorhängeschloss auf einem Schild steht als Symbol für verschlüsselte Daten. Wie Sie die Risiko-Ermittlung ermöglichen @@ -345,18 +352,24 @@ Nicht aktivieren Zurück + + Drei Personen haben die Risiko-Erkennung auf ihren Smartphones aktiviert, ihre Begegnung wird daher aufgezeichnet. Falls Sie positiv getestet werden … … teilen Sie es bitte über die Corona-Warn-App mit. Freiwillig und sicher. Für die Gesundheit aller. Ihre Mitteilung wird zuverlässig verschlüsselt über einen sicheren Server weiterverarbeitet. Die Personen, deren verschlüsselte Zufallscodes Sie gesammelt haben, erhalten nun eine Warnung und Informationen darüber, wie sie weiter vorgehen sollen. + + Ein positiver Testbefund wird verschlüsselt ins System übermittelt, das nun andere Nutzerinnen und Nutzer warnt. Warnungen erhalten, Risiken erkennen Die App kann Sie automatisch über Ihren Risikostatus informieren und bei Neuinfektionen von Menschen, denen Sie begegnet sind, warnen. Erlauben Sie der App jetzt, Sie zu benachrichtigen. Auf diese Weise können Sie sich zum Schutz Ihrer Mitmenschen in Isolation begeben und nach entsprechender Abklärung testen lassen. + + Eine Frau erhält eine Benachrichtigung von ihrer Corona-Warn-App. + Drei Personen haben die Risiko-Erkennung auf ihren Smartphones aktiviert, ihre Begegnung wird daher aufgezeichnet. + + Eine Person hat die Risiko-Erkennung auf ihrem Smartphone ausgeschaltet, eine Begegnung mit zwei weiteren Personen wird daher nicht aufgezeichnet. + + Eine Person hat Bluetooth auf ihrem Smartphone ausgeschaltet, eine Begegnung mit zwei weiteren Personen wird daher nicht aufgezeichnet. + + Eine Person hat die Internetverbindung ihres Smartphones ausgeschaltet, eine Begegnung mit zwei weiteren Personen wird daher nicht aufgezeichnet. + Benachrichtigungen @@ -426,6 +448,10 @@ Status Ihres COVID-19-Tests Geräte-Einstellungen öffnen + + Eine Frau erhält eine Mitteilung von ihrer Corona-Warn-App. + + Eine Frau hat die Mitteilungen ihrer Corona-Warn-App ausgeschaltet. Anwendung zurücksetzen @@ -442,6 +468,9 @@ Anwendung zurücksetzen Abbrechen + + Eine Hand hält ein Smartphone, auf dem das Zurücksetzen der Anwendung symbolisiert wird. + Wer sie nutzt, hilft, Infektionsketten schnell nachzuverfolgen und zu durchbrechen. Die App speichert dezentral – auf Ihrem Smartphone – Begegnungen mit anderen.Sie werden informiert, wenn Sie Kontakt mit nachweislich infizierten Personen hatten.Ihre Privatsphärebleibt dabeibestens geschützt. + + Eine vielfältige Gruppe in einer Stadt benutzt Smartphones. Datenschutzinformation @string/lorem_ipsum + + Eine Frau mit einem Handy benutzt die Corona-Warn-App, ein Vorhängeschloss auf einem Schild steht als Symbol für verschlüsselte Daten. Nutzungsbedingungen @string/lorem_ipsum + + Eine Hand hält ein Smartphone mit viel Text, daneben ist ein Haken als Symbol für akzeptierte Nutzungsbedingungen. Technische Hotline @@ -483,15 +518,22 @@ Unsere Öffnungszeiten:\nMo – Fr: 08:00 – 22:00 Uhr\nSa – So: 10:00 – 22:00 Uhr\nEs gelten die Preise Ihres Telefonanbieters. Für gesundheitliche Fragen, wenden Sie sich bitte an Ihre Hausarztpraxis oder die Hotline des ärztlichen Bereitschaftsdienstes 116 117. + + Ein Mann nutzt ein Headset zum Telefonieren. Häufige Fragen Rechtliche Hinweise FTP/SFTP/FTPS client uses libs + + Eine Hand hält ein Smartphone mit viel Text, daneben ist eine Balkenwaage als Symbol für rechtliche Hinweise. Impressum Herausgeber SAP Deutschland SE & Co. KG \n \nHauptsitz: \nSAP Deutschland SE & Co. KG \nHasso-Plattner-Ring 7 \n69190 Walldorf + + Eine Hand hält ein Smartphone mit viel Text, daneben ist ein Paragraphenzeichen als Symbol für das Impressum. + Nicht erlauben + + Ein Smartphone übermittelt einen positiven Testbefund verschlüsselt ins System. + @@ -698,6 +701,8 @@ Bitte isolieren Sie sich von anderen Personen. Fertig + + Eine vielfältige Gruppe begrüßt durch Jubel, dass jemand sein Testergebnis mit anderen geteilt hat. From 49735830c80573f71d2c55b131fd820221b3bbf6 Mon Sep 17 00:00:00 2001 From: Fabian-K Date: Fri, 5 Jun 2020 11:24:39 +0200 Subject: [PATCH 04/24] Submission style (#181) * color definitions from design spec added (day & night) * common: - adjust style of button & buttonPrimary - adjust style of textTitle - adjust style of textMultiline submission intro: - simplify the layout - change headline style * Changes to TAN contact page Added operating hours and changed style/string values slightly. * submission dispatcher fragment - style update - text typo fixed * updated test result illustrations updated test result illustrations, changed button colour * Update strings.xml slight text change to match style * submission warn others: - scrolling behavior fixed - style updated - illustration replaced * submission done fragment: - style updated - first behavior row exchanged * submission done fragment: illustration content description * submission tan fragment: style updated * replace colorGreen & colorRed with semantic colors * - unused color removed - colorRiskCardIncreasedRisk and colorRiskCardLowRisk referencing semantic colors * submission status cards style update * emphasized button text color in dark mode adjusted Co-authored-by: Oliver Zimmerman --- .../SubmissionDispatcherFragment.kt | 4 + .../ui/submission/SubmissionDoneFragment.kt | 7 +- ...ssionResultPositiveOtherWarningFragment.kt | 15 +- .../formatter/FormatterSubmissionHelper.kt | 6 +- .../src/main/res/drawable/card.xml | 2 +- .../ic_information_illustration_contact.xml | 157 +- .../res/drawable/ic_risk_details_contact.xml | 12 + .../ic_submission_illustration_intro_b.xml | 175 - ..._submission_illustration_other_warning.xml | 728 +- ...c_submission_illustration_qr_code_card.xml | 6100 +++++++++++------ ..._submission_illustration_tan_code_card.xml | 216 +- ...bmission_illustration_tan_hotline_card.xml | 211 +- .../ic_test_result_illustration_invalid.xml | 155 +- .../ic_test_result_illustration_negative.xml | 152 +- .../ic_test_result_illustration_pending.xml | 123 +- .../ic_test_result_illustration_positive.xml | 204 +- .../src/main/res/drawable/tan_input_digit.xml | 18 +- .../src/main/res/layout/fragment_main.xml | 6 +- .../layout/fragment_submission_contact.xml | 2 +- .../layout/fragment_submission_dispatcher.xml | 92 +- .../res/layout/fragment_submission_done.xml | 75 +- .../res/layout/fragment_submission_intro.xml | 36 +- ...ment_submission_positive_other_warning.xml | 127 +- .../res/layout/fragment_submission_tan.xml | 3 +- .../fragment_submission_test_result.xml | 2 +- .../res/layout/include_dispatcher_card.xml | 102 +- .../main/res/layout/include_further_info.xml | 36 + .../main/res/layout/include_privacy_card.xml | 35 + .../res/layout/include_submission_contact.xml | 11 + .../layout/include_submission_done_card.xml | 56 + ...ml => include_submission_done_content.xml} | 54 +- .../res/layout/include_submission_intro.xml | 64 +- ...lude_submission_positive_other_warning.xml | 62 + ...include_submission_status_card_content.xml | 2 +- ...nclude_submission_status_card_fetching.xml | 2 +- ...nclude_submission_status_card_positive.xml | 2 +- ...de_submission_status_card_unregistered.xml | 21 +- .../main/res/layout/merge_guidelines_card.xml | 23 + .../main/res/layout/merge_guidelines_side.xml | 23 + .../src/main/res/values-night/colors.xml | 38 +- .../src/main/res/values/colors.xml | 40 +- .../src/main/res/values/dimens.xml | 13 +- .../src/main/res/values/strings.xml | 28 +- .../src/main/res/values/styles.xml | 39 +- 44 files changed, 5659 insertions(+), 3620 deletions(-) create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml delete mode 100644 Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml create mode 100644 Corona-Warn-App/src/main/res/layout/include_further_info.xml create mode 100644 Corona-Warn-App/src/main/res/layout/include_privacy_card.xml create mode 100644 Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml rename Corona-Warn-App/src/main/res/layout/{include_submission_done.xml => include_submission_done_content.xml} (61%) create mode 100644 Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml create mode 100644 Corona-Warn-App/src/main/res/layout/merge_guidelines_card.xml create mode 100644 Corona-Warn-App/src/main/res/layout/merge_guidelines_side.xml 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 c7e4bf5b4bf..b575c9ccd17 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 @@ -7,6 +7,7 @@ import android.view.ViewGroup import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentSubmissionDispatcherBinding import de.rki.coronawarnapp.ui.BaseFragment +import de.rki.coronawarnapp.ui.main.MainActivity import de.rki.coronawarnapp.util.DialogHelper class SubmissionDispatcherFragment : BaseFragment() { @@ -33,6 +34,9 @@ class SubmissionDispatcherFragment : BaseFragment() { } private fun setButtonOnClickListener() { + binding.submissionDispatcherHeader.headerButtonBack.buttonIcon.setOnClickListener { + (activity as MainActivity).goBack() + } binding.submissionDispatcherQr.dispatcherCard.setOnClickListener { checkForDataPrivacyPermission() } 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 af9ab63b466..e3625fa8812 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 @@ -30,12 +30,7 @@ class SubmissionDoneFragment : BaseFragment() { } private fun setButtonOnClickListener() { - binding - .submissionDoneInclude - .submissionDoneHeader - .informationHeader - .headerButtonBack.buttonIcon - .setOnClickListener { + binding.submissionDoneHeader.headerButtonBack.buttonIcon.setOnClickListener { doNavigate( SubmissionDoneFragmentDirections.actionSubmissionDoneFragmentToMainFragment() ) 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 527afa53285..96ef049bc5e 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 @@ -75,16 +75,15 @@ class SubmissionResultPositiveOtherWarningFragment : BaseFragment(), } private fun setButtonOnClickListener() { - binding.submissionPositiveOtherWarningButton.setOnClickListener { + binding.submissionPositiveOtherWarningButtonNext.setOnClickListener { initiateWarningOthers() } - binding.submissionPositiveOtherWarningHeader - .informationHeader.headerButtonBack.buttonIcon.setOnClickListener { - doNavigate( - SubmissionResultPositiveOtherWarningFragmentDirections - .actionSubmissionResultPositiveOtherWarningFragmentToSubmissionResultFragment() - ) - } + binding.submissionPositiveOtherWarningHeader.headerButtonBack.buttonIcon.setOnClickListener { + doNavigate( + SubmissionResultPositiveOtherWarningFragmentDirections + .actionSubmissionResultPositiveOtherWarningFragmentToSubmissionResultFragment() + ) + } } private fun initiateWarningOthers() { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt index 590f0cee20d..8ab733ade2d 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt @@ -47,10 +47,10 @@ fun formatTestResultStatusText(uiState: DeviceUIState?): String { fun formatTestResultStatusColor(uiState: DeviceUIState?): Int { val appContext = CoronaWarnApplication.getAppContext() return when (uiState) { - DeviceUIState.PAIRED_NEGATIVE -> appContext.getColor(R.color.colorGreen) + DeviceUIState.PAIRED_NEGATIVE -> appContext.getColor(R.color.colorTextSemanticGreen) DeviceUIState.PAIRED_POSITIVE, - DeviceUIState.PAIRED_POSITIVE_TELETAN -> appContext.getColor(R.color.colorRed) - else -> appContext.getColor(R.color.colorRed) + DeviceUIState.PAIRED_POSITIVE_TELETAN -> appContext.getColor(R.color.colorTextSemanticRed) + else -> appContext.getColor(R.color.colorTextSemanticRed) } } diff --git a/Corona-Warn-App/src/main/res/drawable/card.xml b/Corona-Warn-App/src/main/res/drawable/card.xml index 46d367552bd..f8eeda3b0c3 100644 --- a/Corona-Warn-App/src/main/res/drawable/card.xml +++ b/Corona-Warn-App/src/main/res/drawable/card.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml b/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml index ad11fa0fafb..580c4fc2057 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml @@ -3,79 +3,94 @@ android:height="220dp" android:viewportWidth="360" android:viewportHeight="220"> + + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml new file mode 100644 index 00000000000..80b69c16540 --- /dev/null +++ b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml @@ -0,0 +1,12 @@ + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml deleted file mode 100644 index e5a27ee2360..00000000000 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml index 2627793b076..a2892c4b4bd 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml @@ -1,468 +1,414 @@ + android:width="361dp" + android:height="221dp" + android:viewportWidth="361" + android:viewportHeight="221"> + + - - - - + android:strokeColor="#00000000"/> + - - - - + android:fillColor="#BE0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> - - - - + android:strokeColor="#00000000"/> - - - - + android:strokeColor="#00000000"/> + android:strokeColor="#00000000"/> - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> - - + + + - - - - - - - - - - - - - - - - - - - - + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + + + + android:fillColor="#BE0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#A6B4BC" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#E8F5FF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#E8F5FF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#DCE1E5" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#DCE1E5" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + - - + + - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + - - + + + android:fillColor="#EFEFEF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml index 2e43b0c7272..509a57e7765 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml @@ -1,2046 +1,4066 @@ + android:viewportHeight="104"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml index b0ba7336a20..c89aac841f8 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml @@ -1,126 +1,102 @@ + android:viewportHeight="104"> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml index f19c107d07e..5e8c2fb8119 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml @@ -1,45 +1,176 @@ - - - - - - - - + android:viewportHeight="104"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml index 16d54eb8eb7..4e596d091d9 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml @@ -1,123 +1,80 @@ + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + + - - - - - - - - - - - - - - - - - - - - - + android:strokeColor="#00000000"/> - + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + + + + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml index 358b6f85c4e..d8053b5fb20 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml @@ -1,132 +1,70 @@ + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + + - - - - - - - - - - - - - + android:strokeColor="#00000000"/> - - - - - - - - - - - - + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#2E854B" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#00000000" + android:strokeColor="#FFFFFF" + android:fillType="evenOdd"/> - + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml index 8feb68e65b6..ee5c94390ab 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml @@ -1,81 +1,70 @@ + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + + - + + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> - - - - - - - - + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + - - - - - - - - - - - - + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml index d817b79c812..5e6691c4bf7 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml @@ -1,120 +1,130 @@ + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + + - - - - - - - - - - - - - + android:strokeColor="#00000000"/> + + + + + + - - - - - - - - - - - - - + + + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + + + + + diff --git a/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml b/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml index d3d6d9da50d..d06cdb9200e 100644 --- a/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml +++ b/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml @@ -1,9 +1,11 @@ - - - - - - - - \ No newline at end of file + + + + \ No newline at end of file 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 0a064e38540..c1c6d292abd 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml @@ -151,6 +151,7 @@ - + app:icon="@{@drawable/ic_back}" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:title="@{@string/submission_dispatcher_headline}" /> + app:layout_constraintEnd_toStartOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@+id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_header" /> + app:layout_constraintEnd_toStartOf="@+id/guideline_card_end" + app:layout_constraintStart_toStartOf="@+id/guideline_card_start" + app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" /> - - + - - - - - + diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml index f58cd85b45c..2f825aaac59 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml @@ -3,30 +3,57 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - - - + tools:context=".ui.submission.SubmissionDoneFragment"> + + + + + + + android:layout_marginTop="@dimen/spacing_normal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/submission_done_headline" />