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

[android] fix position button hidden in routing mode

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-10-22 21:52:59 +02:00 • committed by Alexander Borsuk
parent c696c263c0
commit 71ef628a9b
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
View file

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