From 94b25f93ae9ad4f176bc74c0abc04b28252c48be Mon Sep 17 00:00:00 2001 From: axelherbstreith <75120552+axelherbstreith@users.noreply.github.com> Date: Thu, 27 May 2021 18:17:48 +0200 Subject: [PATCH] updated contact diary entry (#3304) --- .../ic_result_pending_contact_diary.xml | 12 ++++++++++++ .../fragment_submission_test_result_pending.xml | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 Corona-Warn-App/src/main/res/drawable-night/ic_result_pending_contact_diary.xml diff --git a/Corona-Warn-App/src/main/res/drawable-night/ic_result_pending_contact_diary.xml b/Corona-Warn-App/src/main/res/drawable-night/ic_result_pending_contact_diary.xml new file mode 100644 index 000000000..665d639e5 --- /dev/null +++ b/Corona-Warn-App/src/main/res/drawable-night/ic_result_pending_contact_diary.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:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0" + android:fillColor="#434445"/> + <path + android:pathData="M28.0753,28.2529V11.4371C28.0753,9.9748 27,9 25.5,9H13.3493C12.088,9 10.9919,10.2089 11,11.4371C11,16.8684 11,22.5784 11,28.009C11,29.4713 12.0002,30.4461 13.5582,30.4461H27.5C27.5,30.4461 28,30.4461 28,29.9587C28,29.4713 28,28.9839 28,28.9839C28,28.9839 28,28.5019 27.5,28.4965C27,28.491 14.5002,28.4965 14.5002,28.4965C14.5002,28.4965 13,28.4965 13,27.0342C13,26.3653 13,26.0594 13,26.0594C13,24.5972 14.5002,24.5972 14.5002,24.5972C13.1767,24.5972 24.2552,24.5972 27,24.5972C27,24.5972 26.5,25.572 26.5,26.5468C26.5,27.1052 27,28.2529 27,28.2529C27.5,28.2529 28.0753,28.2529 28.0753,28.2529Z" + android:fillColor="#83D2F2"/> +</vector> diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml index 510bb0650..5cfaa3a49 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml @@ -108,7 +108,7 @@ android:id="@+id/test_result_pending_steps_waiting_pcr_result" android:layout_width="0dp" android:layout_height="wrap_content" - app:step_entry_final="true" + app:step_entry_final="false" app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle" app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle" app:layout_constraintTop_toBottomOf="@+id/test_result_pending_steps_rat_added" @@ -124,7 +124,7 @@ app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle" app:layout_constraintTop_toBottomOf="@+id/test_result_pending_steps_waiting_pcr_result" android:visibility="gone" - app:step_entry_final="true" + app:step_entry_final="false" app:simple_step_entry_text="@string/submission_test_result_pending_steps_waiting_rat_body" app:simple_step_entry_title="@string/submission_test_result_pending_steps_waiting_rat_heading" app:step_entry_icon="@drawable/ic_hourglass" @@ -140,7 +140,6 @@ app:simple_step_entry_text="@string/submission_test_result_pending_steps_contact_diary_body" app:simple_step_entry_title="@string/submission_test_result_pending_steps_contact_diary_heading" app:step_entry_final="true" - android:visibility="gone" app:step_entry_icon="@drawable/ic_result_pending_contact_diary" tools:visibility="visible"/> -- GitLab