From 752ee54707e1b2ddbe80c1f4f1aae9b8f6c13ea6 Mon Sep 17 00:00:00 2001 From: Verdulo Date: Wed, 1 Aug 2018 09:29:20 +0000 Subject: [PATCH 1/9] Translated using Weblate (Esperanto) Currently translated at 100.0% (2601 of 2601 strings) --- OsmAnd/res/values-eo/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml index b26442fe97..c6ebf77396 100644 --- a/OsmAnd/res/values-eo/strings.xml +++ b/OsmAnd/res/values-eo/strings.xml @@ -1859,7 +1859,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB). Malfermaj horoj Malfermado de ŝanĝaro… Fermado de ŝanĝaro… - Enmetado de nodo… + Alŝutado de nodo… Ŝargado de interesejoj… Rajtigo malsukcesis malsukcesis From 2624debd9fc0abf2315ee7064f3a5be914589c57 Mon Sep 17 00:00:00 2001 From: Alex Sytnyk Date: Wed, 1 Aug 2018 12:35:08 +0300 Subject: [PATCH 2/9] Fix the "map_context_menu_fragment" layout formatting --- .../res/layout/map_context_menu_fragment.xml | 152 +++++++++--------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index bfb51ff362..4c07a1e64e 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -99,26 +99,26 @@ android:paddingTop="3dp"> + osmand:typeface="@string/font_roboto_medium"/> + android:visibility="gone"/> - - - - - - + android:layout_marginBottom="@dimen/context_menu_direction_margin" + android:layout_marginTop="@dimen/context_menu_padding_margin_tiny" + android:gravity="top" + android:orientation="horizontal" + android:paddingBottom="3dp" + android:paddingLeft="@dimen/context_menu_padding_margin_default" + android:paddingRight="@dimen/context_menu_padding_margin_default" + android:paddingTop="3dp"> - - - - - - - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + - - - @@ -723,13 +723,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" - android:scaleType="center" - android:textColor="@color/abc_primary_text_material_dark" - android:textSize="@dimen/abc_text_size_large_material" android:ellipsize="end" android:lines="1" android:maxLines="1" + android:scaleType="center" android:singleLine="true" + android:textColor="@color/abc_primary_text_material_dark" + android:textSize="@dimen/abc_text_size_large_material" tools:text="Toolbar" tools:visibility="visible"/> From 799e7fb791cb7778093df9f6127aa1e2a229826a Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Wed, 1 Aug 2018 12:52:34 +0300 Subject: [PATCH 3/9] Update Realese notes for 3.1 --- OsmAnd/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 07eb92c4a2..6556402b9b 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -14,9 +14,10 @@ • Navigation: Fix progress bar, fast swapping of the start and end point of the route\n\n • Map markers: fix turn on/off groups, ability to hide markers from the map\n\n - • OSM Edit: Ability to edit tags for non-point objects, fix missing comments on notes, backup of edits\n\n + • OSM Edit: Ability to edit tags for non-point objects and ways, fix missing comments on notes, backup of edits\n\n • Improve Wikipedia and Wikivoyage parsing, updated files are already available\n\n • Context menu: fix transport shields color in the night mode, fix additional menu sizes\n\n + • Boat navigation: support for waterway fairway\n\n • Other bug fixes\n\n Committing way… From cad28668dc9bd9b3068577d669127ea15ef07cbb Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 1 Aug 2018 11:44:16 +0000 Subject: [PATCH 4/9] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2601 of 2601 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 990fb2222c..0bac1403e9 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -3140,4 +3140,5 @@ \n • 其他錯誤修復 \n 將搜尋半徑增加到 %1$s + 正在提交路線… From da41ef62e00e4cca3e53654c2d9074d2519e173d Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Wed, 1 Aug 2018 04:56:42 +0000 Subject: [PATCH 5/9] Translated using Weblate (Hebrew) Currently translated at 99.8% (2598 of 2601 strings) --- OsmAnd/res/values-he/strings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml index acd37eb115..968bd71378 100644 --- a/OsmAnd/res/values-he/strings.xml +++ b/OsmAnd/res/values-he/strings.xml @@ -3068,4 +3068,16 @@ לשלוח את שאילתת החיפוש? הגדלת רדיוס החיפוש ל־%1$s הדרך נשלחת… + • ניווט: תיקון סרגל ההתקדמות, החלפה מהירה בין נקודות ההתחלה והסיום של המסלול +\n +\n • סמני מפה: תיקון כיבוי/הפעלה של קבוצות, אפשרות להסתיר סמנים במפה +\n +\n • עריכת OSM: היכולת לערוך תגיות לפריטים שאינם נקודה, תיקון תגובות חסרות על הערות, גיבוי עריכות +\n +\n • שיפור פענוח של ויקיפדיה ושל ויקימסע, קבצים מעודכנים כבר זמינים +\n +\n • תפריט הקשר: תיקון צבעי סימול כבישים במצב לילה, תיקון גדלי תפריט נוספים +\n +\n • תיקון תקלות נוספות +\n From 5cce837db0d067ed74657e95b0ef842b3b81ead4 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Wed, 1 Aug 2018 05:20:56 +0000 Subject: [PATCH 6/9] Translated using Weblate (Hebrew) Currently translated at 48.7% (1703 of 3494 strings) --- OsmAnd/res/values-he/phrases.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OsmAnd/res/values-he/phrases.xml b/OsmAnd/res/values-he/phrases.xml index e20cc77cd1..977b913953 100644 --- a/OsmAnd/res/values-he/phrases.xml +++ b/OsmAnd/res/values-he/phrases.xml @@ -1837,4 +1837,20 @@ פחם נחושת יהלומים + חתירה יחידנית במים עמוקים: יש + חתירה יחידנית במים עמוקים: אין + + גובה הטיפוס + גובה טיפוס מזערי + גובה טיפוס מרבי + סלע טיפוס: אבן גיר + סלע טיפוס: גרניט + סלע טיפוס: אבן חול + סלע טיפוס: קוורציט + סלע טיפוס: גנייס + סלע טיפוס: פורפיר + איכות טיפוס: אחידה + איכות טיפוס: שבירה + ידיות קבועות: יש + ידיות קבועות: אין From 918ada71c9798a4ee4864a868ebbfc1679191404 Mon Sep 17 00:00:00 2001 From: Alex Sytnyk Date: Wed, 1 Aug 2018 15:56:27 +0300 Subject: [PATCH 7/9] Add some info from AMapPoint to the Context Menu --- .../res/layout/map_context_menu_fragment.xml | 11 +++ .../osmand/aidl/maplayer/point/AMapPoint.java | 2 + .../plus/mapcontextmenu/MapContextMenu.java | 7 ++ .../MapContextMenuFragment.java | 66 +++++++++-------- .../plus/mapcontextmenu/MenuController.java | 4 ++ .../controllers/AMapPointMenuController.java | 71 +++++++++++++++++-- 6 files changed, 126 insertions(+), 35 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 4c07a1e64e..5fe1ee1efe 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -173,6 +173,17 @@ android:layout_marginRight="@dimen/context_menu_padding_margin_small" tools:text="Closed till 10:00"/> + + Date: Wed, 1 Aug 2018 16:39:45 +0300 Subject: [PATCH 8/9] Fix vertical offset --- OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java b/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java index 5d906fba81..1e83ff3742 100644 --- a/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java @@ -173,8 +173,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider canvas.drawBitmap(image, null, getDstRect(x, y, smallIconSize / 2), bitmapPaint); } else if (pointsType == PointsType.BIG_ICON) { bitmapPaint.setColorFilter(null); - // FIXME: vertical offset - float vOffset = bigIconBg.getHeight() * 0.9f; + float vOffset = bigIconBg.getHeight() * 0.91f; int imageCenterY = (int) (y - vOffset + bigIconBg.getHeight() / 2); canvas.drawBitmap(bigIconBg, x - bigIconBg.getWidth() / 2, y - vOffset, bitmapPaint); canvas.drawBitmap(image, null, getDstRect(x, imageCenterY, bigIconSize / 2), bitmapPaint); From 5fe78faf0501613f3a5a5ffd893668613ea0afe6 Mon Sep 17 00:00:00 2001 From: Alex Sytnyk Date: Wed, 1 Aug 2018 16:40:18 +0300 Subject: [PATCH 9/9] Show separator for all types of context menu --- .../src/net/osmand/plus/mapcontextmenu/MapContextMenu.java | 7 ------- .../osmand/plus/mapcontextmenu/MapContextMenuFragment.java | 6 ++++-- .../src/net/osmand/plus/mapcontextmenu/MenuController.java | 4 ---- .../controllers/AMapPointMenuController.java | 5 ----- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java index d104605c34..e850dd4db9 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java @@ -1279,13 +1279,6 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL return 0; } - public boolean isShowInfoCompassSeparator() { - if (menuController != null) { - return menuController.isShowInfoCompassSeparator(); - } - return false; - } - public boolean isMapDownloaded() { return menuController != null && menuController.isMapDownloaded(); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 97fc71894c..d0e2256821 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -1479,7 +1479,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo TextView additionalInfoTextView = (TextView) view.findViewById(R.id.additional_info_text_view); CharSequence additionalInfoStr = menu.getAdditionalInfo(); boolean showAdditionalImage = false; - if (!TextUtils.isEmpty(additionalInfoStr)) { + boolean showAdditionalInfo = !TextUtils.isEmpty(additionalInfoStr); + if (showAdditionalInfo) { int colorId = menu.getAdditionalInfoColor(); int additionalInfoIconRes = menu.getAdditionalInfoIconRes(); if (colorId != 0) { @@ -1497,8 +1498,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo } additionalInfoImageView.setVisibility(showAdditionalImage ? View.VISIBLE : View.GONE); + boolean showSeparator = showAdditionalInfo && menu.displayDistanceDirection(); view.findViewById(R.id.info_compass_separator) - .setVisibility(menu.isShowInfoCompassSeparator() ? View.VISIBLE : View.GONE); + .setVisibility(showSeparator ? View.VISIBLE : View.GONE); } updateCompassVisibility(); updateAdditionalInfoVisibility(); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java index 5ba1bb986c..5ba197428b 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java @@ -528,10 +528,6 @@ public abstract class MenuController extends BaseMenuController implements Colla return 0; } - public boolean isShowInfoCompassSeparator() { - return false; - } - private boolean shouldShowMapSize() { return indexItem != null && !downloaded; } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java index afd78683e9..1dfe9d3e82 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java @@ -133,11 +133,6 @@ public class AMapPointMenuController extends MenuController { return super.getAdditionalInfoIconRes(); } - @Override - public boolean isShowInfoCompassSeparator() { - return getPointSpeed() != NO_SPEED; - } - @Override public boolean needStreetName() { return false;