From 308a872de037e7363ea0cb62597da7b5b10837e6 Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Fri, 2 Feb 2018 12:30:32 +0200
Subject: [PATCH 1/3] Fixed the dash removal for internal renderers

---
 OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index bea1ac0eb1..a859c71530 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -517,7 +517,7 @@ public class ConfigureMapMenu {
 							if (item.equals(selectedName)) {
 								selected = i;
 							}
-							visibleNamesList.add(item.replace('_', ' ').replace('-', ' '));
+							visibleNamesList.add(item);
 							i++;
 						}
 

From fa515e97bcfdbf87fbe7eb6cfa588cd80c75edb0 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 2 Feb 2018 14:46:49 +0300
Subject: [PATCH 2/3] Fix opening hours UI

---
 .../src/net/osmand/util/OpeningHoursParser.java    |  4 ++--
 OsmAnd/res/layout/map_context_menu_fragment.xml    |  9 +++++++++
 .../osmand/plus/mapcontextmenu/MapContextMenu.java |  2 +-
 .../mapcontextmenu/MapContextMenuFragment.java     |  7 +++++--
 .../osmand/plus/mapcontextmenu/MenuController.java | 14 ++++++++++++--
 .../controllers/MapDataMenuController.java         |  2 +-
 .../osmand/plus/osmedit/EditPOIMenuController.java |  2 +-
 .../ParkingPositionMenuController.java             |  2 +-
 8 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
index 870ab9b01f..3762dade8b 100644
--- a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
+++ b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
@@ -1016,7 +1016,7 @@ public class OpeningHoursParser {
 					if (b.charAt(b.length() - 1) != ' ') {
 						b.append(" ");
 					}
-					b.append("(").append(comment).append(")");
+					b.append("- ").append(comment);
 				} else {
 					b.append(comment);
 				}
@@ -1136,7 +1136,7 @@ public class OpeningHoursParser {
 			}
 			String res = sb.toString();
 			if (res.length() > 0 && !Algorithms.isEmpty(comment)) {
-				res += " (" + comment + ")";
+				res += " - " + comment;
 			}
 			return res;
 		}
diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 46964956a4..60d0136612 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -108,6 +108,15 @@
                     osmand:typeface="@string/font_roboto_medium"
                     tools:text="Museum"/>
 
+                <ImageView
+                    android:id="@+id/additional_info_image_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top"
+                    android:paddingTop="1dp"
+                    android:paddingRight="@dimen/context_menu_padding_margin_small"
+                    tools:src="@drawable/ic_action_opening_hour_16"/>
+
                 <TextView
                     android:id="@+id/additional_info_text_view"
                     android:layout_width="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index d5956608dc..54c2d05a4e 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -1182,7 +1182,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 
 	public int getAdditionalInfoColor() {
 		if (menuController != null) {
-			return menuController.getAdditionalInfoColor();
+			return menuController.getAdditionalInfoColorId();
 		}
 		return 0;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index ec8c63a08e..a1ea75009b 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -1360,8 +1360,10 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				line3.setCompoundDrawablePadding(dpToPx(5f));
 			}
 
+			ImageView additionalInfoImageView = (ImageView) view.findViewById(R.id.additional_info_image_view);
 			TextView additionalInfoTextView = (TextView) view.findViewById(R.id.additional_info_text_view);
 			CharSequence additionalInfoStr = menu.getAdditionalInfo();
+			boolean showAdditionalImage = false;
 			if (!TextUtils.isEmpty(additionalInfoStr)) {
 				int colorId = menu.getAdditionalInfoColor();
 				int additionalInfoIconRes = menu.getAdditionalInfoIconRes();
@@ -1369,8 +1371,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 					additionalInfoTextView.setTextColor(ContextCompat.getColor(getContext(), colorId));
 					if (additionalInfoIconRes != 0) {
 						Drawable additionalIcon = getIcon(additionalInfoIconRes, colorId);
-						additionalInfoTextView.setCompoundDrawablesWithIntrinsicBounds(additionalIcon, null, null, null);
-						additionalInfoTextView.setCompoundDrawablePadding(dpToPx(8));
+						additionalInfoImageView.setImageDrawable(additionalIcon);
+						showAdditionalImage = true;
 					}
 				}
 				additionalInfoTextView.setText(additionalInfoStr);
