diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt index c7e4bf5b4bf2cff326840419fb30556972c81e93..b575c9ccd17bd2e471dac82ef80ce54fc9687d55 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentSubmissionDispatcherBinding import de.rki.coronawarnapp.ui.BaseFragment +import de.rki.coronawarnapp.ui.main.MainActivity import de.rki.coronawarnapp.util.DialogHelper class SubmissionDispatcherFragment : BaseFragment() { @@ -33,6 +34,9 @@ class SubmissionDispatcherFragment : BaseFragment() { } private fun setButtonOnClickListener() { + binding.submissionDispatcherHeader.headerButtonBack.buttonIcon.setOnClickListener { + (activity as MainActivity).goBack() + } binding.submissionDispatcherQr.dispatcherCard.setOnClickListener { checkForDataPrivacyPermission() } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt index af9ab63b466a2b6159ab8371da8cbda72416d9bd..e3625fa8812cebf08d690423876147c8a5de8b4d 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt @@ -30,12 +30,7 @@ class SubmissionDoneFragment : BaseFragment() { } private fun setButtonOnClickListener() { - binding - .submissionDoneInclude - .submissionDoneHeader - .informationHeader - .headerButtonBack.buttonIcon - .setOnClickListener { + binding.submissionDoneHeader.headerButtonBack.buttonIcon.setOnClickListener { doNavigate( SubmissionDoneFragmentDirections.actionSubmissionDoneFragmentToMainFragment() ) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt index 527afa5328515903c9e9a994b2371f4de3c474fc..96ef049bc5e015bac99e633b48e17f772e04970a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt @@ -75,16 +75,15 @@ class SubmissionResultPositiveOtherWarningFragment : BaseFragment(), } private fun setButtonOnClickListener() { - binding.submissionPositiveOtherWarningButton.setOnClickListener { + binding.submissionPositiveOtherWarningButtonNext.setOnClickListener { initiateWarningOthers() } - binding.submissionPositiveOtherWarningHeader - .informationHeader.headerButtonBack.buttonIcon.setOnClickListener { - doNavigate( - SubmissionResultPositiveOtherWarningFragmentDirections - .actionSubmissionResultPositiveOtherWarningFragmentToSubmissionResultFragment() - ) - } + binding.submissionPositiveOtherWarningHeader.headerButtonBack.buttonIcon.setOnClickListener { + doNavigate( + SubmissionResultPositiveOtherWarningFragmentDirections + .actionSubmissionResultPositiveOtherWarningFragmentToSubmissionResultFragment() + ) + } } private fun initiateWarningOthers() { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt index 590f0cee20da901247071653289a563f0361feeb..8ab733ade2d3ac950ce9a7605b05f9fd09ca01ab 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt @@ -47,10 +47,10 @@ fun formatTestResultStatusText(uiState: DeviceUIState?): String { fun formatTestResultStatusColor(uiState: DeviceUIState?): Int { val appContext = CoronaWarnApplication.getAppContext() return when (uiState) { - DeviceUIState.PAIRED_NEGATIVE -> appContext.getColor(R.color.colorGreen) + DeviceUIState.PAIRED_NEGATIVE -> appContext.getColor(R.color.colorTextSemanticGreen) DeviceUIState.PAIRED_POSITIVE, - DeviceUIState.PAIRED_POSITIVE_TELETAN -> appContext.getColor(R.color.colorRed) - else -> appContext.getColor(R.color.colorRed) + DeviceUIState.PAIRED_POSITIVE_TELETAN -> appContext.getColor(R.color.colorTextSemanticRed) + else -> appContext.getColor(R.color.colorTextSemanticRed) } } diff --git a/Corona-Warn-App/src/main/res/drawable/card.xml b/Corona-Warn-App/src/main/res/drawable/card.xml index 46d367552bd81a1f4a8a83ff5082985d3a40252c..f8eeda3b0c331e9452b1e669dd45ea1b398baacf 100644 --- a/Corona-Warn-App/src/main/res/drawable/card.xml +++ b/Corona-Warn-App/src/main/res/drawable/card.xml @@ -3,7 +3,7 @@ <item> <shape android:shape="rectangle"> <corners android:radius="@dimen/radius_card" /> - <solid android:color="@color/colorLight" /> + <solid android:color="@color/colorSurface1" /> </shape> </item> </selector> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml b/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml index ad11fa0fafb275d293a84448f8d4afa7fae06f62..580c4fc2057cf51916c6e56321e165aa81fa44f1 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_information_illustration_contact.xml @@ -3,79 +3,94 @@ android:height="220dp" android:viewportWidth="360" android:viewportHeight="220"> + <group> + <clip-path + android:pathData="M0,0h360v220h-360z"/> + <path + android:pathData="M273.5,161.612C273.889,158.044 274.5,155.612 274.5,155.612L255.5,153.612C255.5,153.612 254.641,161.2 254.5,164.612L273.5,161.612Z" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M236.462,62.523C236.462,62.523 234.831,95.377 211.781,85.648C209.393,84.639 206.501,83.612 203.9,81.165C199.289,76.825 192.501,68.612 194.331,49.473C196.001,32.01 213.47,19.77 227.141,35.926C240.813,52.083 242.676,58.297 240.813,60.037C238.949,61.777 236.462,62.523 236.462,62.523" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M207.02,103.767C207.02,103.767 205.443,101.86 207.105,96.006C207.125,95.938 207.112,95.822 207.188,95.725C208.39,94.188 209.977,86.817 211.333,84.432L229.589,81.198C229.589,81.198 229.344,90.307 231.462,97.121C232.601,100.785 230.443,104.377 228.195,105.879C222.929,109.396 211.689,113.366 207.02,103.767" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M186.891,143.043C186.891,143.043 178.5,200.612 166.5,198.612C161.05,197.704 143.46,186.756 129.241,171.964C120.419,162.789 116.584,159.285 115.02,157.172C111.088,151.859 95.638,147.71 98.966,139.277C100.127,136.335 106.281,133.665 112.109,136.985C117.811,140.233 121.27,146.481 121.553,147.512C122.389,150.562 129.108,155.933 134.883,160.252C140.58,164.514 158.09,174.252 158.09,174.252C159.097,175.093 160.633,174.683 161.081,173.449C163.735,166.146 165.63,144.616 165.813,143.903C166.037,143.036 186.891,143.043 186.891,143.043" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <path - android:fillColor="#F4B691" - android:fillType="evenOdd" - android:pathData="M221.262,58.861C221.262,58.861 219.629,91.715 196.58,81.986C194.192,80.978 191.337,79.884 188.7,77.504C188.7,77.504 174.905,62.839 179.13,45.812C183.356,28.785 198.27,16.108 211.941,32.265C225.612,48.422 227.476,54.635 225.612,56.376C223.747,58.116 221.262,58.861 221.262,58.861" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M162.478,95.804l113.459,0l0,110.029l-113.459,0z"/> + <path + android:pathData="M231.647,97.474C231.647,97.474 230.335,101.311 226.5,103.612C216.5,109.612 208.5,102.612 207.603,98.661L207.094,95.804C207.094,95.804 179.414,102.261 171.337,111.99C167.5,116.612 165.5,119.612 162.5,148.612C162.191,151.596 165.209,153.182 166.5,153.612C171.273,155.203 181.731,154.025 184.99,153.476C185.799,153.34 186.444,152.736 186.638,151.938L187.751,147.373L189.5,137.612L188.153,205.182L248.846,205.833L253.5,140.612L254.52,154.074C254.599,155.12 255.326,155.991 256.335,156.277C261.203,157.655 272.895,155.97 274.898,155.648C275.496,155.553 275.935,155.043 275.938,154.437C275.956,148.516 275.647,119.08 267.665,112.46C258.777,105.09 231.647,97.474 231.647,97.474" + android:strokeWidth="1" + android:fillColor="#898995" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> + <path + android:pathData="M255.5,156.612C254.668,159.914 253.944,170.157 253.5,174.612C252.608,183.573 251.457,191.975 250.754,191.887C249.35,191.711 207.885,198.489 203.5,197.612C198.5,196.612 201.5,196.612 196.5,195.612C186.5,193.612 175.5,197.612 179.5,205.612C180.552,207.716 184.5,208.612 192.5,207.612C198.122,206.909 205.457,205.677 208.5,205.612C215.537,205.462 253.577,207.13 261.162,205.669C265.07,204.916 268.504,192.053 270.5,179.612C271.609,172.704 273.003,166.173 273.5,161.612L255.5,156.612Z" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M223.5,45.612C225.781,47.893 225.264,50.376 227.5,52.612C230.5,55.612 238.778,55.769 239.787,49.574C239.829,49.317 239.59,55.707 239.665,55.956C240.562,58.928 237.428,58.192 236.462,62.523C236.341,63.069 235.513,69.269 235.426,69.642C234.603,73.137 234.086,74.458 234.086,74.458C237.968,73.736 251.6,54.089 247.551,42.958C243.557,31.981 234.767,25.766 230.17,23.572C230.056,23.518 219.538,20.284 216.5,20.612C215.473,20.723 206.515,22.498 205.525,23.372C205.397,23.485 205.236,23.543 205.069,23.573C203.553,23.849 197.739,24.818 194.937,24.028C194.266,23.839 193.611,24.365 193.702,25.056C193.799,25.799 193.946,26.619 194.166,27.261C194.369,27.856 193.929,28.475 193.301,28.497C190.346,28.599 184.47,28.47 183.633,28.47C182.726,28.47 184.194,31.155 186.221,32.931C186.904,33.529 186.466,34.638 185.559,34.601C185.537,34.6 185.515,34.599 185.493,34.598C184.742,34.563 184.25,35.362 184.622,36.015C186.639,39.559 189.683,47.988 195.5,47.612C202.083,47.187 214.5,36.612 223.5,45.612" + android:strokeWidth="1" + android:fillColor="#352525" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M216.5,73.612C216.5,73.612 210.061,73.594 209.865,76.717C209.67,79.839 216.329,77.564 217.5,75.612C217.5,75.612 227.5,72.612 236.894,60.129C236.894,60.129 246.075,62.084 245.773,52.908C245.5,44.612 242.5,43.612 239.5,43.612C239.5,43.612 237.5,31.612 230.5,23.612C225.844,18.291 218.577,15.738 212.5,17.612C208.454,18.86 204.5,23.612 204.5,23.612C204.5,23.612 207.857,23.001 209.82,22.454C211.584,21.963 213.538,21.035 216.745,21.319C223.173,21.887 225.385,23.725 227.152,25.413C230.5,28.612 235.5,36.612 236.992,44.419C236.992,44.419 230.356,47.932 235.918,58.373C235.918,58.373 233.5,61.612 229.5,65.612C225.5,69.612 217.927,73.73 216.5,73.612" + android:strokeWidth="1" + android:fillColor="#C36A61" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <path - android:fillColor="#F4B691" - android:fillType="evenOdd" - android:pathData="M191.818,100.105C191.818,100.105 190.242,98.2 191.904,92.344C191.923,92.276 191.911,92.161 191.986,92.063C193.188,90.526 194.775,83.156 196.131,80.771L214.387,77.536C214.387,77.536 214.142,86.646 216.26,93.46C217.4,97.124 215.242,100.715 212.994,102.217C207.727,105.735 196.488,109.704 191.818,100.105" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <group> - <clip-path android:pathData="M79,134.837l88.229,0l0,66.655l-88.229,0z" /> - <path - android:fillColor="#F4B691" - android:fillType="evenOdd" - android:pathData="M167.229,149.188C167.229,149.188 156.844,202.359 147.712,201.482C138.583,200.604 99.777,161.445 95.562,156.354C91.348,151.262 75.821,147.745 79.582,139.497C84.324,129.104 95.385,138.794 97.142,142.658C98.898,146.521 99.549,148.268 99.549,148.268L139.23,179.673C140.283,180.458 141.792,179.965 142.173,178.71C144.428,171.273 150.793,150.264 150.938,149.542C151.113,148.665 167.229,149.188 167.229,149.188" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - </group> - <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <group> - <clip-path android:pathData="M148.654,92.142l115.057,0l0,110.029l-115.057,0z" /> - <path - android:fillColor="#8A8A96" - android:fillType="evenOdd" - android:pathData="M216.446,93.813L214.343,97.492C213.501,98.966 212.427,100.299 211.149,101.417C211.054,101.501 210.982,101.562 210.943,101.588C207.884,103.695 202.458,103.785 198.39,102.533C197.823,102.357 197.206,102.004 196.592,101.549C194.446,99.958 192.992,97.604 192.401,94.999L191.893,92.143C191.893,92.143 164.414,98.771 156.136,108.329C156.136,108.329 150.589,111.458 148.654,149.354L169.121,149.574L172.884,134.141L172.952,201.521L233.644,202.172L240.655,138.504L242.481,152.557L260.726,151.815L263.711,151.721C263.711,151.721 261.35,116.169 252.464,108.799C243.576,101.428 216.446,93.813 216.446,93.813" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - </group> - <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <group> - <clip-path android:pathData="M164.973,151.739l96.861,0l0,54.261l-96.861,0z" /> - <path - android:fillColor="#F4B691" - android:fillType="evenOdd" - android:pathData="M261.834,151.739C261.834,151.739 257.737,200.51 249.961,202.008C242.377,203.468 187.46,203.22 185.343,202.885C183.43,202.584 164.798,210.612 164.974,202.008C165.149,193.403 177.805,191.545 185.004,193.476C192.203,195.408 197.381,194.718 197.381,194.718C197.381,194.718 238.149,188.05 239.554,188.225C240.959,188.401 243.826,152.47 243.826,152.47L261.834,151.739Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - </group> - <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <path - android:fillColor="#663014" - android:fillType="evenOdd" - android:pathData="M195.074,42.706C194.97,43.245 195.529,44.388 196.722,44.388C198.334,44.388 200.516,44.587 202.272,46.354C204.545,48.643 206.372,50.635 207.807,50.941C207.854,50.951 209.709,51.516 210.727,51.652C211.712,51.785 223.577,52.107 224.586,45.913C224.628,45.656 224.389,52.046 224.465,52.295C225.36,55.267 222.227,54.53 221.261,58.861C221.139,59.407 220.312,65.608 220.224,65.98C219.401,69.476 218.885,70.797 218.885,70.797C222.767,70.074 236.399,50.428 232.349,39.297C228.355,28.319 219.565,22.105 214.969,19.911C214.855,19.857 214.756,19.785 214.674,19.689C214.072,18.983 210.774,15.728 201.45,16.25C201.386,16.254 201.323,16.264 201.261,16.279C200.261,16.535 191.313,18.837 190.324,19.711C190.197,19.823 190.035,19.882 189.868,19.912C188.352,20.187 182.538,21.157 179.736,20.366C179.065,20.178 178.41,20.704 178.501,21.394C178.597,22.138 178.745,22.958 178.965,23.6C179.168,24.194 178.728,24.813 178.1,24.835C175.145,24.937 169.269,24.809 168.431,24.809C167.524,24.809 168.993,27.494 171.02,29.269C171.704,29.868 171.265,30.977 170.358,30.94C170.336,30.939 170.314,30.938 170.292,30.937C169.541,30.902 169.049,31.7 169.421,32.353C171.438,35.897 176.138,42.807 181.956,42.431C188.54,42.005 191.38,39.626 192.107,38.892C192.265,38.732 192.47,38.637 192.692,38.619C193.62,38.546 195.836,38.762 195.074,42.706" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M0,0h360v220h-360z" /> - <group> - <clip-path android:pathData="M190.234,14l40.35,0l0,60.761l-40.35,0z" /> - <path - android:fillColor="#C46A61" - android:fillType="evenOdd" - android:pathData="M201.007,71.202C201.007,71.202 194.86,69.933 194.665,73.056C194.47,76.178 200.715,74.422 201.886,72.471C201.886,72.471 218.181,63.493 221.694,56.468C221.694,56.468 230.963,58.419 230.572,49.247C230.183,40.075 225.694,39.099 223.449,39.88C223.449,39.88 220.407,24.771 212.807,17.755C212.101,17.103 211.286,16.586 210.409,16.194C207.772,15.014 201.965,12.863 195.888,14.737C189.073,16.838 190.324,19.711 190.324,19.711C190.324,19.711 192.656,19.34 194.62,18.793C196.384,18.302 198.338,17.374 201.544,17.657C207.972,18.225 209.928,20.598 210.951,21.752C211.192,22.022 211.397,22.321 211.628,22.599C213.823,25.233 220.912,36.138 221.791,40.758C221.791,40.758 215.155,44.27 220.718,54.712C220.718,54.712 214.945,62.357 212.24,63.648C212.24,63.648 202.435,71.319 201.007,71.202" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + <clip-path + android:pathData="M83,9.4l79.69,0l0,71.289l-79.69,0z"/> + <path + android:pathData="M161.679,77.391L156.832,62.702C156.611,62.033 156.678,61.312 157.023,60.697C159.004,57.158 164.393,44.605 162.157,34.175C159.732,22.87 146.747,6.486 116.161,9.845C85.575,13.205 83.094,40.548 83.094,40.548C83.094,40.548 81.288,54.163 93.453,64.618C105.391,74.878 124.803,76.632 138.99,72.971C139.517,72.835 140.068,72.87 140.57,73.079L158.333,80.49C160.316,81.318 162.353,79.43 161.679,77.391" + android:strokeWidth="1" + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> + <path + android:pathData="M150.847,34.203L141.384,34.203C140.677,34.203 140.103,34.735 140.103,35.393L140.103,50.265C140.103,50.922 140.677,51.455 141.384,51.455L150.847,51.455C151.554,51.455 152.128,50.922 152.128,50.265L152.128,35.393C152.128,34.735 151.554,34.203 150.847,34.203" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M135.522,34.203L126.06,34.203C125.353,34.203 124.779,34.735 124.779,35.393L124.779,50.265C124.779,50.922 125.353,51.455 126.06,51.455L135.522,51.455C136.229,51.455 136.803,50.922 136.803,50.265L136.803,35.393C136.803,34.735 136.229,34.203 135.522,34.203" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M120.197,34.203L110.735,34.203C110.028,34.203 109.454,34.735 109.454,35.393L109.454,50.265C109.454,50.922 110.028,51.455 110.735,51.455L120.197,51.455C120.904,51.455 121.478,50.922 121.478,50.265L121.478,35.393C121.478,34.735 120.904,34.203 120.197,34.203" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M104.873,34.203L95.41,34.203C94.703,34.203 94.129,34.735 94.129,35.393L94.129,50.265C94.129,50.922 94.703,51.455 95.41,51.455L104.873,51.455C105.58,51.455 106.154,50.922 106.154,50.265L106.154,35.393C106.154,34.735 105.58,34.203 104.873,34.203" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml new file mode 100644 index 0000000000000000000000000000000000000000..80b69c165408b148ddb09a973c15e3ff9d228e0f --- /dev/null +++ b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_contact.xml @@ -0,0 +1,12 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M19.2118,15.2582L16.6918,14.9682C16.0818,14.8982 15.4818,15.1082 15.0518,15.5382L13.2018,17.3882C11.7828,16.6682 10.4958,15.7292 9.3838,14.6162C8.2708,13.5042 7.3318,12.2172 6.6118,10.7982L8.4618,8.9482C8.8918,8.5182 9.1018,7.9182 9.0318,7.3082L8.7418,4.7882C8.6218,3.7782 7.7718,3.0182 6.7518,3.0182L5.0218,3.0182C3.8918,3.0182 2.9518,3.9582 3.0218,5.0882C3.2868,9.3572 5.1258,13.1962 7.9648,16.0352C10.8038,18.8742 14.6428,20.7132 18.9118,20.9782C20.0418,21.0482 20.9818,20.1082 20.9818,18.9782L20.9818,17.2482C20.9818,16.2282 20.2218,15.3782 19.2118,15.2582Z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> +</vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml deleted file mode 100644 index e5a27ee2360fa67b3790d651eb4bd44183efd1b4..0000000000000000000000000000000000000000 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_intro_b.xml +++ /dev/null @@ -1,175 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="360dp" - android:height="136dp" - android:viewportWidth="360" - android:viewportHeight="136"> - <group> - <clip-path android:pathData="M0,0h360v136h-360z" /> - <path - android:fillAlpha="0.87" - android:fillColor="#000000" - android:fillType="nonZero" - android:pathData="M29.504,26L33.086,16.047L31.186,16.047L28.656,23.833L26.154,16.047L24.261,16.047L27.829,26L29.504,26ZM37.103,26.137C37.718,26.137 38.273,26.015 38.768,25.771C39.262,25.527 39.657,25.184 39.954,24.742L39.954,24.742L39.058,23.888C38.58,24.503 37.96,24.811 37.199,24.811C36.656,24.811 36.206,24.633 35.849,24.277C35.491,23.922 35.287,23.439 35.237,22.828L35.237,22.828L40.07,22.828L40.07,22.158C40.07,20.982 39.795,20.073 39.246,19.431C38.697,18.788 37.919,18.467 36.912,18.467C36.278,18.467 35.704,18.629 35.189,18.952C34.674,19.276 34.274,19.728 33.989,20.309C33.704,20.89 33.562,21.55 33.562,22.288L33.562,22.288L33.562,22.493C33.562,23.596 33.889,24.479 34.543,25.142C35.197,25.805 36.05,26.137 37.103,26.137ZM38.429,21.611L35.264,21.611C35.342,21.042 35.521,20.597 35.801,20.278C36.081,19.959 36.449,19.8 36.905,19.8C37.365,19.8 37.725,19.942 37.985,20.227C38.245,20.512 38.393,20.932 38.429,21.488L38.429,21.488L38.429,21.611ZM43.116,26L43.116,20.941C43.38,20.358 43.893,20.066 44.654,20.066C44.887,20.066 45.112,20.085 45.331,20.121L45.331,20.121L45.338,18.563C45.183,18.499 44.987,18.467 44.75,18.467C44.039,18.467 43.483,18.788 43.082,19.431L43.082,19.431L43.041,18.604L41.455,18.604L41.455,26L43.116,26ZM47.42,17.558C47.721,17.558 47.953,17.474 48.117,17.308C48.282,17.142 48.364,16.933 48.364,16.683C48.364,16.427 48.282,16.215 48.117,16.047C47.953,15.878 47.721,15.794 47.42,15.794C47.119,15.794 46.888,15.878 46.726,16.047C46.565,16.215 46.484,16.427 46.484,16.683C46.484,16.933 46.565,17.142 46.726,17.308C46.888,17.474 47.119,17.558 47.42,17.558ZM48.247,26L48.247,18.604L46.586,18.604L46.586,26L48.247,26ZM52.401,26L52.401,19.834L53.905,19.834L53.905,18.604L52.401,18.604L52.401,17.947C52.401,17.132 52.798,16.724 53.591,16.724C53.832,16.724 54.044,16.742 54.226,16.778L54.226,16.778L54.267,15.479C53.939,15.397 53.629,15.356 53.338,15.356C52.517,15.356 51.879,15.58 51.424,16.026C50.968,16.473 50.74,17.106 50.74,17.927L50.74,17.927L50.74,18.604L49.612,18.604L49.612,19.834L50.74,19.834L50.74,26L52.401,26ZM56.158,17.558C56.459,17.558 56.692,17.474 56.856,17.308C57.02,17.142 57.102,16.933 57.102,16.683C57.102,16.427 57.02,16.215 56.856,16.047C56.692,15.878 56.459,15.794 56.158,15.794C55.858,15.794 55.626,15.878 55.464,16.047C55.303,16.215 55.222,16.427 55.222,16.683C55.222,16.933 55.303,17.142 55.464,17.308C55.626,17.474 55.858,17.558 56.158,17.558ZM56.985,26L56.985,18.604L55.324,18.604L55.324,26L56.985,26ZM64.605,26L64.605,24.674L60.667,24.674L64.461,19.656L64.461,18.604L58.671,18.604L58.671,19.943L62.356,19.943L58.603,24.913L58.603,26L64.605,26ZM66.975,17.558C67.275,17.558 67.508,17.474 67.672,17.308C67.836,17.142 67.918,16.933 67.918,16.683C67.918,16.427 67.836,16.215 67.672,16.047C67.508,15.878 67.275,15.794 66.975,15.794C66.674,15.794 66.442,15.878 66.281,16.047C66.119,16.215 66.038,16.427 66.038,16.683C66.038,16.933 66.119,17.142 66.281,17.308C66.442,17.474 66.674,17.558 66.975,17.558ZM67.802,26L67.802,18.604L66.141,18.604L66.141,26L67.802,26ZM72.967,26.137C73.582,26.137 74.137,26.015 74.632,25.771C75.126,25.527 75.521,25.184 75.818,24.742L75.818,24.742L74.922,23.888C74.444,24.503 73.824,24.811 73.063,24.811C72.52,24.811 72.07,24.633 71.713,24.277C71.355,23.922 71.151,23.439 71.101,22.828L71.101,22.828L75.934,22.828L75.934,22.158C75.934,20.982 75.659,20.073 75.11,19.431C74.561,18.788 73.783,18.467 72.776,18.467C72.142,18.467 71.568,18.629 71.053,18.952C70.538,19.276 70.138,19.728 69.853,20.309C69.568,20.89 69.426,21.55 69.426,22.288L69.426,22.288L69.426,22.493C69.426,23.596 69.753,24.479 70.407,25.142C71.061,25.805 71.914,26.137 72.967,26.137ZM74.293,21.611L71.128,21.611C71.206,21.042 71.385,20.597 71.665,20.278C71.945,19.959 72.313,19.8 72.769,19.8C73.229,19.8 73.589,19.942 73.849,20.227C74.109,20.512 74.257,20.932 74.293,21.488L74.293,21.488L74.293,21.611ZM78.98,26L78.98,20.941C79.244,20.358 79.757,20.066 80.518,20.066C80.751,20.066 80.976,20.085 81.195,20.121L81.195,20.121L81.202,18.563C81.047,18.499 80.851,18.467 80.614,18.467C79.903,18.467 79.347,18.788 78.946,19.431L78.946,19.431L78.905,18.604L77.319,18.604L77.319,26L78.98,26ZM85.472,26.137C86.087,26.137 86.642,26.015 87.136,25.771C87.631,25.527 88.026,25.184 88.322,24.742L88.322,24.742L87.427,23.888C86.948,24.503 86.329,24.811 85.567,24.811C85.025,24.811 84.575,24.633 84.217,24.277C83.86,23.922 83.656,23.439 83.606,22.828L83.606,22.828L88.439,22.828L88.439,22.158C88.439,20.982 88.164,20.073 87.615,19.431C87.066,18.788 86.288,18.467 85.28,18.467C84.647,18.467 84.073,18.629 83.558,18.952C83.043,19.276 82.643,19.728 82.358,20.309C82.073,20.89 81.931,21.55 81.931,22.288L81.931,22.288L81.931,22.493C81.931,23.596 82.258,24.479 82.912,25.142C83.566,25.805 84.419,26.137 85.472,26.137ZM86.798,21.611L83.633,21.611C83.71,21.042 83.889,20.597 84.17,20.278C84.45,19.959 84.818,19.8 85.274,19.8C85.734,19.8 86.094,19.942 86.354,20.227C86.613,20.512 86.761,20.932 86.798,21.488L86.798,21.488L86.798,21.611ZM91.464,26L91.464,20.736C91.792,20.13 92.292,19.827 92.961,19.827C93.422,19.827 93.753,19.94 93.956,20.166C94.159,20.391 94.26,20.739 94.26,21.208L94.26,21.208L94.26,26L95.921,26L95.921,21.112C95.894,19.349 95.11,18.467 93.57,18.467C92.681,18.467 91.963,18.797 91.417,19.458L91.417,19.458L91.369,18.604L89.803,18.604L89.803,26L91.464,26Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillAlpha="0.87" - android:fillColor="#000000" - android:fillType="nonZero" - android:pathData="M165.874,26L165.874,17.441L168.978,17.441L168.978,16.047L161.082,16.047L161.082,17.441L164.158,17.441L164.158,26L165.874,26ZM172.872,26.137C173.487,26.137 174.042,26.015 174.536,25.771C175.031,25.527 175.426,25.184 175.722,24.742L175.722,24.742L174.827,23.888C174.348,24.503 173.729,24.811 172.967,24.811C172.425,24.811 171.975,24.633 171.617,24.277C171.26,23.922 171.056,23.439 171.006,22.828L171.006,22.828L175.839,22.828L175.839,22.158C175.839,20.982 175.564,20.073 175.015,19.431C174.466,18.788 173.688,18.467 172.68,18.467C172.047,18.467 171.473,18.629 170.958,18.952C170.443,19.276 170.043,19.728 169.758,20.309C169.473,20.89 169.331,21.55 169.331,22.288L169.331,22.288L169.331,22.493C169.331,23.596 169.658,24.479 170.312,25.142C170.966,25.805 171.819,26.137 172.872,26.137ZM174.198,21.611L171.033,21.611C171.11,21.042 171.289,20.597 171.57,20.278C171.85,19.959 172.218,19.8 172.674,19.8C173.134,19.8 173.494,19.942 173.754,20.227C174.013,20.512 174.161,20.932 174.198,21.488L174.198,21.488L174.198,21.611ZM178.167,17.558C178.468,17.558 178.7,17.474 178.864,17.308C179.028,17.142 179.11,16.933 179.11,16.683C179.11,16.427 179.028,16.215 178.864,16.047C178.7,15.878 178.468,15.794 178.167,15.794C177.866,15.794 177.635,15.878 177.473,16.047C177.311,16.215 177.231,16.427 177.231,16.683C177.231,16.933 177.311,17.142 177.473,17.308C177.635,17.474 177.866,17.558 178.167,17.558ZM178.994,26L178.994,18.604L177.333,18.604L177.333,26L178.994,26ZM182.669,26L182.669,15.5L181.008,15.5L181.008,26L182.669,26ZM187.835,26.137C188.45,26.137 189.005,26.015 189.499,25.771C189.994,25.527 190.389,25.184 190.685,24.742L190.685,24.742L189.79,23.888C189.311,24.503 188.692,24.811 187.931,24.811C187.388,24.811 186.938,24.633 186.58,24.277C186.223,23.922 186.019,23.439 185.969,22.828L185.969,22.828L190.802,22.828L190.802,22.158C190.802,20.982 190.527,20.073 189.978,19.431C189.429,18.788 188.651,18.467 187.643,18.467C187.01,18.467 186.436,18.629 185.921,18.952C185.406,19.276 185.006,19.728 184.721,20.309C184.436,20.89 184.294,21.55 184.294,22.288L184.294,22.288L184.294,22.493C184.294,23.596 184.621,24.479 185.275,25.142C185.929,25.805 186.782,26.137 187.835,26.137ZM189.161,21.611L185.996,21.611C186.073,21.042 186.252,20.597 186.533,20.278C186.813,19.959 187.181,19.8 187.637,19.8C188.097,19.8 188.457,19.942 188.717,20.227C188.976,20.512 189.125,20.932 189.161,21.488L189.161,21.488L189.161,21.611ZM193.827,26L193.827,20.736C194.156,20.13 194.655,19.827 195.325,19.827C195.785,19.827 196.116,19.94 196.319,20.166C196.522,20.391 196.623,20.739 196.623,21.208L196.623,21.208L196.623,26L198.284,26L198.284,21.112C198.257,19.349 197.473,18.467 195.933,18.467C195.044,18.467 194.326,18.797 193.78,19.458L193.78,19.458L193.732,18.604L192.166,18.604L192.166,26L193.827,26Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillAlpha="0.87" - android:fillColor="#000000" - android:fillType="nonZero" - android:pathData="M279.373,18L280.18,15.683L284.035,15.683L284.849,18L286.654,18L282.887,8.047L281.335,8.047L277.576,18L279.373,18ZM283.55,14.288L280.665,14.288L282.108,10.159L283.55,14.288ZM289.03,18L289.03,12.736C289.358,12.13 289.857,11.827 290.527,11.827C290.987,11.827 291.319,11.94 291.522,12.166C291.724,12.391 291.826,12.739 291.826,13.208L291.826,13.208L291.826,18L293.487,18L293.487,13.112C293.46,11.349 292.676,10.467 291.135,10.467C290.247,10.467 289.529,10.797 288.982,11.458L288.982,11.458L288.934,10.604L287.369,10.604L287.369,18L289.03,18ZM297.873,18.137C298.703,18.137 299.366,17.836 299.862,17.234L299.862,17.234L299.944,18L301.448,18L301.448,7.5L299.787,7.5L299.787,11.287C299.304,10.74 298.671,10.467 297.887,10.467C296.998,10.467 296.289,10.812 295.761,11.502C295.232,12.193 294.968,13.108 294.968,14.247C294.968,15.446 295.236,16.394 295.771,17.091C296.307,17.788 297.007,18.137 297.873,18.137ZM298.297,16.783C297.764,16.783 297.352,16.572 297.063,16.151C296.774,15.729 296.629,15.143 296.629,14.391C296.629,13.534 296.775,12.892 297.066,12.466C297.358,12.04 297.773,11.827 298.311,11.827C298.99,11.827 299.482,12.123 299.787,12.716L299.787,12.716L299.787,15.874C299.473,16.48 298.976,16.783 298.297,16.783ZM306.539,18.137C307.154,18.137 307.709,18.015 308.203,17.771C308.698,17.527 309.093,17.184 309.389,16.742L309.389,16.742L308.494,15.888C308.015,16.503 307.395,16.811 306.634,16.811C306.092,16.811 305.642,16.633 305.284,16.277C304.926,15.922 304.723,15.439 304.672,14.828L304.672,14.828L309.505,14.828L309.505,14.158C309.505,12.982 309.231,12.073 308.682,11.431C308.132,10.788 307.354,10.467 306.347,10.467C305.714,10.467 305.139,10.629 304.625,10.952C304.11,11.276 303.71,11.728 303.425,12.309C303.14,12.89 302.998,13.55 302.998,14.288L302.998,14.288L302.998,14.493C302.998,15.596 303.325,16.479 303.979,17.142C304.632,17.805 305.486,18.137 306.539,18.137ZM307.865,13.611L304.7,13.611C304.777,13.042 304.956,12.597 305.236,12.278C305.517,11.959 305.885,11.8 306.34,11.8C306.801,11.8 307.161,11.942 307.42,12.227C307.68,12.512 307.828,12.932 307.865,13.488L307.865,13.488L307.865,13.611ZM312.552,18L312.552,12.941C312.816,12.358 313.329,12.066 314.09,12.066C314.322,12.066 314.548,12.085 314.767,12.121L314.767,12.121L314.773,10.563C314.618,10.499 314.422,10.467 314.185,10.467C313.475,10.467 312.919,10.788 312.517,11.431L312.517,11.431L312.476,10.604L310.891,10.604L310.891,18L312.552,18ZM319.043,18.137C319.659,18.137 320.213,18.015 320.708,17.771C321.202,17.527 321.598,17.184 321.894,16.742L321.894,16.742L320.998,15.888C320.52,16.503 319.9,16.811 319.139,16.811C318.597,16.811 318.147,16.633 317.789,16.277C317.431,15.922 317.227,15.439 317.177,14.828L317.177,14.828L322.01,14.828L322.01,14.158C322.01,12.982 321.735,12.073 321.186,11.431C320.637,10.788 319.859,10.467 318.852,10.467C318.218,10.467 317.644,10.629 317.129,10.952C316.614,11.276 316.214,11.728 315.93,12.309C315.645,12.89 315.502,13.55 315.502,14.288L315.502,14.288L315.502,14.493C315.502,15.596 315.829,16.479 316.483,17.142C317.137,17.805 317.991,18.137 319.043,18.137ZM320.369,13.611L317.204,13.611C317.282,13.042 317.461,12.597 317.741,12.278C318.021,11.959 318.389,11.8 318.845,11.8C319.305,11.8 319.665,11.942 319.925,12.227C320.185,12.512 320.333,12.932 320.369,13.488L320.369,13.488L320.369,13.611ZM280.324,33L281.882,27.921L283.468,33L284.835,33L286.852,25.604L285.232,25.604L284.056,30.71L282.518,25.604L281.267,25.604L279.749,30.655L278.553,25.604L276.933,25.604L278.956,33L280.324,33ZM290.349,33.137C291.115,33.137 291.762,32.861 292.291,32.31C292.345,32.629 292.409,32.859 292.482,33L292.482,33L294.177,33L294.177,32.884C293.991,32.487 293.897,31.956 293.897,31.291L293.897,31.291L293.897,27.955C293.883,27.167 293.619,26.555 293.104,26.12C292.589,25.684 291.899,25.467 291.033,25.467C290.463,25.467 289.947,25.567 289.485,25.768C289.022,25.968 288.656,26.245 288.387,26.598C288.119,26.951 287.984,27.331 287.984,27.736L287.984,27.736L289.645,27.736C289.645,27.445 289.766,27.204 290.008,27.015C290.249,26.826 290.559,26.731 290.937,26.731C291.375,26.731 291.701,26.847 291.915,27.077C292.129,27.307 292.236,27.613 292.236,27.996L292.236,27.996L292.236,28.481L291.217,28.481C290.128,28.481 289.291,28.692 288.705,29.114C288.12,29.535 287.827,30.14 287.827,30.929C287.827,31.553 288.062,32.077 288.531,32.501C289,32.925 289.606,33.137 290.349,33.137ZM290.657,31.804C290.301,31.804 290.018,31.709 289.806,31.52C289.594,31.331 289.488,31.077 289.488,30.758C289.488,30.366 289.643,30.063 289.953,29.849C290.263,29.634 290.725,29.527 291.341,29.527L291.341,29.527L292.236,29.527L292.236,30.922C292.09,31.191 291.873,31.405 291.583,31.564C291.294,31.724 290.985,31.804 290.657,31.804ZM297.395,33L297.395,27.941C297.659,27.358 298.172,27.066 298.933,27.066C299.165,27.066 299.391,27.085 299.609,27.121L299.609,27.121L299.616,25.563C299.461,25.499 299.265,25.467 299.028,25.467C298.317,25.467 297.762,25.788 297.36,26.431L297.36,26.431L297.319,25.604L295.733,25.604L295.733,33L297.395,33ZM302.396,33L302.396,27.736C302.724,27.13 303.223,26.827 303.893,26.827C304.353,26.827 304.685,26.94 304.888,27.166C305.09,27.391 305.192,27.739 305.192,28.208L305.192,28.208L305.192,33L306.853,33L306.853,28.112C306.826,26.349 306.042,25.467 304.501,25.467C303.613,25.467 302.895,25.797 302.348,26.458L302.348,26.458L302.3,25.604L300.735,25.604L300.735,33L302.396,33ZM311.902,33.137C312.517,33.137 313.072,33.015 313.567,32.771C314.061,32.527 314.457,32.184 314.753,31.742L314.753,31.742L313.857,30.888C313.379,31.503 312.759,31.811 311.998,31.811C311.456,31.811 311.006,31.633 310.648,31.277C310.29,30.922 310.086,30.439 310.036,29.828L310.036,29.828L314.869,29.828L314.869,29.158C314.869,27.982 314.594,27.073 314.045,26.431C313.496,25.788 312.718,25.467 311.711,25.467C311.077,25.467 310.503,25.629 309.988,25.952C309.473,26.276 309.073,26.728 308.788,27.309C308.504,27.89 308.361,28.55 308.361,29.288L308.361,29.288L308.361,29.493C308.361,30.596 308.688,31.479 309.342,32.142C309.996,32.805 310.85,33.137 311.902,33.137ZM313.228,28.611L310.063,28.611C310.141,28.042 310.32,27.597 310.6,27.278C310.88,26.959 311.248,26.8 311.704,26.8C312.164,26.8 312.524,26.942 312.784,27.227C313.044,27.512 313.192,27.932 313.228,28.488L313.228,28.488L313.228,28.611ZM317.895,33L317.895,27.736C318.223,27.13 318.722,26.827 319.392,26.827C319.852,26.827 320.184,26.94 320.387,27.166C320.589,27.391 320.691,27.739 320.691,28.208L320.691,28.208L320.691,33L322.352,33L322.352,28.112C322.325,26.349 321.541,25.467 320,25.467C319.112,25.467 318.394,25.797 317.847,26.458L317.847,26.458L317.799,25.604L316.234,25.604L316.234,33L317.895,33Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#E9F6FF" - android:fillType="evenOdd" - android:pathData="M24,78C24,97.882 40.118,114 60,114L60,114C79.882,114 96,97.882 96,78L96,78C96,58.118 79.882,42 60,42L60,42C40.118,42 24,58.118 24,78L24,78Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#D4D4D4" - android:fillType="evenOdd" - android:pathData="M106,78.5C106,80.433 107.567,82 109.5,82L109.5,82C111.433,82 113,80.433 113,78.5L113,78.5C113,76.567 111.433,75 109.5,75L109.5,75C107.567,75 106,76.567 106,78.5L106,78.5Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#D4D4D4" - android:fillType="evenOdd" - android:pathData="M126,78.5C126,80.433 127.567,82 129.5,82L129.5,82C131.433,82 133,80.433 133,78.5L133,78.5C133,76.567 131.433,75 129.5,75L129.5,75C127.567,75 126,76.567 126,78.5L126,78.5Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#D4D4D4" - android:fillType="evenOdd" - android:pathData="M226,78.5C226,80.433 227.567,82 229.5,82L229.5,82C231.433,82 233,80.433 233,78.5L233,78.5C233,76.567 231.433,75 229.5,75L229.5,75C227.567,75 226,76.567 226,78.5L226,78.5Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#D4D4D4" - android:fillType="evenOdd" - android:pathData="M247,78.5C247,80.433 248.567,82 250.5,82L250.5,82C252.433,82 254,80.433 254,78.5L254,78.5C254,76.567 252.433,75 250.5,75L250.5,75C248.567,75 247,76.567 247,78.5L247,78.5Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#E9F6FF" - android:fillType="evenOdd" - android:pathData="M144,78C144,97.882 160.118,114 180,114L180,114C199.882,114 216,97.882 216,78L216,78C216,58.118 199.882,42 180,42L180,42C160.118,42 144,58.118 144,78L144,78Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#E9F6FF" - android:fillType="evenOdd" - android:pathData="M264,78C264,97.882 280.118,114 300,114L300,114C319.882,114 336,97.882 336,78L336,78C336,58.118 319.882,42 300,42L300,42C280.118,42 264,58.118 264,78L264,78Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#59112B" - android:fillType="nonZero" - android:pathData="M307.5,86.9C306.3,86.9 306.9,84.1 306.9,83.7C307,83.5 306,71.6 306,71.6C306.1,71.2 306.3,70.7 307,70.7C307,70.7 307,70.7 307.1,70.7L307.2,70.7C308.8,70.7 310.2,69.4 310.2,67.8C310.2,66.2 308.9,64.9 307.2,64.9C305.6,64.9 304.2,66.2 304.2,67.8C304.2,68.1 304.2,68.4 304.3,68.7C304.3,68.7 304.9,70.2 303.6,70C303.6,70 292.3,73.9 291.8,74C290.4,76.5 286.8,75.2 285.7,74.4C285.4,74 284.8,73.7 284.1,73.7C282.9,73.7 281.9,74.7 281.9,75.9C282,77 283,78 284.2,78C284.6,78 285.1,77.9 285.4,77.7C287.2,76.8 290.5,77.4 290.9,79L290.9,79.1C291,79.4 293.3,84 293.6,84.4C295.1,87.2 291.4,88.3 291.4,88.3C290.4,88.3 289.5,89.2 289.5,90.3C289.5,91.5 290.5,92.5 291.7,92.5C292.9,92.5 293.9,91.5 293.9,90.3C294.2,88 295.4,86.5 297.6,86.4C297.9,86.5 303.3,86.1 303.7,86C305.3,86.3 304.4,87.6 304.4,89.8C304.4,91.4 305.7,92.7 307.4,92.7C309,92.7 310.4,91.4 310.4,89.8C310.5,88.2 309.2,86.9 307.5,86.9Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#AF4C4C" - android:fillType="nonZero" - android:pathData="M314.1,72.2C313.2,72.2 312.5,72.6 312.2,73.4C311.3,74.7 309.4,75 308.2,74.4C308,73.9 295.4,70.5 295.4,70.6C293.8,71.5 292.3,68.7 292.4,67.4L292.4,67.3C292.5,67 292.5,66.7 292.5,66.4C292.5,64.8 291.2,63.5 289.5,63.5C287.9,63.5 286.5,64.8 286.5,66.4C286.5,67.7 287.4,68.7 288.4,69.2C290.1,69.9 292.4,71.9 292.2,73.3C292.9,74.5 291.3,80.7 291.4,81.2C290.5,82.1 288.7,81.9 288,81.6C287.7,81.2 287.1,81 286.5,81C284.9,81 283.5,82.3 283.5,83.9C283.5,85.5 284.8,86.8 286.5,86.8C287.5,86.8 288.3,86.4 288.9,85.6C289.8,84.3 291.3,83.1 292.6,83.1C292.8,83.4 308.9,77.1 308.9,77C309,76.4 311.4,75.8 313.5,76.3L314.1,76.3C315.3,76.3 316.3,75.3 316.3,74.1C316.3,72.9 315.3,72.2 314.1,72.2Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#AF4C4C" - android:fillType="nonZero" - android:pathData="M309,78C309,83 305,87 300,87C295,87 291,83 291,78C291,73 295,69 300,69C305,69 309,73 309,78Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#C34A4A" - android:fillType="nonZero" - android:pathData="M302.3,86.5C302.6,85.9 301.5,85.7 300.6,85.7C299.7,85.7 298.8,86.2 299,86.8C301.4,90.4 299.6,90.9 298.5,91.6C297.6,92 297,93.1 297,94.1C297,95.7 298.3,97 300,97C301.7,97 303,95.7 303,94.1C303.1,91.3 301.3,87.4 302.3,86.5ZM314.9,80.9C314.3,80.9 313.7,81 313.3,81.3C311.5,82 309.9,80.7 308.7,79.9C308.1,79.5 307.4,80.5 307.2,80.8C307,81.1 306.7,82.5 307.9,82.5C309.9,81.8 312.4,85.3 312.4,85.3C312.8,86.3 313.9,86.9 315.1,86.9C316.7,86.9 318.1,85.6 318.1,84C317.8,82.2 316.5,80.9 314.9,80.9ZM297.4,63.5C299.3,67.4 299.2,68.9 298.1,69.3C297.2,70 298.7,70.9 299.8,70.7C300.9,70.5 301.9,70 301.2,69C299.5,66 301.7,64 301.7,64C302.4,63.6 302.9,62.7 302.9,61.8C302.9,60.2 301.6,58.9 299.9,58.9C298.2,58.9 296.9,60.2 296.9,61.8C296.9,62.2 297,62.7 297.2,63.1C297.2,63.4 297.2,63.4 297.4,63.5Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#E1A5A5" - android:fillType="nonZero" - android:pathData="M298.4,78C296.8,78 295.4,76.7 295.4,75.1C295.4,73.5 296.7,72.2 298.4,72.2C300.1,72.2 301.4,73.5 301.4,75.1C301.4,76.7 300.1,78 298.4,78Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#F8E9E9" - android:fillType="nonZero" - android:pathData="M296.9,82.4C296,82.4 295.4,81.8 295.4,80.9C295.4,80 296,79.4 296.9,79.4C297.8,79.4 298.4,80 298.4,80.9C298.4,81.8 297.8,82.4 296.9,82.4Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#EDC8C8" - android:fillType="nonZero" - android:pathData="M302.2,84C301,84 300,83 300,81.8C300,80.6 301,79.6 302.2,79.6C303.4,79.6 304.4,80.6 304.4,81.8C304.4,83 303.4,84 302.2,84Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#E9F6FF" - android:fillType="nonZero" - android:pathData="M280.978,58.979C282.15,57.808 284.05,57.808 285.221,58.979L318.951,92.707C320.122,93.879 320.122,95.779 318.951,96.95C317.779,98.122 315.88,98.122 314.708,96.95L280.979,63.222C279.807,62.05 279.807,60.151 280.978,58.979Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#59112B" - android:fillType="nonZero" - android:pathData="M282.337,60.338C282.814,59.861 283.586,59.861 284.062,60.338L317.592,93.866C318.068,94.343 318.068,95.115 317.592,95.591C317.116,96.068 316.343,96.068 315.867,95.591L282.337,62.063C281.861,61.587 281.861,60.814 282.337,60.338Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillAlpha="1" - android:fillColor="#000000" - android:fillType="nonZero" - android:pathData="M74,99l-32,0l0,-42l22,0l10,10z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#FFFFFF" - android:fillType="nonZero" - android:pathData="M74,99l-32,0l0,-42l22,0l10,10z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#657888" - android:fillType="nonZero" - android:pathData="M72.5,68l-9.5,0l0,-9.5z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#2E854B" - android:fillType="nonZero" - android:pathData="M82,92C82,97.523 77.522,102 72,102C66.477,102 62,97.523 62,92C62,86.477 66.477,82 72,82C77.522,82 82,86.477 82,92" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#DCEDC8" - android:fillType="nonZero" - android:pathData="M76.492,87.35l-5.69,5.701l-2.728,-2.721l-2.123,2.127l4.855,4.844l7.813,-7.828z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#657888" - android:fillType="nonZero" - android:pathData="M192,60L164,60C162.9,60 162,60.9 162,62L162,68C162,69.1 162.9,70 164,70L192,70C193.1,70 194,69.1 194,68L194,62C194,60.9 193.1,60 192,60ZM192,72L164,72C162.9,72 162,72.9 162,74L162,80C162,81.1 162.9,82 164,82L192,82C193.1,82 194,81.1 194,80L194,74C194,72.9 193.1,72 192,72ZM192,84L164,84C162.9,84 162,84.9 162,86L162,92C162,93.1 162.9,94 164,94L192,94C193.1,94 194,93.1 194,92L194,86C194,84.9 193.1,84 192,84Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#2E854B" - android:fillType="nonZero" - android:pathData="M192,81C186.477,81 182,85.477 182,91C182,96.523 186.477,101 192,101C197.523,101 202,96.523 202,91C202,85.477 197.523,81 192,81L192,81Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#DCEDC8" - android:fillType="nonZero" - android:pathData="M196.5,86.3l-5.7,5.7l-2.7,-2.7l-2.1,2.2l4.8,4.8l7.8,-7.8z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> -</vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml index 2627793b076bcff6066e1b595743d538bcd8d132..a2892c4b4bd775842eaf2961e4b639897f6fe71d 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_other_warning.xml @@ -1,468 +1,414 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="396dp" - android:height="220dp" - android:viewportWidth="396" - android:viewportHeight="220"> + android:width="361dp" + android:height="221dp" + android:viewportWidth="361" + android:viewportHeight="221"> + <group> + <clip-path + android:pathData="M0.5,0.1h360v220h-360z"/> <path + android:pathData="M174.363,100.835L143.485,100.733C142.828,100.73 142.293,101.261 142.291,101.918L142.259,111.573C142.257,112.229 142.788,112.764 143.445,112.766L174.323,112.869C174.98,112.871 175.514,112.34 175.516,111.683L175.549,102.029C175.55,101.371 175.019,100.837 174.363,100.835" + android:strokeWidth="1" android:fillColor="#B1BBC2" android:fillType="evenOdd" - android:pathData="M141.324,143.096L80.418,142.914C79.122,142.91 78.067,143.852 78.063,145.018L78,162.142C77.996,163.308 79.043,164.256 80.34,164.26L141.245,164.442C142.542,164.446 143.596,163.504 143.6,162.338L143.664,145.214C143.668,144.048 142.621,143.1 141.324,143.096" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M141.324,143.096L80.418,142.914C79.122,142.91 78.067,143.852 78.063,145.018L78,162.142C77.996,163.308 79.043,164.256 80.34,164.26L141.245,164.442C142.542,164.446 143.596,163.504 143.6,162.338L143.664,145.214C143.668,144.048 142.621,143.1 141.324,143.096" /> - <path - android:fillColor="#BF0F2D" - android:fillType="evenOdd" - android:pathData="M80.592,140.845L78.099,140.634C78.046,140.63 78.003,141.722 78.003,143.073L78,162.928C78,164.28 78.043,165.379 78.096,165.383L80.589,165.594C80.642,165.598 80.685,164.507 80.685,163.155L80.688,143.3C80.688,141.949 80.645,140.849 80.592,140.845" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:strokeColor="#00000000"/> <path + android:pathData="M174.422,84.121L143.545,84.018C142.887,84.016 142.353,84.548 142.351,85.204L142.319,94.858C142.317,95.516 142.848,96.051 143.505,96.053L174.382,96.155C175.039,96.158 175.574,95.627 175.576,94.969L175.608,85.315C175.61,84.658 175.079,84.123 174.422,84.121" + android:strokeWidth="1" android:fillColor="#94A1AB" android:fillType="evenOdd" - android:pathData="M141.695,113.45L80.432,113.268C79.129,113.264 78.068,114.206 78.064,115.372L78,132.496C77.996,133.662 79.049,134.61 80.353,134.614L141.615,134.796C142.92,134.8 143.98,133.858 143.984,132.692L144.048,115.568C144.052,114.402 142.999,113.454 141.695,113.45" + android:strokeColor="#00000000"/> + <path + android:pathData="M143.997,96.052C143.997,96.052 143.579,96.054 143.561,96.054C143.285,96.052 143.597,96.058 143.322,96.051C143.095,96.047 142.381,95.786 142.355,95.022C142.354,94.175 142.355,88.153 142.355,85.274C142.348,84.263 143.166,84.025 143.455,84.024C143.706,84.024 143.294,84.026 143.545,84.023C143.6,84.023 143.995,84.023 143.995,84.023L143.997,96.052Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M141.695,113.45L80.432,113.268C79.129,113.264 78.068,114.206 78.064,115.372L78,132.496C77.996,133.662 79.049,134.61 80.353,134.614L141.615,134.796C142.92,134.8 143.98,133.858 143.984,132.692L144.048,115.568C144.052,114.402 142.999,113.454 141.695,113.45" /> - <path - android:fillColor="#BF0F2D" - android:fillType="evenOdd" - android:pathData="M80.592,112.719L78.099,112.524C78.046,112.52 78.003,113.528 78.003,114.775L78,133.103C78,134.35 78.043,135.365 78.096,135.369L80.589,135.564C80.642,135.568 80.685,134.56 80.685,133.313L80.688,114.985C80.688,113.737 80.645,112.723 80.592,112.719" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#BE0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path + android:pathData="M174.472,67.412L143.596,67.31C142.938,67.307 142.403,67.838 142.401,68.495L142.369,78.15C142.367,78.806 142.898,79.341 143.555,79.343L174.433,79.446C175.09,79.448 175.624,78.917 175.626,78.26L175.658,68.606C175.66,67.948 175.129,67.414 174.472,67.412" + android:strokeWidth="1" android:fillColor="#748692" android:fillType="evenOdd" - android:pathData="M141.709,83.812L80.802,83.63C79.506,83.626 78.451,84.568 78.447,85.734L78.384,102.858C78.38,104.024 79.427,104.972 80.724,104.976L141.63,105.158C142.926,105.162 143.98,104.22 143.985,103.054L144.048,85.93C144.052,84.764 143.005,83.816 141.709,83.812" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M141.709,83.812L80.802,83.63C79.506,83.626 78.451,84.568 78.447,85.734L78.384,102.858C78.38,104.024 79.427,104.972 80.724,104.976L141.63,105.158C142.926,105.162 143.98,104.22 143.985,103.054L144.048,85.93C144.052,84.764 143.005,83.816 141.709,83.812" /> - <path - android:fillColor="#BF0F2D" - android:fillType="evenOdd" - android:pathData="M80.976,81.567L78.483,81.349C78.43,81.345 78.387,82.471 78.387,83.863L78.384,104.329C78.384,105.723 78.427,106.856 78.48,106.86L80.973,107.077C81.026,107.082 81.069,105.957 81.069,104.563L81.072,84.098C81.072,82.705 81.029,81.572 80.976,81.567" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:strokeColor="#00000000"/> <path + android:pathData="M174.515,50.708L143.638,50.605C142.981,50.603 142.447,51.134 142.444,51.791L142.412,61.445C142.41,62.102 142.941,62.637 143.599,62.639L174.476,62.741C175.132,62.744 175.667,62.213 175.669,61.555L175.701,51.901C175.703,51.244 175.173,50.71 174.515,50.708" + android:strokeWidth="1" android:fillColor="#657887" android:fillType="evenOdd" - android:pathData="M141.708,54.182L80.802,54C79.506,53.996 78.451,54.938 78.447,56.104L78.384,73.228C78.38,74.394 79.427,75.342 80.724,75.346L141.629,75.528C142.926,75.532 143.98,74.59 143.984,73.424L144.048,56.299C144.052,55.134 143.005,54.186 141.708,54.182" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M141.708,54.182L80.802,54C79.506,53.996 78.451,54.938 78.447,56.104L78.384,73.228C78.38,74.394 79.427,75.342 80.724,75.346L141.629,75.528C142.926,75.532 143.98,74.59 143.984,73.424L144.048,56.299C144.052,55.134 143.005,54.186 141.708,54.182" /> - <path - android:fillColor="#BF0F2D" - android:fillType="evenOdd" - android:pathData="M80.976,52.325L78.483,52.104C78.43,52.099 78.387,53.242 78.387,54.655L78.384,75.427C78.384,76.84 78.427,77.99 78.48,77.995L80.973,78.216C81.026,78.22 81.069,77.078 81.069,75.664L81.072,54.893C81.072,53.479 81.029,52.329 80.976,52.325" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:strokeColor="#00000000"/> <path + android:pathData="M159.431,89.897C164.014,89.897 167.73,86.182 167.73,81.599C167.73,77.016 164.014,73.3 159.431,73.3C154.848,73.3 151.133,77.016 151.133,81.599C151.133,86.182 154.848,89.897 159.431,89.897" + android:strokeWidth="1" android:fillColor="#E7EAEF" android:fillType="evenOdd" - android:pathData="M113.268,123.696C121.397,123.696 127.988,117.106 127.988,108.976C127.988,100.847 121.397,94.257 113.268,94.257C105.139,94.257 98.548,100.847 98.548,108.976C98.548,117.106 105.139,123.696 113.268,123.696" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M98.548,108.976C98.548,117.105 105.138,123.696 113.268,123.696L113.268,123.696C121.397,123.696 127.988,117.105 127.988,108.976L127.988,108.976C127.988,100.846 121.397,94.256 113.268,94.256L113.268,94.256C105.138,94.256 98.548,100.846 98.548,108.976L98.548,108.976Z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M82.561,229.952l73.112,0l0,-158.311l-73.112,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M98.548,108.976C98.548,117.105 105.139,123.696 113.267,123.696L113.267,123.696C121.397,123.696 127.987,117.105 127.987,108.976L127.987,108.976C127.987,100.846 121.397,94.256 113.267,94.256L113.267,94.256C105.139,94.256 98.548,100.846 98.548,108.976L98.548,108.976Z" /> - <path - android:fillColor="#FFFFFF" - android:fillType="evenOdd" - android:pathData="M97.573,124.671l31.389,0l0,-31.389l-31.389,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M151.132,81.599C151.132,86.183 154.848,89.898 159.431,89.898L159.431,89.898C164.014,89.898 167.73,86.183 167.73,81.599L167.73,81.599C167.73,77.016 164.014,73.3 159.431,73.3L159.431,73.3C154.848,73.3 151.132,77.016 151.132,81.599L151.132,81.599Z"/> + <path + android:pathData="M150.583,90.447l17.696,0l0,-17.696l-17.696,0z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> <path + android:pathData="M159.221,75.229C158.649,75.574 156.802,76.603 154.949,76.739C154.725,76.755 154.551,76.939 154.551,77.159L154.551,83.753C154.551,84.766 155.088,85.706 155.969,86.236C157.393,87.091 158.954,87.9 159.322,88.088C159.373,88.114 159.432,88.114 159.482,88.088C159.851,87.9 161.412,87.091 162.835,86.236C163.716,85.706 164.253,84.766 164.253,83.753L164.253,77.159C164.253,76.939 164.08,76.755 163.855,76.739C162.003,76.603 160.156,75.574 159.582,75.229C159.528,75.196 159.464,75.179 159.402,75.179C159.34,75.179 159.277,75.196 159.221,75.229" + android:strokeWidth="1" android:fillColor="#657887" android:fillType="evenOdd" - android:pathData="M112.896,97.678C111.88,98.29 108.605,100.114 105.319,100.356C104.921,100.385 104.613,100.71 104.613,101.101L104.613,112.798C104.613,114.595 105.565,116.263 107.127,117.201C109.652,118.718 112.422,120.152 113.074,120.487C113.163,120.532 113.27,120.532 113.359,120.487C114.011,120.152 116.781,118.718 119.306,117.201C120.868,116.263 121.82,114.595 121.82,112.798L121.82,101.101C121.82,100.71 121.512,100.385 121.114,100.356C117.829,100.114 114.553,98.29 113.537,97.678C113.439,97.619 113.327,97.589 113.216,97.589C113.105,97.589 112.994,97.619 112.896,97.678" + android:strokeColor="#00000000"/> + <path + android:pathData="M157.715,80.334L157.419,80.334C157.026,80.334 156.708,80.66 156.708,81.062L156.708,83.557C156.708,83.96 157.026,84.287 157.419,84.287L161.194,84.287C161.587,84.287 161.906,83.96 161.906,83.557L161.906,81.062C161.906,80.66 161.587,80.334 161.194,80.334L160.898,80.334C160.846,79.247 160.152,78.384 159.307,78.384C158.462,78.384 157.768,79.247 157.715,80.334M159.307,79.086C159.77,79.086 160.166,79.645 160.211,80.334L158.402,80.334C158.448,79.645 158.843,79.086 159.307,79.086" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M112.895,97.678C111.88,98.289 108.604,100.114 105.319,100.356L105.319,100.356C104.92,100.385 104.612,100.709 104.612,101.101L104.612,101.101L104.612,112.797C104.612,114.594 105.565,116.263 107.126,117.201L107.126,117.201C109.652,118.718 112.421,120.152 113.073,120.486L113.073,120.486C113.163,120.532 113.27,120.532 113.359,120.486L113.359,120.486C114.011,120.152 116.781,118.718 119.306,117.201L119.306,117.201C120.868,116.263 121.82,114.594 121.82,112.797L121.82,112.797L121.82,101.101C121.82,100.709 121.512,100.385 121.114,100.356L121.114,100.356C117.828,100.114 114.553,98.289 113.537,97.678L113.537,97.678C113.439,97.618 113.327,97.589 113.216,97.589L113.216,97.589C113.105,97.589 112.994,97.618 112.895,97.678L112.895,97.678Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M69.255,314.808l106.211,0l0,-229.982l-106.211,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M112.895,97.677C111.88,98.289 108.604,100.114 105.319,100.356L105.319,100.356C104.92,100.385 104.612,100.709 104.612,101.101L104.612,101.101L104.612,112.797C104.612,114.594 105.565,116.263 107.126,117.201L107.126,117.201C109.652,118.718 112.421,120.152 113.073,120.486L113.073,120.486C113.163,120.532 113.27,120.532 113.359,120.486L113.359,120.486C114.011,120.152 116.781,118.718 119.306,117.201L119.306,117.201C120.868,116.263 121.82,114.594 121.82,112.797L121.82,112.797L121.82,101.101C121.82,100.709 121.512,100.385 121.114,100.356L121.114,100.356C117.829,100.114 114.553,98.289 113.537,97.677L113.537,97.677C113.439,97.619 113.327,97.589 113.216,97.589L113.216,97.589C113.105,97.589 112.994,97.619 112.895,97.677L112.895,97.677Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M104.457,120.583l17.56,0l0,-23.225l-17.56,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M112.895,97.677C111.88,98.289 108.604,100.114 105.319,100.356L105.319,100.356C104.92,100.385 104.612,100.709 104.612,101.101L104.612,101.101L104.612,112.797C104.612,114.594 105.565,116.263 107.126,117.201L107.126,117.201C109.652,118.718 112.421,120.152 113.073,120.486L113.073,120.486C113.163,120.532 113.27,120.532 113.359,120.486L113.359,120.486C114.011,120.152 116.781,118.718 119.306,117.201L119.306,117.201C120.868,116.263 121.82,114.594 121.82,112.797L121.82,112.797L121.82,101.101C121.82,100.709 121.512,100.385 121.114,100.356L121.114,100.356C117.829,100.114 114.553,98.289 113.537,97.677L113.537,97.677C113.439,97.619 113.327,97.589 113.216,97.589L113.216,97.589C113.105,97.589 112.994,97.619 112.895,97.677L112.895,97.677Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M105.319,100.356C104.921,100.385 104.612,100.709 104.612,101.101L104.612,112.798C104.612,114.595 105.565,116.263 107.127,117.201C109.652,118.718 112.422,120.152 113.073,120.487C113.163,120.533 113.27,120.533 113.359,120.487C114.012,120.152 116.781,118.718 119.307,117.201C120.868,116.263 121.821,114.595 121.821,112.798L121.821,101.101C121.821,100.709 121.512,100.385 121.114,100.356C117.829,100.115 114.553,98.29 113.537,97.678C113.439,97.619 113.327,97.589 113.216,97.589C113.105,97.589 112.994,97.619 112.896,97.678C111.88,98.29 108.605,100.115 105.319,100.356" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M113.185,97.589C113.085,97.594 112.985,97.624 112.896,97.677L112.896,97.677C112.739,97.772 112.527,97.896 112.27,98.038L112.27,98.038C110.866,98.816 108.096,100.151 105.319,100.356L105.319,100.356C104.92,100.385 104.612,100.709 104.612,101.101L104.612,101.101L104.612,112.797C104.612,114.594 105.565,116.263 107.126,117.201L107.126,117.201C109.652,118.718 112.421,120.152 113.073,120.486L113.073,120.486C113.118,120.509 113.167,120.52 113.216,120.52L113.216,120.52C113.265,120.52 113.314,120.509 113.359,120.486L113.359,120.486C114.011,120.152 116.781,118.718 119.306,117.201L119.306,117.201C120.868,116.263 121.82,114.594 121.82,112.797L121.82,112.797L121.82,101.101C121.82,101.092 121.82,101.083 121.819,101.073L121.819,101.073C121.806,100.694 121.503,100.384 121.114,100.356L121.114,100.356C117.829,100.114 114.553,98.289 113.537,97.677L113.537,97.677C113.439,97.619 113.327,97.589 113.216,97.589L113.216,97.589C113.206,97.589 113.195,97.589 113.185,97.589L113.185,97.589Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M104.457,120.583l17.56,0l0,-23.225l-17.56,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M113.185,97.589C113.085,97.594 112.985,97.624 112.896,97.677L112.896,97.677C112.739,97.772 112.527,97.896 112.27,98.038L112.27,98.038C110.866,98.816 108.096,100.151 105.319,100.356L105.319,100.356C104.92,100.385 104.612,100.709 104.612,101.101L104.612,101.101L104.612,112.797C104.612,114.594 105.565,116.263 107.126,117.201L107.126,117.201C109.652,118.718 112.421,120.152 113.073,120.486L113.073,120.486C113.118,120.509 113.167,120.521 113.216,120.521L113.216,120.521C113.265,120.521 113.314,120.509 113.359,120.486L113.359,120.486C114.011,120.152 116.781,118.718 119.306,117.201L119.306,117.201C120.868,116.263 121.82,114.594 121.82,112.797L121.82,112.797L121.82,101.101C121.82,101.092 121.82,101.083 121.819,101.074L121.819,101.074C121.806,100.694 121.503,100.384 121.114,100.356L121.114,100.356C117.829,100.114 114.553,98.289 113.537,97.677L113.537,97.677C113.439,97.619 113.327,97.589 113.216,97.589L113.216,97.589C113.206,97.589 113.195,97.589 113.185,97.589L113.185,97.589Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M103.196,121.937l20.04,0l0,-25.764l-20.04,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M110.832,104.673C110.483,105.246 110.262,105.957 110.225,106.732L110.225,106.732L110.224,106.732L109.699,106.732C109.002,106.732 108.437,107.311 108.437,108.025L108.437,108.025L108.437,112.45L108.437,112.467C108.446,113.174 109.008,113.744 109.699,113.744L109.699,113.744L116.394,113.744C116.422,113.744 116.448,113.742 116.475,113.741L116.475,113.741C117.135,113.698 117.657,113.136 117.657,112.45L117.657,112.45L117.657,108.025C117.657,107.311 117.092,106.732 116.394,106.732L116.394,106.732L115.869,106.732C115.777,104.804 114.546,103.273 113.047,103.273L113.047,103.273C112.15,103.273 111.35,103.821 110.832,104.673L110.832,104.673ZM113.047,104.519C113.869,104.519 114.571,105.511 114.651,106.732L114.651,106.732L111.443,106.732C111.523,105.511 112.224,104.519 113.047,104.519L113.047,104.519Z" /> - <path - android:fillColor="#FFFFFF" - android:fillType="evenOdd" - android:pathData="M107.021,115.16l12.053,0l0,-13.303l-12.053,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M157.715,80.334L157.419,80.334C157.026,80.334 156.708,80.661 156.708,81.063L156.708,81.063L156.708,83.557C156.708,83.961 157.026,84.287 157.419,84.287L157.419,84.287L161.194,84.287C161.587,84.287 161.906,83.961 161.906,83.557L161.906,83.557L161.906,81.063C161.906,80.661 161.587,80.334 161.194,80.334L161.194,80.334L160.898,80.334C160.846,79.247 160.152,78.383 159.306,78.383L159.306,78.383C158.462,78.383 157.768,79.247 157.715,80.334L157.715,80.334ZM159.306,79.087C159.77,79.087 160.165,79.645 160.212,80.334L160.212,80.334L158.402,80.334C158.447,79.645 158.843,79.087 159.306,79.087L159.306,79.087Z"/> + <path + android:pathData="M155.909,85.085l6.795,0l0,-7.5l-6.795,0z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> <path + android:pathData="M158.579,81.954C158.579,82.203 158.724,82.421 158.937,82.537L158.937,83.28C158.937,83.377 159.021,83.457 159.126,83.457L159.465,83.457C159.569,83.457 159.654,83.377 159.654,83.28L159.654,82.537C159.868,82.421 160.013,82.203 160.013,81.954C160.013,81.582 159.691,81.281 159.295,81.281C158.9,81.281 158.579,81.582 158.579,81.954" + android:strokeWidth="1" android:fillColor="#657887" android:fillType="evenOdd" - android:pathData="M111.757,109.606C111.757,110.048 112.013,110.434 112.392,110.64L112.392,111.958C112.392,112.131 112.542,112.272 112.726,112.272L113.329,112.272C113.514,112.272 113.663,112.131 113.663,111.958L113.663,110.64C114.043,110.434 114.299,110.048 114.299,109.606C114.299,108.946 113.73,108.411 113.028,108.411C112.326,108.411 111.757,108.946 111.757,109.606" + android:strokeColor="#00000000"/> + <path + android:pathData="M149.055,57.873L149.055,57.207L149.404,57.207L149.404,56.714L149.055,56.714L149.055,54.795L148.438,54.795L147.154,56.822L147.182,57.207L148.444,57.207L148.444,57.873L149.055,57.873ZM148.444,56.714L147.763,56.714L148.404,55.697L148.444,55.628L148.444,56.714ZM150.811,57.915C151.011,57.915 151.191,57.87 151.349,57.78C151.508,57.69 151.631,57.564 151.717,57.401C151.804,57.239 151.847,57.058 151.847,56.858C151.847,56.545 151.768,56.293 151.611,56.101C151.453,55.91 151.24,55.814 150.972,55.814C150.723,55.814 150.516,55.897 150.353,56.063C150.386,55.815 150.488,55.621 150.656,55.482C150.824,55.342 151.047,55.27 151.323,55.266L151.323,55.266L151.382,55.266L151.382,54.763L151.281,54.763C150.969,54.764 150.695,54.835 150.459,54.975C150.223,55.116 150.042,55.314 149.916,55.57C149.79,55.825 149.727,56.12 149.727,56.454L149.727,56.454L149.727,56.674C149.727,57.051 149.827,57.351 150.026,57.577C150.225,57.802 150.487,57.915 150.811,57.915ZM150.799,57.423C150.653,57.423 150.541,57.365 150.46,57.25C150.38,57.135 150.34,56.976 150.34,56.771L150.34,56.771L150.34,56.585C150.378,56.501 150.437,56.433 150.517,56.381C150.598,56.33 150.687,56.304 150.786,56.304C150.924,56.304 151.034,56.356 151.116,56.459C151.198,56.561 151.238,56.697 151.238,56.864C151.238,57.029 151.198,57.164 151.117,57.267C151.036,57.371 150.93,57.423 150.799,57.423ZM153.264,57.915C153.477,57.915 153.661,57.872 153.818,57.785C153.974,57.699 154.094,57.577 154.178,57.419C154.262,57.262 154.304,57.084 154.304,56.886C154.304,56.559 154.221,56.304 154.054,56.122C153.888,55.941 153.658,55.85 153.365,55.85C153.202,55.85 153.047,55.888 152.902,55.966L152.902,55.966L152.978,55.304L154.202,55.304L154.202,54.795L152.477,54.795L152.3,56.359L152.786,56.48L152.845,56.425C152.935,56.349 153.053,56.311 153.198,56.311C153.356,56.311 153.478,56.357 153.564,56.45C153.65,56.543 153.693,56.677 153.693,56.852C153.693,57.034 153.656,57.174 153.581,57.274C153.506,57.373 153.4,57.423 153.262,57.423C153.138,57.423 153.037,57.387 152.96,57.316C152.884,57.245 152.839,57.145 152.826,57.017L152.826,57.017L152.221,57.017C152.227,57.191 152.276,57.347 152.368,57.484C152.461,57.621 152.587,57.727 152.746,57.802C152.905,57.878 153.078,57.915 153.264,57.915ZM155.727,57.915C156.047,57.915 156.3,57.836 156.486,57.677C156.672,57.519 156.765,57.303 156.765,57.029C156.765,56.859 156.721,56.71 156.634,56.584C156.546,56.458 156.428,56.359 156.279,56.287C156.41,56.218 156.513,56.126 156.587,56.01C156.662,55.895 156.699,55.762 156.699,55.613C156.699,55.348 156.612,55.138 156.436,54.984C156.261,54.83 156.023,54.752 155.725,54.752C155.424,54.752 155.187,54.83 155.012,54.986C154.837,55.142 154.75,55.351 154.75,55.613C154.75,55.762 154.787,55.895 154.861,56.01C154.935,56.126 155.038,56.218 155.169,56.287C155.021,56.358 154.903,56.456 154.816,56.583C154.728,56.71 154.684,56.859 154.684,57.029C154.684,57.301 154.778,57.517 154.966,57.676C155.153,57.836 155.407,57.915 155.727,57.915ZM155.727,56.051C155.611,56.051 155.522,56.013 155.458,55.938C155.395,55.864 155.363,55.765 155.363,55.642C155.363,55.518 155.395,55.421 155.458,55.351C155.522,55.28 155.61,55.245 155.725,55.245C155.84,55.245 155.93,55.281 155.993,55.354C156.057,55.426 156.088,55.523 156.088,55.642C156.088,55.765 156.057,55.864 155.994,55.938C155.931,56.013 155.842,56.051 155.727,56.051ZM155.727,57.423C155.591,57.423 155.486,57.382 155.41,57.302C155.334,57.222 155.295,57.116 155.295,56.985C155.295,56.85 155.334,56.742 155.412,56.663C155.489,56.583 155.593,56.543 155.723,56.543C155.854,56.543 155.958,56.583 156.035,56.664C156.113,56.744 156.152,56.851 156.152,56.985C156.152,57.122 156.114,57.229 156.039,57.306C155.963,57.384 155.859,57.423 155.727,57.423ZM158.605,57.873L159.677,54.795L158.971,54.795L158.274,57.11L157.58,54.795L156.876,54.795L157.944,57.873L158.605,57.873ZM160.601,57.873L160.601,56.746L161.107,56.746L161.684,57.873L162.364,57.873L162.364,57.843L161.698,56.585C161.883,56.502 162.021,56.391 162.112,56.25C162.203,56.11 162.248,55.935 162.248,55.725C162.248,55.429 162.149,55.2 161.952,55.038C161.755,54.876 161.474,54.795 161.111,54.795L161.111,54.795L159.967,54.795L159.967,57.873L160.601,57.873ZM161.113,56.232L160.601,56.232L160.601,55.308L161.111,55.308C161.281,55.308 161.408,55.35 161.49,55.433C161.573,55.516 161.614,55.631 161.614,55.776C161.614,55.918 161.57,56.03 161.483,56.111C161.395,56.192 161.272,56.232 161.113,56.232L161.113,56.232ZM163.567,57.873L164.758,55.137L164.758,54.795L162.584,54.795L162.584,55.289L164.115,55.289L162.923,57.873L163.567,57.873ZM167.259,57.873L167.259,57.38L165.935,57.38L166.635,56.642C166.827,56.432 166.962,56.249 167.041,56.091C167.12,55.933 167.159,55.778 167.159,55.626C167.159,55.348 167.072,55.133 166.896,54.981C166.721,54.829 166.474,54.752 166.157,54.752C165.95,54.752 165.765,54.796 165.601,54.885C165.438,54.973 165.311,55.094 165.222,55.249C165.132,55.404 165.087,55.576 165.087,55.763L165.087,55.763L165.701,55.763C165.701,55.608 165.74,55.483 165.82,55.388C165.9,55.293 166.009,55.245 166.147,55.245C166.275,55.245 166.374,55.284 166.443,55.362C166.512,55.441 166.546,55.548 166.546,55.685C166.546,55.785 166.513,55.891 166.448,56.002C166.382,56.113 166.281,56.244 166.145,56.393L166.145,56.393L165.149,57.454L165.149,57.873L167.259,57.873ZM168.815,57.915C169.156,57.915 169.427,57.839 169.629,57.688C169.83,57.536 169.931,57.327 169.931,57.061C169.931,56.821 169.849,56.621 169.684,56.461C169.519,56.3 169.256,56.165 168.895,56.057C168.699,55.998 168.551,55.934 168.45,55.867C168.349,55.799 168.299,55.715 168.299,55.615C168.299,55.508 168.342,55.422 168.428,55.356C168.514,55.29 168.634,55.258 168.789,55.258C168.95,55.258 169.075,55.297 169.164,55.375C169.252,55.453 169.297,55.563 169.297,55.704L169.297,55.704L169.931,55.704C169.931,55.519 169.883,55.354 169.788,55.209C169.693,55.064 169.56,54.952 169.388,54.872C169.216,54.792 169.02,54.752 168.8,54.752C168.581,54.752 168.385,54.789 168.209,54.862C168.034,54.936 167.899,55.037 167.805,55.168C167.712,55.298 167.665,55.447 167.665,55.613C167.665,55.933 167.839,56.187 168.189,56.376C168.317,56.445 168.491,56.515 168.711,56.586C168.931,56.658 169.083,56.725 169.168,56.789C169.252,56.854 169.295,56.946 169.295,57.065C169.295,57.175 169.252,57.261 169.168,57.322C169.083,57.383 168.966,57.414 168.815,57.414C168.409,57.414 168.206,57.244 168.206,56.905L168.206,56.905L167.569,56.905C167.569,57.103 167.621,57.278 167.723,57.429C167.825,57.58 167.973,57.699 168.168,57.785C168.362,57.872 168.578,57.915 168.815,57.915Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M111.757,109.606C111.757,110.048 112.012,110.433 112.392,110.64L112.392,110.64L112.392,111.958C112.392,112.131 112.541,112.271 112.726,112.271L112.726,112.271L113.329,112.271C113.514,112.271 113.663,112.131 113.663,111.958L113.663,111.958L113.663,110.64C114.043,110.433 114.299,110.048 114.299,109.606L114.299,109.606C114.299,108.946 113.729,108.411 113.027,108.411L113.027,108.411C112.325,108.411 111.757,108.946 111.757,109.606L111.757,109.606Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M69.255,314.808l106.211,0l0,-229.982l-106.211,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M111.757,109.606C111.757,110.048 112.013,110.433 112.393,110.64L112.393,110.64L112.393,111.958C112.393,112.131 112.542,112.272 112.726,112.272L112.726,112.272L113.329,112.272C113.513,112.272 113.663,112.131 113.663,111.958L113.663,111.958L113.663,110.64C114.042,110.433 114.298,110.048 114.298,109.606L114.298,109.606C114.298,108.946 113.73,108.411 113.027,108.411L113.027,108.411C112.325,108.411 111.757,108.946 111.757,109.606L111.757,109.606Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M111.538,112.37l2.832,0l0,-3.965l-2.832,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M111.757,109.606C111.757,110.048 112.013,110.433 112.393,110.64L112.393,110.64L112.393,111.958C112.393,112.131 112.542,112.272 112.726,112.272L112.726,112.272L113.329,112.272C113.513,112.272 113.663,112.131 113.663,111.958L113.663,111.958L113.663,110.64C114.042,110.433 114.298,110.048 114.298,109.606L114.298,109.606C114.298,108.946 113.73,108.411 113.027,108.411L113.027,108.411C112.325,108.411 111.757,108.946 111.757,109.606L111.757,109.606Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M111.757,109.606C111.757,110.048 112.013,110.434 112.392,110.64L112.392,111.958C112.392,112.131 112.542,112.272 112.726,112.272L113.329,112.272C113.514,112.272 113.663,112.131 113.663,111.958L113.663,110.64C114.043,110.434 114.299,110.048 114.299,109.606C114.299,108.946 113.73,108.411 113.028,108.411C112.326,108.411 111.757,108.946 111.757,109.606" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M112.533,108.505C112.077,108.687 111.757,109.111 111.757,109.606L111.757,109.606C111.757,109.62 111.757,109.634 111.758,109.647L111.758,109.647C111.773,110.072 112.025,110.44 112.393,110.64L112.393,110.64L112.393,111.958C112.393,112.131 112.542,112.272 112.726,112.272L112.726,112.272L113.329,112.272C113.51,112.272 113.659,112.135 113.663,111.966L113.663,111.966L113.663,111.958L113.663,110.64C114.04,110.435 114.295,110.054 114.298,109.616L114.298,109.616L114.298,109.606C114.298,108.946 113.73,108.411 113.027,108.411L113.027,108.411C112.852,108.411 112.685,108.445 112.533,108.505L112.533,108.505Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M111.538,112.37l2.832,0l0,-3.965l-2.832,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M112.533,108.505C112.077,108.687 111.757,109.111 111.757,109.606L111.757,109.606C111.757,109.62 111.757,109.634 111.757,109.647L111.757,109.647C111.773,110.072 112.024,110.44 112.393,110.64L112.393,110.64L112.393,111.958C112.393,112.131 112.542,112.272 112.726,112.272L112.726,112.272L113.329,112.272C113.51,112.272 113.658,112.135 113.663,111.966L113.663,111.966L113.663,111.958L113.663,110.64C114.039,110.435 114.294,110.054 114.298,109.616L114.298,109.616L114.298,109.606C114.298,108.946 113.73,108.411 113.027,108.411L113.027,108.411C112.852,108.411 112.685,108.445 112.533,108.505L112.533,108.505Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M110.341,113.688l5.374,0l0,-6.692l-5.374,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> <path - android:fillColor="#D8ECF9" - android:fillType="evenOdd" - android:pathData="M236.446,81.673C241.815,73.808 244.884,70.782 251.02,67.152C287.889,45.343 364.55,55.052 369.152,100.429C389.096,102.244 395.368,119.832 396,121L346.458,121L278.538,121L218.538,121L185,121C185,121 184.868,81.817 236.446,81.673" + android:pathData="M148.561,74.668L148.561,73.826L148.498,72.376L149.327,74.668L149.762,74.668L150.593,72.374L150.53,73.826L150.53,74.668L151.166,74.668L151.166,71.59L150.333,71.59L149.547,73.822L148.756,71.59L147.927,71.59L147.927,74.668L148.561,74.668ZM153.143,74.668L153.143,71.585L153.078,71.585L151.803,72.042L151.803,72.539L152.532,72.313L152.532,74.668L153.143,74.668ZM155.116,74.71C155.444,74.71 155.708,74.628 155.908,74.463C156.107,74.298 156.207,74.079 156.207,73.805C156.207,73.636 156.164,73.49 156.079,73.366C155.994,73.242 155.864,73.149 155.691,73.087C155.83,73.023 155.943,72.932 156.029,72.814C156.115,72.695 156.158,72.566 156.158,72.425C156.158,72.151 156.066,71.937 155.881,71.781C155.697,71.625 155.441,71.547 155.116,71.547C154.928,71.547 154.757,71.583 154.601,71.655C154.445,71.727 154.324,71.827 154.237,71.954C154.151,72.082 154.107,72.226 154.107,72.387L154.107,72.387L154.718,72.387C154.718,72.284 154.758,72.2 154.837,72.136C154.916,72.072 155.014,72.04 155.131,72.04C155.26,72.04 155.362,72.075 155.436,72.144C155.51,72.213 155.547,72.309 155.547,72.433C155.547,72.562 155.51,72.664 155.435,72.742C155.36,72.819 155.245,72.858 155.09,72.858L155.09,72.858L154.765,72.858L154.765,73.336L155.088,73.336C155.427,73.336 155.596,73.49 155.596,73.797C155.596,73.924 155.555,74.026 155.472,74.102C155.39,74.179 155.276,74.218 155.131,74.218C155.004,74.218 154.897,74.181 154.81,74.108C154.724,74.034 154.68,73.94 154.68,73.824L154.68,73.824L154.069,73.824C154.069,74.091 154.167,74.305 154.362,74.467C154.557,74.629 154.809,74.71 155.116,74.71ZM157.059,74.698L157.209,74.695C157.677,74.676 158.038,74.519 158.293,74.226C158.549,73.933 158.676,73.53 158.676,73.017L158.676,73.017L158.676,72.791C158.675,72.545 158.63,72.328 158.543,72.137C158.456,71.947 158.333,71.801 158.175,71.7C158.017,71.598 157.837,71.547 157.634,71.547C157.436,71.547 157.259,71.594 157.101,71.688C156.943,71.782 156.82,71.913 156.732,72.081C156.644,72.25 156.6,72.435 156.6,72.636C156.6,72.953 156.682,73.205 156.845,73.392C157.009,73.579 157.226,73.672 157.498,73.672C157.711,73.672 157.897,73.594 158.057,73.437C158.013,73.912 157.725,74.162 157.194,74.186L157.194,74.186L157.059,74.188L157.059,74.698ZM157.649,73.205C157.509,73.205 157.401,73.151 157.324,73.043C157.247,72.935 157.209,72.798 157.209,72.63C157.209,72.461 157.248,72.32 157.327,72.208C157.406,72.096 157.507,72.04 157.63,72.04C157.762,72.04 157.868,72.097 157.947,72.211C158.026,72.325 158.065,72.486 158.065,72.693L158.065,72.693L158.065,72.945C158.028,73.017 157.975,73.078 157.903,73.129C157.832,73.18 157.747,73.205 157.649,73.205ZM160.145,74.71C160.485,74.71 160.743,74.597 160.919,74.372C161.095,74.146 161.183,73.821 161.183,73.395L161.183,73.395L161.183,72.829C161.179,72.416 161.088,72.099 160.911,71.878C160.733,71.658 160.477,71.547 160.141,71.547C159.806,71.547 159.549,71.659 159.371,71.881C159.192,72.104 159.103,72.43 159.103,72.86L159.103,72.86L159.103,73.427C159.107,73.84 159.198,74.157 159.376,74.378C159.553,74.6 159.81,74.71 160.145,74.71ZM160.145,74.218C159.995,74.218 159.885,74.157 159.817,74.035C159.748,73.913 159.714,73.726 159.714,73.476L159.714,73.476L159.714,72.727C159.718,72.492 159.755,72.319 159.823,72.208C159.891,72.097 159.997,72.042 160.141,72.042C160.289,72.042 160.398,72.1 160.468,72.217C160.538,72.333 160.572,72.519 160.572,72.774L160.572,72.774L160.572,73.505C160.57,73.746 160.535,73.925 160.469,74.042C160.403,74.159 160.295,74.218 160.145,74.218ZM162.034,74.668L162.245,74.034L163.358,74.034L163.571,74.668L164.245,74.668L163.093,71.59L162.506,71.59L161.36,74.668L162.034,74.668ZM163.186,73.52L162.417,73.52L162.799,72.368L163.186,73.52ZM165.167,74.668L165.167,73.826L165.104,72.376L165.933,74.668L166.368,74.668L167.199,72.374L167.136,73.826L167.136,74.668L167.772,74.668L167.772,71.59L166.939,71.59L166.152,73.822L165.362,71.59L164.533,71.59L164.533,74.668L165.167,74.668ZM170.307,74.668L170.307,74.158L168.96,74.158L168.96,71.59L168.326,71.59L168.326,74.668L170.307,74.668Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> <path - android:fillColor="#B1BBC2" + android:pathData="M148.205,91.463L148.205,90.205L149.423,90.205L149.423,89.693L148.205,89.693L148.205,88.898L149.575,88.898L149.575,88.385L147.571,88.385L147.571,91.463L148.205,91.463ZM150.575,91.463L150.575,90.583L150.905,90.228L151.696,91.463L152.45,91.463L151.326,89.752L152.419,88.385L151.639,88.385L150.854,89.397L150.575,89.78L150.575,88.385L149.941,88.385L149.941,91.463L150.575,91.463ZM153.512,91.505C153.71,91.505 153.889,91.464 154.047,91.383C154.204,91.301 154.327,91.185 154.413,91.035C154.5,90.885 154.543,90.712 154.543,90.516L154.543,90.516L154.543,88.385L153.909,88.385L153.909,90.516C153.909,90.669 153.873,90.788 153.801,90.871C153.729,90.954 153.633,90.996 153.512,90.996C153.375,90.996 153.275,90.96 153.211,90.888C153.148,90.816 153.116,90.705 153.116,90.554L153.116,90.554L152.478,90.554C152.478,90.857 152.569,91.091 152.751,91.257C152.932,91.422 153.186,91.505 153.512,91.505ZM155.452,91.492L155.603,91.49C156.07,91.471 156.432,91.314 156.687,91.021C156.942,90.728 157.07,90.325 157.07,89.812L157.07,89.812L157.07,89.585C157.068,89.34 157.024,89.122 156.937,88.932C156.849,88.742 156.727,88.596 156.569,88.495C156.411,88.393 156.23,88.342 156.027,88.342C155.83,88.342 155.653,88.389 155.495,88.483C155.337,88.577 155.214,88.708 155.126,88.876C155.038,89.045 154.994,89.23 154.994,89.431C154.994,89.748 155.075,90 155.239,90.187C155.402,90.374 155.62,90.467 155.892,90.467C156.105,90.467 156.291,90.389 156.45,90.232C156.407,90.707 156.119,90.957 155.588,90.981L155.588,90.981L155.452,90.983L155.452,91.492ZM156.042,90C155.903,90 155.795,89.946 155.718,89.838C155.641,89.73 155.603,89.593 155.603,89.425C155.603,89.256 155.642,89.115 155.721,89.003C155.8,88.891 155.901,88.835 156.023,88.835C156.156,88.835 156.261,88.892 156.34,89.006C156.419,89.12 156.459,89.281 156.459,89.488L156.459,89.488L156.459,89.74C156.422,89.812 156.368,89.873 156.297,89.924C156.226,89.974 156.141,90 156.042,90ZM157.937,91.492L158.087,91.49C158.555,91.471 158.916,91.314 159.171,91.021C159.426,90.728 159.554,90.325 159.554,89.812L159.554,89.812L159.554,89.585C159.553,89.34 159.508,89.122 159.421,88.932C159.333,88.742 159.211,88.596 159.053,88.495C158.895,88.393 158.715,88.342 158.512,88.342C158.314,88.342 158.137,88.389 157.979,88.483C157.821,88.577 157.698,88.708 157.61,88.876C157.522,89.045 157.478,89.23 157.478,89.431C157.478,89.748 157.56,90 157.723,90.187C157.887,90.374 158.104,90.467 158.376,90.467C158.589,90.467 158.775,90.389 158.934,90.232C158.891,90.707 158.603,90.957 158.072,90.981L158.072,90.981L157.937,90.983L157.937,91.492ZM158.526,90C158.387,90 158.279,89.946 158.202,89.838C158.125,89.73 158.087,89.593 158.087,89.425C158.087,89.256 158.126,89.115 158.205,89.003C158.284,88.891 158.385,88.835 158.507,88.835C158.64,88.835 158.746,88.892 158.825,89.006C158.903,89.12 158.943,89.281 158.943,89.488L158.943,89.488L158.943,89.74C158.906,89.812 158.852,89.873 158.781,89.924C158.71,89.974 158.625,90 158.526,90ZM161.031,91.505C161.244,91.505 161.429,91.462 161.585,91.375C161.742,91.288 161.862,91.167 161.946,91.009C162.03,90.852 162.072,90.674 162.072,90.476C162.072,90.149 161.988,89.894 161.822,89.712C161.656,89.531 161.426,89.44 161.133,89.44C160.969,89.44 160.815,89.478 160.67,89.556L160.67,89.556L160.746,88.894L161.97,88.894L161.97,88.385L160.245,88.385L160.067,89.949L160.554,90.07L160.613,90.015C160.703,89.939 160.821,89.9 160.966,89.9C161.124,89.9 161.246,89.947 161.332,90.04C161.418,90.133 161.461,90.267 161.461,90.442C161.461,90.624 161.423,90.764 161.349,90.863C161.274,90.963 161.167,91.013 161.029,91.013C160.905,91.013 160.805,90.977 160.728,90.906C160.651,90.835 160.606,90.735 160.594,90.607L160.594,90.607L159.989,90.607C159.995,90.781 160.044,90.937 160.136,91.074C160.228,91.211 160.354,91.317 160.513,91.392C160.673,91.467 160.845,91.505 161.031,91.505ZM163.433,91.505C163.762,91.505 164.025,91.423 164.225,91.258C164.424,91.093 164.524,90.874 164.524,90.6C164.524,90.431 164.481,90.285 164.396,90.161C164.311,90.036 164.182,89.943 164.008,89.881C164.148,89.818 164.26,89.727 164.346,89.609C164.432,89.49 164.475,89.361 164.475,89.22C164.475,88.946 164.383,88.732 164.198,88.576C164.014,88.42 163.759,88.342 163.433,88.342C163.246,88.342 163.074,88.378 162.918,88.45C162.763,88.522 162.641,88.622 162.555,88.749C162.468,88.877 162.425,89.021 162.425,89.182L162.425,89.182L163.036,89.182C163.036,89.079 163.075,88.995 163.154,88.931C163.233,88.867 163.331,88.835 163.448,88.835C163.578,88.835 163.679,88.869 163.753,88.939C163.827,89.008 163.864,89.104 163.864,89.228C163.864,89.356 163.827,89.459 163.752,89.537C163.678,89.614 163.563,89.653 163.408,89.653L163.408,89.653L163.082,89.653L163.082,90.131L163.406,90.131C163.744,90.131 163.913,90.285 163.913,90.592C163.913,90.719 163.872,90.821 163.789,90.897C163.707,90.974 163.593,91.013 163.448,91.013C163.321,91.013 163.214,90.976 163.128,90.903C163.041,90.829 162.998,90.735 162.998,90.619L162.998,90.619L162.387,90.619C162.387,90.886 162.484,91.1 162.679,91.262C162.875,91.424 163.126,91.505 163.433,91.505ZM165.971,91.505C166.311,91.505 166.569,91.392 166.745,91.167C166.921,90.941 167.009,90.616 167.009,90.19L167.009,90.19L167.009,89.624C167.005,89.211 166.914,88.894 166.737,88.673C166.559,88.453 166.302,88.342 165.967,88.342C165.632,88.342 165.375,88.454 165.196,88.676C165.018,88.899 164.929,89.225 164.929,89.655L164.929,89.655L164.929,90.222C164.933,90.635 165.024,90.952 165.202,91.173C165.379,91.394 165.636,91.505 165.971,91.505ZM165.971,91.013C165.82,91.013 165.711,90.952 165.642,90.83C165.574,90.708 165.54,90.521 165.54,90.27L165.54,90.27L165.54,89.522C165.544,89.287 165.58,89.114 165.649,89.003C165.717,88.892 165.823,88.837 165.967,88.837C166.115,88.837 166.224,88.895 166.294,89.011C166.363,89.128 166.398,89.313 166.398,89.569L166.398,89.569L166.398,90.3C166.395,90.541 166.361,90.72 166.295,90.837C166.228,90.954 166.121,91.013 165.971,91.013ZM169.501,91.463L169.501,90.97L168.177,90.97L168.877,90.232C169.069,90.022 169.204,89.838 169.283,89.681C169.362,89.523 169.401,89.368 169.401,89.215C169.401,88.938 169.314,88.723 169.138,88.571C168.963,88.418 168.716,88.342 168.399,88.342C168.192,88.342 168.007,88.386 167.843,88.474C167.68,88.563 167.553,88.684 167.464,88.839C167.374,88.994 167.329,89.165 167.329,89.353L167.329,89.353L167.943,89.353C167.943,89.198 167.982,89.073 168.062,88.978C168.142,88.883 168.251,88.835 168.389,88.835C168.517,88.835 168.616,88.874 168.685,88.952C168.754,89.031 168.788,89.138 168.788,89.275C168.788,89.375 168.755,89.48 168.69,89.592C168.624,89.703 168.523,89.834 168.387,89.983L168.387,89.983L167.391,91.044L167.391,91.463L169.501,91.463Z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + <path + android:pathData="M147.405,108.258L147.405,106.939L148.642,106.939L148.642,108.258L149.276,108.258L149.276,105.18L148.642,105.18L148.642,106.427L147.405,106.427L147.405,105.18L146.771,105.18L146.771,108.258L147.405,108.258ZM150.282,108.258L150.494,107.624L151.606,107.624L151.819,108.258L152.494,108.258L151.342,105.18L150.754,105.18L149.608,108.258L150.282,108.258ZM151.435,107.11L150.665,107.11L151.048,105.958L151.435,107.11ZM153.669,108.3C153.997,108.3 154.261,108.218 154.461,108.053C154.66,107.888 154.76,107.669 154.76,107.395C154.76,107.226 154.717,107.08 154.632,106.956C154.547,106.832 154.417,106.738 154.244,106.676C154.383,106.613 154.496,106.522 154.582,106.404C154.668,106.285 154.711,106.156 154.711,106.015C154.711,105.741 154.619,105.527 154.434,105.371C154.25,105.215 153.994,105.137 153.669,105.137C153.481,105.137 153.31,105.173 153.154,105.245C152.998,105.317 152.877,105.417 152.79,105.544C152.704,105.672 152.66,105.816 152.66,105.977L152.66,105.977L153.271,105.977C153.271,105.874 153.311,105.79 153.39,105.726C153.469,105.662 153.567,105.63 153.684,105.63C153.813,105.63 153.915,105.664 153.989,105.734C154.063,105.803 154.1,105.899 154.1,106.023C154.1,106.151 154.063,106.254 153.988,106.332C153.913,106.409 153.799,106.448 153.644,106.448L153.644,106.448L153.318,106.448L153.318,106.926L153.641,106.926C153.98,106.926 154.149,107.08 154.149,107.387C154.149,107.514 154.108,107.616 154.025,107.692C153.943,107.769 153.829,107.808 153.684,107.808C153.557,107.808 153.45,107.771 153.363,107.698C153.277,107.624 153.233,107.53 153.233,107.414L153.233,107.414L152.622,107.414C152.622,107.681 152.72,107.895 152.915,108.057C153.11,108.219 153.362,108.3 153.669,108.3ZM156.988,108.258L156.988,107.592L157.337,107.592L157.337,107.099L156.988,107.099L156.988,105.18L156.371,105.18L155.087,107.207L155.115,107.592L156.377,107.592L156.377,108.258L156.988,108.258ZM156.377,107.099L155.696,107.099L156.337,106.082L156.377,106.013L156.377,107.099ZM158.966,108.3C159.22,108.3 159.451,108.262 159.659,108.187C159.868,108.112 160.029,108.006 160.144,107.869L160.144,107.869L160.144,106.641L158.932,106.641L158.932,107.108L159.509,107.108L159.509,107.638C159.408,107.74 159.238,107.791 159,107.791C158.763,107.791 158.583,107.708 158.461,107.543C158.338,107.378 158.277,107.135 158.277,106.812L158.277,106.812L158.277,106.615C158.278,106.295 158.335,106.054 158.448,105.892C158.561,105.73 158.725,105.649 158.941,105.649C159.11,105.649 159.243,105.69 159.339,105.772C159.436,105.853 159.498,105.982 159.526,106.159L159.526,106.159L160.144,106.159C160.106,105.826 159.984,105.573 159.778,105.398C159.572,105.224 159.287,105.137 158.922,105.137C158.66,105.137 158.431,105.197 158.236,105.316C158.04,105.435 157.891,105.607 157.787,105.832C157.684,106.057 157.632,106.323 157.632,106.63L157.632,106.63L157.632,106.839C157.635,107.138 157.691,107.398 157.8,107.619C157.909,107.841 158.064,108.009 158.265,108.126C158.466,108.242 158.7,108.3 158.966,108.3ZM161.807,108.3C162.173,108.3 162.46,108.202 162.671,108.006C162.882,107.81 162.987,107.544 162.987,107.207L162.987,107.207L162.987,105.18L162.351,105.18L162.351,107.228C162.345,107.603 162.164,107.791 161.807,107.791C161.637,107.791 161.503,107.744 161.407,107.652C161.31,107.56 161.262,107.413 161.262,107.211L161.262,107.211L161.262,105.18L160.628,105.18L160.628,107.23C160.632,107.563 160.74,107.824 160.951,108.015C161.163,108.205 161.448,108.3 161.807,108.3ZM164.017,108.258L164.609,107.18L165.201,108.258L165.939,108.258L165.019,106.706L165.915,105.18L165.186,105.18L164.609,106.241L164.032,105.18L163.302,105.18L164.199,106.706L163.279,108.258L164.017,108.258ZM167.207,108.3C167.42,108.3 167.604,108.257 167.761,108.17C167.917,108.083 168.037,107.962 168.121,107.804C168.205,107.647 168.247,107.469 168.247,107.271C168.247,106.944 168.164,106.689 167.998,106.507C167.831,106.326 167.602,106.235 167.308,106.235C167.145,106.235 166.991,106.273 166.845,106.351L166.845,106.351L166.922,105.689L168.146,105.689L168.146,105.18L166.42,105.18L166.243,106.744L166.729,106.865L166.788,106.81C166.879,106.734 166.996,106.696 167.141,106.696C167.299,106.696 167.421,106.742 167.507,106.835C167.593,106.928 167.636,107.062 167.636,107.237C167.636,107.419 167.599,107.559 167.524,107.659C167.449,107.758 167.343,107.808 167.205,107.808C167.081,107.808 166.98,107.772 166.904,107.701C166.827,107.63 166.782,107.53 166.769,107.402L166.769,107.402L166.165,107.402C166.17,107.576 166.219,107.732 166.312,107.869C166.404,108.006 166.53,108.112 166.689,108.187C166.848,108.262 167.021,108.3 167.207,108.3ZM170.12,108.258L170.12,105.175L170.055,105.175L168.78,105.632L168.78,106.129L169.509,105.903L169.509,108.258L170.12,108.258Z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + <path + android:pathData="M144.053,62.632C144.053,62.632 143.636,62.634 143.617,62.634C143.342,62.632 143.654,62.637 143.379,62.632C143.152,62.626 142.437,62.365 142.412,61.602C142.411,60.754 142.412,54.733 142.412,51.854C142.405,50.843 143.223,50.605 143.511,50.605C143.762,50.604 143.351,50.606 143.602,50.603C143.656,50.603 144.051,50.604 144.051,50.604L144.053,62.632Z" + android:strokeWidth="1" + android:fillColor="#BE0F2D" android:fillType="evenOdd" - android:pathData="M158,65m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" + android:strokeColor="#00000000"/> + <path + android:pathData="M144.065,79.348C144.065,79.348 143.648,79.35 143.63,79.35C143.354,79.348 143.666,79.354 143.391,79.348C143.164,79.343 142.449,79.082 142.424,78.318C142.424,77.471 142.424,71.449 142.424,68.571C142.417,67.559 143.236,67.321 143.524,67.32C143.774,67.32 143.363,67.322 143.614,67.319C143.669,67.319 144.063,67.32 144.063,67.32L144.065,79.348Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BE0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B1BBC2" + android:pathData="M191.722,80.638C191.722,81.988 190.628,83.081 189.279,83.081C187.93,83.081 186.835,81.988 186.835,80.638C186.835,79.289 187.93,78.196 189.279,78.196C190.628,78.196 191.722,79.289 191.722,80.638" + android:strokeWidth="1" + android:fillColor="#A6B4BC" android:fillType="evenOdd" - android:pathData="M176,65m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" + android:strokeColor="#00000000"/> + <path + android:pathData="M208.812,80.605C208.812,81.977 207.7,83.09 206.328,83.09C204.956,83.09 203.843,81.977 203.843,80.605C203.843,79.233 204.956,78.121 206.328,78.121C207.7,78.121 208.812,79.233 208.812,80.605" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#A6B4BC" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B1BBC2" + android:pathData="M328.845,126.726L245.679,126.726C242.158,126.726 239.304,123.268 239.304,119.004L239.304,32.251C239.304,27.986 242.158,24.528 245.679,24.528L328.845,24.528C332.366,24.528 335.22,27.986 335.22,32.251L335.22,119.004C335.22,123.268 332.366,126.726 328.845,126.726" + android:strokeWidth="1" + android:fillColor="#94A1AB" android:fillType="evenOdd" - android:pathData="M193,65m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" + android:strokeColor="#00000000"/> + <path + android:pathData="M322.474,96.909C322.474,98.5 323.764,99.79 325.355,99.79C326.946,99.79 328.236,98.5 328.236,96.909C328.236,95.317 326.946,94.028 325.355,94.028C323.764,94.028 322.474,95.317 322.474,96.909" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#E8F5FF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B1BBC2" + android:pathData="M310.951,96.909C310.951,98.5 312.241,99.79 313.832,99.79C315.423,99.79 316.713,98.5 316.713,96.909C316.713,95.317 315.423,94.028 313.832,94.028C312.241,94.028 310.951,95.317 310.951,96.909" + android:strokeWidth="1" + android:fillColor="#E8F5FF" android:fillType="evenOdd" - android:pathData="M211,65m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" + android:strokeColor="#00000000"/> + <path + android:pathData="M299.428,96.909C299.428,98.5 300.718,99.79 302.308,99.79C303.9,99.79 305.19,98.5 305.19,96.909C305.19,95.317 303.9,94.028 302.308,94.028C300.718,94.028 299.428,95.317 299.428,96.909" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#E8F5FF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B1BBC2" + android:pathData="M322.528,69.213C322.143,71.242 323.89,72.989 325.918,72.604C327.047,72.39 327.968,71.469 328.182,70.341C328.567,68.312 326.821,66.565 324.791,66.95C323.664,67.163 322.741,68.086 322.528,69.213" + android:strokeWidth="1" + android:fillColor="#DCE1E5" android:fillType="evenOdd" - android:pathData="M229,65m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" + android:strokeColor="#00000000"/> + <path + android:pathData="M311.005,69.213C310.62,71.242 312.366,72.989 314.395,72.604C315.524,72.39 316.445,71.469 316.659,70.341C317.044,68.312 315.298,66.565 313.268,66.95C312.141,67.163 311.218,68.086 311.005,69.213" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#DCE1E5" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#FFFFFF" + android:pathData="M299.481,69.213C299.097,71.242 300.843,72.989 302.872,72.604C304,72.39 304.922,71.469 305.135,70.341C305.521,68.312 303.774,66.565 301.745,66.95C300.617,67.163 299.695,68.086 299.481,69.213" + android:strokeWidth="1" + android:fillColor="#DCE1E5" android:fillType="evenOdd" - android:pathData="M76.332,81.2L35.669,81.2C30.33,81.2 26,85.461 26,90.715L26,187.685C26,192.938 30.33,197.2 35.669,197.2L76.332,197.2C81.673,197.2 86,192.938 86,187.685L86,90.715C86,85.461 81.673,81.2 76.332,81.2" + android:strokeColor="#00000000"/> + <path + android:pathData="M249.368,48.407L290.431,48.407C291.422,48.407 292.226,47.603 292.226,46.612L292.226,38.679C292.226,37.687 291.422,36.883 290.431,36.883L249.368,36.883C248.377,36.883 247.574,37.687 247.574,38.679L247.574,46.612C247.574,47.603 248.377,48.407 249.368,48.407" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#4A4A4A" + android:pathData="M322.528,42.081C322.143,44.11 323.89,45.857 325.918,45.472C327.047,45.258 327.968,44.336 328.182,43.209C328.567,41.18 326.821,39.433 324.791,39.818C323.664,40.032 322.741,40.954 322.528,42.081" + android:strokeWidth="1" + android:fillColor="#DCE1E5" android:fillType="evenOdd" - android:pathData="M76.274,81.31C79.931,81.31 82.905,84.299 82.905,87.975L82.905,189.625C82.905,193.3 79.931,196.289 76.274,196.289L34.526,196.289C30.869,196.289 27.894,193.3 27.894,189.625L27.894,87.975C27.894,84.299 30.869,81.31 34.526,81.31L76.274,81.31ZM76.274,78L34.526,78C29.045,78 24.6,82.464 24.6,87.975L24.6,189.625C24.6,195.133 29.045,199.6 34.526,199.6L76.274,199.6C81.757,199.6 86.2,195.133 86.2,189.625L86.2,87.975C86.2,82.464 81.757,78 76.274,78L76.274,78Z" + android:strokeColor="#00000000"/> + <path + android:pathData="M311.005,42.081C310.62,44.11 312.366,45.857 314.395,45.472C315.524,45.258 316.445,44.336 316.659,43.209C317.044,41.18 315.298,39.433 313.268,39.818C312.141,40.032 311.218,40.954 311.005,42.081" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#DCE1E5" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#EFEFEF" + android:pathData="M299.481,42.081C299.097,44.11 300.843,45.857 302.872,45.472C304,45.258 304.922,44.336 305.135,43.209C305.521,41.18 303.774,39.433 301.745,39.818C300.617,40.032 299.695,40.954 299.481,42.081" + android:strokeWidth="1" + android:fillColor="#DCE1E5" android:fillType="evenOdd" - android:pathData="M77.609,155.6L32.791,155.6C32.133,155.6 31.6,155.069 31.6,154.414L31.6,119.186C31.6,118.531 32.133,118 32.791,118L77.609,118C78.267,118 78.8,118.531 78.8,119.186L78.8,154.414C78.8,155.069 78.267,155.6 77.609,155.6L41.537,120.699" + android:strokeColor="#00000000"/> + <path + android:pathData="M249.738,75.59L290.801,75.59C291.792,75.59 292.596,74.786 292.596,73.796L292.596,65.863C292.596,64.87 291.792,64.067 290.801,64.067L249.738,64.067C248.747,64.067 247.943,64.87 247.943,65.863L247.943,73.796C247.943,74.786 248.747,75.59 249.738,75.59" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M77.609,155.6L32.791,155.6C32.133,155.6 31.6,155.069 31.6,154.414L31.6,119.186C31.6,118.531 32.133,118 32.791,118L77.609,118C78.267,118 78.8,118.531 78.8,119.186L78.8,154.414C78.8,155.069 78.267,155.6 77.609,155.6L41.537,120.699" /> - <path - android:fillColor="#BF0F2D" - android:fillType="evenOdd" - android:pathData="M35.499,155.6L31.701,155.6C31.645,155.6 31.6,155.069 31.6,154.414L31.6,119.186C31.6,118.531 31.645,118 31.701,118L35.499,118C35.555,118 35.6,118.531 35.6,119.186L35.6,154.414C35.6,155.069 35.555,155.6 35.499,155.6" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,49l89.6,0l0,22.4l-89.6,0z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M333.153,71.4L248.447,71.4C247.096,71.4 246,70.304 246,68.953L246,51.447C246,50.096 247.096,49 248.447,49L333.153,49C334.504,49 335.6,50.096 335.6,51.447L335.6,68.953C335.6,70.304 334.504,71.4 333.153,71.4" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#4A4A4A" - android:fillType="evenOdd" - android:pathData="M251.6,105l78.4,0l0,-5.6l-78.4,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M333.126,99.4L248.474,99.4C247.108,99.4 246,98.292 246,96.926L246,79.474C246,78.107 247.108,77 248.474,77L333.126,77C334.492,77 335.6,78.107 335.6,79.474L335.6,96.926C335.6,98.292 334.492,99.4 333.126,99.4" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M257.2,88.2C257.2,89.747 255.946,91 254.4,91C252.854,91 251.6,89.747 251.6,88.2C251.6,86.654 252.854,85.4 254.4,85.4C255.946,85.4 257.2,86.654 257.2,88.2" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M268.4,88.2C268.4,89.747 267.146,91 265.6,91C264.054,91 262.8,89.747 262.8,88.2C262.8,86.654 264.054,85.4 265.6,85.4C267.146,85.4 268.4,86.654 268.4,88.2" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M279.6,88.2C279.6,89.747 278.346,91 276.8,91C275.254,91 274,89.747 274,88.2C274,86.654 275.254,85.4 276.8,85.4C278.346,85.4 279.6,86.654 279.6,88.2" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#4A4A4A" - android:fillType="evenOdd" - android:pathData="M251.6,77l78.4,0l0,-5.6l-78.4,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M257.148,59.652C257.522,61.624 255.825,63.322 253.852,62.948C252.756,62.74 251.86,61.844 251.652,60.748C251.278,58.775 252.975,57.078 254.948,57.452C256.044,57.66 256.94,58.556 257.148,59.652" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M268.348,59.652C268.722,61.624 267.025,63.322 265.052,62.948C263.956,62.74 263.06,61.844 262.852,60.748C262.478,58.775 264.175,57.078 266.148,57.452C267.244,57.66 268.14,58.556 268.348,59.652" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M279.548,59.652C279.922,61.624 278.225,63.322 276.252,62.948C275.156,62.74 274.26,61.844 274.052,60.748C273.678,58.775 275.375,57.078 277.348,57.452C278.444,57.66 279.34,58.556 279.548,59.652" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#4A4A4A" - android:fillType="evenOdd" - android:pathData="M251.6,49l78.4,0l0,-5.6l-78.4,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M333.215,43.4L248.385,43.4C247.068,43.4 246,42.332 246,41.015L246,23.385C246,22.067 247.068,21 248.385,21L333.215,21C334.532,21 335.6,22.067 335.6,23.385L335.6,41.015C335.6,42.332 334.532,43.4 333.215,43.4" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#4A4A4A" - android:fillType="evenOdd" - android:pathData="M328.255,37.8L288.344,37.8C287.381,37.8 286.6,37.019 286.6,36.055L286.6,28.345C286.6,27.381 287.381,26.6 288.344,26.6L328.255,26.6C329.219,26.6 330,27.381 330,28.345L330,36.055C330,37.019 329.219,37.8 328.255,37.8" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M257.148,31.652C257.522,33.624 255.825,35.322 253.852,34.948C252.756,34.74 251.86,33.844 251.652,32.748C251.278,30.775 252.975,29.078 254.948,29.452C256.044,29.66 256.94,30.556 257.148,31.652" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M249.738,101.899L290.801,101.899C291.792,101.899 292.596,101.096 292.596,100.105L292.596,92.171C292.596,91.18 291.792,90.376 290.801,90.376L249.738,90.376C248.747,90.376 247.943,91.18 247.943,92.171L247.943,100.105C247.943,101.096 248.747,101.899 249.738,101.899" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M268.348,31.652C268.722,33.624 267.025,35.322 265.052,34.948C263.956,34.74 263.06,33.844 262.852,32.748C262.478,30.775 264.175,29.078 266.148,29.452C267.244,29.66 268.14,30.556 268.348,31.652" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M205.488,87.08l179.566,0l0,50.259l-179.566,0z"/> + <path + android:pathData="M205.488,137.339C207.64,113.404 238.984,115.718 241.359,116.668C247.984,101.553 270.401,99.797 278.229,105.388C282.143,98.12 287.522,94.521 292.596,92.171C309.207,84.476 338.622,81.178 355.692,114.744C382.384,114.197 384.593,136.26 385.054,137.339L297.156,137.339L205.488,137.339Z" + android:strokeWidth="1" + android:fillColor="#D8ECF9" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> - <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#E7EAEF" - android:fillType="evenOdd" - android:pathData="M279.548,31.652C279.922,33.624 278.225,35.322 276.252,34.948C275.156,34.74 274.26,33.844 274.052,32.748C273.678,30.775 275.375,29.078 277.348,29.452C278.444,29.66 279.34,30.556 279.548,31.652" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <path + android:pathData="M226.65,80.576C226.65,81.948 225.538,83.06 224.166,83.06C222.793,83.06 221.681,81.948 221.681,80.576C221.681,79.204 222.793,78.091 224.166,78.091C225.538,78.091 226.65,79.204 226.65,80.576" + android:strokeWidth="1" + android:fillColor="#A6B4BC" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M47.231,22.5L47.891,30.585C47.654,27.644 47.343,23.786 47.231,22.5" + android:strokeWidth="1" + android:fillColor="#E1EEFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M45.547,40.243l-0.829,10.532l9.703,0.786l1.688,-11.196z" + android:strokeWidth="1" + android:fillColor="#F6B893" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.096,31.557C58.29,48.725 41.801,48.193 41.19,31.717C41.252,14.89 57.717,14.735 58.096,31.557" + android:strokeWidth="1" + android:fillColor="#F6B893" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.046,98.4C27.783,125.6 33.713,164.943 35.323,196.472L40.275,196.712C40.275,196.712 43.935,145.54 45.325,133.914C45.748,130.382 47.065,122.836 47.727,119.558C47.778,119.308 48.324,118.23 48.367,119.501C48.641,127.539 52.114,136.431 52.777,145.279C54.325,165.956 53.682,180.321 54.225,197.375C54.225,197.375 59.915,200.866 59.926,200.829C61.202,196.092 65.044,156.972 65.136,151.1C65.156,149.896 67.122,124.833 61.143,99.217L35.046,98.4Z" + android:strokeWidth="1" + android:fillColor="#8C8C98" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.121,51.63C59.194,48.461 59.039,49.482 54.854,48.583C51.711,52.75 46.328,50.327 44.779,48.649C44.595,48.45 44.09,48.687 44.008,48.637C26.924,49.859 35.724,86.622 34.532,97.578C34.474,98.114 34.553,99.131 35.039,99.082C35.039,99.082 50.763,101.303 57.174,100.021C58.092,99.837 61.221,99.508 61.286,98.838C62.339,87.944 67.97,57.275 63.121,51.63" + android:strokeWidth="1" + android:fillColor="#C66A61" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <group> + <clip-path + android:pathData="M33.543,16.945l32.089,0l0,35.573l-32.089,0z"/> + <path + android:pathData="M37.462,50.848C37.473,50.855 37.485,50.858 37.498,50.863C37.856,51.01 38.996,52.46 41.308,51.585C43.199,50.87 44.29,49.219 44.852,48.685C46.033,47.562 46.597,45.325 46.171,43.321C45.941,42.238 45.517,41.792 45.284,41.518C40.704,36.131 42.19,30.556 42.746,28.571C42.792,28.408 42.946,26.989 43.033,27.133C43.89,28.527 48.2,29.161 57.418,32.599C57.505,32.632 57.281,35.619 57.264,35.71C57.151,36.337 56.651,38.684 55.291,40.427C55.175,40.574 53.983,41.68 53.961,43.387C53.94,45.06 53.96,46.757 55.131,49.307C56.563,52.425 60.118,53.135 62.796,52.027C64.724,51.228 65.517,49.322 65.632,47.41C65.639,47.299 65.55,47.206 65.438,47.205C64.458,47.203 60.314,46.874 61.387,41.46C62.295,36.853 63.324,26.803 58.719,21.054C58.654,20.975 58.589,20.896 58.524,20.815C58.479,20.756 58.426,20.696 58.373,20.641C58.279,20.534 58.182,20.426 58.084,20.323C57.991,20.228 57.897,20.132 57.803,20.038C56.366,18.614 54.485,17.553 52.036,17.051C52.031,17.05 52.024,17.05 52.018,17.049C51.679,17.008 42.732,15.99 41.16,21.294C41.145,21.339 41.115,21.378 41.074,21.403C40.678,21.645 38.554,23.14 38.311,27.518C38.049,32.349 38.877,34.107 39.082,37.808C39.325,42.241 39.307,46.245 33.736,46.391C33.604,46.395 33.512,46.52 33.553,46.646C33.787,47.343 34.671,49.352 37.462,50.848" + android:strokeWidth="1" + android:fillColor="#4A4A4A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M33.528,191.945l9.105,0l0,15.276l-9.105,0z"/> + <path + android:pathData="M40.462,191.945L35.267,193.122C34.979,195.135 31.213,203.976 35.753,206.049C37.538,207.082 38.919,208.028 40.861,206.131C45.031,203.701 40.542,193.632 40.462,191.945" + android:strokeWidth="1" + android:fillColor="#4A4A4A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> + <path + android:pathData="M54.257,194.239C54.395,195.308 53.238,202.91 54.341,203.618C54.701,204.038 55.123,204.211 55.32,204.278C61.058,204.38 67.599,204.497 73.337,204.6C76.58,201.147 60.565,199.899 60.925,194.184C58.702,194.202 56.479,194.22 54.257,194.239" + android:strokeWidth="1" + android:fillColor="#4A4A4A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M50.048,51.641C49.047,51.22 48.537,51.008 48.078,50.891C47.144,50.655 46.677,50.537 46.239,50.704C45.757,50.888 45.362,51.267 44.663,51.266C44.456,51.266 44.286,51.232 44.138,51.078C43.976,50.912 43.95,50.716 43.744,49.955C43.499,49.051 41.749,45.918 41.511,45.27C41.084,44.107 40.463,44.053 40.461,43.396C40.46,43.142 40.552,42.985 41.38,41.898C42.068,40.994 42.472,40.488 42.694,40.212C43.637,39.032 43.748,38.898 44.006,38.713C44.282,38.516 44.66,38.244 45.188,38.151C45.642,38.07 45.846,38.186 46.239,37.964C46.3,37.93 46.287,37.932 46.896,37.401C47.405,36.958 47.576,36.816 47.815,36.839C47.923,36.85 52.603,38.024 53.712,38.024C54.097,38.024 56.183,38.791 56.613,38.9C56.746,38.934 57.562,39.138 58.452,39.462C58.695,39.551 58.28,40.827 57.993,41.18C57.86,41.343 56.402,43.57 56.219,44.147C55.854,45.303 55.826,46.362 55.825,46.769C55.825,47.466 55.905,47.962 55.957,49.58C55.967,49.874 55.977,50.283 55.825,50.704C55.753,50.908 55.707,50.932 55.432,51.454C55.126,52.031 55.137,52.086 55.038,52.203C54.754,52.538 54.365,52.446 53.987,52.39C52.788,52.214 52.873,52.585 51.886,52.39C51.516,52.317 51.561,52.277 50.048,51.641" + android:strokeWidth="1" + android:fillColor="#EFEFEF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.581,75.457C31.688,74.815 31.886,74.197 32.169,73.622L34.532,68.818C34.542,68.798 34.553,68.778 34.563,68.758C39.051,60.661 39.448,59.985 39.856,59.271C39.903,59.192 41.838,55.765 41.867,55.677C42.016,55.231 42.5,53.741 42.849,52.279C42.858,52.244 42.864,52.208 42.87,52.172C43.016,51.283 43.162,50.395 43.308,49.506C43.318,49.446 43.324,49.386 43.326,49.326L44.836,43.571C44.852,43.178 45.826,42.822 45.946,42.462C45.946,42.462 46.662,42.432 46.728,42.867C47.218,46.079 48.159,45.447 47.939,47.128C47.741,48.639 47.429,51.36 46.577,54.739C46.294,55.86 45.845,57.591 45.237,59.717C44.212,63.308 43.345,66.265 41.952,69.626C41.05,71.805 39.686,74.716 37.663,77.98C37.63,78.032 37.594,78.083 37.556,78.13C35.754,80.329 34.559,80.723 33.772,80.605C33.706,80.594 33.642,80.574 33.58,80.55L32.071,79.958C31.692,79.81 31.524,79.084 31.462,78.634C31.327,77.665 31.411,76.482 31.581,75.457" + android:strokeWidth="1" + android:fillColor="#F6B893" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M45.417,53.067L46.907,52.8C48.496,49.601 49.489,44.577 48.094,41.722C46.558,39.758 44.002,42.972 43.618,44.94C42.875,48.051 43.389,51.103 43.761,53.383" + android:strokeWidth="1" + android:fillColor="#F6B893" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.196,76.118C66.078,75.507 65.87,74.92 65.577,74.379L63.125,69.842C63.115,69.823 63.104,69.804 63.093,69.785C58.454,62.152 58.044,61.516 57.622,60.843C57.574,60.769 55.575,57.54 55.544,57.456C55.388,57.033 54.877,55.619 54.505,54.229C54.496,54.196 54.488,54.162 54.481,54.128C54.323,53.281 54.162,52.435 54.002,51.588C53.991,51.531 53.984,51.475 53.981,51.417C54.167,49.7 54.167,47.593 53.633,45.282C53.523,44.809 53.398,44.357 53.262,43.927C53.22,43.652 53.126,43.265 52.909,42.853C52.806,42.658 51.981,41.142 50.858,41.264C50.154,41.34 49.698,42.015 49.597,42.184C49.405,42.508 49.272,42.894 49.211,43.312C48.766,46.396 49.055,47.827 49.301,49.43C49.522,50.87 49.876,53.465 50.784,56.676C51.085,57.742 51.562,59.386 52.205,61.406C53.291,64.813 54.206,67.621 55.659,70.8C56.601,72.862 58.017,75.613 60.103,78.685C60.135,78.733 60.173,78.781 60.212,78.825C62.06,80.883 63.27,81.231 64.061,81.098C64.128,81.086 64.191,81.064 64.255,81.04L65.767,80.436C66.145,80.285 66.424,79.929 66.481,79.497C66.603,78.566 66.382,77.095 66.196,76.118" + android:strokeWidth="1" + android:fillColor="#F6B893" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#4A4A4A" - android:fillType="evenOdd" - android:pathData="M327.896,65.85L287.985,65.85C287.022,65.85 286.241,65.069 286.241,64.106L286.241,56.395C286.241,55.432 287.022,54.65 287.985,54.65L327.896,54.65C328.86,54.65 329.641,55.432 329.641,56.395L329.641,64.106C329.641,65.069 328.86,65.85 327.896,65.85" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M30.5,68.569l3.84,0l0,11.881l-3.84,0z"/> + <path + android:pathData="M33.029,80.417C32.751,79.111 32.57,77.753 32.633,76.438C32.675,75.537 32.807,74.092 33.321,72.347C33.825,70.314 34.299,68.673 34.34,68.569C34.34,68.566 32.291,69.832 31.478,71.395C29.486,75.231 31.102,79.454 31.413,79.418C31.436,79.415 31.459,79.414 31.483,79.414C31.688,79.419 31.759,79.43 31.819,79.489C31.939,79.604 31.879,79.77 31.967,79.973C32.014,80.08 32.11,80.219 32.34,80.339C32.38,80.359 33.05,80.517 33.029,80.417" + android:strokeWidth="1" + android:fillColor="#C66A61" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> + <path + android:pathData="M65.625,80.602C65.702,79.269 65.761,77.234 65.5,75.944C65.319,75.06 64.97,73.652 64.196,72.006C63.388,70.073 62.67,68.524 62.614,68.427C62.613,68.424 64.831,69.363 65.872,70.784C68.425,74.272 67.471,78.692 67.159,78.704C67.135,78.705 67.112,78.707 67.089,78.712C66.887,78.746 66.819,78.768 66.768,78.835C66.667,78.968 66.752,79.122 66.695,79.336C66.666,79.449 66.591,79.602 66.382,79.755C66.347,79.781 65.62,80.705 65.625,80.602" + android:strokeWidth="1" + android:fillColor="#C66A61" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M0.5,0.1h360v220h-360z"/> + <path + android:pathData="M142.082,91.956L106.598,91.956C101.941,91.956 98.162,95.712 98.162,100.34L98.162,185.788C98.162,190.418 101.941,194.174 106.598,194.174L142.082,194.174C146.742,194.174 150.518,190.418 150.518,185.788L150.518,100.34C150.518,95.712 146.742,91.956 142.082,91.956" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M246,105l89.6,0l0,-84l-89.6,0z" /> - <path - android:fillColor="#4A4A4A" - android:fillType="evenOdd" - android:pathData="M327.896,93.05L287.985,93.05C287.022,93.05 286.241,92.269 286.241,91.306L286.241,83.595C286.241,82.632 287.022,81.85 287.985,81.85L327.896,81.85C328.86,81.85 329.641,82.632 329.641,83.595L329.641,91.306C329.641,92.269 328.86,93.05 327.896,93.05" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M96.5,89.463l54.849,0l0,107.203l-54.849,0z"/> + <path + android:pathData="M142.51,92.382C145.765,92.382 148.415,95.016 148.415,98.257L148.415,187.873C148.415,191.113 145.765,193.748 142.51,193.748L105.339,193.748C102.082,193.748 99.433,191.113 99.433,187.873L99.433,98.257C99.433,95.016 102.082,92.382 105.339,92.382L142.51,92.382ZM142.51,89.463L105.339,89.463C100.458,89.463 96.5,93.399 96.5,98.257L96.5,187.873C96.5,192.728 100.458,196.666 105.339,196.666L142.51,196.666C147.392,196.666 151.349,192.728 151.349,187.873L151.349,98.257C151.349,93.399 147.392,89.463 142.51,89.463L142.51,89.463Z" + android:strokeWidth="1" + android:fillColor="#4A4A4A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> <path - android:fillColor="#C01633" - android:fillType="nonZero" - android:pathData="M67.691,131.523C66.974,131.523 66.377,131.874 66.138,132.458C65.422,133.51 63.868,133.744 62.912,133.277C62.735,132.873 52.635,130.12 52.635,130.236C51.321,130.938 50.126,128.717 50.246,127.663L50.246,127.546C50.365,127.313 50.365,127.078 50.365,126.845C50.365,125.559 49.289,124.506 47.975,124.506C46.66,124.506 45.585,125.558 45.585,126.845C45.585,127.897 46.302,128.716 47.138,129.067C48.47,129.61 50.311,131.259 50.188,132.334C50.719,133.287 49.437,138.294 49.529,138.654C48.812,139.355 47.378,139.238 46.78,139.004C46.542,138.654 46.063,138.536 45.585,138.536C44.27,138.536 43.195,139.588 43.195,140.875C43.195,142.161 44.27,143.214 45.585,143.214C46.422,143.214 47.018,142.862 47.497,142.278C48.214,141.226 49.41,140.29 50.485,140.29C50.64,140.518 63.511,135.497 63.511,135.38C63.63,134.912 65.542,134.444 67.215,134.795L67.693,134.795C68.649,134.795 69.486,133.977 69.486,133.042C69.486,132.106 68.648,131.523 67.691,131.523Z" + android:pathData="M143.748,156.229L104.269,156.431C103.691,156.434 103.218,155.966 103.216,155.387L103.056,124.224C103.053,123.645 103.521,123.173 104.1,123.17L143.578,122.968C144.157,122.965 144.629,123.433 144.632,124.011L144.791,155.174C144.794,155.754 144.328,156.227 143.748,156.229" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#EFEFEF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#59112B" - android:fillType="nonZero" - android:pathData="M62.434,143.332C61.479,143.332 61.957,141.111 61.957,140.76C62.074,140.586 61.24,131.055 61.24,131.055C61.359,130.704 61.479,130.354 62.076,130.354C62.076,130.354 62.076,130.354 62.195,130.354L62.315,130.354C63.63,130.354 64.704,129.302 64.704,128.015C64.704,126.729 63.629,125.677 62.315,125.677C61,125.677 59.925,126.728 59.925,128.015C59.925,128.249 59.925,128.482 60.043,128.717C60.043,128.717 60.522,129.886 59.446,129.768C59.446,129.768 50.409,132.906 49.97,132.985C48.867,135.004 45.935,133.97 45.107,133.277C44.868,132.926 44.39,132.692 43.792,132.692C42.836,132.692 42,133.511 42,134.446C42,135.382 42.836,136.2 43.793,136.2C44.152,136.2 44.51,136.083 44.749,135.966C46.182,135.264 48.812,135.732 49.17,137.018L49.17,137.135C49.224,137.398 51.097,141.015 51.321,141.344C52.516,143.566 49.529,144.501 49.529,144.501C48.692,144.501 47.975,145.202 47.975,146.138C47.975,147.074 48.811,147.891 49.767,147.891C50.723,147.891 51.56,147.074 51.56,146.138C51.799,144.268 52.755,143.098 54.547,142.982C54.824,143.071 59.088,142.747 59.446,142.631C60.762,142.864 60.043,143.917 60.043,145.671C60.043,146.957 61.12,148.01 62.434,148.01C63.749,148.01 64.824,146.958 64.824,145.671C64.825,144.384 63.75,143.332 62.434,143.332Z" + android:pathData="M129.855,142.919C127.959,146.528 123.495,147.915 119.888,146.018C116.279,144.121 114.892,139.658 116.788,136.05C118.686,132.442 123.148,131.054 126.757,132.951C130.365,134.848 131.753,139.31 129.855,142.919" + android:strokeWidth="1" + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M131.004,146.116C130.834,146.376 130.258,147.288 129.845,146.173C129.305,144.718 128.164,145.036 128.164,145.036L127.105,145.185L129.328,142.676C129.328,142.676 129.275,143.683 129.603,144.186C129.769,144.439 130.115,144.81 130.549,144.82C130.984,144.83 131.825,144.862 131.004,146.116" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#C01633" - android:fillType="nonZero" - android:pathData="M56.4,129C52.424,129 49.2,132.224 49.2,136.2C49.2,140.176 52.424,143.4 56.4,143.4C60.376,143.4 63.6,140.176 63.6,136.2C63.6,132.224 60.376,129 56.4,129Z" + android:pathData="M118.883,149.179C118.592,149.072 117.575,148.711 118.57,148.062C119.87,147.214 119.485,145.819 119.485,145.819L119.105,144.821L122.044,146.433C122.044,146.433 121.049,146.603 120.633,147.035C120.421,147.252 119.96,148.023 120.046,148.449C120.132,148.875 120.288,149.703 118.883,149.179" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#C43B52" - android:fillType="nonZero" - android:pathData="M58.252,142.982C58.517,142.466 57.612,142.313 56.9,142.338C56.188,142.362 55.5,142.775 55.63,143.228C57.53,146.139 56.099,146.49 55.264,147.074C54.547,147.425 54.069,148.243 54.069,149.062C54.069,150.347 55.145,151.4 56.459,151.4C57.774,151.4 58.85,150.348 58.85,149.062C58.85,146.84 57.416,143.683 58.252,142.982ZM68.29,138.538C67.811,138.538 67.334,138.655 66.975,138.889C65.55,139.47 64.243,138.434 63.289,137.733C62.812,137.438 62.27,138.186 62.112,138.487C61.954,138.788 61.712,139.85 62.673,139.824C64.299,139.3 66.257,142.046 66.257,142.046C66.616,142.863 67.453,143.331 68.408,143.331C69.724,143.331 70.798,142.279 70.798,140.993C70.68,139.59 69.605,138.538 68.29,138.538ZM54.309,124.624C55.862,127.782 55.742,128.95 54.906,129.302C54.162,129.838 55.362,130.562 56.25,130.45C57.137,130.338 57.937,129.9 57.386,129.127C56.014,126.705 57.774,125.093 57.774,125.093C58.371,124.742 58.729,124.041 58.729,123.339C58.73,122.052 57.654,121 56.34,121C55.026,121 53.95,122.052 53.95,123.338C53.95,123.689 54.07,124.04 54.19,124.39C54.19,124.508 54.19,124.508 54.309,124.624Z" + android:pathData="M126.377,145.445C126.377,145.445 125.785,145.753 125.97,147.083C126.081,147.877 126.618,149.095 126.694,149.348C126.744,149.51 126.843,149.558 126.981,149.657C127.323,149.899 127.84,150.422 126.613,150.765C125.583,151.054 125.115,150.958 125.323,150.345C125.429,150.032 125.48,149.8 125.443,149.471C125.366,148.75 124.854,147.001 124.177,146.528C123.156,145.816 123.5,146.034 123.5,146.034L125.69,144.38L126.377,145.445Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#E1A5A5" - android:fillType="nonZero" - android:pathData="M55.146,136.2C53.83,136.2 52.756,135.148 52.756,133.862C52.756,132.575 53.831,131.523 55.146,131.523C56.46,131.523 57.535,132.575 57.535,133.862C57.535,135.148 56.46,136.2 55.146,136.2Z" + android:pathData="M121.169,129.912C121.57,129.855 122.019,129.718 121.827,130.416C121.76,130.659 121.749,130.894 121.769,131.109C121.821,131.673 122.011,131.981 122.45,132.338L122.787,132.613L120.537,132.813C120.537,132.813 120.937,132.466 120.828,131.888C120.782,131.647 120.746,131.113 120.473,130.915C120.225,130.732 119.707,130.12 121.169,129.912" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#F8E9E9" - android:fillType="nonZero" - android:pathData="M53.95,139.708C53.234,139.708 52.755,139.24 52.755,138.538C52.755,137.837 53.233,137.369 53.95,137.369C54.667,137.369 55.146,137.837 55.146,138.538C55.146,139.24 54.667,139.708 53.95,139.708Z" + android:pathData="M117.635,136.873C117.458,136.747 117.369,136.531 117.412,136.318C117.487,135.947 117.647,135.381 116.913,134.725C116.072,133.975 114.866,133.402 114.766,133.392C114,133.307 113.508,133.274 114.349,132.087C115.146,130.965 115.608,131.011 115.686,131.881C115.703,132.068 115.772,132.248 115.883,132.401C116.281,132.945 117.793,134.422 118.818,134.441C119.132,134.446 118.779,136.061 118.779,136.061C118.721,136.47 117.635,136.873 117.635,136.873" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#EDC8C8" - android:fillType="nonZero" - android:pathData="M58.133,140.994C57.177,140.994 56.34,140.176 56.34,139.24C56.34,138.304 57.176,137.486 58.133,137.486C59.088,137.486 59.925,138.304 59.925,139.24C59.925,140.176 59.088,140.994 58.133,140.994Z" + android:pathData="M112.602,138.792C112.702,137.872 113.09,137.43 113.909,138C115.329,138.987 116.945,137.543 116.945,137.543L117.256,136.693L116.925,140.685C116.925,140.685 116.29,139.838 115.647,139.531C115.335,139.383 114.375,139.25 113.909,139.44C113.405,139.647 112.477,139.939 112.602,138.792" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M118.834,144.073C118.834,144.073 117.93,143.175 116.696,144.113C115.46,145.05 115.218,145.312 115.218,145.312C115.218,145.312 114.21,147.358 113.151,145.735C112.093,144.114 112.963,143.729 114.121,143.999C114.121,143.999 116.518,143.325 116.918,142.026C117.317,140.728 117.103,141.06 117.103,141.06L119.895,143.241L118.834,144.073Z" + android:strokeWidth="1" + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M124.245,132.636C124.245,132.636 125.431,132.957 126.016,131.527C126.297,130.842 126.517,130.056 126.612,129.786C126.685,129.581 126.715,129.365 126.697,129.148C126.666,128.757 126.769,128.109 127.987,128.745C129.398,129.484 128.952,129.837 128.483,130.023C128.293,130.099 128.126,130.222 127.991,130.375C127.521,130.901 126.52,132.457 126.737,133.457C127.022,134.78 127.042,134.386 127.042,134.386L124.046,134.065L124.245,132.636Z" + android:strokeWidth="1" + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M132.324,134.264C132.499,134.521 133.117,135.405 131.929,135.356C130.379,135.29 129.883,136.65 129.883,136.65L129.611,137.684L128.156,134.664C128.156,134.664 129.064,135.102 129.655,134.994C129.952,134.939 130.775,134.581 130.952,134.183C131.13,133.786 131.484,133.023 132.324,134.264" + android:strokeWidth="1" + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M130.176,138.689C130.176,138.689 130.33,139.798 131.752,139.774C132.553,139.761 133.03,139.775 133.294,139.79C133.463,139.799 134.095,139.795 134.235,139.699C134.58,139.461 135.248,139.154 135.15,140.426C135.067,141.491 134.816,141.897 134.312,141.491C134.055,141.285 133.301,141.086 132.981,141.007C132.276,140.833 131.115,140.653 130.438,141.128C129.419,141.842 129.742,141.594 129.742,141.594L128.94,138.969L130.176,138.689Z" + android:strokeWidth="1" + android:fillColor="#BF0F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml index 2e43b0c7272e1825e0e70665dd17f5a4102bdc29..509a57e776591cd30e15b2c95a52aa3f708b7b06 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_qr_code_card.xml @@ -1,2046 +1,4066 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="100dp" - android:height="105dp" + android:height="104dp" android:viewportWidth="100" - android:viewportHeight="105"> + android:viewportHeight="104"> + <group> + <clip-path + android:pathData="M0,0h100v104h-100z"/> + <path + android:pathData="M0.618,26.416L16.585,94.656C16.802,95.585 17.733,96.163 18.663,95.943C18.663,95.943 52.15,88.065 53.54,87.698L61.415,74.158C61.625,73.8 47.947,15.164 47.947,15.164C47.73,14.234 46.547,13.822 45.617,14.042L1.903,24.341C0.976,24.56 0.401,25.488 0.618,26.416" + android:strokeWidth="1" + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M41.444,70.2L45.6,69.228C46.352,69.051 46.82,68.299 46.643,67.546L45.672,63.391C45.495,62.638 44.742,62.17 43.99,62.346L39.834,63.318C39.081,63.495 38.614,64.248 38.79,65.001L39.762,69.156C39.939,69.908 40.691,70.376 41.444,70.2Z" + android:strokeWidth="0.7" + android:fillColor="#00000000" + android:strokeColor="#657888" + android:fillType="evenOdd"/> + <path + android:pathData="M30.961,31.935l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.621,31.786l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.281,31.636l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.941,31.487l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.601,31.337l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.262,31.188l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.922,31.038l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.071,31.698l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.221,32.359l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.37,33.019l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.52,33.679l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.669,34.339l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.819,35l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.086,34.851l0.66,-0.15l-0.15,-0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.426,35l0.66,-0.149l-0.15,-0.661l-0.659,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M16.766,35.15l0.66,-0.15l-0.15,-0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M16.106,35.3l0.66,-0.149l-0.15,-0.661l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M15.445,35.449l0.66,-0.15l-0.15,-0.66l-0.659,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.785,35.599l0.66,-0.149l-0.15,-0.661l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.125,35.748l0.66,-0.15l-0.15,-0.66l-0.659,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.275,36.408l0.66,-0.149l-0.15,-0.661l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.424,37.069l0.66,-0.15l-0.15,-0.66l-0.659,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.574,37.729l0.66,-0.149l-0.15,-0.661l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.723,38.389l0.66,-0.149l-0.15,-0.661l-0.659,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M14.872,39.049l0.66,-0.15l-0.149,-0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M15.022,39.709l0.66,-0.149l-0.15,-0.661l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.409,51.577l-0.66,0.15l0.149,0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M36.069,51.427l-0.66,0.149l0.15,0.661l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M36.729,51.278l-0.66,0.15l0.15,0.66l0.659,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M37.389,51.128l-0.66,0.149l0.15,0.661l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M38.05,50.978l-0.66,0.15l0.15,0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M38.71,50.829l-0.66,0.149l0.15,0.661l0.659,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M39.37,50.68l-0.66,0.149l0.15,0.661l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M39.221,50.019l-0.66,0.149l0.15,0.661l0.659,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M39.071,49.359l-0.66,0.15l0.15,0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M38.922,48.699l-0.66,0.149l0.15,0.661l0.659,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M38.772,48.039l-0.66,0.15l0.15,0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M38.623,47.379l-0.66,0.149l0.15,0.661l0.659,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M38.473,46.718l-0.66,0.149l0.15,0.661l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.535,54.492l0.66,-0.15l0.15,0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.875,54.642l0.66,-0.149l0.15,0.66l-0.661,0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.214,54.792l0.66,-0.15l0.15,0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.554,54.941l0.66,-0.149l0.15,0.659l-0.661,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.894,55.091l0.66,-0.15l0.15,0.66l-0.661,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.233,55.24l0.66,-0.149l0.15,0.659l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.574,55.39l0.66,-0.15l0.15,0.66l-0.661,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.424,54.729l0.66,-0.149l0.15,0.659l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.274,54.069l0.66,-0.15l0.15,0.66l-0.661,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.125,53.409l0.66,-0.15l0.15,0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.975,52.749l0.66,-0.149l0.15,0.659l-0.661,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.826,52.089l0.66,-0.15l0.15,0.66l-0.66,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.676,51.428l0.66,-0.149l0.15,0.659l-0.661,0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.377,35.995l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.358,35.547l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.187,36.506l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.168,36.057l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.488,35.758l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.997,37.017l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.638,36.419l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.826,37.976l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.147,37.677l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.467,37.378l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.127,37.228l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.976,38.636l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.636,38.486l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.785,39.147l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.446,38.997l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.426,38.549l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.086,38.399l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.275,39.957l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.255,39.508l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.424,40.617l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.084,40.467l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.405,40.168l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.725,39.869l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.385,39.72l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.659,34.799l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.809,35.459l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.958,36.12l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.279,35.82l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.939,35.671l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.599,35.521l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.259,35.372l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.108,36.78l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.428,36.481l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.088,36.331l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.749,36.181l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.409,36.032l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.257,37.44l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.578,37.141l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.238,36.992l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.898,36.842l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.558,36.692l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.407,38.1l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.727,37.801l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.387,37.652l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.048,37.502l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.708,37.352l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.556,38.76l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.32,34.65l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.98,34.5l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.64,34.35l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.3,34.201l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.96,34.051l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.621,33.902l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.281,33.752l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.43,34.413l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.58,35.073l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.729,35.733l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.879,36.393l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.029,37.053l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.178,37.714l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.706,39.421l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.366,39.271l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.027,39.122l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.687,38.972l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.347,38.823l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.007,38.673l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.667,38.523l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.328,38.374l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.436,37.341l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.096,37.191l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.756,37.042l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.416,36.892l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.076,36.743l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.737,36.593l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.397,36.444l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.057,36.294l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.585,38.001l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.207,36.955l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.735,38.661l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.055,38.362l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.715,38.213l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.375,38.063l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.036,37.914l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.356,37.615l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M17.884,39.322l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.204,39.022l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.865,38.873l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.525,38.723l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.185,38.574l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.506,38.275l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.034,39.982l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.354,39.683l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.014,39.533l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.674,39.384l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.335,39.234l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.655,38.935l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.183,40.642l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.504,40.343l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.164,40.193l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.824,40.044l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.484,39.894l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.805,39.595l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.333,41.302l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.954,40.256l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.482,41.963l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.143,41.813l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.803,41.664l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.463,41.514l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.123,41.364l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.783,41.215l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.444,41.065l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.104,40.916l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.978,48.565l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.638,48.415l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.298,48.266l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.958,48.116l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.618,47.967l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.279,47.817l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.939,47.667l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.599,47.518l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.127,49.225l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.749,48.178l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.277,49.885l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.597,49.586l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.257,49.437l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.917,49.287l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.578,49.138l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.898,48.839l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.426,50.545l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.746,50.246l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.407,50.097l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.067,49.947l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.727,49.798l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.047,49.499l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.576,51.205l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.896,50.906l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.556,50.757l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.216,50.607l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.877,50.458l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.197,50.159l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.725,51.866l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.045,51.567l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.706,51.417l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.366,51.268l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.026,51.118l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.347,50.819l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.875,52.526l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.496,51.479l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.024,53.186l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.685,53.037l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.345,52.887l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.005,52.738l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.665,52.588l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.325,52.439l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.986,52.289l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.646,52.14l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.894,40.978l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.554,40.828l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.214,40.679l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.535,40.38l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.781,43.283l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.102,42.984l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.762,42.835l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.422,42.685l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.743,42.386l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.723,41.937l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.383,41.788l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.044,41.638l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.364,41.339l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.024,41.189l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.685,41.04l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.345,40.89l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.986,40.293l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.966,39.844l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.627,39.694l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.591,43.794l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.911,43.495l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.552,42.896l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.873,42.597l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.514,41.999l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.834,41.7l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.155,41.401l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.135,40.953l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.795,40.803l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.116,40.504l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.08,44.603l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M19.741,44.454l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.401,44.304l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.721,44.005l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.362,43.407l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.683,43.108l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.663,42.66l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.304,42.061l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.624,41.762l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.945,41.463l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.55,44.965l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.852,44.217l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.512,44.067l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.172,43.918l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.153,43.469l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.473,43.17l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.133,43.021l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.114,42.572l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.774,42.423l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.075,41.675l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.04,45.774l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.7,45.625l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.02,45.326l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.001,44.877l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.321,44.578l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.982,44.429l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.302,44.13l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.904,42.634l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.564,42.485l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.85,46.285l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.83,45.837l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.49,45.687l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.131,45.089l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.092,44.191l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.413,43.893l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.073,43.743l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.393,43.444l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M20.339,47.095l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.659,46.796l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M22.319,46.646l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M24.3,46.197l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.281,45.749l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.941,45.599l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.261,45.3l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.582,45.002l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.242,44.852l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.883,44.254l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.543,44.104l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.09,46.26l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.411,45.961l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.071,45.811l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.052,45.362l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.712,45.213l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.353,44.615l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.673,44.316l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.919,47.219l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.58,47.069l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.22,46.471l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.881,46.322l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.201,46.023l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.182,45.574l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.502,45.275l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.37,47.132l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.218,48.539l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.879,48.39l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.199,48.091l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.18,47.642l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.84,47.492l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.5,47.343l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.821,47.044l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.801,46.596l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M36.122,46.297l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.368,49.199l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.009,48.601l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.669,48.452l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.65,48.003l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.178,49.71l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.498,49.411l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M30.479,48.963l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.139,48.813l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M33.12,48.364l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.44,48.065l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.609,49.174l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.25,48.576l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.91,48.427l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M36.57,48.277l-0.66,0.149l-0.15,-0.66l0.66,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M26.817,51.18l-0.66,0.15l-0.15,-0.66l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.477,51.031l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.797,50.732l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M34.739,49.386l-0.66,0.149l-0.15,-0.66l0.661,-0.149z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.399,49.236l-0.66,0.15l-0.15,-0.66l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.287,51.541l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M29.607,51.242l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M32.248,50.644l-0.66,0.149l-0.15,-0.659l0.661,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M36.87,49.598l-0.66,0.149l-0.15,-0.659l0.66,-0.15z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.253,47.108L58.202,47.103" + android:strokeWidth="1" + android:fillColor="#FF395A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.102,42.247L78.395,42.247L77.102,42.247Z" + android:strokeWidth="1" + android:fillColor="#FF395A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M0,0.405h100v104h-100z" /> - <path - android:fillColor="#FF395A" - android:fillType="evenOdd" - android:pathData="M69.795,50.721L71.505,50.721L69.795,50.721Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M11.658,25.076C10.639,31.019 24.902,36.118 24.902,36.118L24.902,36.118L26.092,36.285L25.922,45.116C25.922,45.116 12.51,57.339 12.679,62.095L12.679,62.095C12.849,66.851 20.314,65.845 20.314,65.845L20.314,65.845C20.314,65.845 14.319,77.837 17.1,81.618L17.1,81.618C19.136,84.39 21.687,83.658 21.687,83.658L21.687,83.658C21.687,83.658 14.919,88.269 16.933,93.506L16.933,93.506C17.821,95.811 24.742,97.41 24.742,97.41L24.742,97.41L36.127,98.65C35.721,95.471 35.987,92.331 36.412,89.189L36.412,89.189L36.394,89.187C36.737,82.392 37.261,75.618 37.389,68.803L37.389,68.803C37.657,54.619 37.289,40.444 37.207,26.246L37.207,26.246C30.264,24.336 25.415,23.058 25.415,23.058L25.415,23.058C25.415,23.058 21.289,21.787 17.546,21.787L17.546,21.787C14.712,21.787 12.097,22.514 11.658,25.076L11.658,25.076Z" /> - <path - android:fillColor="#F7B994" - android:fillType="evenOdd" - android:pathData="M8.612,16.017l42.604,5.988l-11.5,81.828l-42.604,-5.988z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M26.917,9.851L26.905,116.709C26.906,121.071 30.441,124.606 34.803,124.609L34.803,124.609L77.646,124.609C82.005,124.609 85.54,121.076 85.542,116.717L85.542,116.717L85.542,9.858C85.539,5.503 82.012,1.971 77.658,1.964L77.658,1.964L34.814,1.964C30.456,1.964 26.923,5.494 26.917,9.851L26.917,9.851Z" /> - <path - android:fillColor="#FFFFFF" - android:fillType="evenOdd" - android:pathData="M25.283,-9.79l80.837,11.361l-18.944,134.792l-80.837,-11.36z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <path - android:fillColor="#00000000" - android:fillType="evenOdd" - android:pathData="M77.646,124.609L34.803,124.609C30.442,124.606 26.906,121.07 26.905,116.709L26.917,9.852C26.923,5.494 30.457,1.964 34.815,1.964L77.657,1.964C82.013,1.972 85.539,5.504 85.541,9.858L85.541,116.718C85.54,121.077 82.005,124.609 77.646,124.609Z" - android:strokeWidth="3.049785" - android:strokeColor="#4A4A4A" /> - <group> - <clip-path android:pathData="M83.626,17.522C81.248,23.592 81.552,35.436 87.053,39.625L87.053,39.625C87.053,39.625 87.148,114.893 87.128,115.12L87.128,115.12C86.586,121.096 86.041,120.704 84.948,122.628L84.948,122.628C89.559,124.501 107.453,132.68 127.753,142.049L127.753,142.049C143.915,135.383 156.377,123.865 165.141,107.497L165.141,107.497L122.003,91.217C122.003,91.217 116.636,88.932 112.127,79.673L112.127,79.673C107.618,70.412 105.251,49.252 101.804,46.534L101.804,46.534C101.804,46.534 102.927,28.528 93.993,25.904L93.993,25.904C93.993,25.904 92.924,12.602 91.939,12.436L91.939,12.436C91.684,12.396 91.165,12.309 90.495,12.309L90.495,12.309C88.569,12.309 85.391,13.021 83.626,17.522L83.626,17.522Z" /> - <path - android:fillColor="#F7B994" - android:fillType="evenOdd" - android:pathData="M80.367,6.489l101.286,14.234l-18.36,130.637l-101.286,-14.234z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.853,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M69.175,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.498,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.82,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M73.142,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M74.465,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,44.815l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,46.138l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,47.46l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,48.783l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,50.105l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,51.428l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.389,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.066,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M40.745,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.422,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M38.099,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M36.777,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,43.493l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,44.815l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,46.138l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,47.46l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,48.783l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,50.105l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,51.428l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.853,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M69.175,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.498,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.82,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M73.142,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M74.465,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,82.833l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,81.512l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,80.19l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,78.866l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,77.544l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M75.787,76.222l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.389,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.066,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M40.745,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.422,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M38.099,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M36.777,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,84.157l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,82.833l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,81.512l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,80.19l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,78.866l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,77.544l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M35.455,76.222l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,55.891l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,55.891l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,55.891l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M63.555,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.167,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,55.891l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M63.555,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.167,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M47.686,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,47.956l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,49.278l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,50.601l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,51.923l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,53.245l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,54.568l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,55.891l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,55.891l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M47.686,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,57.212l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M47.686,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,71.759l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,71.759l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M47.686,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,58.535l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,58.535l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,58.535l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,58.535l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M47.686,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M60.911,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.167,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,59.858l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.167,61.18l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M39.752,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M50.331,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,62.502l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M50.331,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M63.555,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,63.824l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.167,65.147l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M42.397,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M46.364,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M47.686,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M60.911,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M63.555,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,66.47l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M41.075,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M43.719,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M45.042,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M49.009,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M60.911,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,67.792l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M63.555,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,69.114l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M66.2,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,70.437l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,71.759l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M60.911,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,73.081l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M58.265,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,74.404l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M59.588,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M60.911,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M64.878,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,75.726l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M63.555,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M70.167,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,77.048l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M51.654,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M52.976,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M55.621,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M67.522,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M68.845,78.371l1.323,0l0,-1.323l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M54.298,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M56.943,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M62.233,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#000000" - android:fillType="evenOdd" - android:pathData="M71.49,79.693l1.323,0l0,-1.322l-1.323,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#C01633" - android:fillType="evenOdd" - android:pathData="M77.11,65.163L35.12,65.163C34.438,65.163 33.885,64.61 33.885,63.927C33.885,63.246 34.438,62.693 35.12,62.693L77.11,62.693C77.792,62.693 78.345,63.246 78.345,63.927C78.345,64.61 77.792,65.163 77.11,65.163" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M33.15,22.859C32.38,27.351 43.163,31.206 43.163,31.206L43.163,31.206L44.063,31.332L43.934,38.009C43.934,38.009 33.795,47.249 33.923,50.845L33.923,50.845C34.051,54.44 39.695,53.68 39.695,53.68L39.695,53.68C39.695,53.68 35.163,62.746 37.265,65.604L37.265,65.604C38.804,67.7 40.732,67.146 40.732,67.146L40.732,67.146C40.732,67.146 35.616,70.632 37.138,74.591L37.138,74.591C37.81,76.334 43.042,77.543 43.042,77.543L43.042,77.543L51.649,78.481C51.342,76.078 51.543,73.704 51.865,71.328L51.865,71.328L51.851,71.326C52.111,66.189 52.506,61.068 52.603,55.917L52.603,55.917C52.806,45.193 52.527,34.477 52.465,23.743L52.465,23.743C47.217,22.299 43.551,21.333 43.551,21.333L43.551,21.333C43.551,21.333 40.432,20.372 37.602,20.372L37.602,20.372C35.46,20.372 33.483,20.922 33.15,22.859L33.15,22.859Z"/> + <path + android:pathData="M30.848,16.01l32.208,4.527l-8.694,61.862l-32.208,-4.527z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> + <group> + <clip-path + android:pathData="M44.685,11.349L44.676,92.133C44.678,95.431 47.35,98.104 50.648,98.105L50.648,98.105L83.037,98.105C86.332,98.105 89.004,95.435 89.006,92.14L89.006,92.14L89.006,11.354C89.004,8.062 86.338,5.392 83.045,5.386L83.045,5.386L50.656,5.386C47.361,5.386 44.69,8.055 44.685,11.349L44.685,11.349Z"/> + <path + android:pathData="M43.451,-3.5l61.113,8.589l-14.322,101.903l-61.113,-8.588z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M83.037,98.106L50.648,98.106C47.351,98.104 44.678,95.43 44.677,92.133L44.686,11.349C44.69,8.055 47.362,5.386 50.657,5.386L83.046,5.386C86.339,5.392 89.004,8.062 89.006,11.354L89.006,92.14C89.005,95.435 86.333,98.106 83.037,98.106Z" + android:strokeWidth="2.30563746" + android:fillColor="#00000000" + android:strokeColor="#4A4A4A" + android:fillType="evenOdd"/> + <group> + <clip-path + android:pathData="M90.149,33.858C90.149,33.858 90.221,90.761 90.205,90.932C89.796,95.45 89.384,95.154 88.557,96.608C92.043,98.024 105.571,104.208 120.918,111.291C133.136,106.252 142.558,97.544 149.183,85.169L116.571,72.862C116.571,72.862 112.514,71.134 109.105,64.134C105.696,57.134 103.906,41.137 101.301,39.081C101.301,39.081 102.15,25.47 95.396,23.485C95.396,23.485 94.588,13.43 93.842,13.304C93.65,13.272 93.257,13.207 92.751,13.207C91.295,13.207 88.892,13.745 87.558,17.149C85.76,21.738 85.99,30.691 90.149,33.858Z"/> + <path + android:pathData="M85.094,8.807l76.572,10.761l-13.88,98.762l-76.572,-10.761z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M75.634,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.633,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.633,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.633,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M79.632,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M80.632,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,37.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,38.781l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,39.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,40.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,41.781l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,42.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.139,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.139,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.14,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.14,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M53.14,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M52.141,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,36.782l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,37.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,38.781l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,39.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,40.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,41.781l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,42.781l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.634,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.633,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.633,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.633,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M79.632,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M80.632,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,66.523l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,65.525l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,64.525l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,63.524l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,62.525l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M81.632,61.525l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.139,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.139,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.14,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.14,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M53.14,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M52.141,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,67.524l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,66.523l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,65.525l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,64.525l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,63.524l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,62.525l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M51.141,61.525l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,46.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,46.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,46.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M72.385,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.383,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,46.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M72.385,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.383,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M60.388,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,40.156l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,41.156l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,42.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,43.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,44.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,45.155l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,46.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,46.155l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M60.388,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,47.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M60.388,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,58.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,58.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M60.388,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,48.154l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,48.154l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,48.154l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,48.154l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M60.388,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M70.385,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.383,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,49.154l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.383,50.153l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M54.389,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M62.387,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,51.153l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M62.387,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M72.385,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,52.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.383,53.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M56.389,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M59.388,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M60.388,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M70.385,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M72.385,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,54.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M55.389,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M57.389,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M58.389,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.388,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M70.385,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,55.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M72.385,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,56.152l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M74.384,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,57.152l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,58.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M70.385,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,59.151l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M68.385,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,60.151l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M69.385,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M70.385,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M73.385,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,61.15l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M72.385,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M77.383,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,62.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.387,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M64.387,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M66.386,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.384,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M76.384,63.15l1,0l0,-1l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M65.386,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M67.386,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M71.385,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M78.383,64.149l1,0l0,-0.999l-1,0z" + android:strokeWidth="1" + android:fillColor="#000000" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M82.632,53.165L50.888,53.165C50.372,53.165 49.954,52.746 49.954,52.23C49.954,51.715 50.372,51.297 50.888,51.297L82.632,51.297C83.148,51.297 83.565,51.715 83.565,52.23C83.565,52.746 83.148,53.165 82.632,53.165" + android:strokeWidth="1" + android:fillColor="#C01633" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M94.943,99.37l6.615,3.509l0,-6.89z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml index b0ba7336a20971d5e2a317fd67999b9edba93daf..c89aac841f85731e441b8d05052c770ce8d32c41 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml @@ -1,126 +1,102 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="100dp" - android:height="105dp" + android:height="104dp" android:viewportWidth="100" - android:viewportHeight="105"> + android:viewportHeight="104"> + <group> + <path + android:pathData="M3.681,17.332L18.182,58.796C18.428,59.497 19.196,59.867 19.898,59.621L56.613,46.782L41.667,4.047L3.681,17.332Z" + android:strokeWidth="1" + android:fillColor="#E7E7E7" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + <path + android:pathData="M75.011,46.094L76.297,46.088L75.011,46.094Z" + android:strokeWidth="1" + android:fillColor="#FF395A" + android:fillType="nonZero" + android:strokeColor="#00000000"/> <group> - <clip-path android:pathData="M0,0.096h100v104h-100z" /> - <path - android:fillColor="#FF395A" - android:fillType="evenOdd" - android:pathData="M42.407,51.003L40.686,50.995L42.407,51.003Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M87.191,23.364C87.191,23.364 82.303,24.629 75.309,26.519L75.309,26.519C75.163,40.808 74.73,55.07 74.936,69.344L74.936,69.344C75.035,76.203 75.53,83.022 75.846,89.861L75.846,89.861L75.827,89.863C76.242,93.026 76.496,96.19 76.073,99.386L76.073,99.386L86.08,98.185C86.08,98.185 92.964,99.906 94.685,96.464L94.685,96.464C97.209,91.414 88.662,82.698 88.662,82.698L88.662,82.698C88.662,82.698 94.235,85.394 96.406,82.698L96.406,82.698C100.956,77.043 90.383,65.49 90.383,65.49L90.383,65.49C90.383,65.49 98.249,67.223 99.832,62.703L99.832,62.703C101.567,57.746 86.582,45.559 86.582,45.559L86.582,45.559L86.449,36.672L87.647,36.509C87.647,36.509 102.023,31.441 101.025,25.456L101.025,25.456C100.591,22.855 97.921,22.12 95.041,22.12L95.041,22.12C91.294,22.12 87.191,23.364 87.191,23.364L87.191,23.364Z" /> - <path - android:fillColor="#F7B994" - android:fillType="evenOdd" - android:pathData="M104.13,16.353l-42.9,5.835l11.208,82.396l42.9,-5.836z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M34.689,1.905C30.317,1.905 26.764,5.439 26.743,9.814L26.743,9.814L26.266,117.346C26.248,121.733 29.789,125.303 34.175,125.323L34.175,125.323L77.289,125.513C81.678,125.53 85.251,121.988 85.273,117.598L85.273,117.598L85.737,10.067C85.751,5.683 82.21,2.115 77.824,2.095L77.824,2.095L34.712,1.905L34.689,1.905Z" /> - <path - android:fillColor="#FFFFFF" - android:fillType="evenOdd" - android:pathData="M87.469,-9.691l-81.398,11.072l18.462,135.727l81.398,-11.072z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <path - android:fillColor="#00000000" - android:fillType="evenOdd" - android:pathData="M34.176,125.322L77.29,125.513C81.679,125.531 85.252,121.988 85.272,117.599L85.738,10.068C85.751,5.682 82.211,2.115 77.825,2.095L34.712,1.904C30.33,1.893 26.765,5.431 26.744,9.813L26.267,117.345C26.249,121.732 29.789,125.302 34.176,125.322Z" - android:strokeWidth="3.06318644" - android:strokeColor="#4A4A4A" /> - <group> - <clip-path android:pathData="M19.434,23.564C18.677,23.688 17.806,31.474 17.433,35.179L17.433,35.179C17.321,36.295 16.87,37.339 16.157,38.205L16.157,38.205C11.657,43.677 9.354,57.831 9.354,57.831L9.354,57.831C6.611,70.911 5.137,70.232 3.482,77.535L3.482,77.535C1.861,84.691 1.355,86.727 0.901,90.44L0.901,90.44C-0.643,103.086 1.486,110.092 1.761,117.974L1.761,117.974C2.023,125.432 -1.68,134.321 -7.703,148.087L-7.703,148.087L-22.329,181.644C-18.957,188.011 20.695,195.398 28.435,179.922L28.435,179.922C32.737,171.318 34.946,148.724 41.34,137.763L41.34,137.763C47.363,127.439 51.165,127.924 50.805,126.577L50.805,126.577C50.737,126.544 42.2,126.577 36.337,126.891L36.337,126.891C29.283,127.265 24.402,123.812 24.677,115.73L24.677,115.73C24.685,115.501 24.993,50.862 24.993,50.862L24.993,50.862C30.547,46.672 30.143,34.837 27.775,28.719L27.775,28.719C26.01,24.152 22.786,23.441 20.851,23.441L20.851,23.441C20.194,23.441 19.685,23.523 19.434,23.564L19.434,23.564Z" /> - <path - android:fillColor="#F7B994" - android:fillType="evenOdd" - android:pathData="M39.709,3.864l-102.01,18.893l17.688,177.611l102.01,-18.893z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M32.538,47.167C31.941,47.167 31.456,47.751 31.456,48.473L31.456,48.473L31.456,64.789C31.456,65.512 31.941,66.096 32.538,66.096L32.538,66.096L40.54,66.096C41.137,66.096 41.622,65.512 41.622,64.789L41.622,64.789L41.622,48.473C41.622,47.751 41.137,47.167 40.54,47.167L40.54,47.167L32.538,47.167Z" /> - <path - android:fillColor="#0F4963" - android:fillType="evenOdd" - android:pathData="M27.123,210.999l101.533,0l0,-265.004l-101.533,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M32.538,47.167C31.941,47.167 31.456,47.751 31.456,48.473L31.456,48.473L31.456,64.789C31.456,65.512 31.941,66.096 32.538,66.096L32.538,66.096L40.54,66.096C41.137,66.096 41.622,65.512 41.622,64.789L41.622,64.789L41.622,48.473C41.622,47.751 41.137,47.167 40.54,47.167L40.54,47.167L32.538,47.167Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M30.101,67.727l12.875,0l0,-22.193l-12.875,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M45.496,47.167C44.898,47.167 44.413,47.751 44.413,48.473L44.413,48.473L44.413,64.789C44.413,65.512 44.898,66.096 45.496,66.096L45.496,66.096L53.498,66.096C54.097,66.096 54.582,65.512 54.582,64.789L54.582,64.789L54.582,48.473C54.582,47.751 54.097,47.167 53.498,47.167L53.498,47.167L45.496,47.167Z" /> - <path - android:fillColor="#0F4963" - android:fillType="evenOdd" - android:pathData="M40.081,210.999l101.533,0l0,-265.004l-101.533,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M45.496,47.167C44.898,47.167 44.413,47.751 44.413,48.473L44.413,48.473L44.413,64.789C44.413,65.512 44.898,66.096 45.496,66.096L45.496,66.096L53.498,66.096C54.097,66.096 54.582,65.512 54.582,64.789L54.582,64.789L54.582,48.473C54.582,47.751 54.097,47.167 53.498,47.167L53.498,47.167L45.496,47.167Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M43.06,67.727l12.875,0l0,-22.193l-12.875,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M58.453,47.167C57.856,47.167 57.371,47.751 57.371,48.473L57.371,48.473L57.371,64.789C57.371,65.512 57.856,66.096 58.453,66.096L58.453,66.096L66.456,66.096C67.054,66.096 67.539,65.512 67.539,64.789L67.539,64.789L67.539,48.473C67.539,47.751 67.054,47.167 66.456,47.167L66.456,47.167L58.453,47.167Z" /> - <path - android:fillColor="#0F4963" - android:fillType="evenOdd" - android:pathData="M53.039,210.999l101.533,0l0,-265.004l-101.533,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M58.453,47.167C57.856,47.167 57.371,47.751 57.371,48.473L57.371,48.473L57.371,64.789C57.371,65.512 57.856,66.096 58.453,66.096L58.453,66.096L66.456,66.096C67.054,66.096 67.539,65.512 67.539,64.789L67.539,64.789L67.539,48.473C67.539,47.751 67.054,47.167 66.456,47.167L66.456,47.167L58.453,47.167Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M56.018,67.727l12.875,0l0,-22.193l-12.875,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M71.413,47.167C70.815,47.167 70.331,47.751 70.331,48.473L70.331,48.473L70.331,64.789C70.331,65.512 70.815,66.096 71.413,66.096L71.413,66.096L79.414,66.096C80.012,66.096 80.497,65.512 80.497,64.789L80.497,64.789L80.497,48.473C80.497,47.751 80.012,47.167 79.414,47.167L79.414,47.167L71.413,47.167Z" /> - <path - android:fillColor="#0F4963" - android:fillType="evenOdd" - android:pathData="M65.998,210.999l101.533,0l0,-265.004l-101.533,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M71.413,47.167C70.815,47.167 70.331,47.751 70.331,48.473L70.331,48.473L70.331,64.789C70.331,65.512 70.815,66.096 71.413,66.096L71.413,66.096L79.414,66.096C80.012,66.096 80.497,65.512 80.497,64.789L80.497,64.789L80.497,48.473C80.497,47.751 80.012,47.167 79.414,47.167L79.414,47.167L71.413,47.167Z" /> - <path - android:fillColor="#657887" - android:fillType="evenOdd" - android:pathData="M68.977,67.727l12.875,0l0,-22.193l-12.875,0z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <path - android:fillColor="#F7B994" - android:fillType="evenOdd" - android:pathData="M152.968,133.492C152.795,131.051 152.771,126.572 151.717,119.675C151.663,119.32 151.607,118.969 151.55,118.622C150.978,115.2 150.204,112.03 148.785,106.225C146.687,97.636 145.855,95.819 144.356,93.981C142.623,91.856 132.651,80.681 123.878,80.832C121.959,80.866 120.515,81.565 119.017,82.772C118.068,83.537 113.321,78.844 111.85,78.171C107.937,76.381 103.444,80.003 102.785,81.027C101.872,82.45 100.153,79.776 98.032,79.421C93.463,78.656 88.785,81.437 88.495,84.142C88.493,84.157 88.491,84.172 88.49,84.187C88.392,85.288 87.078,85.772 86.361,84.931L64.689,59.501C64.645,59.432 61.5,55.947 59.49,56.121C57.192,56.319 55.903,58.31 55.654,58.718C55.654,58.718 54.538,60.545 54.889,63.288C55.368,67.046 67.977,84.294 80.195,101.489C82.357,104.533 83.733,113.709 84.345,117.629C85.186,123.005 93.647,148.183 105.385,153.55C105.385,153.55 111.327,155.622 117.962,158.735C121.676,160.477 126.644,163.615 131.769,169.74C131.792,169.764 131.814,169.787 131.837,169.81C134.284,172.053 139.04,177.688 139.659,177.378C144.822,174.797 167.192,173.076 171.002,156.984C171.041,156.821 171.163,156.691 171.054,156.564C161.211,144.962 153.408,139.694 152.968,133.492" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + <clip-path + android:pathData="M41.549,25.442C41.549,25.442 45.201,26.387 50.427,27.799L50.427,27.799C50.536,38.476 50.86,49.132 50.706,59.798L50.706,59.798C50.632,64.923 50.262,70.017 50.026,75.128L50.026,75.128L50.04,75.129C49.73,77.493 49.541,79.857 49.857,82.245L49.857,82.245L42.38,81.347C42.38,81.347 37.236,82.633 35.95,80.061L35.95,80.061C34.064,76.289 40.45,69.776 40.45,69.776L40.45,69.776C40.45,69.776 36.286,71.79 34.664,69.776L34.664,69.776C31.264,65.551 39.164,56.918 39.164,56.918L39.164,56.918C39.164,56.918 33.287,58.213 32.104,54.836L32.104,54.836C30.807,51.132 42.004,42.026 42.004,42.026L42.004,42.026L42.104,35.385L41.208,35.264C41.208,35.264 30.467,31.477 31.212,27.005L31.212,27.005C31.537,25.061 33.532,24.512 35.684,24.512L35.684,24.512C38.483,24.512 41.549,25.442 41.549,25.442L41.549,25.442Z"/> + <path + android:pathData="M28.892,20.204l32.054,4.36l-8.374,61.566l-32.054,-4.361z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="nonZero" + android:strokeColor="#00000000"/> </group> + <group> + <clip-path + android:pathData="M80.778,9.408C84.045,9.408 86.7,12.049 86.715,15.318L86.715,15.318L87.072,95.665C87.085,98.943 84.439,101.611 81.162,101.625L81.162,101.625L48.948,101.768C45.668,101.78 42.999,99.134 42.983,95.854L42.983,95.854L42.636,15.507C42.625,12.231 45.271,9.565 48.548,9.55L48.548,9.55L80.761,9.408L80.778,9.408Z"/> + <path + android:pathData="M41.341,0.744l60.82,8.273l-13.795,101.414l-60.82,-8.273z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M81.161,101.625L48.947,101.768C45.667,101.781 42.998,99.133 42.983,95.854L42.635,15.508C42.624,12.231 45.27,9.565 48.547,9.55L80.76,9.408C84.035,9.399 86.699,12.043 86.714,15.317L87.071,95.665C87.085,98.942 84.439,101.61 81.161,101.625Z" + android:strokeWidth="2.1147" + android:fillColor="#00000000" + android:strokeColor="#4A4A4A" + android:fillType="evenOdd"/> + <group> + <clip-path + android:pathData="M91.992,25.592C92.558,25.684 93.209,31.502 93.487,34.27L93.487,34.27C93.571,35.105 93.908,35.884 94.441,36.532L94.441,36.532C97.803,40.62 99.525,51.196 99.525,51.196L99.525,51.196C101.574,60.969 102.675,60.462 103.912,65.918L103.912,65.918C105.123,71.266 105.501,72.787 105.84,75.562L105.84,75.562C106.994,85.01 105.403,90.245 105.198,96.134L105.198,96.134C105.002,101.707 107.769,108.349 112.269,118.635L112.269,118.635L123.198,143.709C120.678,148.466 91.05,153.986 85.267,142.422L85.267,142.422C82.053,135.993 80.402,119.111 75.624,110.921L75.624,110.921C71.124,103.206 68.283,103.569 68.552,102.563L68.552,102.563C68.603,102.538 74.982,102.563 79.363,102.797L79.363,102.797C84.633,103.077 88.28,100.497 88.075,94.458L88.075,94.458C88.069,94.286 87.839,45.989 87.839,45.989L87.839,45.989C83.689,42.858 83.991,34.015 85.76,29.444L85.76,29.444C87.079,26.031 89.488,25.5 90.934,25.5L90.934,25.5C91.424,25.5 91.805,25.561 91.992,25.592L91.992,25.592Z"/> + <path + android:pathData="M75.433,10.872l76.221,14.117l-13.216,132.71l-76.221,-14.117z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M82.385,45.291C82.831,45.291 83.194,45.661 83.194,46.117L83.194,46.117L83.194,56.434C83.194,56.891 82.831,57.261 82.385,57.261L82.385,57.261L76.406,57.261C75.96,57.261 75.597,56.891 75.597,56.434L75.597,56.434L75.597,46.117C75.597,45.661 75.96,45.291 76.406,45.291L76.406,45.291L82.385,45.291Z"/> + <path + android:pathData="M84.206,58.591l-9.62,0l-0,-14.63l9.62,0z" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M72.702,45.291C73.15,45.291 73.512,45.661 73.512,46.117L73.512,46.117L73.512,56.434C73.512,56.891 73.15,57.261 72.702,57.261L72.702,57.261L66.723,57.261C66.276,57.261 65.914,56.891 65.914,56.434L65.914,56.434L65.914,46.117C65.914,45.661 66.276,45.291 66.723,45.291L66.723,45.291L72.702,45.291Z"/> + <path + android:pathData="M74.523,58.591l-9.62,0l-0,-14.63l9.62,0z" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M63.021,45.291C63.468,45.291 63.83,45.661 63.83,46.117L63.83,46.117L63.83,56.434C63.83,56.891 63.468,57.261 63.021,57.261L63.021,57.261L57.042,57.261C56.595,57.261 56.233,56.891 56.233,56.434L56.233,56.434L56.233,46.117C56.233,45.661 56.595,45.291 57.042,45.291L57.042,45.291L63.021,45.291Z"/> + <path + android:pathData="M64.841,58.591l-9.62,0l-0,-14.63l9.62,0z" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M53.338,45.291C53.785,45.291 54.146,45.661 54.146,46.117L54.146,46.117L54.146,56.434C54.146,56.891 53.785,57.261 53.338,57.261L53.338,57.261L47.36,57.261C46.912,57.261 46.55,56.891 46.55,56.434L46.55,56.434L46.55,46.117C46.55,45.661 46.912,45.291 47.36,45.291L47.36,45.291L53.338,45.291Z"/> + <path + android:pathData="M55.158,58.591l-9.62,0l-0,-14.63l9.62,0z" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M1.724,122.663C1.503,120.848 0.882,117.559 0.671,112.35C0.66,112.082 0.651,111.816 0.644,111.553C0.576,108.962 0.691,106.527 0.904,102.067C1.218,95.468 1.57,94.017 2.407,92.455C3.375,90.649 9.096,81.031 15.553,79.891C16.964,79.642 18.124,79.949 19.394,80.621C20.199,81.047 23.012,76.928 23.995,76.224C26.61,74.354 30.422,76.37 31.051,77.027C31.924,77.94 32.803,75.734 34.308,75.171C37.551,73.959 41.378,75.331 41.977,77.274C41.98,77.285 41.983,77.296 41.986,77.306C42.216,78.1 43.248,78.267 43.654,77.549L55.924,55.806C55.946,55.75 57.756,52.746 59.255,52.586C60.97,52.404 62.199,53.681 62.439,53.944C62.439,53.944 63.518,55.125 63.652,57.187C63.836,60.012 57.047,74.46 50.537,88.814C49.385,91.355 49.684,98.281 49.794,101.244C49.944,105.307 47.328,124.981 39.484,130.591C39.484,130.591 35.421,132.958 30.998,136.187C28.522,137.994 25.326,141.004 22.44,146.227C22.427,146.248 22.414,146.268 22.4,146.288C20.926,148.282 18.241,153.093 17.742,152.954C13.588,151.797 -3.066,153.724 -8.155,142.465C-8.206,142.351 -8.314,142.272 -8.252,142.163C-2.687,132.25 2.285,127.274 1.724,122.663" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="nonZero" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml index f19c107d07e05aeaa0518708e2b5b591ce30fb5e..5e8c2fb811980ec456af59bdf5dfbe5e602d888e 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_hotline_card.xml @@ -1,45 +1,176 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="100dp" - android:height="105dp" + android:height="104dp" android:viewportWidth="100" - android:viewportHeight="105"> - <group> - <clip-path android:pathData="M0,0.096h100v104h-100z" /> - <path - android:fillColor="#F3B590" - android:fillType="evenOdd" - android:pathData="M68.623,66.853C68.623,66.853 68.606,67.461 68.62,68.481C71.045,65.668 72.656,62.016 73.725,58.54C73.962,57.743 74.288,56.558 74.686,54.868C74.69,54.847 74.693,54.83 74.697,54.813C74.803,54.315 75.645,47.994 75.772,47.434C76.006,46.38 76.366,45.624 76.765,45.03C76.425,44.985 76.219,44.944 76.219,44.944C66.452,57.925 56.051,61.044 56.051,61.044C54.835,63.074 47.91,65.441 48.112,62.195C48.315,58.945 55.014,58.966 55.014,58.966C56.498,59.086 64.371,54.806 68.531,50.646C72.691,46.486 75.205,43.116 75.205,43.116C74.432,41.663 73.889,40.344 73.525,39.142C70.877,39.482 67.991,38.668 66.452,37.126C64.127,34.8 64.663,32.217 62.293,29.847C52.932,20.486 40.019,31.485 33.173,31.928C32.843,31.945 32.527,31.928 32.218,31.901C32.112,32.547 32.019,33.199 31.957,33.862C30.051,53.765 37.113,62.308 41.909,66.822C44.296,69.069 46.917,70.161 49.212,71.109C49.356,70.773 49.497,70.463 49.638,70.216L68.623,66.853Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#F3B590" - android:fillType="evenOdd" - android:pathData="M65.411,90.164C68.939,88.048 70.413,84.685 70.705,83.937C70.664,83.765 70.626,83.59 70.571,83.414C68.925,78.117 68.651,71.491 68.62,68.482C68.606,67.462 68.623,66.854 68.623,66.854L49.637,70.217C49.496,70.464 49.356,70.773 49.211,71.11C47.903,74.174 46.453,80.522 45.326,81.961C45.271,82.034 45.261,82.109 45.254,82.174L45.759,85.015C46.69,89.124 55.013,96.403 65.411,90.164" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#898995" - android:fillType="evenOdd" - android:pathData="M108.221,99.366C98.981,91.702 70.765,83.781 70.765,83.781C70.765,83.781 70.744,83.839 70.706,83.936C70.411,84.688 68.937,88.047 65.413,90.163C55.011,96.405 46.691,89.126 45.757,85.014L45.252,82.177L45.231,82.046C45.231,82.046 16.442,88.758 8.043,98.878C4.625,102.997 2.608,105.893 0.139,125.597L115.4,125.597L115.4,119.585C114.226,110.942 112.092,102.578 108.221,99.366" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#352525" - android:fillType="evenOdd" - android:pathData="M85.455,37.433C85.723,45.599 78.777,45.289 76.764,45.028C76.366,45.623 76.009,46.378 75.772,47.433C75.648,47.996 74.803,54.314 74.696,54.815C74.696,54.818 74.693,54.832 74.693,54.836C74.69,54.846 74.69,54.856 74.686,54.867C74.288,56.56 73.961,57.745 73.724,58.542C73.453,59.446 73.298,59.844 73.298,59.844C77.338,59.095 91.515,38.663 87.303,27.087C83.298,16.077 74.662,9.685 69.767,7.197C76.885,15.514 78.932,27.767 78.932,27.767C82.051,27.767 85.17,28.804 85.455,37.433" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#352525" - android:fillType="evenOdd" - android:pathData="M62.292,29.847C64.662,32.217 64.126,34.8 66.451,37.126C67.994,38.668 70.876,39.482 73.524,39.142C71.151,31.348 76.321,28.607 76.321,28.607C74.771,20.486 69.571,12.166 66.087,8.841C64.253,7.086 61.951,5.172 55.267,4.582C51.931,4.286 49.901,5.251 48.063,5.763C46.693,6.145 44.666,6.557 43.484,6.787C43.374,6.852 43.254,6.904 43.124,6.928C41.547,7.213 35.501,8.223 32.588,7.398C31.887,7.203 31.207,7.749 31.303,8.467C31.403,9.24 31.554,10.095 31.784,10.761C31.997,11.38 31.537,12.026 30.884,12.046C27.81,12.153 21.702,12.019 20.83,12.019C19.885,12.019 21.414,14.811 23.523,16.66C24.23,17.281 23.777,18.432 22.832,18.398C22.812,18.394 22.788,18.394 22.764,18.394C21.984,18.356 21.472,19.184 21.857,19.864C23.842,23.351 26.786,31.369 32.217,31.901C32.526,31.929 32.846,31.946 33.172,31.925C40.018,31.485 52.931,20.486 62.292,29.847" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#C36A61" - android:fillType="evenOdd" - android:pathData="M55.265,4.582C61.95,5.172 64.252,7.086 66.089,8.841C69.573,12.166 74.77,20.486 76.323,28.607C76.323,28.607 71.153,31.348 73.523,39.142C73.891,40.345 74.433,41.664 75.206,43.117C75.206,43.117 72.692,46.487 68.532,50.647C64.372,54.806 56.495,59.087 55.011,58.966C55.011,58.966 48.316,58.946 48.11,62.192C47.907,65.442 54.836,63.075 56.052,61.045C56.052,61.045 66.45,57.926 76.22,44.944C76.22,44.944 76.426,44.985 76.766,45.03C78.779,45.291 85.725,45.597 85.457,37.432C85.171,28.806 82.049,27.765 78.93,27.765C78.93,27.765 76.886,15.516 69.765,7.196C69.7,7.12 69.638,7.041 69.573,6.966C64.729,1.432 57.172,-1.22 50.851,0.727C46.643,2.022 42.531,6.966 42.531,6.966C42.531,6.966 42.909,6.897 43.486,6.787C44.668,6.557 46.691,6.145 48.065,5.763C49.9,5.251 51.93,4.286 55.265,4.582" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:viewportHeight="104"> + <group> + <clip-path + android:pathData="M0,0h100v104h-100z"/> + <path + android:pathData="M50.6,52.187L49.26,52.181L50.6,52.187Z" + android:strokeWidth="1" + android:fillColor="#FF395A" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <group> + <clip-path + android:pathData="M85.49,30.654C85.49,30.654 81.683,31.639 76.233,33.112L76.233,33.112C76.12,44.244 75.782,55.355 75.944,66.476L75.944,66.476C76.02,71.819 76.406,77.131 76.651,82.46L76.651,82.46L76.637,82.462C76.96,84.926 77.157,87.39 76.827,89.88L76.827,89.88L84.625,88.945C84.625,88.945 89.987,90.285 91.328,87.604L91.328,87.604C93.295,83.67 86.636,76.879 86.636,76.879L86.636,76.879C86.636,76.879 90.978,78.98 92.669,76.879L92.669,76.879C96.214,72.474 87.978,63.473 87.978,63.473L87.978,63.473C87.978,63.473 94.105,64.824 95.338,61.303L95.338,61.303C96.691,57.44 85.016,47.946 85.016,47.946L85.016,47.946L84.913,41.021L85.846,40.895C85.846,40.895 97.046,36.946 96.267,32.284L96.267,32.284C95.929,30.257 93.849,29.684 91.605,29.684L91.605,29.684C88.686,29.685 85.49,30.654 85.49,30.654L85.49,30.654Z"/> + <path + android:pathData="M98.687,25.192l-33.422,4.546l8.732,64.192l33.422,-4.547z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M44.587,13.936C41.182,13.936 38.414,16.688 38.397,20.096L38.397,20.096L38.025,103.872C38.012,107.289 40.77,110.071 44.188,110.086L44.188,110.086L77.777,110.235C81.195,110.249 83.979,107.489 83.995,104.069L83.995,104.069L84.358,20.295C84.368,16.879 81.61,14.099 78.194,14.084L78.194,14.084L44.605,13.936C44.599,13.936 44.592,13.936 44.587,13.936L44.587,13.936Z"/> + <path + android:pathData="M85.707,4.902l-63.414,8.626l14.383,105.741l63.414,-8.626z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M44.188,110.087L77.777,110.236C81.196,110.249 83.979,107.489 83.996,104.07L84.358,20.296C84.369,16.879 81.611,14.1 78.194,14.084L44.605,13.936C41.192,13.927 38.414,16.683 38.398,20.096L38.026,103.872C38.012,107.29 40.77,110.072 44.188,110.087Z" + android:strokeWidth="2.32617" + android:fillColor="#00000000" + android:strokeColor="#4A4A4A" + android:fillType="evenOdd"/> + <group> + <clip-path + android:pathData="M32.703,30.81C32.113,30.907 31.434,36.973 31.144,39.859L31.144,39.859C31.056,40.729 30.706,41.542 30.151,42.217L30.151,42.217C26.644,46.48 24.849,57.507 24.849,57.507L24.849,57.507C22.713,67.696 21.565,67.168 20.275,72.857L20.275,72.857C19.012,78.432 18.617,80.019 18.264,82.912L18.264,82.912C17.062,92.763 18.72,98.221 18.935,104.362L18.935,104.362C19.138,110.173 16.253,117.097 11.561,127.823L11.561,127.823L0.166,153.965C2.793,158.926 33.686,164.681 39.715,152.625L39.715,152.625C43.066,145.922 44.788,128.319 49.768,119.78L49.768,119.78C54.462,111.735 57.369,112.746 57.088,111.698L57.088,111.698C57.069,111.688 56.019,111.702 54.471,111.716L54.471,111.716C51.828,111.738 47.733,111.761 44.83,111.668L44.83,111.668C39.317,111.492 36.503,108.589 36.788,102.614L36.788,102.614C36.797,102.436 37.033,52.078 37.033,52.078L37.033,52.078C41.36,48.812 41.046,39.593 39.202,34.827L39.202,34.827C37.825,31.269 35.314,30.714 33.807,30.714L33.807,30.714C33.295,30.714 32.899,30.778 32.703,30.81L32.703,30.81Z"/> + <path + android:pathData="M48.498,15.462l-79.473,14.719l13.781,138.371l79.473,-14.718z" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M78.085,72.39C78.085,75.677 75.421,78.343 72.133,78.343C68.846,78.343 66.182,75.677 66.182,72.39C66.182,69.103 68.846,66.438 72.133,66.438C75.421,66.438 78.085,69.103 78.085,72.39" + android:strokeWidth="1" + android:fillColor="#2F854B" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M47.174,66.321L75.769,66.321A2.66,2.66 0,0 1,78.429 68.981L78.429,75.631A2.66,2.66 0,0 1,75.769 78.291L47.174,78.291A2.66,2.66 0,0 1,44.514 75.631L44.514,68.981A2.66,2.66 0,0 1,47.174 66.321z" + android:strokeWidth="1" + android:fillColor="#0088B2" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M63.64,75.517L63.634,75.517C62.566,75.482 61.314,74.447 60.452,73.584C59.588,72.721 58.553,71.47 58.52,70.407C58.508,70.033 59.423,69.369 59.433,69.363C59.671,69.198 59.934,69.257 60.042,69.406C60.115,69.508 60.81,70.559 60.885,70.679C60.963,70.802 60.952,70.987 60.854,71.172C60.801,71.274 60.622,71.589 60.538,71.736C60.628,71.864 60.868,72.18 61.362,72.674C61.856,73.168 62.171,73.408 62.3,73.498C62.448,73.414 62.761,73.235 62.864,73.182C63.046,73.085 63.229,73.073 63.354,73.15C63.482,73.227 64.531,73.925 64.627,73.992C64.709,74.049 64.76,74.147 64.771,74.261C64.781,74.376 64.745,74.498 64.672,74.604C64.666,74.613 64.01,75.517 63.64,75.517" + android:strokeWidth="1" + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <group> + <clip-path + android:pathData="M67.924,69.664l90.588,0l0,94.483l-90.588,0z"/> + <path + android:pathData="M144.294,129.682C144.159,127.781 144.14,124.291 143.319,118.918C143.277,118.641 143.233,118.367 143.189,118.097C142.743,115.431 142.14,112.962 141.035,108.439C139.4,101.748 138.752,100.332 137.583,98.9C136.234,97.245 128.465,88.538 121.63,88.656C120.136,88.682 119.01,89.227 117.844,90.168C117.104,90.763 113.406,87.107 112.26,86.583C109.211,85.189 107.931,88.586 107.418,89.384C106.707,90.492 110.03,96.789 107.418,98.9C104.807,101.011 101.679,97.697 98.644,96.477C95.61,95.256 92.96,92.504 92.402,91.85L75.518,72.037C75.484,71.984 73.034,69.269 71.468,69.404C69.677,69.559 68.673,71.11 68.479,71.427C68.479,71.427 67.61,72.851 67.883,74.988C68.257,77.916 78.08,91.353 87.598,104.749C89.283,107.121 90.355,114.269 90.832,117.323C91.486,121.512 98.079,141.127 107.223,145.309C107.223,145.309 111.852,146.923 117.022,149.348C119.915,150.705 123.785,153.15 127.778,157.921C127.796,157.94 127.813,157.958 127.831,157.976C129.737,159.724 133.442,164.113 133.925,163.872C137.947,161.862 155.375,160.521 158.343,147.984C158.374,147.857 158.468,147.755 158.384,147.656" + android:strokeWidth="1" + android:fillColor="#F7B994" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <path + android:pathData="M78.373,42.775C78.373,52.126 70.792,59.706 61.442,59.706C52.092,59.706 44.512,52.126 44.512,42.775C44.512,33.424 52.092,25.844 61.442,25.844C70.792,25.844 78.373,33.424 78.373,42.775" + android:strokeWidth="1" + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <group> + <clip-path + android:pathData="M44.512,42.775C44.512,52.125 52.092,59.705 61.443,59.705L61.443,59.705C70.793,59.705 78.372,52.125 78.372,42.775L78.372,42.775C78.372,33.424 70.793,25.844 61.443,25.844L61.443,25.844C52.092,25.844 44.512,33.424 44.512,42.775L44.512,42.775Z"/> + <path + android:pathData="M64.76,46.928C64.76,46.928 64.756,47.086 64.759,47.352C65.39,46.62 65.809,45.67 66.087,44.766C66.148,44.559 66.233,44.251 66.337,43.812C66.338,43.806 66.339,43.802 66.339,43.797C66.367,43.668 66.586,42.024 66.619,41.879C66.68,41.604 66.774,41.408 66.877,41.253C66.789,41.242 66.735,41.231 66.735,41.231C64.196,44.607 61.491,45.418 61.491,45.418C61.175,45.946 59.374,46.561 59.427,45.717C59.479,44.872 61.221,44.877 61.221,44.877C61.607,44.908 63.654,43.795 64.736,42.714C65.818,41.632 66.472,40.756 66.472,40.756C66.271,40.378 66.129,40.035 66.035,39.722C65.346,39.811 64.596,39.599 64.196,39.198C63.591,38.593 63.73,37.921 63.114,37.305C60.68,34.871 57.322,37.731 55.542,37.846C55.456,37.851 55.374,37.846 55.293,37.839C55.266,38.007 55.242,38.177 55.226,38.349C54.73,43.525 56.566,45.746 57.813,46.92C58.434,47.504 59.116,47.788 59.712,48.035C59.75,47.947 59.787,47.867 59.823,47.803L64.76,46.928Z" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M44.512,42.775C44.512,52.125 52.092,59.705 61.443,59.705L61.443,59.705C70.793,59.705 78.372,52.125 78.372,42.775L78.372,42.775C78.372,33.424 70.793,25.844 61.443,25.844L61.443,25.844C52.092,25.844 44.512,33.424 44.512,42.775"/> + <path + android:pathData="M63.925,52.99C64.842,52.44 65.225,51.565 65.301,51.37C65.291,51.326 65.281,51.28 65.267,51.235C64.839,49.857 64.767,48.134 64.759,47.352C64.756,47.086 64.76,46.928 64.76,46.928L59.823,47.803C59.786,47.867 59.75,47.947 59.712,48.035C59.372,48.832 58.995,50.483 58.702,50.857C58.688,50.876 58.685,50.895 58.683,50.912L58.815,51.651C59.057,52.719 61.221,54.612 63.925,52.99" + android:strokeWidth="1" + android:fillColor="#F3B590" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M44.512,42.775C44.512,52.125 52.092,59.705 61.443,59.705L61.443,59.705C70.793,59.705 78.372,52.125 78.372,42.775L78.372,42.775C78.372,33.424 70.793,25.844 61.443,25.844L61.443,25.844C52.092,25.844 44.512,33.424 44.512,42.775"/> + <path + android:pathData="M75.057,55.383C72.654,53.39 65.317,51.33 65.317,51.33C65.317,51.33 65.312,51.345 65.302,51.37C65.225,51.566 64.842,52.439 63.925,52.99C61.22,54.613 59.057,52.72 58.814,51.651L58.683,50.913L58.677,50.879C58.677,50.879 51.191,52.624 49.007,55.256C48.118,56.327 47.594,57.08 46.952,62.203L76.924,62.203L76.924,60.64C76.618,58.393 76.064,56.218 75.057,55.383" + android:strokeWidth="1" + android:fillColor="#898995" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M44.512,42.775C44.512,52.125 52.092,59.705 61.443,59.705L61.443,59.705C70.793,59.705 78.372,52.125 78.372,42.775L78.372,42.775C78.372,33.424 70.793,25.844 61.443,25.844L61.443,25.844C52.092,25.844 44.512,33.424 44.512,42.775"/> + <path + android:pathData="M69.137,39.278C69.207,41.401 67.4,41.321 66.877,41.253C66.773,41.407 66.681,41.604 66.619,41.878C66.587,42.025 66.367,43.667 66.339,43.798C66.339,43.799 66.338,43.802 66.338,43.803C66.338,43.806 66.338,43.809 66.337,43.811C66.233,44.252 66.148,44.56 66.087,44.767C66.016,45.002 65.976,45.106 65.976,45.106C67.026,44.911 70.713,39.598 69.618,36.587C68.576,33.725 66.33,32.062 65.057,31.416C66.908,33.578 67.441,36.764 67.441,36.764C68.252,36.764 69.063,37.034 69.137,39.278" + android:strokeWidth="1" + android:fillColor="#352525" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M44.512,42.775C44.512,52.125 52.092,59.705 61.443,59.705L61.443,59.705C70.793,59.705 78.372,52.125 78.372,42.775L78.372,42.775C78.372,33.424 70.793,25.844 61.443,25.844L61.443,25.844C52.092,25.844 44.512,33.424 44.512,42.775"/> + <path + android:pathData="M63.114,37.305C63.73,37.922 63.591,38.593 64.195,39.198C64.596,39.599 65.346,39.811 66.035,39.722C65.417,37.696 66.762,36.983 66.762,36.983C66.359,34.871 65.006,32.708 64.101,31.843C63.624,31.387 63.025,30.889 61.287,30.735C60.42,30.659 59.892,30.91 59.414,31.043C59.057,31.142 58.53,31.249 58.223,31.309C58.194,31.326 58.163,31.339 58.129,31.345C57.719,31.42 56.147,31.682 55.39,31.468C55.207,31.417 55.031,31.559 55.056,31.746C55.082,31.947 55.121,32.169 55.181,32.342C55.236,32.503 55.116,32.671 54.947,32.676C54.147,32.704 52.559,32.669 52.332,32.669C52.086,32.669 52.484,33.395 53.032,33.876C53.216,34.038 53.098,34.337 52.853,34.328C52.847,34.327 52.841,34.327 52.835,34.327C52.632,34.317 52.499,34.533 52.599,34.709C53.115,35.616 53.881,37.701 55.293,37.839C55.374,37.847 55.457,37.851 55.542,37.846C57.322,37.731 60.679,34.871 63.114,37.305" + android:strokeWidth="1" + android:fillColor="#352525" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> + <group> + <clip-path + android:pathData="M44.512,42.775C44.512,52.125 52.092,59.705 61.443,59.705L61.443,59.705C70.793,59.705 78.372,52.125 78.372,42.775L78.372,42.775C78.372,33.424 70.793,25.844 61.443,25.844L61.443,25.844C52.092,25.844 44.512,33.424 44.512,42.775"/> + <path + android:pathData="M61.287,30.735C63.025,30.889 63.623,31.387 64.101,31.843C65.007,32.708 66.358,34.871 66.762,36.983C66.762,36.983 65.418,37.696 66.034,39.722C66.13,40.035 66.271,40.378 66.472,40.756C66.472,40.756 65.818,41.632 64.736,42.714C63.655,43.796 61.606,44.909 61.22,44.877C61.22,44.877 59.48,44.872 59.426,45.716C59.373,46.561 61.175,45.946 61.491,45.418C61.491,45.418 64.195,44.607 66.735,41.231C66.735,41.231 66.789,41.242 66.877,41.253C67.401,41.321 69.207,41.401 69.137,39.278C69.063,37.035 68.251,36.764 67.44,36.764C67.44,36.764 66.909,33.579 65.057,31.415C65.04,31.395 65.024,31.375 65.007,31.355C63.747,29.916 61.782,29.227 60.139,29.733C59.044,30.07 57.975,31.355 57.975,31.355C57.975,31.355 58.074,31.337 58.224,31.309C58.531,31.249 59.057,31.142 59.414,31.043C59.891,30.91 60.419,30.659 61.287,30.735" + android:strokeWidth="1" + android:fillColor="#C36A61" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> </group> + <path + android:pathData="M46.27,29.97L44.198,23.691C44.104,23.405 44.133,23.096 44.28,22.834C45.127,21.321 47.43,15.955 46.475,11.496C45.438,6.663 39.887,-0.341 26.811,1.094C13.736,2.531 12.675,14.22 12.675,14.22C12.675,14.22 11.903,20.041 17.104,24.51C22.207,28.896 30.506,29.646 36.571,28.081C36.796,28.023 37.031,28.038 37.246,28.127L44.84,31.295C45.688,31.649 46.558,30.842 46.27,29.97" + android:strokeWidth="1" + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M41.64,11.508L37.594,11.508C37.292,11.508 37.047,11.735 37.047,12.016L37.047,18.374C37.047,18.655 37.292,18.883 37.594,18.883L41.64,18.883C41.942,18.883 42.187,18.655 42.187,18.374L42.187,12.016C42.187,11.735 41.942,11.508 41.64,11.508" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.088,11.508L31.043,11.508C30.741,11.508 30.495,11.735 30.495,12.016L30.495,18.374C30.495,18.655 30.741,18.883 31.043,18.883L35.088,18.883C35.391,18.883 35.636,18.655 35.636,18.374L35.636,12.016C35.636,11.735 35.391,11.508 35.088,11.508" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.537,11.508L24.492,11.508C24.189,11.508 23.944,11.735 23.944,12.016L23.944,18.374C23.944,18.655 24.189,18.883 24.492,18.883L28.537,18.883C28.839,18.883 29.085,18.655 29.085,18.374L29.085,12.016C29.085,11.735 28.839,11.508 28.537,11.508" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M21.986,11.508L17.94,11.508C17.638,11.508 17.393,11.735 17.393,12.016L17.393,18.374C17.393,18.655 17.638,18.883 17.94,18.883L21.986,18.883C22.288,18.883 22.533,18.655 22.533,18.374L22.533,12.016C22.533,11.735 22.288,11.508 21.986,11.508" + android:strokeWidth="1" + android:fillColor="#657887" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml index 16d54eb8eb76afe5eae83d2924465e68a41d13a9..4e596d091d92d2da21a133c54d12590a44a616fa 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_invalid.xml @@ -1,123 +1,80 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="77dp" - android:height="105dp" - android:viewportWidth="77" - android:viewportHeight="105"> + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + <group> + <clip-path + android:pathData="M0,0h80v112h-80z"/> <path - android:fillColor="#F5F5F5" - android:fillType="nonZero" - android:pathData="M-231,-36L97,-36A4,4 0,0 1,101 -32L101,128A4,4 0,0 1,97 132L-231,132A4,4 0,0 1,-235 128L-235,-32A4,4 0,0 1,-231 -36z" + android:pathData="M8.314,17.979l0,94.021l70.787,0l0,-76.112l-16.997,-17.909z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path android:fillColor="#FFFFFF" android:fillType="evenOdd" - android:pathData="M5.88,104.02l0,-94.32l53.617,0l16.943,17.968l0,76.352z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M59.178,9.917l16.936,0l0,17.938l-16.936,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M76.114,27.854l-16.936,0l0,-17.938z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M24.676,81.096l10.455,0l0,10.455l-10.455,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M33.92,91.551L25.887,91.551C25.218,91.551 24.676,91.009 24.676,90.34L24.676,82.306C24.676,81.638 25.218,81.096 25.887,81.096L33.92,81.096C34.589,81.096 35.131,81.638 35.131,82.306L35.131,90.34C35.131,91.009 34.589,91.551 33.92,91.551" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M21.903,51.513l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M23.383,51.513L62.278,51.513C63.04,51.572 63.519,52.107 63.519,52.841C63.519,53.485 63.04,54.203 62.278,54.169L23.383,54.169C22.382,54.203 21.903,53.574 21.903,52.841C21.903,52.107 22.382,51.572 23.383,51.513" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M21.903,36.558l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M23.383,36.558L62.278,36.558C63.04,36.617 63.519,37.152 63.519,37.886C63.519,38.53 63.04,39.248 62.278,39.214L23.383,39.214C22.382,39.248 21.903,38.619 21.903,37.886C21.903,37.152 22.382,36.617 23.383,36.558" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M21.903,65.249l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M23.383,65.249L62.278,65.249C63.04,65.308 63.519,65.844 63.519,66.577C63.519,67.222 63.04,67.939 62.278,67.905L23.383,67.905C22.382,67.939 21.903,67.311 21.903,66.577C21.903,65.844 22.382,65.308 23.383,65.249" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:strokeColor="#00000000"/> <path - android:fillColor="#F7A8A8" - android:fillType="nonZero" - android:pathData="M2,31.5C1.173,31.5 0.5,30.827 0.5,30C0.5,29.72 0.59,29.437 0.773,29.135L17.628,1.385C17.829,1.054 18.274,0.5 19,0.5C19.726,0.5 20.171,1.054 20.371,1.385L37.225,29.135C37.41,29.437 37.5,29.72 37.5,30C37.5,30.827 36.827,31.5 36,31.5L2,31.5Z" + android:pathData="M62.149,35.889l16.897,0l-16.897,-17.896z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path - android:fillColor="#C74343" - android:fillType="nonZero" - android:pathData="M19,1C19.481,1 19.798,1.403 19.944,1.644L28.371,15.519L36.798,29.394C36.934,29.617 37,29.815 37,30C37,30.551 36.551,31 36,31L2,31C1.449,31 1,30.551 1,30C1,29.815 1.066,29.617 1.201,29.394L9.628,15.519L18.055,1.644C18.202,1.404 18.519,1 19,1M19,0C18.209,0 17.586,0.492 17.201,1.125C0.346,28.875 17.201,1.125 0.346,28.875C0.145,29.206 0,29.583 0,30C0,31.105 0.895,32 2,32C2.874,32 35.06,32 36,32C37.105,32 38,31.105 38,30C38,29.583 37.855,29.206 37.654,28.875C20.799,1.125 37.654,28.875 20.799,1.125C20.414,0.492 19.791,0 19,0L19,0Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B33C3C" - android:fillType="nonZero" - android:pathData="M6.21,13.443l0.272,-0.449l-5.453,-0.654l-0.57,0.939l5.453,0.654z" + android:pathData="M35.577,99.125L29.383,99.125C28.213,99.125 27.264,98.177 27.264,97.007L27.264,90.89C27.264,89.677 28.247,88.694 29.46,88.694L35.577,88.694C36.747,88.694 37.696,89.643 37.696,90.812L37.696,97.007C37.696,98.177 36.747,99.125 35.577,99.125" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B33C3C" - android:fillType="nonZero" - android:pathData="M11.49,4.748l-3.316,-4.171l-0.553,0.911l3.316,4.172z" + android:pathData="M60.681,99.125L54.656,99.125C53.439,99.125 52.453,98.139 52.453,96.922L52.453,90.897C52.453,89.681 53.439,88.694 54.656,88.694L60.681,88.694C61.898,88.694 62.884,89.681 62.884,90.897L62.884,96.922C62.884,98.139 61.898,99.125 60.681,99.125" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B33C3C" - android:fillType="nonZero" - android:pathData="M8.469,9.722l0.52,-0.856l-4.374,-2.43l-0.52,0.856z" + android:pathData="M25.4,58.977L64.206,58.977C64.967,59.037 65.445,59.571 65.445,60.302C65.445,60.946 64.967,61.662 64.206,61.627L25.4,61.627C24.4,61.662 23.924,61.034 23.924,60.302C23.924,59.571 24.4,59.037 25.4,58.977" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B33C3C" - android:fillType="nonZero" - android:pathData="M31.79,13.443l-0.272,-0.449l5.453,-0.654l0.57,0.939l-5.453,0.654z" + android:pathData="M25.4,44.659L64.206,44.659C64.967,44.719 65.445,45.252 65.445,45.984C65.445,46.627 64.967,47.344 64.206,47.308L25.4,47.308C24.4,47.344 23.924,46.716 23.924,45.984C23.924,45.252 24.4,44.719 25.4,44.659" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B33C3C" - android:fillType="nonZero" - android:pathData="M26.51,4.748l3.316,-4.171l0.553,0.911l-3.316,4.172z" + android:pathData="M25.4,73.056L64.206,73.056C64.967,73.116 65.445,73.65 65.445,74.381C65.445,75.025 64.967,75.741 64.206,75.706L25.4,75.706C24.4,75.741 23.924,75.113 23.924,74.381C23.924,73.65 24.4,73.116 25.4,73.056" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B33C3C" - android:fillType="nonZero" - android:pathData="M29.531,9.722l-0.52,-0.856l4.374,-2.43l0.52,0.856z" + android:pathData="M2.155,32.586C1.463,32.586 0.791,32.188 0.572,31.531C0.429,31.104 0.492,30.688 0.77,30.229L17.572,2.565C17.773,2.235 18.216,1.684 18.94,1.684C19.664,1.684 20.107,2.235 20.307,2.565L37.108,30.229C37.39,30.69 37.45,31.106 37.307,31.535C37.089,32.188 36.422,32.586 35.734,32.586L2.155,32.586Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <group> + <clip-path + android:pathData="M0,1.185l37.881,0l0,31.899l-37.881,0z"/> + <path + android:pathData="M18.941,1.185C18.152,1.185 17.531,1.676 17.147,2.307L0.345,29.97C0.034,30.483 -0.144,31.107 0.148,31.82C0.475,32.613 1.299,33.084 2.158,33.084L35.723,33.084C36.581,33.084 37.407,32.613 37.732,31.82C38.023,31.107 37.847,30.483 37.535,29.97L20.733,2.307C20.35,1.676 19.729,1.185 18.941,1.185M18.941,2.182C19.42,2.182 19.736,2.584 19.882,2.825L28.281,16.656L36.682,30.487C36.818,30.709 36.883,30.907 36.883,31.091C36.883,31.64 36.437,32.088 35.887,32.088L1.993,32.088C1.444,32.088 0.997,31.64 0.997,31.091C0.997,30.907 1.063,30.709 1.197,30.487L9.597,16.656L17.999,2.825C18.145,2.585 18.462,2.182 18.941,2.182" + android:strokeWidth="1" + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> <path - android:fillColor="#36404D" - android:fillType="nonZero" - android:pathData="M19,26m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" + android:pathData="M18.941,25.109C20.042,25.109 20.934,26.002 20.934,27.103C20.934,28.204 20.042,29.096 18.941,29.096C17.84,29.096 16.947,28.204 16.947,27.103C16.947,26.002 17.84,25.109 18.941,25.109" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#36404D" - android:fillType="nonZero" - android:pathData="M19,10C17.895,10 17,10.826 17,11.846C17,12.528 18.002,21.151 18.007,21.187C18.066,21.645 18.488,22 19,22C19.512,22 19.934,21.645 19.993,21.187C19.998,21.151 21,12.528 21,11.846C21,10.826 20.105,10 19,10Z" + android:pathData="M18.941,11.153C17.838,11.153 16.947,11.976 16.947,12.994C16.947,13.674 17.945,22.269 17.951,22.305C18.01,22.761 18.43,23.116 18.941,23.116C19.451,23.116 19.872,22.761 19.931,22.305C19.935,22.269 20.934,13.674 20.934,12.994C20.934,11.976 20.042,11.153 18.941,11.153" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#E7E7E7" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml index 358b6f85c4e739f8c20f145d8cc8e28623349f99..d8053b5fb2066271471df5650815dc095c4acb72 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_negative.xml @@ -1,132 +1,70 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="79dp" - android:height="109dp" - android:viewportWidth="79" - android:viewportHeight="109"> + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + <group> + <clip-path + android:pathData="M0,0h80v112h-80z"/> <path - android:fillColor="#F5F5F5" - android:fillType="nonZero" - android:pathData="M-229,-35L99,-35A4,4 0,0 1,103 -31L103,129A4,4 0,0 1,99 133L-229,133A4,4 0,0 1,-233 129L-233,-31A4,4 0,0 1,-229 -35z" + android:pathData="M8.222,17.425l0,94.575l71.203,0l0,-76.558l-17.097,-18.017z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path android:fillColor="#FFFFFF" android:fillType="evenOdd" - android:pathData="M7.88,108.02l0,-94.32l53.617,0l16.943,17.968l0,76.352z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M61.178,13.917l16.936,0l0,17.938l-16.936,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M78.114,31.854l-16.936,0l0,-17.938z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M26.676,85.096l10.455,0l0,10.455l-10.455,0z" /> - <path - android:fillColor="#2E854B" - android:fillType="evenOdd" - android:pathData="M35.92,95.551L27.887,95.551C27.218,95.551 26.676,95.009 26.676,94.34L26.676,86.306C26.676,85.638 27.218,85.096 27.887,85.096L35.92,85.096C36.589,85.096 37.131,85.638 37.131,86.306L37.131,94.34C37.131,95.009 36.589,95.551 35.92,95.551" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M52.007,85.096l10.455,0l0,10.455l-10.455,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M61.241,95.551L53.229,95.551C52.554,95.551 52.007,95.004 52.007,94.329L52.007,86.317C52.007,85.642 52.554,85.096 53.229,85.096L61.241,85.096C61.916,85.096 62.462,85.642 62.462,86.317L62.462,94.329C62.462,95.004 61.916,95.551 61.241,95.551" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:strokeColor="#00000000"/> <path - android:fillColor="#FFFFFF" - android:fillType="evenOdd" - android:pathData="M53.358,90.937C53.2,90.769 53.203,90.585 53.355,90.411C53.542,90.198 53.344,90.408 53.544,90.206C53.73,90.018 53.906,90.019 54.091,90.211C54.556,90.694 55.017,91.183 55.479,91.669C55.481,91.67 55.483,91.672 55.484,91.673C55.607,91.789 55.759,91.93 55.852,92.017C55.9,92.061 55.972,92.055 56.012,92.004C56.083,91.913 56.192,91.771 56.282,91.645C57.341,89.993 58.4,88.34 59.461,86.689C59.663,86.375 59.833,86.342 60.136,86.558C60.322,86.691 60.542,86.914 60.388,87.159C59.984,87.805 59.576,88.448 59.165,89.09C58.249,90.52 57.33,91.949 56.413,93.379C56.268,93.641 56.004,93.712 55.757,93.479C54.95,92.639 54.153,91.789 53.358,90.937Z" + android:pathData="M62.374,35.442l16.996,0l-16.996,-18.003z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M23.903,55.513l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M25.383,55.513L64.278,55.513C65.04,55.572 65.519,56.107 65.519,56.841C65.519,57.485 65.04,58.203 64.278,58.169L25.383,58.169C24.382,58.203 23.903,57.574 23.903,56.841C23.903,56.107 24.382,55.572 25.383,55.513" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M23.903,40.558l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M25.383,40.558L64.278,40.558C65.04,40.617 65.519,41.152 65.519,41.886C65.519,42.53 65.04,43.248 64.278,43.214L25.383,43.214C24.382,43.248 23.903,42.619 23.903,41.886C23.903,41.152 24.382,40.617 25.383,40.558" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M23.903,69.249l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M25.383,69.249L64.278,69.249C65.04,69.308 65.519,69.844 65.519,70.577C65.519,71.222 65.04,71.939 64.278,71.905L25.383,71.905C24.382,71.939 23.903,71.311 23.903,70.577C23.903,69.844 24.382,69.308 25.383,69.249" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#2E7D32" - android:fillType="nonZero" - android:pathData="M26.518,29.973C25.308,29.973 25.913,27.078 25.913,26.665C26.013,26.458 25.005,14.157 25.005,14.157C25.106,13.744 25.308,13.227 26.013,13.227C26.013,13.227 26.013,13.227 26.114,13.227L26.215,13.227C27.828,13.227 29.239,11.883 29.239,10.229C29.239,8.575 27.929,7.231 26.215,7.231C24.602,7.231 23.191,8.575 23.191,10.229C23.191,10.539 23.191,10.849 23.292,11.159C23.292,11.159 23.896,12.71 22.586,12.503C22.586,12.503 11.194,16.535 10.69,16.638C9.279,19.222 5.649,17.878 4.541,17.051C4.238,16.638 3.633,16.328 2.928,16.328C1.718,16.328 0.71,17.362 0.71,18.602C0.81,19.739 1.819,20.773 3.028,20.773C3.432,20.773 3.936,20.669 4.238,20.463C6.053,19.532 9.38,20.153 9.783,21.806L9.783,21.91C9.884,22.22 12.202,26.975 12.505,27.388C14.017,30.283 10.287,31.42 10.287,31.42C9.279,31.42 8.371,32.35 8.371,33.487C8.371,34.728 9.38,35.761 10.589,35.761C11.799,35.761 12.807,34.728 12.807,33.487C13.11,31.11 14.319,29.559 16.537,29.456C16.84,29.559 22.283,29.146 22.687,29.042C24.3,29.352 23.392,30.696 23.392,32.97C23.392,34.624 24.703,35.968 26.417,35.968C28.03,35.968 29.441,34.624 29.441,32.97C29.542,31.316 28.231,29.973 26.518,29.973Z" + android:pathData="M35.774,99.05L29.286,99.05C28.18,99.05 27.284,98.154 27.284,97.048L27.284,90.56C27.284,89.453 28.18,88.558 29.286,88.558L35.774,88.558C36.88,88.558 37.776,89.453 37.776,90.56L37.776,97.048C37.776,98.154 36.88,99.05 35.774,99.05" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#4CAF50" - android:fillType="nonZero" - android:pathData="M32.749,14.793C31.839,14.793 31.131,15.191 30.828,15.988C29.918,17.283 27.998,17.582 26.784,16.984C26.582,16.486 13.845,13.099 13.845,13.199C12.227,14.095 10.711,11.306 10.812,10.011L10.812,9.911C10.913,9.613 10.913,9.314 10.913,9.015C10.913,7.421 9.599,6.126 7.88,6.126C6.263,6.126 4.848,7.421 4.848,9.015C4.848,10.31 5.758,11.306 6.768,11.804C8.487,12.501 10.812,14.494 10.61,15.888C11.318,17.084 9.7,23.26 9.801,23.758C8.891,24.655 7.072,24.455 6.364,24.157C6.061,23.758 5.454,23.559 4.848,23.559C3.23,23.559 1.815,24.854 1.815,26.448C1.815,28.042 3.129,29.337 4.848,29.337C5.859,29.337 6.667,28.938 7.274,28.141C8.184,26.846 9.7,25.651 11.014,25.651C11.216,25.95 27.492,19.674 27.492,19.574C27.593,18.976 30.019,18.379 32.142,18.877L32.749,18.877C33.962,18.877 34.973,17.881 34.973,16.685C34.973,15.49 33.962,14.793 32.749,14.793Z" + android:pathData="M61.111,99.05L54.62,99.05C53.515,99.05 52.619,98.154 52.619,97.049L52.619,90.558C52.619,89.453 53.515,88.558 54.62,88.558L61.111,88.558C62.216,88.558 63.112,89.453 63.112,90.558L63.112,97.049C63.112,98.154 62.216,99.05 61.111,99.05" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#2E854B" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#4CAF50" - android:fillType="nonZero" - android:pathData="M29.447,19.942C29.447,25.161 25.271,29.337 20.052,29.337C14.832,29.337 10.657,25.161 10.657,19.942C10.657,14.723 14.832,10.547 20.052,10.547C25.271,10.547 29.447,14.723 29.447,19.942Z" + android:pathData="M25.409,58.665L64.443,58.665C65.209,58.725 65.689,59.262 65.689,59.998C65.689,60.645 65.209,61.365 64.443,61.331L25.409,61.331C24.404,61.365 23.924,60.734 23.924,59.998C23.924,59.262 24.404,58.725 25.409,58.665" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#8BC34A" - android:fillType="nonZero" - android:pathData="M22.638,28.623C22.935,28.014 21.845,27.811 20.954,27.811C20.062,27.811 19.171,28.318 19.369,28.928C21.746,32.583 19.963,33.09 18.874,33.801C17.982,34.207 17.388,35.324 17.388,36.339C17.388,37.964 18.675,39.284 20.359,39.284C22.043,39.284 23.331,37.964 23.331,36.339C23.43,33.497 21.647,29.537 22.638,28.623ZM35.119,22.937C34.524,22.937 33.93,23.039 33.534,23.343C31.751,24.054 30.166,22.734 28.977,21.922C28.383,21.516 27.69,22.531 27.491,22.836C27.293,23.14 26.996,24.562 28.185,24.562C30.166,23.851 32.642,27.405 32.642,27.405C33.039,28.42 34.128,29.029 35.317,29.029C36.902,29.029 38.289,27.709 38.289,26.085C37.991,24.257 36.704,22.937 35.119,22.937ZM17.784,5.27C19.666,9.23 19.567,10.753 18.477,11.159C17.586,11.87 19.072,12.784 20.161,12.581C21.251,12.378 22.241,11.87 21.548,10.855C19.864,7.809 22.043,5.778 22.043,5.778C22.737,5.372 23.232,4.458 23.232,3.544C23.232,1.92 21.944,0.6 20.26,0.6C18.576,0.6 17.289,1.92 17.289,3.544C17.289,3.95 17.388,4.458 17.586,4.864C17.586,5.169 17.586,5.169 17.784,5.27Z" + android:pathData="M25.409,44.264L64.443,44.264C65.209,44.324 65.689,44.861 65.689,45.597C65.689,46.243 65.209,46.964 64.443,46.929L25.409,46.929C24.404,46.964 23.924,46.332 23.924,45.597C23.924,44.861 24.404,44.324 25.409,44.264" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#C5E1A5" - android:fillType="nonZero" - android:pathData="M17.289,20.494C15.52,20.494 13.973,19.008 13.973,17.179C13.973,15.349 15.41,13.863 17.289,13.863C19.168,13.863 20.604,15.349 20.604,17.179C20.604,19.008 19.168,20.494 17.289,20.494Z" + android:pathData="M25.409,72.827L64.443,72.827C65.209,72.887 65.689,73.424 65.689,74.16C65.689,74.806 65.209,75.527 64.443,75.492L25.409,75.492C24.404,75.527 23.924,74.895 23.924,74.16C23.924,73.424 24.404,72.887 25.409,72.827" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#F1F8E9" - android:fillType="nonZero" - android:pathData="M16.183,23.81C15.52,23.81 15.078,23.368 15.078,22.705C15.078,22.042 15.52,21.6 16.183,21.6C16.847,21.6 17.289,22.042 17.289,22.705C17.289,23.368 16.847,23.81 16.183,23.81Z" + android:pathData="M61.074,91.143C60.954,91.134 60.837,91.187 60.763,91.282L56.827,96.123L54.825,93.994C54.741,93.885 54.602,93.835 54.468,93.863C54.334,93.888 54.226,93.989 54.189,94.12C54.153,94.253 54.193,94.394 54.295,94.487L56.584,96.924C56.656,96.999 56.757,97.04 56.861,97.036C56.966,97.033 57.063,96.982 57.128,96.901L61.331,91.741C61.421,91.634 61.442,91.489 61.387,91.362C61.333,91.235 61.212,91.15 61.074,91.143" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#FFFFFF" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#DCEDC8" - android:fillType="nonZero" - android:pathData="M21.71,26.021C20.504,26.021 19.499,25.016 19.499,23.81C19.499,22.604 20.504,21.6 21.71,21.6C22.915,21.6 23.92,22.604 23.92,23.81C23.92,25.016 22.915,26.021 21.71,26.021Z" + android:pathData="M61.074,91.143C60.954,91.134 60.837,91.187 60.763,91.282L56.827,96.123L54.825,93.994C54.741,93.885 54.602,93.835 54.468,93.863C54.334,93.888 54.226,93.989 54.189,94.12C54.153,94.253 54.193,94.394 54.295,94.487L56.584,96.924C56.656,96.999 56.757,97.04 56.861,97.036C56.966,97.033 57.063,96.982 57.128,96.901L61.331,91.741C61.421,91.634 61.442,91.489 61.387,91.362C61.333,91.235 61.212,91.15 61.074,91.143Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#00000000" + android:strokeColor="#FFFFFF" + android:fillType="evenOdd"/> <path - android:fillColor="#FFFFFF" - android:fillType="nonZero" - android:pathData="M4.176,4.776C5.503,3.449 7.655,3.449 8.982,4.776L34.553,30.346C35.881,31.674 35.881,33.826 34.554,35.153C33.226,36.48 31.074,36.48 29.747,35.153L4.176,9.583C2.848,8.256 2.848,6.104 4.176,4.776Z" + android:pathData="M6.939,12.415L23.355,28.459C22.751,28.821 22.117,29.127 21.461,29.376C21.435,29.686 21.443,30.058 21.505,30.5C21.681,31.775 22.546,33.731 22.669,34.137C22.748,34.399 22.907,34.476 23.13,34.635C23.679,35.025 24.51,35.865 22.536,36.418C20.882,36.881 20.132,36.725 20.465,35.74C20.636,35.238 20.716,34.864 20.659,34.337C20.55,33.333 19.919,31.089 19.044,30.012C17.434,30.26 15.764,30.179 14.139,29.736C13.699,29.89 13.222,30.114 12.925,30.421C12.587,30.77 11.845,32.01 11.984,32.694C12.122,33.379 12.372,34.708 10.114,33.868C9.646,33.694 8.011,33.115 9.612,32.071C11.701,30.709 11.08,28.467 11.08,28.467L11.054,28.403C9.657,27.55 8.493,26.446 7.591,25.18C7.281,25.285 6.947,25.459 6.598,25.724C4.613,27.231 4.223,27.651 4.223,27.651C4.223,27.651 2.603,30.94 0.902,28.333C-0.799,25.725 0.6,25.107 2.46,25.54C2.46,25.54 5.241,24.758 6.471,23.243C5.809,21.803 5.438,20.238 5.389,18.646C5.234,18.535 5.074,18.437 4.913,18.361C4.411,18.123 2.869,17.908 2.12,18.214C1.309,18.545 -0.183,19.018 0.018,17.172C0.179,15.693 0.801,14.984 2.12,15.901C3.336,16.746 4.643,16.48 5.597,16.048C5.81,14.93 6.191,13.825 6.747,12.766C6.81,12.647 6.874,12.53 6.939,12.415ZM4.444,4.186L31.018,30.179C31.625,30.772 31.752,31.628 31.301,32.09C30.851,32.553 29.991,32.445 29.384,31.852L2.811,5.859C2.203,5.266 2.076,4.41 2.527,3.948C2.979,3.487 3.837,3.593 4.444,4.186ZM24.746,1.024C27.013,2.211 26.297,2.779 25.544,3.079C25.239,3.2 24.971,3.399 24.752,3.643C24.119,4.352 22.888,6.221 22.709,7.755C22.73,7.764 22.749,7.774 22.768,7.785C24.34,8.611 25.65,9.739 26.663,11.062C26.928,11.101 27.193,11.111 27.427,11.068C27.905,10.98 29.229,10.402 29.514,9.764C29.799,9.126 30.368,7.899 31.718,9.894C31.998,10.308 32.992,11.729 31.083,11.649C29.305,11.575 28.39,12.665 28.011,13.297C28.736,14.859 29.116,16.571 29.114,18.307C29.49,18.57 30.029,18.763 30.798,18.751C32.085,18.73 32.851,18.752 33.275,18.776C33.549,18.791 34.563,18.784 34.788,18.629C35.344,18.247 36.418,17.755 36.26,19.799C36.127,21.512 35.723,22.163 34.912,21.511C34.498,21.179 33.287,20.86 32.772,20.733C31.691,20.464 29.939,20.189 28.836,20.829C28.616,21.843 28.255,22.843 27.749,23.806C27.676,23.945 27.601,24.082 27.523,24.217L11.091,8.143C11.718,7.764 12.377,7.444 13.059,7.186C13.204,6.931 13.33,6.552 13.239,6.075C13.165,5.688 13.106,4.831 12.67,4.51C12.269,4.217 11.436,3.234 13.787,2.899C14.432,2.807 15.153,2.588 14.845,3.71C14.738,4.1 14.719,4.477 14.751,4.823C14.823,5.592 15.053,6.066 15.553,6.543C17.197,6.305 18.901,6.408 20.553,6.889C20.93,6.617 21.298,6.181 21.579,5.494C22.029,4.395 22.384,3.132 22.537,2.699C22.653,2.369 22.701,2.02 22.673,1.671C22.623,1.043 22.79,0.001 24.746,1.024Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path android:fillColor="#2E854B" - android:fillType="nonZero" - android:pathData="M5.863,6.463C6.408,5.918 7.291,5.918 7.836,6.463L34.067,32.693C34.612,33.238 34.612,34.121 34.067,34.666C33.522,35.211 32.638,35.211 32.093,34.666L5.863,8.437C5.318,7.892 5.318,7.008 5.863,6.463Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml index 8feb68e65b6090fa04d67533fee6f14f4e794300..ee5c94390ab542675ce8d5814a8d9cdc8bf865de 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_pending.xml @@ -1,81 +1,70 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="82dp" - android:height="99dp" - android:viewportWidth="82" - android:viewportHeight="99"> + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + <group> + <clip-path + android:pathData="M0,0h80v112h-80z"/> <path - android:fillColor="#F5F5F5" - android:fillType="nonZero" - android:pathData="M-226,-45L102,-45A4,4 0,0 1,106 -41L106,119A4,4 0,0 1,102 123L-226,123A4,4 0,0 1,-230 119L-230,-41A4,4 0,0 1,-226 -45z" + android:pathData="M8.222,17.425l0,94.575l71.203,0l0,-76.558l-17.097,-18.017z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path android:fillColor="#FFFFFF" android:fillType="evenOdd" - android:pathData="M10.88,95.02l0,-94.32l53.617,0l16.943,17.9678l0,76.3522z" + android:strokeColor="#00000000"/> + <path + android:pathData="M62.374,35.442l16.996,0l-16.996,-18.003z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#B2DBF0" - android:fillType="nonZero" - android:pathData="M15.0432,77.06C17.781,74.3222 21.993,69.7943 21.993,66.3194C21.993,61.0544 17.781,58.0007 12.516,58.0007C7.251,58.0007 3.039,61.0544 3.039,66.3194C3.039,69.7943 7.251,74.4275 9.9888,77.1653C7.251,79.7978 3.039,84.3257 3.039,87.9059C3.039,93.1709 7.251,96.2246 12.516,96.2246C17.781,96.2246 21.993,93.1709 21.993,87.9059C21.993,84.3257 17.781,79.7978 15.0432,77.06Z" + android:pathData="M35.774,99.05L29.286,99.05C28.18,99.05 27.284,98.154 27.284,97.048L27.284,90.56C27.284,89.453 28.18,88.558 29.286,88.558L35.774,88.558C36.88,88.558 37.776,89.453 37.776,90.56L37.776,97.048C37.776,98.154 36.88,99.05 35.774,99.05" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.111,99.05L54.62,99.05C53.515,99.05 52.619,98.154 52.619,97.049L52.619,90.558C52.619,89.453 53.515,88.558 54.62,88.558L61.111,88.558C62.216,88.558 63.112,89.453 63.112,90.558L63.112,97.049C63.112,98.154 62.216,99.05 61.111,99.05" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#8D6E63" - android:fillType="nonZero" - android:pathData="M23.611,96.7196C23.611,97.5598 23.2412,98.12 22.6864,98.12L2.3456,98.12C1.7908,98.12 1.421,97.5598 1.421,96.7196L1.421,95.3192C1.421,94.479 1.7908,93.9188 2.3456,93.9188L22.6864,93.9188C23.2412,93.9188 23.611,94.479 23.611,95.3192L23.611,96.7196ZM23.611,57.4004C23.611,56.5602 23.2412,56 22.6864,56L2.3456,56C1.7908,56 1.421,56.5602 1.421,57.4004L1.421,58.8008C1.421,59.641 1.7908,60.2012 2.3456,60.2012L22.6864,60.2012C23.2412,60.2012 23.611,59.641 23.611,58.8008L23.611,57.4004Z" + android:pathData="M25.409,58.665L64.443,58.665C65.209,58.725 65.689,59.262 65.689,59.998C65.689,60.645 65.209,61.365 64.443,61.331L25.409,61.331C24.404,61.365 23.924,60.734 23.924,59.998C23.924,59.262 24.404,58.725 25.409,58.665" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M64.1782,0.9166l16.9362,0l0,17.9375l-16.9362,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M81.1144,18.8542l-16.9362,0l0,-17.9376z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M29.6756,72.0957l10.455,0l0,10.4551l-10.455,0z" /> - <path - android:fillColor="#5D6E80" - android:fillType="evenOdd" - android:pathData="M38.92,82.5507L30.8866,82.5507C30.2177,82.5507 29.6756,82.0086 29.6756,81.34L29.6756,73.3064C29.6756,72.6378 30.2177,72.0956 30.8866,72.0956L38.92,72.0956C39.5886,72.0956 40.1307,72.6378 40.1307,73.3064L40.1307,81.34C40.1307,82.0086 39.5886,82.5507 38.92,82.5507" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#FFFFFF" + android:pathData="M25.409,44.264L64.443,44.264C65.209,44.324 65.689,44.861 65.689,45.597C65.689,46.243 65.209,46.964 64.443,46.929L25.409,46.929C24.404,46.964 23.924,46.332 23.924,45.597C23.924,44.861 24.404,44.324 25.409,44.264" + android:strokeWidth="1" + android:fillColor="#657888" android:fillType="evenOdd" - android:pathData="M56.3576,77.9374C56.2,77.7688 56.2026,77.5845 56.3545,77.4112C56.5423,77.1977 56.3444,77.4075 56.5436,77.2063C56.7301,77.0178 56.9057,77.0192 57.0907,77.2112C57.5561,77.6945 58.017,78.1827 58.4795,78.6688C58.4812,78.6704 58.4827,78.6718 58.4843,78.6734C58.6072,78.7887 58.7593,78.9303 58.8525,79.0172C58.8996,79.0612 58.9717,79.0552 59.0118,79.0037C59.0828,78.9133 59.1922,78.7715 59.2818,78.6445C60.341,76.9927 61.3999,75.3404 62.4607,73.6894C62.6629,73.3745 62.8328,73.3422 63.1359,73.5583C63.3224,73.6911 63.5418,73.9144 63.3883,74.159C62.9836,74.8047 62.5759,75.4482 62.1652,76.0897C61.2492,77.5202 60.3302,78.9487 59.4131,80.3786C59.2682,80.6414 59.0039,80.7117 58.7571,80.4788C57.9502,79.6393 57.1531,78.7892 56.3576,77.9374Z" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.409,72.827L64.443,72.827C65.209,72.887 65.689,73.424 65.689,74.16C65.689,74.806 65.209,75.527 64.443,75.492L25.409,75.492C24.404,75.527 23.924,74.895 23.924,74.16C23.924,73.424 24.404,72.887 25.409,72.827" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M26.9034,42.5128l41.6152,0l0,2.657l-41.6152,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M28.3834,42.5127L67.2777,42.5127C68.0403,42.5719 68.5186,43.1071 68.5186,43.8405C68.5186,44.4854 68.0403,45.2029 67.2777,45.1685L28.3834,45.1685C27.3816,45.2029 26.9033,44.5739 26.9033,43.8405C26.9033,43.1071 27.3816,42.5719 28.3834,42.5127" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M26.9034,27.5578l41.6152,0l0,2.6572l-41.6152,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M28.3834,27.5578L67.2777,27.5578C68.0403,27.617 68.5186,28.1522 68.5186,28.8855C68.5186,29.5304 68.0403,30.2479 67.2777,30.2136L28.3834,30.2136C27.3816,30.2479 26.9033,29.6191 26.9033,28.8855C26.9033,28.1522 27.3816,27.617 28.3834,27.5578" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M26.9034,56.2492l41.6152,0l0,2.6572l-41.6152,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M28.3834,56.2492L67.2777,56.2492C68.0403,56.3084 68.5186,56.8437 68.5186,57.577C68.5186,58.2219 68.0403,58.9394 67.2777,58.9051L28.3834,58.9051C27.3816,58.9394 26.9033,58.3106 26.9033,57.577C26.9033,56.8437 27.3816,56.3084 28.3834,56.2492" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M16.238,89.449C19.17,86.516 23.68,81.668 23.68,77.946C23.68,72.308 19.17,69.038 13.531,69.038C7.893,69.038 3.383,72.308 3.383,77.946C3.383,81.668 7.893,86.63 10.825,89.561C7.893,92.381 3.383,97.229 3.383,101.063C3.383,106.702 7.893,109.972 13.531,109.972C19.17,109.972 23.68,106.702 23.68,101.063C23.68,97.229 19.17,92.381 16.238,89.449" + android:strokeWidth="1" + android:fillColor="#B2DBF0" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M23.681,68.023C23.681,67.346 23.23,66.895 22.554,66.895L4.511,66.895C3.834,66.895 3.383,67.346 3.383,68.023L3.383,72.534C3.383,73.21 3.834,73.661 4.511,73.661L22.554,73.661C23.23,73.661 23.681,73.21 23.681,72.534L23.681,68.023ZM23.681,110.874C23.681,111.55 23.23,112.002 22.554,112.002L4.511,112.002C3.834,112.002 3.383,111.55 3.383,110.874L3.383,106.363C3.383,105.687 3.834,105.236 4.511,105.236L22.554,105.236C23.23,105.236 23.681,105.687 23.681,106.363L23.681,110.874Z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.064,68.023C27.064,67.346 26.613,66.895 25.936,66.895L1.127,66.895C0.451,66.895 0,67.346 0,68.023L0,69.151C0,69.827 0.451,70.278 1.127,70.278L25.936,70.278C26.613,70.278 27.064,69.827 27.064,69.151L27.064,68.023ZM27.064,110.874C27.064,111.55 26.613,112.002 25.936,112.002L1.127,112.002C0.451,112.002 0,111.55 0,110.874L0,109.747C0,109.07 0.451,108.619 1.127,108.619L25.936,108.619C26.613,108.619 27.064,109.07 27.064,109.747L27.064,110.874Z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml index d817b79c8124ab8b67e245f1368093fc1052cefd..5e6691c4bf71072632edeccd8080fc8f56d457e9 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_illustration_positive.xml @@ -1,120 +1,130 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="77dp" - android:height="105dp" - android:viewportWidth="77" - android:viewportHeight="105"> + android:width="80dp" + android:height="112dp" + android:viewportWidth="80" + android:viewportHeight="112"> + <group> + <clip-path + android:pathData="M0,0h80v112h-80z"/> <path - android:fillColor="#F5F5F5" - android:fillType="nonZero" - android:pathData="M-231,-36L97,-36A4,4 0,0 1,101 -32L101,128A4,4 0,0 1,97 132L-231,132A4,4 0,0 1,-235 128L-235,-32A4,4 0,0 1,-231 -36z" + android:pathData="M8.222,17.425l0,94.575l71.203,0l0,-76.558l-17.097,-18.017z" android:strokeWidth="1" - android:strokeColor="#00000000" /> - <path android:fillColor="#FFFFFF" android:fillType="evenOdd" - android:pathData="M5.88,104.02l0,-94.32l53.617,0l16.943,17.968l0,76.352z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M59.178,9.917l16.936,0l0,17.938l-16.936,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M76.114,27.854l-16.936,0l0,-17.938z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M24.676,81.096l10.455,0l0,10.455l-10.455,0z" /> - <path - android:fillColor="#C01633" - android:fillType="evenOdd" - android:pathData="M33.92,91.551L25.887,91.551C25.218,91.551 24.676,91.009 24.676,90.34L24.676,82.306C24.676,81.638 25.218,81.096 25.887,81.096L33.92,81.096C34.589,81.096 35.131,81.638 35.131,82.306L35.131,90.34C35.131,91.009 34.589,91.551 33.92,91.551" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M50.007,81.096l10.455,0l0,10.455l-10.455,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M59.241,91.551L51.229,91.551C50.554,91.551 50.007,91.004 50.007,90.329L50.007,82.317C50.007,81.642 50.554,81.096 51.229,81.096L59.241,81.096C59.916,81.096 60.462,81.642 60.462,82.317L60.462,90.329C60.462,91.004 59.916,91.551 59.241,91.551" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> + android:strokeColor="#00000000"/> <path + android:pathData="M62.374,35.442l16.996,0l-16.996,-18.003z" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.774,99.05L29.286,99.05C28.18,99.05 27.284,98.154 27.284,97.048L27.284,90.56C27.284,89.453 28.18,88.558 29.286,88.558L35.774,88.558C36.88,88.558 37.776,89.453 37.776,90.56L37.776,97.048C37.776,98.154 36.88,99.05 35.774,99.05" + android:strokeWidth="1" + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M61.111,99.05L54.62,99.05C53.515,99.05 52.619,98.154 52.619,97.049L52.619,90.558C52.619,89.453 53.515,88.558 54.62,88.558L61.111,88.558C62.216,88.558 63.112,89.453 63.112,90.558L63.112,97.049C63.112,98.154 62.216,99.05 61.111,99.05" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.409,58.665L64.443,58.665C65.209,58.725 65.689,59.262 65.689,59.998C65.689,60.645 65.209,61.365 64.443,61.331L25.409,61.331C24.404,61.365 23.924,60.734 23.924,59.998C23.924,59.262 24.404,58.725 25.409,58.665" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.409,44.264L64.443,44.264C65.209,44.324 65.689,44.861 65.689,45.597C65.689,46.243 65.209,46.964 64.443,46.929L25.409,46.929C24.404,46.964 23.924,46.332 23.924,45.597C23.924,44.861 24.404,44.324 25.409,44.264" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M25.409,72.827L64.443,72.827C65.209,72.887 65.689,73.424 65.689,74.16C65.689,74.806 65.209,75.527 64.443,75.492L25.409,75.492C24.404,75.527 23.924,74.895 23.924,74.16C23.924,73.424 24.404,72.887 25.409,72.827" + android:strokeWidth="1" + android:fillColor="#657888" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.713,90.803C35.593,90.795 35.476,90.847 35.402,90.942L31.466,95.784L29.464,93.655C29.38,93.546 29.241,93.495 29.107,93.523C28.973,93.549 28.865,93.649 28.828,93.781C28.792,93.913 28.832,94.054 28.934,94.147L31.223,96.585C31.295,96.66 31.396,96.701 31.5,96.697C31.605,96.693 31.702,96.643 31.767,96.562L35.97,91.401C36.06,91.295 36.081,91.149 36.026,91.022C35.972,90.896 35.851,90.811 35.713,90.803" + android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd" - android:pathData="M51.358,86.937C51.2,86.769 51.203,86.585 51.355,86.411C51.542,86.198 51.344,86.408 51.544,86.206C51.73,86.018 51.906,86.019 52.091,86.211C52.556,86.694 53.017,87.183 53.479,87.669C53.481,87.67 53.483,87.672 53.484,87.673C53.607,87.789 53.759,87.93 53.852,88.017C53.9,88.061 53.972,88.055 54.012,88.004C54.083,87.913 54.192,87.771 54.282,87.645C55.341,85.993 56.4,84.34 57.461,82.689C57.663,82.375 57.833,82.342 58.136,82.558C58.322,82.691 58.542,82.914 58.388,83.159C57.984,83.805 57.576,84.448 57.165,85.09C56.249,86.52 55.33,87.949 54.413,89.379C54.268,89.641 54.004,89.712 53.757,89.479C52.95,88.639 52.153,87.789 51.358,86.937Z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - <group> - <clip-path android:pathData="M21.903,51.513l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M23.383,51.513L62.278,51.513C63.04,51.572 63.519,52.107 63.519,52.841C63.519,53.485 63.04,54.203 62.278,54.169L23.383,54.169C22.382,54.203 21.903,53.574 21.903,52.841C21.903,52.107 22.382,51.572 23.383,51.513" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M21.903,36.558l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M23.383,36.558L62.278,36.558C63.04,36.617 63.519,37.152 63.519,37.886C63.519,38.53 63.04,39.248 62.278,39.214L23.383,39.214C22.382,39.248 21.903,38.619 21.903,37.886C21.903,37.152 22.382,36.617 23.383,36.558" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <group> - <clip-path android:pathData="M21.903,65.249l41.615,0l0,2.657l-41.615,0z" /> - <path - android:fillColor="#657888" - android:fillType="evenOdd" - android:pathData="M23.383,65.249L62.278,65.249C63.04,65.308 63.519,65.844 63.519,66.577C63.519,67.222 63.04,67.939 62.278,67.905L23.383,67.905C22.382,67.939 21.903,67.311 21.903,66.577C21.903,65.844 22.382,65.308 23.383,65.249" - android:strokeWidth="1" - android:strokeColor="#00000000" /> - </group> - <path - android:fillColor="#C01633" + android:strokeColor="#00000000"/> + <path + android:pathData="M35.741,90.304L35.625,90.304C35.384,90.322 35.158,90.441 35.008,90.634L31.438,95.024L29.828,93.312C29.659,93.089 29.327,92.966 29.005,93.033C28.692,93.094 28.434,93.332 28.347,93.646C28.271,93.923 28.335,94.213 28.514,94.429L30.858,96.927C31.033,97.109 31.272,97.206 31.519,97.196C31.769,97.187 32.001,97.069 32.157,96.874L36.358,91.716C36.564,91.473 36.615,91.124 36.485,90.823C36.373,90.561 36.138,90.374 35.862,90.319L35.741,90.304Z" + android:strokeWidth="1" + android:fillColor="#FFFFFF" android:fillType="nonZero" - android:pathData="M32.114,13.154C31.218,13.154 30.471,13.592 30.173,14.322C29.277,15.638 27.335,15.93 26.14,15.346C25.919,14.841 13.294,11.4 13.294,11.545C11.651,12.422 10.157,9.646 10.307,8.329L10.307,8.183C10.456,7.891 10.456,7.598 10.456,7.306C10.456,5.699 9.111,4.383 7.469,4.383C5.825,4.383 4.481,5.698 4.481,7.306C4.481,8.621 5.377,9.645 6.423,10.084C8.087,10.762 10.389,12.824 10.235,14.168C10.899,15.359 9.296,21.617 9.411,22.067C8.515,22.944 6.722,22.797 5.975,22.505C5.677,22.067 5.079,21.92 4.481,21.92C2.838,21.92 1.494,23.235 1.494,24.844C1.494,26.451 2.838,27.767 4.481,27.767C5.527,27.767 6.273,27.328 6.871,26.597C7.767,25.283 9.262,24.113 10.606,24.113C10.8,24.397 26.889,18.121 26.889,17.975C27.037,17.39 29.428,16.805 31.519,17.244L32.116,17.244C33.311,17.244 34.358,16.221 34.358,15.052C34.358,13.883 33.31,13.154 32.114,13.154Z" + android:strokeColor="#00000000"/> + <path + android:pathData="M27.587,23.929C24.556,29.695 17.425,31.911 11.66,28.88C5.894,25.85 3.677,18.719 6.708,12.953C9.739,7.188 16.87,4.971 22.635,8.001C28.401,11.033 30.618,18.163 27.587,23.929" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#59112B" - android:fillType="nonZero" - android:pathData="M25.543,27.915C24.349,27.915 24.946,25.139 24.946,24.7C25.093,24.482 24.05,12.569 24.05,12.569C24.199,12.13 24.349,11.692 25.095,11.692C25.095,11.692 25.095,11.692 25.244,11.692L25.394,11.692C27.037,11.692 28.38,10.377 28.38,8.769C28.38,7.161 27.036,5.846 25.394,5.846C23.75,5.846 22.406,7.16 22.406,8.769C22.406,9.061 22.406,9.353 22.554,9.646C22.554,9.646 23.153,11.107 21.808,10.96C21.808,10.96 10.511,14.882 9.962,14.981C8.584,17.505 4.919,16.213 3.884,15.346C3.585,14.907 2.988,14.615 2.24,14.615C1.045,14.615 0,15.639 0,16.808C0,17.978 1.045,19 2.241,19C2.69,19 3.137,18.854 3.436,18.708C5.228,17.83 8.515,18.415 8.963,20.022L8.963,20.169C9.03,20.498 11.371,25.019 11.651,25.43C13.145,28.207 9.411,29.376 9.411,29.376C8.365,29.376 7.469,30.253 7.469,31.422C7.469,32.592 8.514,33.614 9.709,33.614C10.904,33.614 11.95,32.592 11.95,31.422C12.249,29.085 13.444,27.622 15.684,27.477C16.03,27.589 21.36,27.184 21.808,27.039C23.452,27.33 22.554,28.646 22.554,30.839C22.554,32.446 23.9,33.762 25.542,33.762C27.186,33.762 28.53,32.447 28.53,30.839C28.531,29.23 27.187,27.915 25.543,27.915Z" + android:pathData="M29.423,29.037C29.151,29.452 28.23,30.91 27.57,29.129C26.709,26.804 24.884,27.311 24.884,27.311L23.194,27.55L26.746,23.54C26.746,23.54 26.66,25.148 27.185,25.952C27.449,26.357 28.001,26.95 28.695,26.966C29.39,26.982 30.734,27.033 29.423,29.037" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#C01633" - android:fillType="nonZero" - android:pathData="M18,10C13.029,10 9,14.029 9,19C9,23.971 13.029,28 18,28C22.971,28 27,23.971 27,19C27,14.029 22.971,10 18,10Z" + android:pathData="M10.055,33.932C9.59,33.76 7.965,33.184 9.555,32.146C11.633,30.792 11.015,28.563 11.015,28.563L10.409,26.967L15.105,29.543C15.105,29.543 13.518,29.816 12.85,30.505C12.513,30.853 11.776,32.083 11.914,32.764C12.052,33.445 12.3,34.768 10.055,33.932" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#C43B52" - android:fillType="nonZero" - android:pathData="M20.315,27.478C20.646,26.833 19.515,26.641 18.625,26.672C17.735,26.703 16.875,27.219 17.038,27.785C19.412,31.424 17.624,31.862 16.58,32.593C15.684,33.031 15.086,34.054 15.086,35.077C15.086,36.684 16.431,38 18.074,38C19.717,38 21.062,36.685 21.062,35.077C21.063,32.3 19.27,28.354 20.315,27.478ZM32.862,21.923C32.264,21.923 31.668,22.069 31.219,22.361C29.437,23.088 27.804,21.793 26.611,20.916C26.015,20.547 25.338,21.483 25.14,21.859C24.942,22.235 24.64,23.562 25.841,23.53C27.874,22.875 30.321,26.307 30.321,26.307C30.77,27.329 31.816,27.914 33.01,27.914C34.655,27.914 35.998,26.599 35.998,24.991C35.85,23.238 34.506,21.923 32.862,21.923ZM15.386,4.53C17.327,8.477 17.178,9.938 16.133,10.377C15.203,11.047 16.703,11.953 17.812,11.813C18.921,11.673 19.921,11.125 19.232,10.159C17.517,7.131 19.717,5.116 19.717,5.116C20.464,4.678 20.911,3.801 20.911,2.924C20.912,1.315 19.568,0 17.925,0C16.282,0 14.938,1.315 14.938,2.923C14.938,3.361 15.087,3.8 15.237,4.238C15.237,4.385 15.237,4.385 15.386,4.53Z" + android:pathData="M22.029,27.966C22.029,27.966 21.084,28.457 21.379,30.583C21.554,31.852 22.414,33.797 22.536,34.2C22.615,34.461 22.773,34.537 22.994,34.695C23.54,35.083 24.367,35.917 22.405,36.467C20.76,36.928 20.014,36.773 20.346,35.794C20.515,35.294 20.595,34.923 20.538,34.399C20.413,33.246 19.597,30.45 18.514,29.695C16.883,28.559 17.432,28.907 17.432,28.907L20.932,26.264L22.029,27.966Z" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#E1A5A5" - android:fillType="nonZero" - android:pathData="M16.432,19C14.788,19 13.445,17.685 13.445,16.077C13.445,14.469 14.789,13.154 16.432,13.154C18.075,13.154 19.419,14.469 19.419,16.077C19.419,17.685 18.075,19 16.432,19Z" + android:pathData="M13.707,3.144C14.349,3.053 15.065,2.835 14.759,3.95C14.652,4.337 14.633,4.712 14.665,5.057C14.749,5.957 15.052,6.451 15.754,7.021L16.293,7.459L12.697,7.78C12.697,7.78 13.337,7.224 13.162,6.301C13.089,5.916 13.03,5.064 12.596,4.747C12.198,4.455 11.37,3.477 13.707,3.144" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#F8E9E9" - android:fillType="nonZero" - android:pathData="M14.938,23.385C14.042,23.385 13.444,22.8 13.444,21.923C13.444,21.046 14.041,20.461 14.938,20.461C15.834,20.461 16.432,21.046 16.432,21.923C16.432,22.8 15.834,23.385 14.938,23.385Z" + android:pathData="M8.06,14.267C7.777,14.068 7.635,13.72 7.704,13.38C7.824,12.788 8.079,11.881 6.905,10.834C5.562,9.636 3.635,8.722 3.475,8.705C2.251,8.569 1.466,8.517 2.81,6.622C4.082,4.829 4.823,4.901 4.946,6.29C4.973,6.591 5.082,6.878 5.261,7.122C5.897,7.992 8.312,10.351 9.951,10.38C10.452,10.391 9.889,12.969 9.889,12.969C9.794,13.622 8.06,14.267 8.06,14.267" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> <path - android:fillColor="#EDC8C8" - android:fillType="nonZero" - android:pathData="M20.166,24.992C18.971,24.992 17.925,23.97 17.925,22.8C17.925,21.63 18.97,20.608 20.166,20.608C21.36,20.608 22.406,21.63 22.406,22.8C22.406,23.97 21.36,24.992 20.166,24.992Z" + android:pathData="M0.018,17.334C0.178,15.863 0.796,15.158 2.107,16.069C4.374,17.646 6.958,15.337 6.958,15.337L7.453,13.98L6.925,20.36C6.925,20.36 5.912,19.005 4.884,18.517C4.385,18.279 2.852,18.065 2.107,18.37C1.301,18.699 -0.182,19.169 0.018,17.334" android:strokeWidth="1" - android:strokeColor="#00000000" /> + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M9.977,25.772C9.977,25.772 8.532,24.337 6.559,25.835C4.586,27.334 4.198,27.751 4.198,27.751C4.198,27.751 2.587,31.021 0.896,28.429C-0.795,25.836 0.596,25.222 2.445,25.652C2.445,25.652 6.276,24.576 6.914,22.501C7.553,20.426 7.21,20.958 7.21,20.958L11.67,24.443L9.977,25.772Z" + android:strokeWidth="1" + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M31.533,10.098C31.811,10.509 32.8,11.922 30.902,11.842C28.424,11.74 27.632,13.911 27.632,13.911L27.198,15.563L24.873,10.738C24.873,10.738 26.323,11.438 27.267,11.266C27.742,11.179 29.058,10.603 29.342,9.969C29.625,9.335 30.191,8.115 31.533,10.098" + android:strokeWidth="1" + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M28.1,17.17C28.1,17.17 28.345,18.941 30.618,18.903C31.898,18.882 32.66,18.904 33.081,18.928C33.352,18.943 34.361,18.937 34.585,18.782C35.138,18.402 36.205,17.913 36.048,19.944C35.916,21.648 35.514,22.295 34.708,21.648C34.297,21.316 33.093,21 32.581,20.873C31.455,20.595 29.599,20.308 28.518,21.066C26.891,22.208 27.406,21.812 27.406,21.812L26.125,17.616L28.1,17.17Z" + android:strokeWidth="1" + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + <path + android:pathData="M18.622,7.498C18.622,7.498 20.516,8.011 21.453,5.725C21.901,4.632 22.254,3.376 22.406,2.945C22.521,2.617 22.568,2.27 22.54,1.924C22.491,1.299 22.657,0.264 24.601,1.28C26.856,2.46 26.144,3.024 25.395,3.323C25.092,3.444 24.825,3.641 24.607,3.885C23.856,4.725 22.258,7.21 22.603,8.81C23.059,10.923 23.092,10.293 23.092,10.293L18.304,9.781L18.622,7.498Z" + android:strokeWidth="1" + android:fillColor="#C00F2D" + android:fillType="evenOdd" + android:strokeColor="#00000000"/> + </group> </vector> diff --git a/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml b/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml index d3d6d9da50d21c1a78a4e59f7305cd635ea45fb0..d06cdb9200e0e17be9a2d49cbc16c86faf412081 100644 --- a/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml +++ b/Corona-Warn-App/src/main/res/drawable/tan_input_digit.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="rectangle"> - <corners android:radius="@dimen/submission_tan_input_digit_radius" /> - <solid android:color="@color/tanInputBackground" /> - </shape> - </item> -</selector> \ No newline at end of file +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="@dimen/submission_tan_input_digit_radius" /> + <gradient + android:angle="90" + android:centerColor="@color/colorSurface2" + android:centerX="0.02" + android:endColor="@color/colorSurface2" + android:startColor="@color/colorTextSemanticNeutral" /> +</shape> \ No newline at end of file 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 0a064e38540b096ef518f01f36c1905b918dc38c..c1c6d292abdb9cbbb7a1f485fb5098ee935908b5 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml @@ -151,6 +151,7 @@ <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/main_test_done" style="@style/card" + android:padding="0dp" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:visibility="@{FormatterSubmissionHelper.formatShowSubmissionDoneCard(submissionViewModel.deviceUiState)}" @@ -159,10 +160,9 @@ app:layout_constraintTop_toBottomOf="@+id/main_tracing_divider"> <include - layout="@layout/include_submission_done" - android:layout_width="0dp" + layout="@layout/include_submission_done_card" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - app:illustrationDescription="@{@string/submission_done_illustration_description}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_contact.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_contact.xml index 18b6108f6eae667fb78fb9e22792054c0fbb07bf..cf0aed7d129ca5836a6cbb3cbc8ae01467f5c488 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_contact.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_contact.xml @@ -47,7 +47,7 @@ <Button android:id="@+id/submission_contact_button_enter" - style="@style/buttonGrey" + style="@style/buttonLight" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:text="@string/submission_contact_button_enter" diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml index 7909a029da7ca852f3042e8443d2cc7142877e37..c34516634469e6e6c94f653d6b9505ab437c53b8 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml @@ -13,101 +13,73 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <TextView - android:id="@+id/submission_dispatcher_title" - style="@style/textTitle" - android:layout_width="0dp" + <include + android:id="@+id/submission_dispatcher_header" + layout="@layout/include_header" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:text="@string/submission_dispatcher_headline" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" - app:layout_constraintTop_toTopOf="@+id/submission_guideline_top" /> + app:icon="@{@drawable/ic_back}" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:title="@{@string/submission_dispatcher_headline}" /> <TextView - android:id="@+id/submission_dispatcher_subtitle" - style="@style/textLargeEmphasized" - android:layout_width="0dp" + android:id="@+id/submission_dispatcher_text" + style="@style/textMultiline" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" android:text="@string/submission_dispatcher_subheadline" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" - app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_title" /> + app:layout_constraintEnd_toStartOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@+id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_header" /> <include android:id="@+id/submission_dispatcher_qr" layout="@layout/include_dispatcher_card" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:layout_marginTop="24dp" + android:layout_marginTop="@dimen/spacing_normal" android:clickable="true" + android:focusable="true" app:body="@{@string/submission_dispatcher_qr_card_text}" app:headline="@{@string/submission_dispatcher_card_qr}" app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" - android:focusable="true" - app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_subtitle" /> + app:layout_constraintEnd_toStartOf="@+id/guideline_card_end" + app:layout_constraintStart_toStartOf="@+id/guideline_card_start" + app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" /> <include android:id="@+id/submission_dispatcher_tan_code" layout="@layout/include_dispatcher_card" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_marginTop="@dimen/spacing_small" app:body="@{@string/submission_dispatcher_tan_code_card_text}" app:headline="@{@string/submission_dispatcher_card_tan_code}" app:illustration="@{@drawable/ic_submission_illustration_tan_code_card}" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" + app:layout_constraintEnd_toStartOf="@+id/guideline_card_end" + app:layout_constraintStart_toStartOf="@+id/guideline_card_start" app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_qr" /> <include android:id="@+id/submission_dispatcher_tan_tele" layout="@layout/include_dispatcher_card" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_marginTop="@dimen/spacing_small" app:body="@{@string/submission_dispatcher_tan_tele_card_text}" app:headline="@{@string/submission_dispatcher_card_tan_tele}" app:illustration="@{@drawable/ic_submission_illustration_tan_hotline_card}" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" + app:layout_constraintEnd_toStartOf="@+id/guideline_card_end" + app:layout_constraintStart_toStartOf="@+id/guideline_card_start" app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@dimen/guideline_start" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_end="@dimen/guideline_bottom" /> + <include layout="@layout/merge_guidelines_side" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_end="@dimen/guideline_end" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_end="@dimen/submission_guideline_button" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_begin="@dimen/guideline_top" /> + <include layout="@layout/merge_guidelines_card" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml index f58cd85b45c3af9ca4ecc30f5177e28feb2b8904..2f825aaac59f9e5337b4d025bf2a41edc049371a 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml @@ -3,30 +3,57 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - <data> - - <import type="de.rki.coronawarnapp.risk.RiskLevelConstants" /> - </data> - <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - tools:context=".ui.submission.SubmissionIntroFragment"> + tools:context=".ui.submission.SubmissionDoneFragment"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> <include - android:id="@+id/submission_done_include" - layout="@layout/include_submission_done" + android:id="@+id/submission_done_header" + layout="@layout/include_header" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + app:icon="@{@drawable/ic_close}" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/submission_done_hero_illustration" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:contentDescription="@string/submission_done_illustration_description" + android:importantForAccessibility="no" + android:src="@drawable/ic_submission_illustration_thanks" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/submission_done_header" /> + + <TextView + android:id="@+id/submission_done_headline" + style="@style/textHeadline" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" + android:text="@string/submission_done_title" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_done_hero_illustration" /> + + <include + android:id="@+id/submission_done_content" + layout="@layout/include_submission_done_content" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - app:illustrationDescription="@{@string/submission_done_illustration_description}" - app:layout_constraintEnd_toStartOf="@+id/guideline_end" - app:layout_constraintStart_toStartOf="@+id/guideline_start" - app:layout_constraintTop_toTopOf="@+id/guideline_top" /> + android:layout_marginTop="@dimen/spacing_normal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/submission_done_headline" /> <Button android:id="@+id/submission_done_button_done" @@ -38,30 +65,10 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline_end" app:layout_constraintStart_toStartOf="@id/guideline_start" - app:layout_constraintTop_toBottomOf="@+id/submission_done_include" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_begin="@dimen/guideline_top" /> + app:layout_constraintTop_toBottomOf="@+id/submission_done_content" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@dimen/guideline_start" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_end="@dimen/guideline_end" /> + <include layout="@layout/merge_guidelines_side" /> </androidx.constraintlayout.widget.ConstraintLayout> - </ScrollView> </layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_intro.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_intro.xml index ab84c15f46e3877e69ef47d1295b76e64422aa43..f9742d587260454a02f77db7738da2988ad8d38f 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_intro.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_intro.xml @@ -16,7 +16,7 @@ <include android:id="@+id/submission_intro_header" layout="@layout/include_header" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" app:icon="@{@drawable/ic_close}" app:layout_constraintEnd_toEndOf="parent" @@ -26,8 +26,8 @@ <include layout="@layout/include_submission_intro" - android:layout_width="0dp" - android:layout_height="0dp" + android:layout_width="@dimen/match_constraint" + android:layout_height="@dimen/match_constraint" app:layout_constraintBottom_toTopOf="@+id/guideline_action" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -36,7 +36,7 @@ <Button android:id="@+id/submission_intro_button_next" style="@style/buttonPrimary" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:text="@string/submission_intro_button_next" android:textAllCaps="true" @@ -45,13 +45,6 @@ app:layout_constraintStart_toStartOf="@id/guideline_start" app:layout_constraintTop_toBottomOf="@id/guideline_action" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_begin="@dimen/guideline_top" /> - <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_action" android:layout_width="wrap_content" @@ -59,26 +52,7 @@ android:orientation="horizontal" app:layout_constraintGuide_end="@dimen/guideline_action" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@dimen/guideline_start" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_end="@dimen/guideline_end" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@dimen/guideline_back" /> + <include layout="@layout/merge_guidelines_side" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml index 6e8d7078984ee785f9af3cb6b0ee93eb1de51a37..a37607c2959952dd9456af5aee7c2cbf2518d1aa 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml @@ -13,103 +13,48 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" + <include + android:id="@+id/submission_positive_other_warning_header" + layout="@layout/include_header" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" + app:icon="@{@drawable/ic_back}" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - <!-- todo separate icon from onboarding? --> - - <include - android:id="@+id/submission_positive_other_warning_header" - layout="@layout/include_information_details_header" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:headline="@{@string/submission_positive_other_warning_headline}" - app:icon="@{@drawable/ic_back}" - app:illustration="@{@drawable/ic_submission_illustration_other_warning}" - app:illustrationDescription="@{@string/submission_positive_other_illustration_description}" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:title="@{@string/submission_positive_other_warning_title}" /> - - <TextView - android:id="@+id/submission_positive_other_warning_body" - style="@style/textMultiline" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:text="@string/submission_positive_other_warning_body" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" - app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_header" - tools:text="@string/submission_positive_other_warning_body" /> - - <TextView - android:id="@+id/submission_positive_other_warning_data_security_body" - style="@style/textMultiline" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/submission_positive_other_warning_data_security_body" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" - app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_body" - tools:text="@string/submission_positive_other_warning_data_security_body" /> - - <Button - android:id="@+id/submission_positive_other_warning_button" - style="@style/buttonPrimary" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:text="@string/submission_positive_other_warning_button" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end" - app:layout_constraintStart_toStartOf="@+id/submission_guideline_start" - app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_data_security_body" /> - - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@dimen/guideline_start" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_end="@dimen/guideline_bottom" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_end="@dimen/guideline_end" /> + app:layout_constraintTop_toTopOf="parent" + app:title="@{@string/submission_positive_other_warning_title}" /> + + <include + layout="@layout/include_submission_positive_other_warning" + android:layout_width="@dimen/match_constraint" + android:layout_height="@dimen/match_constraint" + app:layout_constraintBottom_toTopOf="@+id/guideline_action" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_header" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_end="@dimen/submission_guideline_button" /> + <Button + android:id="@+id/submission_positive_other_warning_button_next" + style="@style/buttonPrimary" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:text="@string/submission_positive_other_warning_button" + android:textAllCaps="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@id/guideline_action" /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_action" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:layout_constraintGuide_end="@dimen/guideline_action" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/submission_guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_begin="@dimen/guideline_top" /> + <include layout="@layout/merge_guidelines_side" /> - </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> - </ScrollView> </layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml index 4786dd44c47475ed2575d249ec352fe5c242899a..623eebcf69203f3e923878300e2944d10a779feb 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml @@ -26,7 +26,7 @@ <include android:id="@+id/submission_tan_header" layout="@layout/include_header" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" app:icon="@{@drawable/ic_close}" app:layout_constraintEnd_toEndOf="parent" @@ -64,6 +64,7 @@ android:text="@string/submission_tan_button_text" android:textAllCaps="true" android:textColor="@{FormatterSubmissionHelper.formatSubmissionTanButtonTextColor(viewmodel.isValidTanFormat())}" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline_end" app:layout_constraintStart_toStartOf="@id/guideline_start" app:layout_constraintTop_toBottomOf="@id/guideline_action" /> diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml index 1a0bbe2b10cab260f269300edb753405292088b8..7b89e45a3c6741e61c4a2913abc9b219b4178ec7 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml @@ -185,7 +185,7 @@ <Button android:id="@+id/submission_test_result_button_negative_remove_test" - style="@style/buttonPrimary" + style="@style/buttonLight" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/spacing_normal" diff --git a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml index ba99f44cd1073f5e35f370bda306622b75dbb22c..1acf04a23de389a5924dc7a9b3d24bdfac6e8911 100644 --- a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml +++ b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml @@ -4,10 +4,6 @@ <data> - <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" /> - - <import type="android.view.View" /> - <variable name="headline" type="String" /> @@ -24,70 +20,60 @@ <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/dispatcher_card" + style="@style/cardGrey" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/dispatcher_card_header" - android:layout_width="0dp" + <TextView + android:id="@+id/dispatcher_card_title" + style="@style/textTitle" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:background="#f5f5f5" - app:layout_constraintEnd_toEndOf="parent" + android:layout_marginStart="@dimen/spacing_normal" + android:layout_marginTop="@dimen/spacing_normal" + android:layout_marginEnd="@dimen/spacing_small" + android:text="@{headline}" + app:layout_constraintEnd_toStartOf="@+id/dispatcher_card_icon" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/dispatcher_card_header_title" - style="@style/textTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="24dp" - android:layout_marginTop="24dp" - android:layout_marginEnd="16dp" - android:text="@{headline}" - app:layout_constraintEnd_toStartOf="@+id/dispatcher_card_header_icon_drilldown" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView - android:id="@+id/dispatcher_card_header_icon_drilldown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:layout_marginEnd="24dp" - android:contentDescription="@string/lorem_ipsum" - android:src="@drawable/ic_icon_drilldowncard_dark" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <include + android:id="@+id/dispatcher_card_icon" + layout="@layout/include_button_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_small" + android:layout_marginEnd="@dimen/spacing_normal" + app:icon="@{@drawable/ic_icon_drilldowncard_dark}" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/submission_dispatcher_card_text" - style="@style/textMultiline" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="24dp" - android:layout_marginTop="24dp" - android:layout_marginBottom="24dp" - android:text="@{body}" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/dispatcher_card_illustration" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/dispatcher_card_header_title" /> + <TextView + android:id="@+id/submission_dispatcher_card_text" + style="@style/textMultiline" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacing_normal" + android:layout_marginTop="@dimen/spacing_normal" + android:layout_marginBottom="@dimen/spacing_normal" + android:text="@{body}" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/dispatcher_card_illustration" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/dispatcher_card_title" /> - <ImageView - android:id="@+id/dispatcher_card_illustration" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:contentDescription="@string/lorem_ipsum" - android:src="@{illustration}" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/dispatcher_card_header_icon_drilldown" /> + <ImageView + android:id="@+id/dispatcher_card_illustration" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/button_icon_margin" + android:contentDescription="@string/lorem_ipsum" + android:src="@{illustration}" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/dispatcher_card_icon" /> - </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> </layout> diff --git a/Corona-Warn-App/src/main/res/layout/include_further_info.xml b/Corona-Warn-App/src/main/res/layout/include_further_info.xml new file mode 100644 index 0000000000000000000000000000000000000000..993da849e5398a61d5e58e42ca40726e5377e7ae --- /dev/null +++ b/Corona-Warn-App/src/main/res/layout/include_further_info.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/further_info" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/colorSurface2" + android:padding="@dimen/spacing_normal" + app:layout_constraintTop_toTopOf="parent"> + + <TextView + android:id="@+id/further_info_title" + style="@style/textTitleLarger" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:text="@string/submission_done_further_info_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/further_info_text" + style="@style/textMultiline" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacing_normal" + android:layout_marginTop="@dimen/spacing_normal" + android:text="@string/submission_done_further_info_enum" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/further_info_title" /> + + </androidx.constraintlayout.widget.ConstraintLayout> +</layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/include_privacy_card.xml b/Corona-Warn-App/src/main/res/layout/include_privacy_card.xml new file mode 100644 index 0000000000000000000000000000000000000000..843f6b476ed02f161b9f12ccc1adb8604ad2e2fa --- /dev/null +++ b/Corona-Warn-App/src/main/res/layout/include_privacy_card.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/privacy_card" + style="@style/cardGrey" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="@dimen/spacing_normal" + app:layout_constraintTop_toTopOf="parent"> + + <TextView + android:id="@+id/privacy_card_title" + style="@style/textTitle" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:text="@string/submission_positive_other_warning_privacy_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/privacy_card_text" + style="@style/textMultiline" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" + android:text="@string/submission_positive_other_warning_privacy_body" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/privacy_card_title" /> + + </androidx.constraintlayout.widget.ConstraintLayout> +</layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml index 29e22f9867ad95a13b80347544cbae5905c74629..41d9b1a6bb33400587b06fc1d7c10d2436b5c3f2 100644 --- a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml +++ b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml @@ -68,6 +68,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + <TextView android:id="@+id/submission_contact_step_1_number" style="@style/textTitle" @@ -80,6 +81,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/submission_contact_step_1_body" /> + <TextView + android:id="@+id/submission_contact_operating_hours_body" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_small" + android:text="@string/submission_contact_operating_hours_body" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/submission_contact_step_1_number" /> + </androidx.constraintlayout.widget.ConstraintLayout> </de.rki.coronawarnapp.ui.view.StepEntry> diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml new file mode 100644 index 0000000000000000000000000000000000000000..fa69c4a3f311924e8e2451df9722de98152ff9b0 --- /dev/null +++ b/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/submission_done_card_title" + style="@style/textTitleLarger" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacing_normal" + android:layout_marginTop="@dimen/spacing_normal" + android:layout_marginEnd="@dimen/spacing_small" + android:text="@string/submission_done_title" + app:layout_constraintEnd_toStartOf="@+id/submission_done_card__icon" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <include + android:id="@+id/submission_done_card__icon" + layout="@layout/include_button_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" + android:layout_marginEnd="@dimen/spacing_normal" + app:icon="@{@drawable/ic_icon_drilldowncard_dark}" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/submission_done_card_illustration" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_tiny" + android:contentDescription="@string/submission_done_illustration_description" + android:importantForAccessibility="no" + android:src="@drawable/ic_submission_illustration_thanks" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/submission_done_card_title" /> + + + <include + android:id="@+id/submission_done_card_content" + layout="@layout/include_submission_done_content" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/submission_done_card_illustration" /> + + </androidx.constraintlayout.widget.ConstraintLayout> +</layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml similarity index 61% rename from Corona-Warn-App/src/main/res/layout/include_submission_done.xml rename to Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml index 3bd82a7c029ddc68f0ff7ca3114c7d386e0a2a0a..a93ed5b0b1fc545a0b612af8a27021bcb17955d4 100644 --- a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml +++ b/Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml @@ -3,52 +3,45 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <data> - <import type="de.rki.coronawarnapp.risk.RiskLevelConstants" /> - <variable - name="illustrationDescription" - type="String" /> + <import type="de.rki.coronawarnapp.risk.RiskLevelConstants" /> </data> - <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <include - android:id="@+id/submission_done_header" - layout="@layout/include_information_details_header" + <TextView + android:id="@+id/submission_done_text" + style="@style/textMultiline" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - app:title="@{@string/submission_done_title}" - app:body="@{@string/submission_done_body}" - app:illustration="@{@drawable/ic_submission_illustration_thanks}" - app:illustrationDescription="@{illustrationDescription}" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + android:text="@string/submission_done_body" + app:layout_constraintEnd_toEndOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@+id/guideline_start" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/submission_done_subtitle" - style="@style/textSubTitle" + style="@style/textTitleLarger" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacing_normal" android:text="@string/submission_done_subtitle" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/submission_done_header" /> + app:layout_constraintEnd_toEndOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@+id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_done_text" /> <include - android:id="@+id/submission_done_contagious" + android:id="@+id/submission_done_contact" layout="@layout/include_risk_details_behavior_row" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacing_normal" - app:body="@{@string/submission_done_contagious}" - app:icon="@{@drawable/ic_risk_card_contact_increased}" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:body="@{@string/submission_done_contact}" + app:icon="@{@drawable/ic_risk_details_contact}" + app:layout_constraintEnd_toEndOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@+id/guideline_start" app:layout_constraintTop_toBottomOf="@+id/submission_done_subtitle" app:riskLevel="@{RiskLevelConstants.INCREASED_RISK}" /> @@ -60,10 +53,21 @@ android:layout_marginTop="@dimen/spacing_normal" app:body="@{@string/submission_done_isolate}" app:icon="@{@drawable/ic_risk_details_home}" + app:layout_constraintEnd_toEndOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@+id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_done_contact" + app:riskLevel="@{RiskLevelConstants.INCREASED_RISK}" /> + + <include + layout="@layout/include_further_info" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/submission_done_contagious" - app:riskLevel="@{RiskLevelConstants.INCREASED_RISK}" /> + app:layout_constraintTop_toBottomOf="@+id/submission_done_isolate" /> + + <include layout="@layout/merge_guidelines_side" /> </androidx.constraintlayout.widget.ConstraintLayout> </layout> \ No newline at end of file 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 40caa2885b533cbafd2bfe97f6213dd2ffe03860..af6624e0114bde576dec6bd5d8e41fa01cf5be60 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 @@ -11,55 +11,51 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <include - android:id="@+id/submission_intro_information_details" - layout="@layout/include_information_details" - android:layout_width="0dp" + <ImageView + android:id="@+id/submission_intro_hero_illustration" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - app:body="@{@string/submission_intro_text_a}" - app:headline="@{@string/submission_intro_headline}" - app:illustration="@{@drawable/ic_submission_illustration_intro_a}" + android:importantForAccessibility="no" + android:src="@drawable/ic_submission_illustration_intro_a" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <ImageView - android:id="@+id/submission_intro_imageview_illustration_b" - android:layout_width="0dp" + <TextView + android:id="@+id/submission_intro_headline" + style="@style/textHeadline" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_normal" - android:src="@drawable/ic_submission_illustration_intro_b" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/submission_intro_information_details" /> + android:text="@string/submission_intro_headline" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_intro_hero_illustration" /> <TextView - android:id="@+id/submission_intro_textview_text_b" + android:id="@+id/submission_intro_text" style="@style/textMultiline" - android:layout_width="0dp" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacing_normal" - android:paddingBottom="@dimen/spacing_normal" - android:text="@string/submission_intro_text_b" - app:layout_constraintEnd_toStartOf="@+id/guideline_end" - app:layout_constraintStart_toStartOf="@+id/guideline_start" - app:layout_constraintTop_toBottomOf="@id/submission_intro_imageview_illustration_b" /> + android:text="@string/submission_intro_text" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_intro_headline" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_start" - android:layout_width="wrap_content" + <TextView + android:id="@+id/submission_intro_text_enum" + style="@style/textMultiline" + android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_begin="@dimen/guideline_start" /> + android:layout_marginStart="@dimen/spacing_normal" + android:paddingBottom="@dimen/spacing_normal" + android:text="@string/submission_intro_enum" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_intro_text" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_end="@dimen/guideline_end" /> + <include layout="@layout/merge_guidelines_side" /> </androidx.constraintlayout.widget.ConstraintLayout> - </ScrollView> </layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml new file mode 100644 index 0000000000000000000000000000000000000000..9b839fb34bb60cd22686b4d8777af2d9d83f7cae --- /dev/null +++ b/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <ScrollView + style="@style/fadingScrollView" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/submission_positive_other_warning_hero_illustration" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:contentDescription="@string/submission_positive_other_illustration_description" + android:importantForAccessibility="no" + android:src="@drawable/ic_submission_illustration_other_warning" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/submission_positive_other_warning_headline" + style="@style/textTitleLarger" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:text="@string/submission_positive_other_warning_headline" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_hero_illustration" /> + + <TextView + android:id="@+id/submission_positive_other_warning_text" + style="@style/textMultiline" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" + android:text="@string/submission_positive_other_warning_body" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_headline" /> + + <include + android:id="@+id/submission_positive_other_privacy" + layout="@layout/include_privacy_card" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" + app:layout_constraintEnd_toStartOf="@+id/guideline_card_end" + app:layout_constraintStart_toStartOf="@+id/guideline_card_start" + app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_text" /> + + <include layout="@layout/merge_guidelines_side" /> + + <include layout="@layout/merge_guidelines_card" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </ScrollView> +</layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml index 4ea2ee7406aa1fea61df540b65c2abcff4506247..d865fc4c82881333e4ce227de95b47b4a063abab 100644 --- a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml +++ b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml @@ -19,7 +19,7 @@ <TextView android:id="@+id/submission_status_card_content_title" - style="@style/textTitle" + style="@style/textTitleLarger" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:text="@{FormatterSubmissionHelper.formatSubmissionStatusCardContentTitleText(deviceUIState)}" diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_fetching.xml b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_fetching.xml index fa86d9e570a8e5856df3eed797b8d30232790c11..f1318cf35f7d4aa00b87faeef9a5e01d6ff4c40e 100644 --- a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_fetching.xml +++ b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_fetching.xml @@ -10,7 +10,7 @@ <TextView android:id="@+id/submission_status_card_fetching_title" - style="@style/textTitle" + style="@style/textTitleLarger" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:text="@string/submission_status_card_title_fetching" diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_positive.xml b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_positive.xml index 2d6874951377491f894a7838f93031955b5f854a..ee1cbe905dbf90f8cde192149f0adfafe99a6a5c 100644 --- a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_positive.xml +++ b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_positive.xml @@ -30,7 +30,7 @@ <TextView android:id="@+id/submission_status_card_positive_title" - style="@style/textTitle" + style="@style/textTitleLarger" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" android:text="@string/submission_status_card_positive_result_title" diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml index 57e9e70d645f487bb9f1559568af2f4f928b8e93..275dda56f682daf33b3e09f659f93dff14e2020a 100644 --- a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml +++ b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml @@ -10,9 +10,10 @@ <TextView android:id="@+id/submission_status_card_unregistered_title" - style="@style/textTitle" + style="@style/textTitleLarger" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/spacing_small" android:text="@string/submission_status_card_title_unregistered" app:layout_constraintEnd_toStartOf="@+id/submission_status_card_unregistered_icon" app:layout_constraintStart_toStartOf="parent" @@ -23,23 +24,24 @@ android:id="@+id/submission_status_card_unregistered_body" style="@style/textMultiline" android:layout_width="@dimen/match_constraint" - android:layout_marginBottom="@dimen/spacing_normal" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_normal" + android:layout_marginEnd="@dimen/spacing_small" android:text="@string/submission_status_card_body_unregistered" - app:layout_constraintBottom_toTopOf="@+id/submission_status_card_unregistered_button" app:layout_constraintEnd_toStartOf="@+id/submission_status_card_unregistered_icon" - app:layout_constraintStart_toStartOf="@+id/submission_status_card_unregistered_title" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/submission_status_card_unregistered_title" /> <Button android:id="@+id/submission_status_card_unregistered_button" + style="@style/buttonPrimary" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - style="@style/buttonPrimary" android:layout_marginTop="@dimen/spacing_normal" android:text="@string/submission_status_card_button_unregistered" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/submission_status_card_unregistered_icon" /> + app:layout_constraintTop_toBottomOf="@+id/submission_status_card_unregistered_barrier" /> <ImageView android:id="@+id/submission_status_card_unregistered_icon" @@ -48,5 +50,12 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/submission_status_card_unregistered_title" app:srcCompat="@drawable/ic_main_illustration_untested" /> + + <androidx.constraintlayout.widget.Barrier + android:id="@+id/submission_status_card_unregistered_barrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="bottom" + app:constraint_referenced_ids="submission_status_card_unregistered_icon,submission_status_card_unregistered_body" /> </androidx.constraintlayout.widget.ConstraintLayout> </layout> \ No newline at end of file diff --git a/Corona-Warn-App/src/main/res/layout/merge_guidelines_card.xml b/Corona-Warn-App/src/main/res/layout/merge_guidelines_card.xml new file mode 100644 index 0000000000000000000000000000000000000000..9836dcaf8cf4c7abb7ea326aa360db69c0f5518b --- /dev/null +++ b/Corona-Warn-App/src/main/res/layout/merge_guidelines_card.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout> + + <merge xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_card_start" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + app:layout_constraintGuide_begin="@dimen/guideline_card" /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_card_end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + app:layout_constraintGuide_end="@dimen/guideline_card" /> + + </merge> + +</layout> diff --git a/Corona-Warn-App/src/main/res/layout/merge_guidelines_side.xml b/Corona-Warn-App/src/main/res/layout/merge_guidelines_side.xml new file mode 100644 index 0000000000000000000000000000000000000000..71002eda70e3121bfad385e738a2a31748edcb47 --- /dev/null +++ b/Corona-Warn-App/src/main/res/layout/merge_guidelines_side.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout> + + <merge xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_start" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + app:layout_constraintGuide_begin="@dimen/guideline_start" /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline_end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + app:layout_constraintGuide_end="@dimen/guideline_end" /> + + </merge> + +</layout> diff --git a/Corona-Warn-App/src/main/res/values-night/colors.xml b/Corona-Warn-App/src/main/res/values-night/colors.xml index d8105b64e9a475b147ba29a8130fb4d303ac9dc4..30f965566d38bb67a08ded900d6fc070df83f470 100644 --- a/Corona-Warn-App/src/main/res/values-night/colors.xml +++ b/Corona-Warn-App/src/main/res/values-night/colors.xml @@ -1,12 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- TODO: Add variables when colors are final to reduce maintenance --> + <!-- Brand Colors --> + <color name="colorBrandPrimary">#D13F3F</color> + <color name="colorBrandSecondary">#80CDEC</color> + <color name="colorBrandTertiary">#994866</color> + + <!-- Backgrounds and Separators --> + <color name="colorBackground">#000000</color> + <color name="colorSurface1">#232324</color> + <color name="colorSurface2">#434445</color> + <color name="colorHairline">#4DFFFFFF</color> + + <!-- Text --> + <color name="colorTextPrimary1">#FFFFFF</color> + <color name="colorTextPrimary2">#99FFFFFF</color> + <color name="colorTextPrimary3">#4DFFFFFF</color> + <color name="colorTextEmphasizedButton">#FFFFFF</color> + <color name="colorTextSemanticRed">#FF919A</color> + <color name="colorTextSemanticGreen">#6ACC8B</color> + <color name="colorTextSemanticNeutral">#B8C8D9</color> + <color name="colorTextTint">#83D2F2</color> - <!-- TODO: green, blue, etc. should be exchanged by meaningful colors when they are final --> - <!-- Status Colors --> - <color name="colorGreen">#2E854B</color> - <color name="colorRed">#C4314A</color> + <!-- Accent --> + <color name="colorAccentTintButton">#007FAD</color> + <color name="colorAccentTintIcon">#83D2F2</color> + + <!-- Semantic --> + <color name="colorSemanticHighRisk">#C4314A</color> + <color name="colorSemanticLowRisk">#378250</color> + <color name="colorSemanticNeutralRisk">#5D6E80</color> + + <!-- TODO: Add variables when colors are final to reduce maintenance --> <!-- App Color --> <color name="appTheme">#000000</color> @@ -17,9 +42,7 @@ <color name="colorTransparent">#00FFFFFF</color> <!-- Risk Card Colors --> - <color name="colorRiskCardIncreasedRisk">#C4314A</color> <color name="colorRiskCardIncreasedRiskPressed">#A30C26</color> - <color name="colorRiskCardLowRisk">#2E854B</color> <color name="colorRiskCardLowRiskPressed">#27713F</color> <color name="colorRiskCardNoCalculationPossible">@color/colorLight</color> <color name="colorRiskCardNoCalculationPossiblePressed">@color/colorGreyLight</color> @@ -38,7 +61,6 @@ <color name="textColorPrimary">#ffffff</color> <color name="textColorSecondary">#DFD8D8</color> <color name="textColorLight">#ffffff</color> - <color name="textColorRed">#C4314A</color> <color name="textColorBlue">#2C79A9</color> <color name="textColorGrey">#D3D3D3</color> diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml index 2aa9213fc8329ceec56980388f2256ecaf785e26..f5af0a8af42ffdfcd81257927cf8ea411b4c9aac 100644 --- a/Corona-Warn-App/src/main/res/values/colors.xml +++ b/Corona-Warn-App/src/main/res/values/colors.xml @@ -1,12 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- TODO: Add variables when colors are final to reduce maintenance --> + <!-- Brand Colors --> + <color name="colorBrandPrimary">#BD1200</color> + <color name="colorBrandSecondary">#80CDEC</color> + <color name="colorBrandTertiary">#59112B</color> + + <!-- Backgrounds and Separators --> + <color name="colorBackground">#FFFFFF</color> + <color name="colorSurface1">#FFFFFF</color> + <color name="colorSurface2">#F5F5F5</color> + <color name="colorHairline">#3317191A</color> + + <!-- Text --> + <color name="colorTextPrimary1">#17191A</color> + <color name="colorTextPrimary2">#9917191A</color> + <color name="colorTextPrimary3">#4D17191A</color> + <color name="colorTextEmphasizedButton">#FFFFFF</color> + <color name="colorTextSemanticRed">#C00F2D</color> + <color name="colorTextSemanticGreen">#2E854B</color> + <color name="colorTextSemanticNeutral">#5D6E80</color> + <color name="colorTextTint">#007FAD</color> - <!-- TODO: green, blue, etc. should be exchanged by meaningful colors when they are final --> - <!-- Status Colors --> - <color name="colorGreen">#2E854B</color> - <color name="colorRed">#C00F2D</color> + <!-- Accent --> + <color name="colorAccentTintButton">#007FAD</color> + <color name="colorAccentTintIcon">#007FAD</color> + + <!-- Semantic --> + <color name="colorSemanticHighRisk">#C00F2D</color> + <color name="colorSemanticLowRisk">#2E854B</color> + <color name="colorSemanticNeutralRisk">#5D6E80</color> + + <!-- TODO: Add variables when colors are final to reduce maintenance --> <!-- App Color --> <color name="appTheme">#ffffff</color> @@ -17,9 +42,9 @@ <color name="colorTransparent">#00FFFFFF</color> <!-- Risk Card Colors --> - <color name="colorRiskCardIncreasedRisk">#C00F2D</color> + <color name="colorRiskCardIncreasedRisk">@color/colorSemanticHighRisk</color> <color name="colorRiskCardIncreasedRiskPressed">#A30C26</color> - <color name="colorRiskCardLowRisk">#2E854B</color> + <color name="colorRiskCardLowRisk">@color/colorSemanticLowRisk</color> <color name="colorRiskCardLowRiskPressed">#27713F</color> <color name="colorRiskCardNoCalculationPossible">@color/colorLight</color> <color name="colorRiskCardNoCalculationPossiblePressed">@color/colorGreyLight</color> @@ -39,7 +64,6 @@ <color name="textColorPrimary">#000000</color> <color name="textColorSecondary">#333333</color> <color name="textColorLight">#ffffff</color> - <color name="textColorRed">#C00F2D</color> <color name="textColorBlue">#2C79A9</color> <color name="textColorGrey">#747576</color> diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml index 8ce610c0aef2f9885b4b56a4a15aa5a175a56720..141c37f5ef19bd94a32cd72e2a047749c7a274d0 100644 --- a/Corona-Warn-App/src/main/res/values/dimens.xml +++ b/Corona-Warn-App/src/main/res/values/dimens.xml @@ -2,16 +2,22 @@ <!-- spacing, used as reference for everything else --> <dimen name="spacing_large">48dp</dimen> <dimen name="spacing_normal">24dp</dimen> - <dimen name="spacing_small">12dp</dimen> + <dimen name="spacing_small">16dp</dimen> <dimen name="spacing_tiny">6dp</dimen> <dimen name="spacing_mega_tiny">3dp</dimen> <!-- font sizes --> + <dimen name="font_largest">34sp</dimen> <dimen name="font_larger">24sp</dimen> <dimen name="font_large">18sp</dimen> <dimen name="font_normal">16sp</dimen> <dimen name="font_small">12sp</dimen> + <dimen name="font_button">14sp</dimen> + <dimen name="font_title">20sp</dimen> + + <dimen name="font_line_spacing_extra">4sp</dimen> + <!-- header height --> <dimen name="header">50dp</dimen> @@ -20,11 +26,12 @@ <dimen name="elevation_weak">4dp</dimen> <!-- default spacing for guidelines --> + <dimen name="guideline_card">12dp</dimen> <dimen name="guideline_start">@dimen/spacing_normal</dimen> <dimen name="guideline_end">@dimen/spacing_normal</dimen> <dimen name="guideline_top">@dimen/spacing_normal</dimen> <dimen name="guideline_bottom">@dimen/spacing_normal</dimen> - <dimen name="guideline_action">90dp</dimen> + <dimen name="guideline_action">72dp</dimen> <dimen name="guideline_action_large">150dp</dimen> <dimen name="guideline_body_title">45dp</dimen> <dimen name="guideline_back">14dp</dimen> <!-- guideline_start - button_icon_padding --> @@ -45,7 +52,7 @@ <!-- general --> <dimen name="radius_button">@dimen/spacing_tiny</dimen> - <dimen name="radius_card">@dimen/spacing_tiny</dimen> + <dimen name="radius_card">4dp</dimen> <dimen name="icon_size">20dp</dimen> <dimen name="icon_size_risk_card">35dp</dimen> <dimen name="icon_size_main_card">35dp</dimen> diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index ef7e771d6fa9367c8d75b8021edb041e8f966a08..cf88f77f96d219af3e1eb3834bd8aac72e4d88c8 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -603,7 +603,7 @@ <!-- XHED: Page headline for invalid test result screen --> <string name="submission_test_result_invalid_steps_invalid_heading">Ihr Test-Ergebnis</string> <!-- YTXT: Body text for next steps section of invalid test result--> - <string name="submission_test_result_invalid_steps_invalid_body">Es gab ein Problem bei der Auswertung Ihres Tests. Bitte kontaktieren Sie das Gesundheitsamt um Information zum weiteren Vorgehen zu erhalten. Bitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können.</string> + <string name="submission_test_result_invalid_steps_invalid_body">Es gab ein Problem bei der Auswertung Ihres Tests. Bitte kontaktieren Sie das Gesundheitsamt um Information zum weiteren Vorgehen zu erhalten.\n\nBitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können.</string> <!-- XBUT: invalid test result : remove the test button --> <string name="submission_test_result_invalid_remove_test_button">Test entfernen</string> <!-- XHED: Dialog title for tracing required dailog --> @@ -626,10 +626,10 @@ <string name="submission_intro_title">Wurden Sie getestet?</string> <!-- XHED: Page headline for menu the at start of the submission process --> <string name="submission_intro_headline">So funktionert das Corona-Warn-System</string> - <!-- YTXT: submission introduction text part 1 --> - <string name="submission_intro_text_a">Damit die Corona-Warn-App funktioniert, sind wir auf die Mithilfe von Corona-positiven Personen angewiesen.</string> - <!-- YTXT: submission introduction text part 2 --> - <string name="submission_intro_text_b">Da nur verschlüsselte Zufallscodes ausgetauscht werden, bleiben Sie unerkannt. Sie können jetzt wie folgt vorgehen:</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> + <!-- YTXT: submission introduction enumeration --> + <string name="submission_intro_enum"><li>Wenn Sie positiv getestet wurden, können Sie andere warnen.</li>\n\n<li>Wenn Ihnen für einen positiven Test eine TAN mitgeteilt wurde , können Sie diese für die Registrierung des Tests nutzen.</li>\n\n<li>Wenn Sie keine TAN haben, können Sie diese telefonisch anfragen.</li></string> <!-- XBUT: Submission introduction next button--> <string name="submission_intro_button_next">Weiter</string> @@ -658,7 +658,7 @@ <!-- YTXT: Dispatcher text for TAN code option --> <string name="submission_dispatcher_card_tan_code">TAN-Code</string> <!-- YTXT: Body text for TAN code dispatcher option --> - <string name="submission_dispatcher_tan_code_card_text">Registrieren Sie Ihren Test per manuekker TAN Eingabe</string> + <string name="submission_dispatcher_tan_code_card_text">Registrieren Sie Ihren Test per manueller TAN Eingabe</string> <!-- YTXT: Dispatcher text for TELE-TAN option --> <string name="submission_dispatcher_card_tan_tele">Noch keine TAN?</string> <!-- YTXT: Body text for TELE_TAN dispatcher option --> @@ -671,7 +671,10 @@ <string name="submission_positive_other_warning_headline">Helfen Sie mit!</string> <!-- YTXT: Body text for the positive result additional warning page--> <string name="submission_positive_other_warning_body">Als Nächstes können Sie dafür sorgen, dass das Corona-Warn-System Ihre lokal gespeicherten Zufallscodes der letzten 14 Tage an andere verteilt. So können Sie Ihre Mitmenschen warnen und helfen, die Infektionskette zu unterbrechen. \n\n Da nur unpersönliche Zufallscodes übertragen werden, bleibt Ihre Identität unbekannt.</string> - <string name="submission_positive_other_warning_data_security_body">+Data-Security Text</string> + <!-- XHED: Title for the privacy card--> + <string name="submission_positive_other_warning_privacy_title">Datenschutz</string> + <!-- YTXT: Body text for the privacy card--> + <string name="submission_positive_other_warning_privacy_body">Ich willige hiermit ein, dass mein positiver Corona-Befund an das Tracing Backend übermittelt und dazu genutzt wird, andere App Nutzer auf ein mögliches Infektionsrisiko hinzuweisen. Dabei werden die auf meinem Gerät gespeicherten Temporary Exposure Keys an das Tracing Backend übermittelt und dort anderen Nutzern der App zur Verfügung gestellt. Ich kann meine Einwilligung jederzeit mit Wirkung für die Zukunft widerrufen. Ein Widerruf lässt die Rechtmäßigkeit der Verarbeitung bis zum Widerruf unberührt.\n\nWeitere Informationen finden Sie in unserer Datenschutzhinweisen.</string> <!-- XBUT: other warning continue button --> <string name="submission_positive_other_warning_button">Weiter</string> <!-- XHED: Dialog title for positive other warning dialog --> @@ -699,6 +702,12 @@ <string name="submission_done_contagious">Sie sind ansteckend.</string> <!-- YTXT: text after submission: isolate --> <string name="submission_done_isolate">Bitte isolieren Sie sich von anderen Personen.</string> + <!-- YTXT: text after submission: contact --> + <string name="submission_done_contact">Das Gesundheitsamt wird sich in den nächsten Tagen telefonisch oder schriftlich bei Ihnen melden.</string> + <!-- XHED: Title for further info --> + <string name="submission_done_further_info_title">Weitere Infos:</string> + <!-- YTXT: Content for further info --> + <string name="submission_done_further_info_enum"><li>Ihre Quarantänezeit beträgt im Regelfall 14 Tage. Beobachten und erfassen Sie genau, wie sich ihre Krankheitszeichen entwickeln.</li>\n\n<li>Sie werden von Ihrem Gesundheitsamt gebeten, eine Liste Ihrer Kontaktpersonen zu erstellen. Dabei sollen alle Personen erfasst werden, mit denen Sie in den zwei Tagen vor Erkrankungsbeginn engen Kontakt (unter 2 Meter, direktes Gespräch) über insgesamt 15 Minuten hatten.</li>\n\n<li>Bitte denken Sie hier auch besonders an Personen, die nicht automatisch durch die App informiert werden, da sie kein Smartphone oder die App haben.</li>\n\n<li>Auch wenn Sie keine Krankheitszeichen mehr haben und sich wieder gesund fühlen, könnten Sie noch ansteckend sein.</li></string> <!-- XBUT: submission finished button --> <string name="submission_done_button_done">Fertig</string> <!-- XACT: submission finished - illustration description, explanation image --> @@ -718,9 +727,12 @@ <!-- YTXT: Body text for step 1 of contact page --> <string name="submission_contact_step_1_body"><![CDATA[Hotline anrufen & TAN erfragen:]]></string> <!-- XLNK: Button / hyperlink to phone call for TAN contact page --> - <string name="submission_contact_number">0800 7540002</string> + <string name="submission_contact_number">+49 (0) 800 7540002</string> <!-- YTXT: Body text for step 2 of contact page--> <string name="submission_contact_step_2_body">Test per TAN-Eingabe in der App registrieren</string> + <!-- YTXT: Body text for operating hours in contact page--> + <string name="submission_contact_operating_hours_body">Unsere Öffnungszeiten:\nMo - Fr: 08:00 - 22:00 Uhr\nSa - So: 10:00 - 22:00 Uhr\nEs gelten die Preise Ihres\nTelefonanbieters.</string> + <!-- Submission Status Card --> <!-- XHED: Page title for the various submission status: fetching --> diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml index 285842c941ed470778d627f6579b51f3755c3ced..9140f7997ec969904ef0a5676de12a9f6e558bc2 100644 --- a/Corona-Warn-App/src/main/res/values/styles.xml +++ b/Corona-Warn-App/src/main/res/values/styles.xml @@ -36,11 +36,13 @@ <item name="android:paddingEnd">@dimen/button_padding_start_end</item> <item name="android:paddingBottom">@dimen/button_padding_top_bottom</item> <item name="android:background">@drawable/button</item> + <item name="android:textSize">@dimen/font_button</item> + <item name="android:fontFamily">sans-serif-medium</item> </style> <style name="buttonPrimary" parent="@style/button"> - <item name="android:textColor">@color/textColorLight</item> - <item name="android:backgroundTint">@color/button_primary</item> + <item name="android:textColor">@color/colorTextEmphasizedButton</item> + <item name="android:backgroundTint">@color/colorAccentTintButton</item> </style> <style name="buttonReset" parent="@style/button"> @@ -97,7 +99,7 @@ </style> <style name="rowDanger" parent="row"> - <item name="android:textColor">@color/colorRed</item> + <item name="android:textColor">@color/colorTextSemanticRed</item> <item name="android:background">@drawable/row</item> <item name="android:backgroundTint">@color/button_light</item> </style> @@ -118,11 +120,6 @@ <item name="android:backgroundTint">@color/colorGreyLight</item> </style> <!-- todo unify padding with main card - tbr --> - <style name="cardSubmission"> - <item name="android:background">@drawable/card</item> - <item name="android:backgroundTint">@color/card_light</item> - <item name="android:elevation">@dimen/elevation_strong</item> - </style> <style name="cardHeadline" parent="@style/Widget.AppCompat.TextView"> <item name="android:textSize">@dimen/font_larger</item> @@ -140,14 +137,29 @@ <item name="android:textColor">@color/textColorSecondary</item> </style> + <style name="cardGrey"> + <item name="android:background">@drawable/card</item> + <item name="android:backgroundTint">@color/colorSurface2</item> + </style> + <!-- #################################### Text ###################################### --> <style name="textTitle" parent="@style/TextAppearance.AppCompat.Headline"> + <item name="android:textSize">@dimen/font_title</item> + <item name="android:textColor">@color/colorTextPrimary1</item> + <item name="android:fontFamily">sans-serif-medium</item> + </style> + + <style name="textTitleLarger"> <item name="android:textSize">@dimen/font_larger</item> - <item name="android:textColor">@color/textColorPrimary</item> - <item name="android:textStyle">bold</item> + <item name="android:textColor">@color/colorTextPrimary1</item> + <item name="android:fontFamily">sans-serif</item> + </style> + + <style name="textHeadline" parent="textTitleLarger"> + <item name="android:textSize">@dimen/font_largest</item> </style> <style name="textSubTitle" parent="textTitle" /> @@ -157,7 +169,10 @@ </style> <style name="textMultiline" parent="@style/TextAppearance.AppCompat.Body1"> - <item name="android:textColor">@color/textColorSecondary</item> + <item name="android:textColor">@color/colorTextPrimary1</item> + <item name="android:textSize">@dimen/font_normal</item> + <item name="android:fontFamily">sans-serif</item> + <item name="android:lineSpacingExtra">@dimen/font_line_spacing_extra</item> </style> <style name="textLargeEmphasized" parent="@style/TextAppearance.AppCompat.Headline"> @@ -176,7 +191,7 @@ <style name="textDanger"> <item name="android:textSize">@dimen/font_normal</item> - <item name="android:textColor">@color/colorRed</item> + <item name="android:textColor">@color/colorTextSemanticRed</item> </style> <style name="textLink" parent="@style/textMultilineEmphasized">