forked from organicmaps/organicmaps
[android] Added matrix, email, OSM links
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
Viktor Govako
parent
967ce63f0e
commit
0301f7678e
5 changed files with 126 additions and 55 deletions
9
android/res/drawable/ic_matrix.xml
Normal file
9
android/res/drawable/ic_matrix.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:height="24dp"
|
||||
android:width="22.95dp"
|
||||
android:viewportHeight="336.807"
|
||||
android:viewportWidth="322.008">
|
||||
<path android:fillColor="#FF000000" android:pathData="m8.876,7.71v321.386h23.13v7.711H0V0h32.006v7.71z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="m97.989,109.594v16.264h0.463c4.338,-6.191 9.563,-10.998 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869v80.385h-32.993v-68.074c0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035v66.91h-32.991v-67.375c0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.099,-5.304 -5.809,-7.088 -2.711,-1.775 -6.699,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287v69.701H66.858V109.594Z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M313.13,329.096V7.71H290V0h32.008V336.807H290v-7.711z"/>
|
||||
</vector>
|
||||
78
android/res/drawable/ic_openstreetmap.xml
Normal file
78
android/res/drawable/ic_openstreetmap.xml
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:height="24dp"
|
||||
android:width="23.95dp"
|
||||
android:viewportHeight="256.56815"
|
||||
android:viewportWidth="256.0111">
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m221.354,448.341c0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5 0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 0,0 -18.5,-9 -31.5,-11.5 -13,-2.5 -24,-2 -24.75,-1.75 0,0 7.5,13 11.75,27.75C27.104,493.091 29.104,503.841 29.104,503.841l51.469,5.125 48.969,-4 52.25,12.031C192.178,512.58 233.909,512.097 237.104,503.841c0,0 -4.75,-15.25 -7.5,-29.75C226.854,459.591 221.354,448.341 221.354,448.341z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m29.104,503.841c0,0 -5.5,12.75 -8.25,24.75 -2.75,12 -5.75,23 -5.75,23l50.969,16.375 53.719,-15.75 52.25,17.531C188.407,565.491 204.439,560.629 220.104,554.341c0,0 1.75,-10.5 6.75,-23.75C231.854,517.341 237.104,503.841 237.104,503.841c-3.196,8.256 -44.927,8.738 -55.313,13.156l-52.25,-12.031 -47.969,4L29.104,503.841z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m233.854,603.841c-17.899,7.671 -35.943,14.904 -54.313,21.406l-52.25,-18.531 -50.219,9L28.104,605.841c0,0 -4,10.25 -7.5,24.25 -3.5,14 -5,30.75 -5,30.75 0,0 9.25,-2 28.5,1.25 19.25,3.25 32.25,6 32.25,6 0,0 12.75,-2.75 24,-6.25 11.25,-3.5 16.25,-6.5 16.25,-6.5 0,0 5.5,0.5 22.5,6.25 17,5.75 29.25,8.5 29.25,8.5 0,0 13,-2.75 26,-5.75 13,-3 26.5,-8 26.5,-8 0,0 -0.75,-5 4.25,-24.5 5,-19.5 8.75,-28 8.75,-28z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m15.104,551.591c0,0 5.75,16 9.25,30 3.5,14 3.75,24.25 3.75,24.25l48.969,9.875 50.219,-9 52.25,18.531c18.369,-6.502 36.413,-13.735 54.313,-21.406 0,0 -0.5,-4.5 -3.75,-19.75C226.854,568.841 220.104,554.341 220.104,554.341c-15.666,6.288 -31.698,11.15 -48.063,15.406L119.792,552.216 66.073,567.966 15.104,551.591z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="M15.823,450.373C13.094,450.366 11.386,450.498 11.104,450.591 11.104,450.591 18.604,463.591 22.854,478.341 27.104,493.091 29.104,503.841 29.104,503.841c0,0 -5.5,12.75 -8.25,24.75 -2.75,12 -5.75,23 -5.75,23 0,0 5.75,16 9.25,30 3.5,14 3.75,24.25 3.75,24.25 0,0 -4,10.25 -7.5,24.25 -3.5,14 -5,30.75 -5,30.75 0,0 9.25,-2 28.5,1.25 19.25,3.25 32.25,6 32.25,6L77.854,614.841 65.604,568.341 81.604,508.591C79.384,493.111 72.537,478.545 67.354,463.841 67.354,463.841 48.854,454.841 35.854,452.341 27.729,450.779 20.372,450.385 15.823,450.373z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="m116.854,450.091c0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 5.182,14.704 12.03,29.27 14.25,44.75l-16,59.75 12.25,46.5 -1.5,53.25c0,0 12.75,-2.75 24,-6.25C111.604,658.341 116.604,655.341 116.604,655.341l11.25,-48.5 -8.25,-54.25 11.75,-45c-3.44,-9.727 -8.064,-56.93 -14.5,-57.5z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="m221.354,448.341c0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 4.924,-1.358 11.437,45.392 14.25,52.25l-11.25,53.25 9.5,55 -12.75,45.5c0,0 13,-2.75 26,-5.75 13,-3 26.5,-8 26.5,-8 0,0 -0.75,-5 4.25,-24.5 5,-19.5 8.75,-28 8.75,-28 0,0 -0.5,-4.5 -3.75,-19.75C226.854,568.841 220.104,554.341 220.104,554.341c0,0 1.75,-10.5 6.75,-23.75C231.854,517.341 237.104,503.841 237.104,503.841c0,0 -4.75,-15.25 -7.5,-29.75C226.854,459.591 221.354,448.341 221.354,448.341z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="m116.854,450.091c6.436,0.57 11.06,47.773 14.5,57.5l-11.75,45 8.25,53.25 -11.25,49.5c0,0 5.5,0.5 22.5,6.25 17,5.75 29.25,8.5 29.25,8.5l12.75,-45.5 -9.5,-55L182.854,516.341c-2.813,-6.858 -9.326,-53.608 -14.25,-52.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
<path android:fillColor="#010100"
|
||||
android:pathData="m-297.473,315.707 l0,149.571c0,32.37 -10.058,58.429 -22.552,58.429l-14.712,0c-12.494,0 -22.552,-26.059 -22.552,-58.429l0,-149.571c0.423,0.492 59.815,0 59.815,0z"
|
||||
android:strokeLineJoin="round" android:strokeWidth="1"/>
|
||||
<path android:fillColor="#00000000"
|
||||
android:pathData="m-207.393,193.707a119.894,119.894 0,1 1,-239.789 0,119.894 119.894,0 1,1 239.789,0z"
|
||||
android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="20.21144"/>
|
||||
<path android:fillColor="#00000000"
|
||||
android:pathData="m221.366,448.342c0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5 0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 0,0 -18.5,-9 -31.5,-11.5 -8.125,-1.563 -15.483,-1.957 -20.031,-1.969 -2.729,-0.01 -4.438,0.125 -4.719,0.219 0,0 7.5,13 11.75,27.75 4.25,14.75 6.25,25.5 6.25,25.5 0,0 -5.5,12.75 -8.25,24.75 -2.75,12 -5.75,23 -5.75,23 0,0 5.75,16 9.25,30 3.5,14 3.75,24.25 3.75,24.25 0,0 -4,10.25 -7.5,24.25 -3.5,14 -5,30.75 -5,30.75 0,0 9.25,-2 28.5,1.25 19.25,3.25 32.25,6 32.25,6 0,0 12.75,-2.75 24,-6.25 11.25,-3.5 16.25,-6.5 16.25,-6.5 0,0 5.5,0.5 22.5,6.25 17,5.75 29.25,8.5 29.25,8.5 0,0 13,-2.75 26,-5.75 13,-3 26.5,-8 26.5,-8 0,0 -0.75,-5 4.25,-24.5 5,-19.5 8.75,-28 8.75,-28 0,0 -0.5,-4.5 -3.75,-19.75 -3.25,-15.25 -10,-29.75 -10,-29.75 0,0 1.75,-10.5 6.75,-23.75 5,-13.25 10.25,-26.75 10.25,-26.75 0,0 -4.75,-15.25 -7.5,-29.75 -2.75,-14.5 -8.25,-25.75 -8.25,-25.75z"
|
||||
android:strokeColor="#000000" android:strokeWidth="3"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m237.607,3.818c0,0 -21.752,8.073 -28.48,9.419 -6.728,1.346 -18.837,4.709 -18.837,4.709 0,0 -8.746,-3.812 -19.734,-7.625 -10.988,-3.812 -26.686,-4.934 -26.686,-4.934 0,0 -2.915,3.14 -19.734,7.176 -16.819,4.037 -24.668,5.158 -24.668,5.158 0,0 -16.595,-8.073 -28.256,-10.316 -11.661,-2.243 -21.528,-1.794 -22.201,-1.57 0,0 6.728,11.661 10.54,24.892C63.363,43.959 65.157,53.602 65.157,53.602l46.168,4.597 43.925,-3.588 46.869,10.792C211.435,61.44 248.868,61.007 251.735,53.602c0,0 -4.261,-13.679 -6.728,-26.686C242.541,13.909 237.607,3.818 237.607,3.818z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m65.157,53.602c0,0 -4.934,11.437 -7.4,22.201 -2.467,10.764 -5.158,20.631 -5.158,20.631l45.719,14.689 48.186,-14.128 46.869,15.726C208.053,108.902 222.434,104.541 236.486,98.901c0,0 1.57,-9.419 6.055,-21.304C247.026,65.711 251.735,53.602 251.735,53.602c-2.867,7.406 -40.3,7.839 -49.616,11.801l-46.869,-10.792 -43.028,3.588L65.157,53.602z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m248.82,143.302c-16.056,6.881 -32.241,13.369 -48.719,19.202l-46.869,-16.623 -45.047,8.073L64.26,145.096c0,0 -3.588,9.194 -6.728,21.752 -3.14,12.558 -4.485,27.583 -4.485,27.583 0,0 8.297,-1.794 25.565,1.121 17.267,2.915 28.929,5.382 28.929,5.382 0,0 11.437,-2.467 21.528,-5.606 10.091,-3.14 14.576,-5.831 14.576,-5.831 0,0 4.934,0.449 20.183,5.606 15.249,5.158 26.238,7.625 26.238,7.625 0,0 11.661,-2.467 23.322,-5.158 11.661,-2.691 23.771,-7.176 23.771,-7.176 0,0 -0.673,-4.485 3.812,-21.977 4.485,-17.492 7.849,-25.116 7.849,-25.116z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m52.599,96.434c0,0 5.158,14.352 8.297,26.91 3.14,12.558 3.364,21.752 3.364,21.752l43.925,8.858 45.047,-8.073 46.869,16.623c16.477,-5.833 32.663,-12.32 48.719,-19.202 0,0 -0.449,-4.037 -3.364,-17.716C242.541,111.907 236.486,98.901 236.486,98.901c-14.052,5.64 -28.433,10.001 -43.113,13.82L146.505,96.994 98.318,111.122 52.599,96.434z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="M53.244,5.64C50.796,5.633 49.263,5.752 49.011,5.836 49.011,5.836 55.738,17.497 59.551,30.728 63.363,43.959 65.157,53.602 65.157,53.602c0,0 -4.934,11.437 -7.4,22.201 -2.467,10.764 -5.158,20.631 -5.158,20.631 0,0 5.158,14.352 8.297,26.91 3.14,12.558 3.364,21.752 3.364,21.752 0,0 -3.588,9.194 -6.728,21.752 -3.14,12.558 -4.485,27.583 -4.485,27.583 0,0 8.297,-1.794 25.565,1.121 17.267,2.915 28.929,5.382 28.929,5.382L108.886,153.17 97.898,111.459 112.25,57.862C110.259,43.977 104.116,30.91 99.468,17.721 99.468,17.721 82.873,9.648 71.212,7.406 63.924,6.004 57.324,5.651 53.244,5.64z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="m143.87,5.387c0,0 -2.915,3.14 -19.734,7.176 -16.819,4.037 -24.668,5.158 -24.668,5.158 4.649,13.189 10.791,26.255 12.782,40.141l-14.352,53.596 10.988,41.711 -1.346,47.766c0,0 11.437,-2.467 21.528,-5.606C139.16,192.189 143.645,189.498 143.645,189.498l10.091,-43.505 -7.4,-48.663 10.54,-40.365c-3.085,-8.725 -7.234,-51.067 -13.007,-51.578z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="m237.607,3.818c0,0 -21.752,8.073 -28.48,9.419 -6.728,1.346 -18.837,4.709 -18.837,4.709 4.417,-1.218 10.259,40.717 12.782,46.869l-10.091,47.766 8.522,49.336 -11.437,40.814c0,0 11.661,-2.467 23.322,-5.158 11.661,-2.691 23.771,-7.176 23.771,-7.176 0,0 -0.673,-4.485 3.812,-21.977 4.485,-17.492 7.849,-25.116 7.849,-25.116 0,0 -0.449,-4.037 -3.364,-17.716C242.541,111.907 236.486,98.901 236.486,98.901c0,0 1.57,-9.419 6.055,-21.304C247.026,65.711 251.735,53.602 251.735,53.602c0,0 -4.261,-13.679 -6.728,-26.686C242.541,13.909 237.607,3.818 237.607,3.818z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillAlpha="0.5217391" android:fillColor="#00000000"
|
||||
android:pathData="m143.87,5.387c5.773,0.512 9.921,42.853 13.007,51.578l-10.54,40.365 7.4,47.766 -10.091,44.402c0,0 4.934,0.449 20.183,5.606 15.249,5.158 26.238,7.625 26.238,7.625l11.437,-40.814 -8.522,-49.336L203.072,64.814c-2.523,-6.151 -8.366,-48.087 -12.782,-46.869 0,0 -8.746,-3.812 -19.734,-7.625 -10.988,-3.812 -26.686,-4.934 -26.686,-4.934z"
|
||||
android:strokeAlpha="0.5217391" android:strokeColor="#000000" android:strokeWidth="2.2497241"/>
|
||||
<path android:fillColor="#00000000"
|
||||
android:pathData="m237.618,3.818c0,0 -21.752,8.073 -28.48,9.419 -6.728,1.346 -18.837,4.709 -18.837,4.709 0,0 -8.746,-3.812 -19.734,-7.625 -10.988,-3.812 -26.686,-4.934 -26.686,-4.934 0,0 -2.915,3.14 -19.734,7.176 -16.819,4.037 -24.668,5.158 -24.668,5.158 0,0 -16.595,-8.073 -28.256,-10.316 -7.288,-1.402 -13.888,-1.755 -17.968,-1.766 -2.448,-0.006 -3.98,0.112 -4.233,0.196 0,0 6.728,11.661 10.54,24.892 3.812,13.231 5.606,22.874 5.606,22.874 0,0 -4.934,11.437 -7.4,22.201 -2.467,10.764 -5.158,20.631 -5.158,20.631 0,0 5.158,14.352 8.297,26.91 3.14,12.558 3.364,21.752 3.364,21.752 0,0 -3.588,9.194 -6.728,21.752 -3.14,12.558 -4.485,27.583 -4.485,27.583 0,0 8.297,-1.794 25.565,1.121 17.267,2.915 28.929,5.382 28.929,5.382 0,0 11.437,-2.467 21.528,-5.606 10.091,-3.14 14.576,-5.831 14.576,-5.831 0,0 4.934,0.448 20.183,5.606 15.249,5.158 26.238,7.625 26.238,7.625 0,0 11.661,-2.467 23.322,-5.158 11.661,-2.691 23.771,-7.176 23.771,-7.176 0,0 -0.673,-4.485 3.812,-21.977 4.485,-17.492 7.849,-25.116 7.849,-25.116 0,0 -0.449,-4.037 -3.364,-17.716 -2.915,-13.679 -8.97,-26.686 -8.97,-26.686 0,0 1.57,-9.419 6.055,-21.304 4.485,-11.885 9.194,-23.995 9.194,-23.995 0,0 -4.261,-13.679 -6.728,-26.686 -2.467,-13.007 -7.4,-23.098 -7.4,-23.098z"
|
||||
android:strokeColor="#000000" android:strokeWidth="4.4994483"/>
|
||||
<path android:fillColor="#010100"
|
||||
android:pathData="m127.345,599.587 l-62.613,62.613c-13.551,13.551 -28.67,20.249 -33.9,15.019l-6.159,-6.159C19.444,665.83 26.142,650.711 39.693,637.16l62.613,-62.613c-0.029,0.383 25.04,25.04 25.04,25.04z"
|
||||
android:strokeLineJoin="round" android:strokeWidth="0.59201556"/>
|
||||
<path android:fillColor="#00000000"
|
||||
android:pathData="m216.126,586.224c-27.719,27.719 -72.661,27.719 -100.38,-0 -27.719,-27.719 -27.719,-72.661 0,-100.38 27.719,-27.719 72.661,-27.719 100.38,-0 27.719,27.719 27.719,72.661 0,100.38z"
|
||||
android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="11.965487"/>
|
||||
<path android:fillColor="#010100"
|
||||
android:pathData="m119.469,165.5 l-71.017,71.017c-15.369,15.369 -32.518,22.967 -38.45,17.035l-6.985,-6.985c-5.932,-5.932 1.666,-23.081 17.035,-38.45l71.017,-71.017c-0.033,0.435 28.401,28.401 28.401,28.401z"
|
||||
android:strokeLineJoin="round" android:strokeWidth="0.59694356"/>
|
||||
<path android:fillColor="#00000000"
|
||||
android:pathData="m220.166,150.344c-31.44,31.44 -82.414,31.44 -113.853,-0 -31.44,-31.44 -31.44,-82.414 0,-113.853 31.44,-31.44 82.414,-31.44 113.853,-0 31.44,31.44 31.44,82.414 0,113.853z"
|
||||
android:strokeColor="#000000" android:strokeLineJoin="round" android:strokeWidth="19.999998"/>
|
||||
</vector>
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
package com.mapswithme.maps.help;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
|
@ -58,14 +56,16 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
|||
.setText(getString(R.string.data_version, localDate(Framework.nativeGetDataVersion())));
|
||||
|
||||
setupItem(R.id.web, true, root);
|
||||
setupItem(R.id.email, true, root);
|
||||
setupItem(R.id.github, false, root);
|
||||
setupItem(R.id.telegram, false, root);
|
||||
setupItem(R.id.instagram, false, root);
|
||||
setupItem(R.id.facebook, false, root);
|
||||
setupItem(R.id.twitter, false, root);
|
||||
setupItem(R.id.matrix, true, root);
|
||||
setupItem(R.id.openstreetmap, true, root);
|
||||
setupItem(R.id.faq, true, root);
|
||||
setupItem(R.id.report, true, root);
|
||||
//noinspection ConstantConditions
|
||||
if ("google".equalsIgnoreCase(BuildConfig.FLAVOR))
|
||||
{
|
||||
TextView view = root.findViewById(R.id.support_us);
|
||||
|
|
@ -103,51 +103,34 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
|||
@Override
|
||||
public void onClick(View v)
|
||||
{
|
||||
switch (v.getId())
|
||||
{
|
||||
case R.id.web:
|
||||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.WEB_SITE)));
|
||||
break;
|
||||
|
||||
case R.id.github:
|
||||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.GITHUB)));
|
||||
break;
|
||||
|
||||
case R.id.telegram:
|
||||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TELEGRAM)));
|
||||
break;
|
||||
|
||||
case R.id.instagram:
|
||||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.INSTAGRAM)));
|
||||
break;
|
||||
|
||||
case R.id.facebook:
|
||||
final int id = v.getId();
|
||||
if (id == R.id.web)
|
||||
openLink(Constants.Url.WEB_SITE);
|
||||
else if (id == R.id.email)
|
||||
Utils.sendTo(getContext(), BuildConfig.SUPPORT_MAIL, "Organic Maps");
|
||||
else if (id == R.id.github)
|
||||
openLink(Constants.Url.GITHUB);
|
||||
else if (id == R.id.telegram)
|
||||
openLink(Constants.Url.TELEGRAM);
|
||||
else if (id == R.id.instagram)
|
||||
openLink(Constants.Url.INSTAGRAM);
|
||||
else if (id == R.id.facebook)
|
||||
Utils.showFacebookPage(getActivity());
|
||||
break;
|
||||
|
||||
case R.id.twitter:
|
||||
Utils.showTwitterPage(getActivity());
|
||||
break;
|
||||
|
||||
case R.id.faq:
|
||||
else if (id == R.id.twitter)
|
||||
openLink(Constants.Url.TWITTER);
|
||||
else if (id == R.id.matrix)
|
||||
openLink(Constants.Url.MATRIX);
|
||||
else if (id == R.id.openstreetmap)
|
||||
openLink(Constants.Url.OSM_ABOUT);
|
||||
else if (id == R.id.faq)
|
||||
((HelpActivity) getActivity()).stackFragment(FaqFragment.class, getString(R.string.faq), null);
|
||||
break;
|
||||
|
||||
case R.id.report:
|
||||
else if (id == R.id.report)
|
||||
Utils.sendFeedback(getActivity());
|
||||
break;
|
||||
|
||||
case R.id.support_us:
|
||||
Utils.showSupportUsPage(getActivity());
|
||||
break;
|
||||
|
||||
case R.id.rate:
|
||||
else if (id == R.id.support_us)
|
||||
openLink(Constants.Url.SUPPORT_US);
|
||||
else if (id == R.id.rate)
|
||||
Utils.openAppInMarket(getActivity(), BuildConfig.REVIEW_URL);
|
||||
break;
|
||||
|
||||
case R.id.copyright:
|
||||
else if (id == R.id.copyright)
|
||||
((HelpActivity) getActivity()).stackFragment(CopyrightFragment.class, getString(R.string.copyright), null);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ public final class Constants
|
|||
public static final String TWITTER = "https://twitter.com/OrganicMapsApp";
|
||||
public static final String TELEGRAM = "https://t.me/OrganicMaps";
|
||||
public static final String INSTAGRAM = "https://www.instagram.com/organicmaps.app";
|
||||
public static final String MATRIX = "https://matrix.to/#/%23organicmaps:matrix.org";
|
||||
|
||||
public static final String SUPPORT_US = "https://organicmaps.app/support-us";
|
||||
|
||||
|
|
|
|||
|
|
@ -264,16 +264,6 @@ public class Utils
|
|||
}
|
||||
}
|
||||
|
||||
public static void showTwitterPage(Activity activity)
|
||||
{
|
||||
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TWITTER)));
|
||||
}
|
||||
|
||||
public static void showSupportUsPage(Activity activity)
|
||||
{
|
||||
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.SUPPORT_US)));
|
||||
}
|
||||
|
||||
public static void openUrl(@NonNull Context context, @Nullable String url)
|
||||
{
|
||||
if (TextUtils.isEmpty(url))
|
||||
|
|
@ -435,9 +425,19 @@ public class Utils
|
|||
}
|
||||
|
||||
public static void sendTo(@NonNull Context context, @NonNull String email)
|
||||
{
|
||||
sendTo(context, email, "", "");
|
||||
}
|
||||
|
||||
public static void sendTo(@NonNull Context context, @NonNull String email, @NonNull String subject)
|
||||
{
|
||||
sendTo(context, email, subject, "");
|
||||
}
|
||||
|
||||
public static void sendTo(@NonNull Context context, @NonNull String email, @NonNull String subject, @NonNull String body)
|
||||
{
|
||||
Intent intent = new Intent(Intent.ACTION_SENDTO);
|
||||
intent.setData(Utils.buildMailUri(email, "", ""));
|
||||
intent.setData(Utils.buildMailUri(email, subject, body));
|
||||
context.startActivity(intent);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue