AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Advanced whatsnew for 10.2

Browse source
This commit is contained in:
alexzatsepin 2020-08-24 14:28:05 +03:00 • committed by Maksim Andrianov
parent 06630df57c
commit 66bc5e4a62
8 changed files with 357 additions and 515 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

252
android/res/drawable/ic_img_whatsnew_trial.xml Normal file
View file

@ -0,0 +1,252 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="240dp"
android:height="240dp"
android:viewportWidth="240"
android:viewportHeight="240">
<group>
<clip-path
android:pathData="M0,33h240v173.854h-240z"/>
<path
android:pathData="M94.595,44.21H149.385C152.517,44.21 155.005,41.693 155.005,38.561C155.005,35.429 152.488,32.912 149.385,32.912H94.595C91.463,32.912 88.976,35.429 88.976,38.561C88.976,41.693 91.463,44.21 94.595,44.21ZM178.624,66.746H175.083C171.951,66.746 169.463,69.263 169.463,72.395C169.463,75.527 171.98,78.044 175.083,78.044H207.278C210.41,78.044 212.897,80.561 212.897,83.693C212.897,86.824 210.38,89.341 207.278,89.341H201.073C197.941,89.341 195.454,91.858 195.454,94.99C195.454,98.122 197.971,100.639 201.073,100.639H229.112C232.244,100.639 234.732,103.156 234.732,106.288C234.732,109.42 232.215,111.937 229.112,111.937H225.571C222.439,111.937 219.951,114.454 219.951,117.585C219.951,120.717 222.468,123.234 225.571,123.234H234.468C237.6,123.234 240.088,125.751 240.088,128.883C240.088,132.015 237.571,134.532 234.468,134.532H228.263C225.132,134.532 222.644,137.049 222.644,140.18C222.644,143.312 225.161,145.829 228.263,145.829H229.112C232.244,145.829 234.732,148.346 234.732,151.478C234.732,154.61 232.215,157.127 229.112,157.127H215.18C212.049,157.127 209.561,159.644 209.561,162.776C209.561,165.907 212.078,168.424 215.18,168.424H224.078C227.21,168.424 229.697,170.941 229.697,174.073C229.697,177.205 227.18,179.722 224.078,179.722H217.873C214.741,179.722 212.254,182.239 212.254,185.371C212.254,188.502 214.771,191.02 217.873,191.02H218.722C221.854,191.02 224.341,193.537 224.341,196.668C224.341,199.8 221.824,202.317 218.722,202.317H21.249C18.117,202.317 15.629,199.8 15.629,196.668C15.629,193.537 18.146,191.02 21.249,191.02H22.097C25.229,191.02 27.717,188.502 27.717,185.371C27.717,182.239 25.2,179.722 22.097,179.722H15.893C12.761,179.722 10.273,177.205 10.273,174.073C10.273,170.941 12.79,168.424 15.893,168.424H24.79C27.922,168.424 30.41,165.907 30.41,162.776C30.41,159.644 27.893,157.127 24.79,157.127H10.888C7.756,157.127 5.268,154.61 5.268,151.478C5.268,148.346 7.785,145.829 10.888,145.829H11.736C14.868,145.829 17.356,143.312 17.356,140.18C17.356,137.049 14.839,134.532 11.736,134.532H5.532C2.4,134.532 -0.088,132.015 -0.088,128.883C-0.088,125.751 2.429,123.234 5.532,123.234H14.429C17.561,123.234 20.049,120.717 20.049,117.585C20.049,114.454 17.532,111.937 14.429,111.937H10.888C7.756,111.937 5.268,109.42 5.268,106.288C5.268,103.156 7.785,100.639 10.888,100.639H22.127C25.258,100.639 27.746,98.122 27.746,94.99C27.746,91.858 25.229,89.341 22.127,89.341H15.893C12.761,89.341 10.273,86.824 10.273,83.693C10.273,80.561 12.79,78.044 15.893,78.044H72.468C75.6,78.044 78.088,75.527 78.088,72.395C78.088,69.263 75.571,66.746 72.468,66.746H68.927C65.795,66.746 63.307,64.229 63.307,61.098C63.307,57.966 65.824,55.449 68.927,55.449H178.624C181.756,55.449 184.244,57.966 184.244,61.098C184.244,64.229 181.697,66.746 178.624,66.746ZM74.546,44.21C71.415,44.21 68.927,41.693 68.927,38.561C68.927,35.488 71.444,32.971 74.546,32.912C77.678,32.912 80.166,35.429 80.166,38.561C80.166,41.693 77.678,44.21 74.546,44.21ZM196.156,55.449H200.078C203.21,55.449 205.697,57.966 205.697,61.098C205.697,64.229 203.18,66.746 200.078,66.746H196.156C193.024,66.746 190.537,64.229 190.537,61.098C190.537,58.024 193.054,55.449 196.156,55.449ZM53.561,55.449H38.283C35.151,55.449 32.663,58.024 32.663,61.098C32.663,64.229 35.18,66.746 38.283,66.746H53.561C56.693,66.746 59.18,64.229 59.18,61.098C59.18,57.966 56.693,55.449 53.561,55.449Z"
android:fillColor="#CBE9FA"/>
<path
android:pathData="M105.541,168.132C102.819,168.102 100.097,167.663 97.522,166.785C91.083,164.649 84.556,160.141 78.585,153.702C77.034,152.034 76.215,149.81 76.302,147.527C76.39,145.244 77.385,143.107 79.053,141.556C80.722,140.005 82.946,139.185 85.229,139.273C87.512,139.361 89.649,140.356 91.2,142.024C97.668,149.02 103.083,150.893 105.366,150.98C105.219,149.868 104.605,147.849 102.761,145.01C101.532,143.078 101.122,140.766 101.59,138.512C102.088,136.288 103.434,134.327 105.366,133.098C107.297,131.868 109.61,131.459 111.863,131.927C114.088,132.424 116.049,133.771 117.278,135.702C120.673,141 122.458,146.093 122.605,150.863C122.78,156.541 120.614,161.459 116.488,164.649C113.473,166.961 109.697,168.132 105.541,168.132Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M143.619,202.112C144.673,202.112 145.697,201.907 146.663,201.498C147.629,201.088 148.507,200.502 149.268,199.771C150,199.039 150.585,198.161 150.995,197.166C151.405,196.2 151.61,195.146 151.61,194.122C151.61,194.034 151.61,193.946 151.61,193.859C151.171,179.985 148.156,153.439 131.59,153.439C109.112,153.439 112.8,202.112 112.8,202.112H143.619Z"
android:fillColor="#DD6912"/>
<path
android:pathData="M110.663,189.732C135.219,189.732 144.41,202.112 144.41,202.112H106.449C105.366,202.112 104.341,201.673 103.58,200.912C102.819,200.151 102.38,199.127 102.38,198.044C102.38,196.961 102.585,195.878 102.995,194.854C103.405,193.859 104.019,192.922 104.78,192.161C105.541,191.4 106.449,190.785 107.473,190.346C108.468,189.937 109.551,189.732 110.663,189.732Z"
android:fillColor="#DD6912"/>
<path
android:pathData="M176.107,189.322L190.361,105.176C190.42,104.883 190.537,104.59 190.742,104.356C190.946,104.122 191.21,103.976 191.503,103.888C191.795,103.8 192.088,103.8 192.381,103.888C192.673,103.976 192.937,104.122 193.142,104.356C196.888,108.454 203.854,118.902 203.005,139.741L204.029,139.01C204.205,138.893 204.41,138.805 204.615,138.746C204.82,138.688 205.024,138.688 205.259,138.717C205.463,138.746 205.668,138.834 205.844,138.951C206.02,139.068 206.166,139.215 206.312,139.39C206.488,139.624 206.576,139.888 206.605,140.151C207.424,148.99 205.493,182.766 176.107,189.322Z"
android:fillColor="#DD6912"/>
<path
android:pathData="M168.439,117.937L154.741,115.771L151.229,125.341L168.497,123.38L168.439,117.937Z"
android:fillColor="#53930F"/>
<path
android:pathData="M160.478,122.59L163.61,119.459C165.805,117.263 169.376,117.293 171.512,119.546L193.493,142.551C197.649,146.912 198.439,153.468 195.454,158.678L186.059,175.039L160.478,122.59Z"
android:fillColor="#6FB218"/>
<path
android:pathData="M160.478,122.59L160.537,122.707L160.595,122.473L160.478,122.59Z"
android:fillColor="#6FB218"/>
<path
android:pathData="M195.512,158.62C194.898,157.595 194.107,156.483 193.024,155.254C188.195,149.693 179.268,155.693 177.073,142.961C175.288,132.659 166.244,123.41 162.849,120.249L160.595,122.502L160.537,122.737L180,162.688C183.044,165.878 185.151,168.102 185.268,168.278C185.473,168.541 188.107,167.693 190.859,166.727L195.454,158.737C195.454,158.678 195.483,158.649 195.512,158.62Z"
android:fillColor="#53930F"/>
<path
android:pathData="M124.654,147.41L114.615,199.244C114.468,200.034 114.029,200.766 113.415,201.293C112.8,201.82 112.01,202.112 111.19,202.112H96.41L107.883,144.161C108.146,142.873 108.673,141.673 109.463,140.649C110.254,139.595 111.249,138.746 112.419,138.161C113.59,137.576 114.849,137.254 116.166,137.224C117.483,137.195 118.771,137.488 119.941,138.044C120.117,138.132 120.263,138.22 120.439,138.307C122.019,139.185 123.307,140.532 124.068,142.171C124.8,143.781 125.034,145.624 124.654,147.41Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M111.776,202.259C111.454,194.912 103.815,191.751 98.693,191.751C88.391,191.751 88.391,202.259 90.117,202.259H111.776Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M153.658,119.02C162.292,118.229 166.946,126.454 166.946,135.615C166.946,144.776 174.38,149.546 183.717,155.312C202.683,167.02 201.278,202.141 166.858,202.141C83.766,202.141 107.883,124.317 107.883,124.317L153.658,119.02Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M167.122,144.776C161.795,147.41 157.229,146.59 153.717,141.556"
android:strokeWidth="10"
android:fillColor="#00000000"
android:strokeColor="#53930F"
android:strokeLineCap="round"/>
<path
android:pathData="M105.249,137.751C107.678,135.615 110.81,134.415 114.058,134.444C117.541,134.444 120.878,135.82 123.395,138.249C125.883,140.678 127.317,144.015 127.405,147.498C127.61,155.4 128.897,164.063 132.293,172.141C132.936,173.693 133.258,175.39 133.171,177.088C133.112,178.785 132.644,180.424 131.883,181.946C131.093,183.439 130.01,184.756 128.663,185.781C127.317,186.805 125.766,187.537 124.097,187.888C122.868,188.151 121.61,188.239 120.351,188.093C104.224,173.781 103.58,151.829 105.249,137.751Z"
android:fillColor="#EDD296"/>
<path
android:pathData="M155.678,166.024C148.888,166.024 140.605,162.659 131.971,153.38C131.21,152.561 130.595,151.595 130.214,150.512C129.834,149.459 129.629,148.317 129.688,147.205C129.717,146.063 129.98,144.98 130.478,143.927C130.946,142.902 131.619,141.966 132.439,141.205C133.258,140.444 134.253,139.829 135.307,139.449C136.361,139.068 137.502,138.863 138.614,138.922C139.756,138.951 140.839,139.215 141.892,139.712C142.917,140.18 143.853,140.854 144.614,141.673C151.288,148.873 155.736,149.02 156.351,148.727C156.819,148.141 157.288,144.512 153.688,138.893C152.458,136.961 152.049,134.649 152.517,132.395C153.014,130.171 154.361,128.21 156.292,126.98C158.224,125.751 160.536,125.341 162.79,125.81C165.014,126.307 166.975,127.654 168.205,129.585C171.951,135.439 173.912,141.498 173.883,147.117C173.853,153.439 171.366,158.824 166.888,162.307C163.639,164.795 159.717,166.083 155.678,166.024Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M146.839,147.702C146.517,140.356 138.878,137.195 133.756,137.195C123.424,137.195 123.424,147.702 125.18,147.702H146.839Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M93.424,147.702C93.102,140.356 85.463,137.195 80.37,137.195C70.039,137.195 70.068,147.702 71.795,147.702H93.424Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M104.078,133.741C104.224,134.327 104.546,134.883 104.985,135.322C105.424,135.761 105.951,136.083 106.536,136.259C110.458,137.371 120.117,139.127 134.575,135.263C149.034,131.4 156.527,125.02 159.366,122.122C159.805,121.683 160.097,121.127 160.244,120.541C160.39,119.956 160.39,119.312 160.244,118.727L158.488,112.2C158.429,111.966 158.283,111.732 158.107,111.527C157.931,111.351 157.697,111.205 157.463,111.146C157.229,111.059 156.966,111.059 156.702,111.117C156.439,111.176 156.234,111.293 156.029,111.468C152.575,114.571 144.234,121.098 131.678,124.463C119.122,127.829 108.614,126.366 104.078,125.4C103.814,125.341 103.58,125.371 103.317,125.429C103.083,125.517 102.849,125.634 102.673,125.839C102.497,126.015 102.38,126.249 102.322,126.512C102.263,126.776 102.263,127.01 102.322,127.273L104.078,133.741Z"
android:fillColor="#E04A27"/>
<path
android:pathData="M110.283,79.888C101.268,73.215 88.888,68.59 74.78,68.356H74.722C71.824,68.298 69.98,70.317 70.507,73.039C71.063,75.907 71.824,78.746 72.79,81.498C75.424,89.02 79.61,95.927 85.083,101.722C85.697,102.366 86.517,102.776 87.395,102.863C88.273,102.98 89.18,102.776 89.912,102.278C98.634,96.805 105.658,89.078 110.283,79.888Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M72.409,74.532C72.292,74.034 72.263,73.537 72.292,73.039C72.351,72.512 72.585,72.044 72.995,71.693C73.375,71.341 73.902,71.137 74.429,71.137C87.658,70.99 98.165,81 98.165,81L104.546,92.473C101.707,95.898 98.487,98.971 94.917,101.634C93.658,102.571 92.107,103.039 90.526,102.893C88.946,102.746 87.482,102.044 86.4,100.902C81.512,95.663 77.648,89.576 75.014,82.902C73.931,80.18 73.053,77.371 72.409,74.532Z"
android:fillColor="#DD6912"/>
<path
android:pathData="M120.263,75.234C120.966,64.024 125.356,51.585 134.253,40.61L134.283,40.581C136.097,38.327 138.819,38.21 140.605,40.376C142.449,42.659 144.117,45.058 145.61,47.576C149.678,54.424 152.283,62.063 153.19,69.995C153.278,70.873 153.073,71.751 152.575,72.512C152.078,73.244 151.346,73.8 150.497,74.063C140.722,77.166 130.273,77.605 120.263,75.234Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M140.517,42.776C140.224,42.366 139.844,42.015 139.434,41.751C138.995,41.458 138.468,41.341 137.941,41.4C137.415,41.458 136.946,41.722 136.595,42.132C127.961,52.171 128.897,66.659 128.897,66.659L133.58,78.922C138.029,78.951 142.449,78.454 146.78,77.429C148.302,77.078 149.678,76.171 150.585,74.883C151.493,73.595 151.902,72.015 151.727,70.463C150.878,63.351 148.683,56.473 145.258,50.181C143.883,47.576 142.273,45.117 140.517,42.776Z"
android:fillColor="#DD6912"/>
<path
android:pathData="M139.844,129.498C128.224,134.912 103.961,133.946 93.512,115.771C92.81,114.571 90.878,110.59 90.263,109.244C80.429,88.171 93.717,78.073 111.893,69.585C130.097,61.098 146.341,57.439 156.176,78.512C156.79,79.829 158.605,83.868 159.073,85.185C166.302,104.854 151.463,124.083 139.844,129.498Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M111.951,69.79C128.224,62.21 137.151,60.717 139.902,60.424C140.429,60.366 140.839,60.688 140.868,61.127L140.927,63.41L146.049,62.59C146.78,62.473 147.278,63.029 146.985,63.644L144.761,68.415L111.951,69.79Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M111.951,69.79C95.678,77.371 88.8,83.254 86.81,85.185C86.429,85.566 86.4,86.063 86.722,86.385L88.449,87.907L84.556,91.302C84,91.8 84.117,92.532 84.761,92.707L89.825,94.054L111.951,69.79Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M139.903,129.644C126.673,135.82 104.02,134.093 93.571,115.917C107.093,109.888 118.215,111.146 126.527,115.098C128.312,115.976 130.361,116.122 132.264,115.478C134.137,114.834 135.688,113.488 136.595,111.702C136.829,111.205 137.034,110.678 137.151,110.151C139.493,101.195 145.698,91.8 159.161,85.332C166.361,105.029 153.132,123.498 139.903,129.644Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M133.551,115.976C140.751,112.639 146.458,107.195 149.297,101.078C149.385,100.902 149.385,100.698 149.327,100.522C149.268,100.346 149.122,100.2 148.975,100.112C148.8,100.024 148.595,100.024 148.419,100.083C148.244,100.141 148.097,100.288 148.01,100.434V100.463C145.317,106.288 139.844,111.468 132.966,114.659C126.088,117.878 118.624,118.727 112.478,117.059C112.302,117.029 112.097,117.059 111.951,117.146C111.805,117.234 111.688,117.381 111.629,117.585C111.571,117.761 111.6,117.966 111.688,118.112C111.775,118.288 111.922,118.405 112.097,118.434C118.566,120.249 126.38,119.341 133.551,115.976Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M98.107,96.307C97.522,99.615 99.512,100.463 100.858,98.239C102.585,95.341 105.307,93.293 108.79,92.034C112.273,90.776 111.131,87.732 107.209,88.229C101.707,88.932 98.663,93.205 98.107,96.307Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M140.107,91.42C142.419,90.337 143.414,87.615 142.331,85.302C141.249,82.99 138.527,81.995 136.214,83.078C133.902,84.161 132.907,86.883 133.99,89.195C135.073,91.507 137.824,92.502 140.107,91.42Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M138,89.283C139.317,89.283 140.4,88.2 140.4,86.883C140.4,85.566 139.317,84.483 138,84.483C136.683,84.483 135.6,85.566 135.6,86.883C135.6,88.2 136.653,89.283 138,89.283Z"
android:fillColor="#4C5B66"/>
<path
android:pathData="M143.297,87L134.868,90.922C135.249,91.742 135.951,92.385 136.8,92.707C137.649,93.029 138.585,92.971 139.405,92.59L141.629,91.566C142.039,91.39 142.39,91.098 142.712,90.776C143.005,90.454 143.239,90.044 143.415,89.634C143.561,89.224 143.649,88.756 143.619,88.317C143.59,87.849 143.473,87.41 143.297,87Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M108.82,90.395C110.254,90.102 111.249,89.049 111.044,88.024C110.839,87 109.493,86.415 108.059,86.678C106.625,86.941 105.629,88.024 105.834,89.049C106.039,90.102 107.386,90.688 108.82,90.395Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M141.073,76.258C143.971,77.927 143.356,80.005 140.781,79.595C137.444,79.068 134.107,79.829 130.917,81.673C127.727,83.546 126.117,80.707 129.015,78.015C133.142,74.268 138.351,74.678 141.073,76.258Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M129.688,80.678C130.829,79.771 131.239,78.366 130.566,77.546C129.922,76.727 128.459,76.815 127.317,77.722C126.176,78.629 125.766,80.034 126.439,80.854C127.083,81.673 128.546,81.585 129.688,80.678Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M110.195,105.38C112.507,104.298 113.502,101.576 112.419,99.263C111.336,96.951 108.615,95.956 106.302,97.039C103.99,98.122 102.995,100.844 104.078,103.156C105.161,105.468 107.883,106.463 110.195,105.38Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M109.083,103.01C110.283,102.454 110.81,101.02 110.254,99.82C109.697,98.619 108.263,98.093 107.063,98.649C105.863,99.205 105.336,100.639 105.893,101.839C106.449,103.039 107.883,103.566 109.083,103.01Z"
android:fillColor="#4C5B66"/>
<path
android:pathData="M113.385,100.961L104.927,104.883C105.307,105.702 106.01,106.346 106.858,106.639C107.707,106.932 108.644,106.902 109.463,106.551L111.688,105.527C112.507,105.146 113.151,104.444 113.473,103.595C113.795,102.746 113.766,101.78 113.385,100.961Z"
android:fillColor="#F7A116"/>
<path
android:pathData="M140.312,103.946L143.795,111.439L144.468,119.898C144.585,121.185 144.293,122.502 143.619,123.615C142.946,124.727 141.98,125.634 140.81,126.19L136.536,128.181C135.366,128.737 134.019,128.912 132.732,128.678C131.444,128.444 130.244,127.829 129.336,126.922L123.307,120.981L119.854,113.488L140.312,103.946Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M139.317,100.61L141.424,110.561L140.897,117.937C140.751,119.81 139.405,122.239 136.917,123.41C134.4,124.58 131.678,124.024 130.185,122.941L124.215,118.61L117.951,110.561L139.317,100.61Z"
android:fillColor="#E04A27"/>
<path
android:pathData="M132.322,103.361L124.537,106.99L130.127,118.961C130.595,119.985 131.473,120.805 132.556,121.185C133.639,121.566 134.81,121.537 135.834,121.039C136.859,120.571 137.678,119.693 138.059,118.61C138.439,117.527 138.41,116.356 137.912,115.332L132.322,103.361Z"
android:fillColor="#FF9271"/>
<path
android:pathData="M112.537,111.234L143.327,96.893L131.181,89.283C129.629,88.317 127.873,87.761 126.059,87.644C124.244,87.527 122.429,87.878 120.761,88.639C119.122,89.4 117.688,90.571 116.605,92.034C115.522,93.498 114.82,95.224 114.556,97.01L112.537,111.234Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M114.878,106.288L138.088,95.429C138.088,95.429 131.151,97.068 128.078,90.483L126.351,86.766C126.351,86.766 123.629,84.893 119.795,86.649C115.99,88.405 115.815,91.654 115.815,91.654L117.541,95.371C120.146,100.902 114.878,106.288 114.878,106.288Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M117.512,102.22C118.039,101.956 118.595,101.722 119.18,101.576C123.658,100.259 127.902,98.298 131.795,95.693C133.141,94.785 134.693,94.229 136.332,94.083C137.941,93.937 139.58,94.171 141.073,94.785C142.566,95.4 143.912,96.395 144.937,97.654C145.961,98.912 146.663,100.405 146.985,101.985C147.307,103.595 147.219,105.234 146.751,106.785C146.283,108.337 145.434,109.771 144.293,110.912C143.151,112.054 141.717,112.902 140.166,113.371C138.615,113.839 136.946,113.927 135.366,113.605C134.429,113.429 133.493,113.546 132.615,113.927C131.766,114.337 131.063,114.98 130.595,115.829C129.863,117.176 128.78,118.346 127.522,119.224C126.234,120.102 124.771,120.659 123.249,120.863C121.697,121.068 120.146,120.893 118.683,120.395C117.219,119.868 115.902,119.019 114.819,117.907C113.736,116.795 112.946,115.419 112.507,113.956C112.039,112.463 111.951,110.912 112.215,109.361C112.478,107.839 113.093,106.376 114.029,105.146C114.907,103.917 116.107,102.922 117.512,102.22Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M122.517,101.927L129.746,98.561C132.029,97.507 133.844,99.995 133.463,102.629L133.346,103.537C133.317,103.8 133.2,104.063 133.024,104.239C132.848,104.444 132.614,104.59 132.351,104.649C132.175,104.678 132,104.766 131.853,104.883C131.678,105.029 131.531,105.176 131.444,105.38C131.356,105.585 131.297,105.79 131.297,106.024C131.297,106.229 131.356,106.434 131.502,106.58C131.648,106.727 131.824,106.815 132.029,106.844C132.117,106.844 132.175,106.844 132.263,106.815C132.351,106.844 132.409,106.873 132.468,106.932C132.527,106.99 132.556,107.049 132.585,107.107C132.614,107.166 132.614,107.254 132.614,107.341C132.614,107.429 132.585,107.488 132.527,107.546C132.263,107.985 131.853,108.366 131.385,108.571L129.102,109.624C128.575,109.859 127.961,109.946 127.405,109.8C127.346,109.771 127.288,109.741 127.229,109.683C127.2,109.624 127.141,109.566 127.141,109.507C127.112,109.449 127.112,109.361 127.141,109.302C127.17,109.244 127.2,109.185 127.229,109.127C127.346,109.039 127.434,108.893 127.492,108.746C127.522,108.6 127.522,108.424 127.463,108.278C127.229,107.693 126.38,107.4 125.736,107.693C125.649,107.722 125.59,107.78 125.502,107.839C125.268,107.985 125.005,108.073 124.741,108.073C124.478,108.073 124.185,107.985 123.98,107.839L123.249,107.371C120.995,105.966 120.234,102.98 122.517,101.927Z"
android:fillColor="#51545B"/>
<path
android:pathData="M164.429,202.229C162.585,198.219 161.385,193.419 161.092,188.093C160.565,178.698 170.078,166.434 175.229,163.595C180.38,160.756 218.4,167.927 199.492,202.229H164.429Z"
android:fillColor="#FFBF0B"/>
<path
android:pathData="M161.707,189.878C186.263,189.878 195.454,202.259 195.454,202.259H157.493C156.41,202.259 155.385,201.82 154.624,201.059C153.863,200.298 153.424,199.273 153.424,198.19C153.424,197.107 153.629,196.024 154.039,195.029C154.449,194.034 155.063,193.098 155.824,192.337C156.585,191.576 157.493,190.961 158.517,190.551C159.512,190.112 160.595,189.878 161.707,189.878Z"
android:fillColor="#FFEBB8"/>
<path
android:pathData="M125.385,190.376L115.522,184.024C115.171,183.79 114.732,183.907 114.498,184.259L112.302,187.654C112.068,188.005 112.185,188.444 112.537,188.678L122.371,195.029C122.722,195.263 123.161,195.146 123.395,194.795L125.59,191.4C125.824,191.049 125.707,190.58 125.385,190.376Z"
android:fillColor="#E04A27"/>
<path
android:pathData="M147.015,147.029H107.971V202.259H144.556C145.902,202.259 147.015,201.146 147.015,199.8V147.029Z"
android:fillColor="#D8AA73"/>
<path
android:pathData="M147.014,147.088H135.892C135.688,147.088 135.483,147.088 135.307,147.146C132.468,147.702 130.712,150.073 130.712,152.62C130.712,155.195 132.527,157.595 135.453,158.122C135.658,158.151 135.863,158.151 136.068,158.151C137.59,158.093 139.053,158.678 140.136,159.761C141.161,160.785 141.746,162.19 141.746,163.654C141.746,166.229 139.931,168.659 136.975,169.156C136.77,169.185 136.566,169.185 136.361,169.185C134.839,169.156 133.375,169.741 132.322,170.795C131.297,171.82 130.712,173.224 130.712,174.688C130.712,177.263 132.527,179.663 135.453,180.19C135.658,180.22 135.863,180.22 136.068,180.22C137.59,180.161 139.053,180.746 140.136,181.829C141.161,182.854 141.746,184.259 141.746,185.722C141.746,187.185 141.161,188.59 140.136,189.615C139.112,190.639 137.707,191.224 136.244,191.224C135.483,191.224 134.751,191.371 134.049,191.663C133.346,191.956 132.731,192.395 132.205,192.951C131.678,193.507 131.297,194.151 131.034,194.854C130.77,195.556 130.683,196.317 130.712,197.078C130.888,200.005 133.463,202.229 136.39,202.229H144.644C145.756,202.229 146.809,201.439 146.985,200.151L147.014,147.088Z"
android:fillColor="#CC9A64"/>
<path
android:pathData="M139.668,147.029H131.18V202.259H139.668V147.029Z"
android:fillColor="#53930F"/>
<path
android:pathData="M147.015,147.029H128.458L147.015,169.683V147.029Z"
android:fillColor="#AF7C4E"/>
<path
android:pathData="M139.668,147.029H131.18V150.366L139.668,160.727V147.029Z"
android:fillColor="#145B42"/>
<path
android:pathData="M120.146,147.029H64.917V201.117C64.917,201.732 65.415,202.259 66.059,202.259H120.146V147.029Z"
android:fillColor="#F4D49D"/>
<path
android:pathData="M120.234,147.059H87.278C86.605,147.059 85.961,147.322 85.493,147.79C85.024,148.259 84.761,148.902 84.761,149.576C84.761,149.898 84.82,150.219 84.937,150.541C85.054,150.834 85.259,151.127 85.493,151.361C85.727,151.595 85.99,151.771 86.312,151.917C86.605,152.034 86.956,152.122 87.278,152.122H90.498C91.171,152.122 91.815,152.385 92.283,152.854C92.751,153.322 93.015,153.966 93.015,154.639C93.015,154.961 92.956,155.283 92.81,155.605C92.663,155.927 92.488,156.19 92.254,156.424C92.02,156.659 91.756,156.834 91.434,156.98C91.142,157.098 90.79,157.185 90.468,157.185H84.878C84.205,157.185 83.561,157.449 83.093,157.917C82.624,158.385 82.361,159.029 82.361,159.702C82.361,160.024 82.42,160.346 82.566,160.668C82.683,160.961 82.888,161.254 83.122,161.488C83.356,161.722 83.619,161.898 83.941,162.044C84.234,162.161 84.585,162.249 84.907,162.22H90.498C91.171,162.22 91.815,162.483 92.283,162.951C92.751,163.42 93.015,164.063 93.015,164.737C93.015,165.059 92.956,165.38 92.81,165.702C92.693,165.995 92.488,166.288 92.254,166.522C92.02,166.756 91.756,166.932 91.434,167.078C91.142,167.195 90.79,167.283 90.468,167.254H82.537C81.863,167.254 81.219,167.517 80.751,167.985C80.283,168.454 80.02,169.098 80.02,169.771C80.02,170.093 80.078,170.415 80.224,170.737C80.341,171.029 80.546,171.322 80.781,171.556C81.015,171.79 81.278,171.966 81.6,172.112C81.893,172.229 82.244,172.288 82.566,172.288H90.498C90.82,172.288 91.142,172.346 91.463,172.463C91.756,172.58 92.049,172.785 92.283,173.02C92.517,173.254 92.693,173.517 92.839,173.839C92.956,174.132 93.044,174.483 93.044,174.805C93.044,175.478 92.781,176.122 92.312,176.59C91.844,177.059 91.2,177.322 90.527,177.322H80.254C79.932,177.322 79.61,177.38 79.288,177.498C78.995,177.615 78.702,177.819 78.468,178.054C78.234,178.288 78.059,178.551 77.912,178.873C77.795,179.166 77.707,179.517 77.707,179.839C77.707,180.512 77.971,181.156 78.439,181.624C78.907,182.093 79.551,182.356 80.224,182.356H90.498C91.171,182.356 91.815,182.619 92.283,183.088C92.751,183.556 93.015,184.2 93.015,184.873C93.015,185.195 92.956,185.517 92.81,185.839C92.693,186.132 92.488,186.424 92.254,186.659C92.02,186.893 91.756,187.068 91.434,187.215C91.142,187.332 90.79,187.419 90.468,187.39H77.854C77.18,187.39 76.537,187.654 76.068,188.122C75.6,188.59 75.337,189.234 75.337,189.907C75.337,190.229 75.395,190.551 75.541,190.873C75.659,191.166 75.863,191.459 76.098,191.693C76.332,191.927 76.595,192.102 76.917,192.219C77.21,192.337 77.561,192.395 77.883,192.395H90.527C91.2,192.395 91.844,192.659 92.312,193.127C92.781,193.595 93.044,194.239 93.044,194.912C93.044,195.585 92.781,196.229 92.312,196.698C91.844,197.166 91.2,197.429 90.527,197.429H75.541C75.219,197.429 74.868,197.488 74.576,197.634C74.283,197.751 73.99,197.956 73.756,198.19C73.522,198.424 73.346,198.717 73.2,199.01C73.083,199.302 73.024,199.654 73.024,199.976C73.024,200.298 73.083,200.619 73.2,200.941C73.317,201.234 73.522,201.527 73.756,201.761C73.99,201.995 74.254,202.171 74.576,202.317C74.868,202.434 75.219,202.522 75.541,202.522H120.263V147.059H120.234Z"
android:fillColor="#E5BE85"/>
<path
android:pathData="M95.356,147.029H64.917V185.224L95.356,147.029Z"
android:fillColor="#D8AA73"/>
<path
android:pathData="M99.775,147.029H85.288V202.259H99.775V147.029Z"
android:fillColor="#6FB218"/>
<path
android:pathData="M85.288,147.029V159.673L95.356,147.029H85.288Z"
android:fillColor="#53930F"/>
<path
android:pathData="M64.214,154.815C59.414,156.659 54,152.415 45.805,152.356C37.024,152.854 37.58,167.488 42.234,170.151C46.565,172.961 52.068,169.537 58.741,164.824C60.204,162.659 62.166,158.824 64.214,154.815Z"
android:fillColor="#53930F"/>
<path
android:pathData="M64.215,154.815C61.083,156.015 57.688,154.639 53.444,153.498C56.663,158.268 56.576,163.01 54.468,167.722C55.844,166.844 57.278,165.878 58.771,164.824C60.088,163.039 62.166,158.883 64.215,154.815Z"
android:fillColor="#145B42"/>
<path
android:pathData="M62.341,146.21C61.61,143.751 60.585,141.585 60.819,139.829C61.756,135.878 69.688,136.99 71.853,139.01C74.019,141.029 72.966,144.132 72.058,147.351L58.771,164.824C62.634,158.239 64.478,153.673 62.341,146.21Z"
android:fillColor="#53930F"/>
<path
android:pathData="M63.219,150.951C63.541,155.868 61.727,159.732 58.771,164.795L71.005,148.698C68.107,150.366 65.502,151.185 63.219,150.951Z"
android:fillColor="#145B42"/>
<path
android:pathData="M88.361,125.517L63.336,157.712L74.166,166.141L99.19,133.946C99.571,133.449 99.483,132.746 98.985,132.366L89.912,125.312C89.444,124.932 88.741,125.02 88.361,125.517Z"
android:fillColor="#CC9A64"/>
<path
android:pathData="M83.843,131.33L78.128,138.677L88.963,147.105L94.677,139.759L83.843,131.33Z"
android:fillColor="#145B42"/>
<path
android:pathData="M71.327,147.41L35.473,193.507C35.18,193.859 35.268,194.385 35.619,194.678L45.132,202.083C45.483,202.376 46.01,202.288 46.302,201.937L82.156,155.839L71.327,147.41Z"
android:fillColor="#E5BE85"/>
<path
android:pathData="M57.651,164.992L48.629,176.589L59.464,185.018L68.485,173.421L57.651,164.992Z"
android:fillColor="#53930F"/>
<path
android:pathData="M165.922,125.517C157.258,122.063 146.663,131.429 153.336,141.059"
android:strokeWidth="10"
android:fillColor="#00000000"
android:strokeColor="#53930F"
android:strokeLineCap="round"/>
<path
android:pathData="M185.59,140.59L178.771,148.551L184.331,154.054C186.468,156.161 189.951,156.015 191.912,153.761C193.697,151.712 193.58,148.61 191.649,146.678L185.59,140.59Z"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#53930F"/>
<path
android:pathData="M170.927,131.195C175.844,134.063 180.088,134.62 183.512,132.454"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#53930F"
android:strokeLineCap="round"/>
<path
android:pathData="M116.663,170.444V164.854C116.663,164.444 116.4,164.093 116.019,163.976L110.722,162.249C110.546,162.19 110.371,162.073 110.254,161.927L106.976,157.42C106.741,157.098 106.332,156.951 105.951,157.098L100.654,158.824C100.478,158.883 100.273,158.883 100.098,158.824L94.8,157.098C94.42,156.98 94.01,157.098 93.776,157.42L90.497,161.927C90.381,162.073 90.234,162.19 90.029,162.249L84.732,163.976C84.351,164.093 84.088,164.444 84.088,164.854V170.444C84.088,170.649 84.029,170.824 83.912,170.971L80.634,175.478C80.4,175.8 80.4,176.239 80.634,176.561L83.912,181.068C84.029,181.215 84.088,181.42 84.088,181.595V187.185C84.088,187.595 84.351,187.946 84.732,188.063L90.029,189.79C90.205,189.849 90.381,189.966 90.497,190.112L93.776,194.62C94.01,194.941 94.42,195.088 94.8,194.941L100.098,193.215C100.273,193.156 100.478,193.156 100.654,193.215L105.951,194.941C106.332,195.059 106.741,194.941 106.976,194.62L110.254,190.112C110.371,189.966 110.517,189.849 110.722,189.79L116.019,188.063C116.4,187.946 116.663,187.595 116.663,187.185V181.595C116.663,181.39 116.722,181.215 116.839,181.068L120.117,176.561C120.351,176.239 120.351,175.8 120.117,175.478L116.839,170.971C116.722,170.824 116.663,170.619 116.663,170.444Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M84.731,188.063L90.029,189.79C90.205,189.849 90.38,189.966 90.497,190.112L93.775,194.619C94.009,194.941 94.419,195.088 94.8,194.941L100.097,193.215C100.273,193.156 100.478,193.156 100.653,193.215L105.951,194.941C106.331,195.058 106.741,194.941 106.975,194.619L110.253,190.112C110.37,189.966 110.517,189.849 110.722,189.79L116.019,188.063C116.4,187.946 116.663,187.595 116.663,187.185V181.595C116.663,181.39 116.722,181.215 116.839,181.068L120.117,176.561C120.351,176.239 120.351,175.8 120.117,175.478L116.839,170.971C100.244,169.595 90,175.859 84.731,188.063Z"
android:fillColor="#D64580"/>
<path
android:pathData="M87.19,172.815H91.873V174.483H89.034V176.122H91.522V177.79H89.034V180.571H87.19V172.815Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M93.366,180.571V172.844C93.805,172.844 95.883,172.815 96.117,172.815C98.313,172.815 99.103,173.868 99.103,175.302C99.103,176.737 98.166,177.322 97.727,177.527L100.069,180.571H97.844L95.883,177.878H95.21V180.571H93.366ZM95.21,174.483V176.18H95.883C96.586,176.18 97.142,175.946 97.142,175.273C97.142,174.834 96.908,174.424 96.03,174.424C95.737,174.454 95.591,174.483 95.21,174.483Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M101.122,172.815H105.922V174.483H102.966V175.829H105.571V177.498H102.966V178.902H106.01V180.571H101.093V172.815H101.122Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M107.766,172.815H112.566V174.483H109.61V175.829H112.215V177.498H109.61V178.902H112.683V180.571H107.766V172.815Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M221.561,206.737H19.61C18.322,206.737 17.269,205.683 17.269,204.395C17.269,203.107 18.322,202.054 19.61,202.054H221.561C222.849,202.054 223.903,203.107 223.903,204.395C223.903,205.683 222.849,206.737 221.561,206.737Z"
android:fillColor="#5A6B84"/>
<path
android:pathData="M77.737,206.737H19.61C18.322,206.737 17.269,205.683 17.269,204.395C17.269,203.107 18.322,202.054 19.61,202.054H77.737C79.025,202.054 80.078,203.107 80.078,204.395C80.078,205.683 79.025,206.737 77.737,206.737Z"
android:fillColor="#6C7F9E"/>
<path
android:pathData="M221.561,206.737H160.976C159.688,206.737 158.634,205.683 158.634,204.395C158.634,203.107 159.688,202.054 160.976,202.054H221.561C222.849,202.054 223.903,203.107 223.903,204.395C223.903,205.683 222.849,206.737 221.561,206.737Z"
android:fillColor="#4E5E75"/>
</group>
</vector>

