Fixes - context menu + download maps layer

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

@@ -222,6 +222,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		updateButtonsAndProgress();
 
 		if (menu.isLandscapeLayout()) {
+			final TypedValue typedValueAttr = new TypedValue();
+			getMapActivity().getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
+			mainView.setBackgroundResource(typedValueAttr.resourceId);
 			mainView.setLayoutParams(new FrameLayout.LayoutParams(dpToPx(menu.getLandscapeWidthDp()),
 					ViewGroup.LayoutParams.MATCH_PARENT));
 			View fabContainer = view.findViewById(R.id.context_menu_fab_container);
@@ -303,7 +306,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 					case MotionEvent.ACTION_UP:
 					case MotionEvent.ACTION_CANCEL:
 						int currentY = getViewY();
-						
+
 						slidingUp = Math.abs(maxVelocityY) > 500 && (currentY - dyMain) < -50;
 						slidingDown = Math.abs(maxVelocityY) > 500 && (currentY - dyMain) > 50;
 
@@ -339,6 +342,11 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		// FAB
 		fabView = (ImageView)view.findViewById(R.id.context_menu_fab_view);
 		if (menu.fabVisible()) {
+			if (menu.isLandscapeLayout()) {
+				FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) fabView.getLayoutParams();
+				params.setMargins(0, 0, dpToPx(28f), 0);
+				fabView.setLayoutParams(params);
+			}
 			fabView.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -407,7 +415,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 	public void openMenuFullScreen() {
 		changeMenuState(getViewY(), true, true, false);
 	}
-	
+
 	public void openMenuHalfScreen() {
 		int oldMenuState = menu.getCurrentMenuState();
 		if(oldMenuState == MenuState.HEADER_ONLY) {

OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java

@@ -123,12 +123,12 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 		pathOutdated = new Path();
 
 		data = new MapLayerData<List<BinaryMapDataObject>>() {
-			
+
 			@Override
 			public void layerOnPostExecute() {
 				view.refreshMap();
 			}
-			
+
 			public boolean queriedBoxContains(final RotatedTileBox queriedData, final RotatedTileBox newBox) {
 				if (newBox.getZoom() < ZOOM_TO_SHOW_SELECTION) {
 					if (queriedData != null && queriedData.getZoom() < ZOOM_TO_SHOW_SELECTION) {
@@ -139,19 +139,19 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 				}
 				List<BinaryMapDataObject> queriedResults = getResults();
 				if(queriedData != null && queriedData.containsTileBox(newBox) && queriedData.getZoom() >= ZOOM_TO_SHOW_MAP_NAMES) {
-					if(queriedResults != null && ( queriedResults.isEmpty() || 
+					if(queriedResults != null && ( queriedResults.isEmpty() ||
 							Math.abs(queriedData.getZoom() - newBox.getZoom()) <= 1)) {
 						return true;
 					}
 				}
 				return false;
 			}
-			
+
 			@Override
 			protected List<BinaryMapDataObject> calculateResult(RotatedTileBox tileBox) {
 				return queryData(tileBox);
 			}
-			
+
 		};
 
 	}
@@ -184,19 +184,19 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 			final List<BinaryMapDataObject> selectedObjects = new LinkedList<>(this.selectedObjects);
 
 			if (selectedObjects.size() > 0) {
-				currentObjects.removeAll(selectedObjects);
+				removeObjectsFromList(currentObjects, selectedObjects);
 				drawBorders(canvas, tileBox, selectedObjects, pathSelected, paintSelected);
 			}
 
 			if (zoom >= ZOOM_TO_SHOW_BORDERS_ST && zoom < ZOOM_TO_SHOW_BORDERS) {
-				downloadingObjects.removeAll(selectedObjects);
+				removeObjectsFromList(downloadingObjects, selectedObjects);
 				if (downloadingObjects.size() > 0) {
-					currentObjects.removeAll(downloadingObjects);
+					removeObjectsFromList(currentObjects, downloadingObjects);
 					drawBorders(canvas, tileBox, downloadingObjects, pathDownloading, paintDownloading);
 				}
-				outdatedObjects.removeAll(selectedObjects);
+				removeObjectsFromList(outdatedObjects, selectedObjects);
 				if (outdatedObjects.size() > 0) {
-					currentObjects.removeAll(outdatedObjects);
+					removeObjectsFromList(currentObjects, outdatedObjects);
 					drawBorders(canvas, tileBox, outdatedObjects, pathOutdated, paintOutdated);
 				}
 				if (currentObjects.size() > 0) {
@@ -216,6 +216,19 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 		}
 	}
 
+	private void removeObjectsFromList(List<BinaryMapDataObject> list, List<BinaryMapDataObject> objects) {
+		Iterator<BinaryMapDataObject> it = list.iterator();
+		while (it.hasNext()) {
+			BinaryMapDataObject o = it.next();
+			for (BinaryMapDataObject obj : objects) {
+				if (o.getId() == obj.getId()) {
+					it.remove();
+					break;
+				}
+			}
+		}
+	}
+
 	private void drawBorders(Canvas canvas, RotatedTileBox tileBox, final List<BinaryMapDataObject> objects, Path path, Paint paint) {
 		path.reset();
 		for (BinaryMapDataObject o : objects) {
@@ -240,11 +253,11 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 	}
 
 
-	
+
 	private List<BinaryMapDataObject> queryData(RotatedTileBox tileBox) {
 		if (tileBox.getZoom() >= ZOOM_AFTER_BASEMAP) {
 			if(!checkIfMapEmpty(tileBox)) {
-				return Collections.emptyList();	
+				return Collections.emptyList();
 			}
 		}
 		LatLon lt = tileBox.getLeftTopLatLon();
@@ -252,7 +265,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 //		if (tileBox.getZoom() >= ZOOM_TO_SHOW_MAP_NAMES) {
 //			lt = rb = tileBox.getCenterLatLon();
 //		}
-		
+
 		List<BinaryMapDataObject> result = null;
 		int left = MapUtils.get31TileNumberX(lt.getLongitude());
 		int right = MapUtils.get31TileNumberX(rb.getLongitude());