From 71ef628a9befc89adf7eef31cb6e1ef521bacd86 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Sat, 22 Oct 2022 21:52:59 +0200 Subject: [PATCH] [android] fix position button hidden in routing mode Signed-off-by: Arnaud Vergnet --- .../maps/widget/menu/MyPositionButton.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java index 86dcbfcaf2..3b0753b9f7 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java +++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java @@ -17,7 +17,6 @@ import androidx.core.widget.ImageViewCompat; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.mapswithme.maps.R; import com.mapswithme.maps.location.LocationState; -import com.mapswithme.maps.routing.RoutingController; import com.mapswithme.util.ThemeUtils; import com.mapswithme.util.UiUtils; @@ -29,15 +28,11 @@ public class MyPositionButton private final FloatingActionButton mButton; private static final SparseArray mIcons = new SparseArray<>(); // Location mode -> Button icon - private int mMode; - private final boolean mVisible; - private final int mFollowPaddingShift; public MyPositionButton(@NonNull View button, int myPositionMode, @NonNull View.OnClickListener listener) { mButton = (FloatingActionButton) button; - mVisible = UiUtils.isVisible(mButton); mButton.setOnClickListener(listener); mIcons.clear(); mFollowPaddingShift = (int) (FOLLOW_SHIFT * button.getResources().getDisplayMetrics().density); @@ -46,7 +41,6 @@ public class MyPositionButton public void update(int mode) { - mMode = mode; Drawable image = mIcons.get(mode); @AttrRes int colorAttr = R.attr.iconTint; @DimenRes int sizeDimen = R.dimen.map_button_icon_size; @@ -94,8 +88,6 @@ public class MyPositionButton if (image instanceof AnimationDrawable) ((AnimationDrawable) image).start(); - - UiUtils.visibleIf(!shouldBeHidden(), mButton); } private void updatePadding(int mode) @@ -106,13 +98,6 @@ public class MyPositionButton mButton.setPadding(0, 0, 0, 0); } - private boolean shouldBeHidden() - { - return (mMode == LocationState.FOLLOW_AND_ROTATE - && (RoutingController.get().isPlanning())) - || !mVisible; - } - public void showButton(boolean show) { UiUtils.showIf(show, mButton);