From 3d796e927b910446980cc8b649416cf470bdf0d0 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Fri, 11 Nov 2016 14:34:40 +0400
Subject: [PATCH 1/2] [android] Added copass y offset in landscape navigation
 mode.

---
 android/res/values-w1020dp/dimens.xml              | 3 +++
 android/res/values/dimens.xml                      | 3 +++
 android/src/com/mapswithme/maps/MapFragment.java   | 2 +-
 android/src/com/mapswithme/maps/MwmActivity.java   | 1 +
 android/src/com/mapswithme/maps/PanelAnimator.java | 4 ++--
 android/src/com/mapswithme/util/UiUtils.java       | 8 ++++++++
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/android/res/values-w1020dp/dimens.xml b/android/res/values-w1020dp/dimens.xml
index 42aaae0e77..ee03656052 100644
--- a/android/res/values-w1020dp/dimens.xml
+++ b/android/res/values-w1020dp/dimens.xml
@@ -3,4 +3,7 @@
   <dimen name="menu_line_button_inset_edge">-12dp</dimen>
   <dimen name="menu_line_button_width_edge">72dp</dimen>
   <dimen name="menu_line_button_width">80dp</dimen>
+
+  <!-- Compass offset-->
+  <dimen name="compass_navigation_landscape_offset">-72dp</dimen>
 </resources>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index c5d743cc34..c5bb871d90 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -157,4 +157,7 @@
   <!-- Rating-->
   <dimen name="placepage_margin_rating">20dp</dimen>
 
+  <!-- Compass offset-->
+  <dimen name="compass_navigation_landscape_offset">-54dp</dimen>
+
 </resources>
diff --git a/android/src/com/mapswithme/maps/MapFragment.java b/android/src/com/mapswithme/maps/MapFragment.java
index e7dacde089..6ffae2ea28 100644
--- a/android/src/com/mapswithme/maps/MapFragment.java
+++ b/android/src/com/mapswithme/maps/MapFragment.java
@@ -91,7 +91,7 @@ public class MapFragment extends BaseMwmFragment
                         ANCHOR_LEFT_TOP);
     }
 
-    setupCompass(0, 0, false);
+    setupCompass(0, UiUtils.getCompassYOffset(getContext()), false);
   }
 
   void setupCompass(int offsetX, int offsetY, boolean forceRedraw)
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 6e1c4f57a1..7dd2cc2d12 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1410,6 +1410,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mPlacePage.refreshViews();
     mNavigationController.show(show);
     mOnmapDownloader.updateState(false);
+    adjustCompass(0, UiUtils.getCompassYOffset(this));
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/PanelAnimator.java b/android/src/com/mapswithme/maps/PanelAnimator.java
index 3dc83dc7e2..4169880e80 100644
--- a/android/src/com/mapswithme/maps/PanelAnimator.java
+++ b/android/src/com/mapswithme/maps/PanelAnimator.java
@@ -95,7 +95,7 @@ class PanelAnimator
           listener.onTrackStarted(true);
         mAnimationTrackListeners.finishIterate();
 
-        mActivity.adjustCompass(WIDTH, 0);
+        mActivity.adjustCompass(WIDTH, UiUtils.getCompassYOffset(mActivity));
       }
     });
 
@@ -137,7 +137,7 @@ class PanelAnimator
           listener.onTrackStarted(false);
         mAnimationTrackListeners.finishIterate();
 
-        mActivity.adjustCompass(0, 0);
+        mActivity.adjustCompass(0, UiUtils.getCompassYOffset(mActivity));
 
         if (completionListener != null)
           completionListener.run();
diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 3869d8bd70..6c6b71a447 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -37,6 +37,7 @@ import android.widget.TextView;
 
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.routing.RoutingController;
 
 public final class UiUtils
 {
@@ -440,6 +441,13 @@ public final class UiUtils
     decorViewGroup.addView(statusBarTintView);
   }
 
+  public static int getCompassYOffset(Context context)
+  {
+    return isLandscape(context) && RoutingController.get().isNavigating()
+              ? (int)context.getResources()
+               .getDimension(R.dimen.compass_navigation_landscape_offset) : 0;
+  }
+
   // utility class
   private UiUtils() {}
 }

From 53ece13305251cdf6de22513af09596f67898b1d Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Fri, 18 Nov 2016 08:06:56 +0400
Subject: [PATCH 2/2] [android] Review fixes

---
 android/src/com/mapswithme/util/UiUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 6c6b71a447..2935dbe604 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -441,7 +441,7 @@ public final class UiUtils
     decorViewGroup.addView(statusBarTintView);
   }
 
-  public static int getCompassYOffset(Context context)
+  public static int getCompassYOffset(@NonNull Context context)
   {
     return isLandscape(context) && RoutingController.get().isNavigating()
               ? (int)context.getResources()