From 8552ffe45fee8abae81ea25034521cff285c33d3 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Tue, 23 Jul 2019 00:28:05 +0300 Subject: [PATCH 01/22] Add strings (lez) --- OsmAnd/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index d595a15d3c..9a089bf037 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,8 @@ Thx - Hardy --> + Show Low Emission zones on the map. Does not affect routing. + Show Low Emission Zones Consider temporary limitations Please turn on at least one application profile, to use this setting. Winter road From a11c7b0e2a175f550d565be0a7551410326a9844 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Tue, 23 Jul 2019 12:49:12 +0300 Subject: [PATCH 02/22] Add new App profiles icons --- OsmAnd/res/drawable-hdpi/ic_action_camper.png | Bin 0 -> 363 bytes OsmAnd/res/drawable-hdpi/ic_action_campervan.png | Bin 0 -> 439 bytes OsmAnd/res/drawable-hdpi/map_action_camper.png | Bin 0 -> 363 bytes OsmAnd/res/drawable-hdpi/map_action_campervan.png | Bin 0 -> 439 bytes .../res/drawable-large-hdpi/map_action_camper.png | Bin 0 -> 372 bytes .../drawable-large-hdpi/map_action_campervan.png | Bin 0 -> 456 bytes .../drawable-large-xhdpi/map_action_camper.png | Bin 0 -> 503 bytes .../drawable-large-xhdpi/map_action_campervan.png | Bin 0 -> 644 bytes OsmAnd/res/drawable-large/map_action_camper.png | Bin 0 -> 363 bytes .../res/drawable-large/map_action_campervan.png | Bin 0 -> 439 bytes OsmAnd/res/drawable-mdpi/ic_action_camper.png | Bin 0 -> 247 bytes OsmAnd/res/drawable-mdpi/ic_action_campervan.png | Bin 0 -> 275 bytes OsmAnd/res/drawable-mdpi/map_action_camper.png | Bin 0 -> 247 bytes OsmAnd/res/drawable-mdpi/map_action_campervan.png | Bin 0 -> 275 bytes OsmAnd/res/drawable-xhdpi/ic_action_camper.png | Bin 0 -> 372 bytes OsmAnd/res/drawable-xhdpi/ic_action_campervan.png | Bin 0 -> 456 bytes OsmAnd/res/drawable-xhdpi/map_action_camper.png | Bin 0 -> 372 bytes .../res/drawable-xhdpi/map_action_campervan.png | Bin 0 -> 456 bytes OsmAnd/res/drawable-xxhdpi/ic_action_camper.png | Bin 0 -> 503 bytes .../res/drawable-xxhdpi/ic_action_campervan.png | Bin 0 -> 644 bytes OsmAnd/res/drawable-xxhdpi/map_action_camper.png | Bin 0 -> 503 bytes .../res/drawable-xxhdpi/map_action_campervan.png | Bin 0 -> 644 bytes OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png | Bin 0 -> 647 bytes .../res/drawable-xxxhdpi/ic_action_campervan.png | Bin 0 -> 846 bytes OsmAnd/res/drawable-xxxhdpi/map_action_camper.png | Bin 0 -> 647 bytes .../res/drawable-xxxhdpi/map_action_campervan.png | Bin 0 -> 846 bytes OsmAnd/res/values/strings.xml | 2 ++ .../SelectProfileBottomSheetDialogFragment.java | 2 ++ 28 files changed, 4 insertions(+) create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-hdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-hdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-large/map_action_camper.png create mode 100644 OsmAnd/res/drawable-large/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-mdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-mdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-xhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-xhdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-xxhdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/map_action_campervan.png diff --git a/OsmAnd/res/drawable-hdpi/ic_action_camper.png b/OsmAnd/res/drawable-hdpi/ic_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..08f6ec1d26a3e863e69cb7147daa183e9e9ed2eb GIT binary patch literal 363 zcmV-x0hIoUP)`5$pzTpxvM&xQTX?j?fKkCvXJWpl(3pl^@i@FBI`dp1T|zpm`-R05A;0 zFx#M%O2{hZkGk_Q0>#njYfXZWQhy9goL{zPP1eA__~w2$025e+Qf3#+da#(9yw zv7Ex_-+OZ@S%xK0PL)PNmTofkoMvjA1R)^Dd2e@=4r`8$5la^9e9FkWR+2q!7k`F18eiJ0ZPN?R>>L09002ov JPDHLkV1fpVkO2Sy literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/ic_action_campervan.png b/OsmAnd/res/drawable-hdpi/ic_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..dda219fe4c819a5d961a42c2ac9237a6ffc95687 GIT binary patch literal 439 zcmV;o0Z9IdP)cNJ&{mXM?bJFpXD1=@k>Ks&&96-Ool5=}yMcxHAOKK7jj z7D9+3k;t1Mr5wRB*j~C>!Nw*Hp^KsTgN^BNK4CN1$a8!J`w>DMZh8>V)MI8{k=El$ z(D;pV*eP}`PK@g!5-O0-Z#ixNEfv!(aQ@k{- zIi;LWw3T;0n$DbpPo|e`;GtQVoO0N$=x1y;;cy>GGxKs6q h-|$^%Mk0|eI06n9?o#bjkO=?)002ovPDHLkV1n3Evx@)# literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/map_action_camper.png b/OsmAnd/res/drawable-hdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..08f6ec1d26a3e863e69cb7147daa183e9e9ed2eb GIT binary patch literal 363 zcmV-x0hIoUP)`5$pzTpxvM&xQTX?j?fKkCvXJWpl(3pl^@i@FBI`dp1T|zpm`-R05A;0 zFx#M%O2{hZkGk_Q0>#njYfXZWQhy9goL{zPP1eA__~w2$025e+Qf3#+da#(9yw zv7Ex_-+OZ@S%xK0PL)PNmTofkoMvjA1R)^Dd2e@=4r`8$5la^9e9FkWR+2q!7k`F18eiJ0ZPN?R>>L09002ov JPDHLkV1fpVkO2Sy literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/map_action_campervan.png b/OsmAnd/res/drawable-hdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..dda219fe4c819a5d961a42c2ac9237a6ffc95687 GIT binary patch literal 439 zcmV;o0Z9IdP)cNJ&{mXM?bJFpXD1=@k>Ks&&96-Ool5=}yMcxHAOKK7jj z7D9+3k;t1Mr5wRB*j~C>!Nw*Hp^KsTgN^BNK4CN1$a8!J`w>DMZh8>V)MI8{k=El$ z(D;pV*eP}`PK@g!5-O0-Z#ixNEfv!(aQ@k{- zIi;LWw3T;0n$DbpPo|e`;GtQVoO0N$=x1y;;cy>GGxKs6q h-|$^%Mk0|eI06n9?o#bjkO=?)002ovPDHLkV1n3Evx@)# literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_camper.png b/OsmAnd/res/drawable-large-hdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..0ab012b2ad5c474cb9127ea4640b09ef3674233f GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=e{F{Fa=?Ttp>CIbQ13x_Qj@)(qNOkBL9 zQCUE}fW<9=wHN%5bYQwQp<&yTP>t>H4{@n3;pNQuJwNnCxLxesuKA5g-Wt~ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_campervan.png b/OsmAnd/res/drawable-large-hdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08d90a4d915881fc106837030cf2c0765849f1 GIT binary patch literal 456 zcmV;(0XP1MP)6Fxo@9z7{ za$5jJQ4~d45bwRkaGp+hw}rL2qwyR&me(W&Hh9@%*ci2OGRExk!5;z9B8SmJ-Rw}r zDII9yRYLOtn-4U&`W?t}Q@WYA+A^T7wGpMM)SrGff6Tz#6K7C?k^ z-pGMxixRFNz-F(xqJ(SABfG%eNPz&F3*3#A%pQOfF_V>{6!(T67z{{k1 z6bJg`egphWsdu3Wc*B)w<7ym$A8NhP-^jtXS5K#dLT0ZQlw+I;$<8nXEcN_g;kBgU ySqn44Ru3n27@tWZ=LgGKHuKW;6h%=K`FsPn6Nj5|r5Kw40000}FKH!g+*u zS7V-n--5meEN|6%63iQTU$H$`PPioTqT0jz)W`p-`YLBHe%rTa_oW67ps^rOq3X=m zF7WQlhecDjnyOc?J+Ixm@)6|U~#gK$|8D%t|YyRJXDB)+-? zq^^5k;R{E0pjLxW2l=Sg+u~Hs66frB{P*5rAD@k$>;KuU5Siuvlh25G9rsc1`}bsj zMFv|vmkas2=iXP9>%r%5>^{xrmOMQClM>8Sgxe0>*)=#JS%?t`o#fWYuARU0YmRV a%wL9E*EVGpO%~V#3QbQ}KbLh*2~7Zeam&d7 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_campervan.png b/OsmAnd/res/drawable-large-xhdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..60c0f69634534df4be60769ce2d4a700e9f40fd3 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zc>C}b8Alss-gt!m-XdSv(zc*C_`1dyDA3`uRLs?Zwu0hdT~E_GP(w{jE%J#hO_q ze1Qux_f1*Vo+s+g$8%IYz5A|F(5i0Vg!wg_{^cH+@+v|4hWPw9QLft>Yd@XT3w0vAEP5n+xl7~PW}HE z;=($0^U^)D6ei3QUKy?|aN>j<)6AU?3%EXLhcU9OVqgkoXw+(O5WT^*MNs7QFru z_H@?muJ-QSd0B^l-qMhL9q(_J=*GY7y3Ng8;qMcz7Hzk&ylr0l?AeNJp;sMopGDY( z^TcAlzO9LlUtd{N*4}5@wCqmeQyxA4LM!3hU9wyU`;zSMqy%4T{;28?i^->d7@NNo U&!7MMwI4{x)78&qol`;+0PB_t^#A|> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_action_camper.png b/OsmAnd/res/drawable-large/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..08f6ec1d26a3e863e69cb7147daa183e9e9ed2eb GIT binary patch literal 363 zcmV-x0hIoUP)`5$pzTpxvM&xQTX?j?fKkCvXJWpl(3pl^@i@FBI`dp1T|zpm`-R05A;0 zFx#M%O2{hZkGk_Q0>#njYfXZWQhy9goL{zPP1eA__~w2$025e+Qf3#+da#(9yw zv7Ex_-+OZ@S%xK0PL)PNmTofkoMvjA1R)^Dd2e@=4r`8$5la^9e9FkWR+2q!7k`F18eiJ0ZPN?R>>L09002ov JPDHLkV1fpVkO2Sy literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_action_campervan.png b/OsmAnd/res/drawable-large/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..dda219fe4c819a5d961a42c2ac9237a6ffc95687 GIT binary patch literal 439 zcmV;o0Z9IdP)cNJ&{mXM?bJFpXD1=@k>Ks&&96-Ool5=}yMcxHAOKK7jj z7D9+3k;t1Mr5wRB*j~C>!Nw*Hp^KsTgN^BNK4CN1$a8!J`w>DMZh8>V)MI8{k=El$ z(D;pV*eP}`PK@g!5-O0-Z#ixNEfv!(aQ@k{- zIi;LWw3T;0n$DbpPo|e`;GtQVoO0N$=x1y;;cy>GGxKs6q h-|$^%Mk0|eI06n9?o#bjkO=?)002ovPDHLkV1n3Evx@)# literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_camper.png b/OsmAnd/res/drawable-mdpi/ic_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..210a1a2c5badfbe12877fe0f08ce7e16676a53db GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#9#0p?kP61PQ!es0DDb#+7c$&+P%jpBFK~7{ zz?VSKIW!k_T4NF$GIj{Zklz!L3?$(+`r3z*lL|V zs{ecW^R`8-lHk^rg+>PZMLstMO*Yw_#`E}KeQtkN(;e}m^6j@$)DG5*Zg_mq>hcw? zsU6oi+p@E|rYtzS%C%?nI)#1FH6n34IKNxAui9bK@G;c)Q=Ve>W4>(VSKIW!k_T4NF$GIj{Zklz!L3?$(+`r3z*lL|V zs{ecW^R`8-lHk^rg+>PZMLstMO*Yw_#`E}KeQtkN(;e}m^6j@$)DG5*Zg_mq>hcw? zsU6oi+p@E|rYtzS%C%?nI)#1FH6n34IKNxAui9bK@G;c)Q=Ve>W4>(e{F{Fa=?Ttp>CIbQ13x_Qj@)(qNOkBL9 zQCUE}fW<9=wHN%5bYQwQp<&yTP>t>H4{@n3;pNQuJwNnCxLxesuKA5g-Wt~ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_campervan.png b/OsmAnd/res/drawable-xhdpi/ic_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08d90a4d915881fc106837030cf2c0765849f1 GIT binary patch literal 456 zcmV;(0XP1MP)6Fxo@9z7{ za$5jJQ4~d45bwRkaGp+hw}rL2qwyR&me(W&Hh9@%*ci2OGRExk!5;z9B8SmJ-Rw}r zDII9yRYLOtn-4U&`W?t}Q@WYA+A^T7wGpMM)SrGff6Tz#6K7C?k^ z-pGMxixRFNz-F(xqJ(SABfG%eNPz&F3*3#A%pQOfF_V>{6!(T67z{{k1 z6bJg`egphWsdu3Wc*B)w<7ym$A8NhP-^jtXS5K#dLT0ZQlw+I;$<8nXEcN_g;kBgU ySqn44Ru3n27@tWZ=LgGKHuKW;6h%=K`FsPn6Nj5|r5Kw40000e{F{Fa=?Ttp>CIbQ13x_Qj@)(qNOkBL9 zQCUE}fW<9=wHN%5bYQwQp<&yTP>t>H4{@n3;pNQuJwNnCxLxesuKA5g-Wt~ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xhdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08d90a4d915881fc106837030cf2c0765849f1 GIT binary patch literal 456 zcmV;(0XP1MP)6Fxo@9z7{ za$5jJQ4~d45bwRkaGp+hw}rL2qwyR&me(W&Hh9@%*ci2OGRExk!5;z9B8SmJ-Rw}r zDII9yRYLOtn-4U&`W?t}Q@WYA+A^T7wGpMM)SrGff6Tz#6K7C?k^ z-pGMxixRFNz-F(xqJ(SABfG%eNPz&F3*3#A%pQOfF_V>{6!(T67z{{k1 z6bJg`egphWsdu3Wc*B)w<7ym$A8NhP-^jtXS5K#dLT0ZQlw+I;$<8nXEcN_g;kBgU ySqn44Ru3n27@tWZ=LgGKHuKW;6h%=K`FsPn6Nj5|r5Kw40000}FKH!g+*u zS7V-n--5meEN|6%63iQTU$H$`PPioTqT0jz)W`p-`YLBHe%rTa_oW67ps^rOq3X=m zF7WQlhecDjnyOc?J+Ixm@)6|U~#gK$|8D%t|YyRJXDB)+-? zq^^5k;R{E0pjLxW2l=Sg+u~Hs66frB{P*5rAD@k$>;KuU5Siuvlh25G9rsc1`}bsj zMFv|vmkas2=iXP9>%r%5>^{xrmOMQClM>8Sgxe0>*)=#JS%?t`o#fWYuARU0YmRV a%wL9E*EVGpO%~V#3QbQ}KbLh*2~7Zeam&d7 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_campervan.png b/OsmAnd/res/drawable-xxhdpi/ic_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..60c0f69634534df4be60769ce2d4a700e9f40fd3 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zc>C}b8Alss-gt!m-XdSv(zc*C_`1dyDA3`uRLs?Zwu0hdT~E_GP(w{jE%J#hO_q ze1Qux_f1*Vo+s+g$8%IYz5A|F(5i0Vg!wg_{^cH+@+v|4hWPw9QLft>Yd@XT3w0vAEP5n+xl7~PW}HE z;=($0^U^)D6ei3QUKy?|aN>j<)6AU?3%EXLhcU9OVqgkoXw+(O5WT^*MNs7QFru z_H@?muJ-QSd0B^l-qMhL9q(_J=*GY7y3Ng8;qMcz7Hzk&ylr0l?AeNJp;sMopGDY( z^TcAlzO9LlUtd{N*4}5@wCqmeQyxA4LM!3hU9wyU`;zSMqy%4T{;28?i^->d7@NNo U&!7MMwI4{x)78&qol`;+0PB_t^#A|> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_camper.png b/OsmAnd/res/drawable-xxhdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f89c8561035ff84215f57fef93e4027c28980e GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z}FKH!g+*u zS7V-n--5meEN|6%63iQTU$H$`PPioTqT0jz)W`p-`YLBHe%rTa_oW67ps^rOq3X=m zF7WQlhecDjnyOc?J+Ixm@)6|U~#gK$|8D%t|YyRJXDB)+-? zq^^5k;R{E0pjLxW2l=Sg+u~Hs66frB{P*5rAD@k$>;KuU5Siuvlh25G9rsc1`}bsj zMFv|vmkas2=iXP9>%r%5>^{xrmOMQClM>8Sgxe0>*)=#JS%?t`o#fWYuARU0YmRV a%wL9E*EVGpO%~V#3QbQ}KbLh*2~7Zeam&d7 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..60c0f69634534df4be60769ce2d4a700e9f40fd3 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zc>C}b8Alss-gt!m-XdSv(zc*C_`1dyDA3`uRLs?Zwu0hdT~E_GP(w{jE%J#hO_q ze1Qux_f1*Vo+s+g$8%IYz5A|F(5i0Vg!wg_{^cH+@+v|4hWPw9QLft>Yd@XT3w0vAEP5n+xl7~PW}HE z;=($0^U^)D6ei3QUKy?|aN>j<)6AU?3%EXLhcU9OVqgkoXw+(O5WT^*MNs7QFru z_H@?muJ-QSd0B^l-qMhL9q(_J=*GY7y3Ng8;qMcz7Hzk&ylr0l?AeNJp;sMopGDY( z^TcAlzO9LlUtd{N*4}5@wCqmeQyxA4LM!3hU9wyU`;zSMqy%4T{;28?i^->d7@NNo U&!7MMwI4{x)78&qol`;+0PB_t^#A|> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..ddec5227fd88e3381aab7cf032cdfdac3933bd75 GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47?@-{T^vIy7~kIM^<{DtXnS}tf}yNIHiJEg zF``K}fi;1Bnge$jLs)~X1N)7GR^rz(IO=!n)D(QTJK5I4ocwI}&AoH(&0+)^3+@K51&KT(+~@fJ>3VkV!z9VPmwmPN|^P)>?7imHYEwb_-ZJ^e`OZz)Gz7 zu~*?=!sIqSpgyo>OhUU(|HZ8p?_)1ACb1~EF(lb6P;_JO5NwcO?1=SZ;Fgb-FaP-e z>-@*nTgy4SKO8##_*e43LhF{9S8JFjc)w`4?pv*Mw{Q zOC1u*cb7?O{_VNG)bhBo;644zIgod95K>Z^`%L?`|$D`^4A5{pQLk>GA0O7Pz`eGd!bHaKc5e`#&{?Bk){Lm%DRY7(z@~0drDELIAGL9O(c600d`2O+f$vv5yP9|WoZ0YG!+7Md=0000000000;6ym*8f|aR)>7LqZC?fb5>0%cH*K|`bHIsTw>bME zWSaPOzxO%cDl(W${qaLvqpc1NaZgoMJr3#ETYwOw7wIM*`}?B>xEa#%V*3G|e81v- zj2gjM*M2J;(s82z`b!V`<5}CKV5(+Fr+-^eSozNaE3IxrSFuj-1qge--*#B}wr;fu z^IaW2wjjUtF!}bHScfXC{)Hfg=r-gNz~>n0)Ugh}0AB>Dyv92CEodq1|0%4r-RKt7 z?&{Aox4_B}}g(!0~ z&+U`*!eig1d`ZVQIRPP(y}~M4O2JZ(Z*l^{N%ZPlIi*QGK8r2r`hQQj)3}*k%JIGO zCLGsFn(@6~M{JRR+MmeBYVao(zL0bZlke4HJHCzUh^tud#BZcmLoQ}cDfjrI2?)`f zi@jOy$@hvFpRSVHb$5xi;$N$lBT>Zo^abyooqIVlMT}2h_|Z-GC`YP@@wslLjESrN zouga%+lm;U>-Nmq9w+za3c9CqG2;s-dLK?;ebp?&V?NTw-jC?i#|Hoa00000000i- YFRx{_FtnHUFaQ7m07*qoM6N<$g4mCWEdT%j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png b/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..ddec5227fd88e3381aab7cf032cdfdac3933bd75 GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47?@-{T^vIy7~kIM^<{DtXnS}tf}yNIHiJEg zF``K}fi;1Bnge$jLs)~X1N)7GR^rz(IO=!n)D(QTJK5I4ocwI}&AoH(&0+)^3+@K51&KT(+~@fJ>3VkV!z9VPmwmPN|^P)>?7imHYEwb_-ZJ^e`OZz)Gz7 zu~*?=!sIqSpgyo>OhUU(|HZ8p?_)1ACb1~EF(lb6P;_JO5NwcO?1=SZ;Fgb-FaP-e z>-@*nTgy4SKO8##_*e43LhF{9S8JFjc)w`4?pv*Mw{Q zOC1u*cb7?O{_VNG)bhBo;644zIgod95K>Z^`%L?`|$D`^4A5{pQLk>GA0O7Pz`eGd!bHaKc5e`#&{?Bk){Lm%DRY7(z@~0drDELIAGL9O(c600d`2O+f$vv5yP9|WoZ0YG!+7Md=0000000000;6ym*8f|aR)>7LqZC?fb5>0%cH*K|`bHIsTw>bME zWSaPOzxO%cDl(W${qaLvqpc1NaZgoMJr3#ETYwOw7wIM*`}?B>xEa#%V*3G|e81v- zj2gjM*M2J;(s82z`b!V`<5}CKV5(+Fr+-^eSozNaE3IxrSFuj-1qge--*#B}wr;fu z^IaW2wjjUtF!}bHScfXC{)Hfg=r-gNz~>n0)Ugh}0AB>Dyv92CEodq1|0%4r-RKt7 z?&{Aox4_B}}g(!0~ z&+U`*!eig1d`ZVQIRPP(y}~M4O2JZ(Z*l^{N%ZPlIi*QGK8r2r`hQQj)3}*k%JIGO zCLGsFn(@6~M{JRR+MmeBYVao(zL0bZlke4HJHCzUh^tud#BZcmLoQ}cDfjrI2?)`f zi@jOy$@hvFpRSVHb$5xi;$N$lBT>Zo^abyooqIVlMT}2h_|Z-GC`YP@@wslLjESrN zouga%+lm;U>-Nmq9w+za3c9CqG2;s-dLK?;ebp?&V?NTw-jC?i#|Hoa00000000i- YFRx{_FtnHUFaQ7m07*qoM6N<$g4mCWEdT%j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 9a089bf037..aeef5c9ac3 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,8 @@ Thx - Hardy --> + Camper + Campervan Show Low Emission zones on the map. Does not affect routing. Show Low Emission Zones Consider temporary limitations diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java index 4e356fb482..0bb1c41314 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java @@ -256,6 +256,8 @@ public class SelectProfileBottomSheetDialogFragment extends MenuBottomSheetDialo icons.add(new IconResWithDescr(R.drawable.ic_action_scooter, R.string.app_mode_scooter, "ic_action_scooter", false)); icons.add(new IconResWithDescr(R.drawable.ic_action_ufo, R.string.app_mode_ufo, "ic_action_ufo", false)); icons.add(new IconResWithDescr(R.drawable.ic_action_offroad, R.string.app_mode_offroad, "ic_action_offroad", false)); + icons.add(new IconResWithDescr(R.drawable.ic_action_campervan, R.string.app_mode_campervan, "ic_action_campervan", false)); + icons.add(new IconResWithDescr(R.drawable.ic_action_camper, R.string.app_mode_camper, "ic_action_camper", false)); return icons; } From 6f22a093bb0b57498030e6df3d558447836c3030 Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 23 Jul 2019 13:23:14 +0300 Subject: [PATCH 03/22] Fix setting without descr and change icon for avoid roads setting --- .../plus/routepreparationmenu/RouteOptionsBottomSheet.java | 2 +- .../plus/routepreparationmenu/RoutingOptionsHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java index bea07a0b90..dbe9633c44 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java @@ -167,7 +167,7 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment { .setChecked(settings.ENABLE_TIME_CONDITIONAL_ROUTING.get()) .setIcon(getContentIcon((optionsItem.getActiveIconId()))) .setTitle(getString(R.string.temporary_conditional_routing)) - .setLayoutId(R.layout.bottom_sheet_item_with_descr_and_switch_56dp) + .setLayoutId(R.layout.bottom_sheet_item_with_switch_56dp) .setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java index 8f5b25d61b..1ca5620923 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java @@ -817,12 +817,12 @@ public class RoutingOptionsHelper { @Override public int getActiveIconId() { - return R.drawable.ic_action_road_works_dark; + return R.drawable.ic_action_alert; } @Override public int getDisabledIconId() { - return R.drawable.ic_action_road_works_dark; + return R.drawable.ic_action_alert; } } From 5287ec04ad3b5c246448ea4aa42fe83c32655b77 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Mon, 22 Jul 2019 14:11:16 +0300 Subject: [PATCH 04/22] Add icon for conditional --- OsmAnd/res/drawable-hdpi/ic_action_alert.png | Bin 0 -> 422 bytes .../ic_action_road_works_dark.png | Bin 1598 -> 557 bytes OsmAnd/res/drawable-mdpi/ic_action_alert.png | Bin 0 -> 304 bytes .../ic_action_road_works_dark.png | Bin 1362 -> 363 bytes OsmAnd/res/drawable-xhdpi/ic_action_alert.png | Bin 0 -> 533 bytes .../ic_action_road_works_dark.png | Bin 1806 -> 669 bytes .../res/drawable-xxhdpi/ic_action_alert.png | Bin 0 -> 788 bytes .../ic_action_road_works_dark.png | Bin 2312 -> 1000 bytes .../res/drawable-xxxhdpi/ic_action_alert.png | Bin 0 -> 1037 bytes .../ic_action_road_works_dark.png | Bin 0 -> 1394 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_alert.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_alert.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_alert.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_alert.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/ic_action_alert.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/ic_action_road_works_dark.png diff --git a/OsmAnd/res/drawable-hdpi/ic_action_alert.png b/OsmAnd/res/drawable-hdpi/ic_action_alert.png new file mode 100644 index 0000000000000000000000000000000000000000..e175feed8361e1b4f6f3a026d3e2319ed47f028d GIT binary patch literal 422 zcmV;X0a^ZuP)obtayZ}VBat%x4g&gR{eo@(gR7ZiJ zKT2V6x_(Jg<~2CQjoh@xo5*+x1qE~rF>9@vEEdE&t@vW0r_>l+B*+~VlsgTmr3RN~ z$ceES&I-Z}^$MbE)vYj|t;FDx41HrdddonkAl}giPx#1ZP1_ zK>z@;j|==^1poj6!bwCyRCodHmeFy-Fbsy3PQV7u2yD=F1DK#}KsO*8zy@w7V1&>K zU<0#3Mo{HOp^Du_FJLB?o|si3b1?XU^c>uz!#Oe=&CzMvHH;%@*zf zEu3OEa~K<1^cWCSz?jg2D~$6FW57pcJp$ZsxtJ?)i~`51lYFE?aLsKC9K(g2cKBph zECI=c$iB$lgpcEpB*`lb4K@q8tTQ6!U1mNyvNvpjW4n+S{M**! z>k~C>fn&3fGk>f;8CGYBeRmyM8m7Q0&|C#JoSm8STeHy69hJd=1i86StpF1E?Y}6*M$@Nw*u#5DLZz$W1p4Cpb;4hedk&o+E~lAf(+0yBwc~=vmkTivyHK(6n3xpfERCHn8i0;2ROney?+?tJ!4^qcJl^+RAuv7vQ9mv;{y~JDvv& z04Iyrb%In5=Q%HBGBajfmYksNd_1Vb_u8E-n!`z5>UH8o0bn2t$fFzzZlL9BE<}+E z?#m(_s&lG9K9yPG0>+YT6H!t?$Vl$eG$_?8XARf^gF{}s&Eb}N72FZKa&{jSBV1@i zg(*;QM}so!^pJ{n0Z7Cb!vrQoA&HESiBX{lTLKACOoE^y1Qo+5CP$@m0S1jdT-KY5 zw8{O%ii!wijJSh>mtaE5l7XxbL)0)0Ns(C&QN38_@Us!O3{9Zpb= zpzwuYp+@so0~b{U$P5>4henu|Q%{M46j-Gak=P20g%%VR5-b-|sTG4UR4m5X#u5;K zWndIf{$BEZC1TfIHN8TH5mr}Xko(nbpMHm*8cVI&DJf=0sr~pzdaWe1N$W7&imf~ zy|ZZM&%0v6fa)TsE-$Ql>GDp=u`kOmQfK>k5eII4zomNWqsF~MYx!aR#!XdgZ^T68 z8TBhRY=5QaT!Z0md}a;0qiu<4R})Wox-Tp5N_=@W{2;2;nA}P35VgK}-nOUrIM0}9 zJoI2(_M+y`3iOkQe~rFUyWp(tn}B0>mZu|n#bTZ>S{gC`^_z{gDMQO5OBXE|PH5>m z(4gPFSGZ*L(k?KE+SIx`~ISd$%k%JG7$J6YdDJ;(W3u$(n06U*e0E z)K1>&9>?;`SMlY7?+%rfD>^F%D^FdYb8sWi86UTB{gJYJbFGmzrPo&J7d~1yZT}nb zrPpW9d#A{}p};x*+_e*p^9w3_R+Pu4H$)vu;ScwBE*`9y*xUpuiIbI)C;R)RCuLuh zO}QJ`y6VFi|Ncu4lW#X2Yv^u5Wij7Q-V`=e9!Lo5Ry7pW?LL-w=gMD=Z3j{J*1l_;^-03*w`bJ)mYia|k`v6=pjf>w_`o*K}ocl*>pyY-Lk7wj^Ed1Z<4wU!~2LI?TAk8%)fYW0Ji^>BA z837T6L?JasPLCBWo)&SNS!Z1;%l=*W&U=>X>8j~pmNJ(`c}PV*-o&%TbH&s1+_O|Z z9I7|Zi0C`!#-$eNzGc#c#!UY$6B;JZf42Ag*A=32zKb68N^SZmHP3xf!%^nvHaAu- zI8dAI#ntBFvF?E6_O|)LjM=Py`FVdQ&MBb@0P)9if&c&j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png index 72417b25f52d5490722321bdb8cee981a6a184b5..80783fc6cad9352383ab613ef730ca0fba63d5da 100644 GIT binary patch delta 336 zcmV-W0k8hj3hM%pB!3BTNLh0L01FcU01FcV0GgZ_00001b5ch_0Itp)=>Px#1ZP1_ zK>z@;j|==^1poj607*naRCodHlwlErFbsvm6d<7zkWdLY7!HPmF$I$V4v>HZBvb+t zvgR&~P{NMU{^YysakR-x`f^u*i&P+@@vG-$AT?gp;lcnZ@qdC9ZmA&!Y>iV2On&7M zix+7FVZ)1fLkwP^P&$_d2n%Ns)-+Z%OvVHD8Gmmzj`NGy_!f2aeGPj@!Y`$ftrV>2?apTYMkGOave#B=gYs iCiY&Cj+9y#k$eF8=vuLvh-B^n0000c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6ZE^QqR!L zz{J#0N5ROz&|KfZRNuf%*TB%qz{1MNPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv|=;~_XXl`ie zYGG;YYVPXhY;Iv{VQl8)YzfornO9trn3tRivpW-Lx3jsWfw`H9GhV$`&PAz-CHX}m z`T04pR1lDnUy@&(kzb(T>H{664@xdb z$pN5w*9QYWged<8V z6)zn%MUN6eHZh@K^T{zk`L)svJ$3#t=7c#X88LJ$VD>M` zvJloUUj0|zuUKT=#pHd;x@@-YgoBg)8TYDBJ}Yt~y!Wxt%l#rV#8?06D?BWjoycAC z=ve9^&Xm|=UpZg%2PZ_U>`&m6m2f?}IP~ZO)-PK2F4<`tx~2qvxY-}Gn5k;Bo{ZUP_PpetD=W_;wPW)FTY9r&9x^`Hu>52kF`aqZj&)y;sC!sXGAry3 zFTSZeW20@!L!a}?b?e2=+cxcaGfAWJ&s)tok0i98b-fVGwJ12LIs5Ob?Hc_$_hR+# zh_qd356gKNSaZMNq~x(pITvNClpMa$~NaTS%bexyr78#}~_6*|AD6 YEHHb!L_uS8;x=gK0`u` z-HYP@g+ie)Clw}wWFtSz)8Fr^s*ZRTMEr)=Z14<-&^Hd#Aa_J$8wkK%TOd~kN~g~j zIU>Sp+W2#AksBiFi*|mH6AT-7h&6IRge({~?hq|=Ftmu+@pg8Y69$Z{v>jrJxsbsR zBLpyyp&2o*(muoo9tnNvv?B)K)`rI!S_a!k1f>Sxc#NTGTyd5AEHs!J8lU;feHNxQ zG!s@_(X;UwqwMd+O*~C}9 zK8Q4arHfUpQM80)+;`kiI1*c_;LZMJ76ngvv X-;wd@*_$%$00000NkvXXu0mjfRMy>$ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png index 8e7159594399cc838e467c9e75cdd4c290184302..562efb579056997d744890ed8886271f12fc8c63 100644 GIT binary patch delta 644 zcmV-~0(Px#1ZP1_ zK>z@;j|==^1poj7GD$>1RCodHn1OYpFbsypO~7s75i){D$Ozfsx&hn-?M;wwKsR87 z+y-=mbc6rwtNiL18Pqle@}9r<@&ZD#q(nbBAu1FKg*B;YA%6f^_qOBHm#V5>>0WTf zHyG2UvGAdjW3rAr$ii(C zpLFhXJkTxS!heROh;GJzsuBNexSgPdQ5f((B4JEyChk1Z#BBtPu@F0a%(&OYaUyn3 zGnSSHbMonftEmMDxeib<-YKxB}j(OB}D);6FL_}?(z zt8IwQ)WH-9Y(UcWa;zRouQ@Qr-G?1n6tQSHQF=926ltmek*8~5Eh-XliP#NUp;mAd zEKtFuDOn^ojm9L=Aa($WMU^Q@Fco4;6*2`KhU9a0-iPOff>bJ1AQaL*um zVJM%;qO$@RJU)94E7BTJsa6ip`Br1TXR(40VmW+0EJYE0EP|xYb%9ugpol?*=m0+7 zQgs%vGD0d>Yc0Z6mO{N1R(;W4CqEJwkEGC_yBr#|*kVKPXT(DS5 zhy;NQh7@ZosvO1`n87RlFM|{;D2ktNxnZbN7 z+uVBZ89S;3aw9bO$UM)52Ya_w`s6Naag5y}DqmVMuk@Fc!MGpiXXKm5TQAu(XnI{I zDt40Xn8CLPH?BTJ_`BeU&4qGC(dcbu!JQE2ijGv>Ypa_1(AMGnPM~veW9xPEVt)sT z{fkW*zD1+ZwsF6`4*T+!7ngLYzOLO<5W7HMZa+rl?*H`3j=>(Qjhc~=>Z@-9nQjFi zb-41LtY-xQL!oDg#vE6%{qBTA`{V0Kwfr`|ed)P4QSyedsAp5+Gi`W6Pf8XJ$#zmZIdJ3h&C&{owq%fPphF;=TMoqbLCk}ekt6zOeiQHPo9wM(EY^X6YiM7O z1lNAjwq{AS7Jta6=}zT~75#qRuGZ8qN0)c`=B@5~#0y@^TGfJ0rRqS0-5s{u3al^QO0u%U38N}Ioc9^8S^iKW LVWgmzmt61<2C=Vn diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_alert.png b/OsmAnd/res/drawable-xxhdpi/ic_action_alert.png new file mode 100644 index 0000000000000000000000000000000000000000..255d12aafde22eb74e49d9dbca2cc304bdff255a GIT binary patch literal 788 zcmV+v1MB>WP)g z+%OPDzfytIfl@)d9c(&qI&dm*ItWrhkP3`ckaQ5c0=omL1G|Iq5aI&9cn@`P9zX~% zEv-2C^GOZ`D2k#eilQjWJ9Jn9M0CcNOKzX-pKiI`bX_;1bvQWZ+#cvHgXu%dZ~%Ho za88)M9<5?k65>Bvga>{}@q9;1*wh*l0%TI{46VR}y{2@2p#^A~wQ@OP?@(H5z2**k zh6i{>5i>B$W|aps@TG?=Bew%@Xdh9L52y?W z=Lh721N+Qv8#YbG9K>^fh;17-MH;i`{us8onWcoysOK569I-VhVa4ouMl1tW+RRol zX{u+;E_zflZ1HKHCes{J?%}Drb3BU>kD2Zd(sk?_3RFJ7Xa zf=+zlpSVE=B?{V7nIT(6Spl-f++#ar8+LMvNg4A3WEpmjg4S-#F0u?eNkKGy@wN5i z-z39M4N#5ao4L8?03BlgIXcBSI9J$ya17@uh8?9KYs@CK_VN)^boDV-LB`yw1*da> zdYG|9ZDxZnVJmc1ck45(q+J9JJ0?KYjd{TUjR;g9y(vcXAK%PPkHB$}Q$doO(GUwN z$lx_>pMu2dx+}*Rwo^qu1wCLt(|U+UR?x@yI(z||L*A>wmFB(_8_^EV(+^*O{-7Ox zyE?qmYmMH+UqtVMcC0eZf%_MNt$*Q4~c{mf;Cxb17$4 SKe+k;0000Px#1ZP1_ zK>z@;j|==^1poj8eMv+?RCodHn~PE7Fc5~eoslM2SQqk$*@e5{ZO`j3xkpT>ja} z>w9U?lr1$UxoW7@lqaDNN)$=k(o2v$98a1$M)L&3UOR__YwT#8?U2qI%753 z{n%y8b$^eGFnpI#pqMGwiDwPfrhqP|~GA z+|au1o^>rs1spRR;%2f>E-ToG(}XvRo!*W@t4{*)Tt=`FFU(EAW?x5{3s^N=)zDQ# zvhjTXWds}X!n`%?6c*d1<5}TwR0VgYZsWXyjen8O)w_-ehm(ZIhCo1Y;g2HVoPv!3 z8erI|wGJ0XSxAhlKpR6*be{8l3_DkE3|m4g6Gqt+BAuhzXy9jD!N%}&^}S)sM9+6z z%ZiH8-cS^cyZeaY8FQ)GvZV-{Ksh4X+`!K`=lkIA=-J2v4c~{pkC-4FMT(M!f?>&- z;(x`k=dA7wRt)0!4yw6nO>P7eO)S>NZ}r&!wlHzD0VV@d!nc8e+~Ua{ibF?c#DR|C{`t zW!X1dfzLtFVLeBrgRH*r4Y32QhgVmD&r3mnXg&OP6?lJ8hc?@s=27l={FS5YhpW(= z2XznrB2Ng;n1j3?e9lQE5{X12kw_#GiNtmI0F)`UX?!TKPyhe`07*qoM6N<$f=TAm ANB{r; literal 2312 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 AwEzGB literal 0 HcmV?d00001 From 11f3a1d06b8d38356ae0345f0282cd68df9e944b Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Mon, 22 Jul 2019 14:17:09 +0300 Subject: [PATCH 05/22] Fix Avoid Road icon with new symbol --- .../res/drawable-hdpi/map_pin_avoid_road.png | Bin 3120 -> 2219 bytes .../map_pin_avoid_road.png | Bin 3980 -> 3280 bytes .../map_pin_avoid_road.png | Bin 5654 -> 5323 bytes .../res/drawable-large/map_pin_avoid_road.png | Bin 3120 -> 2219 bytes .../res/drawable-mdpi/map_pin_avoid_road.png | Bin 2193 -> 1224 bytes .../res/drawable-xhdpi/map_pin_avoid_road.png | Bin 3980 -> 3280 bytes .../drawable-xxhdpi/map_pin_avoid_road.png | Bin 5654 -> 5323 bytes .../drawable-xxxhdpi/map_pin_avoid_road.png | Bin 0 -> 7579 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 OsmAnd/res/drawable-xxxhdpi/map_pin_avoid_road.png diff --git a/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png index c2718a056de86074d0024d0629e8204ccb8af383..704cb1ca4db8e16f3ea32e4d08d931dbc5ca5039 100644 GIT binary patch literal 2219 zcmV;c2vqlpP)uEU29v#^R`7;apBH8nL} zT=`yRWo+dtHz8FBEEvGT%V_$}b?d?ptY5!vKAoQZV1E9+zg)gN5{*XVqobn>=$l4g zlPZ8pu7)GL_s!PUgEf-$ME0MP$>eiCdjI{u;&u)#ftIEUpi&C(I4r#9Of2?rgQ`9g z6h#W4v6R!vB+aJNbSaT|@|P1612=Bmn1dA-D`5qJ%0w1nm3`4@EUG9^NG=yuOA=|F zo#bw5p|C8Ij%OPb<f00fWA7KTnR##rGPDf2$xWQ8;LYmi(((Ujtr%=J$uOI^I1*n?ig>ITJQCGpY@BPe;tHVcki}VJQwUrW+Fkt@G#v%MA8Id%QZoG zc}mx3w{G20#9Pq>p1E#S+zW???BzT)9S-fNfHGAZ$hCz zV-egVBO`LDvXtsVY<3M~>;^G+uy0$$?eAaefEA_2#zw30J%g>luEbmkg4D3uj^{z> z+1XikCH97*U8yJq;5x+lOgJ1?@YBql9bkVD)o*ExCeq$M~vzF*QDWafTBTj@@W zfhgwYF)?=03tH?8uHoTfX<}kRf4#MJze8Mh3w0IO$%X#ZQx>7uLkWyg_j*gq{`vWN zoyRU#rh+>&al5;_#cS8Dsr`{i4AJBup@eA&fcwY6U_Zz6Dx0`W&SJsuushYTD+z+{r&U$YdORK-8Ea8iD72%iqoYGa zDy*H3#da}qogLS6>==~_wt~eWSOM1f=HF^+x_J)D1c`!Br~(28R(eAr!%5a0;uhmN zxnK(@4?buSTE&>(@OqE**4FZXihYv1y$yJ^`j_MoHx^r#td$FP#q4B{34Q(gbt~n@8M|Z!EY}$u8`EBHZr+8o zvDHb|JV%dGrNKKi3*!(Pb3TNh+No2gR!#O+RKVU9l|MwI%^OtpabA6n`5ZYa;X0oY zggJ$=nb3TCYgE-g{oF8WFJ8Q;&?;q_yb5q>gh_;3_xJq%{mY13V9ejRabw>5)!-z1 z)jZdyr#CLi6dYEq9k;8ii(d#l9*KPW!sgB9NPD|E-Pvg_3=W#bU|?XtYQ{Aw>n3j^Y6;4^77o5`@?+r}o|JK*o`HM<;RnS;aT*|TTWcs%a^onib( z!Fd&1y0t@=k}5OW+uOO|MccP;r@p>EDg{C$Lg}$Fl1E19CJF%vulHV=pMT}5&o_7e z{P`622y10HRpyuP z#)XE4hAbCCihMs4*8}2KDp@NR*{3%qG^&4(c)eb!si{eTey;2tPT;U9WJ)H4)u+_) z7|!wErE++T%wPsQs+SA6lEgZ z(oSq`UI(Mmww_?{6}AMeK_pFcbZ~ll$MHnsA_`)+@F?Xd;C!Ia4%gSmHtG6zz=No1 zE67(@I&GSQuwq)9N~MHFqWWYyy?r$yP?38L6I~WXF_RKtRY}N`Q{uTx5I6vH^*5a| z&FM2&um11EE~Nsn75C3p0oU$U_LlCvvXY;Ac!G z^kXY3zc-8naKT6O34cAAeE#Y2@uz)0-!1rWn#a!mAM^1z_L?n6b#--eYHEsIXA$!y zSNgiM^m&vr7U3r4T;)9fapMG#zetAvXc&J#QeSUow}Xc954YPLfgnCa5bi76;oG@N zIZe*F7ws>gMWdj4rJ30oCHwR0h69Fi>=_8o4fh<*8f^vhrNt$e*DLzX7CWzoS||qq z&Z)G0hQSpEIyyFXTv3!b%sz*YAs^vUoGOG$e?4c{h@e4Ug;!cyTwLTIsfC4wB%Xuk tG)kGztZN!1a-2%32-NDxmp8%NB0d^doq`?3H002ovPDHLkV1iE)KWYE~ literal 3120 zcmbVOc{r4N8=fp>NvQ~vm`01GSq-yfY%?4hL-rA2%nUP@nQ6>0Sxe*yIT0<4wT_Ay zX_x45lARDDl13kWluC%hH#&8`?~ikxKfd?6-uJgX_x(J-=eeKjdQ%QL{-mM=R0041 zD)x3n7wHIJdllA8zn(IS$bDrGqWZL1sdnlpu`3r-FoGq3m#+5D)&wi<8dRwqanmPY#L6~ee=@?XU4@b8I|rVJ*ea$yK492OR~cCT;N z;d~dyf5Z4&>u|SYTn5aA5zZ0tXwrHF>iqyqbNA1V)(oZ5;GB3YX;G-5L=H_5#$fa9 ziFmN|1WISoaf|>sD!`NuhoDW6SO_WrMTcOJ0mcv-Ef7Tu2*dcKZbKlL{J`3?!}(M;jq$@bOX~YO*6JUzI0BDB<#Tv$ z98TyD6&zx6_?&PihYKPQ)~b#I>3g!+bWUWr!CIOAyfu-*V?{9NwmeQ4=v$s~tiOrD z)EHq($50tk#RMQANCb)s!P0092og;VG(n)yR1=0N_&c8d|K<-S4GOjk=kUi1LP57esaP%R!ey!CR+UVv8jU0ie#&B{O z=w~J8A;mi)w=N(m?FDdLPxBfpOeO#@t>PPZ_I-S*xJD z7ggCOkd7<=O56JE`KB#Q?s>_VrJ4Mi+OC(3NUsfF+qGw2Mt3aE%rA@H=PB>A-@0s( zWfzY*L&CkvkVv$QZ#)Q3Zc42OI-di6ywsN9`OF+?UJ#NBAGh2p2xosJX3G7?+ z=Nh%|g0-0zEoy7lA7UZzTdyaObaZJ!%n;dKn#-J+vD%{B?vF|lR<$b%?NmibTZ)X~ z0BTix*Rx#;I(Vg~XtTl_m8%7_FM{&d#dU)V5txX_u+yi%7{l6vkB$c^=PINZ$vB%` zt^YOiR*GHx0(XBAqEWkeV1Poo$G;

D+F*S#7)NF5;A;VN&MSu5!NuzRp~?<|T*l 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 KMNUMnLSTY@-bN$< literal 3980 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 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-large-xhdpi/map_pin_avoid_road.png index b555ffea04ea14ea7a6e6a5a978c005864455f76..ca93d9a83f78440185835fd1d554f3fdc18135dc 100644 GIT binary patch literal 5323 zcmV;+6g2CJP)?+`$}98d&YcS#J$jU@Qpu}psJbg!SUF^`MnO+Ew{6>I(f=?N zhe{ij2udoI!m+b)<3@*=V#|8C#*oYlECM?MKz!NbidO?!~g8SKC4|p}oD`oSvRW`V@vP2$8je*8EH4#L|V9UbA1J5J)Wt5BPkU92^;WyQ`}!LySn%SDC`sLNOw6Ob8+aJds1a*rHwx;zRDYegB$k_9QK9&fpPi$=s1j&p$O{snz>Xe5M*_!cn%3f$0iN?;H;25jHHJv1^h!ZM%COAtT& zFPk>q*=JdMRV5;{=&>w84B>)fJ2X#M)cv=sufCVW5MNJBFv(0caPOd5MM3Hfs&_)> zdp-YwWOCCVCK4}LQr>r&rs$<&gcdgaY&I*VaydTEyYA#8@4fdsKS`%YXe7c( z2$(1e$_U_|2{A#oywTIsW06(Ez4x|gbWjl=J)e4aN#X;&+DL$?+Sk`Nn9t{Jc`xM~ z=nh@eVTxdYiSo)Tub8jD{<=lxWjLKqJCA+f1J`}9z5TCLB@oy#3Vp^%CPn1YM@9Jd z+ePm9ap7LP$iv4W+D_%!85ZrP`I}c+*3bU)(xrDZnG9P&WLf2hhK2$ohl0=(JjF|L z8okt!CGzr?EkC6my$+SSiSVm!+qs3`7@97ERGbHjx3{;~BFly4{|~RZX1^jnL{7}IylcXr`HV+=z}mW% z&nfh3Vk#U8ZKit-67eC1Y&=6qZ#oE~sM#Wji9pthIW{(C4G#~q=(#_c{EZKHc0NT! z#7GbcB4~#$dcO1}5$ftHx{-D5wIcn!?@|9wGx15Oh-qo@v>V1i#58|=BA>rN$S0FY zl2{ixJb@1I_~Va@W}(?508vbMyT?tXF{6HODA;&d^O!r*(`M$p0kw^qL zW(JT>XsU0}lo3Fw#3HX3A%o8+lUF2d`vFxaK|R-Vs)(qN{Y!;&=baw2@Pct;{x$K8 zUD4>3qA&{VH{N)IM*-R+Q=AP&qq(jpSGd=cQglczx4$$n@GS~6{2nSnd2R@Yy^GpO ztW=WyrQr7s-XrU1Mp{MF`TQ%t|K^)_n5MbFHxLa@-ZVu7QMkb*#ml`vm&=8}yJ^!7 zMSNh5rg+0d_~jBGfHH$~NzsI{=;94keg}5(RH@IfaK2gvGY!#7DqUQ}7f`%{v zJ&Jn2ICA8Ovb}A}>Do}d-KKfFs+Z8h%!?^rc(1WojLYEQVA*<5$mUg7749jDeFG9p zcR!O#-GH{xM+^Q4F~Ljtiw2wx~kWf!r{Y*7o0nI@L<{c z{$O1nDP%R$ppgId>Z|X;W2HZ04h#&a5m0vtQP*Ln&FwKM0A^Dh9y1#vySuwL-kC^z zSIK_#{J2z*5Ix-cE6DzGBD#|Dbf>1o)NQx%e_)KVXJcCS>@P<~KKdfXMd+h4OEIHD zpIcNH)RV*d#43Y`&$6F}`2xioUqZ00>c+sL(iC#kuaFZ7MDo}$h{xj=GIL_yZ>d{H zt@jXP;#2QeqQ`!I)22`AinmuIJ_x@On}4Z*LRP^#y!dKO?5&~zAcA#t7^cv;N#41a zHxPA1T^OL|bi%HN;-%hiVNw-B&6^$PVO0-`w?kt9L{GiZrUmp6tn1Ls-s>q?M{NwF zt{7VItdpU)Swox1R$?Tc(lJ)74HAg*e zs-}*!!xfE2d1l-FzF=FlieOu{(DjTzSVv;%kEyLG@(q{?Bt9)sM_o`a1{l)gwX)eP zvRwA3D9fcPl*)4XQ;hWlo~4T-DC9_q>=}K8<>o15mA@7>M6DU1+s~|YDbk57*Bz_M zWVu!vY^xUj>{+}-_Dp%m6uV+kBojBHmZ&8I^wle#)$_4vw6{{0%W0tK@nf;<*^Ql@ zy->*X5%Wt8602sdvuCv)0s2A;n=((~`_`=4Rc)55URW%9_9yZ9E*KBwA={YbE5&L} zV|BG+KuBh}jP>i+bMMFS{Vau=YnA1y7yQ{X-7i7gA78ibgL0CuO61qnG_55AcwXn} z)2CVVK#A>4B>rAiKs>%nSG-F|ur~rcorOe^0@@hSdid`~qwtUw1DFX2S);?%LLXGi zfRMJ3&XmfE%}xro-GNzYs^WqySDDCVGvLpj_4%@A6s+4VWa0)h>oAoDxeZZ+QBds- z{5f8p)A>L$SyixY(TA=e7`GVmLqp=?U3ZlY)?upqzmJb2ST`#Qt8cQhR5c8$8Ue~K zMvhm=o-aydx%6OLSd+Oyfx0ZxqKM5>3bR+O4_3?oeHA07c64`lvy3d2 zn1_DG+0BruHLXS=PXKJjs z?Y#&r(mUG}XvD~8-(aPqV7Uz7;Rc%@ael1j5`|E6_||B2f1|Tp^@2ZprgtU;>pmTe zJwos7AkZlN9u=-$_DERv2ta}z!;V~YBa_Ln$4gnRPmtB{2dYk=CVC7~YRw3?RSP|P z2IvYIv-n6Me*{zArSYLJ02Ir?k{KZ9_JoccIT9i-7uVSrE?j`e8}?_pBHEDcIB-DJ z8rYy?Dd(z%Um$e~3mYP(gjxfzegF>3%JhxY&4y!mS? z(SqKes&YzsP*G{B`%FInzc;=4=8oCfS2B=*LQ4hIY+#E`0Uou&wcvoqSX?B*YUZ|8k11+#G1$+Y- zC*&KLDtoqABEJ#?_#zrknAd5Jj*i0S=e1ltrg^uj6vQl7z2KkDqG!)A)%~yg`>!Rl z6#CHy&D09aO7|@JrBCsqIBG4|u`OHvTg__5tg@t@ym;!VKqXr0fh8#9JETHJ-oV=; zN0d>>B}V|1?v5Qh^v&{kE!TG_%cV~#@9_oO8cF=6F3_koID4iU82(`0KT|+bXz5Ea zA2Tc2*%vTCd2!_NssuaV3~RZra2(I(Z)UI!1jmY-iHQj=@BtdR-$O)Od*%<;Z6Lo$ zE(Z6QfDL9v8HMa;K!{$%n+pkLg1r^!*tsPd9SlmAYq<+FYK_IFxtyQa5@ys?-yeWPEhRZ3-RWDSU>JEjB>>0$iC`?vhT}qvML9}$i2$01j zj~C1M?I32k8Wjs#4EiYWXU{&=)%DQK%#4>kgE)s-@3)E+CH0ko9CEO2J8T$+b0n4e zBH8&jp%Ro0l#Z!3Ln37qZi2^)#dy>?#HmxK1a%Pc;DZnHqP<4LSi6>IQRGgX;Lq*E zgvorK%^jjq@5f@Xi$9#6{y)ka| zT`KjFs5ZSMsVN!LXA8gI0Wn-|qo__2-_NE}H;_fdidcpy0OkOHP~4y)!a9H~A9G7b z$1ZgfC|*aib=$SMlr0pX&oA`{>$bGF?;@IdSu?dKg%Fw*1jR-}Bt)hskA${R=)>x} z_d~F)S}d4Zr_qd*^YxKPL`fI{G2~q*|A*ur2_BT}2lU?mezf_QitsJBc*mAzZ9*52 zN$M?NAu%*x4}aud%6tOm9guU~DaC{g=?LZNP2PB;Xkl^8$&F(HSVQ#BCF$Z)xY{L4 z$c4l~I7R6IP?wkFQ;yXo6ErvLx-Y96T+nXT!qPCI(Tt*{$LL>LsC}!IcI6R3 ziR2u9{DzLRlmpJ(^xA6=kLPmFixyUd@oe__8&96ZG)DemAtJv1TQ=SdX9dp@BY(ic zR>E_0b74gEo>{y0hE0xh4@^_tI%;7dV7$!caxb5poqg_4-+uciqL3BSx4$Xc0>{q) zK+ob>zG71F3;R6l$%PP|b8!xVG3;Ok$a5SlLmhd{50!QFXS?(r*Kr&tM2zQWe__p< z`x2J*XQB$6&t|`VXl(4+bULlJr7Y@!3bLK*JzUjB`A%N@^tQ@lbshgFdp}PmCrgnM zWx-Es`7<DCaXq8&?t|J$l|C6Vu&bhwtUHKiKM}7LNKeMPlSzrbY zS$-xl!`@5rDAGgsi4}lEz_VW+9{yWV=zW}oKyc7fxha7 z4FcpN_C}-oi3#_MWq>TVXAe$He2sc04}S_UW=+$~jgOCe!(VTkAHMexrQS`oS^Lf< z`nVLzSHI?`_Mj`fA?$*T7*^s-6A6{oP|8rK8YO-9?AZ)GOv$x5>PZ=OjPqp5@^{q0 zIUK8VG=g+l$iMF;=H;VT5VED0m?M)7GYe+0yX{wohYwuH<(~2PhH~XXHhbvF;o+y{ z>;x_pkDn#tb34_uRGZL7t>FE*ZD={^vDo>(0&#<-&2wfg)Y_r$NF;zGnq&YwST zk}Ngpg?P_@5*2MYH#D$+*2N0E3Uq9ftrYBUp-?zb2NO4WClc-}7~-3s58x}PqJkl+r32@fTcUx;bH zDW-!==0i`MIdg#Y$QS5)An$m86=zyOv&>l=!N$(nZy2vy_?DW<5$j|`!?zznIxnVyzaW| zvUERX{^jNGhm~qixi-4KV^QYXWfLD*?g(fk&^8cqH5K?CY7;$9bnox$+r2IvW-t9r zCi4$Z4-Y>l3i^dDo^UvvBhz!7j?asNd=4an@;hSXuz^fbhpaBIcaeqRQpQgFES>)O zKsX$la^0UlbN>7{=^PsiAUv!cB0hRNtf&r3icg4uBFG~E=%->!=S=AYL;D}H3v*N5 zOeUk-+Fa;5m#zb2-Vp&s&_}=}Dh7>!Hu+hX#Y|+&vhqIStMA~i;QC=P?<55dK_3AM zkpJy+hBlaClc>ROjC651f)s_ zK?P}{NmXosNK;CXCO3ZP`_8>T&YT~2&+PrSwVw5?HuKKDZEJ1H!79uO00215&5Z15 zqsO0@g^Bk4oE@q`8%`08QAB%!7cmqagahbf37$BRc>vlQXNN;$!>{z=v;YA55MKur z5oKkGzz_ly(SKwV!vX?n+5mu-Zdf21a~VejdE&f%@!H^xmJTq;7po0+QngaD3N*y| z_?kro;p`)<9WW7>F>owcR|ljOhM)li;D~5YSb#r17!jro{tFjDoB!E{fI)wW5HD+k z|3wOAWeYMS1mQrcifRfNWo2cMI$Tj%RYL`;Di4AxDXT)1;1Fdc1tn#KvJwKS1p4~{ z)2szyy%2UrCV$(at+c^DL}DNU0tpQbRSZ>8Bm{Xwl;LnVLZziD!Fa(io?aSW8ZfVa zaQ>4%6sD@Lp`;EqfU6iOD;uk7Xux46a1B*8s0mCRs&4X+t~oxKh{j`Z|Je4W+5THs z`M>HS41;iJA|c3uK=A*k3T%A{L_)9+ArNF}_$TWykhGI89!m%fmid#We|c?$3-S%Y zVNHSv0ieI)jPU&r9Mn{l)vy|99IawJl@*}MFth?3gTX04)zMz6$}n}bDozdjw?6j& z8$Sq*6y#5_{Ga0aXNy*mf2RL#1=`}@&4k0#Iw*+NDq9BjIRF5!nz@m_L)gr!Yj_~v z1>xwU$JZjHRGL(pyr2>}skiQlvq*zL!Ve#(+BXpx93=Dr8$sv0Fh!RrHG0m9u7S_& zkP0Px(K-4;iSKn(L~OC!q-i+D1aP>xCTqam%(5l(CNh0d z^HVnG#g@gEjkFpPecQEjYl}>gI~imi(i7Is<19gdQoEIQWl|#`WH_D&cCDH|72gSI5&oSPiqoe&%pSVx9axn)#scK&*Qj$iV`B)P#b{5E^HAKgUjKq|TZg*Zj={`F zE-^X5_VEoszrev=6?eP(`TgSA>lc&z#?u4nMCl9B^C$7UmJ=L(x44@XKo)DeEu#G| zV`6I9(|z5Ng}%dU^;jN;y{T)}5L!I$bw~@B+#egKJxq7!orSa3#4)6&O9EW8SiX9 z$eB`VeUk0h9C;Q9IiZkD90*fG|%JrA|frjG3xNXAvyecZtB!W0F}OyWw$^=3q4BG z@@ti+WH?1kdWsBh6T3N#TECZ3NCUqU0=AYArzH{3JGrax3p*TSq;*>+Ji5_k&GRJ< zH*utI|z&epfQzJIAYK3CYYea8_7 z$NVHmT~9fyY8K>m3#G^L@(?uD2b)x*;0XhI*$|X`kJc5>C$>^np5ELeBrPp*Ov!uf zX186R8O?qt@Tt_7jN|2>chUNFys`P2uT2bGD=8;4GI>`S+m3={SFh#lFjc zsIdMw5#jAD+!o(ht%-U0vIab)NCx(f9?tBv@+l6%e)R97L7)s+a7^a`d&Qi6D#?mM7z<$YJWtoP2A z2J09~pORj^R3q`a^igy5eP?}Yx8mfS!{lwBv^w|lJ=VpJ`Q-{vMYILy!y`M_Gd#>3 ziF^A1*OJRs9MfDAcBIz+#KgC7_50f-%k<)-sCiMA_J<(UYpge9SkQR;Ecv4VB+Yx! zfRL!~cEtjZr)Nf{;~8PbGhEfdLa}kN&tpWC2FA;s=GME%ThwJK1Id2NW+4zm7M%>q zPmX%&J%?nMj*FRVZDXSp{g5uNJFFpYFi>qUu=rJ6Cn!*y9vEU3l*xy(NcTVst>*Q3 zc;Du~k+0Nab|>+3w77Mto%w{Fi)npb%=WFI*Te{eudZ;IQ_H1^fvHhSEc=KwGh8`2bDA+qW)mq?G3;x5l5EBae$-B=G2cJ^_dKr|0C2Ff@s- zDLo1=eWLDgTpMagDfZK0Vf1e}6y;Z2M3OJbhK|^L-68fcFm2J4V}&9(!#XhrJ;K^I(u;yF7>j9BDl%A57$G#9T7W6N3C$U zMzACIuJct`@=VIhA@ioDSK$v|u&}i%6*7A@7$e;ye;QME>6tl=wvX+uw*jx$GjKPN z^cS8_Pcuq%)qejhY4zUE+YtTf3`GNN;8EJ@bKX*LZMKn64Q3bOhRYk1A$r*O#8tV( zJA&WD9)>Yuh0m>-A~`A2U2{W1d?Cpqraf|1cb8{Ubbo7{Qu7xwM zIurVhEt4CFoYq$9)mqjst#ty^*JMjC8pblfEcCh=gc;7+a2_B;)cipQ)HU%^n?fn? zp*%6~;R4Bti3#k^_X+IMQ2z7oQQtAMl>%)cd4BxR5I*vA@4eaC$acpDwuX?PA`#t1 z0hI7LIac%LkT9)B3PNav0yt_JHq){lD0x7`$Lr?IRP<>hEFuhYUJoz z0TTx=^qm8b)N16xS|h(8{Q$H3F~yMUo_(ox(Hs1HyLN~Q6DkpQ4TbP{x{^~<(|4Ox z0%KY;MW2HiDKRMPid-%uAuNTexA5`9A|fKUCs!mdPgY8vl(Mu{in@GRE<)?Yyhs$nk6Cn9FJICv;RH}X;KYYo-bQJ;HG+?@8R%{i?d zabIg^+}?tnVuwbH@m$c4E^)po@tt&64^z(!PtyN>6XD3MDqnKmPj|+)vC=dpio$(k zVqa`0p-1lYO!HN_@Sm>)`HO3>d@-pB-&(YNTzy$DaQ%^*pHF(t6SP>rq{kef7Py%F zx=Kc7`OGjcW0Jwv`Kc2e+~QEEV^LeHC31nq;~e+LeJ8i@oBp#6N!upxq+ObVO47pg z1DRgR)2L|SSer#bS6v+)FI`LZz3+GusM&Z;i_(8F;LUe!WR@%k-#y+Q5-qI-s~_4P zXdNGJS&R%;9i>Ug1QL5w#jex?77p3Lm})+ds(tlu_DnaM&#*}IN0i^(lk`bkxSBZ< zb+h@Bk*6~Ow!M($F3aN6bBo7 z>#Ya;-@5Fi7?{kRF5&CF(loX~rm}$6tj1!j6ikoY)+*;nPRDi^aq0Zh+hgk!R61;4 zsT7Ys{K*`?@~rXxs*nYDiZ(Snjq4ZV_ zsU!K8XmA55m_goqtN>|s^{m7Fm8!2dn9qV9nIwTTGBU6mAKI`-`#U{rA#!g>sht*w zK)Nnf7%VmPLwJJL{)diHe3mI<4zIVsbRq{TAsfcQ3;_ z&r|k4btfMHSF;`++6(SA_*xeVl`*KX_NWa<`uboCYDaIdRC`&uup(}m#juGIjX zutS*O;u2(C0)FQKfOsvOc8lYTi)XIO3jOX-avtnLGoHd151e@SE-fYoScB^qFh029 z0a`rTo#$d$=wrv}cX2X|&COLv1XZcI&=}|**#=x<3?6uuBD16Gs1w2 z7-TQG+J1TAX8U`gZ*99D*douCGF{Qr;f@odqmS4cRF8FKIye(A?H;i#DXHVLOv`1m zEXFY+m50bYJVXu^pNu`NEMJ0lG4BOw#^$Sguk36BSB)aV#cvdfMju`=b=5hSaH)R~ zA3rd;u~lC$CUml3@FV8>b!}fiKUO#aiM(U?@s5yeW=7HAS!#00m3@B&NQbfu%0ir! zPe-dI4oO5?YhZ2u&St!!ts^Ojf#Q=5DL(PTx>Tjpwg9BUG|8xFmO>6JJ?g0TkbzwT zSuD5O`75U}?CJYc=*1 zFQN6P392hUg#(QVTy#|U;qS6rOaWLq;?mGisEiEq18-rJS zN_jf1_nJ00yC{^@r;Txzc>+|X4tF~{1H5r2nXc^VQ!&NGl=6uWXi^r6vUZo;z;~g( z&Rw?-RZ0cT_d>tYNyIdj#BgpM<#L?^YI)14J*b_3QZ}=2znC>ZQwF9p6}sWL`0<#( zx1YC57p*8K7)u(0Hd2w7S0=BzM{94TG^mk$yr-FNeLTI48p#(O*yu%b)BR|>^fssq z6z9s%fAYQ8mWJiQv)#G$`#FOqVqz-kl)LPs4bjm`cAj)O#sY6rx3|S1g&IHe-v&Y& zc^>8%>+^J^D2mxv(A>dEB1l)Bp41Dd=qZ>UiETAn(>HNi{;bWl)^o(*v1F(yD4(6r zGsp|gl2`tUG4^;m6PwpEvyjWrDPJO39%9fPGunTrYiMTX#r9^1^C|XI2E{z$6hD~? z>Wkv))D8W2ta_ASef?f$VS&w^%+%W$2*F9x|Leeftd=&U>c+Qn4MDYna$o4mU@b%4yh|v>1t$ZL}OVz)^JhfK7 zDcSe(r<#v2+i+yZEZvmvZ16O0OHLv4V9V$p(SDoQ`Yb7OY;?16WIl2Wq6i@|0KZGQ zm6`VfmHNcY?Nu=HWmoMJ`1#C6VGJ>>`HqIuRe1K05c@brt=ERHU-3Rv$#9he9E*IL znNBdYI`6>VB9l!@a4XyZHT`hxAcwlzts_Z$wvE3Un)XCZT`pb^j9C}_U}CLPueROs z?j1FDa8RVl#g?+d&p5>Ut6A45puaLPai+j=#g2-Bj9zs+^yTxzX(K$IEH@a$4F{nNAFAMPcxg4p{0Y}*N;pK?MLDpc$bmn&j)R0 zEfH&5xk-%-Rph>yaIsste2DckF$e<|yEtNcUqkPwsm_phao2dM*h1aV)u|fY+1X(* z*BY{V=|s@N-0R&e#t+-FpczwD^HazBQ$~<4H`_Y{ZoPNYQq~mNPd$y!`!ZF2&SvQM z*MU=ERaj&iW9P*iP8bgTyH3YU%Jvi<1}b>Lh?Qi+e)Lm1z|HMLr(gLFoEH(_Wq(k# zxM)0^EPBiZ;JyI(y>0?AAG)Jm56OJjKC98okxR5DYoFHy4;ta!)~gH()m6`kU>lEp zOB_OLmiwsGs{YS3kRo zn5_OPg;kw&EZlg;9JRO56;e1{xUPPA&PLWPK;%W{@RGd_Tkcmi&(~#3=6MW=b=!-= zyIe^wX^hw4p*A6Xcfd)@`cYYkLily@osD# z-R{3CUCafXeEroCTO7+V+@U=-oQjfX#<0Kg;sp6nucE`()P=V&$#gO`c4u>6N=y+i ze6f=K(zSDVLeGpI&f#vg$_k_`N&(Zj{ggvxxrZg?0Kat@^W!K9O7AB#&fX;|>vJ0c oish7besD7}u|%KP?*PyP@?K8ys};D|{`pgDZftE-Y2Xp_KQC7zo&W#< diff --git a/OsmAnd/res/drawable-large/map_pin_avoid_road.png b/OsmAnd/res/drawable-large/map_pin_avoid_road.png index c2718a056de86074d0024d0629e8204ccb8af383..704cb1ca4db8e16f3ea32e4d08d931dbc5ca5039 100644 GIT binary patch literal 2219 zcmV;c2vqlpP)uEU29v#^R`7;apBH8nL} zT=`yRWo+dtHz8FBEEvGT%V_$}b?d?ptY5!vKAoQZV1E9+zg)gN5{*XVqobn>=$l4g zlPZ8pu7)GL_s!PUgEf-$ME0MP$>eiCdjI{u;&u)#ftIEUpi&C(I4r#9Of2?rgQ`9g z6h#W4v6R!vB+aJNbSaT|@|P1612=Bmn1dA-D`5qJ%0w1nm3`4@EUG9^NG=yuOA=|F zo#bw5p|C8Ij%OPb<f00fWA7KTnR##rGPDf2$xWQ8;LYmi(((Ujtr%=J$uOI^I1*n?ig>ITJQCGpY@BPe;tHVcki}VJQwUrW+Fkt@G#v%MA8Id%QZoG zc}mx3w{G20#9Pq>p1E#S+zW???BzT)9S-fNfHGAZ$hCz zV-egVBO`LDvXtsVY<3M~>;^G+uy0$$?eAaefEA_2#zw30J%g>luEbmkg4D3uj^{z> z+1XikCH97*U8yJq;5x+lOgJ1?@YBql9bkVD)o*ExCeq$M~vzF*QDWafTBTj@@W zfhgwYF)?=03tH?8uHoTfX<}kRf4#MJze8Mh3w0IO$%X#ZQx>7uLkWyg_j*gq{`vWN zoyRU#rh+>&al5;_#cS8Dsr`{i4AJBup@eA&fcwY6U_Zz6Dx0`W&SJsuushYTD+z+{r&U$YdORK-8Ea8iD72%iqoYGa zDy*H3#da}qogLS6>==~_wt~eWSOM1f=HF^+x_J)D1c`!Br~(28R(eAr!%5a0;uhmN zxnK(@4?buSTE&>(@OqE**4FZXihYv1y$yJ^`j_MoHx^r#td$FP#q4B{34Q(gbt~n@8M|Z!EY}$u8`EBHZr+8o zvDHb|JV%dGrNKKi3*!(Pb3TNh+No2gR!#O+RKVU9l|MwI%^OtpabA6n`5ZYa;X0oY zggJ$=nb3TCYgE-g{oF8WFJ8Q;&?;q_yb5q>gh_;3_xJq%{mY13V9ejRabw>5)!-z1 z)jZdyr#CLi6dYEq9k;8ii(d#l9*KPW!sgB9NPD|E-Pvg_3=W#bU|?XtYQ{Aw>n3j^Y6;4^77o5`@?+r}o|JK*o`HM<;RnS;aT*|TTWcs%a^onib( z!Fd&1y0t@=k}5OW+uOO|MccP;r@p>EDg{C$Lg}$Fl1E19CJF%vulHV=pMT}5&o_7e z{P`622y10HRpyuP z#)XE4hAbCCihMs4*8}2KDp@NR*{3%qG^&4(c)eb!si{eTey;2tPT;U9WJ)H4)u+_) z7|!wErE++T%wPsQs+SA6lEgZ z(oSq`UI(Mmww_?{6}AMeK_pFcbZ~ll$MHnsA_`)+@F?Xd;C!Ia4%gSmHtG6zz=No1 zE67(@I&GSQuwq)9N~MHFqWWYyy?r$yP?38L6I~WXF_RKtRY}N`Q{uTx5I6vH^*5a| z&FM2&um11EE~Nsn75C3p0oU$U_LlCvvXY;Ac!G z^kXY3zc-8naKT6O34cAAeE#Y2@uz)0-!1rWn#a!mAM^1z_L?n6b#--eYHEsIXA$!y zSNgiM^m&vr7U3r4T;)9fapMG#zetAvXc&J#QeSUow}Xc954YPLfgnCa5bi76;oG@N zIZe*F7ws>gMWdj4rJ30oCHwR0h69Fi>=_8o4fh<*8f^vhrNt$e*DLzX7CWzoS||qq z&Z)G0hQSpEIyyFXTv3!b%sz*YAs^vUoGOG$e?4c{h@e4Ug;!cyTwLTIsfC4wB%Xuk tG)kGztZN!1a-2%32-NDxmp8%NB0d^doq`?3H002ovPDHLkV1iE)KWYE~ literal 3120 zcmbVOc{r4N8=fp>NvQ~vm`01GSq-yfY%?4hL-rA2%nUP@nQ6>0Sxe*yIT0<4wT_Ay zX_x45lARDDl13kWluC%hH#&8`?~ikxKfd?6-uJgX_x(J-=eeKjdQ%QL{-mM=R0041 zD)x3n7wHIJdllA8zn(IS$bDrGqWZL1sdnlpu`3r-FoGq3m#+5D)&wi<8dRwqanmPY#L6~ee=@?XU4@b8I|rVJ*ea$yK492OR~cCT;N z;d~dyf5Z4&>u|SYTn5aA5zZ0tXwrHF>iqyqbNA1V)(oZ5;GB3YX;G-5L=H_5#$fa9 ziFmN|1WISoaf|>sD!`NuhoDW6SO_WrMTcOJ0mcv-Ef7Tu2*dcKZbKlL{J`3?!}(M;jq$@bOX~YO*6JUzI0BDB<#Tv$ z98TyD6&zx6_?&PihYKPQ)~b#I>3g!+bWUWr!CIOAyfu-*V?{9NwmeQ4=v$s~tiOrD z)EHq($50tk#RMQANCb)s!P0092og;VG(n)yR1=0N_&c8d|K<-S4GOjk=kUi1LP57esaP%R!ey!CR+UVv8jU0ie#&B{O z=w~J8A;mi)w=N(m?FDdLPxBfpOeO#@t>PPZ_I-S*xJD z7ggCOkd7<=O56JE`KB#Q?s>_VrJ4Mi+OC(3NUsfF+qGw2Mt3aE%rA@H=PB>A-@0s( zWfzY*L&CkvkVv$QZ#)Q3Zc42OI-di6ywsN9`OF+?UJ#NBAGh2p2xosJX3G7?+ z=Nh%|g0-0zEoy7lA7UZzTdyaObaZJ!%n;dKn#-J+vD%{B?vF|lR<$b%?NmibTZ)X~ z0BTix*Rx#;I(Vg~XtTl_m8%7_FM{&d#dU)V5txX_u+yi%7{l6vkB$c^=PINZ$vB%` zt^YOiR*GHx0(XBAqEWkeV1Poo$G;

D+F*S#7)NF5;A;VN&MSu5!NuzRp~?<|T*l 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 diff --git a/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png index da2257e42776745a4778136f4f474696aec68b24..f45fc95abeb741a46cc6145704488715b14e8208 100644 GIT binary patch delta 3276 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 KMNUMnLSTY@-bN$< literal 3980 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 diff --git a/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png index b555ffea04ea14ea7a6e6a5a978c005864455f76..ca93d9a83f78440185835fd1d554f3fdc18135dc 100644 GIT binary patch literal 5323 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 diff --git a/OsmAnd/res/drawable-xxxhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xxxhdpi/map_pin_avoid_road.png new file mode 100644 index 0000000000000000000000000000000000000000..8a2c60050d24d296999bceac8d5888a4a6ddb915 GIT binary patch literal 7579 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 literal 0 HcmV?d00001 From a70863bee6241efd060c3a7947a09244315b5e1a Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Tue, 23 Jul 2019 12:49:12 +0300 Subject: [PATCH 06/22] Add new App profiles icons --- OsmAnd/res/drawable-hdpi/ic_action_camper.png | Bin 0 -> 363 bytes OsmAnd/res/drawable-hdpi/ic_action_campervan.png | Bin 0 -> 439 bytes OsmAnd/res/drawable-hdpi/map_action_camper.png | Bin 0 -> 363 bytes OsmAnd/res/drawable-hdpi/map_action_campervan.png | Bin 0 -> 439 bytes .../res/drawable-large-hdpi/map_action_camper.png | Bin 0 -> 372 bytes .../drawable-large-hdpi/map_action_campervan.png | Bin 0 -> 456 bytes .../drawable-large-xhdpi/map_action_camper.png | Bin 0 -> 503 bytes .../drawable-large-xhdpi/map_action_campervan.png | Bin 0 -> 644 bytes OsmAnd/res/drawable-large/map_action_camper.png | Bin 0 -> 363 bytes .../res/drawable-large/map_action_campervan.png | Bin 0 -> 439 bytes OsmAnd/res/drawable-mdpi/ic_action_camper.png | Bin 0 -> 247 bytes OsmAnd/res/drawable-mdpi/ic_action_campervan.png | Bin 0 -> 275 bytes OsmAnd/res/drawable-mdpi/map_action_camper.png | Bin 0 -> 247 bytes OsmAnd/res/drawable-mdpi/map_action_campervan.png | Bin 0 -> 275 bytes OsmAnd/res/drawable-xhdpi/ic_action_camper.png | Bin 0 -> 372 bytes OsmAnd/res/drawable-xhdpi/ic_action_campervan.png | Bin 0 -> 456 bytes OsmAnd/res/drawable-xhdpi/map_action_camper.png | Bin 0 -> 372 bytes .../res/drawable-xhdpi/map_action_campervan.png | Bin 0 -> 456 bytes OsmAnd/res/drawable-xxhdpi/ic_action_camper.png | Bin 0 -> 503 bytes .../res/drawable-xxhdpi/ic_action_campervan.png | Bin 0 -> 644 bytes OsmAnd/res/drawable-xxhdpi/map_action_camper.png | Bin 0 -> 503 bytes .../res/drawable-xxhdpi/map_action_campervan.png | Bin 0 -> 644 bytes OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png | Bin 0 -> 647 bytes .../res/drawable-xxxhdpi/ic_action_campervan.png | Bin 0 -> 846 bytes OsmAnd/res/drawable-xxxhdpi/map_action_camper.png | Bin 0 -> 647 bytes .../res/drawable-xxxhdpi/map_action_campervan.png | Bin 0 -> 846 bytes OsmAnd/res/values/strings.xml | 7 +++++++ .../SelectProfileBottomSheetDialogFragment.java | 2 ++ 28 files changed, 9 insertions(+) create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-hdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-hdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-large-hdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-large-xhdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-large/map_action_camper.png create mode 100644 OsmAnd/res/drawable-large/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-mdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-mdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-xhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-xhdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-xxhdpi/map_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/ic_action_campervan.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/map_action_camper.png create mode 100644 OsmAnd/res/drawable-xxxhdpi/map_action_campervan.png diff --git a/OsmAnd/res/drawable-hdpi/ic_action_camper.png b/OsmAnd/res/drawable-hdpi/ic_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..08f6ec1d26a3e863e69cb7147daa183e9e9ed2eb GIT binary patch literal 363 zcmV-x0hIoUP)`5$pzTpxvM&xQTX?j?fKkCvXJWpl(3pl^@i@FBI`dp1T|zpm`-R05A;0 zFx#M%O2{hZkGk_Q0>#njYfXZWQhy9goL{zPP1eA__~w2$025e+Qf3#+da#(9yw zv7Ex_-+OZ@S%xK0PL)PNmTofkoMvjA1R)^Dd2e@=4r`8$5la^9e9FkWR+2q!7k`F18eiJ0ZPN?R>>L09002ov JPDHLkV1fpVkO2Sy literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/ic_action_campervan.png b/OsmAnd/res/drawable-hdpi/ic_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..dda219fe4c819a5d961a42c2ac9237a6ffc95687 GIT binary patch literal 439 zcmV;o0Z9IdP)cNJ&{mXM?bJFpXD1=@k>Ks&&96-Ool5=}yMcxHAOKK7jj z7D9+3k;t1Mr5wRB*j~C>!Nw*Hp^KsTgN^BNK4CN1$a8!J`w>DMZh8>V)MI8{k=El$ z(D;pV*eP}`PK@g!5-O0-Z#ixNEfv!(aQ@k{- zIi;LWw3T;0n$DbpPo|e`;GtQVoO0N$=x1y;;cy>GGxKs6q h-|$^%Mk0|eI06n9?o#bjkO=?)002ovPDHLkV1n3Evx@)# literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/map_action_camper.png b/OsmAnd/res/drawable-hdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..08f6ec1d26a3e863e69cb7147daa183e9e9ed2eb GIT binary patch literal 363 zcmV-x0hIoUP)`5$pzTpxvM&xQTX?j?fKkCvXJWpl(3pl^@i@FBI`dp1T|zpm`-R05A;0 zFx#M%O2{hZkGk_Q0>#njYfXZWQhy9goL{zPP1eA__~w2$025e+Qf3#+da#(9yw zv7Ex_-+OZ@S%xK0PL)PNmTofkoMvjA1R)^Dd2e@=4r`8$5la^9e9FkWR+2q!7k`F18eiJ0ZPN?R>>L09002ov JPDHLkV1fpVkO2Sy literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/map_action_campervan.png b/OsmAnd/res/drawable-hdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..dda219fe4c819a5d961a42c2ac9237a6ffc95687 GIT binary patch literal 439 zcmV;o0Z9IdP)cNJ&{mXM?bJFpXD1=@k>Ks&&96-Ool5=}yMcxHAOKK7jj z7D9+3k;t1Mr5wRB*j~C>!Nw*Hp^KsTgN^BNK4CN1$a8!J`w>DMZh8>V)MI8{k=El$ z(D;pV*eP}`PK@g!5-O0-Z#ixNEfv!(aQ@k{- zIi;LWw3T;0n$DbpPo|e`;GtQVoO0N$=x1y;;cy>GGxKs6q h-|$^%Mk0|eI06n9?o#bjkO=?)002ovPDHLkV1n3Evx@)# literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_camper.png b/OsmAnd/res/drawable-large-hdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..0ab012b2ad5c474cb9127ea4640b09ef3674233f GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=e{F{Fa=?Ttp>CIbQ13x_Qj@)(qNOkBL9 zQCUE}fW<9=wHN%5bYQwQp<&yTP>t>H4{@n3;pNQuJwNnCxLxesuKA5g-Wt~ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_campervan.png b/OsmAnd/res/drawable-large-hdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08d90a4d915881fc106837030cf2c0765849f1 GIT binary patch literal 456 zcmV;(0XP1MP)6Fxo@9z7{ za$5jJQ4~d45bwRkaGp+hw}rL2qwyR&me(W&Hh9@%*ci2OGRExk!5;z9B8SmJ-Rw}r zDII9yRYLOtn-4U&`W?t}Q@WYA+A^T7wGpMM)SrGff6Tz#6K7C?k^ z-pGMxixRFNz-F(xqJ(SABfG%eNPz&F3*3#A%pQOfF_V>{6!(T67z{{k1 z6bJg`egphWsdu3Wc*B)w<7ym$A8NhP-^jtXS5K#dLT0ZQlw+I;$<8nXEcN_g;kBgU ySqn44Ru3n27@tWZ=LgGKHuKW;6h%=K`FsPn6Nj5|r5Kw40000}FKH!g+*u zS7V-n--5meEN|6%63iQTU$H$`PPioTqT0jz)W`p-`YLBHe%rTa_oW67ps^rOq3X=m zF7WQlhecDjnyOc?J+Ixm@)6|U~#gK$|8D%t|YyRJXDB)+-? zq^^5k;R{E0pjLxW2l=Sg+u~Hs66frB{P*5rAD@k$>;KuU5Siuvlh25G9rsc1`}bsj zMFv|vmkas2=iXP9>%r%5>^{xrmOMQClM>8Sgxe0>*)=#JS%?t`o#fWYuARU0YmRV a%wL9E*EVGpO%~V#3QbQ}KbLh*2~7Zeam&d7 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_campervan.png b/OsmAnd/res/drawable-large-xhdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..60c0f69634534df4be60769ce2d4a700e9f40fd3 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zc>C}b8Alss-gt!m-XdSv(zc*C_`1dyDA3`uRLs?Zwu0hdT~E_GP(w{jE%J#hO_q ze1Qux_f1*Vo+s+g$8%IYz5A|F(5i0Vg!wg_{^cH+@+v|4hWPw9QLft>Yd@XT3w0vAEP5n+xl7~PW}HE z;=($0^U^)D6ei3QUKy?|aN>j<)6AU?3%EXLhcU9OVqgkoXw+(O5WT^*MNs7QFru z_H@?muJ-QSd0B^l-qMhL9q(_J=*GY7y3Ng8;qMcz7Hzk&ylr0l?AeNJp;sMopGDY( z^TcAlzO9LlUtd{N*4}5@wCqmeQyxA4LM!3hU9wyU`;zSMqy%4T{;28?i^->d7@NNo U&!7MMwI4{x)78&qol`;+0PB_t^#A|> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_action_camper.png b/OsmAnd/res/drawable-large/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..08f6ec1d26a3e863e69cb7147daa183e9e9ed2eb GIT binary patch literal 363 zcmV-x0hIoUP)`5$pzTpxvM&xQTX?j?fKkCvXJWpl(3pl^@i@FBI`dp1T|zpm`-R05A;0 zFx#M%O2{hZkGk_Q0>#njYfXZWQhy9goL{zPP1eA__~w2$025e+Qf3#+da#(9yw zv7Ex_-+OZ@S%xK0PL)PNmTofkoMvjA1R)^Dd2e@=4r`8$5la^9e9FkWR+2q!7k`F18eiJ0ZPN?R>>L09002ov JPDHLkV1fpVkO2Sy literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/map_action_campervan.png b/OsmAnd/res/drawable-large/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..dda219fe4c819a5d961a42c2ac9237a6ffc95687 GIT binary patch literal 439 zcmV;o0Z9IdP)cNJ&{mXM?bJFpXD1=@k>Ks&&96-Ool5=}yMcxHAOKK7jj z7D9+3k;t1Mr5wRB*j~C>!Nw*Hp^KsTgN^BNK4CN1$a8!J`w>DMZh8>V)MI8{k=El$ z(D;pV*eP}`PK@g!5-O0-Z#ixNEfv!(aQ@k{- zIi;LWw3T;0n$DbpPo|e`;GtQVoO0N$=x1y;;cy>GGxKs6q h-|$^%Mk0|eI06n9?o#bjkO=?)002ovPDHLkV1n3Evx@)# literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_camper.png b/OsmAnd/res/drawable-mdpi/ic_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..210a1a2c5badfbe12877fe0f08ce7e16676a53db GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#9#0p?kP61PQ!es0DDb#+7c$&+P%jpBFK~7{ zz?VSKIW!k_T4NF$GIj{Zklz!L3?$(+`r3z*lL|V zs{ecW^R`8-lHk^rg+>PZMLstMO*Yw_#`E}KeQtkN(;e}m^6j@$)DG5*Zg_mq>hcw? zsU6oi+p@E|rYtzS%C%?nI)#1FH6n34IKNxAui9bK@G;c)Q=Ve>W4>(VSKIW!k_T4NF$GIj{Zklz!L3?$(+`r3z*lL|V zs{ecW^R`8-lHk^rg+>PZMLstMO*Yw_#`E}KeQtkN(;e}m^6j@$)DG5*Zg_mq>hcw? zsU6oi+p@E|rYtzS%C%?nI)#1FH6n34IKNxAui9bK@G;c)Q=Ve>W4>(e{F{Fa=?Ttp>CIbQ13x_Qj@)(qNOkBL9 zQCUE}fW<9=wHN%5bYQwQp<&yTP>t>H4{@n3;pNQuJwNnCxLxesuKA5g-Wt~ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_campervan.png b/OsmAnd/res/drawable-xhdpi/ic_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08d90a4d915881fc106837030cf2c0765849f1 GIT binary patch literal 456 zcmV;(0XP1MP)6Fxo@9z7{ za$5jJQ4~d45bwRkaGp+hw}rL2qwyR&me(W&Hh9@%*ci2OGRExk!5;z9B8SmJ-Rw}r zDII9yRYLOtn-4U&`W?t}Q@WYA+A^T7wGpMM)SrGff6Tz#6K7C?k^ z-pGMxixRFNz-F(xqJ(SABfG%eNPz&F3*3#A%pQOfF_V>{6!(T67z{{k1 z6bJg`egphWsdu3Wc*B)w<7ym$A8NhP-^jtXS5K#dLT0ZQlw+I;$<8nXEcN_g;kBgU ySqn44Ru3n27@tWZ=LgGKHuKW;6h%=K`FsPn6Nj5|r5Kw40000e{F{Fa=?Ttp>CIbQ13x_Qj@)(qNOkBL9 zQCUE}fW<9=wHN%5bYQwQp<&yTP>t>H4{@n3;pNQuJwNnCxLxesuKA5g-Wt~ literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xhdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08d90a4d915881fc106837030cf2c0765849f1 GIT binary patch literal 456 zcmV;(0XP1MP)6Fxo@9z7{ za$5jJQ4~d45bwRkaGp+hw}rL2qwyR&me(W&Hh9@%*ci2OGRExk!5;z9B8SmJ-Rw}r zDII9yRYLOtn-4U&`W?t}Q@WYA+A^T7wGpMM)SrGff6Tz#6K7C?k^ z-pGMxixRFNz-F(xqJ(SABfG%eNPz&F3*3#A%pQOfF_V>{6!(T67z{{k1 z6bJg`egphWsdu3Wc*B)w<7ym$A8NhP-^jtXS5K#dLT0ZQlw+I;$<8nXEcN_g;kBgU ySqn44Ru3n27@tWZ=LgGKHuKW;6h%=K`FsPn6Nj5|r5Kw40000}FKH!g+*u zS7V-n--5meEN|6%63iQTU$H$`PPioTqT0jz)W`p-`YLBHe%rTa_oW67ps^rOq3X=m zF7WQlhecDjnyOc?J+Ixm@)6|U~#gK$|8D%t|YyRJXDB)+-? zq^^5k;R{E0pjLxW2l=Sg+u~Hs66frB{P*5rAD@k$>;KuU5Siuvlh25G9rsc1`}bsj zMFv|vmkas2=iXP9>%r%5>^{xrmOMQClM>8Sgxe0>*)=#JS%?t`o#fWYuARU0YmRV a%wL9E*EVGpO%~V#3QbQ}KbLh*2~7Zeam&d7 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_campervan.png b/OsmAnd/res/drawable-xxhdpi/ic_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..60c0f69634534df4be60769ce2d4a700e9f40fd3 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zc>C}b8Alss-gt!m-XdSv(zc*C_`1dyDA3`uRLs?Zwu0hdT~E_GP(w{jE%J#hO_q ze1Qux_f1*Vo+s+g$8%IYz5A|F(5i0Vg!wg_{^cH+@+v|4hWPw9QLft>Yd@XT3w0vAEP5n+xl7~PW}HE z;=($0^U^)D6ei3QUKy?|aN>j<)6AU?3%EXLhcU9OVqgkoXw+(O5WT^*MNs7QFru z_H@?muJ-QSd0B^l-qMhL9q(_J=*GY7y3Ng8;qMcz7Hzk&ylr0l?AeNJp;sMopGDY( z^TcAlzO9LlUtd{N*4}5@wCqmeQyxA4LM!3hU9wyU`;zSMqy%4T{;28?i^->d7@NNo U&!7MMwI4{x)78&qol`;+0PB_t^#A|> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_camper.png b/OsmAnd/res/drawable-xxhdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f89c8561035ff84215f57fef93e4027c28980e GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z}FKH!g+*u zS7V-n--5meEN|6%63iQTU$H$`PPioTqT0jz)W`p-`YLBHe%rTa_oW67ps^rOq3X=m zF7WQlhecDjnyOc?J+Ixm@)6|U~#gK$|8D%t|YyRJXDB)+-? zq^^5k;R{E0pjLxW2l=Sg+u~Hs66frB{P*5rAD@k$>;KuU5Siuvlh25G9rsc1`}bsj zMFv|vmkas2=iXP9>%r%5>^{xrmOMQClM>8Sgxe0>*)=#JS%?t`o#fWYuARU0YmRV a%wL9E*EVGpO%~V#3QbQ}KbLh*2~7Zeam&d7 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png b/OsmAnd/res/drawable-xxhdpi/map_action_campervan.png new file mode 100644 index 0000000000000000000000000000000000000000..60c0f69634534df4be60769ce2d4a700e9f40fd3 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zc>C}b8Alss-gt!m-XdSv(zc*C_`1dyDA3`uRLs?Zwu0hdT~E_GP(w{jE%J#hO_q ze1Qux_f1*Vo+s+g$8%IYz5A|F(5i0Vg!wg_{^cH+@+v|4hWPw9QLft>Yd@XT3w0vAEP5n+xl7~PW}HE z;=($0^U^)D6ei3QUKy?|aN>j<)6AU?3%EXLhcU9OVqgkoXw+(O5WT^*MNs7QFru z_H@?muJ-QSd0B^l-qMhL9q(_J=*GY7y3Ng8;qMcz7Hzk&ylr0l?AeNJp;sMopGDY( z^TcAlzO9LlUtd{N*4}5@wCqmeQyxA4LM!3hU9wyU`;zSMqy%4T{;28?i^->d7@NNo U&!7MMwI4{x)78&qol`;+0PB_t^#A|> literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..ddec5227fd88e3381aab7cf032cdfdac3933bd75 GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47?@-{T^vIy7~kIM^<{DtXnS}tf}yNIHiJEg zF``K}fi;1Bnge$jLs)~X1N)7GR^rz(IO=!n)D(QTJK5I4ocwI}&AoH(&0+)^3+@K51&KT(+~@fJ>3VkV!z9VPmwmPN|^P)>?7imHYEwb_-ZJ^e`OZz)Gz7 zu~*?=!sIqSpgyo>OhUU(|HZ8p?_)1ACb1~EF(lb6P;_JO5NwcO?1=SZ;Fgb-FaP-e z>-@*nTgy4SKO8##_*e43LhF{9S8JFjc)w`4?pv*Mw{Q zOC1u*cb7?O{_VNG)bhBo;644zIgod95K>Z^`%L?`|$D`^4A5{pQLk>GA0O7Pz`eGd!bHaKc5e`#&{?Bk){Lm%DRY7(z@~0drDELIAGL9O(c600d`2O+f$vv5yP9|WoZ0YG!+7Md=0000000000;6ym*8f|aR)>7LqZC?fb5>0%cH*K|`bHIsTw>bME zWSaPOzxO%cDl(W${qaLvqpc1NaZgoMJr3#ETYwOw7wIM*`}?B>xEa#%V*3G|e81v- zj2gjM*M2J;(s82z`b!V`<5}CKV5(+Fr+-^eSozNaE3IxrSFuj-1qge--*#B}wr;fu z^IaW2wjjUtF!}bHScfXC{)Hfg=r-gNz~>n0)Ugh}0AB>Dyv92CEodq1|0%4r-RKt7 z?&{Aox4_B}}g(!0~ z&+U`*!eig1d`ZVQIRPP(y}~M4O2JZ(Z*l^{N%ZPlIi*QGK8r2r`hQQj)3}*k%JIGO zCLGsFn(@6~M{JRR+MmeBYVao(zL0bZlke4HJHCzUh^tud#BZcmLoQ}cDfjrI2?)`f zi@jOy$@hvFpRSVHb$5xi;$N$lBT>Zo^abyooqIVlMT}2h_|Z-GC`YP@@wslLjESrN zouga%+lm;U>-Nmq9w+za3c9CqG2;s-dLK?;ebp?&V?NTw-jC?i#|Hoa00000000i- YFRx{_FtnHUFaQ7m07*qoM6N<$g4mCWEdT%j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png b/OsmAnd/res/drawable-xxxhdpi/map_action_camper.png new file mode 100644 index 0000000000000000000000000000000000000000..ddec5227fd88e3381aab7cf032cdfdac3933bd75 GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47?@-{T^vIy7~kIM^<{DtXnS}tf}yNIHiJEg zF``K}fi;1Bnge$jLs)~X1N)7GR^rz(IO=!n)D(QTJK5I4ocwI}&AoH(&0+)^3+@K51&KT(+~@fJ>3VkV!z9VPmwmPN|^P)>?7imHYEwb_-ZJ^e`OZz)Gz7 zu~*?=!sIqSpgyo>OhUU(|HZ8p?_)1ACb1~EF(lb6P;_JO5NwcO?1=SZ;Fgb-FaP-e z>-@*nTgy4SKO8##_*e43LhF{9S8JFjc)w`4?pv*Mw{Q zOC1u*cb7?O{_VNG)bhBo;644zIgod95K>Z^`%L?`|$D`^4A5{pQLk>GA0O7Pz`eGd!bHaKc5e`#&{?Bk){Lm%DRY7(z@~0drDELIAGL9O(c600d`2O+f$vv5yP9|WoZ0YG!+7Md=0000000000;6ym*8f|aR)>7LqZC?fb5>0%cH*K|`bHIsTw>bME zWSaPOzxO%cDl(W${qaLvqpc1NaZgoMJr3#ETYwOw7wIM*`}?B>xEa#%V*3G|e81v- zj2gjM*M2J;(s82z`b!V`<5}CKV5(+Fr+-^eSozNaE3IxrSFuj-1qge--*#B}wr;fu z^IaW2wjjUtF!}bHScfXC{)Hfg=r-gNz~>n0)Ugh}0AB>Dyv92CEodq1|0%4r-RKt7 z?&{Aox4_B}}g(!0~ z&+U`*!eig1d`ZVQIRPP(y}~M4O2JZ(Z*l^{N%ZPlIi*QGK8r2r`hQQj)3}*k%JIGO zCLGsFn(@6~M{JRR+MmeBYVao(zL0bZlke4HJHCzUh^tud#BZcmLoQ}cDfjrI2?)`f zi@jOy$@hvFpRSVHb$5xi;$N$lBT>Zo^abyooqIVlMT}2h_|Z-GC`YP@@wslLjESrN zouga%+lm;U>-Nmq9w+za3c9CqG2;s-dLK?;ebp?&V?NTw-jC?i#|Hoa00000000i- YFRx{_FtnHUFaQ7m07*qoM6N<$g4mCWEdT%j literal 0 HcmV?d00001 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 517b8c176e..9711e22e95 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,13 @@ Thx - Hardy --> +<<<<<<< HEAD +======= + Camper + Campervan + Show Low Emission zones on the map. Does not affect routing. + Show Low Emission Zones +>>>>>>> a11c7b0e2a... Add new App profiles icons Consider temporary limitations Please turn on at least one application profile, to use this setting. Winter road diff --git a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java index 4e356fb482..0bb1c41314 100644 --- a/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java @@ -256,6 +256,8 @@ public class SelectProfileBottomSheetDialogFragment extends MenuBottomSheetDialo icons.add(new IconResWithDescr(R.drawable.ic_action_scooter, R.string.app_mode_scooter, "ic_action_scooter", false)); icons.add(new IconResWithDescr(R.drawable.ic_action_ufo, R.string.app_mode_ufo, "ic_action_ufo", false)); icons.add(new IconResWithDescr(R.drawable.ic_action_offroad, R.string.app_mode_offroad, "ic_action_offroad", false)); + icons.add(new IconResWithDescr(R.drawable.ic_action_campervan, R.string.app_mode_campervan, "ic_action_campervan", false)); + icons.add(new IconResWithDescr(R.drawable.ic_action_camper, R.string.app_mode_camper, "ic_action_camper", false)); return icons; } From 01c40f7de08d8ae980952c81f78ad2aad1468cb9 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Tue, 23 Jul 2019 13:30:02 +0300 Subject: [PATCH 07/22] Fix strings.xml --- OsmAnd/res/values/strings.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 9711e22e95..455a9dcf2f 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,13 +11,10 @@ Thx - Hardy --> -<<<<<<< HEAD -======= Camper Campervan Show Low Emission zones on the map. Does not affect routing. Show Low Emission Zones ->>>>>>> a11c7b0e2a... Add new App profiles icons Consider temporary limitations Please turn on at least one application profile, to use this setting. Winter road From f4846c0b7b3e6f5ada10deb736535ac853ec3cc9 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Tue, 23 Jul 2019 14:38:42 +0300 Subject: [PATCH 08/22] Add Serbian TTS --- OsmAnd/assets/bundled_assets.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml index 8992fc57eb..2d4dedfb87 100644 --- a/OsmAnd/assets/bundled_assets.xml +++ b/OsmAnd/assets/bundled_assets.xml @@ -41,6 +41,7 @@ + From 0774b90664734793a9d8f44fad15236709e69f5b Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Tue, 23 Jul 2019 14:38:42 +0300 Subject: [PATCH 09/22] Add Serbian TTS --- OsmAnd/assets/bundled_assets.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml index 8992fc57eb..2d4dedfb87 100644 --- a/OsmAnd/assets/bundled_assets.xml +++ b/OsmAnd/assets/bundled_assets.xml @@ -41,6 +41,7 @@ + From 32c9dd8ea9a51ace9f5f2b3b2e8d70970c9160f8 Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 23 Jul 2019 16:10:35 +0300 Subject: [PATCH 10/22] Fix #7054 --- .../main/java/net/osmand/GPXUtilities.java | 39 +++++++++++- OsmAnd/res/layout/gpx_item_altitude.xml | 29 +++++++++ OsmAnd/res/layout/gpx_item_general.xml | 29 +++++++++ OsmAnd/res/layout/gpx_item_speed.xml | 29 +++++++++ OsmAnd/res/values/strings.xml | 1 + .../net/osmand/plus/GpxSelectionHelper.java | 15 +++++ .../net/osmand/plus/helpers/GpxUiHelper.java | 15 ++++- .../plus/myplaces/TrackSegmentFragment.java | 63 ++++++++++++++++--- 8 files changed, 207 insertions(+), 13 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java index 73417f2ed1..65e69094ac 100644 --- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java +++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java @@ -159,12 +159,16 @@ public class GPXUtilities { public float distance; public int time; public float elevation; + public boolean firstPoint = false; + public boolean lastPoint = false; } public static class Speed { public float distance; public int time; public float speed; + public boolean firstPoint = false; + public boolean lastPoint = false; } public static class WptPt extends GPXExtensions { @@ -355,15 +359,19 @@ public class GPXUtilities { public static class GPXTrackAnalysis { public float totalDistance = 0; + public float totalDistanceWithoutGaps = 0; public int totalTracks = 0; public long startTime = Long.MAX_VALUE; public long endTime = Long.MIN_VALUE; public long timeSpan = 0; + public long timeSpanWithoutGaps = 0; //Next few lines for Issue 3222 heuristic testing only //public long timeMoving0 = 0; //public float totalDistanceMoving0 = 0; public long timeMoving = 0; + public long timeMovingWithoutGaps = 0; public float totalDistanceMoving = 0; + public float totalDistanceMovingWithoutGaps = 0; public double diffElevationUp = 0; public double diffElevationDown = 0; @@ -432,6 +440,10 @@ public class GPXUtilities { long startTimeOfSingleSegment = 0; long endTimeOfSingleSegment = 0; + float distanceOfSingleSegment = 0; + float distanceMovingOfSingleSegment = 0; + long timeMovingOfSingleSegment = 0; + float totalElevation = 0; int elevationPoints = 0; int speedCount = 0; @@ -479,7 +491,7 @@ public class GPXUtilities { endTimeOfSingleSegment = time; } if (startTimeOfSingleSegment != 0 && endTimeOfSingleSegment != 0) { - timeSpan += endTimeOfSingleSegment - startTimeOfSingleSegment; + timeSpanWithoutGaps += endTimeOfSingleSegment - startTimeOfSingleSegment; startTimeOfSingleSegment = 0; endTimeOfSingleSegment = 0; } @@ -627,6 +639,10 @@ public class GPXUtilities { if ((speed > 0) && (calculations[0] > 0.1 / 1000f * (point.time - prev.time)) && point.time != 0 && prev.time != 0) { timeMoving = timeMoving + (point.time - prev.time); totalDistanceMoving += calculations[0]; + if (s.segment.generalSegment && !point.firstPoint) { + timeMovingOfSingleSegment += point.time - prev.time; + distanceMovingOfSingleSegment += calculations[0]; + } } //Next few lines for Issue 3222 heuristic testing only @@ -658,6 +674,27 @@ public class GPXUtilities { if (!hasSpeedData && speed1.speed > 0 && totalDistance > 0) { hasSpeedData = true; } + if (s.segment.generalSegment) { + distanceOfSingleSegment += calculations[0]; + if (point.firstPoint) { + distanceOfSingleSegment = 0; + timeMovingOfSingleSegment = 0; + distanceMovingOfSingleSegment = 0; + if (j > 0) { + elevation1.firstPoint = true; + speed1.firstPoint = true; + } + } + if (point.lastPoint) { + totalDistanceWithoutGaps += distanceOfSingleSegment; + timeMovingWithoutGaps += timeMovingOfSingleSegment; + totalDistanceMovingWithoutGaps += distanceMovingOfSingleSegment; + if (j < numberOfPoints - 1) { + elevation1.lastPoint = true; + speed1.lastPoint = true; + } + } + } } } if (totalDistance < 0) { diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml index db3e7d8029..f0a2511519 100644 --- a/OsmAnd/res/layout/gpx_item_altitude.xml +++ b/OsmAnd/res/layout/gpx_item_altitude.xml @@ -18,6 +18,35 @@ android:layout_height="150dp" android:layout_gravity="center_vertical"/> + + + + + + + + + + + + + + + + + + + + + + + + + Join gaps Camper Campervan Show Low Emission zones on the map. Does not affect routing. diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java index 64d43a3b97..78ac863c0b 100644 --- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java +++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java @@ -197,6 +197,7 @@ public class GpxSelectionHelper { d = t.name + " " + d; } group.setDescription(d); + group.setGeneralTrack(true); processGroupTrack(app, group); return group; } @@ -215,6 +216,7 @@ public class GpxSelectionHelper { d = t.name + " " + d; } group.setDescription(d); + group.setGeneralTrack(t.generalTrack); processGroupTrack(app, group); return group; } @@ -771,6 +773,7 @@ public class GpxSelectionHelper { private double splitDistance = -1; private int splitTime = -1; private int color; + private boolean generalTrack; public GpxDisplayGroup(GPXFile gpx) { this.gpx = gpx; @@ -878,6 +881,14 @@ public class GpxSelectionHelper { public void setColor(int color) { this.color = color; } + + public boolean isGeneralTrack() { + return generalTrack; + } + + public void setGeneralTrack(boolean generalTrack) { + this.generalTrack = generalTrack; + } } public static class GpxDisplayItem { @@ -903,5 +914,9 @@ public class GpxSelectionHelper { public Matrix chartMatrix; public float chartHighlightPos = -1f; + + public boolean isGeneralTrack() { + return group != null && group.isGeneralTrack(); + } } } diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java index 1adc0b4d89..5350a4b1ad 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java @@ -1164,7 +1164,7 @@ public class GpxUiHelper { } private static List calculateElevationArray(GPXTrackAnalysis analysis, GPXDataSetAxisType axisType, - float divX, float convEle) { + float divX, float convEle, boolean useGeneralTrackPoints) { List values = new ArrayList<>(); List elevationData = analysis.elevationData; float nextX = 0; @@ -1207,6 +1207,9 @@ public class GpxUiHelper { } hasSameY = false; } + if (useGeneralTrackPoints && e.firstPoint && lastEntry != null) { + values.add(new Entry(nextX, lastEntry.getY())); + } prevElevOrig = e.elevation; prevElev = elev; nextY = elev * convEle; @@ -1352,7 +1355,7 @@ public class GpxUiHelper { } }); - List values = calculateElevationArray(analysis, axisType, divX, convEle); + List values = calculateElevationArray(analysis, axisType, divX, convEle, true); OrderedLineDataSet dataSet = new OrderedLineDataSet(values, "", GPXDataSetType.ALTITUDE, axisType); dataSet.priority = (float) (analysis.avgElevation - analysis.minElevation) * convEle; @@ -1483,7 +1486,13 @@ public class GpxUiHelper { if (nextY < 0 || Float.isInfinite(nextY)) { nextY = 0; } + if (s.firstPoint) { + values.add(new Entry(nextX, 0)); + } values.add(new Entry(nextX, nextY)); + if (s.lastPoint) { + values.add(new Entry(nextX, 0)); + } } } @@ -1602,7 +1611,7 @@ public class GpxUiHelper { List values; if (eleValues == null) { - values = calculateElevationArray(analysis, GPXDataSetAxisType.DISTANCE, 1f, 1f); + values = calculateElevationArray(analysis, GPXDataSetAxisType.DISTANCE, 1f, 1f, false); } else { values = new ArrayList<>(eleValues.size()); for (Entry e : eleValues) { diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index 4d43794ebb..d58498804a 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -16,6 +16,7 @@ import android.support.v4.view.MenuItemCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewCompat; import android.support.v7.app.AlertDialog; +import android.support.v7.widget.SwitchCompat; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.Menu; @@ -60,6 +61,7 @@ import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.TrackActivity; import net.osmand.plus.base.OsmAndListFragment; +import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType; import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType; @@ -91,6 +93,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit private boolean updateEnable; private boolean chartClicked; + private boolean joinGapsEnabled; private IconPopupMenu generalPopupMenu; private IconPopupMenu altitudePopupMenu; @@ -455,7 +458,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit dataSets.add(elevationDataSet); } if (analysis.hasElevationData) { - List eleValues = elevationDataSet != null ? elevationDataSet.getValues() : null; + List eleValues = elevationDataSet != null && !gpxItem.isGeneralTrack() ? elevationDataSet.getValues() : null; OrderedLineDataSet slopeDataSet = GpxUiHelper.createGPXSlopeDataSet(app, chart, analysis, GPXDataSetAxisType.DISTANCE, eleValues, true, true); if (slopeDataSet != null) { @@ -713,11 +716,19 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit ((ImageView) view.findViewById(R.id.end_time_icon)) .setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_time_end)); - ((TextView) view.findViewById(R.id.distance_text)) - .setText(OsmAndFormatter.getFormattedDistance(analysis.totalDistance, app)); - ((TextView) view.findViewById(R.id.duration_text)) - .setText(Algorithms.formatDuration((int) (analysis.timeSpan / 1000), app.accessibilityEnabled())); + updateJoinGapsInfo(view, position); + final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); + joinGapsSwitch.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + joinGapsEnabled = joinGapsSwitch.isChecked(); + for (int i = 0; i < getCount(); i++) { + View view = getViewAtPosition(i); + updateJoinGapsInfo(view, i); + } + } + }); if (analysis.timeSpan > 0) { DateFormat tf = SimpleDateFormat.getTimeInstance(DateFormat.SHORT); DateFormat df = SimpleDateFormat.getDateInstance(DateFormat.MEDIUM); @@ -912,6 +923,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit } else { view.findViewById(R.id.overflow_menu).setVisibility(View.GONE); } + updateJoinGapsInfo(view, position); break; case GPX_TAB_ITEM_SPEED: @@ -938,11 +950,20 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit ((TextView) view.findViewById(R.id.average_text)).setText(avg); ((TextView) view.findViewById(R.id.max_text)).setText(max); - ((TextView) view.findViewById(R.id.time_moving_text)) - .setText(Algorithms.formatDuration((int) (analysis.timeMoving / 1000), app.accessibilityEnabled())); - ((TextView) view.findViewById(R.id.distance_text)) - .setText(OsmAndFormatter.getFormattedDistance(analysis.totalDistanceMoving, app)); + updateJoinGapsInfo(view, position); + + final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); + joinGapsSwitch.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + joinGapsEnabled = joinGapsSwitch.isChecked(); + for (int i = 0; i < getCount(); i++) { + View view = getViewAtPosition(i); + updateJoinGapsInfo(view, i); + } + } + }); } else { chart.setVisibility(View.GONE); view.findViewById(R.id.average_max).setVisibility(View.GONE); @@ -1110,6 +1131,30 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit } } + void updateJoinGapsInfo(View view, int position) { + if (view != null) { + GPXTrackAnalysis analysis = gpxItem.analysis; + AndroidUiHelper.updateVisibility(view.findViewById(R.id.gpx_join_gaps_container), gpxItem.isGeneralTrack()); + ((SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch)).setChecked(joinGapsEnabled); + if (analysis != null) { + GPXTabItemType tabType = tabTypes[position]; + if (tabType.equals(GPXTabItemType.GPX_TAB_ITEM_GENERAL)) { + float totalDistance = joinGapsEnabled && gpxItem.isGeneralTrack() ? analysis.totalDistanceWithoutGaps : analysis.totalDistance; + float timeSpan = joinGapsEnabled && gpxItem.isGeneralTrack() ? analysis.timeSpanWithoutGaps : analysis.timeSpan; + + ((TextView) view.findViewById(R.id.distance_text)).setText(OsmAndFormatter.getFormattedDistance(totalDistance, app)); + ((TextView) view.findViewById(R.id.duration_text)).setText(Algorithms.formatDuration((int) (timeSpan / 1000), app.accessibilityEnabled())); + } else if (tabType.equals(GPXTabItemType.GPX_TAB_ITEM_SPEED)) { + long timeMoving = joinGapsEnabled && gpxItem.isGeneralTrack() ? analysis.timeMovingWithoutGaps : analysis.timeMoving; + float totalDistanceMoving = joinGapsEnabled && gpxItem.isGeneralTrack() ? analysis.totalDistanceMovingWithoutGaps : analysis.totalDistanceMoving; + + ((TextView) view.findViewById(R.id.time_moving_text)).setText(Algorithms.formatDuration((int) (timeMoving / 1000), app.accessibilityEnabled())); + ((TextView) view.findViewById(R.id.distance_text)).setText(OsmAndFormatter.getFormattedDistance(totalDistanceMoving, app)); + } + } + } + } + void updateChart(LineChart chart) { if (chart != null && !chart.isEmpty()) { if (gpxItem.chartMatrix != null) { From 7ba9c960a5653c3dc5235740a3743ca0eb71d3b1 Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 23 Jul 2019 16:22:02 +0300 Subject: [PATCH 11/22] Add check for analysis --- .../plus/myplaces/TrackSegmentFragment.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index d58498804a..822a338845 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -716,8 +716,6 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit ((ImageView) view.findViewById(R.id.end_time_icon)) .setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_time_end)); - updateJoinGapsInfo(view, position); - final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); joinGapsSwitch.setOnClickListener(new View.OnClickListener() { @Override @@ -749,6 +747,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit view.findViewById(R.id.list_divider).setVisibility(View.GONE); view.findViewById(R.id.start_end_time).setVisibility(View.GONE); } + updateJoinGapsInfo(view, position); view.findViewById(R.id.analyze_on_map).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -855,12 +854,24 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit ((TextView) view.findViewById(R.id.ascent_text)).setText(asc); ((TextView) view.findViewById(R.id.descent_text)).setText(desc); + final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); + joinGapsSwitch.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + joinGapsEnabled = joinGapsSwitch.isChecked(); + for (int i = 0; i < getCount(); i++) { + View view = getViewAtPosition(i); + updateJoinGapsInfo(view, i); + } + } + }); } else { chart.setVisibility(View.GONE); view.findViewById(R.id.average_range).setVisibility(View.GONE); view.findViewById(R.id.list_divider).setVisibility(View.GONE); view.findViewById(R.id.ascent_descent).setVisibility(View.GONE); } + updateJoinGapsInfo(view, position); view.findViewById(R.id.analyze_on_map).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -923,7 +934,6 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit } else { view.findViewById(R.id.overflow_menu).setVisibility(View.GONE); } - updateJoinGapsInfo(view, position); break; case GPX_TAB_ITEM_SPEED: @@ -951,8 +961,6 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit ((TextView) view.findViewById(R.id.average_text)).setText(avg); ((TextView) view.findViewById(R.id.max_text)).setText(max); - updateJoinGapsInfo(view, position); - final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch); joinGapsSwitch.setOnClickListener(new View.OnClickListener() { @Override @@ -970,6 +978,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit view.findViewById(R.id.list_divider).setVisibility(View.GONE); view.findViewById(R.id.time_distance).setVisibility(View.GONE); } + updateJoinGapsInfo(view, position); view.findViewById(R.id.analyze_on_map).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -1134,7 +1143,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit void updateJoinGapsInfo(View view, int position) { if (view != null) { GPXTrackAnalysis analysis = gpxItem.analysis; - AndroidUiHelper.updateVisibility(view.findViewById(R.id.gpx_join_gaps_container), gpxItem.isGeneralTrack()); + AndroidUiHelper.updateVisibility(view.findViewById(R.id.gpx_join_gaps_container), gpxItem.isGeneralTrack() && analysis != null); ((SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch)).setChecked(joinGapsEnabled); if (analysis != null) { GPXTabItemType tabType = tabTypes[position]; From b06f0481ca51e3f2db81cb43849352bf73b4c69e Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 23 Jul 2019 17:14:18 +0300 Subject: [PATCH 12/22] Show join gaps switch only on overview tab --- .../src/net/osmand/plus/myplaces/TrackSegmentFragment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index 822a338845..fe907e54f8 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -1143,10 +1143,11 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit void updateJoinGapsInfo(View view, int position) { if (view != null) { GPXTrackAnalysis analysis = gpxItem.analysis; - AndroidUiHelper.updateVisibility(view.findViewById(R.id.gpx_join_gaps_container), gpxItem.isGeneralTrack() && analysis != null); + GPXTabItemType tabType = tabTypes[position]; + boolean visible = gpxItem.isGeneralTrack() && analysis != null && tabType.equals(GPXTabItemType.GPX_TAB_ITEM_GENERAL); + AndroidUiHelper.updateVisibility(view.findViewById(R.id.gpx_join_gaps_container), visible); ((SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch)).setChecked(joinGapsEnabled); if (analysis != null) { - GPXTabItemType tabType = tabTypes[position]; if (tabType.equals(GPXTabItemType.GPX_TAB_ITEM_GENERAL)) { float totalDistance = joinGapsEnabled && gpxItem.isGeneralTrack() ? analysis.totalDistanceWithoutGaps : analysis.totalDistance; float timeSpan = joinGapsEnabled && gpxItem.isGeneralTrack() ? analysis.timeSpanWithoutGaps : analysis.timeSpan; From 9cdedafa61eb76754f48fc233ea85676fa230027 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 23 Jul 2019 16:38:42 +0200 Subject: [PATCH 13/22] Fix typo --- OsmAnd/src/net/osmand/plus/ApplicationMode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java index 17daac98ce..94a4ec5de3 100644 --- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java +++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java @@ -140,7 +140,7 @@ public class ApplicationMode { ApplicationMode[] navigationSet2 = new ApplicationMode[]{PEDESTRIAN, PUBLIC_TRANSPORT, AIRCRAFT}; regWidgetVisibility(WIDGET_NEXT_TURN, navigationSet1); - regWidgetVisibility(WIDGET_NEXT_TURN, navigationSet2); + regWidgetVisibility(WIDGET_NEXT_TURN_SMALL, navigationSet2); regWidgetVisibility(WIDGET_NEXT_NEXT_TURN, navigationSet1); regWidgetAvailability(WIDGET_NEXT_TURN, exceptDefault); regWidgetAvailability(WIDGET_NEXT_TURN_SMALL, exceptDefault); From 057b5e2614158a6e3d89009f33b77c83232794ad Mon Sep 17 00:00:00 2001 From: Wilker Santana da Silva Date: Mon, 22 Jul 2019 14:51:42 +0000 Subject: [PATCH 14/22] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2905 of 2905 strings) --- OsmAnd/res/values-pt-rBR/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 4fa453a8b1..23f38ee766 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -2721,7 +2721,8 @@ Pôr do Sol: %2$s Arquivos GPX Hora de chegada intermediária Hora intermediária - Adquira OsmAnd Live para desbloquear todos os recursos:atualização diária de mapa com downloads ilimitados, todos os plugins grátis e pagos, Wikipédia, Wikivoyage e muito mais. + Adquira OsmAnd Live para desbloquear todos estes recursos: +\nAtualização diária de mapa com downloads ilimitados, todos os plugins grátis e pagos, Wikipédia, Wikivoyage e muito mais. Modificação do estilo padrão para aumentar o contraste de vias de pedestre e bicicleta. Usa as cores Mapnik antigo. Adequado para uso durante a condução off-road e com imagens de satélite verde usadas como mapa de fundo. Pontos-chave: espessura de vias principais reduzida, maior espessura de caminhos, trilhas, ciclovias e outras rotas. Baseado no estilo \'Topo\'. Estilo de navegação náutica. Principais características: boias, faróis, rios, rotas e marcas marítimas, portos, serviços de balizamento, batimetria. From 98f2eb766cc054fb4f2b3f23ccc95cd2fa66d675 Mon Sep 17 00:00:00 2001 From: Hakuchi Date: Mon, 22 Jul 2019 15:57:04 +0000 Subject: [PATCH 15/22] Translated using Weblate (German) Currently translated at 99.8% (2900 of 2905 strings) --- OsmAnd/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 5137a308d9..4cf26096d4 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -3186,7 +3186,7 @@ Abgedeckte Fläche: %1$s x %2$s Bestimmen Sie die maximale Anzahl an Änderungen Anzahl der Änderungen Offroad - externes Eingabegerät + Externe Eingabegeräte Bei Richtungsänderung aufwecken Zeitdauer festlegen, für die der Bildschirm eingeschaltet wird. Annäherungssensor verwenden From c36fbeea2cbc8b455f4da37b5340d14b12c65137 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 22 Jul 2019 06:38:38 +0000 Subject: [PATCH 16/22] Translated using Weblate (Danish) Currently translated at 98.5% (2862 of 2905 strings) --- OsmAnd/res/values-da/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 0943803e5f..7c8529ceb8 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1662,7 +1662,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).Næste Åbner kl. Lukker - GPX-fil med placeringsnoter. + GPX-fil med placeringer. Placeringer Grundlæggende Kontaktoplysninger @@ -3059,9 +3059,9 @@ Repræsenterer område: %1$s x %2$s Hentede kort Besøgte skærme Indsamlede data - Liste over data der deles med OsmAnd. - Data indsamles for at forstå, hvilke kort over regioner og lande der er mest populære. - Data indsamles for at forstå hvilke funktioner i OsmAnd der er mest populære. + Definer hvilke data der deles med OsmAnd. + Hjælper med at forstå, hvilke kort over hvilke regioner og lande der er mest populære. + Hjælper med at forstå hvilke funktioner i OsmAnd der er mest populære. Ved at trykke på \"Tillad\" accepteres vores %1$s Privatliv og sikkerhed Vælg hvilke data der deles med os @@ -3124,7 +3124,7 @@ Repræsenterer område: %1$s x %2$s Langrend ski Spor til langrend ski Slæde - Pister til kælling. + Pister til kælkning. Tillad mellemliggende ruter Mere vanskelige ruter med stejlere sektioner. Generelt bør nogle hindringer undgås. Tillad avancerede ruter @@ -3132,9 +3132,9 @@ Repræsenterer område: %1$s x %2$s Tillad ekspert ruter Ekstremt vanskelige ruter, med farlige forhindringer og omgivelser. Tillad kun skøjteløb ruter - Ruter forberedt til freestyle eller bare skøjteløb uden klassiske stier. + Ruter forberedt til freestyle eller kun skøjteløb uden klassiske spor Tillad kun klassiske ruter - Ruter forberedt til den klassiske stil uden skøjtebaner. Omfatter ruter udarbejdet af en mindre snescooter med løsere pister og stier lavet manuelt af skiløbere. + Ruter forberedt til den klassiske stil uden skøjtebaner. Omfatter ruter udarbejdet af en mindre snescooter med løsere pister og spor lavet manuelt af skiløbere. Foretrukket sværhedsgrad Foretræk ruter med denne vanskelighed, selv om ruteplanlægning over sværere eller lettere pister stadig er muligt, hvis de er kortere. Off-piste @@ -3154,8 +3154,8 @@ Repræsenterer område: %1$s x %2$s Nedbrud Den sidste start af OsmAnd mislykkedes. Hjælp med at forbedre OsmAnd ved at dele fejlmeddelelsen. UFO - "• Anvendelsesprofiler: opret en brugervalgt profil med en brugervalgt ikon og farve -\n + "• Anvendelsesprofiler: opret en brugervalgt profil med en brugervalgt ikon og farve +\n \n • Tilpas alle profilers standard- og min/max hastigheder \n \n• Tilføjet et modul til de aktuelle koordinater @@ -3164,8 +3164,8 @@ Repræsenterer område: %1$s x %2$s \n \n• Rettet logføring af baggrundsspor \n -\n• Forbedret hentning af kort i baggrunden -\n +\n• Forbedret hentning af kort i baggrunden +\n \n• Rettet Wikipedia sprogvalg \n \n• Rettet kompasknappens opførsel under navigationen From 80d97c84a4486c596033866cce20acfe65c7116f Mon Sep 17 00:00:00 2001 From: Verdulo Date: Mon, 22 Jul 2019 15:54:19 +0000 Subject: [PATCH 17/22] Translated using Weblate (Esperanto) Currently translated at 100.0% (2905 of 2905 strings) --- OsmAnd/res/values-eo/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml index bcf5ce2ed2..457a9760a5 100644 --- a/OsmAnd/res/values-eo/strings.xml +++ b/OsmAnd/res/values-eo/strings.xml @@ -1962,7 +1962,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB). Formo de geografiaj koordinatoj. Memorkarto Malfermitaj nun - Malfermita 24/7 + Malfermitaj 24/7 Serĉi el Kvartalo From 9dbb4e60ad53740655de593609d2fdd0fb8e933d Mon Sep 17 00:00:00 2001 From: Victor K Date: Mon, 22 Jul 2019 13:33:14 +0000 Subject: [PATCH 18/22] Translated using Weblate (Russian) Currently translated at 96.6% (2806 of 2905 strings) --- OsmAnd/res/values-ru/strings.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index aaefa90459..1e66fde03b 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -3097,7 +3097,7 @@ Значок Собранные данные Нажмите еще раз, чтобы изменить ориентацию карты - Последний запуск OsmAnd завершился с ошибкой. Помогите нам улучшить OsmAnd. Пожалуйста, отправьте нам сообщение об ошибке. + "Последний запуск OsmAnd завершился с ошибкой. Помогите нам улучшить OsmAnd. Пожалуйста, поделитесь с нами сообщением об ошибке." Режим: %s Режим пользователя, полученный из: %s Повторяющееся имя @@ -3146,4 +3146,14 @@ НЛО Настройка профиля У каждого профиля свои настройки - + Мин/макс скорость + Аварии + Бездорожье + Выберите настройки карты по умолчанию для профиля + Выбор параметров экрана по умолчанию для профиля + Выбор параметров навигации по умолчанию для профиля + Укажите максимальное количество изменений + Использовать датчик приближения + Пожалуйста, включите по крайней мере один профиль приложения, чтобы использовать этот параметр. + %s сохранено + \ No newline at end of file From e6bcdb675c5096697d92e9c413ee7a67b5fae421 Mon Sep 17 00:00:00 2001 From: transjjj Date: Mon, 22 Jul 2019 11:17:41 +0000 Subject: [PATCH 19/22] Translated using Weblate (Japanese) Currently translated at 94.0% (2730 of 2905 strings) --- OsmAnd/res/values-ja/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index fe4e64f3cc..9607cb9d28 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -3047,4 +3047,6 @@ POIの更新は利用できません 道(自動車以外のもの向け) 自転車道 自宅の追加 + プライバシーポリシー + プライバシーとセキュリティ \ No newline at end of file From 48f385d7e2769c81ca80bfb5847c9dde1c838e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A8ire=20Br=C3=A9chet?= Date: Mon, 22 Jul 2019 15:54:05 +0000 Subject: [PATCH 20/22] Translated using Weblate (Occitan) Currently translated at 22.9% (823 of 3587 strings) --- OsmAnd/res/values-oc/phrases.xml | 196 +++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/OsmAnd/res/values-oc/phrases.xml b/OsmAnd/res/values-oc/phrases.xml index dc64c14d10..ebae264c06 100644 --- a/OsmAnd/res/values-oc/phrases.xml +++ b/OsmAnd/res/values-oc/phrases.xml @@ -627,4 +627,200 @@ Combustible: organic carbonitzat Combustible: carbon Andana de frenada d’urgéncia + Reciclatge (saquets negres) + Electrodomestic pichon + Electrodomestic gròs + Reciclatge de l’òli + Tòla + Ampola + Cagadas + Bedola + Banasta per lo papier + Bòsc amb manteniment uman + Bastissas agricòlas + Getada + Susvelhança + Observatòri + Biga, pilòn + Centre de contròla + Campàs + Gàbias de cricket + Tina de resèrva + Ninoèra, Escòla mairala + Oficina de l’Estat civiu + Ofici public + Procuraire + Centre de l’Impòst + Escart + Residéncia d\'avis + Ortofonista + Centre educatiu + Escomessas (Bookmaker) + Conselhier fiscau + Icestock ( palets sus glaç) + Corfbòl (basquet olandés) + Espòrt automobile + Multi Espòrt + Corsa d’orientacion + Padèla + Parapenda + Pelòta + Raqueta + Rodelatge + Rem + Rugbi a 15 + Rugbi a 13 + Vela + Tir + Patinatge + MonopatIn (Skètabòrd) + Esquí + Fotbòl + Surf + Natacion + Tenís de taula + Tenís + Tobogan + Voleibòl + Musèu + Memoriau + Òbra d\'art + Site arqueologic + Prat batalhier + Tèrme + Canon istoric + Castèu, castellar + Portau + Fortalesa + Fònt + Roïnas istoricas + Pèira runica + Avariá + Nau istorica + Mina istorica + Monument + Pargue zoologic + Aquari + Pargue tematic + Atracion toristica + Element toristic + Animaus captius (atracion) + Ròda de fiera + Vira-vira + Laberint + Montanhas russas + Tobogan + Tobogan de tirassèu + Vira-vira pendolat + Trenet de fiera + Tobogan aquaric + Alotjament + Ostalariá + Pension + Aubèrga + Motel + Refugi + Abèrg + Apartament + Tubanèu + Cabana + Abric + Agachon + Luòc de culte + Crestianisme + Judaísme + Islamisme + Sikhisme + Bodisme + Indoísme + Chintoísme + Taoísme + Religion Vodó + Universalisme unitarista + Multiconfessionau + Jaïnisme + Espiritualisme + Bahaísme + Scientologia + Paganisme + Tenrikyo + Zoroastrisme + Religion catolica + Glèisa Baptista + Catolica romana + Ortodòxa + Luteriana + Sunnita + Protestanta + Metodista + Anglicana + Presbiteriana + Evangelica + Ortodòxa Russa + Pendecostala + Mormona + Testimonis de Jeòva + Ortodòxa grega + Reformada + Adventisme dau jorn setenc + Nòva apostolica + Glèisa d’Anglatèrra + Episcopala + Chiísme + Glèisa unida + Catolic grèc + Tibetana + Glèisa unida reformada + Glèisa d’Escòcia + Exercici de sauvament + Glèisa dau Crist + Glèisa unificada + Mennonisme + Quaker + Ortodòxa bulgara + Assemblada de Dieu + Sensa denominacion + Adventista + Nazarens + Metodista Unida + Congregacionau + Cresenças ancianas + Ortodòxa sèrbia + Espiritista + Apostolica d\'Armènia + Olandesa reformada + Apostolica + Reformada + Movement dels Sants dels Jorns Darriers + Glèisa dau Crist + Glèisa unida dau Crist + Ortodòxa georgiana + Materialista + Ortodòxa Romanesa + Glèisa ortodòxa etopiana + Unitarista + Còpte ortodòx + Wesleian + Chactisme + Chingon (bodisme) + Maronita + Bodisme mahaiana + Accès a Internet: wifi + Accès a Internet: terminal + Accès a Internet: cau + Accès a Internet: public + Accès a Internet: servici + Accès a Internet: òc + Accès a Internet: non + Accès a Internet - de pagament + Accès a Internet - a gràtis + Monestier + Luòc de culte + Crotz de camin istorica + Oratòri + Informacion + Relòtge + Agéncia de viatge + Avion istoric + Carri d’assaut istoric \ No newline at end of file From f36223fc91f3b4483babe710222388b738c869de Mon Sep 17 00:00:00 2001 From: Hakuchi Date: Mon, 22 Jul 2019 15:59:55 +0000 Subject: [PATCH 21/22] Translated using Weblate (Italian) Currently translated at 67.5% (2422 of 3587 strings) --- OsmAnd/res/values-it/phrases.xml | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml index a1aab85c12..ab18d00ad9 100644 --- a/OsmAnd/res/values-it/phrases.xml +++ b/OsmAnd/res/values-it/phrases.xml @@ -2398,4 +2398,56 @@ Orientamento del muro:SO Orientamento del muro: NO Si + Segno di distanza + Pista Skitour + Riformato unito + Iglesia ni cristo + Unitaria + Archivio + Ministero + Negozio di cannabis + Tipo 3 + Tesla standard + Tesla Supercharger + Tesla Roadster + Basso + Alto + Medio + Basso + Alto + Medio + Basso + Alto + Medio + Basso + Centro giochi per adulti + Riparazione auto + Linea volo + Convertitore + Compressione + Misurazioni + Valvola + Laboratorio medico + Bambini + Atollo + Monumento naturale + Treno + Metropolitana + Traghetto + н/к + н/к* + 1А + 1А* + 1Б + 1Б* + 2А + 2А* + 2Б + 2Б* + 3А + 3А* + 3Б + 3Б* + Oggetto cancellato + Posizione \ No newline at end of file From 2aee7e6b41c986411d127f3fca3a53fecf85e03a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 23 Jul 2019 19:21:41 +0200 Subject: [PATCH 22/22] Add extra voice type default --- OsmAnd/res/values/strings.xml | 1 + .../plus/activities/SettingsNavigationActivity.java | 10 ++++++---- .../osmand/plus/voice/AbstractPrologCommandPlayer.java | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 7796c541f8..8f68b2cf14 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,7 @@ Thx - Hardy --> + Default Join gaps Camper Campervan diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index 59899dfda8..c5bc51bf37 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -251,11 +251,13 @@ public class SettingsNavigationActivity extends SettingsBaseActivity { private void addVoicePrefs(PreferenceGroup cat) { if (!Version.isBlackberry((OsmandApplication) getApplication())) { + String[] streamTypes = new String[]{getString(R.string.voice_stream_music), getString(R.string.voice_stream_notification), + getString(R.string.voice_stream_voice_call), getString(R.string.shared_string_default)}; + Integer[] streamIntTypes = new Integer[]{AudioManager.STREAM_MUSIC, + AudioManager.STREAM_NOTIFICATION, AudioManager.STREAM_VOICE_CALL, + AudioManager.USE_DEFAULT_STREAM_TYPE}; ListPreference lp = createListPreference( - settings.AUDIO_STREAM_GUIDANCE, - new String[]{getString(R.string.voice_stream_music), getString(R.string.voice_stream_notification), - getString(R.string.voice_stream_voice_call)}, new Integer[]{AudioManager.STREAM_MUSIC, - AudioManager.STREAM_NOTIFICATION, AudioManager.STREAM_VOICE_CALL}, R.string.choose_audio_stream, + settings.AUDIO_STREAM_GUIDANCE, streamTypes, streamIntTypes , R.string.choose_audio_stream, R.string.choose_audio_stream_descr); final Preference.OnPreferenceChangeListener prev = lp.getOnPreferenceChangeListener(); lp.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { diff --git a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java index 3a98c6e94a..0e8ad1b997 100644 --- a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java +++ b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java @@ -326,7 +326,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat //public static final int BT_SCO_DELAY = 1500; // This only needed for init debugging in TestVoiceActivity: - public static String btScoInit = ""; + public static String btScoInit = ""; private synchronized boolean toggleBtSco(boolean on) { // Hardy, 2016-07-03: Establish a low quality BT SCO (Synchronous Connection-Oriented) link to interrupt e.g. a car stereo FM radio @@ -348,7 +348,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat btScoInit = "Available, but not initializad.\n(" + e.getMessage() + ")"; return false; } - btScoInit = "Available, initialized OK."; + btScoInit = "Available, initialized OK."; return true; } else { AudioManager mAudioManager = (AudioManager) ctx.getSystemService(Context.AUDIO_SERVICE);