gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4710 from goblinr/MAPSME-82-ext-express-search-button

Browse source 
[android] Added compass y offset in landscape navigation mode
This commit is contained in:
alexzatsepin 2016-11-18 17:10:02 +03:00 • committed by GitHub
commit 4c9520acd9
6 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/res/values-w1020dp/dimens.xml
View file

@ -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>

3
android/res/values/dimens.xml
View file

@ -157,4 +157,7 @@
<!-- Rating-->
<dimen name="placepage_margin_rating">20dp</dimen>
<!-- Compass offset-->
<dimen name="compass_navigation_landscape_offset">-54dp</dimen>
</resources>

2
android/src/com/mapswithme/maps/MapFragment.java
View file

@ -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)

1
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -1410,6 +1410,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mPlacePage.refreshViews();
mNavigationController.show(show);
mOnmapDownloader.updateState(false);
adjustCompass(0, UiUtils.getCompassYOffset(this));
}
@Override

4
android/src/com/mapswithme/maps/PanelAnimator.java
View file

@ -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();

8
android/src/com/mapswithme/util/UiUtils.java
View file

@ -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(@NonNull Context context)
{
return isLandscape(context) && RoutingController.get().isNavigating()
? (int)context.getResources()
.getDimension(R.dimen.compass_navigation_landscape_offset) : 0;
}
// utility class
private UiUtils() {}
}