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

[android] Fixed the "crown" behaviour - too many appearances

Browse source
This commit is contained in:
Dmitry Donskoy 2019-09-10 18:27:09 +03:00 • committed by Aleksandr Zatsepin
parent ad6e632d65
commit 18d06b4a7a
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -719,11 +719,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
initToggleMapLayerController(frame);
View openSubsScreenBtn = frame.findViewById(R.id.subs_screen_btn);
mNavAnimationController = new NavigationButtonsAnimationController(
zoomIn, zoomOut, myPosition, getWindow().getDecorView().getRootView(), this, openSubsScreenBtn);
boolean hasCrownView = Framework.nativeNeedToShowCrown();
openSubsScreenBtn.setOnClickListener(v -> onCrownClicked());
UiUtils.showIf(Framework.nativeNeedToShowCrown(), openSubsScreenBtn);
mNavAnimationController = new NavigationButtonsAnimationController(
zoomIn, zoomOut, myPosition, getWindow().getDecorView().getRootView(), this,
hasCrownView ? openSubsScreenBtn : null);
UiUtils.showIf(hasCrownView, openSubsScreenBtn);
if (hasCrownView)
openSubsScreenBtn.setOnClickListener(v -> onCrownClicked());
}
private void onCrownClicked()

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

@ -37,7 +37,7 @@ class NavigationButtonsAnimationController
NavigationButtonsAnimationController(@NonNull View zoomIn, @NonNull View zoomOut,
@NonNull View myPosition, @NonNull final View contentView,
@Nullable OnTranslationChangedListener translationListener,
@NonNull View crownView)
@Nullable View crownView)
{
mZoomIn = zoomIn;
mZoomOut = zoomOut;