Merge branch 'master' of github.com:osmandapp/Osmand

OsmAnd/res/values-sv/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
     <string name="ChooseCountry">Välj land</string>
@@ -1969,4 +1969,8 @@
     <string name="read_more">Läs mer</string>
     <string name="whats_new">Nyheter</string>
     <string name="rendering_attr_hideProposed_name">Dölj föreslagna objekt</string>
-</resources>
+<string name="lang_nds">Lågtyska</string>
+    <string name="lang_mk">Makedonska</string>
+    <string name="lang_fy">Frisiska</string>
+    <string name="lang_als">Albanska (Toskiska)</string>
+    </resources>

OsmAnd/res/values/styles.xml

@@ -114,7 +114,7 @@
         <item name="appbar_layout_theme">@style/OsmandLightTheme.DarkActionbar</item>
         <item name="toolbar_theme">@style/OsmandLightTheme.Toolbar</item>
         <item name="new_app_theme">@style/OsmandLightTheme.NewAppTheme</item>
-        <item name="android:textColorSecondary">@color/dashboard_black</item>
+        <item name="android:textColorSecondary">@color/icon_color</item>
         <item name="contextMenuButtonColor">@color/map_widget_blue</item>
 
     </style>
@@ -207,7 +207,7 @@
         <item name="appbar_layout_theme">@style/OsmandDarkTheme.DarkActionbar</item>
         <item name="toolbar_theme">@style/OsmandDarkTheme</item>
         <item name="new_app_theme">@style/OsmandDarkTheme</item>
-        <item name="android:textColorSecondary">@color/map_widget_light</item>
+        <item name="android:textColorSecondary">@color/dash_search_icon_dark</item>
 
         <item name="contextMenuButtonColor">@color/osmand_orange</item>
     </style>

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java

@@ -7,7 +7,6 @@ import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -520,13 +519,14 @@ public class MapContextMenu extends MenuTitleController {
 	}
 
 	public void updateMyLocation(net.osmand.Location location) {
-		if (location != null) {
+		if (location != null && active && displayDistanceDirection()) {
 			myLocation = new LatLon(location.getLatitude(), location.getLongitude());
 			updateLocation(false, true, false);
 		}
 	}
 
 	public void updateCompassValue(float value) {
+		if (active && displayDistanceDirection()) {
 			// 99 in next line used to one-time initialize arrows (with reference vs. fixed-north direction)
 			// on non-compass devices
 			float lastHeading = heading != null ? heading : 99;
@@ -537,6 +537,7 @@ public class MapContextMenu extends MenuTitleController {
 				heading = lastHeading;
 			}
 		}
+	}
 
 	public void updateLocation(final boolean centerChanged, final boolean locationChanged,
 							   final boolean compassChanged) {

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java

@@ -74,6 +74,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 	private int menuFullHeight;
 	private int menuFullHeightMax;
 
+	private int screenHeight;
+	private int viewHeight;
+
 	private int fabPaddingTopPx;
 	private int markerPaddingPx;
 	private int markerPaddingXPx;
@@ -126,6 +129,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 							 Bundle savedInstanceState) {
 
+		screenHeight = getScreenHeight();
+		viewHeight = screenHeight - getStatusBarHeight();
+
 		fabPaddingTopPx = dpToPx(FAB_PADDING_TOP_DP);
 		markerPaddingPx = dpToPx(MARKER_PADDING_DP);
 		markerPaddingXPx = dpToPx(MARKER_PADDING_X_DP);
@@ -704,26 +710,26 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 
 	private int getPosY(boolean needCloseMenu) {
 		if (needCloseMenu) {
-			return getScreenHeight();
+			return screenHeight;
 		}
 
 		int destinationState;
 		int minHalfY;
 		if (menu.isExtended()) {
 			destinationState = menu.getCurrentMenuState();
-			minHalfY = view.getHeight() - (int)(view.getHeight() * menu.getHalfScreenMaxHeightKoef());
+			minHalfY = viewHeight - (int)(viewHeight * menu.getHalfScreenMaxHeightKoef());
 		} else {
 			destinationState = MenuController.MenuState.HEADER_ONLY;
-			minHalfY = view.getHeight();
+			minHalfY = viewHeight;
 		}
 
 		int posY = 0;
 		switch (destinationState) {
 			case MenuController.MenuState.HEADER_ONLY:
-				posY = view.getHeight() - (menuTitleHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP));
+				posY = viewHeight - (menuTitleHeight - dpToPx(SHADOW_HEIGHT_BOTTOM_DP));
 				break;
 			case MenuController.MenuState.HALF_SCREEN:
-				posY = view.getHeight() - menuFullHeightMax;
+				posY = viewHeight - menuFullHeightMax;
 				posY = Math.max(posY, minHalfY);
 				break;
 			case MenuController.MenuState.FULL_SCREEN:
@@ -925,6 +931,15 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		return dm.heightPixels;
 	}
 
+	public int getStatusBarHeight() {
+		int result = 0;
+		int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
+		if (resourceId > 0) {
+			result = getResources().getDimensionPixelSize(resourceId);
+		}
+		return result;
+	}
+
 	public void updateLocation(boolean centerChanged, boolean locationChanged, boolean compassChanged) {
 		updateDistanceDirection();
 	}