Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Fix: Submission consent screen last bullet point (EXPOSUREAPP-14867) #5881

Merged
merged 3 commits into from
Mar 3, 2023
Merged

Fix: Submission consent screen last bullet point (EXPOSUREAPP-14867) #5881

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f02a1
Fix: Submission consent screen last bullet point (EXPOSUREAPP-14867)
mtwalli Mar 3, 2023
90d9d5d
Merge branch 'release/3.2.x' into fix/14867-points26-29
mtwalli Mar 3, 2023
9bc6b99
Merge branch 'release/3.2.x' into fix/14867-points26-29
mtwalli Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/include_submission_consent_intro"
android:layout_marginTop="@dimen/margin_24"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/submission_consent_illustration">
Expand All @@ -58,8 +58,8 @@
style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_24"
android:layout_marginHorizontal="@dimen/margin_16"
android:layout_marginTop="@dimen/margin_24"
android:text="@string/submission_consent_call_test_result"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -70,8 +70,8 @@
style="@style/subtitleMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_24"
android:layout_marginHorizontal="@dimen/margin_16"
android:layout_marginTop="@dimen/margin_24"
android:text="@string/submission_consent_main_headline_body"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -81,8 +81,8 @@
android:id="@+id/submission_consent_icon_single_test"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_24"
android:layout_marginStart="@dimen/margin_16"
android:layout_marginTop="@dimen/margin_24"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result_body"
Expand All @@ -102,19 +102,19 @@
app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result_body" />

<ImageView
android:id="@+id/submission_star_checkmark"
android:layout_width="@dimen/width_32"
android:layout_height="@dimen/width_32"
android:layout_marginStart="@dimen/margin_16"
android:layout_marginTop="@dimen/margin_24"
android:background="@drawable/circle"
android:backgroundTint="@color/card_dark"
android:padding="@dimen/padding_6"
app:tint="@color/colorSecondary"
android:id="@+id/submission_star_checkmark"
android:layout_marginTop="@dimen/margin_24"
android:layout_marginStart="@dimen/margin_16"
android:importantForAccessibility="no"
android:padding="@dimen/padding_6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result_scan_test_only_once"
app:srcCompat="@drawable/ic_star_checkmark" />
app:srcCompat="@drawable/ic_star_checkmark"
app:tint="@color/colorSecondary" />

<TextView
android:id="@+id/submission_star_checkmark_text"
Expand All @@ -134,8 +134,8 @@
style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_24"
android:layout_marginHorizontal="@dimen/margin_16"
android:layout_marginTop="@dimen/margin_24"
android:text="@string/submission_consent_help_by_warning_others_headline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -146,8 +146,8 @@
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_24"
android:layout_marginHorizontal="@dimen/margin_16"
android:layout_marginTop="@dimen/margin_24"
android:text="@string/submission_consent_help_by_warning_others_body"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -186,12 +186,12 @@
android:subtitle="@string/submission_consent_your_consent_subsection_tapping_agree"
android:title="@string/submission_consent_your_consent_subsection_headline"
app:bulletpointOne="@string/submission_consent_your_consent_subsection_first_point"
app:bulletpointTwo="@string/submission_consent_your_consent_subsection_second_point"
app:bulletpointThree="@string/submission_consent_your_consent_subsection_third_point"
app:bulletpointFour="@string/submission_consent_your_consent_subsection_fourth_point"
app:bulletpointTwo="@string/submission_consent_your_consent_subsection_second_point"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/submission_consent_hint" />
app:layout_constraintTop_toBottomOf="@id/submission_consent_hint"
app:secondParagraph="@string/submission_consent_your_consent_subsection_fourth_point" />