487
android/res/drawable/img_wnew_newguides.xml
View file

@ -1,487 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="240dp"
android:height="240dp"
android:viewportWidth="240"
android:viewportHeight="240">
<path
android:pathData="M158.553,17.405H135.146V11.844C135.146,10.823 135.969,10 136.99,10H156.681C157.702,10 158.525,10.823 158.525,11.844V17.405H158.553Z"
android:fillColor="#4A6275"/>
<path
android:pathData="M168.342,230H81.948C71.166,230 62.427,221.261 62.427,210.48V33.209C62.427,22.427 71.166,13.688 81.948,13.688H168.313C179.095,13.688 187.834,22.427 187.834,33.209V210.48C187.834,221.261 179.123,230 168.342,230Z"
android:fillColor="#232833"/>
<path
android:pathData="M181.62,40.16C178.187,40.16 175.406,42.94 175.406,46.374V131.406H62.456V210.508C62.456,221.261 71.166,229.972 81.919,229.972H168.398C179.151,229.972 187.862,221.261 187.862,210.508V46.374C187.833,42.94 185.053,40.16 181.62,40.16Z"
android:fillColor="#232833"/>
<path
android:pathData="M155.886,230H69.52C58.739,230 50,221.261 50,210.48V33.209C50,22.427 58.739,13.688 69.52,13.688H155.886C166.668,13.688 175.406,22.427 175.406,33.209V210.48C175.406,221.261 166.668,230 155.886,230Z"
android:fillColor="#40546B"/>
<path
android:pathData="M181.619,156.317C179.775,156.317 178.3,154.813 178.3,152.997V131.264C178.3,129.42 179.804,127.944 181.619,127.944C183.464,127.944 184.939,129.448 184.939,131.264V152.997C184.939,154.813 183.464,156.317 181.619,156.317Z"
android:fillColor="#40546B"/>
<path
android:pathData="M184.826,81.527H182.471C180.088,81.527 178.158,83.456 178.158,85.84V95.968C178.158,98.352 180.088,100.281 182.471,100.281H184.826V81.527Z"
android:fillColor="#4A6275"/>
<path
android:pathData="M184.826,100.253C182.443,100.253 180.513,98.323 180.513,95.94V85.811C180.513,83.428 182.443,81.498 184.826,81.498C187.209,81.498 189.138,83.428 189.138,85.811V95.94C189.138,98.323 187.181,100.253 184.826,100.253Z"
android:fillColor="#40546B"/>
<path
android:pathData="M184.826,58.943H182.471C180.088,58.943 178.158,60.872 178.158,63.255V73.384C178.158,75.767 180.088,77.697 182.471,77.697H184.826V58.943Z"
android:fillColor="#4A6275"/>
<path
android:pathData="M184.826,77.697C182.443,77.697 180.513,75.767 180.513,73.384V63.255C180.513,60.872 182.443,58.943 184.826,58.943C187.209,58.943 189.138,60.872 189.138,63.255V73.384C189.138,75.739 187.181,77.697 184.826,77.697Z"
android:fillColor="#40546B"/>
<path
android:pathData="M156.085,20.895H69.322C62.626,20.895 57.207,26.314 57.207,33.01V210.678C57.207,217.374 62.626,222.793 69.322,222.793H156.085C162.78,222.793 168.2,217.374 168.2,210.678V33.01C168.228,26.314 162.78,20.895 156.085,20.895Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M156.085,20.895H69.322C62.626,20.895 57.207,26.314 57.207,33.01V210.678C57.207,217.374 62.626,222.793 69.322,222.793H156.085C162.78,222.793 168.2,217.374 168.2,210.678V33.01C168.228,26.314 162.78,20.895 156.085,20.895Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M78.316,20.895H72.811C70.825,20.895 69.208,19.278 69.208,17.292C69.208,15.306 70.825,13.688 72.811,13.688H78.316C80.302,13.688 81.919,15.306 81.919,17.292C81.919,19.278 80.302,20.895 78.316,20.895Z"
android:fillColor="#4A6275"/>
<path
android:pathData="M183.634,131.235C183.634,132.342 182.726,133.25 181.62,133.25C180.513,133.25 179.605,132.342 179.605,131.235C179.605,130.129 180.513,129.221 181.62,129.221C182.726,129.221 183.634,130.129 183.634,131.235Z"
android:fillColor="#2F3A49"/>
<path
android:pathData="M183.634,152.997C183.634,154.104 182.726,155.012 181.62,155.012C180.513,155.012 179.605,154.104 179.605,152.997C179.605,151.891 180.513,150.983 181.62,150.983C182.726,150.983 183.634,151.862 183.634,152.997Z"
android:fillColor="#2F3A49"/>
<path
android:pathData="M154.893,28.073H70.513C67.08,28.073 64.3,30.854 64.3,34.287V140.542H161.135V34.287C161.135,30.854 158.326,28.073 154.893,28.073Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M154.893,28.073H70.513C67.08,28.073 64.3,30.854 64.3,34.287V133.534H161.135V34.287C161.135,30.854 158.326,28.073 154.893,28.073Z"
android:fillColor="#DED6D3"/>
<path
android:pathData="M72.698,28.073L64.3,36.472V52.445L88.672,28.073H72.698Z"
android:fillColor="#ACD4E5"/>
<path
android:pathData="M138.607,28.073L101.808,64.872H106.064L142.863,28.073H138.607Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M120.193,31.79H104.333C101.808,31.79 99.453,33.038 98.063,35.166C92.615,43.479 96.474,51.935 98.517,54.034C99.084,54.602 99.623,55.169 100.105,55.68C101.609,57.212 104.077,57.212 105.581,55.708L122.917,38.372C125.357,35.932 123.626,31.79 120.193,31.79Z"
android:fillColor="#ACD4E5"/>
<path
android:pathData="M138.891,36.897L119.598,56.19C118.803,56.985 119.371,58.375 120.506,58.375H126.691C127.712,58.375 128.677,57.978 129.386,57.269L144.31,42.345C144.821,41.834 144.821,41.039 144.31,40.557L140.679,36.925C140.196,36.415 139.402,36.415 138.891,36.897Z"
android:fillColor="#6BC974"/>
<path
android:pathData="M67.024,29.123C66.173,29.691 65.492,30.457 65.009,31.365L98.517,64.872H102.773L67.024,29.123Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M138.948,29.861L161.135,52.048V49.665L140.111,28.669L138.948,29.861Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M90.317,44.274C90.317,38.997 92.36,34.06 96.077,30.343L98.347,28.073H94.091L93.949,28.215C89.665,32.499 87.31,38.202 87.31,44.274C87.31,50.346 89.665,56.049 93.949,60.333L98.489,64.872H102.745L96.077,58.205C92.36,54.488 90.317,49.523 90.317,44.274Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M81.437,45.664L64.3,62.829V64.872H64.584L82.628,46.856L81.437,45.664Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M138.181,53.098L134.465,56.814C134.238,57.042 134.238,57.382 134.465,57.609L136.167,59.311C136.394,59.538 136.734,59.538 136.961,59.311L140.678,55.595C140.905,55.368 140.905,55.027 140.678,54.8L138.976,53.098C138.749,52.871 138.38,52.871 138.181,53.098Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M146.92,44.331L140.593,50.658C140.366,50.885 140.366,51.225 140.593,51.452L142.295,53.154C142.522,53.382 142.863,53.382 143.09,53.154L149.417,46.827C149.644,46.6 149.644,46.26 149.417,46.033L147.715,44.331C147.516,44.104 147.147,44.104 146.92,44.331Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M153.956,29.974L150.24,33.691C150.013,33.918 150.013,34.258 150.24,34.485L151.942,36.188C152.169,36.415 152.509,36.415 152.736,36.188L156.453,32.471C156.68,32.244 156.68,31.903 156.453,31.677L154.751,29.974C154.552,29.747 154.183,29.747 153.956,29.974Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M156.255,53.069L152.538,49.353C152.311,49.126 151.971,49.126 151.744,49.353L150.041,51.055C149.814,51.282 149.814,51.622 150.041,51.849L153.758,55.566C153.985,55.793 154.326,55.793 154.553,55.566L156.255,53.864C156.482,53.637 156.482,53.268 156.255,53.069Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M151.148,58.176L147.431,54.46C147.204,54.233 146.864,54.233 146.637,54.46L144.934,56.162C144.707,56.389 144.707,56.729 144.934,56.956L148.651,60.673C148.878,60.9 149.219,60.9 149.446,60.673L151.148,58.971C151.347,58.744 151.347,58.403 151.148,58.176Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M160.738,44.246C160.511,44.472 160.511,44.813 160.738,45.04L161.106,45.409V43.848L160.738,44.246Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M146.126,30.343L147.828,32.045C148.055,32.272 148.396,32.272 148.623,32.045L152.339,28.329C152.425,28.243 152.453,28.158 152.481,28.073H147.63L146.154,29.549C145.899,29.776 145.899,30.116 146.126,30.343Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M159.092,35.11L155.375,38.826C155.148,39.053 155.148,39.394 155.375,39.621L157.078,41.323C157.305,41.55 157.645,41.55 157.872,41.323L161.135,38.06V36.358L159.887,35.11C159.66,34.883 159.319,34.883 159.092,35.11Z"
android:fillColor="#C1B3A6"/>
<path
android:pathData="M168.171,62.063H57.15V211.047C57.15,217.544 62.427,222.822 68.924,222.822H156.425C162.922,222.822 168.2,217.544 168.2,211.047V62.063H168.171Z"
android:fillColor="#B9E8FF"/>
<path
android:pathData="M96.928,85.017C89.976,78.065 89.976,66.745 96.928,59.822L100.644,56.105H96.389L94.8,57.694C86.685,65.809 86.685,79.03 94.8,87.145L160.908,152.713V148.486L96.928,85.017Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M105.468,95.656L64.47,136.144V140.343L107.567,97.784L105.468,95.656Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M105.468,95.656L64.47,136.144V140.343L107.567,97.784L105.468,95.656Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M82.823,118.111L105.521,95.697L107.515,97.716L84.817,120.13L82.823,118.111Z"
android:fillColor="#FF5C5C"
android:fillType="evenOdd"/>
<path
android:pathData="M64.413,70.521H90.232V73.523H64.413V70.521Z"
android:fillColor="#A9D2FE"
android:fillType="evenOdd"/>
<path
android:pathData="M158.944,67.448L118.088,108.304L116.908,107.125L157.765,66.269L158.944,67.448Z"
android:fillColor="#A9D2FE"
android:fillType="evenOdd"/>
<path
android:pathData="M135.458,125.646L160.936,100.168V96.139L133.443,123.632L135.458,125.646Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M144.247,60.128L107.108,97.296L105.928,96.117L143.067,58.949L144.247,60.128Z"
android:fillColor="#A9D2FE"
android:fillType="evenOdd"/>
<path
android:pathData="M128.516,76.714L107.521,97.709L105.515,95.703L126.51,74.707L128.516,76.714Z"
android:fillColor="#FF5C5C"
android:fillType="evenOdd"/>
<path
android:pathData="M126.474,74.736L154.421,102.683L152.415,104.689L124.468,76.742L126.474,74.736Z"
android:fillColor="#FF5C5C"
android:fillType="evenOdd"/>
<path
android:pathData="M63.795,116.97L95.288,85.477L96.468,86.656L64.974,118.15L63.795,116.97Z"
android:fillColor="#A9D2FE"
android:fillType="evenOdd"/>
<path
android:pathData="M146.154,62.858L133.613,75.398C133.103,75.909 133.103,76.704 133.613,77.186L137.245,80.818C137.756,81.328 138.55,81.328 139.033,80.818L151.573,68.277C152.084,67.766 152.084,66.972 151.573,66.49L147.942,62.858C147.431,62.375 146.636,62.375 146.154,62.858Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M120.477,72.845L116.448,76.874C116.306,77.016 116.306,77.214 116.448,77.328L118.463,79.342C118.604,79.484 118.803,79.484 118.917,79.342L122.945,75.313C123.087,75.172 123.087,74.973 122.945,74.859L120.931,72.845C120.818,72.703 120.591,72.703 120.477,72.845Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M129.244,64.078L122.605,70.717C122.463,70.859 122.463,71.058 122.605,71.171L124.619,73.185C124.761,73.327 124.96,73.327 125.073,73.185L131.713,66.546C131.854,66.404 131.854,66.206 131.713,66.092L129.698,64.078C129.585,63.936 129.358,63.936 129.244,64.078Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M116.193,64.191L109.554,70.83C109.412,70.972 109.412,71.171 109.554,71.285L111.569,73.299C111.71,73.441 111.909,73.441 112.023,73.299L118.662,66.66C118.804,66.518 118.804,66.319 118.662,66.206L116.647,64.191C116.534,64.078 116.307,64.078 116.193,64.191Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M106.859,73.469L100.475,79.853C100.277,80.052 100.277,80.364 100.475,80.591L102.234,82.35C102.433,82.548 102.773,82.548 102.972,82.35L109.356,75.966C109.554,75.767 109.554,75.455 109.356,75.228L107.597,73.469C107.37,73.271 107.058,73.271 106.859,73.469Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M64.158,96.281L68.073,100.224C68.243,100.395 68.499,100.395 68.641,100.224L70.57,98.295C70.74,98.125 70.74,97.869 70.57,97.728L66.626,93.812C66.456,93.642 66.2,93.642 66.059,93.812L64.129,95.742C64.016,95.855 64.016,96.139 64.158,96.281Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M69.52,87.627L67.591,85.698C67.421,85.527 67.165,85.527 67.023,85.698L64.47,88.251V93.245L69.52,88.195C69.662,88.053 69.662,87.797 69.52,87.627Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M68.272,107.857L66.342,105.927C66.172,105.757 65.917,105.757 65.775,105.927L64.47,107.232V112.226L68.272,108.424C68.413,108.254 68.413,107.998 68.272,107.857Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M111.228,62.205L107.199,58.148C107.057,58.006 106.859,58.006 106.745,58.148L104.731,60.162C104.589,60.304 104.589,60.503 104.731,60.616L108.76,64.645C108.902,64.787 109.1,64.787 109.214,64.645L111.228,62.631C111.37,62.546 111.37,62.319 111.228,62.205Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M107.086,66.348L103.057,62.319C102.915,62.177 102.716,62.177 102.603,62.319L100.588,64.333C100.446,64.475 100.446,64.674 100.588,64.787L104.617,68.816C104.759,68.958 104.958,68.958 105.071,68.816L107.086,66.802C107.227,66.66 107.227,66.461 107.086,66.348Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M101.979,71.455L97.95,67.426C97.808,67.284 97.609,67.284 97.496,67.426L95.481,69.44C95.34,69.582 95.34,69.781 95.481,69.894L99.51,73.923C99.652,74.065 99.851,74.065 99.964,73.923L101.979,71.909C102.092,71.795 102.092,71.597 101.979,71.455Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M134.21,212.069L125.953,203.812C118.236,196.095 118.236,183.554 125.953,175.837L155.829,145.961L153.815,143.946L123.939,173.823C115.115,182.646 115.115,197.003 123.939,205.827L130.181,212.069L125.045,217.204H129.046L134.21,212.069Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M106.466,94.592L157.111,144.754L155.115,146.77L104.47,96.608L106.466,94.592Z"
android:fillColor="#FF5C5C"
android:fillType="evenOdd"/>
<path
android:pathData="M98.482,163.801L65.031,197.252L63.852,196.073L97.303,162.621L98.482,163.801Z"
android:fillColor="#A9D2FE"
android:fillType="evenOdd"/>
<path
android:pathData="M85.658,154.637L64.974,175.32L63.795,174.141L84.479,153.457L85.658,154.637Z"
android:fillColor="#A9D2FE"
android:fillType="evenOdd"/>
<path
android:pathData="M152.397,204.124L156.397,200.124C156.539,199.982 156.539,199.755 156.397,199.642L154.411,197.655C154.269,197.514 154.042,197.514 153.929,197.655L149.928,201.656C149.786,201.798 149.786,202.025 149.928,202.138L151.914,204.124C152.028,204.238 152.255,204.238 152.397,204.124Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M155.659,211.643L151.658,207.643C151.516,207.501 151.289,207.501 151.176,207.643L149.19,209.629C149.048,209.77 149.048,209.997 149.19,210.111L153.19,214.111C153.332,214.253 153.559,214.253 153.673,214.111L155.659,212.125C155.801,211.984 155.801,211.785 155.659,211.643Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M143.63,212.863L150.24,206.252C150.382,206.11 150.382,205.883 150.24,205.77L148.254,203.784C148.112,203.642 147.885,203.642 147.772,203.784L141.133,210.395C140.991,210.536 140.991,210.763 141.133,210.877L143.119,212.863C143.261,213.005 143.488,213.005 143.63,212.863Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M135.316,201.032L142.04,194.307C142.154,194.194 142.154,194.024 142.04,193.939L139.941,191.839C139.827,191.726 139.657,191.726 139.572,191.839L132.848,198.563C132.734,198.677 132.734,198.847 132.848,198.932L134.947,201.032C135.032,201.145 135.203,201.145 135.316,201.032Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M136.394,188.463L132.28,184.349C132.167,184.235 131.996,184.235 131.911,184.349L129.812,186.448C129.698,186.562 129.698,186.732 129.812,186.817L133.926,190.931C134.039,191.045 134.209,191.045 134.295,190.931L136.394,188.832C136.508,188.718 136.508,188.548 136.394,188.463Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M132.252,192.577L128.138,188.463C128.024,188.349 127.854,188.349 127.769,188.463L125.67,190.562C125.556,190.676 125.556,190.846 125.67,190.931L129.784,195.045C129.897,195.159 130.067,195.159 130.152,195.045L132.252,192.946C132.365,192.861 132.365,192.69 132.252,192.577Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M152.425,179.979C152.425,176.007 149.19,172.773 145.218,172.773C141.246,172.773 138.012,176.007 138.012,179.979C138.012,183.952 141.246,187.186 145.218,187.186C149.19,187.186 152.425,183.952 152.425,179.979Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M69.832,206.962L76.557,213.686C76.67,213.799 76.84,213.799 76.925,213.686L79.025,211.586C79.139,211.473 79.139,211.303 79.025,211.217L72.301,204.493C72.187,204.38 72.017,204.38 71.932,204.493L69.832,206.593C69.747,206.678 69.747,206.848 69.832,206.962Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M101.326,185.285L97.41,189.229C97.24,189.399 97.24,189.654 97.41,189.796L99.34,191.726C99.51,191.896 99.765,191.896 99.907,191.726L103.823,187.81C103.993,187.64 103.993,187.385 103.823,187.243L101.893,185.313C101.751,185.143 101.496,185.143 101.326,185.285Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M107.908,179.128L103.965,183.044C103.794,183.214 103.794,183.469 103.965,183.611L105.894,185.54C106.064,185.711 106.319,185.711 106.461,185.54L110.377,181.625C110.547,181.455 110.547,181.199 110.377,181.058L108.447,179.128C108.306,178.958 108.05,178.958 107.908,179.128Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M86.26,185.086L90.261,181.086C90.403,180.944 90.403,180.717 90.261,180.604L88.275,178.617C88.133,178.476 87.906,178.476 87.793,178.617L83.792,182.618C83.65,182.76 83.65,182.987 83.792,183.1L85.778,185.086C85.892,185.228 86.118,185.228 86.26,185.086Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M85.636,197.854L81.635,193.853C81.493,193.712 81.267,193.712 81.153,193.853L79.167,195.839C79.025,195.981 79.025,196.208 79.167,196.322L83.168,200.322C83.309,200.464 83.536,200.464 83.65,200.322L85.636,198.336C85.778,198.223 85.778,197.996 85.636,197.854Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M77.493,193.853L84.104,187.243C84.245,187.101 84.245,186.874 84.104,186.76L82.118,184.774C81.976,184.632 81.749,184.632 81.635,184.774L75.024,191.385C74.882,191.527 74.882,191.754 75.024,191.867L77.01,193.853C77.124,193.967 77.351,193.967 77.493,193.853Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M81.636,172.574L77.834,168.772C77.635,168.574 77.323,168.574 77.153,168.772L75.365,170.56C75.167,170.758 75.167,171.07 75.365,171.241L79.167,175.043C79.366,175.241 79.678,175.241 79.848,175.043L81.636,173.255C81.834,173.085 81.834,172.773 81.636,172.574Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M77.493,176.716L73.691,172.915C73.493,172.716 73.18,172.716 73.01,172.915L71.223,174.702C71.024,174.901 71.024,175.213 71.223,175.383L75.025,179.185C75.223,179.383 75.535,179.383 75.705,179.185L77.493,177.397C77.692,177.227 77.692,176.915 77.493,176.716Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M72.386,181.824L68.584,178.022C68.385,177.823 68.073,177.823 67.903,178.022L66.116,179.809C65.917,180.008 65.917,180.32 66.116,180.49L69.918,184.292C70.116,184.491 70.428,184.491 70.599,184.292L72.386,182.504C72.556,182.334 72.556,182.022 72.386,181.824Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M147.686,144.429L143.685,140.4C143.543,140.258 143.316,140.258 143.203,140.4L141.217,142.386C141.075,142.528 141.075,142.755 141.217,142.868L145.217,146.869C145.359,147.011 145.586,147.011 145.7,146.869L147.686,144.883C147.828,144.769 147.828,144.542 147.686,144.429Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M141.274,137.988L137.274,133.988C137.132,133.846 136.905,133.846 136.791,133.988L134.805,135.974C134.663,136.116 134.663,136.343 134.805,136.456L138.806,140.457C138.948,140.598 139.175,140.598 139.288,140.457L141.274,138.47C141.388,138.357 141.388,138.13 141.274,137.988Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M157.844,107.658L151.262,114.24C151.12,114.382 151.12,114.638 151.262,114.779L153.219,116.737C153.361,116.879 153.617,116.879 153.758,116.737L160.341,110.155C160.483,110.013 160.483,109.757 160.341,109.616L158.383,107.658C158.241,107.516 157.986,107.516 157.844,107.658Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M156.085,133.363L152.17,129.448C152,129.278 151.744,129.278 151.602,129.448L149.673,131.377C149.503,131.548 149.503,131.803 149.673,131.945L153.588,135.86C153.759,136.03 154.014,136.03 154.156,135.86L156.085,133.931C156.227,133.789 156.227,133.534 156.085,133.363Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M153.446,120.567L149.531,116.652C149.36,116.482 149.105,116.482 148.963,116.652L147.034,118.581C146.864,118.752 146.864,119.007 147.034,119.149L150.949,123.064C151.12,123.234 151.375,123.234 151.517,123.064L153.446,121.135C153.616,120.965 153.616,120.709 153.446,120.567Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M148.339,125.674L144.424,121.759C144.254,121.589 143.998,121.589 143.856,121.759L141.927,123.688C141.757,123.859 141.757,124.114 141.927,124.256L145.842,128.171C146.013,128.341 146.268,128.341 146.41,128.171L148.339,126.242C148.481,126.1 148.481,125.845 148.339,125.674Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M131.372,86.918L127.57,83.116C127.372,82.917 127.06,82.917 126.89,83.116L125.102,84.903C124.903,85.102 124.903,85.414 125.102,85.584L128.904,89.386C129.103,89.585 129.415,89.585 129.585,89.386L131.372,87.599C131.571,87.428 131.571,87.116 131.372,86.918Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M135.997,99.43L139.998,95.429C140.14,95.288 140.14,95.061 139.998,94.947L138.012,92.961C137.87,92.819 137.643,92.819 137.529,92.961L133.529,96.962C133.387,97.104 133.387,97.33 133.529,97.444L135.515,99.43C135.657,99.572 135.855,99.572 135.997,99.43Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M135.373,112.198L131.372,108.197C131.23,108.055 131.003,108.055 130.89,108.197L128.904,110.183C128.762,110.325 128.762,110.552 128.904,110.665L132.904,114.666C133.046,114.808 133.273,114.808 133.387,114.666L135.373,112.68C135.515,112.566 135.515,112.339 135.373,112.198Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M127.23,108.197L133.841,101.586C133.983,101.444 133.983,101.217 133.841,101.104L131.855,99.118C131.713,98.976 131.486,98.976 131.372,99.118L124.762,105.729C124.62,105.871 124.62,106.098 124.762,106.211L126.748,108.197C126.89,108.339 127.117,108.339 127.23,108.197Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M127.258,91.06L123.456,87.258C123.258,87.06 122.946,87.06 122.775,87.258L120.988,89.046C120.789,89.244 120.789,89.556 120.988,89.727L124.79,93.529C124.988,93.727 125.3,93.727 125.471,93.529L127.258,91.741C127.428,91.571 127.428,91.259 127.258,91.06Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M122.123,96.196L118.321,92.394C118.122,92.195 117.81,92.195 117.64,92.394L115.853,94.181C115.654,94.38 115.654,94.692 115.853,94.862L119.654,98.664C119.853,98.863 120.165,98.863 120.335,98.664L122.123,96.876C122.321,96.678 122.321,96.366 122.123,96.196Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M147.09,91.287L150.807,95.004C151.034,95.231 151.374,95.231 151.601,95.004L153.304,93.301C153.531,93.075 153.531,92.734 153.304,92.507L149.587,88.79C149.36,88.563 149.019,88.563 148.792,88.79L147.09,90.493C146.863,90.72 146.863,91.06 147.09,91.287Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M154.496,80.931L158.525,76.902C158.666,76.76 158.666,76.562 158.525,76.448L156.51,74.434C156.368,74.292 156.17,74.292 156.056,74.434L152.027,78.463C151.885,78.605 151.885,78.803 152.027,78.917L154.042,80.931C154.155,81.073 154.354,81.073 154.496,80.931Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M145.785,89.642L152.339,83.087C152.509,82.917 152.509,82.662 152.339,82.52L150.41,80.591C150.24,80.42 149.984,80.42 149.842,80.591L143.288,87.145C143.118,87.315 143.118,87.57 143.288,87.712L145.218,89.642C145.36,89.812 145.615,89.812 145.785,89.642Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M81.465,133.108L85.465,129.108C85.607,128.966 85.607,128.739 85.465,128.625L83.479,126.639C83.338,126.497 83.11,126.497 82.997,126.639L78.996,130.64C78.855,130.782 78.855,131.009 78.996,131.122L80.983,133.108C81.096,133.222 81.323,133.222 81.465,133.108Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M72.698,141.847L79.309,135.236C79.451,135.094 79.451,134.867 79.309,134.754L77.323,132.768C77.181,132.626 76.954,132.626 76.84,132.768L70.201,139.378C70.059,139.52 70.059,139.747 70.201,139.861L72.187,141.847C72.329,141.989 72.556,141.989 72.698,141.847Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M84.728,111.176L80.784,107.232C80.614,107.062 80.358,107.062 80.217,107.232L78.287,109.162C78.117,109.332 78.117,109.587 78.287,109.729L82.231,113.645C82.401,113.815 82.657,113.815 82.799,113.645L84.728,111.715C84.898,111.573 84.898,111.318 84.728,111.176Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M80.586,115.29L76.642,111.375C76.472,111.204 76.216,111.204 76.075,111.375L74.145,113.304C73.975,113.474 73.975,113.73 74.145,113.871L78.089,117.787C78.259,117.957 78.515,117.957 78.657,117.787L80.586,115.858C80.756,115.716 80.756,115.46 80.586,115.29Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M76.358,119.433L72.414,115.517C72.244,115.347 71.988,115.347 71.847,115.517L69.917,117.446C69.747,117.617 69.747,117.872 69.917,118.014L73.861,121.929C74.031,122.1 74.287,122.1 74.428,121.929L76.358,120C76.5,119.858 76.5,119.603 76.358,119.433Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M83.933,80.052L75.989,87.996C75.478,88.507 75.478,89.301 75.989,89.812L79.592,93.415C80.103,93.926 80.897,93.926 81.408,93.415L87.905,86.918C88.274,86.549 88.388,85.981 88.189,85.499L86.033,80.449C85.664,79.626 84.558,79.399 83.933,80.052Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M71.734,85.981L75.649,82.066C75.82,81.896 75.82,81.64 75.649,81.498L73.72,79.569C73.55,79.399 73.294,79.399 73.152,79.569L69.237,83.513C69.067,83.683 69.067,83.939 69.237,84.08L71.166,86.01C71.308,86.152 71.564,86.152 71.734,85.981Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M72.443,104.225L78.997,97.671C79.167,97.501 79.167,97.245 78.997,97.103L77.067,95.174C76.897,95.004 76.642,95.004 76.5,95.174L69.946,101.728C69.776,101.898 69.776,102.154 69.946,102.296L71.875,104.225C72.046,104.395 72.301,104.395 72.443,104.225Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M99.226,96.649L95.282,92.734C95.112,92.564 94.857,92.564 94.715,92.734L92.785,94.663C92.615,94.834 92.615,95.089 92.785,95.231L96.729,99.146C96.899,99.316 97.155,99.316 97.297,99.146L99.226,97.217C99.396,97.075 99.396,96.82 99.226,96.649Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M95.084,100.792L91.14,96.877C90.97,96.706 90.715,96.706 90.573,96.877L88.643,98.806C88.473,98.976 88.473,99.231 88.643,99.373L92.587,103.289C92.757,103.459 93.013,103.459 93.155,103.289L95.084,101.359C95.254,101.217 95.254,100.962 95.084,100.792Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M133.188,213.062L160.936,185.342V181.313L131.202,211.076L133.188,213.062Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M160,90.209C159.773,89.982 159.433,89.982 159.206,90.209L152.879,96.536C152.652,96.763 152.652,97.103 152.879,97.33L154.581,99.033C154.808,99.26 155.149,99.26 155.375,99.033L160.936,93.472V91.145L160,90.209Z"
android:fillColor="#A9D2FE"/>
<path
android:pathData="M64.044,60.9H160.936V61.326H161.362V208.295C161.362,213.439 157.171,217.63 152.027,217.63H73.379C68.235,217.63 64.044,213.439 64.044,208.295V60.9ZM160.511,61.751H64.896V208.295C64.896,212.968 68.706,216.778 73.379,216.778H152.027C156.701,216.778 160.511,212.968 160.511,208.295V61.751Z"
android:fillColor="#7CA3E4"
android:fillType="evenOdd"/>
<path
android:pathData="M168.228,64.163H57.178V73.554H168.228V64.163Z"
android:strokeAlpha="0.5"
android:fillColor="#6EA5DB"
android:fillAlpha="0.5"/>
<path
android:pathData="M57.49,67.71C54.227,67.71 51.588,65.043 51.588,61.78C51.588,58.517 54.227,55.85 57.461,55.85C57.461,55.85 57.461,55.85 57.49,55.85H162.44V67.71H57.49Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M58.653,65.355C58.653,64.258 59.542,63.368 60.639,63.368H160.567C161.664,63.368 162.553,64.258 162.553,65.355C162.553,66.451 161.664,67.341 160.567,67.341H60.639C59.542,67.341 58.653,66.451 58.653,65.355Z"
android:fillColor="#DCEFF6"
android:fillType="evenOdd"/>
<path
android:pathData="M63.42,61.78C63.42,58.517 60.781,55.85 57.547,55.85C54.313,55.85 51.674,58.517 51.674,61.78C51.674,65.043 54.313,67.71 57.547,67.71C60.781,67.71 63.42,65.071 63.42,61.78Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M162.525,67.71C159.319,67.71 156.709,65.099 156.652,61.893H168.399C168.342,65.128 165.732,67.71 162.525,67.71Z"
android:fillColor="#DCEFF6"/>
<path
android:pathData="M57.462,56.276C54.466,56.276 52.014,58.748 52.014,61.78C52.014,64.81 54.465,67.284 57.49,67.284H162.014V56.276H57.462ZM51.163,61.78C51.163,58.286 53.988,55.424 57.462,55.424H162.865V68.135H57.49C53.99,68.135 51.163,65.275 51.163,61.78Z"
android:fillColor="#DCEFF6"
android:fillType="evenOdd"/>
<path
android:pathData="M162.525,55.85C165.76,55.85 168.399,58.517 168.399,61.78C168.399,61.808 168.399,61.865 168.399,61.893H156.652C156.652,61.865 156.652,61.808 156.652,61.78C156.681,58.517 159.291,55.85 162.525,55.85Z"
android:fillColor="#ACCFFF"/>
<path
android:pathData="M162.525,56.276C159.521,56.276 157.078,58.736 157.078,61.78C157.078,64.824 159.521,67.284 162.525,67.284C165.53,67.284 167.973,64.824 167.973,61.78C167.973,58.736 165.53,56.276 162.525,56.276ZM156.227,61.78C156.227,58.274 159.043,55.424 162.525,55.424C166.008,55.424 168.824,58.274 168.824,61.78C168.824,65.286 166.008,68.135 162.525,68.135C159.043,68.135 156.227,65.286 156.227,61.78Z"
android:fillColor="#7CA3E4"
android:fillType="evenOdd"/>
<path
android:pathData="M52.014,61.78C52.014,64.812 54.466,67.284 57.462,67.284H162.44V68.135H57.462C53.988,68.135 51.163,65.274 51.163,61.78H52.014Z"
android:fillColor="#7CA3E4"
android:fillType="evenOdd"/>
<path
android:pathData="M128.875,26.74H96.048C94.431,26.74 92.955,25.747 92.359,24.243L90.175,18.881H134.72L132.535,24.243C131.939,25.747 130.492,26.74 128.875,26.74Z"
android:fillColor="#40546B"/>
<path
android:pathData="M119.03,22.342H100.475C99.765,22.342 99.198,21.775 99.198,21.065C99.198,20.356 99.765,19.788 100.475,19.788H119.03C119.739,19.788 120.307,20.356 120.307,21.065C120.307,21.775 119.739,22.342 119.03,22.342Z"
android:fillColor="#232833"/>
<path
android:pathData="M125.499,22.342H125.471C124.761,22.342 124.194,21.775 124.194,21.065C124.194,20.356 124.761,19.788 125.471,19.788H125.499C126.208,19.788 126.776,20.356 126.776,21.065C126.776,21.775 126.208,22.342 125.499,22.342Z"
android:fillColor="#232833"/>
<path
android:pathData="M131.997,146.472C131.997,133.193 121.215,122.412 107.937,122.412C94.659,122.412 83.877,133.193 83.877,146.472C83.877,159.75 94.659,170.531 107.937,170.531C121.215,170.531 131.997,159.778 131.997,146.472Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M84.614,152.458C81.068,152.458 78.202,155.324 78.202,158.87C78.202,161.112 79.365,163.098 81.124,164.233C84.132,166.19 84.444,167.524 83.366,169.567C83.338,169.595 83.338,169.623 83.338,169.652C83.338,169.652 83.338,169.652 83.338,169.68C83.252,169.879 83.196,170.077 83.196,170.304C83.196,171.099 83.848,171.751 84.643,171.751C85.437,171.751 86.09,171.099 86.09,170.304C86.09,170.077 86.033,169.879 85.948,169.68C85.948,169.68 85.948,169.68 85.948,169.652C85.948,169.623 85.919,169.595 85.919,169.567C84.841,167.524 85.153,166.19 88.161,164.233C89.92,163.098 91.083,161.112 91.083,158.87C91.026,155.324 88.132,152.458 84.614,152.458Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M81.04,157.877L83.565,157.65L84.615,155.295L85.607,157.679L88.161,157.877L86.232,159.58L86.827,162.076L84.615,160.743L82.401,162.076L82.94,159.551L81.04,157.877Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M147.147,149.564C143.6,149.564 140.735,152.43 140.735,155.976C140.735,158.218 141.898,160.204 143.657,161.339C146.665,163.296 146.977,164.63 145.899,166.673C145.899,166.701 145.87,166.729 145.87,166.758C145.785,166.956 145.728,167.155 145.728,167.382C145.728,168.176 146.381,168.829 147.175,168.829C147.97,168.829 148.622,168.176 148.622,167.382C148.622,167.155 148.566,166.956 148.481,166.758C148.481,166.729 148.452,166.701 148.452,166.673C147.374,164.63 147.686,163.296 150.694,161.339C152.453,160.204 153.616,158.218 153.616,155.976C153.559,152.43 150.694,149.564 147.147,149.564Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M140.593,155.976C140.593,152.351 143.522,149.422 147.147,149.422C150.772,149.422 153.701,152.351 153.701,155.976C153.701,158.268 152.512,160.298 150.714,161.458C150.648,161.5 150.56,161.481 150.517,161.416C150.475,161.35 150.494,161.262 150.56,161.22C152.28,160.11 153.417,158.168 153.417,155.976C153.417,152.508 150.615,149.706 147.147,149.706C143.679,149.706 140.876,152.508 140.876,155.976C140.876,158.168 142.014,160.11 143.734,161.22C143.8,161.262 143.819,161.35 143.776,161.416C143.734,161.481 143.646,161.5 143.58,161.458C141.782,160.298 140.593,158.268 140.593,155.976Z"
android:fillColor="#B9E8FF"
android:fillType="evenOdd"/>
<path
android:pathData="M143.572,154.955L146.125,154.756L147.147,152.401L148.14,154.756L150.693,154.955L148.792,156.657L149.388,159.182L147.147,157.849L144.934,159.182L145.473,156.629L143.572,154.955Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M91.111,92.592C87.565,92.592 84.699,95.458 84.699,99.004C84.699,101.246 85.863,103.232 87.622,104.367C90.629,106.324 90.941,107.658 89.863,109.701C89.835,109.729 89.835,109.758 89.835,109.786C89.749,109.984 89.693,110.183 89.693,110.41C89.693,111.205 90.345,111.857 91.14,111.857C91.934,111.857 92.587,111.205 92.587,110.41C92.587,110.183 92.53,109.984 92.445,109.786C92.445,109.758 92.416,109.729 92.416,109.701C91.338,107.658 91.65,106.324 94.658,104.367C96.417,103.232 97.58,101.246 97.58,99.004C97.524,95.458 94.63,92.592 91.111,92.592Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M90.253,108.83C90.327,108.858 90.364,108.94 90.336,109.013C90.251,109.24 90.138,109.495 89.997,109.752C89.991,109.773 89.982,109.789 89.977,109.796C89.967,109.815 89.955,109.831 89.945,109.843C89.939,109.851 89.933,109.858 89.927,109.864C89.852,110.044 89.806,110.216 89.806,110.41C89.806,111.126 90.395,111.715 91.111,111.715C91.827,111.715 92.416,111.126 92.416,110.41C92.416,110.21 92.367,110.032 92.288,109.847L92.287,109.844C92.284,109.84 92.281,109.834 92.277,109.827C92.273,109.82 92.269,109.814 92.265,109.809C92.262,109.804 92.26,109.802 92.259,109.801C92.259,109.801 92.259,109.801 92.259,109.801L92.246,109.788L92.237,109.771C92.121,109.569 92.029,109.387 91.968,109.172C91.946,109.097 91.99,109.018 92.065,108.997C92.141,108.975 92.219,109.019 92.241,109.094C92.292,109.273 92.368,109.428 92.475,109.617C92.495,109.64 92.511,109.665 92.52,109.681C92.527,109.692 92.533,109.702 92.536,109.709C92.538,109.713 92.54,109.716 92.541,109.718L92.543,109.721L92.543,109.722L92.543,109.722C92.543,109.722 92.543,109.723 92.416,109.786L92.543,109.722L92.545,109.726L92.547,109.73C92.637,109.94 92.7,110.158 92.7,110.41C92.7,111.283 91.984,111.999 91.111,111.999C90.239,111.999 89.522,111.283 89.522,110.41C89.522,110.158 89.586,109.94 89.676,109.73L89.687,109.705L89.706,109.686C89.706,109.686 89.706,109.686 89.706,109.686L89.707,109.685C89.707,109.684 89.709,109.682 89.711,109.68C89.714,109.677 89.717,109.673 89.721,109.669V109.664L89.739,109.632C89.877,109.383 89.988,109.134 90.071,108.913C90.098,108.84 90.18,108.803 90.253,108.83Z"
android:fillColor="#B9E8FF"
android:fillType="evenOdd"/>
<path
android:pathData="M87.537,97.983L90.062,97.784L91.112,95.429L92.105,97.784L94.658,97.983L92.729,99.714L93.325,102.21L91.112,100.877L88.898,102.21L89.438,99.685L87.537,97.983Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M145.587,94.039C142.04,94.039 139.174,96.905 139.174,100.451C139.174,102.693 140.338,104.679 142.097,105.814C145.104,107.771 145.416,109.105 144.338,111.148C144.338,111.176 144.31,111.205 144.31,111.233C144.225,111.432 144.168,111.63 144.168,111.857C144.168,112.652 144.82,113.304 145.615,113.304C146.409,113.304 147.062,112.652 147.062,111.857C147.062,111.63 147.005,111.432 146.92,111.233C146.92,111.205 146.892,111.176 146.892,111.148C145.813,109.105 146.126,107.771 149.133,105.814C150.892,104.679 152.055,102.693 152.055,100.451C151.999,96.905 149.105,94.039 145.587,94.039Z"
android:fillColor="#FF5C5C"/>
<path
android:pathData="M139.032,100.451C139.032,96.826 141.961,93.897 145.586,93.897C149.183,93.897 152.139,96.826 152.197,100.449L152.197,100.451H152.197C152.197,102.743 151.008,104.773 149.21,105.933C147.71,106.909 146.915,107.711 146.612,108.5C146.315,109.276 146.485,110.074 147.017,111.082L147.033,111.113V111.128C147.037,111.135 147.043,111.148 147.048,111.162C147.051,111.17 147.055,111.182 147.058,111.195C147.144,111.399 147.204,111.612 147.204,111.857C147.204,112.73 146.487,113.446 145.615,113.446C144.742,113.446 144.026,112.73 144.026,111.857C144.026,111.612 144.086,111.399 144.172,111.195C144.174,111.182 144.178,111.17 144.181,111.162C144.186,111.148 144.193,111.135 144.196,111.128V111.113L144.212,111.082C144.744,110.074 144.914,109.276 144.617,108.5C144.315,107.711 143.519,106.909 142.019,105.933C140.221,104.773 139.032,102.743 139.032,100.451ZM145.586,94.181C142.118,94.181 139.316,96.983 139.316,100.451C139.316,102.643 140.453,104.585 142.173,105.695L142.174,105.695C143.681,106.676 144.545,107.52 144.882,108.398C145.22,109.282 145.013,110.167 144.474,111.193C144.472,111.203 144.469,111.212 144.466,111.219C144.461,111.233 144.455,111.246 144.451,111.252V111.262L144.44,111.289C144.36,111.476 144.31,111.655 144.31,111.857C144.31,112.573 144.899,113.162 145.615,113.162C146.331,113.162 146.92,112.573 146.92,111.857C146.92,111.655 146.87,111.476 146.789,111.289L146.778,111.262V111.252C146.775,111.246 146.768,111.233 146.763,111.219C146.76,111.212 146.758,111.203 146.755,111.193C146.217,110.167 146.009,109.282 146.348,108.398C146.684,107.52 147.548,106.676 149.055,105.695L149.056,105.695C150.776,104.585 151.913,102.643 151.913,100.452C151.857,96.983 149.026,94.181 145.586,94.181Z"
android:fillColor="#B9E8FF"
android:fillType="evenOdd"/>
<path
android:pathData="M142.012,99.43L144.537,99.231L145.587,96.877L146.58,99.231L149.133,99.43L147.204,101.161L147.8,103.657L145.587,102.324L143.374,103.657L143.913,101.132L142.012,99.43Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M107.908,104.934C107.986,104.934 108.05,104.998 108.05,105.076V113.9C108.05,113.978 107.986,114.042 107.908,114.042C107.83,114.042 107.766,113.978 107.766,113.9V105.076C107.766,104.998 107.83,104.934 107.908,104.934Z"
android:fillColor="#877C70"
android:fillType="evenOdd"/>
<path
android:pathData="M96.417,158.36H97.438H104.134C105.156,155.636 107.794,153.678 110.887,153.678L113.384,158.36H117.781H121.129L116.079,148.259L112.958,139.01H112.362L109.241,119.347H106.886L105.184,139.01H104.588L102.886,148.259L96.417,158.36Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M117.242,147.408H101.723V148.344H117.242V147.408Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M105.298,147.408L106.603,142.244H105.667L103.879,147.408H105.298Z"
android:fillColor="#877C70"/>
<path
android:pathData="M107.142,117.787H109.015L108.305,112.169H107.851L107.142,117.787Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M101.723,148.316H117.271L116.59,149.252H102.404L101.723,148.316Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M113.894,138.414H103.68V139.35H113.894V138.414Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M103.68,139.322H113.894L113.242,140.258H104.333L103.68,139.322Z"
android:fillColor="#877C70"/>
<path
android:pathData="M109.78,117.333H106.375V121.362H109.78V117.333Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M102.829,158.36C104.759,152.401 102.631,151.834 100.276,158.36H102.829Z"
android:fillColor="#877C70"/>
<path
android:pathData="M111.54,148.259L109.837,139.01H109.242L108.248,119.347H106.603L103.482,139.01H102.886L99.765,148.259L94.715,158.36H98.063H98.205C99.226,155.636 101.865,153.678 104.957,153.678C108.05,153.678 110.689,155.636 111.71,158.36H114.15H115.171L111.54,148.259ZM102.914,148.259L105.071,142.244H107.681L108.419,148.259H102.914Z"
android:fillColor="#D4CFCA"/>
<path
android:pathData="M112.703,147.408H98.602V148.344H112.703V147.408Z"
android:fillColor="#EBE8E6"/>
<path
android:pathData="M108.277,117.787H106.858L107.568,112.169H108.022L108.277,117.787Z"
android:fillColor="#D4CFCA"/>
<path
android:pathData="M112.731,148.316H98.602L99.254,149.252H112.05L112.731,148.316Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M110.773,138.414H101.978V139.35H110.773V138.414Z"
android:fillColor="#EBE8E6"/>
<path
android:pathData="M110.773,139.322H101.978L102.631,140.258H110.121L110.773,139.322Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M109.78,119.347H106.092V121.39H109.78V119.347Z"
android:fillColor="#877C70"/>
<path
android:pathData="M109.27,117.333H106.092V121.362H109.27V117.333Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M110.263,118.184H105.894V120.511H110.263V118.184Z"
android:fillColor="#B2A99D"/>
<path
android:pathData="M109.27,118.184H105.61V120.511H109.27V118.184Z"
android:fillColor="#EBE8E6"/>
<path
android:pathData="M116.59,158.36C114.66,152.401 116.788,151.834 119.143,158.36H116.59Z"
android:fillColor="#877C70"/>
<path
android:pathData="M112.987,147.408L111.824,142.13H112.732L114.406,147.408H112.987Z"
android:fillColor="#877C70"/>
<path
android:pathData="M122.407,199.414C122.407,205.94 117.129,211.217 110.604,211.217C104.078,211.217 98.801,205.94 98.801,199.414C98.801,192.889 104.078,187.611 110.604,187.611C117.129,187.611 122.407,192.889 122.407,199.414Z"
android:fillColor="#FFFDFF"/>
<path
android:pathData="M116.505,198.28L111.228,202.167C110.859,202.45 110.348,202.45 109.951,202.167L104.702,198.308C104.447,198.109 104.447,197.741 104.702,197.542L109.98,193.655C110.348,193.371 110.859,193.371 111.256,193.655L116.505,197.485C116.789,197.684 116.789,198.081 116.505,198.28Z"
android:fillColor="#3073C4"/>
<path
android:pathData="M116.505,200.493L115.909,200.039L111.228,203.472C110.859,203.755 110.348,203.755 109.951,203.472L105.298,200.067L104.702,200.521C104.447,200.72 104.447,201.088 104.702,201.287L109.951,205.117C110.32,205.401 110.831,205.401 111.228,205.117L116.505,201.23C116.789,201.088 116.789,200.691 116.505,200.493Z"
android:fillColor="#3073C4"/>
<path
android:pathData="M83.526,117.635C84.08,117.081 84.978,117.081 85.532,117.635L93.306,125.409C93.86,125.963 93.86,126.861 93.306,127.415C92.752,127.969 91.854,127.969 91.3,127.415L83.526,119.641C82.972,119.087 82.972,118.189 83.526,117.635Z"
android:fillColor="#FF5C5C"
android:fillType="evenOdd"/>
</vector>

