From 804d0790f9d54dd66760b0e0841af3d7f54588a9 Mon Sep 17 00:00:00 2001
From: Fabian-K <fabian.kajzar@sap.com>
Date: Fri, 12 Jun 2020 17:34:25 +0200
Subject: [PATCH] Hotfix (#429)
* - make sure FAQ card is top aligned with other cards
* - submission intro: missing spacing before bullet point list added
- trailing new line from strings.xml removed (this is not present in the translations)
* - illustrations for positive test changed
Co-authored-by: marcmuschko <marc.muschko@sap.com>
---
.../res/layout/fragment_main.xml | 1 -
.../ic_test_result_illustration_positive.xml | 42 +++---
...test_result_illustration_positive_card.xml | 128 ++++++++++++++++++
.../src/main/res/layout/fragment_main.xml | 1 -
.../res/layout/include_submission_intro.xml | 1 +
.../src/main/res/values/strings.xml | 2 +-
6 files changed, 151 insertions(+), 24 deletions(-)
create mode 100644 Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive_card.xml
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml
index 6a9bd45d4..740eb6990 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml
@@ -209,7 +209,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
- app:layout_constraintBottom_toTopOf="@+id/guideline_bottom"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/main_barrier" />
diff --git a/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive.xml b/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive.xml
index 0de3ca0c9..5803fc257 100644
--- a/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive.xml
+++ b/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive.xml
@@ -5,121 +5,121 @@
android:viewportHeight="112">
<group>
<path
- android:pathData="M8.615,17.425l0,94.575l70.324,0l0,-76.558l-16.886,-18.017z"
+ android:pathData="M8.615,17.767l0,93.738l70.324,0l0,-75.88l-16.886,-17.858z"
android:strokeWidth="1"
- android:fillColor="#3F3F43"
+ android:fillColor="#232324"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M62.097,35.442l16.786,0l-16.786,-18.003z"
+ android:pathData="M62.097,35.624l16.786,0l-16.786,-17.844z"
android:strokeWidth="1"
android:fillColor="#B8C8D9"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M35.826,99.05L29.418,99.05C28.326,99.05 27.441,98.154 27.441,97.048L27.441,90.56C27.441,89.453 28.326,88.558 29.418,88.558L35.826,88.558C36.919,88.558 37.803,89.453 37.803,90.56L37.803,97.048C37.803,98.154 36.919,99.05 35.826,99.05"
+ android:pathData="M35.826,98.669L29.418,98.669C28.326,98.669 27.441,97.781 27.441,96.684L27.441,90.254C27.441,89.157 28.326,88.27 29.418,88.27L35.826,88.27C36.919,88.27 37.803,89.157 37.803,90.254L37.803,96.684C37.803,97.781 36.919,98.669 35.826,98.669"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M60.851,99.05L54.44,99.05C53.349,99.05 52.464,98.154 52.464,97.049L52.464,90.558C52.464,89.453 53.349,88.558 54.44,88.558L60.851,88.558C61.942,88.558 62.827,89.453 62.827,90.558L62.827,97.049C62.827,98.154 61.942,99.05 60.851,99.05"
+ android:pathData="M60.851,98.669L54.44,98.669C53.349,98.669 52.464,97.781 52.464,96.685L52.464,90.252C52.464,89.157 53.349,88.27 54.44,88.27L60.851,88.27C61.942,88.27 62.827,89.157 62.827,90.252L62.827,96.685C62.827,97.781 61.942,98.669 60.851,98.669"
android:strokeWidth="1"
android:fillColor="#B8C8D9"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M25.589,58.665L64.141,58.665C64.897,58.725 65.372,59.262 65.372,59.998C65.372,60.645 64.897,61.365 64.141,61.331L25.589,61.331C24.596,61.365 24.122,60.734 24.122,59.998C24.122,59.262 24.596,58.725 25.589,58.665"
+ android:pathData="M25.589,58.641L64.141,58.641C64.897,58.701 65.372,59.233 65.372,59.963C65.372,60.604 64.897,61.317 64.141,61.284L25.589,61.284C24.596,61.317 24.122,60.692 24.122,59.963C24.122,59.233 24.596,58.701 25.589,58.641"
android:strokeWidth="1"
android:fillColor="#B8C8D9"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M25.589,44.264L64.141,44.264C64.897,44.324 65.372,44.861 65.372,45.597C65.372,46.243 64.897,46.964 64.141,46.929L25.589,46.929C24.596,46.964 24.122,46.332 24.122,45.597C24.122,44.861 24.596,44.324 25.589,44.264"
+ android:pathData="M25.589,44.367L64.141,44.367C64.897,44.427 65.372,44.959 65.372,45.689C65.372,46.329 64.897,47.044 64.141,47.009L25.589,47.009C24.596,47.044 24.122,46.417 24.122,45.689C24.122,44.959 24.596,44.427 25.589,44.367"
android:strokeWidth="1"
android:fillColor="#B8C8D9"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M25.589,72.827L64.141,72.827C64.897,72.887 65.372,73.424 65.372,74.16C65.372,74.806 64.897,75.527 64.141,75.492L25.589,75.492C24.596,75.527 24.122,74.895 24.122,74.16C24.122,73.424 24.596,72.887 25.589,72.827"
+ android:pathData="M25.589,72.678L64.141,72.678C64.897,72.738 65.372,73.27 65.372,73.999C65.372,74.64 64.897,75.354 64.141,75.32L25.589,75.32C24.596,75.354 24.122,74.728 24.122,73.999C24.122,73.27 24.596,72.738 25.589,72.678"
android:strokeWidth="1"
android:fillColor="#B8C8D9"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M35.766,90.803C35.647,90.795 35.532,90.847 35.459,90.942L31.571,95.784L29.594,93.655C29.511,93.546 29.374,93.495 29.241,93.523C29.109,93.549 29.002,93.649 28.966,93.781C28.93,93.913 28.97,94.054 29.071,94.147L31.331,96.585C31.402,96.66 31.502,96.701 31.605,96.697C31.709,96.693 31.804,96.643 31.869,96.562L36.02,91.401C36.109,91.295 36.129,91.149 36.075,91.022C36.022,90.896 35.902,90.811 35.766,90.803"
+ android:pathData="M35.766,90.495C35.647,90.487 35.532,90.538 35.459,90.632L31.571,95.431L29.594,93.321C29.511,93.213 29.374,93.163 29.241,93.19C29.109,93.216 29.002,93.315 28.966,93.446C28.93,93.577 28.97,93.717 29.071,93.809L31.331,96.225C31.402,96.3 31.502,96.34 31.605,96.336C31.709,96.332 31.804,96.283 31.869,96.203L36.02,91.087C36.109,90.982 36.129,90.837 36.075,90.712C36.022,90.587 35.902,90.502 35.766,90.495"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M35.794,90.304L35.679,90.304C35.441,90.322 35.218,90.441 35.069,90.634L31.544,95.024L29.954,93.312C29.787,93.089 29.458,92.966 29.14,93.033C28.831,93.094 28.577,93.332 28.49,93.646C28.416,93.923 28.479,94.213 28.656,94.429L30.971,96.927C31.144,97.109 31.38,97.206 31.624,97.196C31.87,97.187 32.1,97.069 32.254,96.874L36.403,91.716C36.607,91.473 36.657,91.124 36.528,90.823C36.418,90.561 36.186,90.374 35.914,90.319L35.794,90.304Z"
+ android:pathData="M35.794,90L35.679,90.001C35.441,90.018 35.218,90.136 35.069,90.328L31.544,94.678L29.954,92.982C29.787,92.76 29.458,92.639 29.14,92.705C28.831,92.765 28.577,93.001 28.49,93.312C28.416,93.587 28.479,93.875 28.656,94.089L30.971,96.565C31.144,96.745 31.38,96.841 31.624,96.832C31.87,96.822 32.1,96.705 32.254,96.513L36.403,91.4C36.607,91.159 36.657,90.814 36.528,90.515C36.418,90.256 36.186,90.07 35.914,90.015L35.794,90Z"
android:strokeWidth="1"
android:fillColor="#17191A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M27.74,23.929C24.747,29.695 17.704,31.911 12.01,28.88C6.315,25.85 4.126,18.719 7.119,12.953C10.113,7.188 17.156,4.971 22.85,8.001C28.544,11.033 30.734,18.163 27.74,23.929"
+ android:pathData="M27.74,24.212C24.747,29.927 17.704,32.124 12.01,29.12C6.315,26.116 4.126,19.049 7.119,13.334C10.113,7.62 17.156,5.422 22.85,8.425C28.544,11.431 30.734,18.497 27.74,24.212"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M29.553,29.037C29.285,29.452 28.375,30.91 27.723,29.129C26.873,26.804 25.07,27.311 25.07,27.311L23.401,27.55L26.909,23.54C26.909,23.54 26.824,25.148 27.343,25.952C27.604,26.357 28.149,26.95 28.834,26.966C29.521,26.982 30.848,27.033 29.553,29.037"
+ android:pathData="M29.553,29.276C29.285,29.687 28.375,31.132 27.723,29.367C26.873,27.062 25.07,27.565 25.07,27.565L23.401,27.802L26.909,23.827C26.909,23.827 26.824,25.421 27.343,26.218C27.604,26.619 28.149,27.207 28.834,27.223C29.521,27.239 30.848,27.289 29.553,29.276"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M10.424,33.932C9.965,33.759 8.36,33.183 9.93,32.146C11.983,30.792 11.372,28.563 11.372,28.563L10.774,26.966L15.412,29.542C15.412,29.542 13.844,29.816 13.185,30.504C12.852,30.853 12.124,32.083 12.26,32.764C12.397,33.445 12.642,34.768 10.424,33.932"
+ android:pathData="M10.424,34.128C9.965,33.956 8.36,33.385 9.93,32.358C11.983,31.015 11.372,28.805 11.372,28.805L10.774,27.223L15.412,29.777C15.412,29.777 13.844,30.047 13.185,30.73C12.852,31.075 12.124,32.295 12.26,32.97C12.397,33.645 12.642,34.955 10.424,34.128"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M22.251,27.966C22.251,27.966 21.317,28.457 21.609,30.583C21.781,31.852 22.631,33.797 22.751,34.2C22.829,34.461 22.985,34.537 23.204,34.695C23.743,35.083 24.56,35.917 22.622,36.467C20.997,36.928 20.26,36.773 20.588,35.794C20.755,35.294 20.834,34.923 20.778,34.399C20.654,33.246 19.849,30.45 18.779,29.695C17.168,28.559 17.71,28.907 17.71,28.907L21.167,26.264L22.251,27.966Z"
+ android:pathData="M22.251,28.214C22.251,28.214 21.317,28.7 21.609,30.808C21.781,32.065 22.631,33.993 22.751,34.393C22.829,34.651 22.985,34.727 23.204,34.883C23.743,35.268 24.56,36.094 22.622,36.64C20.997,37.096 20.26,36.943 20.588,35.973C20.755,35.477 20.834,35.109 20.778,34.59C20.654,33.447 19.849,30.676 18.779,29.927C17.168,28.802 17.71,29.146 17.71,29.146L21.167,26.527L22.251,28.214Z"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M14.031,3.144C14.666,3.053 15.373,2.835 15.07,3.95C14.965,4.337 14.946,4.712 14.978,5.057C15.061,5.957 15.36,6.451 16.053,7.021L16.586,7.459L13.034,7.78C13.034,7.78 13.666,7.224 13.493,6.301C13.421,5.916 13.363,5.064 12.934,4.747C12.541,4.455 11.723,3.477 14.031,3.144"
+ android:pathData="M14.031,3.612C14.666,3.522 15.373,3.306 15.07,4.411C14.965,4.795 14.946,5.166 14.978,5.508C15.061,6.4 15.36,6.89 16.053,7.455L16.586,7.889L13.034,8.207C13.034,8.207 13.666,7.656 13.493,6.741C13.421,6.36 13.363,5.515 12.934,5.201C12.541,4.912 11.723,3.942 14.031,3.612"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M8.455,14.267C8.175,14.068 8.035,13.72 8.103,13.38C8.222,12.788 8.473,11.882 7.314,10.835C5.988,9.637 4.084,8.722 3.926,8.706C2.717,8.569 1.942,8.517 3.269,6.622C4.526,4.829 5.258,4.901 5.379,6.29C5.406,6.591 5.513,6.878 5.69,7.122C6.318,7.992 8.704,10.351 10.322,10.38C10.817,10.391 10.261,12.97 10.261,12.97C10.167,13.623 8.455,14.267 8.455,14.267"
+ android:pathData="M8.455,14.637C8.175,14.439 8.035,14.095 8.103,13.758C8.222,13.171 8.473,12.272 7.314,11.234C5.988,10.047 4.084,9.141 3.926,9.124C2.717,8.989 1.942,8.938 3.269,7.058C4.526,5.281 5.258,5.353 5.379,6.729C5.406,7.028 5.513,7.312 5.69,7.554C6.318,8.416 8.704,10.754 10.322,10.784C10.817,10.794 10.261,13.35 10.261,13.35C10.167,13.998 8.455,14.637 8.455,14.637"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M0.512,17.334C0.67,15.863 1.28,15.158 2.575,16.069C4.814,17.646 7.366,15.337 7.366,15.337L7.855,13.98L7.334,20.36C7.334,20.36 6.333,19.005 5.318,18.517C4.825,18.279 3.311,18.065 2.575,18.37C1.779,18.699 0.314,19.169 0.512,17.334"
+ android:pathData="M0.512,17.676C0.67,16.218 1.28,15.519 2.575,16.422C4.814,17.985 7.366,15.697 7.366,15.697L7.855,14.352L7.334,20.675C7.334,20.675 6.333,19.332 5.318,18.849C4.825,18.613 3.311,18.401 2.575,18.703C1.779,19.029 0.314,19.495 0.512,17.676"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M10.348,25.772C10.348,25.772 8.92,24.337 6.972,25.835C5.023,27.334 4.64,27.751 4.64,27.751C4.64,27.751 3.049,31.021 1.379,28.429C-0.292,25.836 1.082,25.222 2.908,25.652C2.908,25.652 6.692,24.576 7.322,22.501C7.953,20.426 7.615,20.958 7.615,20.958L12.02,24.443L10.348,25.772Z"
+ android:pathData="M10.348,26.04C10.348,26.04 8.92,24.618 6.972,26.102C5.023,27.588 4.64,28.001 4.64,28.001C4.64,28.001 3.049,31.242 1.379,28.673C-0.292,26.103 1.082,25.495 2.908,25.921C2.908,25.921 6.692,24.854 7.322,22.798C7.953,20.741 7.615,21.269 7.615,21.269L12.02,24.723L10.348,26.04Z"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M31.637,10.099C31.912,10.51 32.888,11.922 31.014,11.842C28.566,11.74 27.784,13.911 27.784,13.911L27.356,15.564L25.059,10.738C25.059,10.738 26.491,11.439 27.424,11.266C27.893,11.179 29.193,10.604 29.473,9.97C29.753,9.335 30.312,8.116 31.637,10.099"
+ android:pathData="M31.637,10.505C31.912,10.912 32.888,12.313 31.014,12.233C28.566,12.131 27.784,14.284 27.784,14.284L27.356,15.921L25.059,11.139C25.059,11.139 26.491,11.833 27.424,11.661C27.893,11.575 29.193,11.005 29.473,10.377C29.753,9.748 30.312,8.539 31.637,10.505"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M28.247,17.17C28.247,17.17 28.489,18.941 30.734,18.903C31.998,18.882 32.751,18.904 33.166,18.928C33.434,18.943 34.431,18.937 34.652,18.782C35.198,18.402 36.252,17.913 36.097,19.944C35.966,21.648 35.569,22.295 34.773,21.648C34.367,21.316 33.178,21 32.673,20.873C31.56,20.595 29.727,20.308 28.66,21.066C27.053,22.208 27.561,21.812 27.561,21.812L26.296,17.616L28.247,17.17Z"
+ android:pathData="M28.247,17.513C28.247,17.513 28.489,19.269 30.734,19.231C31.998,19.21 32.751,19.232 33.166,19.256C33.434,19.271 34.431,19.265 34.652,19.111C35.198,18.735 36.252,18.25 36.097,20.263C35.966,21.952 35.569,22.593 34.773,21.952C34.367,21.623 33.178,21.31 32.673,21.184C31.56,20.908 29.727,20.624 28.66,21.375C27.053,22.507 27.561,22.114 27.561,22.114L26.296,17.955L28.247,17.513Z"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
- android:pathData="M18.886,7.498C18.886,7.498 20.756,8.011 21.682,5.725C22.124,4.632 22.473,3.376 22.623,2.945C22.737,2.617 22.783,2.27 22.756,1.924C22.707,1.299 22.871,0.264 24.791,1.28C27.018,2.46 26.315,3.024 25.575,3.323C25.276,3.444 25.012,3.641 24.797,3.885C24.055,4.725 22.477,7.21 22.818,8.81C23.268,10.923 23.301,10.293 23.301,10.293L18.572,9.781L18.886,7.498Z"
+ android:pathData="M18.886,7.927C18.886,7.927 20.756,8.436 21.682,6.17C22.124,5.087 22.473,3.842 22.623,3.415C22.737,3.089 22.783,2.745 22.756,2.403C22.707,1.783 22.871,0.757 24.791,1.764C27.018,2.934 26.315,3.493 25.575,3.789C25.276,3.909 25.012,4.104 24.797,4.346C24.055,5.179 22.477,7.642 22.818,9.228C23.268,11.322 23.301,10.697 23.301,10.697L18.572,10.19L18.886,7.927Z"
android:strokeWidth="1"
android:fillColor="#FF919A"
android:fillType="nonZero"
diff --git a/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive_card.xml b/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive_card.xml
new file mode 100644
index 000000000..5a17e9c7a
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable-night/ic_test_result_illustration_positive_card.xml
@@ -0,0 +1,128 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="80dp"
+ android:height="112dp"
+ android:viewportWidth="80"
+ android:viewportHeight="112">
+ <group>
+ <path
+ android:pathData="M8.615,17.767l0,93.738l70.324,0l0,-75.88l-16.886,-17.858z"
+ android:strokeWidth="1"
+ android:fillColor="#3F3F43"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M62.097,35.624l16.786,0l-16.786,-17.844z"
+ android:strokeWidth="1"
+ android:fillColor="#B8C8D9"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M35.826,98.669L29.418,98.669C28.326,98.669 27.441,97.781 27.441,96.684L27.441,90.254C27.441,89.157 28.326,88.27 29.418,88.27L35.826,88.27C36.919,88.27 37.803,89.157 37.803,90.254L37.803,96.684C37.803,97.781 36.919,98.669 35.826,98.669"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M60.851,98.669L54.44,98.669C53.349,98.669 52.464,97.781 52.464,96.685L52.464,90.252C52.464,89.157 53.349,88.27 54.44,88.27L60.851,88.27C61.942,88.27 62.827,89.157 62.827,90.252L62.827,96.685C62.827,97.781 61.942,98.669 60.851,98.669"
+ android:strokeWidth="1"
+ android:fillColor="#B8C8D9"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M25.589,58.641L64.141,58.641C64.897,58.701 65.372,59.233 65.372,59.963C65.372,60.604 64.897,61.317 64.141,61.284L25.589,61.284C24.596,61.317 24.122,60.692 24.122,59.963C24.122,59.233 24.596,58.701 25.589,58.641"
+ android:strokeWidth="1"
+ android:fillColor="#B8C8D9"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M25.589,44.367L64.141,44.367C64.897,44.427 65.372,44.959 65.372,45.689C65.372,46.329 64.897,47.044 64.141,47.009L25.589,47.009C24.596,47.044 24.122,46.417 24.122,45.689C24.122,44.959 24.596,44.427 25.589,44.367"
+ android:strokeWidth="1"
+ android:fillColor="#B8C8D9"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M25.589,72.678L64.141,72.678C64.897,72.738 65.372,73.27 65.372,73.999C65.372,74.64 64.897,75.354 64.141,75.32L25.589,75.32C24.596,75.354 24.122,74.728 24.122,73.999C24.122,73.27 24.596,72.738 25.589,72.678"
+ android:strokeWidth="1"
+ android:fillColor="#B8C8D9"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M35.766,90.495C35.647,90.487 35.532,90.538 35.459,90.632L31.571,95.431L29.594,93.321C29.511,93.213 29.374,93.163 29.241,93.19C29.109,93.216 29.002,93.315 28.966,93.446C28.93,93.577 28.97,93.717 29.071,93.809L31.331,96.225C31.402,96.3 31.502,96.34 31.605,96.336C31.709,96.332 31.804,96.283 31.869,96.203L36.02,91.087C36.109,90.982 36.129,90.837 36.075,90.712C36.022,90.587 35.902,90.502 35.766,90.495"
+ android:strokeWidth="1"
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M35.794,90L35.679,90.001C35.441,90.018 35.218,90.136 35.069,90.328L31.544,94.678L29.954,92.982C29.787,92.76 29.458,92.639 29.14,92.705C28.831,92.765 28.577,93.001 28.49,93.312C28.416,93.587 28.479,93.875 28.656,94.089L30.971,96.565C31.144,96.745 31.38,96.841 31.624,96.832C31.87,96.822 32.1,96.705 32.254,96.513L36.403,91.4C36.607,91.159 36.657,90.814 36.528,90.515C36.418,90.256 36.186,90.07 35.914,90.015L35.794,90Z"
+ android:strokeWidth="1"
+ android:fillColor="#17191A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M27.74,24.212C24.747,29.927 17.704,32.124 12.01,29.12C6.315,26.116 4.126,19.049 7.119,13.334C10.113,7.62 17.156,5.422 22.85,8.425C28.544,11.431 30.734,18.497 27.74,24.212"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M29.553,29.276C29.285,29.687 28.375,31.132 27.723,29.367C26.873,27.062 25.07,27.565 25.07,27.565L23.401,27.802L26.909,23.827C26.909,23.827 26.824,25.421 27.343,26.218C27.604,26.619 28.149,27.207 28.834,27.223C29.521,27.239 30.848,27.289 29.553,29.276"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M10.424,34.128C9.965,33.956 8.36,33.385 9.93,32.358C11.983,31.015 11.372,28.805 11.372,28.805L10.774,27.223L15.412,29.777C15.412,29.777 13.844,30.047 13.185,30.73C12.852,31.075 12.124,32.295 12.26,32.97C12.397,33.645 12.642,34.955 10.424,34.128"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M22.251,28.214C22.251,28.214 21.317,28.7 21.609,30.808C21.781,32.065 22.631,33.993 22.751,34.393C22.829,34.651 22.985,34.727 23.204,34.883C23.743,35.268 24.56,36.094 22.622,36.64C20.997,37.096 20.26,36.943 20.588,35.973C20.755,35.477 20.834,35.109 20.778,34.59C20.654,33.447 19.849,30.676 18.779,29.927C17.168,28.802 17.71,29.146 17.71,29.146L21.167,26.527L22.251,28.214Z"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M14.031,3.612C14.666,3.522 15.373,3.306 15.07,4.411C14.965,4.795 14.946,5.166 14.978,5.508C15.061,6.4 15.36,6.89 16.053,7.455L16.586,7.889L13.034,8.207C13.034,8.207 13.666,7.656 13.493,6.741C13.421,6.36 13.363,5.515 12.934,5.201C12.541,4.912 11.723,3.942 14.031,3.612"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M8.455,14.637C8.175,14.439 8.035,14.095 8.103,13.758C8.222,13.171 8.473,12.272 7.314,11.234C5.988,10.047 4.084,9.141 3.926,9.124C2.717,8.989 1.942,8.938 3.269,7.058C4.526,5.281 5.258,5.353 5.379,6.729C5.406,7.028 5.513,7.312 5.69,7.554C6.318,8.416 8.704,10.754 10.322,10.784C10.817,10.794 10.261,13.35 10.261,13.35C10.167,13.998 8.455,14.637 8.455,14.637"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M0.512,17.676C0.67,16.218 1.28,15.519 2.575,16.422C4.814,17.985 7.366,15.697 7.366,15.697L7.855,14.352L7.334,20.675C7.334,20.675 6.333,19.332 5.318,18.849C4.825,18.613 3.311,18.401 2.575,18.703C1.779,19.029 0.314,19.495 0.512,17.676"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M10.348,26.04C10.348,26.04 8.92,24.618 6.972,26.102C5.023,27.588 4.64,28.001 4.64,28.001C4.64,28.001 3.049,31.242 1.379,28.673C-0.292,26.103 1.082,25.495 2.908,25.921C2.908,25.921 6.692,24.854 7.322,22.798C7.953,20.741 7.615,21.269 7.615,21.269L12.02,24.723L10.348,26.04Z"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M31.637,10.505C31.912,10.912 32.888,12.313 31.014,12.233C28.566,12.131 27.784,14.284 27.784,14.284L27.356,15.921L25.059,11.139C25.059,11.139 26.491,11.833 27.424,11.661C27.893,11.575 29.193,11.005 29.473,10.377C29.753,9.748 30.312,8.539 31.637,10.505"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M28.247,17.513C28.247,17.513 28.489,19.269 30.734,19.231C31.998,19.21 32.751,19.232 33.166,19.256C33.434,19.271 34.431,19.265 34.652,19.111C35.198,18.735 36.252,18.25 36.097,20.263C35.966,21.952 35.569,22.593 34.773,21.952C34.367,21.623 33.178,21.31 32.673,21.184C31.56,20.908 29.727,20.624 28.66,21.375C27.053,22.507 27.561,22.114 27.561,22.114L26.296,17.955L28.247,17.513Z"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M18.886,7.927C18.886,7.927 20.756,8.436 21.682,6.17C22.124,5.087 22.473,3.842 22.623,3.415C22.737,3.089 22.783,2.745 22.756,2.403C22.707,1.783 22.871,0.757 24.791,1.764C27.018,2.934 26.315,3.493 25.575,3.789C25.276,3.909 25.012,4.104 24.797,4.346C24.055,5.179 22.477,7.642 22.818,9.228C23.268,11.322 23.301,10.697 23.301,10.697L18.572,10.19L18.886,7.927Z"
+ android:strokeWidth="1"
+ android:fillColor="#FF919A"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ </group>
+</vector>
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 0babbd7a7..29c518544 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
@@ -214,7 +214,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
- app:layout_constraintBottom_toTopOf="@+id/guideline_bottom"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/main_barrier" />
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 2819f84a4..7bcfd2f39 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
@@ -57,6 +57,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/spacing_normal"
app:entries="@array/submission_intro_bullet_points"
+ android:layout_marginTop="@dimen/spacing_normal"
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index c44664835..9ffd9eaea 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -804,7 +804,7 @@
<!-- XHED: Page headline for menu the at start of the submission process -->
<string name="submission_intro_headline">So funktionert das\nCorona-Warn-System</string>
<!-- YTXT: submission introduction text -->
- <string name="submission_intro_text">Damit die Corona-Warn-App funktioniert, sind wir auf die Mithilfe von Corona-positiven Personen angewiesen.\n\nDa nur verschlüsselte Zufallscodes ausgetauscht werden, bleiben Sie unerkannt. Sie können jetzt wie folgt vorgehen:\n</string>
+ <string name="submission_intro_text">Damit die Corona-Warn-App funktioniert, sind wir auf die Mithilfe von Corona-positiven Personen angewiesen.\n\nDa nur verschlüsselte Zufallscodes ausgetauscht werden, bleiben Sie unerkannt. Sie können jetzt wie folgt vorgehen:</string>
<!-- XBUT: Submission introduction next button-->
<string name="submission_intro_button_next">Weiter</string>
<!-- XACT: Submission intro - illustration description, explanation image -->
--
GitLab