<de.rki.coronawarnapp.ui.view.BulletPointTextView
android:id="@+id/submission_consent_bulletpoint_one"
Expand Down
2 changes: 1 addition & 1 deletion Corona-Warn-App/src/main/res/values-de/legal_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- YTXT: Body for consent sub section your consent subtext third point -->
<string name="submission_consent_your_consent_subsection_third_point">"<b>Wenn Sie zusätzlich Angaben zum Beginn Ihrer Symptome machen, werden auch diese geteilt.</b>"</string>
<!-- YTXT: Body for consent sub section your consent subtext fourth point -->
<string name="submission_consent_your_consent_subsection_fourth_point">"<b>Sie können Ihr Einverständnis jederzeit zurücknehmen. Die Einstellung hierfür finden Sie unter „Test anzeigen“. Vor dem Teilen werden Sie nochmal auf Ihr Einverständnis hingewiesen.</b>"</string>
<string name="submission_consent_your_consent_subsection_fourth_point">"Sie können Ihr Einverständnis jederzeit zurücknehmen. Die Einstellung hierfür finden Sie unter „Test anzeigen“. Vor dem Teilen werden Sie nochmal auf Ihr Einverständnis hingewiesen."</string>
<!-- YTXT: Body for your consent screen agreement share test results -->
<string name="submission_your_consent_agreement_share_test_results">"<b>Wenn Sie positiv auf Corona getestet wurden, teilt die App Ihr Testergebnis, um Nutzer, denen Sie begegnet sind, zu warnen.</b>\n\n<b>Die Warnung betrifft Nutzer, die zeitgleich am selben Event oder Ort wie Sie eingecheckt waren und Nutzer der Corona-Apps der folgenden Länder:</b>"</string>
<!-- YTXT: Body for your consent screen agreement share symptoms -->
Expand Down
2 changes: 1 addition & 1 deletion Corona-Warn-App/src/main/res/values-tr/legal_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- YTXT: Body for consent sub section your consent subtext third point -->
<string name="submission_consent_your_consent_subsection_third_point">"<b>Ayrıca semptomlarınızın başlangıcı hakkında bilgi verirseniz, bu veri de paylaşılacaktır.</b>"</string>
<!-- YTXT: Body for consent sub section your consent subtext fourth point -->
<string name="submission_consent_your_consent_subsection_fourth_point">"<b>Onay beyanınızı istediğiniz zaman geri çekebilirsiniz. İlgili ayar “Testleri göster” altında yer alır. Bilgiler paylaşılmadan önce tekrar onayınız alınır.</b>"</string>
<string name="submission_consent_your_consent_subsection_fourth_point">"Onay beyanınızı istediğiniz zaman geri çekebilirsiniz. İlgili ayar “Testleri göster” altında yer alır. Bilgiler paylaşılmadan önce tekrar onayınız alınır."</string>
<!-- YTXT: Body for your consent screen agreement share test results -->
<string name="submission_your_consent_agreement_share_test_results">"<b>Korona testiniz pozitif çıktıysa Uygulama test sonucunuzu, karşılaştığınız kullanıcıları yarmak için paylaşır.</b>\n\n<b>Uyarı sizinle aynı etkinlikteki ya da yerdeki kullanıcılara ve aşağıdaki ülkelerdeki Korona Uygulaması kullanıcılarına gönderilir:</b>"</string>
<!-- YTXT: Body for your consent screen agreement share symptoms -->
Expand Down
2 changes: 1 addition & 1 deletion Corona-Warn-App/src/main/res/values/legal_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- YTXT: Body for consent sub section your consent subtext third point -->
<string name="submission_consent_your_consent_subsection_third_point" translatable="false">"<b>"If you provide additional information about the onset of your symptoms, this will also be shared."</b>"</string>
<!-- YTXT: Body for consent sub section your consent subtext fourth point -->
<string name="submission_consent_your_consent_subsection_fourth_point" translatable="false">"<b>"You can withdraw your consent at any time. The setting for this can be found under "Display Test". Before sharing your test result, you will be reminded of your consent."</b>"</string>
<string name="submission_consent_your_consent_subsection_fourth_point" translatable="false">"You can withdraw your consent at any time. The setting for this can be found under "Display Test". Before sharing your test result, you will be reminded of your consent."</string>
<!-- YTXT: Body for your consent screen agreement share test results -->
<string name="submission_your_consent_agreement_share_test_results" translatable="false">"<b>"If you have tested positive for coronavirus, the app will share your test result in order to warn other users whom you have encountered.</b>\n\n<b>This warning only affects users who were simultaneously checked in at the same event or place as you and users of coronavirus apps in the following countries:</b>"</string>
<!-- YTXT: Body for your consent screen agreement share symptoms -->
Expand Down