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

Update text / consent icons (EXPOSUREAPP-12313) #4977

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Update text / consent icons (EXPOSUREAPP-12313) #4977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
324bdb1
Update text / consent icons
mtwalli Mar 22, 2022
d6f497f
Merge branch 'release/2.21.x' into feature/12313-text-icons
mtwalli Mar 23, 2022
ec48df9
Merge branch 'release/2.21.x' into feature/12313-text-icons
SamuraiKek Mar 24, 2022
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
12 changes: 12 additions & 0 deletions Corona-Warn-App/src/main/res/drawable-night/ic_qr_1x_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M0,15.6341a16,15.6341 0,1 0,32 0a16,15.6341 0,1 0,-32 0z"
android:fillColor="#434445"/>
<path
android:pathData="M9.3333,11.3906H12.6667V19.724H11V13.0573H9.3333V11.3906ZM19.1917,15.324L21.55,11.3906H19.6083L18.225,13.699L16.8333,11.3906H14.8917L17.25,15.324L14.6083,19.724H16.55L18.2167,16.9406L19.8833,19.724H21.8333L19.1917,15.324Z"
android:fillColor="#83D2F2"/>
</vector>
12 changes: 12 additions & 0 deletions Corona-Warn-App/src/main/res/drawable-night/ic_star_checkmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M0,15.6341a16,15.6341 0,1 0,32 0a16,15.6341 0,1 0,-32 0z"
android:fillColor="#434445"/>
<path
android:pathData="M26.8052,15.8673L24.4084,13.1267L24.7424,9.502L21.1964,8.6966L19.3398,5.5532L16,6.9874L12.6602,5.5532L10.8037,8.6867L7.2576,9.4824L7.5916,13.1169L5.1948,15.8673L7.5916,18.6079L7.2576,22.2424L10.8037,23.0478L12.6602,26.1813L16,24.7374L19.3398,26.1715L21.1964,23.038L24.7424,22.2325L24.4084,18.6079L26.8052,15.8673ZM14.1239,20.5037L10.3911,16.7612L11.8449,15.3074L14.1239,17.5961L19.8703,11.8301L21.3241,13.2839L14.1239,20.5037Z"
android:fillColor="#83D2F2"/>
</vector>
17 changes: 10 additions & 7 deletions Corona-Warn-App/src/main/res/drawable/ic_qr_1x_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="18.461538dp"
android:viewportWidth="13"
android:viewportHeight="10">
<path
android:fillColor="#007FAD"
android:pathData="M0.3335,0.833H3.6668V9.1663H2.0002V2.4997H0.3335V0.833ZM10.1918,4.7663L12.5502,0.833H10.6085L9.2252,3.1413L7.8335,0.833H5.8918L8.2502,4.7663L5.6085,9.1663H7.5502L9.2168,6.383L10.8835,9.1663H12.8335L10.1918,4.7663Z" />
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M0,15.783a16,15.6341 0,1 0,32 0a16,15.6341 0,1 0,-32 0z"
android:fillColor="#F5F5F5"/>
<path
android:pathData="M9.3333,11.5396H12.6667V19.8729H11V13.2062H9.3333V11.5396ZM19.1917,15.4729L21.55,11.5396H19.6083L18.225,13.8479L16.8333,11.5396H14.8917L17.25,15.4729L14.6083,19.8729H16.55L18.2167,17.0896L19.8833,19.8729H21.8333L19.1917,15.4729Z"
android:fillColor="#007FAD"/>
</vector>
13 changes: 8 additions & 5 deletions Corona-Warn-App/src/main/res/drawable/ic_star_checkmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="21dp"
android:viewportWidth="22"
android:viewportHeight="21">
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M21.6104,10.3141L19.2136,7.5735L19.5476,3.9488L16.0015,3.1433L14.145,0L10.8052,1.4341L7.4654,0L5.6089,3.1335L2.0628,3.9292L2.3968,7.5636L0,10.3141L2.3968,13.0547L2.0628,16.6891L5.6089,17.4946L7.4654,20.6281L10.8052,19.1842L14.145,20.6183L16.0015,17.4848L19.5476,16.6793L19.2136,13.0547L21.6104,10.3141ZM8.929,14.9505L5.1963,11.2079L6.6501,9.7542L8.929,12.0429L14.6754,6.2768L16.1292,7.7306L8.929,14.9505Z"
android:pathData="M0,16.1873a16,15.6341 0,1 0,32 0a16,15.6341 0,1 0,-32 0z"
android:fillColor="#F5F5F5"/>
<path
android:pathData="M26.6104,16.8673L24.2136,14.1267L24.5476,10.502L21.0015,9.6966L19.145,6.5532L15.8052,7.9874L12.4654,6.5532L10.6089,9.6867L7.0628,10.4824L7.3968,14.1169L5,16.8673L7.3968,19.6079L7.0628,23.2424L10.6089,24.0478L12.4654,27.1813L15.8052,25.7374L19.145,27.1715L21.0015,24.038L24.5476,23.2325L24.2136,19.6079L26.6104,16.8673ZM13.929,21.5037L10.1963,17.7612L11.6501,16.3074L13.929,18.5961L19.6754,12.8301L21.1292,14.2839L13.929,21.5037Z"
android:fillColor="#007FAD"/>
</vector>
14 changes: 4 additions & 10 deletions Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,10 @@

<ImageView
android:id="@+id/submission_consent_icon_single_test"
android:layout_width="@dimen/circle_icon"
android:layout_height="@dimen/circle_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:background="@drawable/circle"
android:backgroundTint="@color/card_dark"
android:importantForAccessibility="no"
android:padding="8dp"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_body"
app:srcCompat="@drawable/ic_qr_1x_test" />
Expand All @@ -55,13 +52,10 @@

<ImageView
android:id="@+id/submission_star_checkmark"
android:layout_width="@dimen/circle_icon"
android:layout_height="@dimen/circle_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:background="@drawable/circle"
android:backgroundTint="@color/card_dark"
android:importantForAccessibility="no"
android:padding="8dp"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result_scan_test_only_once"
app:srcCompat="@drawable/ic_star_checkmark" />
Expand Down
2 changes: 1 addition & 1 deletion Corona-Warn-App/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ Sollten Sie den Test in der App gelöscht haben, können Sie ihn aus dem Papierk
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"QR-Code scannen"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
<string name="submission_dispatcher_qr_card_text">"Erhalten Sie Ihr Testergebnis in der App und warnen Sie andere oder fordern Sie Ihr COVID-Testzertifikat an."</string>
<string name="submission_dispatcher_qr_card_text">"Erhalten Sie Ihr Testergebnis und das Ihrer Familienmitglieder und fordern Sie Ihr COVID-Testzertifikat an."</string>
<!-- XHED: Dispatcher text for test center option -->
<string name="submission_dispatcher_card_test_center">"Testmöglichkeit finden"</string>
<!-- YTXT: Body text for test center dispatcher option -->
Expand Down