diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
index 2b26669bfa76401e1dd1077238d59bb459a728a1..d5c825cb6f4a0e3a7d42923f7cc5da947aae2b6d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
@@ -506,7 +506,7 @@ fun formatBehaviorIcon(riskLevelScore: Int?): Int {
val appContext = CoronaWarnApplication.getAppContext()
return when (riskLevelScore) {
RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF,
- RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS -> appContext.getColor(R.color.colorPrimary)
+ RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS -> appContext.getColor(R.color.colorTextSemanticNeutral)
else -> appContext.getColor(R.color.stableIconColor)
}
}
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_mask.xml b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_mask.xml
index cf71a2875b89e0e56b7d680ba820dd3ecd446aec..5dc085308f4c95090db8c7af131ffaca94a37193 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_mask.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_mask.xml
@@ -1,20 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="28dp"
- android:height="28dp"
- android:viewportWidth="28"
- android:viewportHeight="28">
- <path
- android:fillColor="#3C4143"
- android:fillType="nonZero"
- android:pathData="M14,5.4091C12.4524,5.4091 7,6.0455 7,12.4091L7,14.9545L7,15.5909C7,16.5561 7.4227,17.2433 7.8539,17.6206C8.1168,17.8506 8.2268,17.8542 8.4032,17.9238C8.6329,18.5174 10.0958,21.9065 13.9267,21.9508C13.951,21.9535 13.9755,21.9546 14,21.9546C14.0253,21.9548 14.0506,21.9536 14.0758,21.9508C17.9048,21.905 19.3671,18.5173 19.5968,17.9238C19.7732,17.8542 19.8832,17.8506 20.1461,17.6206C20.5773,17.2433 21,16.5561 21,15.5909L21,14.3182L21,12.4091C21,9.8636 19.7273,6.6818 17.1818,6.6818C17.1818,6.6818 16.5455,5.4091 14,5.4091ZM17.1818,9.2273C17.1818,9.2273 19.0909,10.9836 19.0909,14.9545L19.7273,14.9545L19.7273,15.5909C19.7273,16.2167 19.5136,16.484 19.3084,16.6635C19.1033,16.843 18.9368,16.8823 18.9368,16.8823L18.5975,16.9668L18.4869,17.2987C18.4869,17.2987 17.3939,20.6818 14,20.6818C10.6061,20.6818 9.5131,17.2987 9.5131,17.2987L9.4025,16.9668L9.0632,16.8823C9.0632,16.8823 8.8967,16.843 8.6916,16.6635C8.4864,16.484 8.2727,16.2167 8.2727,15.5909L8.2727,14.9545L8.9091,14.9545C8.9091,10.5 15.2727,13.6818 17.1818,9.2273ZM11.1364,14.3182C10.6092,14.3182 10.1818,14.7455 10.1818,15.2727C10.1818,15.7999 10.6092,16.2273 11.1364,16.2273C11.6635,16.2273 12.0909,15.7999 12.0909,15.2727C12.0909,14.7455 11.6635,14.3182 11.1364,14.3182ZM16.8636,14.3182C16.3365,14.3182 15.9091,14.7455 15.9091,15.2727C15.9091,15.7999 16.3365,16.2273 16.8636,16.2273C17.3908,16.2273 17.8182,15.7999 17.8182,15.2727C17.8182,14.7455 17.3908,14.3182 16.8636,14.3182Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
- <path
- android:fillColor="#FFFFFF"
- android:fillType="evenOdd"
- android:pathData="M8.6834,17.802C10.3302,17.802 11.6804,17.4543 12.7339,16.7589L12.7339,16.7589C13.3893,16.3262 14.2372,16.3172 14.9017,16.7358C16.0301,17.4466 17.5017,17.802 19.3166,17.802C18.1496,19.6049 18.1381,22.1385 13.8049,22.1385C9.4717,22.1385 9.7883,19.4673 8.6834,17.802Z"
- android:strokeWidth="1.6"
- android:strokeColor="#3C4143"
- android:strokeLineCap="round"
- android:strokeLineJoin="round" />
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M11.8795,1.35C11.5912,1.35 11.3113,1.3606 11.0387,1.3812C11.0286,1.382 11.0194,1.384 11.0093,1.3848C7.2436,1.68 5.0005,3.9281 4.7303,7.6842C4.7113,7.9406 4.7018,8.2026 4.7018,8.4698C4.7018,9.1394 4.9291,10.278 5.1788,11.2294C5.2594,11.5515 5.3355,11.8215 5.4107,12.064C5.2779,12.1752 5.1507,12.2491 5.021,12.4465C4.8013,12.7809 4.6381,13.2577 4.7045,13.8223C4.7048,13.8223 4.7051,13.8223 4.7054,13.8223C4.8133,14.7378 5.1011,15.3573 5.3812,15.7483C5.5814,16.0277 5.6986,16.084 5.8065,16.1611C5.9491,16.9706 6.4615,17.9228 7.2251,18.8967C8.0323,19.926 9.0885,20.9129 10.2496,21.4646C10.6679,21.9879 11.2869,22.35 12.0061,22.35C12.725,22.35 13.3433,21.9882 13.7618,21.4655C14.9201,20.913 15.9701,19.9239 16.772,18.894C17.5292,17.9214 18.0364,16.9707 18.179,16.1638C18.2902,16.087 18.4049,16.0349 18.6061,15.7608C18.8907,15.3729 19.1835,14.7549 19.2918,13.8384C19.3584,13.2719 19.1915,12.7929 18.9699,12.4554C18.8379,12.2546 18.7089,12.178 18.574,12.064C18.7528,11.4893 18.8959,10.9299 19.0091,10.3841C19.031,10.2813 19.0547,10.1867 19.0751,10.0801C19.1016,9.9386 19.1281,9.7976 19.15,9.6583C19.1558,9.6218 19.1613,9.5855 19.1669,9.5487C19.1882,9.4065 19.2067,9.2658 19.2231,9.126C19.2308,9.0619 19.2386,8.9984 19.2454,8.9334C19.2601,8.7905 19.2715,8.6493 19.2811,8.509C19.2849,8.4532 19.2896,8.3985 19.2927,8.3423C19.3036,8.1391 19.3105,7.9385 19.3105,7.7413C19.3105,7.5401 19.2977,7.338 19.2784,7.1359C19.2763,7.115 19.2753,7.0954 19.273,7.0744C19.2486,6.8426 19.2111,6.612 19.1607,6.3851C19.1596,6.3801 19.1582,6.375 19.1571,6.37C19.1327,6.2615 19.1055,6.1543 19.0751,6.0481C19.0667,6.0183 19.0573,5.9887 19.0483,5.9589C19.0206,5.8676 18.9915,5.777 18.9592,5.6878C18.9427,5.6418 18.9236,5.5964 18.9057,5.5505C18.8799,5.4853 18.8547,5.4199 18.8263,5.3562C18.7887,5.2704 18.7463,5.1864 18.7033,5.102C18.6927,5.0816 18.6829,5.0607 18.6721,5.0405C18.6503,4.9994 18.6318,4.9572 18.6088,4.9166C18.5719,4.8517 18.5287,4.7897 18.4875,4.7267C18.4857,4.7239 18.4839,4.7213 18.4822,4.7186C18.4271,4.635 18.3682,4.5538 18.3056,4.4743C18.2757,4.4355 18.245,4.3977 18.2138,4.3602C18.1809,4.3219 18.1478,4.284 18.113,4.247C17.5737,3.6525 16.8487,3.2481 15.9187,3.185C15.5431,2.6288 14.6018,1.6168 12.6642,1.3955C12.6281,1.3912 12.5903,1.3884 12.5536,1.3848C12.4689,1.3766 12.3852,1.3676 12.2968,1.3625C12.1616,1.3544 12.0226,1.35 11.8795,1.35ZM15.4274,7.0021C15.8711,7.7093 16.5714,9.0537 16.5714,10.4849C16.5784,11.1357 16.7932,12.1528 17.4942,12.5125C16.6691,13.215 15.7404,13.8027 14.8594,14.2316C13.7643,14.7646 12.7264,15.0457 12.1479,15.0457C11.5213,15.0457 10.437,14.7759 9.2911,14.2637C8.3695,13.8518 7.399,13.2862 6.5341,12.607C7.0873,12.204 7.3145,11.111 7.4409,10.4804C7.7267,9.0552 9.2949,8.6543 11.5496,8.6543C13.6734,8.6543 14.864,7.6705 15.4274,7.0021ZM9.4953,12.3065C9.1171,12.3065 8.8105,12.6131 8.8105,12.9913C8.8105,13.3695 9.1171,13.6761 9.4953,13.6761C9.8735,13.6761 10.1801,13.3695 10.1801,12.9913C10.1801,12.6131 9.8735,12.3065 9.4953,12.3065ZM14.517,12.3065C14.1388,12.3065 13.8322,12.6131 13.8322,12.9913C13.8322,13.3695 14.1388,13.6761 14.517,13.6761C14.8952,13.6761 15.2018,13.3695 15.2018,12.9913C15.2018,12.6131 14.8952,12.3065 14.517,12.3065ZM18.2628,13.0555C18.3581,13.232 18.4188,13.4449 18.385,13.7323C18.2932,14.5078 18.0608,14.9611 17.8705,15.2204C17.6801,15.4799 17.5753,15.5227 17.5753,15.5227C17.4408,15.5938 17.3506,15.7272 17.3346,15.8784C17.2872,16.3299 16.7994,17.3725 16.0515,18.3331C15.9854,18.4181 15.9075,18.4987 15.8375,18.5828C15.6303,17.3908 15.4624,15.9737 15.9526,14.6819C16.7438,14.2388 17.5392,13.697 18.2628,13.0555ZM5.6969,13.1054C6.3638,13.6617 7.0918,14.1403 7.8234,14.5445C8.3558,15.8133 8.2201,17.2193 8.0196,18.4214C7.9956,18.3915 7.9673,18.3631 7.9438,18.3331C7.1902,17.3721 6.6988,16.3278 6.6518,15.8784C6.636,15.7302 6.5488,15.5991 6.4182,15.5271C6.4182,15.5271 6.3135,15.4815 6.124,15.2168C5.9344,14.9522 5.7029,14.4926 5.6113,13.7153L5.6122,13.7153C5.5822,13.4602 5.6233,13.2658 5.6969,13.1054Z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_sneeze.xml b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_sneeze.xml
index e7ecd1c92a795f0f8d4993b8ac9c888a5051f0c6..dc5896ac243a9840d8d1588c1331c4f060a786b8 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_sneeze.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_sneeze.xml
@@ -1,18 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="28dp"
- android:height="28dp"
- android:viewportWidth="28"
- android:viewportHeight="28">
- <path
- android:fillColor="#404040"
- android:fillType="nonZero"
- android:pathData="M5.415,3.8182C5.4126,3.8201 5.4115,3.8206 5.4091,3.8232L5.4091,20.3636L7.8439,20.3636L7.8439,19.5768C7.8439,18.9894 8.348,18.0001 8.902,18.0968L10.0861,18.3031C10.8238,18.4317 11.496,17.8373 11.496,17.0552L11.496,16.4349L10.3916,16.251C9.9759,16.181 9.6775,15.9722 9.6775,15.5324C9.6775,15.0926 9.9759,15.0938 10.3916,15.0237L11.276,15.0237C11.385,15.0237 11.4739,14.9365 11.4759,14.8275L11.496,13.7518L11.496,13.7518L12.8787,13.3383C13.1407,13.261 13.3217,13.0113 13.3221,12.7267C13.322,12.5668 13.2643,12.4128 13.1604,12.2954L11.4723,10.1798C11.2245,6.6145 8.9036,3.8206 5.415,3.8182ZM15.1482,13.9995C14.812,13.9995 14.5395,14.2845 14.5395,14.6359C14.5395,14.9874 14.812,15.2723 15.1482,15.2723C15.4844,15.2723 15.7569,14.9874 15.7569,14.6359C15.7569,14.2845 15.4844,13.9995 15.1482,13.9995ZM13.3221,15.2723C12.986,15.2723 12.7134,15.5573 12.7134,15.9088C12.7134,16.2602 12.986,16.5452 13.3221,16.5452C13.6583,16.5452 13.9308,16.2602 13.9308,15.9088C13.9308,15.5573 13.6583,15.2723 13.3221,15.2723ZM16.9743,15.2723C16.6381,15.2723 16.3656,15.5573 16.3656,15.9088C16.3656,16.2602 16.6381,16.5452 16.9743,16.5452C17.3105,16.5452 17.583,16.2602 17.583,15.9088C17.583,15.5573 17.3105,15.2723 16.9743,15.2723ZM15.1482,16.5452C14.812,16.5452 14.5395,16.8301 14.5395,17.1816C14.5395,17.5331 14.812,17.818 15.1482,17.818C15.4844,17.818 15.7569,17.5331 15.7569,17.1816C15.7569,16.8301 15.4844,16.5452 15.1482,16.5452ZM16.9743,17.818C16.6381,17.818 16.3656,18.1029 16.3656,18.4544C16.3656,18.8059 16.6381,19.0908 16.9743,19.0908C17.3105,19.0908 17.583,18.8059 17.583,18.4544C17.583,18.1029 17.3105,17.818 16.9743,17.818Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
- <path
- android:fillColor="#404040"
- android:fillType="nonZero"
- android:pathData="M12.5622,22.3406C10.9452,22.3406 10.4697,21.5998 10.4381,20.6937C10.4064,19.7875 11.2931,19.0056 12.9245,18.2763C15.1482,16.5452 15.712,16.8488 16.4725,15.8007C14.7327,14.2932 15.553,12.4303 14.7744,11.0264C14.1532,11.2182 13.7362,10.8623 13.5176,10.7033L12.4454,10.43C12.3927,10.4174 12.3442,10.3953 12.3015,10.3644C12.0759,10.2003 12.0632,9.8326 12.2732,9.5431C12.417,9.3453 13.3152,9.8102 13.5176,9.8216L13.8501,9.2687L13.7422,8.621L12.3351,8.2654C12.2797,8.253 12.2287,8.2302 12.1842,8.1978C11.9585,8.0336 11.9458,7.6659 12.1559,7.3765C12.261,7.2319 12.4081,7.1278 12.5622,7.0888L14.4944,6.6535L14.517,6.6559C14.6798,6.5945 14.8431,6.6091 14.9635,6.696L16.1893,7.5877C16.31,7.6753 16.375,7.8268 16.3669,8.0016C16.3683,8.0569 16.3934,9.0038 16.5058,9.3881C16.8141,10.4387 17.1637,10.7983 18.0427,11.9245C18.9065,13.0318 19.116,14.2927 19.6866,14.9454C19.836,15.1081 19.8455,15.3841 19.7102,15.6287C19.7094,15.6306 19.7096,15.6337 19.7088,15.6356C19.3564,16.5452 19.1182,17.1816 18.5438,18.1081C17.9695,19.0347 16.9769,20.2308 16.3669,20.6937C15.7569,21.1565 14.1792,22.3406 12.5622,22.3406Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M9.0652,2.7196C3.8563,2.7196 2,6.5001 2,10.0378C2,12.402 2.5774,13.3497 3.1345,14.2651C3.6695,15.1414 4.1739,15.9719 4.1739,18.2274L4.1739,20.5457C4.1739,20.7851 4.3692,20.9804 4.6087,20.9804L10.2609,20.9804C10.5003,20.9804 10.6957,20.7851 10.6957,20.5457L10.6957,20.1109C10.6957,20.1109 11.91,20.9804 13.3043,20.9804C13.7748,20.9804 15.913,20.6357 15.913,18.8065C15.913,18.6486 15.9895,18.5518 16.1168,18.4125C16.2731,18.2376 16.4888,17.9964 16.2188,17.5276C16.054,17.2423 15.7466,17.0674 15.4171,17.0674L15.356,17.0674C15.3475,17.0674 15.3373,17.0674 15.3288,17.0674C13.7816,17.0572 12.0017,16.9468 12.5791,15.7274C12.9783,14.8935 14.0296,14.8935 15.0435,14.8935L16.3478,14.8935C16.4905,14.8935 16.6247,14.8221 16.7062,14.705C16.786,14.5878 16.8047,14.4366 16.7537,14.3024C16.6026,13.9084 16.6552,14.0324 16.6977,13.8863L17.9562,13.134C18.216,12.9913 18.4029,12.7552 18.481,12.4733C18.5591,12.1931 18.5234,11.8976 18.3791,11.6394C18.3604,11.6054 18.3383,11.5749 18.3128,11.5494L16.3478,9.5012C16.3342,7.4631 15.7245,5.7783 14.5798,4.6234C13.3298,3.3599 11.4735,2.7196 9.0652,2.7196ZM11.966,9.243C12.0221,9.2379 12.0798,9.2447 12.1376,9.2634L14.7463,10.1329C14.9738,10.2094 15.0978,10.4556 15.0214,10.6832C14.9603,10.8649 14.7904,10.9804 14.6087,10.9804C14.5628,10.9804 14.517,10.9719 14.4711,10.9584L11.8624,10.0888C11.6349,10.0124 11.5126,9.7661 11.5873,9.5385C11.645,9.3687 11.7962,9.2566 11.966,9.243ZM21.5652,13.1543C21.3257,13.1543 21.1304,13.3497 21.1304,13.5891C21.1304,13.8286 21.3257,14.0239 21.5652,14.0239C21.8047,14.0239 22,13.8286 22,13.5891C22,13.3497 21.8047,13.1543 21.5652,13.1543ZM20.2609,14.0239C20.0214,14.0239 19.8261,14.2192 19.8261,14.4587C19.8261,14.6982 20.0214,14.8935 20.2609,14.8935C20.5003,14.8935 20.6957,14.6982 20.6957,14.4587C20.6957,14.2192 20.5003,14.0239 20.2609,14.0239ZM18.9565,14.8935C18.7171,14.8935 18.5217,15.0888 18.5217,15.3283C18.5217,15.5677 18.7171,15.763 18.9565,15.763C19.196,15.763 19.3913,15.5677 19.3913,15.3283C19.3913,15.0888 19.196,14.8935 18.9565,14.8935ZM21.5652,14.8935C21.3257,14.8935 21.1304,15.0888 21.1304,15.3283C21.1304,15.5677 21.3257,15.763 21.5652,15.763C21.8047,15.763 22,15.5677 22,15.3283C22,15.0888 21.8047,14.8935 21.5652,14.8935ZM17.6522,15.763C17.4127,15.763 17.2174,15.9584 17.2174,16.1978C17.2174,16.4373 17.4127,16.6326 17.6522,16.6326C17.8916,16.6326 18.087,16.4373 18.087,16.1978C18.087,15.9584 17.8916,15.763 17.6522,15.763ZM20.2609,15.763C20.0214,15.763 19.8261,15.9584 19.8261,16.1978C19.8261,16.4373 20.0214,16.6326 20.2609,16.6326C20.5003,16.6326 20.6957,16.4373 20.6957,16.1978C20.6957,15.9584 20.5003,15.763 20.2609,15.763ZM18.9565,16.6326C18.7171,16.6326 18.5217,16.8279 18.5217,17.0674C18.5217,17.3069 18.7171,17.5022 18.9565,17.5022C19.196,17.5022 19.3913,17.3069 19.3913,17.0674C19.3913,16.8279 19.196,16.6326 18.9565,16.6326ZM21.5652,16.6326C21.3257,16.6326 21.1304,16.8279 21.1304,17.0674C21.1304,17.3069 21.3257,17.5022 21.5652,17.5022C21.8047,17.5022 22,17.3069 22,17.0674C22,16.8279 21.8047,16.6326 21.5652,16.6326ZM20.2609,17.5022C20.0214,17.5022 19.8261,17.6975 19.8261,17.937C19.8261,18.1764 20.0214,18.3717 20.2609,18.3717C20.5003,18.3717 20.6957,18.1764 20.6957,17.937C20.6957,17.6975 20.5003,17.5022 20.2609,17.5022ZM21.5652,18.3717C21.3257,18.3717 21.1304,18.5671 21.1304,18.8065C21.1304,19.046 21.3257,19.2413 21.5652,19.2413C21.8047,19.2413 22,19.046 22,18.8065C22,18.5671 21.8047,18.3717 21.5652,18.3717Z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_wash.xml b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_wash.xml
index 7caf0f892425c53076eb625d78b337afc93cc62b..0e7eae98224589f6f81c3a82475b3d1882a7246d 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_wash.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_wash.xml
@@ -1,12 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="28dp"
- android:height="28dp"
- android:viewportWidth="28"
- android:viewportHeight="28">
- <path
- android:fillColor="#3C4143"
- android:fillType="nonZero"
- android:pathData="M9.8636,6.3636L9.8636,7C9.8636,7.3519 10.1481,7.6364 10.5,7.6364L12.782,7.6364L8.7773,11.641C8.5285,11.8898 8.5285,12.292 8.7773,12.5408C9.0262,12.7897 9.4284,12.7897 9.6772,12.5408L12.1456,10.0724L12.5185,10.4453L9.4137,13.5501C9.1649,13.7989 9.1649,14.2011 9.4137,14.4499C9.5378,14.574 9.7007,14.6364 9.8636,14.6364C10.0265,14.6364 10.1895,14.574 10.3136,14.4499L13.4183,11.3452L13.7912,11.718L11.3228,14.1864C11.074,14.4353 11.074,14.8375 11.3228,15.0863C11.4469,15.2104 11.6098,15.2727 11.7727,15.2727C11.9356,15.2727 12.0986,15.2104 12.2227,15.0863L14.6911,12.6179L15.0639,12.9908L13.8683,14.1864C13.6194,14.4353 13.6194,14.8375 13.8683,15.0863C13.9923,15.2104 14.1553,15.2727 14.3182,15.2727C14.4811,15.2727 14.644,15.2104 14.7681,15.0863L18.1239,11.7305C18.9779,10.8765 18.9779,9.4872 18.1239,8.6332L16.502,7.0112C16.1494,6.6586 15.6437,6.3636 14.9545,6.3636L11.7727,6.3636L10.5,6.3636L9.8636,6.3636ZM21.2958,7.6127C20.9817,7.6256 20.724,7.8658 20.6893,8.1783L19.255,17.7337C17.7883,17.4574 16.8636,16.5455 16.8636,16.5455C16.8636,16.5455 15.5909,17.8182 13.6818,17.8182C11.7727,17.8182 10.505,16.5455 10.505,16.5455C10.505,16.5455 9.5393,17.4492 8.1074,17.7299L6.6744,8.1783C6.6328,7.8713 6.3762,7.6388 6.0666,7.6277C5.876,7.621 5.6924,7.7003 5.5665,7.8435C5.4406,7.9868 5.3855,8.179 5.4165,8.3672L7.1628,20.0107C7.3024,20.9405 8.1105,21.6364 9.0508,21.6364L18.3129,21.6364C19.2531,21.6364 20.0621,20.941 20.2008,20.0107L21.9471,8.3672C21.9832,8.1765 21.9304,7.9797 21.8036,7.8328C21.6767,7.6858 21.4898,7.6048 21.2958,7.6127Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M16.0026,0.85L15.6203,1.4088C15.3115,1.8537 14.5909,2.9548 14.5909,3.5559C14.5909,4.3335 15.2251,4.9676 16.0026,4.9676C16.7802,4.9676 17.4144,4.3335 17.4144,3.5559C17.4144,2.9548 16.6938,1.8537 16.385,1.4088L16.0026,0.85ZM20.0026,2.0265L19.6203,2.5853C19.3243,3.0136 18.3556,4.464 18.3556,5.2029C18.3556,6.111 19.0946,6.85 20.0026,6.85C20.9107,6.85 21.6497,6.111 21.6497,5.2029C21.6497,4.464 20.681,3.0136 20.385,2.5853L20.0026,2.0265ZM8.8115,4.0265C8.703,4.0393 8.6074,4.0926 8.5321,4.1735C8.3813,4.3353 4.8151,8.1423 4.3115,8.7912C3.7949,9.4566 2.5412,12.2397 2.3997,12.5559C2.374,12.611 2.3574,12.6717 2.3556,12.7324C2.3519,12.8316 2.2931,14.5375 2.6791,16.1C2.9493,14.986 3.3482,13.5191 3.5909,12.9676C3.953,12.1478 6.5504,7.4254 6.5762,7.3794C6.7912,6.9915 7.192,6.7342 7.635,6.6735C7.6975,6.6643 7.749,6.6588 7.8115,6.6588C8.1901,6.6588 8.5615,6.8151 8.8262,7.0853L9.1644,7.4235C9.1736,7.4327 9.1718,7.4437 9.1791,7.4529C9.7251,6.6312 10.1056,5.6809 9.5173,4.6735L9.2821,4.2618C9.2067,4.1331 9.0762,4.043 8.9291,4.0265C8.8923,4.0228 8.8482,4.0228 8.8115,4.0265ZM17.0615,6.9235C16.9843,6.9309 16.8942,6.9493 16.8115,6.9676L9.8997,8.6294C10.1442,9.3886 10.0486,10.1478 9.885,10.7324L16.4879,7.3353C16.76,7.1956 17.0523,7.1294 17.3409,7.1294C17.7287,7.1294 18.0541,7.2581 18.3262,7.4382C18.0357,7.111 17.6056,6.8757 17.0615,6.9235ZM7.7526,7.6C7.6056,7.6202 7.4714,7.7048 7.3997,7.8353C7.2931,8.0283 4.7747,12.5982 4.4438,13.35C4.1037,14.1202 3.3574,17.2746 3.2968,17.6147C3.2949,17.6349 3.2986,17.6551 3.2968,17.6735C3.0982,21.3702 5.8776,22.6018 5.9879,22.6588C6.0284,22.679 6.0615,22.6938 6.1056,22.7029C6.1368,22.7085 6.9034,22.85 7.9438,22.85C9.2324,22.85 10.3556,22.6349 11.2821,22.2029C11.4273,22.1349 12.7526,21.4548 14.0321,20.8059L20.2232,17.6735C20.6681,17.4511 20.8427,16.9254 20.6203,16.4824C20.3979,16.0412 19.8574,15.8482 19.4144,16.0706L16.9291,17.3353L15.635,17.9824C15.567,18.0154 15.5008,18.0265 15.4291,18.0265C15.2563,18.0265 15.0854,17.9272 15.0026,17.7618C14.8868,17.5301 14.9769,17.2452 15.2085,17.1294L20.8115,14.3206C21.1699,14.0706 21.3078,13.5908 21.1056,13.1882C20.9071,12.793 20.4567,12.6092 20.0468,12.7324L14.7085,15.4088C14.6405,15.4419 14.5725,15.4529 14.5026,15.4529C14.3298,15.4529 14.1589,15.3537 14.0762,15.1882C13.9604,14.9566 14.0504,14.6717 14.2821,14.5559L20.2526,11.5706C20.6699,11.3371 20.8354,10.8243 20.6203,10.3941C20.3979,9.9529 19.8574,9.7746 19.4144,9.9971L14.6203,12.4088L13.1644,13.1588C13.0964,13.1938 13.0302,13.2029 12.9585,13.2029C12.7876,13.2029 12.6148,13.1018 12.5321,12.9382C12.4144,12.7066 12.5063,12.4235 12.7379,12.3059L14.2232,11.5559L14.2085,11.5412L17.8556,9.7029C18.3004,9.4805 18.4751,8.9401 18.2526,8.4971C18.0302,8.0559 17.4898,7.8776 17.0468,8.1L8.135,12.6L8.7232,11.1882C8.9935,10.5301 9.5504,9.157 8.4879,8.0706L8.1497,7.7324C8.0449,7.6257 7.8997,7.5816 7.7526,7.6Z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_increased_risk.xml b/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_increased_risk.xml
index 7085f890b1c0411aeadf0083a353785a119cab70..32fe7197cf62d3fdf4901937c10477980d8eb3a9 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_increased_risk.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_increased_risk.xml
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
app:body="@{@string/risk_details_behavior_body_contact_doctor}"
- app:icon="@{@drawable/ic_risk_details_stethoscope}"
+ app:icon="@{@drawable/ic_risk_details_contact}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/risk_details_behavior_stay_away"
@@ -68,7 +68,7 @@
<TextView
android:id="@+id/risk_details_behavior_bullet_point_1"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/risk_details_behavior_increased_body_1"
@@ -78,7 +78,7 @@
<TextView
android:id="@+id/risk_details_behavior_bullet_point_2"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
@@ -89,7 +89,7 @@
<TextView
android:id="@+id/risk_details_behavior_bullet_point_3"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml b/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml
index a49d6b9dadf75dcc52522cdf5205dfda527d4379..3f25ee1b1a52bca155fe14e9a201da9b08996e03 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml
@@ -24,19 +24,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <ImageView
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/risk_details_behavior_icon"
- style="@style/icon"
- android:layout_width="@dimen/icon_size_risk_details_behavior"
- android:layout_height="@dimen/icon_size_risk_details_behavior"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:background="@drawable/circle"
android:backgroundTint="@{FormatterRiskHelper.formatBehaviorIconBackground(riskLevel)}"
- android:importantForAccessibility="no"
- android:src="@{icon}"
- android:tint="@{FormatterRiskHelper.formatBehaviorIcon(riskLevel)}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ style="@style/icon"
+ android:layout_width="@dimen/icon_size_risk_details_behavior"
+ android:layout_height="@dimen/icon_size_risk_details_behavior"
+ android:importantForAccessibility="no"
+ android:src="@{icon}"
+ android:tint="@{FormatterRiskHelper.formatBehaviorIcon(riskLevel)}"
+ android:layout_margin="@dimen/icon_margin_risk_details_behavior"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
<TextView
style="@style/textMultiline"
diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml
index 141c37f5ef19bd94a32cd72e2a047749c7a274d0..250329a00e5a54f559c648c082176164ff5bc168 100644
--- a/Corona-Warn-App/src/main/res/values/dimens.xml
+++ b/Corona-Warn-App/src/main/res/values/dimens.xml
@@ -59,7 +59,8 @@
<dimen name="icon_size_main_card_end">35dp</dimen>
<dimen name="icon_size_button">40dp</dimen>
<dimen name="icon_size_settings">40dp</dimen>
- <dimen name="icon_size_risk_details_behavior">35dp</dimen>
+ <dimen name="icon_size_risk_details_behavior">25dp</dimen>
+ <dimen name="icon_margin_risk_details_behavior">8dp</dimen>
<dimen name="match_constraint">0dp</dimen>
<!-- todo illustration sizes -->