Merge remote-tracking branch 'origin/master' into slope_hillshade_ui
This commit is contained in:
veliymolfar
commit
3a546f4d6a
1 changed files with 102 additions and 0 deletions
102
OsmAnd/res/drawable/img_legend_slope.xml
Normal file
102
OsmAnd/res/drawable/img_legend_slope.xml
Normal file
|
|
@ -0,0 +1,102 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:aapt="http://schemas.android.com/aapt"
|
||||||
|
android:width="328dp"
|
||||||
|
android:height="73dp"
|
||||||
|
android:viewportWidth="328"
|
||||||
|
android:viewportHeight="73">
|
||||||
|
<path
|
||||||
|
android:pathData="M0,0h328v48h-328z">
|
||||||
|
<aapt:attr name="android:fillColor">
|
||||||
|
<gradient
|
||||||
|
android:startY="24"
|
||||||
|
android:startX="2.13832E-6"
|
||||||
|
android:endY="24"
|
||||||
|
android:endX="328"
|
||||||
|
android:type="linear">
|
||||||
|
<item android:offset="0" android:color="#FFFFFFFF"/>
|
||||||
|
<item android:offset="0.146341" android:color="#FF2EB900"/>
|
||||||
|
<item android:offset="0.278963" android:color="#FFFFDE02"/>
|
||||||
|
<item android:offset="0.567073" android:color="#FFFF0101"/>
|
||||||
|
<item android:offset="0.998611" android:color="#FF8201FF"/>
|
||||||
|
</gradient>
|
||||||
|
</aapt:attr>
|
||||||
|
</path>
|
||||||
|
<path
|
||||||
|
android:pathData="M7.068,64.755C7.068,66.236 6.815,67.337 6.31,68.057C5.804,68.777 5.013,69.137 3.938,69.137C2.876,69.137 2.09,68.786 1.579,68.084C1.069,67.378 0.804,66.325 0.786,64.926V63.237C0.786,61.774 1.039,60.688 1.545,59.977C2.051,59.266 2.844,58.91 3.924,58.91C4.995,58.91 5.783,59.254 6.289,59.942C6.795,60.626 7.055,61.683 7.068,63.114V64.755ZM5.804,63.025C5.804,61.954 5.653,61.175 5.353,60.688C5.052,60.195 4.576,59.949 3.924,59.949C3.277,59.949 2.805,60.193 2.509,60.681C2.213,61.168 2.06,61.918 2.051,62.93V64.953C2.051,66.029 2.206,66.824 2.516,67.339C2.83,67.849 3.304,68.104 3.938,68.104C4.562,68.104 5.024,67.863 5.325,67.38C5.631,66.897 5.79,66.136 5.804,65.097V63.025Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M9.03,60.688C9.03,60.214 9.199,59.799 9.536,59.443C9.878,59.088 10.29,58.91 10.773,58.91C11.247,58.91 11.65,59.088 11.983,59.443C12.32,59.794 12.489,60.209 12.489,60.688C12.489,61.171 12.32,61.583 11.983,61.925C11.65,62.267 11.247,62.438 10.773,62.438C10.295,62.438 9.884,62.267 9.543,61.925C9.201,61.583 9.03,61.171 9.03,60.688ZM10.773,61.563C11.019,61.563 11.227,61.483 11.395,61.323C11.564,61.159 11.648,60.947 11.648,60.688C11.648,60.423 11.564,60.207 11.395,60.038C11.227,59.865 11.019,59.778 10.773,59.778C10.523,59.778 10.311,59.869 10.137,60.052C9.969,60.229 9.884,60.441 9.884,60.688C9.884,60.934 9.969,61.141 10.137,61.31C10.311,61.478 10.523,61.563 10.773,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M43.837,63.408H44.787C45.384,63.399 45.854,63.242 46.196,62.937C46.537,62.631 46.708,62.219 46.708,61.699C46.708,60.533 46.127,59.949 44.965,59.949C44.418,59.949 43.981,60.106 43.653,60.421C43.329,60.731 43.167,61.143 43.167,61.658H41.903C41.903,60.87 42.19,60.216 42.764,59.696C43.343,59.172 44.076,58.91 44.965,58.91C45.904,58.91 46.64,59.159 47.173,59.655C47.706,60.152 47.973,60.842 47.973,61.727C47.973,62.16 47.832,62.579 47.549,62.984C47.271,63.39 46.891,63.693 46.408,63.894C46.954,64.067 47.376,64.354 47.672,64.755C47.973,65.156 48.123,65.646 48.123,66.225C48.123,67.118 47.832,67.826 47.248,68.351C46.665,68.875 45.906,69.137 44.972,69.137C44.038,69.137 43.277,68.884 42.689,68.378C42.105,67.872 41.814,67.204 41.814,66.375H43.085C43.085,66.899 43.256,67.318 43.598,67.633C43.94,67.947 44.398,68.104 44.972,68.104C45.583,68.104 46.05,67.945 46.373,67.626C46.697,67.307 46.859,66.849 46.859,66.252C46.859,65.673 46.681,65.229 46.326,64.919C45.97,64.609 45.457,64.45 44.787,64.44H43.837V63.408Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M50.201,60.688C50.201,60.214 50.37,59.799 50.707,59.443C51.049,59.088 51.461,58.91 51.944,58.91C52.418,58.91 52.822,59.088 53.154,59.443C53.492,59.794 53.66,60.209 53.66,60.688C53.66,61.171 53.492,61.583 53.154,61.925C52.822,62.267 52.418,62.438 51.944,62.438C51.466,62.438 51.056,62.267 50.714,61.925C50.372,61.583 50.201,61.171 50.201,60.688ZM51.944,61.563C52.19,61.563 52.398,61.483 52.566,61.323C52.735,61.159 52.819,60.947 52.819,60.688C52.819,60.423 52.735,60.207 52.566,60.038C52.398,59.865 52.19,59.778 51.944,59.778C51.694,59.778 51.482,59.869 51.309,60.052C51.14,60.229 51.056,60.441 51.056,60.688C51.056,60.934 51.14,61.141 51.309,61.31C51.482,61.478 51.694,61.563 51.944,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M89.084,69H87.812V60.571L85.263,61.508V60.359L88.886,58.999H89.084V69Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M99.31,64.755C99.31,66.236 99.057,67.337 98.551,68.057C98.046,68.777 97.255,69.137 96.179,69.137C95.118,69.137 94.331,68.786 93.821,68.084C93.311,67.378 93.046,66.325 93.028,64.926V63.237C93.028,61.774 93.281,60.688 93.787,59.977C94.293,59.266 95.086,58.91 96.166,58.91C97.237,58.91 98.025,59.254 98.531,59.942C99.037,60.626 99.297,61.683 99.31,63.114V64.755ZM98.046,63.025C98.046,61.954 97.895,61.175 97.594,60.688C97.294,60.195 96.817,59.949 96.166,59.949C95.519,59.949 95.047,60.193 94.751,60.681C94.454,61.168 94.302,61.918 94.293,62.93V64.953C94.293,66.029 94.448,66.824 94.757,67.339C95.072,67.849 95.546,68.104 96.179,68.104C96.804,68.104 97.266,67.863 97.567,67.38C97.872,66.897 98.032,66.136 98.046,65.097V63.025Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M101.272,60.688C101.272,60.214 101.44,59.799 101.778,59.443C102.119,59.088 102.532,58.91 103.015,58.91C103.489,58.91 103.892,59.088 104.225,59.443C104.562,59.794 104.731,60.209 104.731,60.688C104.731,61.171 104.562,61.583 104.225,61.925C103.892,62.267 103.489,62.438 103.015,62.438C102.536,62.438 102.126,62.267 101.785,61.925C101.443,61.583 101.272,61.171 101.272,60.688ZM103.015,61.563C103.261,61.563 103.468,61.483 103.637,61.323C103.806,61.159 103.89,60.947 103.89,60.688C103.89,60.423 103.806,60.207 103.637,60.038C103.468,59.865 103.261,59.778 103.015,59.778C102.764,59.778 102.552,59.869 102.379,60.052C102.211,60.229 102.126,60.441 102.126,60.688C102.126,60.934 102.211,61.141 102.379,61.31C102.552,61.478 102.764,61.563 103.015,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M182.767,63.408H183.717C184.314,63.399 184.783,63.242 185.125,62.937C185.467,62.631 185.638,62.219 185.638,61.699C185.638,60.533 185.057,59.949 183.894,59.949C183.348,59.949 182.91,60.106 182.582,60.421C182.258,60.731 182.097,61.143 182.097,61.658H180.832C180.832,60.87 181.119,60.216 181.693,59.696C182.272,59.172 183.006,58.91 183.894,58.91C184.833,58.91 185.569,59.159 186.102,59.655C186.636,60.152 186.902,60.842 186.902,61.727C186.902,62.16 186.761,62.579 186.478,62.984C186.2,63.39 185.82,63.693 185.337,63.894C185.884,64.067 186.305,64.354 186.601,64.755C186.902,65.156 187.053,65.646 187.053,66.225C187.053,67.118 186.761,67.826 186.178,68.351C185.594,68.875 184.836,69.137 183.901,69.137C182.967,69.137 182.206,68.884 181.618,68.378C181.035,67.872 180.743,67.204 180.743,66.375H182.015C182.015,66.899 182.185,67.318 182.527,67.633C182.869,67.947 183.327,68.104 183.901,68.104C184.512,68.104 184.979,67.945 185.303,67.626C185.626,67.307 185.788,66.849 185.788,66.252C185.788,65.673 185.61,65.229 185.255,64.919C184.899,64.609 184.387,64.45 183.717,64.44H182.767V63.408Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M195.31,64.755C195.31,66.236 195.057,67.337 194.551,68.057C194.046,68.777 193.255,69.137 192.179,69.137C191.117,69.137 190.331,68.786 189.821,68.084C189.311,67.378 189.046,66.325 189.028,64.926V63.237C189.028,61.774 189.281,60.688 189.787,59.977C190.293,59.266 191.086,58.91 192.166,58.91C193.237,58.91 194.025,59.254 194.531,59.942C195.037,60.626 195.297,61.683 195.31,63.114V64.755ZM194.046,63.025C194.046,61.954 193.895,61.175 193.594,60.688C193.294,60.195 192.817,59.949 192.166,59.949C191.519,59.949 191.047,60.193 190.751,60.681C190.454,61.168 190.302,61.918 190.293,62.93V64.953C190.293,66.029 190.448,66.824 190.757,67.339C191.072,67.849 191.546,68.104 192.179,68.104C192.804,68.104 193.266,67.863 193.567,67.38C193.872,66.897 194.032,66.136 194.046,65.097V63.025Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M197.272,60.688C197.272,60.214 197.44,59.799 197.778,59.443C198.119,59.088 198.532,58.91 199.015,58.91C199.489,58.91 199.892,59.088 200.225,59.443C200.562,59.794 200.731,60.209 200.731,60.688C200.731,61.171 200.562,61.583 200.225,61.925C199.892,62.267 199.489,62.438 199.015,62.438C198.536,62.438 198.126,62.267 197.785,61.925C197.443,61.583 197.272,61.171 197.272,60.688ZM199.015,61.563C199.261,61.563 199.468,61.483 199.637,61.323C199.806,61.159 199.89,60.947 199.89,60.688C199.89,60.423 199.806,60.207 199.637,60.038C199.468,59.865 199.261,59.778 199.015,59.778C198.764,59.778 198.552,59.869 198.379,60.052C198.211,60.229 198.126,60.441 198.126,60.688C198.126,60.934 198.211,61.141 198.379,61.31C198.552,61.478 198.764,61.563 199.015,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M135.449,69H128.928V68.091L132.373,64.263C132.883,63.684 133.234,63.215 133.426,62.854C133.622,62.49 133.72,62.114 133.72,61.727C133.72,61.207 133.562,60.781 133.248,60.448C132.934,60.116 132.514,59.949 131.99,59.949C131.361,59.949 130.871,60.129 130.52,60.489C130.174,60.845 130.001,61.341 130.001,61.979H128.736C128.736,61.063 129.03,60.323 129.618,59.758C130.211,59.193 131.001,58.91 131.99,58.91C132.915,58.91 133.647,59.154 134.184,59.642C134.722,60.125 134.991,60.77 134.991,61.576C134.991,62.556 134.367,63.723 133.118,65.076L130.452,67.968H135.449V69Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M143.31,64.755C143.31,66.236 143.057,67.337 142.551,68.057C142.046,68.777 141.255,69.137 140.179,69.137C139.117,69.137 138.331,68.786 137.821,68.084C137.311,67.378 137.046,66.325 137.028,64.926V63.237C137.028,61.774 137.281,60.688 137.787,59.977C138.293,59.266 139.086,58.91 140.166,58.91C141.237,58.91 142.025,59.254 142.531,59.942C143.037,60.626 143.297,61.683 143.31,63.114V64.755ZM142.046,63.025C142.046,61.954 141.895,61.175 141.594,60.688C141.294,60.195 140.817,59.949 140.166,59.949C139.519,59.949 139.047,60.193 138.751,60.681C138.454,61.168 138.302,61.918 138.293,62.93V64.953C138.293,66.029 138.448,66.824 138.757,67.339C139.072,67.849 139.546,68.104 140.179,68.104C140.804,68.104 141.266,67.863 141.567,67.38C141.872,66.897 142.032,66.136 142.046,65.097V63.025Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M145.272,60.688C145.272,60.214 145.44,59.799 145.778,59.443C146.119,59.088 146.532,58.91 147.015,58.91C147.489,58.91 147.892,59.088 148.225,59.443C148.562,59.794 148.731,60.209 148.731,60.688C148.731,61.171 148.562,61.583 148.225,61.925C147.892,62.267 147.489,62.438 147.015,62.438C146.536,62.438 146.126,62.267 145.785,61.925C145.443,61.583 145.272,61.171 145.272,60.688ZM147.015,61.563C147.261,61.563 147.468,61.483 147.637,61.323C147.806,61.159 147.89,60.947 147.89,60.688C147.89,60.423 147.806,60.207 147.637,60.038C147.468,59.865 147.261,59.778 147.015,59.778C146.764,59.778 146.552,59.869 146.379,60.052C146.211,60.229 146.126,60.441 146.126,60.688C146.126,60.934 146.211,61.141 146.379,61.31C146.552,61.478 146.764,61.563 147.015,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M243.267,65.657H244.647V66.689H243.267V69H241.995V66.689H237.463V65.944L241.92,59.047H243.267V65.657ZM238.898,65.657H241.995V60.776L241.845,61.05L238.898,65.657Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M246.65,64.01L247.156,59.047H252.256V60.216H248.229L247.928,62.93C248.416,62.643 248.97,62.499 249.589,62.499C250.496,62.499 251.216,62.8 251.75,63.401C252.283,63.998 252.549,64.807 252.549,65.828C252.549,66.854 252.271,67.662 251.715,68.255C251.164,68.843 250.392,69.137 249.398,69.137C248.519,69.137 247.801,68.893 247.245,68.405C246.689,67.918 246.372,67.243 246.295,66.382H247.491C247.568,66.951 247.771,67.382 248.099,67.674C248.427,67.961 248.86,68.104 249.398,68.104C249.986,68.104 250.446,67.904 250.779,67.503C251.116,67.102 251.285,66.548 251.285,65.842C251.285,65.176 251.103,64.643 250.738,64.242C250.378,63.837 249.897,63.634 249.296,63.634C248.744,63.634 248.311,63.755 247.997,63.996L247.662,64.27L246.65,64.01Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M254.272,60.688C254.272,60.214 254.44,59.799 254.778,59.443C255.119,59.088 255.532,58.91 256.015,58.91C256.489,58.91 256.892,59.088 257.225,59.443C257.562,59.794 257.731,60.209 257.731,60.688C257.731,61.171 257.562,61.583 257.225,61.925C256.892,62.267 256.489,62.438 256.015,62.438C255.536,62.438 255.126,62.267 254.785,61.925C254.443,61.583 254.272,61.171 254.272,60.688ZM256.015,61.563C256.261,61.563 256.468,61.483 256.637,61.323C256.806,61.159 256.89,60.947 256.89,60.688C256.89,60.423 256.806,60.207 256.637,60.038C256.468,59.865 256.261,59.778 256.015,59.778C255.764,59.778 255.552,59.869 255.379,60.052C255.211,60.229 255.126,60.441 255.126,60.688C255.126,60.934 255.211,61.141 255.379,61.31C255.552,61.478 255.764,61.563 256.015,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M311.991,59.04V60.113H311.759C310.774,60.132 309.99,60.423 309.407,60.988C308.824,61.553 308.487,62.349 308.395,63.374C308.919,62.772 309.635,62.472 310.542,62.472C311.408,62.472 312.098,62.777 312.613,63.388C313.133,63.998 313.392,64.787 313.392,65.753C313.392,66.778 313.112,67.599 312.552,68.214C311.996,68.829 311.248,69.137 310.309,69.137C309.357,69.137 308.584,68.772 307.992,68.043C307.4,67.309 307.103,66.366 307.103,65.213V64.728C307.103,62.896 307.493,61.496 308.272,60.53C309.056,59.56 310.221,59.063 311.765,59.04H311.991ZM310.33,63.524C309.897,63.524 309.498,63.654 309.134,63.914C308.769,64.174 308.516,64.5 308.375,64.892V65.356C308.375,66.177 308.559,66.838 308.929,67.339C309.298,67.84 309.758,68.091 310.309,68.091C310.879,68.091 311.326,67.881 311.649,67.462C311.977,67.043 312.141,66.493 312.141,65.814C312.141,65.131 311.975,64.579 311.642,64.16C311.314,63.736 310.877,63.524 310.33,63.524Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M321.411,64.755C321.411,66.236 321.158,67.337 320.652,68.057C320.146,68.777 319.355,69.137 318.28,69.137C317.218,69.137 316.432,68.786 315.921,68.084C315.411,67.378 315.147,66.325 315.128,64.926V63.237C315.128,61.774 315.381,60.688 315.887,59.977C316.393,59.266 317.186,58.91 318.266,58.91C319.337,58.91 320.126,59.254 320.631,59.942C321.137,60.626 321.397,61.683 321.411,63.114V64.755ZM320.146,63.025C320.146,61.954 319.996,61.175 319.695,60.688C319.394,60.195 318.918,59.949 318.266,59.949C317.619,59.949 317.147,60.193 316.851,60.681C316.555,61.168 316.402,61.918 316.393,62.93V64.953C316.393,66.029 316.548,66.824 316.858,67.339C317.172,67.849 317.646,68.104 318.28,68.104C318.904,68.104 319.367,67.863 319.668,67.38C319.973,66.897 320.132,66.136 320.146,65.097V63.025Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M323.372,60.688C323.372,60.214 323.541,59.799 323.878,59.443C324.22,59.088 324.632,58.91 325.116,58.91C325.589,58.91 325.993,59.088 326.325,59.443C326.663,59.794 326.831,60.209 326.831,60.688C326.831,61.171 326.663,61.583 326.325,61.925C325.993,62.267 325.589,62.438 325.116,62.438C324.637,62.438 324.227,62.267 323.885,61.925C323.543,61.583 323.372,61.171 323.372,60.688ZM325.116,61.563C325.362,61.563 325.569,61.483 325.738,61.323C325.906,61.159 325.991,60.947 325.991,60.688C325.991,60.423 325.906,60.207 325.738,60.038C325.569,59.865 325.362,59.778 325.116,59.778C324.865,59.778 324.653,59.869 324.48,60.052C324.311,60.229 324.227,60.441 324.227,60.688C324.227,60.934 324.311,61.141 324.48,61.31C324.653,61.478 324.865,61.563 325.116,61.563Z"
|
||||||
|
android:fillColor="#727272"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M0,48H1V54H0V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M47,48H48V54H47V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M92,48H93V54H92V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M186,48H187V54H186V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M137,48H138V54H137V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M242,48H243V54H242V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M327,48H328V54H327V48Z"
|
||||||
|
android:fillColor="#CBC7D1"/>
|
||||||
|
</vector>
|
||||||
Loading…
Reference in a new issue