From 429aeeb4036d0fc6608c078d63847d495e070bc3 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Tue, 17 Apr 2018 12:46:05 +0300
Subject: [PATCH] add check for shown groups

---
 OsmAnd/res/layout/map_marker_item_categories.xml       |  5 ++---
 OsmAnd/src/net/osmand/plus/MapMarkersHelper.java       |  9 +++++++++
 .../mapmarkers/adapters/MapMarkersGroupsAdapter.java   | 10 +++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/map_marker_item_categories.xml b/OsmAnd/res/layout/map_marker_item_categories.xml
index 09d317a74b..42252a1db7 100644
--- a/OsmAnd/res/layout/map_marker_item_categories.xml
+++ b/OsmAnd/res/layout/map_marker_item_categories.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:descendantFocusability="blocksDescendants"
 	android:orientation="vertical">
 
 	<ImageView
@@ -24,9 +23,9 @@
 		android:orientation="vertical">
 
 		<LinearLayout
+			android:background="?attr/selectableItemBackground"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/map_button_shadow_width"
-			android:background="?attr/selectableItemBackground">
+			android:layout_height="@dimen/map_button_shadow_width">
 
 			<ImageButton
 				android:id="@+id/icon_left"
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index e1c25ddb27..7092984999 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -1219,6 +1219,7 @@ public class MapMarkersHelper {
 		private long creationDate;
 		private boolean disabled;
 		private boolean visible = true;
+		private boolean wasShown = false;
 		private boolean visibleUntilRestart;
 		private List<MapMarker> markers = new ArrayList<>();
 		// TODO should be removed from this class:
@@ -1269,6 +1270,14 @@ public class MapMarkersHelper {
 			return visible;
 		}
 
+		public boolean wasShown() {
+			return wasShown;
+		}
+
+		public void setWasShown(boolean wasShown) {
+			this.wasShown = wasShown;
+		}
+
 		public void setVisibleUntilRestart(boolean visibleUntilRestart) {
 			this.visibleUntilRestart = visibleUntilRestart;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index 931ba35787..a94f308c76 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -439,10 +439,11 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 						final MapMarkersHelper mapMarkersHelper = app.getMapMarkersHelper();
 						final GPXFile[] gpxFile = new GPXFile[1];
 						boolean disabled = !enabled;
-						if (groupIsDisabled) {
-							String m = group.getGpxPath();
+						if (groupIsDisabled&&!group.wasShown()) {
+							group.setWasShown(true);
+
 							Bundle args = new Bundle();
-							args.putString(SelectWptCategoriesBottomSheetDialogFragment.GPX_FILE_PATH_KEY, m);
+							args.putString(SelectWptCategoriesBottomSheetDialogFragment.GPX_FILE_PATH_KEY, group.getGpxPath());
 							args.putBoolean(SelectWptCategoriesBottomSheetDialogFragment.UPDATE_CATEGORIES_KEY, true);
 
 							SelectWptCategoriesBottomSheetDialogFragment fragment = new SelectWptCategoriesBottomSheetDialogFragment();
@@ -523,8 +524,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 			if (header instanceof MapMarkersHelper.CategoriesHeader) {
 				final MapMarkersHelper.CategoriesHeader groupHeader = (MapMarkersHelper.CategoriesHeader) header;
 				final MapMarkersGroup group = groupHeader.getGroup();
-
-				categoriesViewHolder.icon.setImageDrawable(iconsCache.getIcon(groupHeader.getIconRes()));
+				categoriesViewHolder.icon.setImageDrawable(iconsCache.getIcon(groupHeader.getIconRes(), R.color.divider_color));
 				categoriesViewHolder.title.setText(group.getWptCategoriesString());
 				categoriesViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
 					@Override