8
android/res/values/arrays.xml
View file

@ -3,15 +3,15 @@
<!-- What's new -->
<integer-array name="news_images">
<item>@drawable/img_wnew_newguides</item>
<item>@drawable/ic_img_whatsnew_trial</item>
</integer-array>
<string-array name="news_title_keys">
<item>whatsnew_guides_on_map_title</item>
<item>whatsnew_trial_title</item>
</string-array>
<string-array name="news_messages_1">
<item>@string/whatsnew_guides_on_map_message</item>
<item>@string/whatsnew_trial_message</item>
</string-array>
<string-array name="news_messages_2">
@ -19,7 +19,7 @@
</string-array>
<string-array name="news_button_labels">
<item/>
<item>@string/whatsnew_trial_cta</item>
</string-array>
<string-array name="news_button_links">

20
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
View file

@ -25,6 +25,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.android.billingclient.api.SkuDetails;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.PrivateVariables;
@ -35,7 +36,6 @@ import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.AlertDialog;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.dialog.ConfirmationDialogFactory;
import com.mapswithme.maps.metrics.UserActionsLogger;
import com.mapswithme.maps.purchase.AbstractProductDetailsLoadingCallback;
import com.mapswithme.maps.purchase.BillingManager;
@ -244,7 +244,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
if (requestCode == PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION)
{
mWebView.reload();
showSubscriptionSuccessDialog();
showSubscriptionSuccessDialog(this);
return;
}
@ -252,19 +252,11 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
mWebView.reload();
}
private void showSubscriptionSuccessDialog()
private static void showSubscriptionSuccessDialog(@NonNull Fragment fragment)
{
AlertDialog dialog = new AlertDialog.Builder()
.setTitleId(R.string.subscription_success_dialog_title)
.setMessageId(R.string.subscription_success_dialog_message)
.setPositiveBtnId(R.string.subscription_error_button)
.setReqCode(PurchaseUtils.REQ_CODE_BMK_SUBS_SUCCESS_DIALOG)
.setFragManagerStrategyType(AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
.setDialogViewStrategyType(AlertDialog.DialogViewStrategyType.CONFIRMATION_DIALOG)
.setDialogFactory(new ConfirmationDialogFactory())
.build();
dialog.setTargetFragment(this, PurchaseUtils.REQ_CODE_BMK_SUBS_SUCCESS_DIALOG);
dialog.show(this, PurchaseUtils.DIALOG_TAG_BMK_SUBSCRIPTION_SUCCESS);
PurchaseUtils.showSubscriptionSuccessDialog(fragment,
PurchaseUtils.DIALOG_TAG_BMK_SUBSCRIPTION_SUCCESS,
PurchaseUtils.REQ_CODE_BMK_SUBS_SUCCESS_DIALOG);
}
@Override

12
android/src/com/mapswithme/maps/onboarding/BaseNewsFragment.java
View file

@ -29,8 +29,6 @@ import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
@ -207,7 +205,7 @@ public abstract class BaseNewsFragment extends BaseMwmDialogFragment
private void processButton(int position, @NonNull View res)
{
TextView button = res.findViewById(R.id.button);
final TextView button = res.findViewById(R.id.button);
PromoButton promo = mPromoButtons.get(position);
if (promo == null || TextUtils.isEmpty(promo.getLabel()))
{
@ -216,13 +214,11 @@ public abstract class BaseNewsFragment extends BaseMwmDialogFragment
}
button.setText(promo.getLabel());
button.setOnClickListener(v -> {
BookmarksCatalogActivity.startForResult(
BaseNewsFragment.this,
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY, promo.getLink());
});
button.setOnClickListener(v -> onPromoButtonClicked(button));
}
abstract void onPromoButtonClicked(@NonNull View view);
@Override
public void destroyItem(ViewGroup container, int position, Object object)
{

75
android/src/com/mapswithme/maps/onboarding/NewsFragment.java
View file

@ -1,6 +1,9 @@
package com.mapswithme.maps.onboarding;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -8,14 +11,24 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.downloader.UpdaterDialogFragment;
import com.mapswithme.maps.purchase.BookmarksAllSubscriptionActivity;
import com.mapswithme.maps.purchase.PurchaseUtils;
import com.mapswithme.util.Counters;
import com.mapswithme.util.SharedPropertiesUtils;
import com.mapswithme.util.UTM;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.statistics.Statistics;
public class NewsFragment extends BaseNewsFragment
public class NewsFragment extends BaseNewsFragment implements AlertDialogCallback
{
private class Adapter extends BaseNewsFragment.Adapter
{
@Override
@ -65,6 +78,15 @@ public class NewsFragment extends BaseNewsFragment
{
return R.array.news_images;
}
@Override
void onPromoButtonClicked(@NonNull View view)
{
UiUtils.hide(view);
BookmarksAllSubscriptionActivity.startForResult(NewsFragment.this,
PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION,
Statistics.ParamValue.WHATSNEW);
}
}
@Override
@ -132,4 +154,53 @@ public class NewsFragment extends BaseNewsFragment
return sb.toString().trim();
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
if (resultCode != Activity.RESULT_OK)
return;
switch (requestCode)
{
case PurchaseUtils.REQ_CODE_PAY_SUBSCRIPTION:
PurchaseUtils.showSubscriptionSuccessDialog(this,
PurchaseUtils.DIALOG_TAG_BMK_SUBSCRIPTION_SUCCESS,
PurchaseUtils.REQ_CODE_BMK_SUBS_SUCCESS_DIALOG);
break;
case BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY:
if (data == null)
break;
BookmarkCategory category
= data.getParcelableExtra(BookmarksCatalogActivity.EXTRA_DOWNLOADED_CATEGORY);
if (category == null)
throw new IllegalArgumentException("Category not found in bundle");
Framework.nativeShowBookmarkCategory(category.getId());
break;
}
}
@Override
public void onAlertDialogPositiveClick(int requestCode, int which)
{
if (requestCode == PurchaseUtils.REQ_CODE_BMK_SUBS_SUCCESS_DIALOG)
BookmarksCatalogActivity.startForResult(this,
BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY,
BookmarkManager.INSTANCE.getCatalogFrontendUrl(UTM.UTM_NONE));
}
@Override
public void onAlertDialogNegativeClick(int requestCode, int which)
{
// No op.
}
@Override
public void onAlertDialogCancel(int requestCode)
{
// No op.
}
}

17
android/src/com/mapswithme/maps/purchase/PurchaseUtils.java
View file

@ -10,6 +10,7 @@ import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.SkuDetails;
import com.mapswithme.maps.R;
import com.mapswithme.maps.dialog.AlertDialog;
import com.mapswithme.maps.dialog.ConfirmationDialogFactory;
import com.mapswithme.util.CrashlyticsUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
@ -212,6 +213,22 @@ public class PurchaseUtils
return SubscriptionType.BOOKMARKS_ALL.getServerId();
}
public static void showSubscriptionSuccessDialog(@NonNull Fragment targetFragment,
@NonNull String tag, int reqCode)
{
AlertDialog dialog = new AlertDialog.Builder()
.setTitleId(R.string.subscription_success_dialog_title)
.setMessageId(R.string.subscription_success_dialog_message)
.setPositiveBtnId(R.string.subscription_error_button)
.setReqCode(reqCode)
.setFragManagerStrategyType(AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
.setDialogViewStrategyType(AlertDialog.DialogViewStrategyType.CONFIRMATION_DIALOG)
.setDialogFactory(new ConfirmationDialogFactory())
.build();
dialog.setTargetFragment(targetFragment, reqCode);
dialog.show(targetFragment, tag);
}
enum Period
{
// Order is important.

1
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -751,6 +751,7 @@ public enum Statistics
public static final String SPONSORED_BUTTON = "sponsored_button";
public static final String POPUP = "popup";
public static final String WEBVIEW = "webview";
public static final String WHATSNEW = "whatsnew";
public static final String ONBOARDING_GUIDES_SUBSCRIPTION = "onboarding_guides_subscription";
public static final String PLUS = "plus";
public static final String DOWNLOAD = "download";