@@ -1378,6 +1380,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			} else {
 				additionalInfoTextView.setVisibility(View.GONE);
 			}
+			additionalInfoImageView.setVisibility(showAdditionalImage ? View.VISIBLE : View.GONE);
 		}
 		updateCompassVisibility();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index be62359549..df8894343f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -4,6 +4,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -478,9 +479,17 @@ public abstract class MenuController extends BaseMenuController implements Colla
 		return "";
 	}
 
-	public int getAdditionalInfoColor() {
+	@ColorRes
+	public int getAdditionalInfoColorId() {
 		if (openingHoursInfo != null) {
-			return 0;
+			boolean open = false;
+			for (OpeningHours.Info info : openingHoursInfo) {
+				if (info.isOpened() || info.isOpened24_7()) {
+					open = true;
+					break;
+				}
+			}
+			return open ? R.color.ctx_menu_amenity_opened_text_color : R.color.ctx_menu_amenity_closed_text_color;
 		} else if (indexItem != null) {
 			return R.color.icon_color;
 		}
@@ -516,6 +525,7 @@ public abstract class MenuController extends BaseMenuController implements Colla
 		return "";
 	}
 
+	@DrawableRes
 	public int getAdditionalInfoIconRes() {
 		if (openingHoursInfo != null) {
 			return R.drawable.ic_action_opening_hour_16;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
index 2b51c08ac7..4001ed8e8f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
@@ -191,7 +191,7 @@ public class MapDataMenuController extends MenuController {
 	}
 
 	@Override
-	public int getAdditionalInfoColor() {
+	public int getAdditionalInfoColorId() {
 		return R.color.icon_color;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
index ac09ec8ebc..a74921dbbf 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
@@ -136,7 +136,7 @@ public class EditPOIMenuController extends MenuController {
 	}
 
 	@Override
-	public int getAdditionalInfoColor() {
+	public int getAdditionalInfoColorId() {
 		if (osmPoint.getAction() == Action.DELETE) {
 			return R.color.color_osm_edit_delete;
 		} else if (osmPoint.getAction() == Action.MODIFY || osmPoint.getAction() == Action.REOPEN) {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionMenuController.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionMenuController.java
index 7d4addc480..7fed307d2b 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionMenuController.java
@@ -73,7 +73,7 @@ public class ParkingPositionMenuController extends MenuController {
 	}
 
 	@Override
-	public int getAdditionalInfoColor() {
+	public int getAdditionalInfoColorId() {
 		return plugin.getParkingType() ? R.color.ctx_menu_amenity_closed_text_color : R.color.icon_color;
 	}
 

From 87e4e0b7c6c894706f21876d7dc4f339f38ca6bf Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 2 Feb 2018 14:25:53 +0200
Subject: [PATCH 3/3] Fix concurrent modification exception

---
 .../net/osmand/plus/resources/IncrementalChangesManager.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
index be1e017631..4136e75e72 100644
--- a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
@@ -88,7 +88,8 @@ public class IncrementalChangesManager {
 		if (!regionUpdateFiles.dayUpdates.isEmpty()) {
 			ArrayList<String> list = new ArrayList<String>(regionUpdateFiles.dayUpdates.keySet());
 			for (String month : list) {
-				Iterator<RegionUpdate> it = regionUpdateFiles.dayUpdates.get(month).iterator();
+				List<RegionUpdate> newList = new ArrayList<>(regionUpdateFiles.dayUpdates.get(month));
+				Iterator<RegionUpdate> it = newList.iterator();
 				RegionUpdate monthRu = regionUpdateFiles.monthUpdates.get(month);
 				while (it.hasNext()) {
 					RegionUpdate ru = it.next();
@@ -100,6 +101,7 @@ public class IncrementalChangesManager {
 						log.info("Delete overlapping day update " + ru.file.getName());
 					}
 				}
+				regionUpdateFiles.dayUpdates.put(month, newList);
 			}
 		}
 	}