From a2793514fb1279a5d26880579969c7127e5fe32d Mon Sep 17 00:00:00 2001 From: xmd5a Date: Sun, 6 Sep 2015 22:02:22 +0300 Subject: [PATCH 001/113] Update phrases --- OsmAnd/res/values/phrases.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index d511ea6d45..4e6a5ce1f0 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1133,6 +1133,12 @@ Salt (content) Grain (content) + Nudism: allowed + Nudism: prohibited + Nudism: obligatory + Nudism: customary + Nudism: permissive + Enforcement:traffic signals Enforcement:maxspeed Enforcement:maxheight From 25abde3308e1b81349c409024acdb46c8594b933 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 10 Sep 2015 10:32:04 +0300 Subject: [PATCH 002/113] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 16 ++++++++-------- OsmAnd/res/values/phrases.xml | 30 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 98f8562560..5eeb0f0737 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -437,14 +437,14 @@ Шале Место поклонения - Храм, церковь (часовня) - Синагога - Мечеть - Место поклонения: сикхизм - Место поклонения: буддизм - Место поклонения: индуизм - Место поклонения: синтоизм - Место поклонения: даосизм + Христианство + Иудаизм + Мусульманство + Сикхизм + Буддизм + Индуизм + Синтоизм + Даосизм Монастырь Исторический монастырь Придорожный крест diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index d2924be6a8..94cdd9bbb6 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -627,24 +627,24 @@ Hunting lodge Place of worship - Place of worship: christian - Place of worship: jewish - Place of worship: muslim - Place of worship: sikh - Place of worship: buddhist - Place of worship: hindu - Place of worship: shinto - Place of worship: taoist + Сhristianity + Judaism + Islam + Sikhism + Buddhism + Hinduism + Shinto + Taoism Voodoo - Unitarian universalist + Unitarian universalism Multifaith - Jain - Spiritualist - Bahai - Scientologist - Pagan + Jainism + Spiritualism + Bahaism + Scientologism + Paganism Tenrikyo - Zoroastrian + Zoroastrism Catholic Baptist From 2aef26dfc9511fb166cf3f2c70a4e58d1be0e05c Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 10 Sep 2015 11:21:58 +0300 Subject: [PATCH 003/113] Context menu code refactor, remove bold tag --- .../res/layout/map_context_menu_fragment.xml | 3 +- .../osmand/plus/activities/MapActivity.java | 9 +++-- .../plus/mapcontextmenu/MapContextMenu.java | 37 ++++++------------- .../MapContextMenuFragment.java | 28 +++++++++----- .../osmand/plus/views/ContextMenuLayer.java | 3 +- 5 files changed, 37 insertions(+), 43 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 8586c1d72a..de57a3aefc 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -62,8 +62,7 @@ android:layout_marginRight="12dp" android:text="@string/search_address_building" android:textSize="@dimen/default_list_text_size_large" - android:textColor="?android:textColorPrimary" - android:textStyle="bold"/> + android:textColor="?android:textColorPrimary"/> Date: Thu, 10 Sep 2015 02:42:31 +0200 Subject: [PATCH 004/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index f0cd548138..9b019cecda 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -862,7 +862,7 @@ Almacén de jardinería Marroquinería Neumáticos - Relojería (watches) + Relojería Juegos Modelos a escala Trofeos, premios From 2752d25b472643a7a7257b13134658b5dff3fd22 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 10 Sep 2015 10:45:49 +0200 Subject: [PATCH 005/113] Translated using Weblate (Danish) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-da/phrases.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 4c3a20a162..ae8ab18253 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -355,14 +355,14 @@ Udlejningshytte Sted for tilbedelse - Sted for tilbedelse: Kristen - Sted for tilbedelse: Jødisk - Sted for tilbedelse: Muslim - Sted for tilbedelse: Sikh - Sted for tilbedelse: Buddhist - Sted for tilbedelse: Hindu - Sted for tilbedelse: Shinto - Sted for tilbedelse: Taoistisk + Kristendom + Jødedom + Islam + Sikhisme + Buddhisme + Hinduisme + Shinto + Taoisme Kloster Historisk kloster Vejside kors @@ -1080,7 +1080,7 @@ Finansiel kontor Fondskontor Voodoo - Scientolog + Scientology Katolsk Baptist Romersk-katolsk @@ -1117,11 +1117,11 @@ Koptisk-ortodoks Mahayana - Unitarisk universalistisk + Unitarisk universalisme Multireligiøs Jainisme - Spiritist - Bahai + Spiritisme + Bahaism Hedenskab Tenrikyo Zarathustrisme From 6fc80bf5c2cc2193ad9ae0fe4518cfef79062960 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 10 Sep 2015 12:16:21 +0300 Subject: [PATCH 006/113] Make Context Menu links clickable --- .../sections/AmenityInfoMenuBuilder.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java index c01f31cc34..0d2e04e57b 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java @@ -1,6 +1,9 @@ package net.osmand.plus.mapcontextmenu.sections; import android.content.res.Resources; +import android.text.SpannableString; +import android.text.method.LinkMovementMethod; +import android.text.util.Linkify; import android.util.TypedValue; import android.view.Gravity; import android.view.View; @@ -58,16 +61,22 @@ public class AmenityInfoMenuBuilder extends MenuBuilder { // Text LinearLayout llText = new LinearLayout(view.getContext()); llText.setOrientation(LinearLayout.VERTICAL); - LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - llTextParams.setMargins(0, dpToPx(4f), 0, dpToPx(4f)); - llText.setLayoutParams(llTextParams); ll.addView(llText); TextView textView = new TextView(view.getContext()); + LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + llTextParams.setMargins(0, dpToPx(8f), 0, dpToPx(8f)); + textView.setLayoutParams(llTextParams); textView.setTextSize(18); // todo: create constant textView.setTextColor(app.getResources().getColor(light ? R.color.ctx_menu_info_text_light : R.color.ctx_menu_info_text_dark)); - textView.setText(text); + SpannableString spannable = new SpannableString(text); + Linkify.addLinks(spannable, Linkify.ALL); + textView.setClickable(true); + textView.setMovementMethod(LinkMovementMethod.getInstance()); + textView.setLinksClickable(true); + + textView.setText(spannable); //textView.setText("sdf dsaf fsdasdfg adsf asdsfd asdf sdf adsfg asdf sdfa sdf dsf agsfdgd fgsfd sdf asdf adg adf sdf asdf dfgdfsg sdfg adsf asdf asdf sdf SDF ASDF ADSF ASDF ASDF DAF SDAF dfg dsfg dfg sdfg rg rth sfghs dfgs dfgsdfg adfg dfg sdfg dfs "); LinearLayout.LayoutParams llTextViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); From 50ce1f7ccad65a6ce11ccd37eb7a512ae54a44c8 Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Thu, 10 Sep 2015 13:45:35 +0200 Subject: [PATCH 007/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index e67e63be2d..d81d2ed788 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -517,14 +517,14 @@ Pavilhão de caça Lugar de prática religiosa - Lugar de culto: cristão - Lugar de culto: judaico - Lugar de culto: muçulmano - Lugar de culto: siquista - Lugar de culto: budista - Lugar de culto: hindu - Lugar de culto: xintoísta - Lugar de culto: taoísta + Cristianismo + Judaísmo + Islamismo + Sikhismo + Budismo + Hinduísmo + Xintoísmo + Taoísmo Acesso à Internet: wlan Acesso à Internet: terminal @@ -1064,18 +1064,18 @@ Voodoo Multirreligiosa - Espiritualista - Bahai - Cientologista - Pagão + Espiritualismo + Bahaísmo + Cientologismo + Paganismo Zoroastrismo Católica Batista Católica romana Ortodoxo - Unitário-Universalista - Jainista + Unitário-Universalismo + Jainismo Tenrikyo Luterana Sunita From d66283e4b65414c06399ac32c620b3d4a24e80ed Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Thu, 10 Sep 2015 14:50:31 +0300 Subject: [PATCH 008/113] Fix 9 Patch shadow. --- .../drawable-hdpi/bg_shadow_gorizontal.9.png | Bin 1086 -> 1129 bytes .../drawable-mdpi/bg_shadow_gorizontal.9.png | Bin 1066 -> 1107 bytes .../drawable-xhdpi/bg_shadow_gorizontal.9.png | Bin 1083 -> 1126 bytes .../bg_shadow_gorizontal.9.png | Bin 1088 -> 1129 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/OsmAnd/res/drawable-hdpi/bg_shadow_gorizontal.9.png b/OsmAnd/res/drawable-hdpi/bg_shadow_gorizontal.9.png index d2782c1642f06c7f2d2b44c7de2ef30b39806503..565d269a80622770f8f5a05bea9123674eaaa360 100644 GIT binary patch delta 303 zcmdnT@seYLIF~X98v_Hwk}7Ml=hK7c&rWS_Ij&6>|=5D4I zZieQD7L)6kWMGP1aVpxyl%ir{Y?5eVVU(n6Y+`1tn`UBSp_^oulBAnzYG{^ZXl{~} zY@RgPiMgr%O>p~qpc6VhT^vIyZoRo;&DWqH;2P-makKRI{l{=^ku#F_IU>mvHR%E*?qXRRhz5WaA)wz zvu4WK(s@@l7XJSbePQ|=v(p_>{nj=cb)GQf?R*|7`=)w{+QXBFZpg;z_~=~G6V{d3 c$tuCXCa*Z{wd+M^psN@>UHx3vIVCg!00iu5&j0`b delta 226 zcmaFKv5#YdI2RuW8v_G_yoc_^jf%ER3NEg0&X%U;PNrsVmWGC|rjC{_ZkFcG&X#88 zjz*@ImXqt4WMGOMaVpxylrmY4No}$Vb3@h9SAHBo8{#}&978H@EtzB~)L_8Ftg9xI z|KNZB5~m|RKKmVA)y|$%+m>RjV(DPD*rw^(RNlo3FU;O8y2K>TaWC_fzns9HQ#W2T z)HQ3f70H}y#JsYa_*S07|Hp1DWt!JM2mjCvWzL|M1?5$jefYs{29-#dUp00i_>zopr E0L$iKssI20 delta 206 zcmcc2v5I4YI2RWO8v_GFuhIFv8x?Jt6kN^Rj7$uiEKJSZEDa4^O)Xsvj4WJCE!-?k zOdL%e9Vgc@$-oqu<5aYZDP^)8liFk#=7uy4?<>7P8@xPS978H@CH?vT-=0}n`Efm) z4a17IiL9s6QWO{xxMp&!_|0y_nW8Jr*t$PKZIe*8sq{uJOAalTN?DF69lUaRPHIL% e(hnFI*%-9N#Up>sbC?A*mBG{1&t;ucLK6UVKRKcR diff --git a/OsmAnd/res/drawable-xhdpi/bg_shadow_gorizontal.9.png b/OsmAnd/res/drawable-xhdpi/bg_shadow_gorizontal.9.png index d27ed3530aed31685f8b92fc7208e76660256e2a..b528b2f6d43f0a89ecb8c45f8ac3cef78413d1d8 100644 GIT binary patch delta 300 zcmdnZ@r+}FIF}v=8v_G_YME!_MnzjD1p`M{OBZu9XH#=0LqkJXQ%eJ9M@u6^6Jt{& zLsw@vgUNMFGB8C>I2G+;N>MQ}Hc2$GFiO%jHZe2SO*1jE&`mN+NzzRt&GS9Wgx!#LZhw5n0< zkHRXiGiyY&r~Qj)60j9umu)Rcxqtb=;)4rJWmO(KMO$U~GymLF)w1FE$@C*h8hfN# zZf)fB&2X}BU6LNO(Wg-*h4;Su-wUfcF7D}j5ZT;#Pj>EOWv6hf6}{YKgALl Y+FF&4zkW2e8|WkkPgg&ebxsLQ03SVT)&Kwi delta 223 zcmaFHv72LpIF}Fy8v_GF*tx#&jf%ER3N99oCME`EMy6(NmWGC|rcRcw29}P-mX3zz z#zw}5hLh`=S9fBUsJlwD#(LKBL~df!?{g xY*Ts9ewO0OH_gPvLO01QB}q5c)X*%+(A*>` z**s~o6LVAjp_e!6fllc3ba4!+xb^17McxJj4%fgHI#2$sUKz0{)`8jV*{7@fg=ewF zt$L@o>eZx(y8*k;`%cPsnDwSYRK;QaLN=BVK3#{)&Tj4wRjnfaciks$y5!y;a@Ilt z0v2d0cKckgTe~DWM4fGxcai delta 228 zcmaFKae!ljIF}R$8v_HwN-v*t8x?Jt6kLpr3{6~JoK4N#EDa4^O)U&uE!|8UjSS5# zT+NM54JX$z$-opj;Z(GXDP^)8liFk#=7yTa2h;6=HY9kuIEGZ*dUMT??|=aZv%~Jr zEBasl??3Z|ZDp|a Date: Thu, 10 Sep 2015 14:57:28 +0300 Subject: [PATCH 009/113] Fix 9 Patch on shadow 2. --- .../drawable-hdpi/bg_shadow_gorizontal.9.png | Bin 1129 -> 1129 bytes .../drawable-mdpi/bg_shadow_gorizontal.9.png | Bin 1107 -> 1119 bytes .../drawable-xhdpi/bg_shadow_gorizontal.9.png | Bin 1126 -> 1131 bytes .../bg_shadow_gorizontal.9.png | Bin 1129 -> 1129 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/OsmAnd/res/drawable-hdpi/bg_shadow_gorizontal.9.png b/OsmAnd/res/drawable-hdpi/bg_shadow_gorizontal.9.png index 565d269a80622770f8f5a05bea9123674eaaa360..88b4deb8b4d35977fbf771200f0f908a0817b7c1 100644 GIT binary patch delta 129 zcmaFK@seXh9Fx3(k-4F{o1wX>xs$P>p{uEdvzeo-n~9ORnWdY7iP7X*CRvyoGhAwR zGNq~*rWmFqrzTqJniv?F=^7`SB!z8QSm-91r6lR5ni`rV8Je3UC7UNrc4BT~c@x~ee)0+C Fg#c-@BS`=N diff --git a/OsmAnd/res/drawable-mdpi/bg_shadow_gorizontal.9.png b/OsmAnd/res/drawable-mdpi/bg_shadow_gorizontal.9.png index 01cd5de5f8eb2107ca40765635eb4379bd90002d..dd1cc207dfc5433773dbc14429f12ba8dc9b3eff 100644 GIT binary patch delta 279 zcmcc2ai3#D9Fu~9g_E1JtEH)_xs$P>p{uErk)fNjo0+SztDB>%ftl&#Iwl#IA`_g7 zb}^->7^WDeB&Q}?>Y5lBndurQn-3Lm^SSACwVArO~z5y1F;Xe9xS`SJVS(yLHVS1?WC6HYC``7oH`k{scU^< zP`mCv;~>Y`=ccn6&#d=*xbGoQySYqpPyW;wA_)u&o>hL{tCblDbPI#0tDnm{r-UW| DZtrAC delta 267 zcmcc5ahYR79Fu~nsez-pv8$7*xs#!xp{uEri@CFlrMZQTi;MH*Iwl#IB1fEx zb}^->m>8QRnphYm=^C4u8SAE*m{{m0nWZG@rkWa>B^jEVBqf_CO?F~#syFgBKEuGk zQ0(dA7*cWT$z(^a1_K@z;k8P?#Qy&`>W(l_n^3X&=I)(a+7)#!>vnS(ZVss5@gvp8 z!Res&ftBu=d&C~h$yvjwmvKy#bvsYW>8#~H|Fm5B?C{`^u+F=p@bCcn{*uM!d(=#; r@Beb~E?k)4eY^Re(~ZZ<2N=rU%4G;xtq$w~+RxzW>gTe~DWM4fYO7y= diff --git a/OsmAnd/res/drawable-xhdpi/bg_shadow_gorizontal.9.png b/OsmAnd/res/drawable-xhdpi/bg_shadow_gorizontal.9.png index b528b2f6d43f0a89ecb8c45f8ac3cef78413d1d8..24cd01922deb7638e40d1c8ea04d1d79ff0a7596 100644 GIT binary patch delta 291 zcmaFH@tR{p9Fu~Zv$3nOxr>3Rxs#Ehp{uErn~{;5v$>&-Poz6Jvh)_{GBo`3x3zB;O9iBx*xfn{^8_BsgHHFgLvDBfq>e)>tv zi?#-RG7` zuuc8{&DTW2t+E8~h^-a6IBV|Ro!5?NIK1!bt6OL+8}hqV#nshn^$r#Zh9qCrBeR#h RDhIlY!PC{xWt~$(695Iwl#IA}5@R zb}^->m>8QRnphYm=^C4u8SAE*m{{m0nWZG@rkWa>B^jEVBqf_CO?F~#s&BpYVi5xa zLz}0IV@SoVH`fgL8VopC0|LI-?EQanm6+nn&dq-qXB(APHLCqlSmkwQjfnQNe-TXr zwgT+3ttBbgTe~DWM4foI`1| diff --git a/OsmAnd/res/drawable-xxhdpi/bg_shadow_gorizontal.9.png b/OsmAnd/res/drawable-xxhdpi/bg_shadow_gorizontal.9.png index eeb3dbfad657dc6e34bc16312401308cf1d07155..f55e3035deeca16b5667328cbe96f7c072851e4e 100644 GIT binary patch delta 129 zcmaFK@seXhJd?bstE;o4vy-X0laZmJtEr=tvzwE%shOFhsgZ%3lgZ>dCRwN&N1SSQ zF{P*&rWmFqrzTqJniv?F=^7`SB!z8QSm-91r6lR5ni`rV8Je3UC7UNrc4BT~IrQ>I{p1tO F3jsI1BQgL0 From 8cbbf1f0d460012b2ea5ffdc6013105a9f0c712d Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Thu, 10 Sep 2015 14:51:57 +0200 Subject: [PATCH 010/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index 503b0827ef..e14e86fde8 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -508,14 +508,14 @@ 狩獵小屋 宗教場所 - 宗教場所：基督教 - 宗教場所：猶太教 - 宗教場所：回教 - 宗教場所：錫克教 - 宗教場所：佛教 - 宗教場所：印度教 - 宗教場所：日本神道教 - 宗教場所：道教 + 基督教 + 猶太教 + 回教 + 錫克教 + 佛教 + 印度教 + 神道教 + 道教 網際網路存取：無線網路 網際網路存取：終端 From 326de731b3d9b862e8c249e47d98ee2193b36aec Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Thu, 10 Sep 2015 16:34:43 +0300 Subject: [PATCH 011/113] Context menu dots with shadow. --- .../bg_contextmenu_dots_light.9.png | Bin 0 -> 2105 bytes .../bg_contextmenu_dots_light.9.png | Bin 0 -> 1728 bytes .../bg_contextmenu_dots_light.9.png | Bin 0 -> 2504 bytes .../bg_contextmenu_dots_light.9.png | Bin 0 -> 3264 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png create mode 100644 OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png create mode 100644 OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png create mode 100644 OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png diff --git a/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..250f187cd7137f767fba8108a22e237c21ee8c82 GIT binary patch literal 2105 zcmbVNYg7|w8V;a9xoBZkM5xAqpp{%nCNoJ8kPwIvU<0m+P!A!QK-6TyWQ2fOizr(t zZ7HQ(Jj&8`$;xhv5F`rJR<2S?6a?yp1r>@YE68@CvK4W6g5vHEPk-#3GxL4l%=1 zmI{kunIbE_2j&q7b{VP!2__LmbL5DcBD301^lB}RCJ=bRdaX=;2*!vhaH>iZM4J8j zGKr{C1d;Z!L^P2$3{F!;W}|R?c1(gi`;Z(`kb-v+d3p{`poTFSQLjF%(Q))aq-9e4a2k?Dm61Rlad)oLC{nx9fBY#jX`BF$hZYrm!-jE zda_36v%7Pee<;`V(ijRMKk?XZ^VMbvy4Rb{{m0g9-J%X#LgUZa7oq=7I^29lM5 zN;;XzU;<=_hR4r>X)GDQfMK};B)!Bd{@?sjaZyxjv;0r3-^JSVPm34~QrAwM)hKRkV=FUl))U3aSA`O}hsT(X;Qes1z`l=0s6Cvo+0h$yP= z!sbisR3DM`JM!*iKNNm56ij?_V|Vr0?6vbm{+j{rRMYxZZOp6JGW?VsSViTi2=FSg zoQP1q+c~{xIX!#nR89W{HDPPx@#J~ls?CDC4)(VfjYA|HWTgmS&ecp7!CS=RZ&d*&&bhq2HHUb83Mw+RX^VrXjh+6E*-g!@!)4jE= z?08=Lks5uhKez1(h&cEEa^WkVWNv?Ye!Yw^TV}aMX_kX=Tm#*!MDfR4T)txMCMHATp1i3ESQ;@>F!aW^bLi^sb;Tz zSmMM*SlWd)KigK)W7q|PHI6=RO(AQOsycE|+jo3d6@FV^Pirune|D1_>dJxYgXZA{ zqtW<7Wo2bx#`g3B+4;2nJoeWH8;|6$f|KB9uH8|_0f#}R$I*0;`u(-XL`Jc6_*rkW z-I?;uq~h({v_tLu0^UUDcMs+kj;;p+pH3G^Tt1v=Yd4(qEiIpg9HF?;Xw%2V?SDLV zsu|#N7wzYpOdBNuoBQ`VbEllVvI2UG`wmv`@NZ6f>^XC`=YYetl+R4O`wI7?2?xG& zc;=_A{zpaB?>}69OP`emK>+Zip_I_q*Vp#^`LR(c_pgfy0=X2X|3q)eiE!!}TS5n_ zzwunSMRhx$bjDXS84(e2sDM8%+}TE_HSTWuYA@X$10&F?^1W}Dj&yc*{_RSqv^4q) zzStDm%m4oA+VQ`q2TX-dmt7tIX>xK>?ZmZvYLP@gdi3aGf@v{%QXkk6VL12pFR}?k z1;k{23i5a(A&#SJ77ds#Dk^$(_ctFE6`dFx8;g8ACqMad`_RzP_g!7##^U>CLD`pk z_)@8Ul5ly-CTVE?-@b5W=EByu8fHVcc$L=NoSU1=DsLGP{f>X{vbT^PG@^w7T*A5d zThjgq0=c0p<-XiQzi}4`Y=ax}T98Qa^eQQi?EPG&T-ajTLSNX44|BfHs zV;$=*oxk&b>iOI2@|J8}@=X${g?EBr88`gl?i+C%0RL;^zcdQU+t#)cq~`rgWqXWw zgnrS%@L190g6>$RtJ!SMHWy!cvsQI)Q*iZ97`2N%OV z)mBEb?>)z<)o1PR^tC!HZMn*C8NwEeLWVgVi&X?Wg4ozM>*{@Juk~jx43FWT+nt>I EALi>(xc~qF literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..52c58950a3b559a409ac2ff1b2a9bec682115811 GIT binary patch literal 1728 zcmbVNX;2eq7)~ffAx#kltxl`k#c@PUb`x@KB*9#0l!VA3;jp?S8t%v=6c^@p@9Pi544hD;xD<*e%ii2weg1B3?Edd1Y-2;#yl7!mWs#V{8be?ZEb z!)Ox6Dx=12QIZ5SlcZe?K~ATW?F?t*j&z8FAP59=Aug9iAy`C?jYM568xcC8L5UFt zhs91>a2w#&h^FCLqy(fqeG`J!uF~MFh9Rrf8`l_`AY-wA-FPRO zh|jTOP%K8^Sq=kL4^!v_nabV!4S9i-H{uwFg(?b~sl*LgR?J4Kl@gG;VH+(*F)G0L zCXtBG67dZJ7GJlIHfD@+;8tKP&tl6veBhX15eB0omMPrCVez;;0Sket`1u&j zM+ICAGZ;nSIN$hx^9NB*LEdKhPxDM1Q61^sz8wWhcsop(jhY|_H7bEmNmC~iO zt^SPzA<+P5k-pSCs_%?y41O5BuMu&YS3tbNT|2%b#jJZTo<|b*X$^}QXfeyTxEsBD z_JQY;w509#(00B6thM@Y+|WIA!Nc=}cOT!|Ii23m>;MK>WkgZrtv_60wNVY5vWU8} zpBcOeF>*2>qR&T9FAcB@N8RqP>hjMbNiSP>u9}Er)wQ zioWAcZcNp#`ss@2WbLiWVNd&-Yh^86o~K8XYepJ+%*9JGJ!}0lQ?FjDKCfHtS2Lri zEu+iybXxP!$n5fO>JG#X%BnB_C5!QVntNtLSV-gX&FzfjBbtz^`tFxiw}xA`w57$2 zTq)@?9S!Wu9ASR;>UKX-IaOB6lJsy{c1a&T)j7ck7nMqW63p{`R>}91XR9lDEn`zJ{$f* zc(ABOMfe0iN_17|PJDmSv*x+FMF|!JtLj4-56gGdyY#8BHY{(?5ZD~YP6?(D);Ley zT*^C?{-Cwk)Nv}6{bx|TV_Mbdfd$%}7RCW)|H`k|9gF?(Mpf(f9{Q}JqP9tQvIaQr zUS~vkP|DDNeRSLO`Z&@ZwRhLWJ<<31x}3rN&t~*AuZ?^ye-YUJO1)Ayd1&&6O;Y)s ziq|=z`_IkU-Z4;cu=T{%M@cB%)YQXiR;YaE`227I(S^mSPeRp~PDQcBgSu0;#_z(TAnW+E( literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..dc951cfa6f815b1ce39cf0df180b9d2d8195d813 GIT binary patch literal 2504 zcmbVOX;f2L5)O-?U|2*zHi=R>;frN_kr1|Gk;N7z%P4R#(vL?Fh=YPY8x~4GB??R#DwQQhVUTE) zK(KPI586^01NcuEU(}X{rHKI)1CWZ6B^hP+e42aCc=q=`7m z0zfG9r%~YG7bKU@C9?SLqNoHvGF7}25M+=9q)L@_G{~|w)BZHCu++z|%47XpnATl=Wo0o*ha2{=q05Fvlba-=@pI!Q9&B2{WcMX#* z0jG3h`ueO&hrC~oz)od)-r16QRK4z5z19ujBC-uhM#^El@Ukf0o{N9Zq3@tE=->H1FAL;10 z4iSH7Zg|J+&oPMBiE2G&-`l(`vG!gO9nGXqF2S_69uGrkI&a5k&4yWE^?Np0x2=!U zRrEP-7{lHrbz>T*2b?vPmi5t-;Q=9S>usL;6^1L!^)v0L36BOJ4nrP_p}*Hb5(?kY|$Sg;SA&yF#Z)#ep3=~Ht)Nv_|VRa=LmwNxUba6BuclAb@Y>t5TV zE}$stF9hj>p&PCCcE7l*5Y`H+MlwO+IG+(g|ttBWaYo}KM#?zY5 z2L}hIoSyfE_`TS(`1tW-{cm?`bIeC9Y5WU;HVAP`b=Liwy|1&U=|14!^Mp1#y<%HQpd z4y{f~hmukRQGtBBl-4I$_%^6V_8C+%trcW+%<(*fq;K>-wd>zAi*Y%dj^78UEa~{;F;^N}dK6SK< z#WyCca@OGxyy)M4-hQ_&QzQ^{08vBv{m%J->Ro_Jr4p@$xL4vqe`@_1I#qTe1H8=EZm=1ov2bU&6rcy|I)XO|_s_cJQ@=CDo9+r(l8?#J{~ z9UUEE(b1|yrWHAap17lGgHl~x-H4MKWxT=0vm|^+Ugx*{a=dfgnG&?av_he{J~K08 z`^}ptXX{$eo12-{OioQ1LcMOy{IeK@iPuz-o6?J!v^x5J&Yis7$(a8BphL;m6zZ0Pkh*&&1>?R#7gK}5`SF084{zt? zU|uj(EpQCYKd z^dWB}+*qf7Y`Q2j#rpT5^_e<&L!PR2%Z4$Y5z$h+(n~`dx*X_gUy0D46F_)IXN4g- nSt-l+4C>NeJk48*$kc%RE~-)V9jtl2a<}rQ2h+}b$7TN;a)bso literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..71aed527a365b8840af0103e9a1c2ea81d1b21ca GIT binary patch literal 3264 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 literal 0 HcmV?d00001 From 7300cb4d38ddf46fbcc2c2f098e74225cdf3f19e Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Thu, 10 Sep 2015 16:39:03 +0300 Subject: [PATCH 012/113] Poi editing screen dark theme design fix. --- OsmAnd/res/layout/fragment_edit_poi.xml | 8 +-- .../res/layout/fragment_edit_poi_advanced.xml | 6 +- .../res/layout/fragment_edit_poi_normal.xml | 4 +- OsmAnd/res/layout/open_time_list_item.xml | 8 +-- OsmAnd/res/values-ru/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 1 + OsmAnd/res/values/styles.xml | 12 ++-- .../monitoring/OsmandMonitoringPlugin.java | 64 ++++++++++++------- .../plus/osmedit/AdvancedDataFragment.java | 2 +- .../plus/osmedit/BasicDataFragment.java | 32 +++++++--- .../osmand/plus/osmedit/EditPoiFragment.java | 2 +- 11 files changed, 82 insertions(+), 59 deletions(-) diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml index c37d1c7e40..8b1ddc8626 100644 --- a/OsmAnd/res/layout/fragment_edit_poi.xml +++ b/OsmAnd/res/layout/fragment_edit_poi.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/bg_color" + android:background="?attr/spinnerListBackground" android:clickable="true" android:orientation="vertical" tools:context="net.osmand.plus.osmedit.EditPoiFragment"> @@ -97,7 +97,7 @@ android:id="@+id/tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/pstsTabBackground" + android:background="?attr/bg_color" app:layout_scrollFlags="scroll" app:tabIndicatorColor="?attr/pstsIndicatorColor" app:tabSelectedTextColor="?attr/pstsIndicatorColor" @@ -117,7 +117,7 @@ android:id="@+id/buttonDivider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/divider_color"/> + android:background="?attr/dashboard_divider"/> diff --git a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml index 70cb7efce5..f58e76031b 100644 --- a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml +++ b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml @@ -40,7 +40,7 @@ + android:background="?attr/dashboard_divider"/> + android:background="?attr/dashboard_divider"/> + android:background="?attr/dashboard_divider"/> + osmand:theme="?attr/new_app_theme"> - + + android:background="?android:textColorSecondary"/> + android:background="?android:textColorSecondary"/> + android:background="?android:textColorSecondary"/> + android:background="?android:textColorSecondary"/> diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index a4483eff7e..a630669509 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -843,7 +843,7 @@ Произошла неожиданная ошибка при выполнении действия {0}. Произошла ошибка ввода/вывода при выполнении действия {0}. Произошла ошибка при загрузке информации о POI - Имя + Название Время работы Комментарий Изменение POI diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 045e750dda..a54367adb0 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2260,4 +2260,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Working days Recent places Favourites + Successfully saved at: %1$s diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml index bb32c32229..4454e757d9 100644 --- a/OsmAnd/res/values/styles.xml +++ b/OsmAnd/res/values/styles.xml @@ -130,21 +130,17 @@ diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java index 611d33e2f7..86b5788320 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java @@ -117,6 +117,10 @@ public class EditPoiFragment extends DialogFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_edit_poi, container, false); + final OsmandSettings settings = getMyApplication().getSettings(); + boolean isLightTheme = settings.OSMAND_THEME.get() == settings.OSMAND_LIGHT_THEME; + if (savedInstanceState != null) { editPoiData.tags = (LinkedHashSet) savedInstanceState.getSerializable(TAGS_LIST); } else { @@ -151,8 +155,6 @@ public class EditPoiFragment extends DialogFragment { editPoiData.tags.add(tag); } - View view = inflater.inflate(R.layout.fragment_edit_poi, container, false); - Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar); toolbar.setTitle(R.string.poi_create_title); toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha); @@ -200,7 +202,9 @@ public class EditPoiFragment extends DialogFragment { onlineDocumentationButton.setImageDrawable( getMyApplication().getIconsCache() .getPaintedContentIcon(R.drawable.ic_action_help, - getResources().getColor(R.color.dash_search_icon_dark))); + getResources().getColor( + isLightTheme ? R.color.dash_search_icon_dark + : R.color.inactive_item_orange))); final ImageButton poiTypeButton = (ImageButton) view.findViewById(R.id.poiTypeButton); poiTypeButton.setOnClickListener(new View.OnClickListener() { @Override From e12fa76d3b6c42ca607010f416e1d3c2cd7cdc4d Mon Sep 17 00:00:00 2001 From: Catalin Pop Date: Thu, 10 Sep 2015 16:06:00 +0200 Subject: [PATCH 018/113] Translated using Weblate (Romanian) Currently translated at 77.6% (1374 of 1769 strings) --- OsmAnd/res/values-ro/strings.xml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index 93f37b4b82..06020f0c07 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -1678,10 +1678,33 @@ Implicit(cyan transparent) Culoare GPX Pluginuri - Evita transfer tren + Evită transfer tren Pericol - Evita transfer tren + Evită transfer tren Nu sunt disponibile update-uri. Lățime GPX - Update-uri în timp real - + Update-uri in timp real + Bold contur + Locații + Fișier GPX cu notări locații + Roșu + Roșu transparent + Portocaliu transparent + Galben + Galben transparent + Verde deschis + Verde deschis transparent + Verde + Verde transparent + Albastru deschis + Albastru deschis transparent + Albastru + Albastru transparent + Violet + Violet transparent + Pentru a aplica modificările, este nevoie să restartați aplicația. + Deschisă + Închisă + Piemontez + Bengali + From c8e52add17558f8e3eb90df91a6bc1144553275a Mon Sep 17 00:00:00 2001 From: Catalin Pop Date: Thu, 10 Sep 2015 16:06:17 +0200 Subject: [PATCH 019/113] Translated using Weblate (Romanian) Currently translated at 77.6% (1374 of 1769 strings) --- OsmAnd/res/values-ro/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index 06020f0c07..eae9b1a111 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -1707,4 +1707,5 @@ Închisă Piemontez Bengali + Sărbă-Croată From b57ab84234ed3a437569735eede5a4f5df4349ff Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Thu, 10 Sep 2015 16:23:30 +0200 Subject: [PATCH 020/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1769 of 1769 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 606052bd46..47ae648ac8 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -1817,4 +1817,5 @@ Locais recentes Favoritos apagar - + Salvo com sucesso em: %1$s + From b344049992194e25fa23694a5e282406331606e7 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Thu, 10 Sep 2015 17:54:38 +0300 Subject: [PATCH 021/113] Adding new 9patch shadow for dark context menu theme. --- .../drawable-hdpi/bg_contextmenu_dots_dark.9.png | Bin 0 -> 2037 bytes .../drawable-mdpi/bg_contextmenu_dots_dark.9.png | Bin 0 -> 1676 bytes .../bg_contextmenu_dots_dark.9.png | Bin 0 -> 2472 bytes .../bg_contextmenu_dots_dark.9.png | Bin 0 -> 3241 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png create mode 100644 OsmAnd/res/drawable-mdpi/bg_contextmenu_dots_dark.9.png create mode 100644 OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png create mode 100644 OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png diff --git a/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-hdpi/bg_contextmenu_dots_dark.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7d383cb35f26979d21ccb45ec4b734988867bbab GIT binary patch literal 2037 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 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-xhdpi/bg_contextmenu_dots_dark.9.png new file mode 100644 index 0000000000000000000000000000000000000000..275af4ae9294309d963c96587391c24380685ac8 GIT binary patch literal 2472 zcmbVOdpMN&9v^pIrsR-a8BL=HEpuhAk;}{&b2Md#by<`#^D>i}dB@BfgK{~F)rwjr zvqacUlnpVPrBIw)Hq;Sit?sR2lHzos+E=A>p7ZqVALo6Z_xJmKfA8n>y?>wQ&Gz5I zK`ymkia;QcTwfL+-jm?h+te6d3l$gE!`tT&I|K>BWK?(*QpOBD%OK`z~${0M6PN(AuBs__Pg%Ma)q8t*av2vB& zq6QYA5-KGMNCL{y3mOGc;7-UL1AF>D1et=z`>0s1`j99%Wq7qffhXb!c$sV=u6Jk^ z#0UQ4#wXFLz(fUr=L0Hmr&0*lBie3}4Cn5z4J`m+Zx~yZ61XS=DGLf->~GJToMp@PQB|BvB}28a675 zLcvm^TuE3uRY1Z2t+pHHPKp zoD~-9)}NrE^~_Dye{E=P?w>o4Dn4-biIqk6SXWu4ZCbTQntt`!FCDaJE=~?jY<74S zt7|+L+j`pddrjldv*-I;s4k$k^ALXz@wl&9b8ctsWU}et#=WOD^Xod01Lx*nXONP_ zcoWlZ(?B=GfjIo_eA_mj{+j3M!;jE+67rfnu&>HF(~cQ z`szH3lF~1vR|Q?9!e7dtzHv6F+~t>}Y zUH4dpn$#Z4$9WG~<|q8oSy5#lZW7*ZGpY8Z9o>UU*K!M{D(2NG;YOOQapiEhfs|8+ z={Hwsr~&Qyz=4bPPKh|8weMTp!NWQ_+s}6Y^Ec3ql;HdAxZvj1wk5MoBd%1Fedf$D z%aUvp8(-sqdzZ^}l4T{Dpz)#0otRtp<2PP*R%x1E1}~ZJtGk(698ttNF=2u|%0GJ8 zB&Qoco1}a7x;Y``#ofM|)-~E&0y|#(^2$cqMXpKKt;^L4Y?6G`J}&w0=(kp{FAN+x z6~W3V`}@wAxkp2@Yg<9Ym~46GS(K^Hvkq0U-)xJFnE+WFHEdWfD)Mf0^33%FOHv=o z`tiHcjr|)R^$mNxg>+#nTvvt}GyG+j#4|qWC~@WG0c;qy*OR)gG(2KEaKM9OQ2peF z206rP_8r1i+pzqU{3p>rq_y;)yuo~B;;?eNY{uj(+?n>^GOTD~wUJb!HFHptyXy3u z(ptYNhuCGsgKn^;x>cnWR(Lr^i+@ZX8d!d(bzcXL+OJY-~ePxXOQf6mf`n26% zt*NZM_DII$cbkW@*d4Xh&P?4QVcq_HK9l(lJ!|We+>mxUX|VsfpyURRnU(>urltQ_ zTy*~PwevgQu3=wg|L8dy<~K4oB-|wrrS8~V(R)o+S%q{v*MmitE};H>aN`* z)5^L>cLzN?K5>3_@Lx`TcZLE40Y!s#kCM9#N4VxCopk!-nXKuRD9tP9nw+3>L5HQG z)tcu1g4uh6zg9{!XGGe7wjk_ialGfrpgoMPJiYC|@49WNH4VuM4Q;yaelF?Nq|uVd z@{#f#A)k2_wG0~LR;3PH?Op#6zM|9tqV1#z)&F$;Mr-<6yI#@vmmNZmKlD~@&+#)Nc_eYi*#b;YZ z<6VApKb`*Y^Fl|jOSXT6X37G5at^J?SF7RZSL7)T`Fx&ZwuY*YGv2GE9Zf1&Nq_`x>h}(q2TDB7`e%&NV&A+T0zh)uUAva0C5%!Pj^E_(~>C-2CA{0THP B0x19h literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png b/OsmAnd/res/drawable-xxhdpi/bg_contextmenu_dots_dark.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4f1f76c092c7f722c07ea1204fe54d1dd396dcdf GIT binary patch literal 3241 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 O=fTd}nNVuw7yEDSihvCO literal 0 HcmV?d00001 From 097f4bcaa8b56838fe83120f4f4e8cb0ea8eb3a5 Mon Sep 17 00:00:00 2001 From: Catalin Pop Date: Thu, 10 Sep 2015 16:08:28 +0200 Subject: [PATCH 022/113] Translated using Weblate (Romanian) Currently translated at 77.8% (1378 of 1769 strings) --- OsmAnd/res/values-ro/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index eae9b1a111..30b3645fcb 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -1708,4 +1708,7 @@ Piemontez Bengali Sărbă-Croată + Aveți descărcate informații vechi din Wikipedia, incompatibile. Doriți să le arhivați? + Doriți să descărcați informații adiționale din Wikipedia (%1$s MB) ? + Serviciul de localizare este oprit. Doriți să îl activați? From 0b3ee39484852a0582bdecdd6972c15be92a2029 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 16:54:03 +0200 Subject: [PATCH 023/113] Translated using Weblate (Argentinean Spanish) Currently translated at 99.9% (1096 of 1097 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 9b019cecda..6e6a6f80ce 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -507,14 +507,14 @@ Pabellón de caza Lugar de culto - Lugar de culto: cristiano - Lugar de culto: judio - Lugar de culto: musulmán - Lugar de culto: sijista - Lugar de culto: budista - Lugar de culto: hindú - Lugar de culto: sintoísta - Lugar de culto: taoísta + Cristiandad + Judaísmo + Islámismo + Sijismo + Budismo + Hinduismo + Sintoísmo + Taoísmo Internet inalámbrico PC con Internet @@ -1062,15 +1062,15 @@ Oficina militar Vudú - Unitariano universalista + Unitarianismo universal Multireligioso - Jainista - Espiritualista - Bahaísta + Jainismo + Espiritualismo + Bahaísmo Cienciologísta - Pagano + Paganismo Tenrikyō - Zoroástrica + Zoroástrismo Católica Bautista From 8e13b6679ce1c30442aee5adbe74c6e313c0de3e Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 16:55:45 +0200 Subject: [PATCH 024/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 7707a7e99d..3ebb2e5abe 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -2048,4 +2048,5 @@ Lugares recientes Favoritos borrar - + Guardado exitosamente como: %1$s + From e686f6ac551581fe04c89da4b2e53352735a0125 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 16:56:37 +0200 Subject: [PATCH 025/113] Translated using Weblate (Spanish) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-es/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index af3698cdcf..f29dcd08f8 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -2186,4 +2186,5 @@ Lugares recientes Favoritos borrar - + Guardado exitosamente en: %1$s + From 8872cc774e4f51ed4224b0b95c8fd976d014a890 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 17:01:16 +0200 Subject: [PATCH 026/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 6e6a6f80ce..bf47979e6c 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1067,7 +1067,7 @@ Jainismo Espiritualismo Bahaísmo - Cienciologísta + Cienciologísmo Paganismo Tenrikyō Zoroástrismo From 72ef391753ad3ccee5433a23e20f6f5f40687364 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 16:59:39 +0200 Subject: [PATCH 027/113] Translated using Weblate (Spanish) Currently translated at 99.9% (1096 of 1097 strings) --- OsmAnd/res/values-es/phrases.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index f4b263816a..bd82c9a248 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -290,7 +290,7 @@ Chalé Apartamento Lugar de culto - Lugar de culto: cristiano + Cristianismo Acceso a Internet: inalámbrico Acceso a Internet: cableado Acceso a Internet: público @@ -559,12 +559,12 @@ Alojamiento Cabaña - Lugar de culto: musulmán - Lugar de culto: sijista - Lugar de culto: budista - Lugar de culto: hindú - Lugar de culto: sintoísta - Lugar de culto: taoísta + Islamismo + Sijismo + Budismo + Hinduismo + Sintoísmo + Taoísmo Crucero Ermita en el camino @@ -692,7 +692,7 @@ Atracción de feria Noria Carrusel de oscilación - Lugar de culto: judio + Judaísmo Acceso a Internet: servicio Manantial @@ -1065,15 +1065,15 @@ Oficina militar Vudú - Unitariano universalista + Unitarismo universal Multireligioso - Jainista - Espiritualista - Bahaísta + Jainismo + Espiritismo + Bahaísmo Cienciologísta - Pagano + Paganismo Tenrikyō - Zoroástrica + Zoroastrismo Católica Bautista From 8b1830d3849f1a6b057acc40a980e74d0a2443a4 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 17:14:31 +0200 Subject: [PATCH 028/113] Translated using Weblate (Spanish) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-es/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index bd82c9a248..6f727e602c 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1070,7 +1070,7 @@ Jainismo Espiritismo Bahaísmo - Cienciologísta + Cienciologísmo Paganismo Tenrikyō Zoroastrismo From 7dd1196cd974cee04275f375250c0fd515c28124 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 17:12:32 +0200 Subject: [PATCH 029/113] Translated using Weblate (Spanish) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index f29dcd08f8..81d1e5014b 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -2161,7 +2161,7 @@ Deshacer Omitir OsmAnd - Mapas y navegación fuera de línea + Mapas y navegación\nfuera de línea Enviar PDI Evitar tren de enlace Evite tomar trenes de enlace From dacfec888031cc3162a7fcb3b53794a9dee5270f Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 17:08:26 +0200 Subject: [PATCH 030/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index bf47979e6c..c86d8bff2f 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1040,7 +1040,7 @@ Cartón Escombros - Conglomerado + Cartón prensado Laguna de molino Twitter Skype @@ -1128,7 +1128,7 @@ Reformada unida Reformado Unido - cuáquero + Cuáquero Shaktismo Uniendo Wesleyan From 332658157612b05e89f9962fb7a41264c5eaeb11 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 10 Sep 2015 19:14:21 +0300 Subject: [PATCH 031/113] Fix context menu crash while changing device orientation --- .../res/drawable/bg_map_context_menu_dark.xml | 2 +- .../src/net/osmand/data/PointDescription.java | 5 ++++- .../plus/mapcontextmenu/MapContextMenu.java | 19 +++++++++++++++++++ .../MapContextMenuFragment.java | 11 ++++++++++- .../sections/AmenityInfoMenuBuilder.java | 6 ++---- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/drawable/bg_map_context_menu_dark.xml b/OsmAnd/res/drawable/bg_map_context_menu_dark.xml index f67482f175..c584b75e83 100644 --- a/OsmAnd/res/drawable/bg_map_context_menu_dark.xml +++ b/OsmAnd/res/drawable/bg_map_context_menu_dark.xml @@ -1,7 +1,7 @@ - + diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java index 77d5e1b4fd..8b77835709 100644 --- a/OsmAnd/src/net/osmand/data/PointDescription.java +++ b/OsmAnd/src/net/osmand/data/PointDescription.java @@ -1,5 +1,6 @@ package net.osmand.data; +import java.io.Serializable; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; @@ -15,7 +16,7 @@ import net.osmand.util.Algorithms; import android.content.Context; import android.support.annotation.NonNull; -public class PointDescription { +public class PointDescription implements Serializable { private String type = ""; private String name = ""; private String typeName; @@ -23,6 +24,8 @@ public class PointDescription { private double lat = 0; private double lon = 0; + private static final long serialVersionUID = 4078409090417168638L; + public static final String POINT_TYPE_FAVORITE = "favorite"; public static final String POINT_TYPE_WPT = "wpt"; public static final String POINT_TYPE_POI = "poi"; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java index 8e6281dad3..78a3937a09 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java @@ -1,5 +1,6 @@ package net.osmand.plus.mapcontextmenu; +import android.os.Bundle; import android.support.v4.app.Fragment; import net.osmand.binary.RouteDataObject; @@ -29,6 +30,9 @@ public class MapContextMenu { private String foundStreetName; + private static final String KEY_CTX_MENU_OBJECT = "key_ctx_menu_object"; + private static final String KEY_CTX_MENU_POINT_DESC = "key_ctx_menu_point_desc"; + public boolean isMenuVisible(MapActivity mapActivity) { return mapActivity.getSupportFragmentManager().findFragmentByTag("MapContextMenuFragment") != null; } @@ -168,4 +172,19 @@ public class MapContextMenu { mapActivity.getMapActions().contextMenuPoint(pointDescription.getLat(), pointDescription.getLon(), menuAdapter, object); } + + public void saveMenuState(Bundle bundle) { + if (object != null) { + if (object instanceof Amenity) + bundle.putSerializable(KEY_CTX_MENU_OBJECT, (Amenity)object); + } + bundle.putSerializable(KEY_CTX_MENU_POINT_DESC, pointDescription); + } + + public void restoreMenuState(Bundle bundle) { + object = bundle.getSerializable(KEY_CTX_MENU_OBJECT); + Object pDescObj = bundle.getSerializable(KEY_CTX_MENU_POINT_DESC); + if (pDescObj != null) + pointDescription = (PointDescription)pDescObj; + } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 3e1682094a..2a2c213754 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -85,11 +85,20 @@ public class MapContextMenuFragment extends Fragment { */ } + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + getCtxMenu().saveMenuState(outState); + } + @TargetApi(Build.VERSION_CODES.HONEYCOMB) @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + if (savedInstanceState != null) + getCtxMenu().restoreMenuState(savedInstanceState); + view = inflater.inflate(R.layout.map_context_menu_fragment, container, false); ViewTreeObserver vto = view.getViewTreeObserver(); @@ -425,7 +434,7 @@ public class MapContextMenuFragment extends Fragment { } private MapContextMenu getCtxMenu() { - return ((MapActivity)getActivity()).getContextMenu(); + return getMapActivity().getContextMenu(); } private MapActivity getMapActivity() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java index 1ee0b9044e..cf5d90571f 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java @@ -1,8 +1,6 @@ package net.osmand.plus.mapcontextmenu.sections; import android.content.res.Resources; -import android.text.SpannableString; -import android.text.method.LinkMovementMethod; import android.text.util.Linkify; import android.util.TypedValue; import android.view.Gravity; @@ -26,7 +24,7 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP; public class AmenityInfoMenuBuilder extends MenuBuilder { - private static float SHADOW_HEIGHT = 6f; // in dp + private static final float SHADOW_HEIGHT = 6f; // in dp private final Amenity amenity; @@ -53,7 +51,7 @@ public class AmenityInfoMenuBuilder extends MenuBuilder { ImageView icon = new ImageView(view.getContext()); LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) ; - llIconParams.setMargins(dpToPx(16f), firstRow ? dpToPx(12f) - dpToPx(SHADOW_HEIGHT) : dpToPx(12f), dpToPx(32f), dpToPx(12f)); + llIconParams.setMargins(dpToPx(16f), firstRow ? dpToPx(12f) - dpToPx(SHADOW_HEIGHT / 2f) : dpToPx(12f), dpToPx(32f), dpToPx(12f)); llIconParams.gravity = Gravity.CENTER_VERTICAL; icon.setLayoutParams(llIconParams); icon.setScaleType(ImageView.ScaleType.CENTER); From 85748f651f364e3003d536019008de5738f5e4f9 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 10 Sep 2015 17:18:00 +0200 Subject: [PATCH 032/113] Translated using Weblate (Spanish) Currently translated at 100.0% (1097 of 1097 strings) --- OsmAnd/res/values-es/phrases.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index 6f727e602c..9eed1e7cab 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -912,7 +912,7 @@ Control Control de peaje -Portilla giratoria +Portilla en V Portón de muralla Red de nodos ciclista nacional Red de nodos ciclista regional @@ -1111,7 +1111,7 @@ Congregacional Antiguos creyentes Ortodoxa Serbia - Espírita + Espiritista Apostólico armenio Holandés reformado Apostólica @@ -1151,7 +1151,7 @@ Aguas residuales (contenido) Gas (contenido) Biomasa (contenido) - Aguas residuales (contenido) + Agua residual (contenido) Cultivo (contenido) Forraje (contenido) Cerveza (contenido) From 9c5ebe45daa8fdd633a30a182ba645d9f0ca9871 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Fri, 11 Sep 2015 01:19:04 +0200 Subject: [PATCH 033/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 25cda44d96..e6f1703586 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2105,4 +2105,5 @@ 工作日 最近的地點 我的最愛 +已順利的儲存於：%1$s From 10ad01882b60ecf7ebe94cf183f21eecc1bae066 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Fri, 11 Sep 2015 05:36:27 +0200 Subject: [PATCH 034/113] Translated using Weblate (Catalan) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-ca/strings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 120386d8f6..d9ca2f6a86 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -2113,4 +2113,9 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Especifiqueu el tipus de PDI instal·lació comunitària Nombre de files al tauler %1$s - + Suprimeix + Dies laborables + Llocs recents + Favorits + S\'ha desat correctament a: %1$s + From 34c284cab490537d4bcb1be13e72ad0eb95e57d4 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Fri, 11 Sep 2015 11:06:04 +0300 Subject: [PATCH 035/113] Small UI fixes --- .../res/layout/map_context_menu_fragment.xml | 1 + .../MapContextMenuFragment.java | 28 +++++++++++++------ .../sections/AmenityInfoMenuBuilder.java | 8 ++---- .../mapcontextmenu/sections/MenuBuilder.java | 3 ++ 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index e3d7f07cea..2f83828f9f 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -30,6 +30,7 @@ 3 || differenceY > 3 || System.currentTimeMillis() - lastTouchDown > CLICK_ACTION_THRESHHOLD) { + if (differenceX > 1 || differenceY > 1 || System.currentTimeMillis() - lastTouchDown > CLICK_ACTION_THRESHHOLD) { return false; } return true; @@ -227,13 +231,13 @@ public class MapContextMenuFragment extends Fragment { float posY = 0; switch (destinationState) { case MenuController.MenuState.HEADER_ONLY: - posY = view.getHeight() - (menuFullHeight - menuBottomViewHeight); + posY = view.getHeight() - (menuFullHeight - menuBottomViewHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP)); break; case MenuController.MenuState.HALF_SCREEN: posY = view.getHeight() - menuFullHeight; break; case MenuController.MenuState.FULL_SCREEN: - posY = -menuTopShadowHeight; + posY = -menuTopShadowHeight - dpToPx(SHADOW_HEIGHT_TOP_DP); break; default: break; @@ -270,6 +274,16 @@ public class MapContextMenuFragment extends Fragment { topView.setOnTouchListener(slideTouchListener); View topShadowView = view.findViewById(R.id.context_menu_top_shadow); topShadowView.setOnTouchListener(slideTouchListener); + View topShadowAllView = view.findViewById(R.id.context_menu_top_shadow_all); + topShadowAllView.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + if (event.getY() <= dpToPx(SHADOW_HEIGHT_TOP_DP) || event.getAction() != MotionEvent.ACTION_DOWN) + return slideTouchListener.onTouch(v, event); + else + return false; + } + }); // Left icon IconsCache iconsCache = getMyApplication().getIconsCache(); @@ -375,7 +389,7 @@ public class MapContextMenuFragment extends Fragment { switch (menuState) { case MenuController.MenuState.HEADER_ONLY: - shadowViewHeight = view.getHeight() - (menuFullHeight - menuBottomViewHeight); + shadowViewHeight = view.getHeight() - (menuFullHeight - menuBottomViewHeight) + dpToPx(SHADOW_HEIGHT_BOTTOM_DP); bottomBorderHeight = 0; break; case MenuController.MenuState.HALF_SCREEN: @@ -391,7 +405,7 @@ public class MapContextMenuFragment extends Fragment { break; case MenuController.MenuState.FULL_SCREEN: shadowViewHeight = 0; - bottomBorderHeight = view.getHeight() - menuFullHeight + menuTopShadowHeight; + bottomBorderHeight = view.getHeight() - menuFullHeight + menuTopShadowHeight + dpToPx(SHADOW_HEIGHT_TOP_DP); break; default: break; @@ -410,8 +424,6 @@ public class MapContextMenuFragment extends Fragment { lp.height = menuFullHeight; mainView.setLayoutParams(lp); - mainView.bringToFront(); - } public void dismissMenu() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java index cf5d90571f..01a776972d 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java @@ -24,8 +24,6 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP; public class AmenityInfoMenuBuilder extends MenuBuilder { - private static final float SHADOW_HEIGHT = 6f; // in dp - private final Amenity amenity; public AmenityInfoMenuBuilder(OsmandApplication app, final Amenity amenity) { @@ -45,13 +43,13 @@ public class AmenityInfoMenuBuilder extends MenuBuilder { // Icon LinearLayout llIcon = new LinearLayout(view.getContext()); llIcon.setOrientation(LinearLayout.HORIZONTAL); - llIcon.setLayoutParams(new LinearLayout.LayoutParams(dpToPx(72f), firstRow ? dpToPx(48f) - dpToPx(SHADOW_HEIGHT) : dpToPx(48f))); + llIcon.setLayoutParams(new LinearLayout.LayoutParams(dpToPx(72f), firstRow ? dpToPx(48f) - dpToPx(SHADOW_HEIGHT_BOTTOM_DP) : dpToPx(48f))); llIcon.setGravity(Gravity.CENTER_VERTICAL); ll.addView(llIcon); ImageView icon = new ImageView(view.getContext()); LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) ; - llIconParams.setMargins(dpToPx(16f), firstRow ? dpToPx(12f) - dpToPx(SHADOW_HEIGHT / 2f) : dpToPx(12f), dpToPx(32f), dpToPx(12f)); + llIconParams.setMargins(dpToPx(16f), firstRow ? dpToPx(12f) - dpToPx(SHADOW_HEIGHT_BOTTOM_DP / 2f) : dpToPx(12f), dpToPx(32f), dpToPx(12f)); llIconParams.gravity = Gravity.CENTER_VERTICAL; icon.setLayoutParams(llIconParams); icon.setScaleType(ImageView.ScaleType.CENTER); @@ -65,7 +63,7 @@ public class AmenityInfoMenuBuilder extends MenuBuilder { TextView textView = new TextView(view.getContext()); LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - llTextParams.setMargins(0, firstRow ? dpToPx(8f) - dpToPx(SHADOW_HEIGHT) : dpToPx(8f), 0, dpToPx(8f)); + llTextParams.setMargins(0, firstRow ? dpToPx(8f) - dpToPx(SHADOW_HEIGHT_BOTTOM_DP) : dpToPx(8f), 0, dpToPx(8f)); textView.setLayoutParams(llTextParams); textView.setTextSize(16); // todo: create constant textView.setTextColor(app.getResources().getColor(light ? R.color.ctx_menu_info_text_light : R.color.ctx_menu_info_text_dark)); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuBuilder.java index 55211d041c..a219c0db22 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuBuilder.java @@ -9,6 +9,9 @@ import net.osmand.plus.R; public abstract class MenuBuilder { + public static final float SHADOW_HEIGHT_TOP_DP = 16f; + public static final float SHADOW_HEIGHT_BOTTOM_DP = 6f; + protected OsmandApplication app; public MenuBuilder(OsmandApplication app) { From 01fd991c56096942bea82a0a89f898369d0ec074 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 07:11:38 +0200 Subject: [PATCH 036/113] Translated using Weblate (Danish) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 93ca549556..386d3351f5 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2128,5 +2128,5 @@ Seneste steder Favoritter slet - Gemt på: %1$s + Gemt korrekt: %1$s From 80f844a4cf862f1f5b0e5192af637895bd8c5123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20B=C3=A1thory?= Date: Thu, 10 Sep 2015 22:10:20 +0200 Subject: [PATCH 037/113] Translated using Weblate (Hungarian) Currently translated at 99.7% (1764 of 1769 strings) --- OsmAnd/res/values-hu/strings.xml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index e443b27754..a067308893 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -434,8 +434,8 @@ Telepíted az OsmAnd alkalmazást - {0} innen: {1} {2} MB? Az OsmAnd verziók listájának letöltése nem sikerült OsmAnd összeállítások töltése… - A telepítéshez válassz egy OsmAnd buildet - Telepítési verzió + Válassz egy OsmAnd buildet + Verzió telepítése A GPS-állapot alkalmazás nincs telepítve. Megkeresi a piactéren? A beszéd alapú navigáció nem érhető el. A Beállítások → \'Általános\' → \'Hangutasítás\' menüben kiválaszthatsz, vagy letölthetsz hangcsomagokat. Nincs kiválasztva hang adat @@ -1186,7 +1186,7 @@ \n\t* Pebble óra támogatás " - Utca + Utcanév Házszám Útvonalrögzítés Az útvonalaid felvételének beállításai @@ -2044,4 +2044,24 @@ Tovább Kezdőlap beállításai Veszély - + törlés + VISSZAVON + POI beküldése + Alap + Haladó + Házszám + Nyitás + Zárás + név + szolgáltatás + Elérhetőségek + Leírás + Nyitva tartás hozzáadása + POI típus + Sorok száma a kezdőlapon %1$s + Kérlek add meg a POI típusát. + Munkanapok + Gyakori helyek + Kedvencek + Sikeresen mentve ekkor: %1$s + From 8488261052f0c8ae2eaa1a9cfed78c35b73efac9 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Fri, 11 Sep 2015 11:06:28 +0300 Subject: [PATCH 038/113] Poi editing screen height and poi type dropdown. --- OsmAnd/res/layout/fragment_edit_poi.xml | 4 +-- .../osmand/plus/osmedit/EditPoiFragment.java | 26 ++++++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml index 8b1ddc8626..cebdb8705c 100644 --- a/OsmAnd/res/layout/fragment_edit_poi.xml +++ b/OsmAnd/res/layout/fragment_edit_poi.xml @@ -128,7 +128,7 @@ @@ -136,7 +136,7 @@ diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java index 86b5788320..120feae70c 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java @@ -27,6 +27,7 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.view.KeyEvent; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; @@ -117,7 +118,7 @@ public class EditPoiFragment extends DialogFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_edit_poi, container, false); + final View view = inflater.inflate(R.layout.fragment_edit_poi, container, false); final OsmandSettings settings = getMyApplication().getSettings(); boolean isLightTheme = settings.OSMAND_THEME.get() == settings.OSMAND_LIGHT_THEME; @@ -256,14 +257,25 @@ public class EditPoiFragment extends DialogFragment { } } }); - poiTypeEditText.setOnClickListener(new View.OnClickListener() { + poiTypeEditText.setOnTouchListener(new View.OnTouchListener() { @Override - public void onClick(View v) { - if (poiTypeEditText.getText().length() == 0 && editPoiData.amenity.getType() != null) { - DialogFragment dialogFragment = - PoiSubTypeDialogFragment.createInstance(editPoiData.amenity); - dialogFragment.show(getChildFragmentManager(), "PoiSubTypeDialogFragment"); + public boolean onTouch(final View v, MotionEvent event) { + final EditText editText = (EditText) v; + final int DRAWABLE_RIGHT = 2; + if (event.getAction() == MotionEvent.ACTION_UP) { + if (event.getX() >= (editText.getRight() + - editText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width() + - editText.getPaddingRight())) { + if (editPoiData.amenity.getType() != null) { + DialogFragment dialogFragment = + PoiSubTypeDialogFragment.createInstance(editPoiData.amenity); + dialogFragment.show(getChildFragmentManager(), "PoiSubTypeDialogFragment"); + } + + return true; + } } + return false; } }); From 923c03a1e1302e2d4e774d47a1137271d874dc5b Mon Sep 17 00:00:00 2001 From: Evgenii Martynenko Date: Thu, 10 Sep 2015 22:12:36 +0200 Subject: [PATCH 039/113] Translated using Weblate (Russian) Currently translated at 99.3% (1758 of 1769 strings) --- OsmAnd/res/values-ru/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index a630669509..9b19cbe93c 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -2090,4 +2090,5 @@ Жирный контур Рабочие дни Избранное +Успешно сохранён в: %1$s From 50e32f1d50087dbcd5780c5ef6e26758852cb9ff Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Thu, 10 Sep 2015 22:55:47 +0200 Subject: [PATCH 040/113] Translated using Weblate (Swedish) Currently translated at 99.2% (1756 of 1769 strings) --- OsmAnd/res/values-sv/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 4949a5a203..22a5686786 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1994,4 +1994,5 @@ Arbetsdagar Nyliga platser ta bort - + Sparades utan problem kl. %1$s + From 334825b3b7fae66ba476e96c468fc60a3ddcbb42 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Fri, 11 Sep 2015 12:42:33 +0300 Subject: [PATCH 041/113] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 6 ++++++ OsmAnd/res/values/phrases.xml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 5eeb0f0737..4e91a95819 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -662,6 +662,7 @@ Город (небольшой) Деревня Деревня (небольшая) + Район Хутор Урочище @@ -851,6 +852,11 @@ Нерегулируемый Неразмеченный + Население + Дата начала постройки + Доступно для инвалидных кресел + Опт + Частный доступ Нет доступа Доступ: пункт назначения diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 94cdd9bbb6..d5753c0924 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1140,6 +1140,8 @@ Agricultural supplies Tile supplies + Population + Enforcement:traffic signals Enforcement:maxspeed Enforcement:maxheight From 3671f38959a6673fd089ecf048a462e259b1da60 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 12:06:52 +0200 Subject: [PATCH 042/113] Translated using Weblate (Danish) Currently translated at 100.0% (1098 of 1098 strings) --- OsmAnd/res/values-da/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index ae8ab18253..cf6c67b738 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1183,4 +1183,6 @@ Landbrugsmaterialer Flisematerialer + Befolkning + From b98e83f1a8e2ec8aa51830ff7d3769af9d917833 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Fri, 11 Sep 2015 12:14:31 +0200 Subject: [PATCH 043/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1098 of 1098 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index e14e86fde8..7d0098ab40 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -1164,4 +1164,6 @@ 農藝供應商 磚瓦供應商 + 人口數 + From e4f7a3ab39c60d0501b4c45515fca9d1b7eb2c84 Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 13:36:47 +0200 Subject: [PATCH 044/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1098 of 1098 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index d81d2ed788..4caadd1c59 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1166,4 +1166,6 @@ Suprimentos de madeira Suprimentos de telha + População + From 05908877dcf0e9b356e27bbfeaf0f1a33f149efd Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Fri, 11 Sep 2015 14:04:10 +0200 Subject: [PATCH 045/113] Translated using Weblate (Belarusian) Currently translated at 100.0% (1769 of 1769 strings) --- OsmAnd/res/values-be/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 62dced4e42..64e642d423 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2088,4 +2088,5 @@ Працоўныя дні Нядаўнія месцы Упадабанае +Пасьпяхова захаваны ў: %1$s From 502bbf046c5b6ce1c0357926c4208e6903f41943 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Fri, 11 Sep 2015 15:12:16 +0300 Subject: [PATCH 046/113] Poi editing screen edit text scroll. --- .../res/layout/fragment_edit_poi_advanced.xml | 177 +++++++++--------- .../res/layout/fragment_edit_poi_normal.xml | 7 +- .../plus/osmedit/AdvancedDataFragment.java | 12 +- .../plus/osmedit/BasicDataFragment.java | 8 + 4 files changed, 113 insertions(+), 91 deletions(-) diff --git a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml index f58e76031b..4276b9e95d 100644 --- a/OsmAnd/res/layout/fragment_edit_poi_advanced.xml +++ b/OsmAnd/res/layout/fragment_edit_poi_advanced.xml @@ -2,117 +2,122 @@ - + android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginLeft="14dp" + android:layout_marginRight="14dp" + android:layout_marginTop="14dp" + android:background="?attr/bg_card" + android:orientation="vertical"> - + + + + + + + + - - + android:layout_height="37dp" + android:gravity="center"> - + + + + + + + + android:layout_height="wrap_content" + android:orientation="vertical" + android:saveEnabled="false"/> - - - - - - + - - - - - - + android:layout_height="match_parent"/> + diff --git a/OsmAnd/res/layout/fragment_edit_poi_normal.xml b/OsmAnd/res/layout/fragment_edit_poi_normal.xml index 267fd0aabe..229002a227 100644 --- a/OsmAnd/res/layout/fragment_edit_poi_normal.xml +++ b/OsmAnd/res/layout/fragment_edit_poi_normal.xml @@ -4,7 +4,7 @@ xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> + android:layout_height="match_parent" + tools:visibility="visible"/> \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java index ebd221ed7f..93852a08cf 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java @@ -2,6 +2,7 @@ package net.osmand.plus.osmedit; import android.app.Dialog; import android.content.DialogInterface; +import android.graphics.Point; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; @@ -9,6 +10,7 @@ import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; +import android.view.Display; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -54,6 +56,12 @@ public class AdvancedDataFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View view = inflater.inflate(R.layout.fragment_edit_poi_advanced, container, false); + Display display = getActivity().getWindowManager().getDefaultDisplay(); + Point size = new Point(); + display.getSize(size); + int height = size.y; + view.findViewById(R.id.screenFiller).setMinimumHeight(height); + deleteDrawable = ((OsmandApplication) getActivity().getApplication()).getIconsCache() .getPaintedContentIcon(R.drawable.ic_action_remove_dark, getActivity().getResources().getColor(R.color.dash_search_icon_dark)); @@ -205,7 +213,7 @@ public class AdvancedDataFragment extends Fragment { editPoiData.notifyDatasetChanged(mTagsChangedListener); } }); - final Set tagKeys = new TreeSet(); + final Set tagKeys = new TreeSet<>(); for (OSMSettings.OSMTagKey t : OSMSettings.OSMTagKey.values()) { if ((t != OSMSettings.OSMTagKey.NAME) && (t != OSMSettings.OSMTagKey.OPENING_HOURS) && (t != OSMSettings.OSMTagKey.PHONE) && (t != OSMSettings.OSMTagKey.WEBSITE)) { @@ -213,7 +221,7 @@ public class AdvancedDataFragment extends Fragment { } } - ArrayAdapter adapter = new ArrayAdapter(linearLayout.getContext(), + ArrayAdapter adapter = new ArrayAdapter<>(linearLayout.getContext(), R.layout.list_textview, tagKeys.toArray()); tagEditText.setAdapter(adapter); tagEditText.setThreshold(1); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java index 520e6cce97..f9a9212d56 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java @@ -1,5 +1,6 @@ package net.osmand.plus.osmedit; +import android.graphics.Point; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; @@ -7,6 +8,7 @@ import android.support.v4.app.Fragment; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; +import android.view.Display; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -54,6 +56,12 @@ public class BasicDataFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_edit_poi_normal, container, false); + Display display = getActivity().getWindowManager().getDefaultDisplay(); + Point size = new Point(); + display.getSize(size); + int height = size.y; + view.findViewById(R.id.screenFiller).setMinimumHeight(height); + IconsCache iconsCache = getMyApplication().getIconsCache(); int iconColor = getResources().getColor(R.color.dash_search_icon_dark); From 23d378bcae8badc64291c8a9b43ce1f614aa3482 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Fri, 11 Sep 2015 14:05:08 +0200 Subject: [PATCH 047/113] Translated using Weblate (Belarusian) Currently translated at 89.8% (987 of 1098 strings) --- OsmAnd/res/values-be/phrases.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index db61121a1e..8dde3f83cc 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -1065,4 +1065,7 @@ Ваенкамат Натарыўс + Ядравыя адыходы + Насельніцтва + From 80208c1f425dc143838c52ccc1d70239392a5692 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Fri, 11 Sep 2015 15:29:52 +0300 Subject: [PATCH 048/113] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 77 ++++++++++++++++++++++++++++++++ OsmAnd/res/values/phrases.xml | 49 +++++++++++++++++--- 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 4e91a95819..3ef2f339e1 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -856,6 +856,16 @@ Дата начала постройки Доступно для инвалидных кресел Опт + Подземная + Многоэтажная + + Стойка + Крепление только для переднего колеса + Рама + Специальное здание + Навес + Столбик с креплением + Неофициальная Частный доступ Нет доступа @@ -865,4 +875,71 @@ Доступ только для доставки Доступ только для с/х техники + Католицизм + Баптизм + Римский католицизм + Православие + Лютеранство + Суннизм + Протестантизм + Методизм + Англиканство + Пресвитерианство + Евангелизм + Русское православие + Пятидесятничество + Мормонизм + Свидетели Иеговы + Греческое православие + Кальвинизм + Адвентисты седьмого дня + Новоапостольская церковь + Церковь Англии + Епископальная церковь + Шиизм + Объединённая церковь + Греческий католицизм + Тибетский буддизм + Церковь Шотландии + Армия спасения + Церковь Христа + Меннонитство + Квакерство + Болгарское православие + Ассамблеи Бога + Без деноминации + Адвентисты + Старообрядчество + Сербское православие + Спиритизм + Армянская апостольская церковь + + Широколиственная растительность + Хвойная растительность + Смешанного типа + Безлистная растительность + + Оливка + Яблоко + Пальмовое масло + Апельсин + Миндаль + Банан + Лесной орех + Кокос + Хурма + Вишня + Грецкий орех + Слива + Персик + Чай + Кока + Киви + Плодовый сад + Нектарин + Манго + Каучук + Финики + Кофe + Гранат diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index d5753c0924..4cb747fa7d 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -661,18 +661,18 @@ Pentecostal Mormon Jehovahs witness - Greek_orthodox + Greek orthodox Reformed - Seventh_day_adventist - New_apostolic - Church_of_england + Seventh day adventist + New apostolic + Church of england Episcopal Shia United Greek catholic Tibetan United reformed - Church of scotland + Church of Scotland Salvation army Iglesia ni cristo Uniting @@ -1141,6 +1141,45 @@ Tile supplies Population + Underground + Multi-storey + + Stands + Wall loops + Rack + Building + Shed + Bollard + Informal + + Broadleaved + Needleleaved + Mixed + Leafless + + Olive + Apple + Palm oil + Orange + Almond + Banana + Hazel + Coconut + Persimmon + Cherry + Walnut + Plum + Peach + Tea + Coca + Kiwi + Meadow orchard + Nectorine + Mango + Rubber + Date + Coffee + Pomegranate Enforcement:traffic signals Enforcement:maxspeed From 7e7d118cbe01915a1320e5957400119c7f6d0fd7 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Fri, 11 Sep 2015 15:50:15 +0300 Subject: [PATCH 049/113] Poi deletion message. --- .../plus/osmedit/dialogs/DeletePoiDialogFragment.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java index 938dfac41f..db441a8bff 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java @@ -20,9 +20,8 @@ import net.osmand.plus.osmedit.OpenstreetmapUtil; import net.osmand.plus.osmedit.OsmEditingPlugin; import net.osmand.plus.osmedit.OsmPoint; -/** - * Created by GaidamakUA on 8/28/15. - */ +import java.text.MessageFormat; + public class DeletePoiDialogFragment extends DialogFragment { private static final String KEY_AMENITY_NODE = "amenity_node"; @@ -37,7 +36,7 @@ public class DeletePoiDialogFragment extends DialogFragment { final Bundle args = getArguments(); AlertDialog.Builder builder = new AlertDialog.Builder(activity); - builder.setTitle(R.string.poi_remove_title);; + builder.setTitle(R.string.poi_remove_title); builder.setNegativeButton(R.string.shared_string_cancel, null); builder.setPositiveButton(R.string.shared_string_delete, new DialogInterface.OnClickListener() { @Override @@ -48,7 +47,9 @@ public class DeletePoiDialogFragment extends DialogFragment { new Runnable() { @Override public void run() { - AccessibleToast.makeText(activity, R.string.poi_remove_success, + AccessibleToast.makeText(activity, MessageFormat.format( + getString(R.string.poi_action_succeded_template), + getString(R.string.poi_action_delete)), Toast.LENGTH_LONG).show(); if (activity instanceof MapActivity) { ((MapActivity) activity).getMapView().refreshMap(true); From 7765383d8531e9360290fffd923e12dd18e7b8c0 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Fri, 11 Sep 2015 16:35:11 +0300 Subject: [PATCH 050/113] Show GPX on map dialog fix --- OsmAnd/res/layout/list_menu_item_native.xml | 29 ++- OsmAnd/res/values/strings.xml | 2 + .../net/osmand/plus/helpers/GpxUiHelper.java | 177 +++++++++--------- .../dialogs/DeletePoiDialogFragment.java | 7 +- 4 files changed, 104 insertions(+), 111 deletions(-) diff --git a/OsmAnd/res/layout/list_menu_item_native.xml b/OsmAnd/res/layout/list_menu_item_native.xml index bf6182eda2..c4ab4f4296 100644 --- a/OsmAnd/res/layout/list_menu_item_native.xml +++ b/OsmAnd/res/layout/list_menu_item_native.xml @@ -1,32 +1,31 @@ - + android:orientation="horizontal"> + android:visibility="gone"/> + android:textSize="@dimen/default_list_text_size"/> + android:visibility="gone"/> + android:layout_marginRight="24dp" + android:focusable="false"/> \ No newline at end of file diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index a54367adb0..6790d5bd4f 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2261,4 +2261,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Recent places Favourites Successfully saved at: %1$s + POI will be deleted once you upload your changes + Show GPX diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java index f00aab8541..9476551072 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java @@ -5,7 +5,6 @@ import android.app.Application; import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; -import android.os.Build; import android.support.v7.app.AlertDialog; import android.util.TypedValue; import android.view.View; @@ -47,27 +46,26 @@ public class GpxUiHelper { GPXTrackAnalysis analysis = result.getAnalysis(f == null ? 0 : f.lastModified()); return getDescription(app, analysis, html); } - + public static String getDescription(OsmandApplication app, TrkSegment t, boolean html) { return getDescription(app, GPXTrackAnalysis.segment(0, t), html); } - - + public static String getColorValue(String clr, String value, boolean html) { - if(!html) { + if (!html) { return value; } return "" + value + ""; } - + public static String getColorValue(String clr, String value) { return getColorValue(clr, value, true); } - + public static String getDescription(OsmandApplication app, GPXTrackAnalysis analysis, boolean html) { StringBuilder description = new StringBuilder(); - String nl = html?"
":"\n"; + String nl = html ? "
" : "\n"; String timeSpanClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_time_span_color)); String distanceClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_distance_color)); String speedClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_speed)); @@ -75,32 +73,32 @@ public class GpxUiHelper { String descClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_altitude_desc)); // OUTPUT: // 1. Total distance, Start time, End time - description.append(app.getString(R.string.gpx_info_distance, getColorValue(distanceClr, - OsmAndFormatter.getFormattedDistance(analysis.totalDistance, app), html), - getColorValue(distanceClr, analysis.points+"", html) )); - if(analysis.totalTracks > 1) { - description.append(nl).append(app.getString(R.string.gpx_info_subtracks, getColorValue(speedClr, analysis.totalTracks+"", html))); + description.append(app.getString(R.string.gpx_info_distance, getColorValue(distanceClr, + OsmAndFormatter.getFormattedDistance(analysis.totalDistance, app), html), + getColorValue(distanceClr, analysis.points + "", html))); + if (analysis.totalTracks > 1) { + description.append(nl).append(app.getString(R.string.gpx_info_subtracks, getColorValue(speedClr, analysis.totalTracks + "", html))); } - if(analysis.wptPoints > 0) { - description.append(nl).append(app.getString(R.string.gpx_info_waypoints, getColorValue(speedClr, analysis.wptPoints+"", html))); + if (analysis.wptPoints > 0) { + description.append(nl).append(app.getString(R.string.gpx_info_waypoints, getColorValue(speedClr, analysis.wptPoints + "", html))); } - if(analysis.isTimeSpecified()) { - description.append(nl).append(app.getString(R.string.gpx_info_start_time, analysis.startTime)); - description.append(nl).append(app.getString(R.string.gpx_info_end_time, analysis.endTime)); + if (analysis.isTimeSpecified()) { + description.append(nl).append(app.getString(R.string.gpx_info_start_time, analysis.startTime)); + description.append(nl).append(app.getString(R.string.gpx_info_end_time, analysis.endTime)); } // 2. Time span - if(analysis.timeSpan > 0 && analysis.timeSpan / 1000 != analysis.timeMoving / 1000) { - final String formatDuration = Algorithms.formatDuration((int) (analysis.timeSpan/1000) - ); + if (analysis.timeSpan > 0 && analysis.timeSpan / 1000 != analysis.timeMoving / 1000) { + final String formatDuration = Algorithms.formatDuration((int) (analysis.timeSpan / 1000) + ); description.append(nl).append(app.getString(R.string.gpx_timespan, getColorValue(timeSpanClr, formatDuration, html))); } // 3. Time moving, if any - if(analysis.isTimeMoving()){ - final String formatDuration = Algorithms.formatDuration((int) (analysis.timeMoving/1000) - ); + if (analysis.isTimeMoving()) { + final String formatDuration = Algorithms.formatDuration((int) (analysis.timeMoving / 1000) + ); description.append(nl).append(app.getString(R.string.gpx_timemoving, getColorValue(timeSpanClr, formatDuration, html))); } @@ -115,32 +113,32 @@ public class GpxUiHelper { String max = getColorValue(ascClr, OsmAndFormatter.getFormattedAlt(analysis.maxElevation, app), html); String asc = getColorValue(ascClr, OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app), html); String desc = getColorValue(descClr, OsmAndFormatter.getFormattedAlt(analysis.diffElevationDown, app), html); - description.append(app.getString(R.string.gpx_info_diff_altitude,min +" - " + max )); + description.append(app.getString(R.string.gpx_info_diff_altitude, min + " - " + max)); description.append(nl); - description.append(app.getString(R.string.gpx_info_asc_altitude,"\u2193 " + desc + " \u2191 " + asc + "")); + description.append(app.getString(R.string.gpx_info_asc_altitude, "\u2193 " + desc + " \u2191 " + asc + "")); } - if(analysis.isSpeedSpecified()){ + if (analysis.isSpeedSpecified()) { String avg = getColorValue(speedClr, OsmAndFormatter.getFormattedSpeed(analysis.avgSpeed, app), html); String max = getColorValue(ascClr, OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app), html); - description.append(nl).append(app.getString(R.string.gpx_info_average_speed,avg)); - description.append(nl).append(app.getString(R.string.gpx_info_maximum_speed,max)); + description.append(nl).append(app.getString(R.string.gpx_info_average_speed, avg)); + description.append(nl).append(app.getString(R.string.gpx_info_maximum_speed, max)); } return description.toString(); } public static AlertDialog selectGPXFile(List selectedGpxList, final Activity activity, - final boolean showCurrentGpx, final boolean multipleChoice, final CallbackWithObject callbackWithObject){ + final boolean showCurrentGpx, final boolean multipleChoice, final CallbackWithObject callbackWithObject) { OsmandApplication app = (OsmandApplication) activity.getApplication(); final File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR); final List allGpxList = getSortedGPXFilenames(dir, false); - if(allGpxList.isEmpty()){ + if (allGpxList.isEmpty()) { AccessibleToast.makeText(activity, R.string.gpx_files_not_found, Toast.LENGTH_LONG).show(); } - if(!allGpxList.isEmpty() || showCurrentGpx){ - if(showCurrentGpx){ + if (!allGpxList.isEmpty() || showCurrentGpx) { + if (showCurrentGpx) { allGpxList.add(0, activity.getString(R.string.show_current_gpx_title)); } final ContextMenuAdapter adapter = createGpxContextMenuAdapter(activity, allGpxList, selectedGpxList, multipleChoice, @@ -150,17 +148,17 @@ public class GpxUiHelper { } return null; } - + public static AlertDialog selectGPXFile(final Activity activity, - final boolean showCurrentGpx, final boolean multipleChoice, final CallbackWithObject callbackWithObject) { + final boolean showCurrentGpx, final boolean multipleChoice, final CallbackWithObject callbackWithObject) { OsmandApplication app = (OsmandApplication) activity.getApplication(); final File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR); final List list = getSortedGPXFilenames(dir, false); - if(list.isEmpty()){ + if (list.isEmpty()) { AccessibleToast.makeText(activity, R.string.gpx_files_not_found, Toast.LENGTH_LONG).show(); } - if(!list.isEmpty() || showCurrentGpx){ - if(showCurrentGpx){ + if (!list.isEmpty() || showCurrentGpx) { + if (showCurrentGpx) { list.add(0, activity.getString(R.string.show_current_gpx_title)); } @@ -172,7 +170,7 @@ public class GpxUiHelper { } private static ContextMenuAdapter createGpxContextMenuAdapter(Activity activity, List allGpxList, - List selectedGpxList, boolean multipleChoice, + List selectedGpxList, boolean multipleChoice, boolean showCurrentTrack) { final ContextMenuAdapter adapter = new ContextMenuAdapter(activity); //element position in adapter @@ -197,9 +195,9 @@ public class GpxUiHelper { } protected static void updateSelection(List selectedGpxList, boolean showCurrentTrack, - final ContextMenuAdapter adapter, int i, String fileName) { - if(i == 0 && showCurrentTrack) { - if(selectedGpxList.contains("")) { + final ContextMenuAdapter adapter, int i, String fileName) { + if (i == 0 && showCurrentTrack) { + if (selectedGpxList.contains("")) { adapter.setSelection(i, 1); } } else { @@ -211,13 +209,13 @@ public class GpxUiHelper { } } } - + private static void setDescripionInDialog(final ArrayAdapter adapter, final ContextMenuAdapter cmAdapter, Activity activity, - final File dir, String filename, final int position) { + final File dir, String filename, final int position) { final Application app = activity.getApplication(); final File f = new File(dir, filename); loadGPXFileInDifferentThread(activity, new CallbackWithObject() { - + @Override public boolean processResult(GPXFile[] result) { cmAdapter.setItemName(position, cmAdapter.getItemName(position) + "\n" + getDescription((OsmandApplication) app, result[0], f, false)); @@ -228,19 +226,14 @@ public class GpxUiHelper { } private static AlertDialog createDialog(final Activity activity, final boolean showCurrentGpx, - final boolean multipleChoice, final CallbackWithObject callbackWithObject, - final List list, final ContextMenuAdapter adapter) { + final boolean multipleChoice, final CallbackWithObject callbackWithObject, + final List list, final ContextMenuAdapter adapter) { final OsmandApplication app = (OsmandApplication) activity.getApplication(); final File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR); - AlertDialog.Builder b = new AlertDialog.Builder(activity); + AlertDialog.Builder builder = new AlertDialog.Builder(activity); // final int padding = (int) (12 * activity.getResources().getDisplayMetrics().density + 0.5f); final boolean light = app.getSettings().isLightContent(); - final int layout; - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { - layout = R.layout.list_menu_item; - } else { - layout = R.layout.list_menu_item_native; - } + final int layout = R.layout.list_menu_item_native; final ArrayAdapter listAdapter = new ArrayAdapter(activity, layout, R.id.title, adapter.getItemNames()) { @@ -258,7 +251,7 @@ public class GpxUiHelper { return; } int nline = adapter.getItemName(position).indexOf('\n'); - if(nline == -1) { + if (nline == -1) { setDescripionInDialog(arrayAdapter, adapter, activity, dir, list.get(position), position); } else { adapter.setItemName(position, adapter.getItemName(position).substring(0, nline)); @@ -267,7 +260,7 @@ public class GpxUiHelper { } }); - if(showCurrentGpx && position == 0) { + if (showCurrentGpx && position == 0) { icon.setVisibility(View.INVISIBLE); } else { icon.setVisibility(View.VISIBLE); @@ -303,35 +296,37 @@ public class GpxUiHelper { public void onClick(DialogInterface dialog, int position) { } }; - b.setAdapter(listAdapter, onClickListener); + builder.setAdapter(listAdapter, onClickListener); if (multipleChoice) { - b.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() { + builder.setTitle(R.string.show_gpx) + .setPositiveButton(R.string.shared_string_ok, new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - GPXFile currentGPX = null; - //clear all previously selected files before adding new one - OsmandApplication app = (OsmandApplication) activity.getApplication(); - if(app != null && app.getSelectedGpxHelper() != null){ - app.getSelectedGpxHelper().clearAllGpxFileToShow(); - } - if (showCurrentGpx && adapter.getSelection(0) > 0) { - currentGPX = app.getSavingTrackHelper().getCurrentGpx(); - } - List s = new ArrayList(); - for (int i = (showCurrentGpx ? 1 : 0); i < adapter.length(); i++) { - if (adapter.getSelection(i) > 0) { - s.add(list.get(i)); + @Override + public void onClick(DialogInterface dialog, int which) { + GPXFile currentGPX = null; + //clear all previously selected files before adding new one + OsmandApplication app = (OsmandApplication) activity.getApplication(); + if (app != null && app.getSelectedGpxHelper() != null) { + app.getSelectedGpxHelper().clearAllGpxFileToShow(); + } + if (showCurrentGpx && adapter.getSelection(0) > 0) { + currentGPX = app.getSavingTrackHelper().getCurrentGpx(); + } + List s = new ArrayList<>(); + for (int i = (showCurrentGpx ? 1 : 0); i < adapter.length(); i++) { + if (adapter.getSelection(i) > 0) { + s.add(list.get(i)); + } + } + dialog.dismiss(); + loadGPXFileInDifferentThread(activity, callbackWithObject, dir, currentGPX, + s.toArray(new String[s.size()])); } - } - dialog.dismiss(); - loadGPXFileInDifferentThread(activity, callbackWithObject, dir, currentGPX, - s.toArray(new String[s.size()])); - } - }); + }) + .setNegativeButton(R.string.shared_string_cancel, null); } - final AlertDialog dlg = b.create(); + final AlertDialog dlg = builder.create(); dlg.setCanceledOnTouchOutside(true); dlg.getListView().setOnItemClickListener(new OnItemClickListener() { @Override @@ -360,27 +355,27 @@ public class GpxUiHelper { } public static List getSortedGPXFilenamesByDate(File dir, boolean absolutePath) { - final Map mp = new HashMap(); + final Map mp = new HashMap<>(); readGpxDirectory(dir, mp, "", absolutePath); - ArrayList list = new ArrayList(mp.keySet()); + ArrayList list = new ArrayList<>(mp.keySet()); Collections.sort(list, new Comparator() { @Override public int compare(String object1, String object2) { Long l1 = mp.get(object1); Long l2 = mp.get(object2); - long lhs = l1 == null ? 0 : l1.longValue(); - long rhs = l2 == null ? 0 : l2.longValue(); + long lhs = l1 == null ? 0 : l1; + long rhs = l2 == null ? 0 : l2; return lhs < rhs ? 1 : (lhs == rhs ? 0 : -1); } }); return list; } - + public static List getSortedGPXFilenames(File dir, boolean absolutePath) { - final Map mp = new HashMap(); + final Map mp = new HashMap<>(); readGpxDirectory(dir, mp, "", absolutePath); - ArrayList list = new ArrayList(mp.keySet()); + ArrayList list = new ArrayList<>(mp.keySet()); Collections.sort(list, new Comparator() { @Override public int compare(String object1, String object2) { @@ -391,8 +386,8 @@ public class GpxUiHelper { return list; } - private static void readGpxDirectory(File dir, final Map map, String parent, - boolean absolutePath) { + private static void readGpxDirectory(File dir, final Map map, String parent, + boolean absolutePath) { if (dir != null && dir.canRead()) { File[] files = dir.listFiles(); if (files != null) { @@ -407,9 +402,9 @@ public class GpxUiHelper { } } } - + private static void loadGPXFileInDifferentThread(final Activity activity, final CallbackWithObject callbackWithObject, - final File dir, final GPXFile currentFile, final String... filename) { + final File dir, final GPXFile currentFile, final String... filename) { final ProgressDialog dlg = ProgressDialog.show(activity, activity.getString(R.string.loading_smth, ""), activity.getString(R.string.loading_data)); new Thread(new Runnable() { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java index db441a8bff..a2b15ec7a5 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DeletePoiDialogFragment.java @@ -20,8 +20,6 @@ import net.osmand.plus.osmedit.OpenstreetmapUtil; import net.osmand.plus.osmedit.OsmEditingPlugin; import net.osmand.plus.osmedit.OsmPoint; -import java.text.MessageFormat; - public class DeletePoiDialogFragment extends DialogFragment { private static final String KEY_AMENITY_NODE = "amenity_node"; @@ -47,9 +45,8 @@ public class DeletePoiDialogFragment extends DialogFragment { new Runnable() { @Override public void run() { - AccessibleToast.makeText(activity, MessageFormat.format( - getString(R.string.poi_action_succeded_template), - getString(R.string.poi_action_delete)), + AccessibleToast.makeText(activity, + getString(R.string.poi_deleted_localy), Toast.LENGTH_LONG).show(); if (activity instanceof MapActivity) { ((MapActivity) activity).getMapView().refreshMap(true); From 14f7c85090666da2225d643732106e69683c03c6 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 15:35:27 +0200 Subject: [PATCH 051/113] Translated using Weblate (Danish) Currently translated at 100.0% (1134 of 1134 strings) --- OsmAnd/res/values-da/phrases.xml | 44 ++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index cf6c67b738..c1effcb214 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1129,10 +1129,10 @@ Græsk-ortodoks Syvende Dags Adventist Nyapostolsk - Den engelske kirke + Den Engelske kirke Shiisme Forenede reformerte kirke - Den skotske kirke + Den Skotske kirke Iglesia ni cristo Mennonit Assemblies of god @@ -1185,4 +1185,44 @@ Befolkning + Fleretages + + Står + Væg sløjfer + Bygning + Skur + Pullert + Uformel + + Bredbladet + Nålebladet + Blandet + Bladløs + + Oliven + Æble + Palmeolie + Appelsin + Mandel + Banan + Hassel + Kokosnød + Ibenholt + Kirsebær + Valnød + Blomme + Fersken + Te + Coca + Kiwi + Frugtplantage + Nektarin + Mango + Gummitræ + Dadel + Kaffe + Granatæble + + Kældet + Reol From 3b88dae3c5b74387f17d8044d4ff3dd6a215630a Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 15:34:25 +0200 Subject: [PATCH 052/113] Translated using Weblate (Argentinean Spanish) Currently translated at 97.0% (1100 of 1134 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index c86d8bff2f..9898747358 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1165,4 +1165,8 @@ Suministros agrícolas Venta de azulejos + Población + Subterráneo + Varios pisos + From 938c66c41aedb5809a7376431da6c10aa0fd9749 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Fri, 11 Sep 2015 15:23:39 +0200 Subject: [PATCH 053/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 98.2% (1114 of 1134 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index 7d0098ab40..74a122ee12 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -1166,4 +1166,23 @@ 人口數 + 地下 + 多層 + + 立台 + 壁掛架 + 擱物架 + 建築物 + 車棚 + 系船柱 + 非正式的 + + 闊葉樹 + 針葉樹 + 混合林 + 無葉植物 + + 橄欖樹 + 蘋果樹 + 棕櫚油 From 54ad5ae23bb0743cca9a6eea6d13a739a285d5aa Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 15:45:02 +0200 Subject: [PATCH 054/113] Translated using Weblate (Danish) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-da/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 386d3351f5..dd16205ae4 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2129,4 +2129,6 @@ Favoritter slet Gemt korrekt: %1$s +IP vil blive slettet, når ændringer overføres + Vis GPX From 0d779d622845c6db18a98f3b12342f605f63b9ac Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 16:08:15 +0200 Subject: [PATCH 055/113] Translated using Weblate (Spanish) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-es/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 81d1e5014b..d3f2a6fe27 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -2187,4 +2187,6 @@ Favoritos borrar Guardado exitosamente en: %1$s +El PDI se eliminará una vez subido los cambios + Mostrar GPX From 6addb27d4bf63d4d02f2c5dcf53b1976983cf631 Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 16:09:01 +0200 Subject: [PATCH 056/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 3ebb2e5abe..fc9b17c36a 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -2049,4 +2049,6 @@ Favoritos borrar Guardado exitosamente como: %1$s +El PDI se eliminará una vez subido los cambios + Mostrar GPX From beca2f9522d5fced0819f4d93de427beb55afc5f Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Fri, 11 Sep 2015 17:15:52 +0300 Subject: [PATCH 057/113] Show GPX on map dialog fix --- OsmAnd/res/layout/fav_group_edit.xml | 15 +++++++ .../net/osmand/plus/FavouritesDbHelper.java | 9 +++- .../activities/FavoritesTreeFragment.java | 41 +++++++++++-------- .../plus/activities/MapActivityLayers.java | 3 +- 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/OsmAnd/res/layout/fav_group_edit.xml b/OsmAnd/res/layout/fav_group_edit.xml index ba84dcc8f6..66252280a9 100644 --- a/OsmAnd/res/layout/fav_group_edit.xml +++ b/OsmAnd/res/layout/fav_group_edit.xml @@ -6,6 +6,21 @@ android:paddingRight="7dp" android:stretchColumns="1"> + + + + + + + Date: Fri, 11 Sep 2015 15:53:51 +0200 Subject: [PATCH 058/113] Translated using Weblate (Argentinean Spanish) Currently translated at 98.3% (1115 of 1134 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 9898747358..470aedc014 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1169,4 +1169,21 @@ Subterráneo Varios pisos + Soporte + Soporte de pared + Informal + + Hoja ancha + Hoja acicular + Mixto + Sin hojas + + Olivo + Manzano + Aceite de palma + Naranjo + Almendro + Banano + Avellanos + Cocotero From 551bb7ca6532cf9d5884129bcd476ecf69bd9729 Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 16:06:50 +0200 Subject: [PATCH 059/113] Translated using Weblate (Spanish) Currently translated at 99.2% (1126 of 1134 strings) --- OsmAnd/res/values-es/phrases.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index 9eed1e7cab..3d8bb760fc 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1168,4 +1168,36 @@ Insumos agrícolas Azulejos + Población + Subterráneo + Varios pisos + + Soportes + Hoja ancha + Hoja acicular + Mixto + Sin hojas + + Olivo + Manzano + Aceite de palma + Naranjo + Almendro + Banano / Plátano + Avellano + Cocotéro + Caqui + Cerezo + Nogal + Ciruelo + Melocotón + Té + Coca + Kiwi + Prado con huertos + Mango + Fecha + Café + Granada + From c59cc870a181d33cc945b470e7f4de2fc6f8e6f7 Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 16:52:15 +0200 Subject: [PATCH 060/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-pt-rBR/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 47ae648ac8..c76b0e12ae 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -1818,4 +1818,6 @@ Favoritos apagar Salvo com sucesso em: %1$s +POI será apagado quando você enviar suas alterações + Mostrar GPX From 248eee055bfa9ac2ce00168e48b004fa3dc646c0 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 16:55:43 +0200 Subject: [PATCH 061/113] Translated using Weblate (Danish) Currently translated at 100.0% (1134 of 1134 strings) --- OsmAnd/res/values-da/phrases.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index c1effcb214..a35766ff18 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1187,7 +1187,7 @@ Fleretages - Står + Stativ Væg sløjfer Bygning Skur @@ -1210,7 +1210,7 @@ Ibenholt Kirsebær Valnød - Blomme + Blommetræ Fersken Te Coca @@ -1219,10 +1219,10 @@ Nektarin Mango Gummitræ - Dadel + Daddelpalmeq Kaffe Granatæble - Kældet + Kælder Reol From edd291c674ee963e2cdd9711cd65c9d45bc64678 Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 17:29:37 +0200 Subject: [PATCH 062/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.1% (1113 of 1134 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index 4caadd1c59..c013ed832f 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1168,4 +1168,22 @@ População + Subterrâneo + Vários andares + + U-invertido + Edifício + Galpão + Poste de amarração + Informal + + Latifoliadas + Mista + Acicular + Desfolhada + + Oliveira + Macieira + Palmeira oleaginosa + Laranjeira From 7364e44e07b63b3a5f5655dcdb7db844ccc1020f Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 17:30:00 +0200 Subject: [PATCH 063/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.2% (1114 of 1134 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index c013ed832f..86cc9dc73d 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1186,4 +1186,5 @@ Macieira Palmeira oleaginosa Laranjeira + Amendoeira From 9b36b85735224311449ede791619f036b17fd190 Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 17:30:13 +0200 Subject: [PATCH 064/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.3% (1115 of 1134 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index 86cc9dc73d..0e67762091 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1187,4 +1187,5 @@ Palmeira oleaginosa Laranjeira Amendoeira + Bananeira From 4a362613b15df8fe57e4c9eafcbaa9b5ea8fe847 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Fri, 11 Sep 2015 18:34:40 +0300 Subject: [PATCH 065/113] Fix building --- OsmAnd/res/values-ru/phrases.xml | 2 ++ OsmAnd/res/values/phrases.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 3ef2f339e1..3672e968a0 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -942,4 +942,6 @@ Финики Кофe Гранат + + Здание diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 40b85bc3f3..a987e529a0 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1153,7 +1153,7 @@ Stands Wall loops Rack - Building + Special building Shed Bollard Informal From 89a38ce54ebae821174cc52a191676ba370c89b3 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Fri, 11 Sep 2015 17:32:43 +0200 Subject: [PATCH 066/113] Translated using Weblate (Belarusian) Currently translated at 99.8% (1771 of 1773 strings) --- OsmAnd/res/values-be/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 64e642d423..cc74d22659 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2089,4 +2089,5 @@ Нядаўнія месцы Упадабанае Пасьпяхова захаваны ў: %1$s +Паказаць GPX From 269567dad384e8c8e7529c5da2fa639d7eb7c32e Mon Sep 17 00:00:00 2001 From: xmd5a Date: Fri, 11 Sep 2015 18:40:41 +0300 Subject: [PATCH 067/113] Fix phrases --- OsmAnd/res/values/phrases.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index a987e529a0..2fed64f28c 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1134,11 +1134,11 @@ Salt (content) Grain (content) - Nudism: allowed - Nudism: prohibited - Nudism: obligatory - Nudism: customary - Nudism: permissive + Nudism: allowed + Nudism: prohibited + Nudism: obligatory + Nudism: customary + Nudism: permissive Building supplies Plumbing supplies From b2df5863471e781e241f5f67d58c96d3967fd8c7 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 18:10:16 +0200 Subject: [PATCH 068/113] Translated using Weblate (Danish) Currently translated at 100.0% (1139 of 1139 strings) --- OsmAnd/res/values-da/phrases.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index a35766ff18..858294398b 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1189,7 +1189,7 @@ Stativ Væg sløjfer - Bygning + Særlig bygning Skur Pullert Uformel @@ -1225,4 +1225,10 @@ Kælder Reol + Naturisme: tilladt + Naturisme: forbudt + Naturisme: obligatorisk + Naturisme: sædvanligt + Naturisme: eftergivende + From 0bfc9c1c2a3071adc66833a63be0f92a2d30a6bc Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Fri, 11 Sep 2015 19:13:40 +0300 Subject: [PATCH 069/113] Context menu layout fixes --- .../res/layout/map_context_menu_fragment.xml | 36 ++-- .../MapContextMenuFragment.java | 175 +++++++++--------- .../sections/AmenityInfoMenuController.java | 5 + .../sections/MenuController.java | 2 +- 4 files changed, 110 insertions(+), 108 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 2f83828f9f..a9e3374a32 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -1,5 +1,5 @@ - - + android:fillViewport="true"> - + + + + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index f7638c98b6..505c5ccafc 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -1,12 +1,12 @@ package net.osmand.plus.mapcontextmenu; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; import android.annotation.TargetApi; import android.app.Activity; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.support.v4.app.Fragment; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -45,15 +45,17 @@ public class MapContextMenuFragment extends Fragment { private View mainView; private View bottomView; private View shadowView; - private View bottomBorder; MenuController menuController; private int menuTopHeight; private int menuTopShadowHeight; + private int menuTopShadowAllHeight; + private int menuTitleHeight; private int menuButtonsHeight; private int menuBottomViewHeight; private int menuFullHeight; + private int menuFullHeightMax; @Override public void onAttach(Activity activity) { @@ -113,10 +115,13 @@ public class MapContextMenuFragment extends Fragment { menuTopHeight = view.findViewById(R.id.context_menu_top_view).getHeight(); menuTopShadowHeight = view.findViewById(R.id.context_menu_top_shadow).getHeight(); + menuTopShadowAllHeight = view.findViewById(R.id.context_menu_top_shadow_all).getHeight(); menuButtonsHeight = view.findViewById(R.id.context_menu_buttons).getHeight(); - menuBottomViewHeight = view.findViewById(R.id.context_menu_bottom_view).getHeight(); menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight(); + menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight; + menuFullHeightMax = menuTitleHeight + menuBottomViewHeight + dpToPx(2f); + ViewTreeObserver obs = view.getViewTreeObserver(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { @@ -130,14 +135,6 @@ public class MapContextMenuFragment extends Fragment { }); - bottomBorder = view.findViewById(R.id.context_menu_bottom_border); - bottomBorder.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - return true; - } - }); - shadowView = view.findViewById(R.id.context_menu_shadow_view); shadowView.setOnTouchListener(new View.OnTouchListener() { public boolean onTouch(View view, MotionEvent event) { @@ -151,12 +148,13 @@ public class MapContextMenuFragment extends Fragment { final View.OnTouchListener slideTouchListener = new View.OnTouchListener() { private float dy; private float dyMain; - private int destinationState; private VelocityTracker velocity; private boolean slidingUp; private boolean slidingDown; + private float velocityX; private float velocityY; + private float maxVelocityY; private float startX; private float startY; @@ -166,7 +164,11 @@ public class MapContextMenuFragment extends Fragment { private boolean isClick(float endX, float endY) { float differenceX = Math.abs(startX - endX); float differenceY = Math.abs(startY - endY); - if (differenceX > 1 || differenceY > 1 || System.currentTimeMillis() - lastTouchDown > CLICK_ACTION_THRESHHOLD) { + if (differenceX > 1 || + differenceY > 1 || + Math.abs(velocityX) > 10 || + Math.abs(velocityY) > 10 || + System.currentTimeMillis() - lastTouchDown > CLICK_ACTION_THRESHHOLD) { return false; } return true; @@ -184,26 +186,29 @@ public class MapContextMenuFragment extends Fragment { dy = event.getY(); dyMain = mainView.getY(); velocity = VelocityTracker.obtain(); + velocityX = 0; velocityY = 0; + maxVelocityY = 0; velocity.addMovement(event); break; case MotionEvent.ACTION_MOVE: float y = event.getY(); float newY = mainView.getY() + (y - dy); - mainView.setY(newY); + mainView.setY((int)newY); - ViewGroup.LayoutParams lp = bottomBorder.getLayoutParams(); - lp.height = (int)(view.getHeight() - newY - menuFullHeight) + 10; - bottomBorder.setLayoutParams(lp); - bottomBorder.setY(newY + menuFullHeight); - bottomBorder.requestLayout(); + menuFullHeight = view.getHeight() - (int) newY + 10; + ViewGroup.LayoutParams lp = mainView.getLayoutParams(); + lp.height = Math.max(menuFullHeight, menuTitleHeight); + mainView.setLayoutParams(lp); + mainView.requestLayout(); velocity.addMovement(event); velocity.computeCurrentVelocity(1000); - float vel = Math.abs(velocity.getYVelocity()); - if (vel > velocityY) - velocityY = vel; + velocityX = Math.abs(velocity.getXVelocity()); + velocityY = Math.abs(velocity.getYVelocity()); + if (velocityY > maxVelocityY) + maxVelocityY = velocityY; break; @@ -212,8 +217,8 @@ public class MapContextMenuFragment extends Fragment { float endX = event.getX(); float endY = event.getY(); - slidingUp = Math.abs(velocityY) > 500 && (mainView.getY() - dyMain) < -50; - slidingDown = Math.abs(velocityY) > 500 && (mainView.getY() - dyMain) > 50; + slidingUp = Math.abs(maxVelocityY) > 500 && (mainView.getY() - dyMain) < -50; + slidingDown = Math.abs(maxVelocityY) > 500 && (mainView.getY() - dyMain) > 50; velocity.recycle(); @@ -223,37 +228,31 @@ public class MapContextMenuFragment extends Fragment { } else if (slidingDown) { menuController.slideDown(); } - destinationState = menuController.getCurrentMenuState(); - } else { - destinationState = MenuController.MenuState.HEADER_ONLY; } - float posY = 0; - switch (destinationState) { - case MenuController.MenuState.HEADER_ONLY: - posY = view.getHeight() - (menuFullHeight - menuBottomViewHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP)); - break; - case MenuController.MenuState.HALF_SCREEN: - posY = view.getHeight() - menuFullHeight; - break; - case MenuController.MenuState.FULL_SCREEN: - posY = -menuTopShadowHeight - dpToPx(SHADOW_HEIGHT_TOP_DP); - break; - default: - break; - } - - float minY = Math.min(posY, mainView.getY()); - lp = bottomBorder.getLayoutParams(); - lp.height = (int)(view.getHeight() - minY - menuFullHeight) + 10; - if (lp.height < 0) - lp.height = 0; - bottomBorder.setLayoutParams(lp); - bottomBorder.requestLayout(); + final int posY = getPosY(); if (mainView.getY() != posY) { - mainView.animate().y(posY).setDuration(200).setInterpolator(new DecelerateInterpolator()).start(); - bottomBorder.animate().y(posY + menuFullHeight).setDuration(200).setInterpolator(new DecelerateInterpolator()).start(); + + if (posY < mainView.getY()) { + updateMainViewLayout(posY); + } + + mainView.animate().y(posY) + .setDuration(200) + .setInterpolator(new DecelerateInterpolator()) + .setListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationCancel(Animator animation) { + updateMainViewLayout(posY); + } + + @Override + public void onAnimationEnd(Animator animation) { + updateMainViewLayout(posY); + } + }) + .start(); } // OnClick event @@ -323,7 +322,7 @@ public class MapContextMenuFragment extends Fragment { // Action buttons final ImageButton buttonNavigate = (ImageButton) view.findViewById(R.id.context_menu_route_button); buttonNavigate.setImageDrawable(iconsCache.getIcon(R.drawable.map_directions, - light ? R.color.icon_color : R.color.dash_search_icon_dark)); + light ? R.color.icon_color : R.color.dashboard_subheader_text_dark)); buttonNavigate.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -333,7 +332,7 @@ public class MapContextMenuFragment extends Fragment { final ImageButton buttonFavorite = (ImageButton) view.findViewById(R.id.context_menu_fav_button); buttonFavorite.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_fav_dark, - light ? R.color.icon_color : R.color.dash_search_icon_dark)); + light ? R.color.icon_color : R.color.dashboard_subheader_text_dark)); buttonFavorite.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -343,7 +342,7 @@ public class MapContextMenuFragment extends Fragment { final ImageButton buttonShare = (ImageButton) view.findViewById(R.id.context_menu_share_button); buttonShare.setImageDrawable(iconsCache.getIcon(R.drawable.abc_ic_menu_share_mtrl_alpha, - light ? R.color.icon_color : R.color.dash_search_icon_dark)); + light ? R.color.icon_color : R.color.dashboard_subheader_text_dark)); buttonShare.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -353,7 +352,7 @@ public class MapContextMenuFragment extends Fragment { final ImageButton buttonMore = (ImageButton) view.findViewById(R.id.context_menu_more_button); buttonMore.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white, - light ? R.color.icon_color : R.color.dash_search_icon_dark)); + light ? R.color.icon_color : R.color.dashboard_subheader_text_dark)); buttonMore.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -374,56 +373,54 @@ public class MapContextMenuFragment extends Fragment { menuController.build(bottomView); } + bottomView.measure(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + menuBottomViewHeight = bottomView.getMeasuredHeight(); + return view; } - private void doLayoutMenu() { - int shadowViewHeight = 0; - int bottomBorderHeight = 0; + private int getPosY() { + int destinationState; + int minHalfY; + if (menuController != null) { + destinationState = menuController.getCurrentMenuState(); + minHalfY = view.getHeight() - (int)(view.getHeight() * menuController.getHalfScreenMaxHeightKoef()); + } else { + destinationState = MenuController.MenuState.HEADER_ONLY; + minHalfY = view.getHeight(); + } - int menuState; - if (menuController != null) - menuState = menuController.getCurrentMenuState(); - else - menuState = MenuController.MenuState.HEADER_ONLY; - - switch (menuState) { + int posY = 0; + switch (destinationState) { case MenuController.MenuState.HEADER_ONLY: - shadowViewHeight = view.getHeight() - (menuFullHeight - menuBottomViewHeight) + dpToPx(SHADOW_HEIGHT_BOTTOM_DP); - bottomBorderHeight = 0; + posY = view.getHeight() - (menuTitleHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP)); break; case MenuController.MenuState.HALF_SCREEN: - int maxHeight = (int)(menuController.getHalfScreenMaxHeightKoef() * view.getHeight()); - if (maxHeight > menuFullHeight) { - shadowViewHeight = view.getHeight() - menuFullHeight; - bottomBorderHeight = 0; - } else { - shadowViewHeight = view.getHeight() - maxHeight; - bottomBorderHeight = 0; - mainView.setY(shadowViewHeight); - } + posY = view.getHeight() - menuFullHeightMax; + posY = Math.max(posY, minHalfY); break; case MenuController.MenuState.FULL_SCREEN: - shadowViewHeight = 0; - bottomBorderHeight = view.getHeight() - menuFullHeight + menuTopShadowHeight + dpToPx(SHADOW_HEIGHT_TOP_DP); + posY = -menuTopShadowHeight - dpToPx(SHADOW_HEIGHT_TOP_DP); break; default: break; } + return posY; + } - ViewGroup.LayoutParams lp = bottomBorder.getLayoutParams(); - lp.height = bottomBorderHeight + 10; - bottomBorder.setLayoutParams(lp); - bottomBorder.setY(view.getHeight() - bottomBorderHeight); - - lp = shadowView.getLayoutParams(); - lp.height = shadowViewHeight; - shadowView.setLayoutParams(lp); - + private void updateMainViewLayout(int posY) { + ViewGroup.LayoutParams lp; + menuFullHeight = view.getHeight() - posY; lp = mainView.getLayoutParams(); - lp.height = menuFullHeight; + lp.height = Math.max(menuFullHeight, menuTitleHeight); mainView.setLayoutParams(lp); + mainView.requestLayout(); + } + private void doLayoutMenu() { + final int posY = getPosY(); + mainView.setY(posY); + updateMainViewLayout(posY); } public void dismissMenu() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java index ce795e7c87..b22bd2313e 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java @@ -9,6 +9,11 @@ public class AmenityInfoMenuController extends MenuController { super(new AmenityInfoMenuBuilder(app, amenity)); } + @Override + public int getInitialMenuState() { + return MenuState.HALF_SCREEN; + } + @Override public int getSupportedMenuStates() { return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuController.java index 8e1d138d79..c2e01c5e3f 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/MenuController.java @@ -63,7 +63,7 @@ public abstract class MenuController { } public float getHalfScreenMaxHeightKoef() { - return .6f; + return .7f; } public boolean shouldShowButtons() { From ffeaac7b685c17f4420a27913f2717f1ae2821cb Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Fri, 11 Sep 2015 19:19:16 +0300 Subject: [PATCH 070/113] Tiny fix --- .../plus/mapcontextmenu/sections/AmenityInfoMenuController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java index b22bd2313e..6c29cbc601 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuController.java @@ -11,7 +11,7 @@ public class AmenityInfoMenuController extends MenuController { @Override public int getInitialMenuState() { - return MenuState.HALF_SCREEN; + return MenuState.HEADER_ONLY; } @Override From 9c6cda89ab87c7b563f9519ca2c8d1d1e9077b13 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 11 Sep 2015 19:43:31 +0200 Subject: [PATCH 071/113] shorten voice propmts by increasing degree range for "regular" turns --- .../src/net/osmand/router/RouteResultPreparation.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index a866b2ba21..01147408d2 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -600,11 +600,11 @@ public class RouteResultPreparation { // mpi = MapUtils.degreesDiff(prev.getBearingEnd(), begin); } if (mpi >= TURN_DEGREE_MIN) { - if (mpi < 60) { + if (mpi < 45) { t = TurnType.valueOf(TurnType.TSLL, leftSide); } else if (mpi < 120) { t = TurnType.valueOf(TurnType.TL, leftSide); - } else if (mpi < 135 || leftSide) { + } else if (mpi < 150 || leftSide) { t = TurnType.valueOf(TurnType.TSHL, leftSide); } else { t = TurnType.valueOf(TurnType.TU, leftSide); @@ -612,11 +612,11 @@ public class RouteResultPreparation { int[] lanes = getTurnLanesInfo(prev, t.getValue()); t.setLanes(lanes); } else if (mpi < -TURN_DEGREE_MIN) { - if (mpi > -60) { + if (mpi > -45) { t = TurnType.valueOf(TurnType.TSLR, leftSide); } else if (mpi > -120) { t = TurnType.valueOf(TurnType.TR, leftSide); - } else if (mpi > -135 || !leftSide) { + } else if (mpi > -150 || !leftSide) { t = TurnType.valueOf(TurnType.TSHR, leftSide); } else { t = TurnType.valueOf(TurnType.TRU, leftSide); From 289256f5976b97e4122f711df9c7107161f85067 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 19:21:07 +0200 Subject: [PATCH 072/113] Translated using Weblate (Danish) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index dd16205ae4..5c2ef9c46d 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2129,6 +2129,6 @@ Favoritter slet Gemt korrekt: %1$s -IP vil blive slettet, når ændringer overføres +Interessepunkt (IP) vil blive slettet, når ændringer overføres Vis GPX From 64b3e7f93fe2ec9702a298f11b9420ad97ee097d Mon Sep 17 00:00:00 2001 From: Evgenii Martynenko Date: Fri, 11 Sep 2015 19:21:25 +0200 Subject: [PATCH 073/113] Translated using Weblate (Russian) Currently translated at 99.3% (1760 of 1771 strings) --- OsmAnd/res/values-ru/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 9b19cbe93c..1435e280d6 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -2091,4 +2091,6 @@ Рабочие дни Избранное Успешно сохранён в: %1$s +POI будут удалены после того как вы загрузите ваши изменения + Показать GPX From 2c45e676b9186ed920a3884f2a8dd573f486724e Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Fri, 11 Sep 2015 18:29:53 +0200 Subject: [PATCH 074/113] Translated using Weblate (Swedish) Currently translated at 99.2% (1758 of 1771 strings) --- OsmAnd/res/values-sv/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 22a5686786..8052a24421 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1995,4 +1995,6 @@ Nyliga platser ta bort Sparades utan problem kl. %1$s +POI tas bort så snart du laddat upp dina ändringar + Visa GPX From df98acfcda2f9b8afde5501943f5e4f94986fa92 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 11 Sep 2015 19:18:17 +0200 Subject: [PATCH 075/113] Translated using Weblate (Danish) Currently translated at 100.0% (1139 of 1139 strings) --- OsmAnd/res/values-da/phrases.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 858294398b..8cf48a2ea1 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1185,12 +1185,12 @@ Befolkning - Fleretages + Fleretagesparkering - Stativ + Cykelsstativ Væg sløjfer Særlig bygning - Skur + Cykelskur Pullert Uformel @@ -1223,12 +1223,12 @@ Kaffe Granatæble - Kælder + Párkeringskælder Reol Naturisme: tilladt Naturisme: forbudt Naturisme: obligatorisk - Naturisme: sædvanligt - Naturisme: eftergivende + Naturisme: sædvanlig + Naturisme: liberalt From 2284c301bdc098b154fed06c83f272081514a7bf Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 19:15:52 +0200 Subject: [PATCH 076/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.5% (1134 of 1139 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index 0e67762091..d42a500a9c 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1172,7 +1172,7 @@ Vários andares U-invertido - Edifício + Edifício especial Galpão Poste de amarração Informal @@ -1188,4 +1188,25 @@ Laranjeira Amendoeira Bananeira + Aveleira + Coqueiro + Caquizeiro + Cerejeira + Nogueira + Ameixeira + Pessegueiro + Kiwizeiro + Nectarineira + Mangueira + Seringueira + Cafeeiro + Romãzeira + + Nudismo: autorizado + Nudismo: proibido + Nudismo: obrigatório + Nudismo: habitual + Nudismo: permissido + + Tamareira From 7d97627f20af0f1fefb41d22557aca139eb57468 Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 20:06:17 +0200 Subject: [PATCH 077/113] Translated using Weblate (Argentinean Spanish) Currently translated at 99.9% (1138 of 1139 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 470aedc014..c47418c41d 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1186,4 +1186,29 @@ Banano Avellanos Cocotero + Nudismo permitido + Nudismo prohibido + Nudismo obligatorio + Nudismo habitual + Nudismo permisivo + + Bastidores + Edificio especial + Caseta + Bolardos + Caqui + Cerezo + Nogal + Ciruelo + Duraznero + Té + Coca + Kiwi + Huerto + Mango + Caucho + Fecha + Café + Granada + From a5af3b71279b5fa76815b937768db5645137c57a Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Fri, 11 Sep 2015 19:59:36 +0200 Subject: [PATCH 078/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (1137 of 1139 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index d42a500a9c..c777ccff4e 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1209,4 +1209,7 @@ Nudismo: permissido Tamareira + Erveira + Coca + Prado com pomar From ad0eb9e3b32a18407c7da408671eabbeeb23c4e5 Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 20:09:02 +0200 Subject: [PATCH 079/113] Translated using Weblate (Spanish) Currently translated at 99.4% (1133 of 1139 strings) --- OsmAnd/res/values-es/phrases.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index 3d8bb760fc..2c5bafd74f 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1200,4 +1200,12 @@ Café Granada + Nudismo permitido + Nudismo prohibido + Nudismo obligatorio + Nudismo habitual + Nudismo permisivo + + Anclajes de pared + Bastidores From 4d2a57f794373b5778f21e65888d44d87ed0189c Mon Sep 17 00:00:00 2001 From: Ignacio Date: Fri, 11 Sep 2015 20:10:13 +0200 Subject: [PATCH 080/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1139 of 1139 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index c47418c41d..1ced852d84 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1211,4 +1211,5 @@ Café Granada + Nectarina From 25a8b0c699115fae509a74fbbf6f13a05f8b5dfc Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 20:10:26 +0200 Subject: [PATCH 081/113] Translated using Weblate (Spanish) Currently translated at 99.6% (1135 of 1139 strings) --- OsmAnd/res/values-es/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index 2c5bafd74f..ef65f8a7a1 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1208,4 +1208,6 @@ Anclajes de pared Bastidores + Edificio especial + Caseta From eae3d5141eafb952d12a843ece8f43f5b812477c Mon Sep 17 00:00:00 2001 From: xmd5a Date: Fri, 11 Sep 2015 21:34:14 +0300 Subject: [PATCH 082/113] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 4 ++++ OsmAnd/res/values/phrases.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 3672e968a0..b8717c440d 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -802,6 +802,7 @@ Микрорайон Жилой район + Религиозное землепользование Основная туристическая достопримечательность Парк атракционов @@ -943,5 +944,8 @@ Кофe Гранат + Высота + Высота над уровнем моря + Здание diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 2fed64f28c..1c332b6ba6 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1082,6 +1082,8 @@ Service times Maximum height Maximum weight + Height + Height above sea level Abandoned Abandoned object Disused From 23fe82c99de9c36db6c2821f69fb637fa784ad74 Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 20:18:29 +0200 Subject: [PATCH 083/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1139 of 1139 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 1ced852d84..9329928911 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1169,8 +1169,8 @@ Subterráneo Varios pisos - Soporte - Soporte de pared + Anclajes + Anclajes de pared Informal Hoja ancha @@ -1184,7 +1184,7 @@ Naranjo Almendro Banano - Avellanos + Avellano Cocotero Nudismo permitido Nudismo prohibido @@ -1192,10 +1192,10 @@ Nudismo habitual Nudismo permisivo - Bastidores + Bastidor Edificio especial Caseta - Bolardos + Bolardo Caqui Cerezo Nogal From 983d181b6f38708f83ee86aff521f93be08b0e0e Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 11 Sep 2015 20:11:38 +0200 Subject: [PATCH 084/113] Translated using Weblate (Spanish) Currently translated at 99.9% (1138 of 1139 strings) --- OsmAnd/res/values-es/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index ef65f8a7a1..0fd78cb7d2 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1210,4 +1210,8 @@ Bastidores Edificio especial Caseta + Bolardo + Informal + + Caucho From c64d7b06bb89e66af9e440ecc31bc326e7103180 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Fri, 11 Sep 2015 22:03:04 +0300 Subject: [PATCH 085/113] Fix Drawer/Dashboard night theme icon color --- OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java | 2 +- .../src/net/osmand/plus/dashboard/DashSearchFragment.java | 6 +++--- .../osmand/plus/mapcontextmenu/MapContextMenuFragment.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index 0fdb217740..3fb4d99e61 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -346,7 +346,7 @@ public class ContextMenuAdapter { if (layoutId == R.layout.simple_list_menu_item) { int color = activity.getResources() - .getColor(holoLight ? R.color.icon_color : R.color.dash_search_icon_dark); + .getColor(holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark); Drawable imageId = app.getIconsCache().getPaintedContentIcon( iconListLight.get(position), color); float density = activity.getResources().getDisplayMetrics().density; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java index 740f88a48d..dc60ce461c 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java @@ -60,7 +60,7 @@ public class DashSearchFragment extends DashBaseFragment { } }); btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_info2, - light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null); + light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null); btn = (Button)view.findViewById(R.id.address); btn.setOnClickListener(new View.OnClickListener() { @@ -71,7 +71,7 @@ public class DashSearchFragment extends DashBaseFragment { } }); btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_home2, - light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null); + light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null); btn = (Button) view.findViewById(R.id.coord); btn.setOnClickListener(new View.OnClickListener() { @@ -82,7 +82,7 @@ public class DashSearchFragment extends DashBaseFragment { } }); btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_marker2, - light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null); + light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null); (view.findViewById(R.id.recents)).setOnClickListener(new View.OnClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 505c5ccafc..0b4a1a8f2b 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -120,7 +120,7 @@ public class MapContextMenuFragment extends Fragment { menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight(); menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight; - menuFullHeightMax = menuTitleHeight + menuBottomViewHeight + dpToPx(2f); + menuFullHeightMax = menuTitleHeight + (menuBottomViewHeight > 0 ? menuBottomViewHeight + dpToPx(2f) : -dpToPx(SHADOW_HEIGHT_BOTTOM_DP)); ViewTreeObserver obs = view.getViewTreeObserver(); @@ -223,7 +223,7 @@ public class MapContextMenuFragment extends Fragment { velocity.recycle(); if (menuController != null) { - if (slidingUp) { + if (menuBottomViewHeight > 0 && slidingUp) { menuController.slideUp(); } else if (slidingDown) { menuController.slideDown(); From d84ddb54da235d74bf9ef196777b2677f92f8139 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sat, 12 Sep 2015 00:06:53 +0200 Subject: [PATCH 086/113] Translated using Weblate (Slovak) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-sk/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 25854d35ea..930c17d61b 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -2276,10 +2276,13 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Popis Pridať otváracie hodiny Typ bodu záujmu - Počet riadkov v pomlčke %1$s + Počet riadkov v bloku %1$s Prosím zadajte typ bodu záujmu. odstrániť Pracovné dni História miest Obľúbené +Úspešne uložené na: %1$s + Bod POI bude vymazaný keď zmeny odošlete + Zobraziť GPX From f55883570145a311a7c3a084373fe819a95dc596 Mon Sep 17 00:00:00 2001 From: Franco Date: Sat, 12 Sep 2015 03:09:14 +0200 Subject: [PATCH 087/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1141 of 1141 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 9329928911..b1f3c52f54 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -507,7 +507,7 @@ Pabellón de caza Lugar de culto - Cristiandad + Cristianismo Judaísmo Islámismo Sijismo @@ -1212,4 +1212,6 @@ Granada Nectarina + Altura + Elevación sobre el nivel del mar From 791fb57acdf65aab5a056c4d2829c267773efa66 Mon Sep 17 00:00:00 2001 From: Evgenii Martynenko Date: Fri, 11 Sep 2015 22:29:56 +0200 Subject: [PATCH 088/113] Translated using Weblate (Russian) Currently translated at 99.5% (1763 of 1771 strings) --- OsmAnd/res/values-ru/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 1435e280d6..ed133aa2bb 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -2093,4 +2093,7 @@ Успешно сохранён в: %1$s POI будут удалены после того как вы загрузите ваши изменения Показать GPX - +удалить + инфраструктура + Недавние места + From 587cb1310718941eb2f0fc8bdc70cddce55c2e19 Mon Sep 17 00:00:00 2001 From: Adriano Rosa Date: Sat, 12 Sep 2015 02:41:12 +0200 Subject: [PATCH 089/113] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (1139 of 1141 strings) --- OsmAnd/res/values-pt-rBR/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml index c777ccff4e..f92311a5a4 100644 --- a/OsmAnd/res/values-pt-rBR/phrases.xml +++ b/OsmAnd/res/values-pt-rBR/phrases.xml @@ -1212,4 +1212,6 @@ Erveira Coca Prado com pomar + Altura + Altura acima do nível do mar From 7ebd897b50eff07f1487bb5c4c80e7a209e8e4b0 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sat, 12 Sep 2015 03:33:07 +0200 Subject: [PATCH 090/113] Translated using Weblate (Danish) Currently translated at 100.0% (1141 of 1141 strings) --- OsmAnd/res/values-da/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 8cf48a2ea1..42846d1d0c 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1231,4 +1231,6 @@ Naturisme: sædvanlig Naturisme: liberalt + Højde + Højde over havoverfladen From e8b3ceb296ecaf63bdf095ef72d5e9f7bd86f4f5 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 12 Sep 2015 03:51:58 +0200 Subject: [PATCH 091/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index e6f1703586..7fa3e2ccaa 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2106,4 +2106,6 @@ 最近的地點 我的最愛 已順利的儲存於：%1$s +一旦您上傳您的變更，興趣點會被刪除 + 顯示 GPX From 40c88683b85ed5a0c602143ad0c3f80574b81f61 Mon Sep 17 00:00:00 2001 From: Matej U Date: Sat, 12 Sep 2015 09:32:21 +0200 Subject: [PATCH 092/113] Translated using Weblate (Slovenian) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-sl/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 438994a08d..ee60dc4117 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1978,4 +1978,7 @@ Določiti je treba vrsto točke POI. Delovni dnevi Nedavna mesta - + Uspešno shranjeno ob: %1$s + Točka POI bo izbrisana po pošiljanju sprememb + Pokaži GPX + From 3926e2cc0f8185c6abca3b04f5e50345157c3857 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Sat, 12 Sep 2015 15:54:01 +0200 Subject: [PATCH 093/113] Translated using Weblate (Sardinian) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-sc/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 45c8e9ffc7..bf75efe2d8 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -2082,4 +2082,7 @@ Dies de traballu Logos reghentes Prefèrridos - +Su PDI at a èssere burradu a pustis de su carrigamentu de sas modìficas tuas + Ammustra GPX +Sarbada resèssida in: %1$s + From f91451ab9c8299fc9c795459102aeadbbc5cf500 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Sat, 12 Sep 2015 17:36:31 +0200 Subject: [PATCH 094/113] Translated using Weblate (Italian) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-it/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 4e3b0857aa..914f89d41f 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2170,4 +2170,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Giorni lavorativi Luoghi recenti Preferiti +Salvato con successo in: %1$s + I PDI verranno cancellati una volta caricate le modiche + Visualizza GPX From 647bceda98e27634b3aa1964ef799454af3484c4 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sat, 12 Sep 2015 20:14:07 +0200 Subject: [PATCH 095/113] Translated using Weblate (Belarusian) Currently translated at 100.0% (1773 of 1773 strings) --- OsmAnd/res/values-be/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index cc74d22659..9b5187adf0 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2090,4 +2090,5 @@ Упадабанае Пасьпяхова захаваны ў: %1$s Паказаць GPX - +POI будуць выдаленыя, як толькі вы загрузіце вашы зьмены + From f76a9c8e1657932e18971384bb9862d6c40aee47 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Sat, 12 Sep 2015 23:52:19 +0300 Subject: [PATCH 096/113] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 12 ++++++++++++ OsmAnd/res/values/phrases.xml | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index b8717c440d..a0fbb6a1ae 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -173,6 +173,7 @@ Движущийся канат Грузовой подъёмник Ленточный подъёмник + Опора канатной дороги Туннель Мост @@ -196,6 +197,8 @@ Трансформатор Электростанция Генератор + Опора линии электропередач + Столб линии электропередач Почта Почтовый ящик @@ -946,6 +949,15 @@ Высота Высота над уровнем моря + Сиденья + Со спинкой + Без спинки + + Городского типа + Сельского типа + + Пересыхающий(ая) Здание + Тупик diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 1c332b6ba6..d906d7a841 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -274,6 +274,7 @@ Rope tow lift Goods lift Carpet lift + Aerial lift pylon Tunnel Bridge @@ -304,6 +305,8 @@ Cable distribution cabinet Power plant Power generator + Power tower + Power pole Post office Post box @@ -1189,6 +1192,9 @@ Coffee Pomegranate + Urban + Rural + Enforcement:traffic signals Enforcement:maxspeed Enforcement:maxheight @@ -1202,6 +1208,13 @@ Shelter for dogs and cats Shelter for birds + Seats + Backrest: yes + Backrest: no + + Intermittent + Building + Deadlock From 9591b5c7391e3f5f9d37850b95b6ba7705a9d369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Sok=C3=B3=C5=82?= Date: Sat, 12 Sep 2015 09:08:38 +0200 Subject: [PATCH 097/113] Translated using Weblate (Polish) Currently translated at 98.9% (1752 of 1771 strings) --- OsmAnd/res/values-pl/strings.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index d16b5978b3..e4a870817f 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -9,7 +9,7 @@ Zasoby mapy Ustawienia mapy wektorowej Automatyczne środkowanie mapy - Określ opóźnienie podążania mapy za aktualną lokalizacją + Ustala opóźnienie podążania mapy za aktualną lokalizacją Nigdy (dotknij \'Idź\', aby rozpocząć ręcznie) Auto-podążanie za pozycją Włącz podążanie za pozycją tylko w trybie nawigacji. @@ -278,7 +278,7 @@ Wybierz, którą kompilację OsmAnd zainstalować Specialne opcje dla wersji \"contribution\" Nie zainstalowano aplikacji GPS status. Wyszukać ją w Market? - Nawigacja głosowa jest niedostępna. Proszę przejść do „Ustawienia”→„Ogólne”→„Nawigacja głosowa”, wybrać zestaw poleceń głosowych i zainstalować go. + Nawigacja głosowa jest niedostępna. Proszę przejść do „Ustawienia”→„Ogólne”→„Głos komunikatów”, wybrać zestaw komunikatów głosowych i zainstalować go. Nie wybrano nawigacji głosowej Dzień Noc @@ -395,7 +395,7 @@ Wyłącz dźwięk Włącz dźwięk Wybiera głos komunikatów nawigatora - Nawigacja głosowa + Głos komunikatów Inicjowanie danych głosowych… Niewspierana wersja danych głosowych Wybrane dane z głosem są uszkodzone @@ -2086,7 +2086,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant "Umożliwia tworzenie map nawigacyjnych dla łodzi, żaglówek oraz innych sportów wodnych.\n\nSpecjalny dodatek do Osm And wstawia znaki nawigacyjne i oznaczenia map morskich dla nawigacji śródlądowej oraz przybrzeżnej. Opis każdego znaku dostarcza szczegółów potrzebnych do ich identyfikacji oraz ich przeznaczenia (kategoria, kształt, kolor, kolejność, odniesienie itd.).\n\nW razie potrzeby należy wyłączyć tę wtyczkę lub zmienić styl w opcjach \"Styl mapy\" w menu \"Konfiguracja mapy\", aby powrócić do jednego z typowych stylów map OsmAnd. " "Dodaje do OsmAnd szczegóły dotyczące stoków narciarskich, tras biegowych, tras skitour, kolejek linowych i wyciągów narciarskich na świecie. Trasy i szlaki są pokolorowane według trudności i przedstawione w specjalnym zimowym stylu mapy, imitującym krajobraz pokryty śniegiem.\n\nWłączenie tego widoku zmienia styl mapy na „Zima i narty”, ukazujący teren pokryty śniegiem. Widok można wyłączyć przez wyłączenie wtyczki lub zmianę stylu w menu „Styl mapy” w „Konfiguracji mapy”. " Wiadomość - Nie używaj + Brak Adres Wyświetl opis Miejsca @@ -2215,4 +2215,6 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Ilość wierszy na ekranie głównym %1$s Opis Rodzaj POI + usuń + Numer wersji From 90b2c528a67945d20d2ff1803bae9f087023caf6 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sat, 12 Sep 2015 20:35:08 +0200 Subject: [PATCH 098/113] Translated using Weblate (Belarusian) Currently translated at 91.3% (1042 of 1141 strings) --- OsmAnd/res/values-be/phrases.xml | 66 ++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index 8dde3f83cc..a8cd464160 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -396,14 +396,14 @@ Шале Месца пакланеньня - Храм, царква (капліца) - Сынагога - Мячэт - Месца пакланеньня: сыкхізм - Месца пакланеньня: будызм - Месца пакланеньня: індуізм - Месца пакланеньня: сінтаізм - Месца пакланеньня: даасізм + Хрысьціянства + Юдаізм + Іслам + Сыкхізм + Будызм + Індуізм + Сінтаізм + Даасізм Кляштар Гістарычны кляштар Прыдарожны крыж @@ -1068,4 +1068,54 @@ Ядравыя адыходы Насельніцтва + Гранат + + Кава + Каўчук + Манга + Нэктарын + Вуду + Паганства + Зараастрызм + + Каталіцызм + Баптызм + Рымскі каталіцызм + Праваслаўе + Лютэранства + Сунізм + Пратэстантызм + Мэтадызм + Англіканства + Расейкае праваслаўе + Грэцкае праваслаўе + Кальвінізм + Адвентысты сёмага дня + Новаапостальская царква + Царква Ангельшчыны + Епіскапальная царква + Аб\'яднаная царква + Грэка-каталіцызм + Тыбецкі будызм + Царква Шатляндыі + Армія выратаваньня + Царква Хрыста + Квакерства + Баўгарскае праваслаўе + Без дэнамінацыі + Стараверства + Сербскае праваслаўе + Сьпірытызм + Армянская апостальская царква + Вышыня + Вышыня над узроўнем мора + Дата пачатку будаўніцтва + Даступна для інвалідных крэслаў + Падземная + Шматпавярховая + + Ківі + Кока + Гарбата + Персік From 337f59a7fd0c3904bcfa65435fdfa1527bdd9261 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 12 Sep 2015 04:06:25 +0200 Subject: [PATCH 099/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 97.7% (1115 of 1141 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index 74a122ee12..d1f554e2e7 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -1185,4 +1185,6 @@ 橄欖樹 蘋果樹 棕櫚油 + 高度 + 海拔高度 From cd34c5efbf85bd6c2dd813e56bd28f7243eedfbf Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sat, 12 Sep 2015 18:32:40 +0200 Subject: [PATCH 100/113] Translated using Weblate (Danish) Currently translated at 100.0% (1141 of 1141 strings) --- OsmAnd/res/values-da/phrases.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 42846d1d0c..97516348f5 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1206,21 +1206,21 @@ Mandel Banan Hassel - Kokosnød + Kokospalme Ibenholt Kirsebær Valnød Blommetræ Fersken Te - Coca + Cocabuske Kiwi - Frugtplantage + Eng med frugtplantage Nektarin Mango Gummitræ Daddelpalmeq - Kaffe + Kaffetræ Granatæble Párkeringskælder @@ -1228,7 +1228,7 @@ Naturisme: tilladt Naturisme: forbudt Naturisme: obligatorisk - Naturisme: sædvanlig + Naturisme: sædvane Naturisme: liberalt Højde From b733b7350f229318643d5504a85fb71686dfe253 Mon Sep 17 00:00:00 2001 From: Evgenii Martynenko Date: Sat, 12 Sep 2015 14:30:34 +0200 Subject: [PATCH 101/113] Translated using Weblate (Russian) Currently translated at 77.3% (882 of 1141 strings) --- OsmAnd/res/values-ru/phrases.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index b8717c440d..c4b3466aac 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -948,4 +948,5 @@ Высота над уровнем моря Здание - + Туристические маршруты + From f6a1f5649fa0b9485c335b1eb541831db28a6f02 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sat, 12 Sep 2015 17:23:10 +0200 Subject: [PATCH 102/113] Translated using Weblate (Slovak) Currently translated at 95.6% (1091 of 1141 strings) --- OsmAnd/res/values-sk/phrases.xml | 114 +++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml index 38eb98dfa3..5773445199 100644 --- a/OsmAnd/res/values-sk/phrases.xml +++ b/OsmAnd/res/values-sk/phrases.xml @@ -354,14 +354,14 @@ Apartmány Náboženské miesto - Náboženské miesto: kresťanské - Náboženské miesto: židovské - Náboženské miesto: moslimské - Náboženské miesto: sikhovia - Náboženské miesto: budhistické - Náboženské miesto: hinduistické - Náboženské miesto: šintoistické - Náboženské miesto: taoistické + Kresťanstvo + Judaizmus + Islam + Sikhizmus + Budhizmus + Hinduizmus + Šintoizmus + Taoizmus Internetové pripojenie: Wifi Internetové pripojenie: terminál @@ -1044,8 +1044,8 @@ Voodoo Multináboženské - Scientologický - Pohanské + Scientológia + Pohanstvo Katolícke Baptistické Rímskokatolícke @@ -1060,11 +1060,11 @@ Ruské ortodoxné Mormónske Svedkovia Jehovovi - Grécke ortodoxné + Pravoslávna cirkev Reformované Adventisti siedmeho dňa - Novoapoštolské - Anglická cirkev + Novoapoštolská cirkev + Anglikánska cirkev Episkopálne Grékokatolícke Tibetské @@ -1082,4 +1082,92 @@ VKontakte Google+ Vojenský úrad + Jadrový odpad + Zanedbaná plocha + Stavebné pozemky \"na zelenej lúke\" + Silážna jama + Armáda spásy + Bulharská ortodoxná cirkev + Nazaréni + Srbská ortodoxná cirkev + Svätí posledných dní + Gruzínska ortodoxná cirkev + Rumunská ortodoxná cirkev + Etiópska ortodoxná cirkev + Koptská ortodoxná cirkev + Začiatočný dátum + Invalidný vozík + Veľkoobchod + + Siláž (obsah) + Voda (obsah) + Minerálny olej (obsah) + Ropa (obsah) + Palivo (obsah) + Hnoj (obsah) + Víno (obsah) + Kanalizácia (obsah) + Plyn (obsah) + Biomasa (obsah) + Odpadová voda (obsah) + Plodiny (obsah) + Krmivo (obsah) + Pivo (obsah) + Soľ (obsah) + Zrno (obsah) + + Nudizmus: povolený + Nudizmus: zakázaný + Nudizmus: povinný + Nudizmus: obvyklý + Nudizmus: dovolený + + Stavebný materiál + Inštalačný materiál + Drevo + Poľnohospodárske potreby + Kachličky + + Počet obyvateľov + Podzemné + Poschodové + + Stojany + Držiaky na kolesá + Regál + Špecializovaná budova + Prístrešok + Stĺpik + Neoficiálne + + Listnatý + Ihličnatý + Zmiešaný + Bezlistý + + Olivy + Jablká + Palmový olej + Pomaranče + Mandle + Banány + Lieskovce + Kokosové orechy + Persimon (Kaki) + Višne + Vlašské orechy + Slivky + Broskyne + Čaj + Koka + Kiwi + Nektarinky + Mango + Gumovníky + Ďatle + Káva + Granátové jablká + + Nadmorská výška + Výška From 738f011e99c1c665443969691e09159d3ffbe247 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Sun, 13 Sep 2015 02:09:51 +0300 Subject: [PATCH 103/113] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 14 +++++++++++++- OsmAnd/res/values/phrases.xml | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index a0fbb6a1ae..5845ea7b26 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -204,6 +204,8 @@ Почтовый ящик Телефон Вышка связи + Градирня + Осветительная вышка АТС Переработка отходов @@ -960,4 +962,14 @@ Здание Тупик - + + Источник энергии: уголь + Источник энергии: газ + Источник энергии: ядерное топливо + Источник энергии: солнце + Источник энергии: вода + Источник энергии: ветер + Источник энергии: геотермальный + Источник энергии: мазут + Источник энергии: дизельное топливо + diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index d906d7a841..5b06b69b7d 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -314,6 +314,8 @@ Communication tower Observation tower Bell tower + Cooling tower + Lighting tower Telephone exchange Recycling @@ -1217,4 +1219,14 @@ Building Deadlock + Energy source: coal + Energy source: gas + Energy source: nuclear + Energy source: solar + Energy source: hydro + Energy source: wind + Energy source: geothermal + Energy source: oil + Energy source: diesel + From 8840a2ef9430d60408b1f9fb04814957909af034 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 13 Sep 2015 05:18:12 +0200 Subject: [PATCH 104/113] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1141 of 1141 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 29 +++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index d1f554e2e7..f7ac76feec 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -1172,7 +1172,7 @@ 立台 壁掛架 擱物架 - 建築物 + 獨特建築物 車棚 系船柱 非正式的 @@ -1187,4 +1187,31 @@ 棕櫚油 高度 海拔高度 + 天體主義：允許 + 天體主義：禁止 + 天體主義：強制 + 天體主義：慣常 + 天體主義：容許 + + 橙色 + 杏仁 + 香蕉 + 榛樹 + 椰子 + 柿子 + 櫻桃 + 核桃 + 李子 + 桃子 + 茶 + 古柯 + 獼猴桃 + 草甸果樹園 + 油桃 + 芒果 + 橡膠 + 日期 + 咖啡 + 石榴 + From fde8d65208d54247c257107a76be3d2e729b1121 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 13 Sep 2015 10:03:11 +0200 Subject: [PATCH 105/113] Test TURN_DEGREE_MIN = 35 to see if this fixes some missing turn instructions on motorway intersections --- OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index 01147408d2..ed5db4b4b7 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; public class RouteResultPreparation { public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = false; - private static final float TURN_DEGREE_MIN = 45; + private static final float TURN_DEGREE_MIN = 35; private Log log = PlatformUtil.getLog(RouteResultPreparation.class); /** * Helper method to prepare final result From 437907cfca00b5175cf1df47d8b129ce6f3f6e37 Mon Sep 17 00:00:00 2001 From: Hinagiku Zeppeki Date: Sun, 13 Sep 2015 08:41:17 +0200 Subject: [PATCH 106/113] Translated using Weblate (Japanese) Currently translated at 99.8% (1769 of 1771 strings) --- OsmAnd/res/values-ja/strings.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index d67255e004..407b337a44 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -751,7 +751,7 @@ POIの更新は利用できません ナビを停止 選択した目的地、経由地点を削除します、よろしいですか？ 現在Wi-Fiに接続されていません。現在のインターネット接続を使用したままダウンロードを続行しますか？ - 通り + 道路名称 家屋番号 旅程の記録 移動中の経路記録に関する設定 @@ -2134,4 +2134,26 @@ POIの更新は利用できません OsmAnd Offline Maps\n& Navigation POIを申請する +GPXファイルに位置に関するメモを付ける + 位置 + 削除 + 項目は非表示 + 棟の番号 + 次 + ～で開く + ～で閉じる + 名称 + 施設 + 連絡先 + 説明 + 開店時間を追記 + POIの種類 + ダッシュボード内の表示行数 %1$s + POIの種類を指定してください。 + 営業日 + 最近表示した場所 + お気に入り + 正常に保存されました: %1$s + POIをアップロードすると変更前の情報は削除されます + GPXを表示 From 765f41a223a138d3c45ad6020a5193803117e7a0 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 13 Sep 2015 10:58:27 +0200 Subject: [PATCH 107/113] revert and add comment why previous solution was ok --- OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index ed5db4b4b7..69a6ab03e0 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; public class RouteResultPreparation { public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = false; - private static final float TURN_DEGREE_MIN = 35; + private static final float TURN_DEGREE_MIN = 45; private Log log = PlatformUtil.getLog(RouteResultPreparation.class); /** * Helper method to prepare final result @@ -601,6 +601,7 @@ public class RouteResultPreparation { } if (mpi >= TURN_DEGREE_MIN) { if (mpi < 45) { + // Slight turn detection here causes many false positives where drivers would expect a "normal" TL. Best use limit-angle=TURN_DEGREE_MIN, this reduces TSL to the turn-lanes cases. t = TurnType.valueOf(TurnType.TSLL, leftSide); } else if (mpi < 120) { t = TurnType.valueOf(TurnType.TL, leftSide); From f4c34002a4e3479529ea824a36ba2ef8fbbc06b8 Mon Sep 17 00:00:00 2001 From: agilob Date: Sun, 13 Sep 2015 12:09:55 +0200 Subject: [PATCH 108/113] Translated using Weblate (Polish) Currently translated at 100.0% (1771 of 1771 strings) --- OsmAnd/res/values-pl/strings.xml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index e4a870817f..ec098a4191 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -2217,4 +2217,23 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Rodzaj POI usuń Numer wersji - + Plik gpx z notatkami o lokalizacjach + Pogrubione kontury + Aktualizacje na żywo + Wyślij POI + Podstawowe + Zaawansowane + Następny + Otwarte od + Zamknięte od + Nazwa + Udogodnienia + Informacje kontaktowe + Dodaj godziny otwarcia + Dni robocze + Ostatnie miejsca + Ulubione + Zapisano o: %1$s + POI zostanie usunięty gdy tylko wyślesz swoje zmiany + Pokaż GPX + From f1ef75b8cb613b34da6014d5c479fed61f72bed1 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 13 Sep 2015 12:19:03 +0200 Subject: [PATCH 109/113] Translated using Weblate (Danish) Currently translated at 100.0% (1162 of 1162 strings) --- OsmAnd/res/values-da/phrases.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 97516348f5..096c20462c 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1233,4 +1233,32 @@ Højde Højde over havoverfladen + Køletårn + Landdistrikter + + Pladser + Ryglæn: Ja + Ryglæn: nej + + Intermitterende + + Dødvande + + Energikilde: kul + Energikilde: gas + Energikilde: nuklear + Energikilde: solar + Energikilde: hydro + Energikilde: vind + Energikilde: geotermisk + Energikilde: olie + Energikilde: diesel + +Svævebane pylon + + Soltårn + Elmast + + Lysmast + Bymæssig From c6e9669a9ca77932bce3da9f02385b1aec61516e Mon Sep 17 00:00:00 2001 From: Franco Date: Sun, 13 Sep 2015 16:12:15 +0200 Subject: [PATCH 110/113] Translated using Weblate (Argentinean Spanish) Currently translated at 100.0% (1162 of 1162 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 30 +++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index b1f3c52f54..f606f70cb7 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1214,4 +1214,32 @@ Nectarina Altura Elevación sobre el nivel del mar - + Torre de teleférico + + Torre de alta tensión + Poste de energía + + Torre de enfriamiento + Torre de iluminación + Urbano + Rural + + Asientos + Con respaldo + Sin respaldo + + Intermitente + + Punto muerto + + Fuente de energía: carbón + Fuente de energía: gas + Fuente de energía: nuclear + Fuente de energía: solar + Fuente de energía: hidroeléctrica + Fuente de energía: viento + Fuente de energía: geotérmica + Fuente de energía: petróleo + Fuente de energía: diésel + + From af38437fa51e7d3567b0f056e840cba9f08290df Mon Sep 17 00:00:00 2001 From: Marek Tyburec Date: Sun, 13 Sep 2015 12:36:44 +0200 Subject: [PATCH 111/113] Translated using Weblate (Czech) Currently translated at 96.7% (1713 of 1771 strings) --- OsmAnd/res/values-cs/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 2c40f8fa27..ca81d603ce 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -2007,4 +2007,7 @@ s často kladenými otázkami. Ohodnoťte prosím aplikaci OsmAnd na Google Play Řekněte nám proč. Sdělte nám prosím, co byste chtěli v této aplikaci změnit. + Přeskočit + OsmAnd + Moduly From 1eb7fc52a7402aad506bacde4439b7f143ee046b Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 13 Sep 2015 15:42:41 +0200 Subject: [PATCH 112/113] Translated using Weblate (Danish) Currently translated at 100.0% (1162 of 1162 strings) --- OsmAnd/res/values-da/phrases.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 096c20462c..7a7a29350e 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1185,7 +1185,7 @@ Befolkning - Fleretagesparkering + P-hus Cykelsstativ Væg sløjfer @@ -1234,15 +1234,15 @@ Højde Højde over havoverfladen Køletårn - Landdistrikter + Landlig - Pladser + Sæder Ryglæn: Ja Ryglæn: nej Intermitterende - Dødvande + Blindgyde Energikilde: kul Energikilde: gas From 97afbf635ec2cc36d24b7edfdb3a2d641dc87970 Mon Sep 17 00:00:00 2001 From: Franco Date: Sun, 13 Sep 2015 16:05:50 +0200 Subject: [PATCH 113/113] Translated using Weblate (Spanish) Currently translated at 99.9% (1161 of 1162 strings) --- OsmAnd/res/values-es/phrases.xml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml index 0fd78cb7d2..47fe9cce5e 100644 --- a/OsmAnd/res/values-es/phrases.xml +++ b/OsmAnd/res/values-es/phrases.xml @@ -1214,4 +1214,34 @@ Informal Caucho - + Torre de teleférico + + Torre de alta tensión + Poste de energía + + Torre de enfriamiento + Torre de iluminación + Altura + Altura sobre el nivel del mar + Urbano + Rural + + Asientos + Con respaldo + Sin respaldo + + Intermitente + + Punto muerto + + Fuente de energía: carbón + Fuente de energía: gas + Fuente de energía: nuclear + Fuente de energía: solar + Fuente de energía: hidroeléctrica + Fuente de energía: viento + Fuente de energía: geotérmica + Fuente de energía: petróleo + Fuente de energía: diésel + +