From f80f6338dd20f6914835daa77da006d265d01f13 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 24 Sep 2015 10:10:47 +0200 Subject: [PATCH 01/56] Fix multitouch layer --- .../osmand/plus/render/OsmandRenderer.java | 9 ++++----- .../net/osmand/plus/render/TextRenderer.java | 9 ++++----- .../osmand/plus/views/MultiTouchSupport.java | 3 +-- .../src/net/osmand/plus/views/RouteLayer.java | 5 ++--- .../net/osmand/plus/views/TurnPathHelper.java | 19 +++++++++---------- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java b/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java index 101ccba0f9..c00b6fd1ee 100644 --- a/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java +++ b/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java @@ -51,7 +51,6 @@ import android.graphics.Shader.TileMode; import android.os.Handler; import android.os.Looper; import android.util.DisplayMetrics; -import android.util.FloatMath; import android.view.WindowManager; public class OsmandRenderer { @@ -184,8 +183,8 @@ public class OsmandRenderer { Bitmap bmp, RenderingRuleSearchRequest render, final MapTileDownloader mapTileDownloader) { long now = System.currentTimeMillis(); if (rc.width > 0 && rc.height > 0 && searchResultHandler != null) { - rc.cosRotateTileSize = FloatMath.cos((float) Math.toRadians(rc.rotate)) * TILE_SIZE; - rc.sinRotateTileSize = FloatMath.sin((float) Math.toRadians(rc.rotate)) * TILE_SIZE; + rc.cosRotateTileSize = (float) (Math.cos(Math.toRadians(rc.rotate)) * TILE_SIZE); + rc.sinRotateTileSize = (float) (Math.sin(Math.toRadians(rc.rotate)) * TILE_SIZE); try { if(Looper.getMainLooper() != null && library.useDirectRendering()) { final Handler h = new Handler(Looper.getMainLooper()); @@ -249,8 +248,8 @@ public class OsmandRenderer { cv.drawColor(rc.defaultColor); } if (objects != null && !objects.isEmpty() && rc.width > 0 && rc.height > 0) { - rc.cosRotateTileSize = FloatMath.cos((float) Math.toRadians(rc.rotate)) * TILE_SIZE; - rc.sinRotateTileSize = FloatMath.sin((float) Math.toRadians(rc.rotate)) * TILE_SIZE; + rc.cosRotateTileSize = (float) (Math.cos((float) Math.toRadians(rc.rotate)) * TILE_SIZE); + rc.sinRotateTileSize = (float) (Math.sin((float) Math.toRadians(rc.rotate)) * TILE_SIZE); // put in order map List pointsArray = new ArrayList(); diff --git a/OsmAnd/src/net/osmand/plus/render/TextRenderer.java b/OsmAnd/src/net/osmand/plus/render/TextRenderer.java index 41193830dd..bb87e17e46 100644 --- a/OsmAnd/src/net/osmand/plus/render/TextRenderer.java +++ b/OsmAnd/src/net/osmand/plus/render/TextRenderer.java @@ -29,7 +29,6 @@ import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; -import android.util.FloatMath; public class TextRenderer { @@ -145,13 +144,13 @@ public class TextRenderer { } // determine difference close to 180/0 degrees - if (Math.abs(FloatMath.sin(tRot - sRot)) < 0.3) { + if (Math.abs(Math.sin(tRot - sRot)) < 0.3) { // rotate t box // (calculate offset for t center suppose we rotate around s center) float diff = (float) (-Math.atan2(tRect.centerX() - sRect.centerX(), tRect.centerY() - sRect.centerY()) + Math.PI / 2); diff -= sRot; - double left = sRect.centerX() + dist * FloatMath.cos(diff) - tRect.width() / 2; - double top = sRect.centerY() - dist * FloatMath.sin(diff) - tRect.height() / 2; + double left = sRect.centerX() + dist * Math.cos(diff) - tRect.width() / 2; + double top = sRect.centerY() - dist * Math.sin(diff) - tRect.height() / 2; QuadRect nRect = new QuadRect(left, top, left + tRect.width(), top + tRect.height()); return QuadRect.intersects(nRect, sRect); } @@ -458,7 +457,7 @@ public class TextRenderer { boolean inside = points[i].x >= 0 && points[i].x <= rc.width && points[i].x >= 0 && points[i].y <= rc.height; if (i > 0) { - float d = FloatMath.sqrt(fsqr(points[i].x - points[i - 1].x) + + float d = (float) Math.sqrt(fsqr(points[i].x - points[i - 1].x) + fsqr(points[i].y - points[i - 1].y)); distances[i-1]= d; roadLength += d; diff --git a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java index 452c124d89..0858795e53 100644 --- a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java +++ b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java @@ -9,7 +9,6 @@ import org.apache.commons.logging.Log; import android.content.Context; import android.graphics.PointF; -import android.util.FloatMath; import android.view.MotionEvent; @@ -96,7 +95,7 @@ public class MultiTouchSupport { Float x2 = (Float) getX.invoke(event, 1); Float y1 = (Float) getY.invoke(event, 0); Float y2 = (Float) getY.invoke(event, 1); - float distance = FloatMath.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); + float distance = (float) Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); float angle = 0; boolean angleDefined = false; if(x1 != x2 || y1 != y2) { diff --git a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java index c81439789f..35e8ec5682 100644 --- a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java @@ -31,7 +31,6 @@ import android.graphics.Path; import android.graphics.PointF; import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuffColorFilter; -import android.util.FloatMath; public class RouteLayer extends OsmandMapLayer { @@ -204,7 +203,7 @@ public class RouteLayer extends OsmandMapLayer { canvas.drawPath(pth, actionPaint); double angleRad = Math.atan2(y - py, x - px); double angle = (angleRad * 180 / Math.PI) + 90f; - double distSegment = FloatMath.sqrt((y - py) * (y - py) + (x - px) * (x - px)); + double distSegment = Math.sqrt((y - py) * (y - py) + (x - px) * (x - px)); if (distSegment == 0) { continue; } @@ -285,7 +284,7 @@ public class RouteLayer extends OsmandMapLayer { int y = lst.get(i + 3); float angleRad = (float) Math.atan2(y - py, x - px); float angle = (float) (angleRad * 180 / Math.PI) + 90f; - float distSegment = FloatMath.sqrt((y - py) * (y - py) + (x - px) * (x - px)); + float distSegment = (float) Math.sqrt((y - py) * (y - py) + (x - px) * (x - px)); if(distSegment == 0) { continue; } diff --git a/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java b/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java index 06ca94f1d5..fbdde88cba 100644 --- a/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java +++ b/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java @@ -12,7 +12,6 @@ import android.graphics.Path; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.util.FloatMath; public class TurnPathHelper { @@ -216,22 +215,22 @@ public class TurnPathHelper { float tsRad = (float) ((to - step / 8 + 180) * Math.PI / 180f); float tsRad2 = (float) ((to + step / 8 + 180) * Math.PI / 180f); pathForTurn.arcTo(r, prev, to - step / 6 - prev + init ); - pathForTurn.lineTo(cx + (r1 + 10) * FloatMath.sin(tsRad), cy - (r1 + 10) * FloatMath.cos(tsRad)); - pathForTurn.lineTo(cx + (r1 + 10) * FloatMath.sin(tsRad2), cy - (r1 + 10) * FloatMath.cos(tsRad2)); + pathForTurn.lineTo(cx + (r1 + 10) * (float) Math.sin(tsRad), cy - (r1 + 10) * (float) Math.cos(tsRad)); + pathForTurn.lineTo(cx + (r1 + 10) * (float) Math.sin(tsRad2), cy - (r1 + 10) * (float) Math.cos(tsRad2)); // not necessary for next arcTo - //pathForTurn.lineTo(cx + (r1 + 0) * FloatMath.sin(tsRad2), cy - (r1 + 0) * FloatMath.cos(tsRad2)); + //pathForTurn.lineTo(cx + (r1 + 0) * (float) Math.sin(tsRad2), cy - (r1 + 0) * (float) Math.cos(tsRad2)); prev = to + step / 6 + init; } } float angleRad = (float) ((180 + sweepAngle) * Math.PI / 180f); - pathForTurn.lineTo(cx + (r1 + 4) * FloatMath.sin(angleRad), cy - (r1 + 4) * FloatMath.cos(angleRad)); - pathForTurn.lineTo(cx + (r1 + 6) * FloatMath.sin(angleRad + angleToRot/2), cy - (r1 + 6) * FloatMath.cos(angleRad + angleToRot/2)); - pathForTurn.lineTo(cx + (r1 + 14) * FloatMath.sin(angleRad - angleToRot/2), cy - (r1 + 12) * FloatMath.cos(angleRad - angleToRot/2)); - pathForTurn.lineTo(cx + (r1 + 6) * FloatMath.sin(angleRad - 3*angleToRot/2), cy - (r1 + 6) * FloatMath.cos(angleRad - 3*angleToRot/2)); - pathForTurn.lineTo(cx + (r1 + 4) * FloatMath.sin(angleRad - angleToRot), cy - (r1 + 4) * FloatMath.cos(angleRad - angleToRot)); - pathForTurn.lineTo(cx + r2 * FloatMath.sin(angleRad - angleToRot), cy - r2 * FloatMath.cos(angleRad - angleToRot)); + pathForTurn.lineTo(cx + (r1 + 4) * (float) Math.sin(angleRad), cy - (r1 + 4) * (float) Math.cos(angleRad)); + pathForTurn.lineTo(cx + (r1 + 6) * (float) Math.sin(angleRad + angleToRot/2), cy - (r1 + 6) * (float) Math.cos(angleRad + angleToRot/2)); + pathForTurn.lineTo(cx + (r1 + 14) * (float) Math.sin(angleRad - angleToRot/2), cy - (r1 + 12) * (float) Math.cos(angleRad - angleToRot/2)); + pathForTurn.lineTo(cx + (r1 + 6) * (float) Math.sin(angleRad - 3*angleToRot/2), cy - (r1 + 6) * (float) Math.cos(angleRad - 3*angleToRot/2)); + pathForTurn.lineTo(cx + (r1 + 4) * (float) Math.sin(angleRad - angleToRot), cy - (r1 + 4) * (float) Math.cos(angleRad - angleToRot)); + pathForTurn.lineTo(cx + r2 * (float) Math.sin(angleRad - angleToRot), cy - r2 * (float) Math.cos(angleRad - angleToRot)); r.set(cx - r2, cy - r2, cx + r2, cy + r2); pathForTurn.arcTo(r, 360 + sweepAngle + 90, -sweepAngle); From ff5f6fa28efb4e63af453df4989d6412c7356417 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 25 Sep 2015 20:20:35 +0200 Subject: [PATCH 02/56] test 2*hdop --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index 86098d21ff..f2dcc49760 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -273,7 +273,7 @@ public class GPXUtilities { } // Trend channel approach for elevation gain/loss, Hardy 2015-09-22 - // Self-adjusting turnarund threshold added for testing 2015-09-25: Current rule is now: "All up/down trends of amplitude channelTop) { channelTop = point.ele; if (!Double.isNaN(point.hdop)) { - channelThres = Math.max(channelThres, point.hdop); + channelThres = Math.max(channelThres, 2.0*point.hdop); //Try empirical 2*hdop, may better serve very flat tracks, or high dop tracks } } else if (point.ele < channelBottom) { channelBottom = point.ele; if (!Double.isNaN(point.hdop)) { - channelThres = Math.max(channelThres, point.hdop); + channelThres = Math.max(channelThres, 2.0*point.hdop); } } // Turnaround (breakout) detection From 9b9e486253da46641f2228e489d88eae57ecf579 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Fri, 25 Sep 2015 20:52:02 +0200 Subject: [PATCH 03/56] Translated using Weblate (Belarusian) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-be/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index a2b8400d2b..a0e5038b3c 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2099,4 +2099,6 @@ Спыніць эмуляцыю свайго становішча Эмуляваць, выкарыстоўваючы запісаны GPX або разьлічаны маршрут %1$s сьцягваньняў засталося +Вікіпэдыя + Дарогі From bc3a551e621ea452159ac6af2b58594c218eda29 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Fri, 25 Sep 2015 20:53:23 +0200 Subject: [PATCH 04/56] Translated using Weblate (French) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-fr/strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 844f5b896d..ddbf4a0ebd 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2155,4 +2155,10 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Éviter les trains-navettes Fichier GPS avec notes aménité - + Arrêter de simuler votre position + Simuler la position à partir d\'un fichier GPX ou d\'une route + Etes-vous certain ? + Les modifications non enregistrées seront perdues. Souhaitez-vous poursuivre ? + %1$s téléchargement(s) restant(s) + Routes + From 9440edd1583ff83068b4bcd33fa52b2302b62d15 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Fri, 25 Sep 2015 21:00:04 +0200 Subject: [PATCH 05/56] Translated using Weblate (Danish) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-da/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index d31d69d574..4c059c0de3 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2137,4 +2137,5 @@ Stop simulering af position Simuler ved brug af optaget GPX eller beregnet rute %1$s filhentninger tilbage +Veje From 4d3200b6f31db945b21a7f01fe07a203850b87d9 Mon Sep 17 00:00:00 2001 From: Matej U Date: Fri, 25 Sep 2015 22:26:28 +0200 Subject: [PATCH 06/56] Translated using Weblate (Slovenian) Currently translated at 100.0% (1780 of 1780 strings) --- OsmAnd/res/values-sl/strings.xml | 45 +++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 8b7d5c2bc4..af8234c47d 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -79,7 +79,7 @@ elektronski naslov "Spremembe v 0.8.4: \n\t* Odpravljene so nekatere napake delovanja\n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja -\n\t* Med navigacijo je omogočeno izvajanje storitev v pripravljenosti " +\n\t* Med navigacijo omogoči delovanje storitev v ozadju " "Spremembe v 0.8.3: \n\t* Vmesne točke \n\t* Izboljšano vodenje po poti\n\t* Možnost izogibanja avtocestam pri pripravi poti\n\t* Dodana nova vrsta kolesarske poti na zemljevid (Cycleway) @@ -347,8 +347,8 @@ Smer gledanja Prosojni bočni pult Prosojna tema - Omogoči\n način spanja - Ustavi\n način spanja + Omogoči\n ozadnji način delovanja + Zaustavi\n ozadnji način delovanja Interval prebujanja GPS: na %s neprekinjeno delovanje Za odklepanje zaslona pritisnite ikono ključavnice @@ -408,7 +408,7 @@ \n\t* Izboljšano usmerjanje: hitrejše in natančnejše; do 250 km \n\t* Možnost prikaza le cest \n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja -\n\t* Med navigacijo je omogočeno izvajanje storitev v pripravljenosti " +\n\t* Med navigacijo omogoči delovanje storitev v ozadju " Zapri paket sprememb Program ZXing Barcode Scanner ni nameščen. Ali želite program poiskati? Izberite barvno shemo cest: @@ -444,7 +444,7 @@ Vstavek omogoča prikaz nastavitev za razvoj in razhroščevanje programa. Med možnostmi so simuliranje vodenja poti, hitrost izrisovanja zemljevida na zaslonu, glasovni opomniki in podobno. Nastavitve so namenjene razvijalcem programske opreme. Vstavek omogoča nastavljanje in uporabo možnosti dostopnosti pri uporabi programa OsmAnd. Podpira prilagajanje hitrosti govora med vodenjem, nastavljanje prikaza zaslona in prikaz sledilnika za nadzor pogleda zemljevida. Omogoča tudi glasovno objavljanje mesta. - Prikaži nastavitve za sledenje in navigacijo v načinu pripravljenosti (izklopljen zaslon) in občasno uporabo GPS. + Prikaži nastavitve za sledenje in navigacijo v ozadnjem načinu (izklopljen zaslon) in občasno uporabo GPS. Zapri Delovni čas Za objavljanje trenutnega mesta uporabi: @@ -684,8 +684,8 @@ Privzeti profil Splošne nastavitve Upravljalnik datotek zemljevidov - Način pripravljenosti - Uporabi za izvajanje OsmAnd, ko je zaslon izklopljen + Način delovanja v ozadju + Osmand se zažene v ozadju, ko je zaslon izklopljen Dnevni/Nočni način Glede na sončni vzhod in zahod @@ -886,7 +886,7 @@ Izberite ponudnika določevanja mesta med izvajanjem v ozadju Ponudnik mesta Izvaja OsmAnd v ozadju in omogoča spremljanje položaja, ko je zaslon izklopljen - Izvajaj v ozadju + Zaženi OsmAnd v ozadju Storitev navigacije v ozadju zahteva, da je zagnan vsaj en program, ki zahteva te podatke. Filter @@ -1215,9 +1215,9 @@ Ali naj se med fotografiranjem predvaja zvok - Najavi omejitve hitrosti - Najavi hitrostne kamere - Najavi prometna opozorila + Omejitve hitrosti + Hitrostne kamere + Pometna opozorila "Spremembe v 1.5: \n\t* Glasovna opozorila o omejitvah hitrosti in kamere\n\t* Več možnosti glasovnih pozivov (najavljanje imen ulic)\n\t* Ikone za mape visoke gostote\n\t* Veliko sprememb v uporabniškem vmesniku\n\t* Popravek hroščev pri prikazu razdalj, analizatorju GPX, upravljanju točk, orodju za načrtovanje, nalaganje na OSM, pri uporabi protokola HTTPS in drugo " V nastavitvah je treba določiti uporabniško ime in geslo za OSM @@ -1233,10 +1233,10 @@ Geslo OSM (neobvezno) - Najavljanje vmesnih točk GPX + Vmesne točke GPX Najavi … Nastavitve za najavljanje imen ulic, prometnih opozoril (ležeče ovire in podobno), opozoril merilnikov hitrosti, omejitve hitrosti in drugo - Najavi imena ulic (TTS) + Imena ulic (TTS) Podatki razhroščevanja FPS Izbira določil vožnje: ZDA, Evropa, Velika Britanija, Azija in druga Režim vožnje @@ -1541,9 +1541,9 @@ Prejetih datotek ni mogoče najti. Preverite internetno povezavo. Obdrži Prekini - Način delovanja sprejemnika GPS + Omogoči način delovanja GPS v ozadju Interval prebujanja GPS - Nastavitve delovanja sprejemnika GPS + Ali želite prekiniti ozadnji način GPS? Prednostno uporabljeni jezik oznak na zemljevidu (če jezik ni na voljo, so uporabljene angleške ali krajevne oznake) Jezik oznak na zemljevidu Krajevna imena @@ -1610,7 +1610,7 @@ Pešačenje Prometna opozorila - Najavi bližnje priljubljene točke + Bližnje priljubljene točke ur Trajanje Razdalja @@ -1624,7 +1624,7 @@ Dnevnik potovanj Izleti Vmesne točke - Najavi bližnje točke POI + Bližnje točke POI Poišči na zemljevidu Izriši poti po lestvici SAC Ustavi navigacijo @@ -1718,7 +1718,7 @@ Uporabi varno povezavo s strežnikom Ni najdenih možnosti obvoza Glasovna navodila - Najavi prehode za pešce + Prehodi za pešce Območje Koordinata v smeri proti severu Koordinata v smeri proti vzhodu @@ -1981,4 +1981,13 @@ Uspešno shranjeno ob: %1$s Točka POI bo izbrisana po pošiljanju sprememb Pokaži GPX +Zaustavi simuliranje položaja + Simuliraj s shranjeno potjo GPX oziroma izračunano potjo + Naslov še ni znan + Pokaži ob zagonu + Seštevek vrstic + Ali ste prepričani? + Vse neshranjene spremembe bodo izgubljene. Ali želite nadaljevati? + %1$s prejemov v vrsti + Poti From 4ded6be3d83c7d7575b826b86a7b2a7f581c79b7 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Fri, 25 Sep 2015 23:43:27 +0300 Subject: [PATCH 07/56] Context menu - edit favs in progress --- .../drawable/bg_point_editor_view_dark.xml | 12 + .../drawable/bg_point_editor_view_light.xml | 12 + OsmAnd/res/layout/point_editor_fragment.xml | 234 ++++++++++++++++++ OsmAnd/res/values/attrs.xml | 1 + OsmAnd/res/values/strings.xml | 2 + OsmAnd/res/values/styles.xml | 2 + .../src/net/osmand/data/FavouritePoint.java | 2 +- .../net/osmand/plus/FavouritesDbHelper.java | 11 +- .../osmand/plus/activities/MapActivity.java | 9 + .../plus/mapcontextmenu/MapContextMenu.java | 14 +- .../MapContextMenuFragment.java | 6 +- .../AmenityMenuBuilder.java} | 6 +- .../AmenityMenuController.java} | 8 +- .../FavouritePointMenuBuilder.java | 28 +-- .../FavouritePointMenuController.java | 2 +- .../{sections => details}/MenuBuilder.java | 2 +- .../{sections => details}/MenuController.java | 2 +- .../editors/FavoritePointEditor.java | 58 +++++ .../editors/FavoritePointEditorFragment.java | 183 ++++++++++++++ .../mapcontextmenu/editors/PointEditor.java | 63 +++++ .../editors/PointEditorFragment.java | 212 ++++++++++++++++ 21 files changed, 833 insertions(+), 36 deletions(-) create mode 100644 OsmAnd/res/drawable/bg_point_editor_view_dark.xml create mode 100644 OsmAnd/res/drawable/bg_point_editor_view_light.xml create mode 100644 OsmAnd/res/layout/point_editor_fragment.xml rename OsmAnd/src/net/osmand/plus/mapcontextmenu/{sections/AmenityInfoMenuBuilder.java => details/AmenityMenuBuilder.java} (97%) rename OsmAnd/src/net/osmand/plus/mapcontextmenu/{sections/AmenityInfoMenuController.java => details/AmenityMenuController.java} (56%) rename OsmAnd/src/net/osmand/plus/mapcontextmenu/{sections => details}/FavouritePointMenuBuilder.java (91%) rename OsmAnd/src/net/osmand/plus/mapcontextmenu/{sections => details}/FavouritePointMenuController.java (92%) rename OsmAnd/src/net/osmand/plus/mapcontextmenu/{sections => details}/MenuBuilder.java (97%) rename OsmAnd/src/net/osmand/plus/mapcontextmenu/{sections => details}/MenuController.java (98%) create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditor.java create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditor.java create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java diff --git a/OsmAnd/res/drawable/bg_point_editor_view_dark.xml b/OsmAnd/res/drawable/bg_point_editor_view_dark.xml new file mode 100644 index 0000000000..3fd04bc60d --- /dev/null +++ b/OsmAnd/res/drawable/bg_point_editor_view_dark.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/bg_point_editor_view_light.xml b/OsmAnd/res/drawable/bg_point_editor_view_light.xml new file mode 100644 index 0000000000..f1f8c0925e --- /dev/null +++ b/OsmAnd/res/drawable/bg_point_editor_view_light.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml new file mode 100644 index 0000000000..4a4a49050f --- /dev/null +++ b/OsmAnd/res/layout/point_editor_fragment.xml @@ -0,0 +1,234 @@ + + + + + + + +