From 830063aa01b2803560251a0ba58bd2772f52273b Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 8 Dec 2017 15:12:54 +0200
Subject: [PATCH] Fix bullet visibility

---
 .../res/layout/map_context_menu_fragment.xml  | 28 ++++++++-----------
 .../MapContextMenuFragment.java               | 27 ++++++++++++------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 71e54e995f..c43aa008cd 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -82,25 +82,19 @@
                 android:layout_height="@dimen/context_menu_sub_info_height"
                 android:orientation="horizontal">
 
-                <LinearLayout
-                    android:id="@+id/opening_hours_view"
+                <TextView
+                    tools:text="Closed till 10:00"
+                    android:id="@+id/opening_hours_text_view"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"/>
 
-                    <TextView
-                        tools:text="Closed till 10:00"
-                        android:id="@+id/opening_hours_text_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="@dimen/context_menu_padding_margin_default"
-                        android:paddingRight="@dimen/context_menu_padding_margin_default"
-                        android:text="•"/>
-
-                </LinearLayout>
+                <TextView
+                    android:id="@+id/compass_layout_bullet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/context_menu_padding_margin_default"
+                    android:paddingRight="@dimen/context_menu_padding_margin_default"
+                    android:text="•"/>
 
                 <LinearLayout
                     android:id="@+id/compass_layout"
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 1bf87b7193..0c48f3dfb2 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -1103,7 +1103,6 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				line2.setText(line2Str.toString());
 			}
 
-			View openingHoursView = view.findViewById(R.id.opening_hours_view);
 			TextView openingHoursTextView = (TextView) view.findViewById(R.id.opening_hours_text_view);
 			OpeningHoursInfo openingHoursInfo = menu.getOpeningHoursInfo();
 			if (openingHoursInfo != null && openingHoursInfo.containsInfo()) {
@@ -1121,9 +1120,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 					openingHoursStr = getString(R.string.will_be_closed_at) + " " + openingHoursInfo.getNearToClosingTime();
 				}
 				openingHoursTextView.setText(openingHoursStr);
-				openingHoursView.setVisibility(View.VISIBLE);
+				openingHoursTextView.setVisibility(View.VISIBLE);
 			} else {
-				openingHoursView.setVisibility(View.GONE);
+				openingHoursTextView.setVisibility(View.GONE);
 			}
 		}
 		updateCompassVisibility();
@@ -1138,11 +1137,23 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				updateDistanceDirection();
 				compassView.setVisibility(View.VISIBLE);
 			} else {
-				if (!menu.displayDistanceDirection()) {
-					compassView.setVisibility(View.GONE);
-				} else {
-					compassView.setVisibility(View.INVISIBLE);
-				}
+				compassView.setVisibility(View.GONE);
+			}
+			updateCompassBulletVisibility();
+		}
+	}
+
+	private void updateCompassBulletVisibility() {
+		OsmandApplication app = getMyApplication();
+		if (app != null && view != null) {
+			View bulletView = view.findViewById(R.id.compass_layout_bullet);
+			Location ll = app.getLocationProvider().getLastKnownLocation();
+			OpeningHoursInfo openingHoursInfo = menu.getOpeningHoursInfo();
+			if (ll != null && menu.displayDistanceDirection() && menu.getCurrentMenuState() != MenuState.FULL_SCREEN
+					&& openingHoursInfo != null && openingHoursInfo.containsInfo()) {
+				bulletView.setVisibility(View.VISIBLE);
+			} else {
+				bulletView.setVisibility(View.GONE);
 			}
 		}
 	}