From 9f8cd778d6c79cba90cf2a70aa5a018a42c55a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Tue, 5 Sep 2017 19:51:58 +0300
Subject: [PATCH] [android] Fixed compass visibility

---
 .../src/com/mapswithme/maps/MwmActivity.java  | 19 +++++++++++++++----
 .../routing/RoutingPlanInplaceController.java |  3 ---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index f9a1bc9864..c0e70e8706 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1883,9 +1883,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
       mPlacePage.refreshViews();
   }
 
-  private void adjustCompassAndTraffic(int offsetY)
+  private void adjustCompassAndTraffic(final int offsetY)
   {
-    adjustCompass(offsetY);
+    addTask(new MapTask()
+    {
+      @Override
+      public boolean run(MwmActivity target)
+      {
+        adjustCompass(offsetY);
+        return true;
+      }
+    });
     adjustTraffic(0, offsetY);
   }
 
@@ -1901,7 +1909,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
 
     int toolbarHeight = mSearchController.getToolbar().getHeight();
-    adjustCompassAndTraffic(visible ? toolbarHeight : UiUtils.getStatusBarHeight(this));
+    int offset = mRoutingPlanInplaceController != null
+                 && mRoutingPlanInplaceController.getHeight() > 0
+                 ? mRoutingPlanInplaceController.getHeight() : UiUtils.getStatusBarHeight(this);
+
+    adjustCompassAndTraffic(visible ? toolbarHeight : offset);
     setNavButtonsTopLimit(visible ? toolbarHeight : 0);
     if (mFilterController != null)
     {
@@ -1934,7 +1946,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     refreshFade();
     if (mOnmapDownloader != null)
       mOnmapDownloader.updateState(false);
-    adjustCompass(UiUtils.getCompassYOffset(this));
     if (show)
     {
       mSearchController.clear();
diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java
index f34b6e1d79..bf95bcbf53 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java
@@ -25,9 +25,6 @@ public class RoutingPlanInplaceController extends RoutingPlanController
 
   public void show(final boolean show)
   {
-    if (show == UiUtils.isVisible(mFrame))
-      return;
-
     if (show)
       UiUtils.show(mFrame);