Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add isShowMapBottomHudButtons

Browse source
This commit is contained in:
Vitaliy 2020-07-30 17:01:32 +03:00
parent fb48c41c90
commit c25bf93d6f
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
OsmAnd/src/net/osmand/plus/base/ContextMenuScrollFragment.java
View file

@ -6,11 +6,13 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.MapActivityLayers; import net.osmand.plus.activities.MapActivityLayers;
import net.osmand.plus.base.ContextMenuFragment.ContextMenuFragmentListener; import net.osmand.plus.base.ContextMenuFragment.ContextMenuFragmentListener;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.views.MapControlsLayer; import net.osmand.plus.views.MapControlsLayer;
import net.osmand.plus.views.MapInfoLayer; import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.OsmandMapTileView;
@ -31,14 +33,20 @@ public abstract class ContextMenuScrollFragment extends ContextMenuFragment impl
private static final String ZOOM_OUT_BUTTON_ID = ZOOM_OUT_HUD_ID + TAG; private static final String ZOOM_OUT_BUTTON_ID = ZOOM_OUT_HUD_ID + TAG;
private static final String BACK_TO_LOC_BUTTON_ID = BACK_TO_LOC_HUD_ID + TAG; private static final String BACK_TO_LOC_BUTTON_ID = BACK_TO_LOC_HUD_ID + TAG;
private View mapControlsView; @Nullable
private View mapBottomHudButtons;
@Nullable
private RulerWidget rulerWidget; private RulerWidget rulerWidget;
public float getMiddleStateKoef() { public float getMiddleStateKoef() {
return 0.5f; return 0.5f;
} }
public boolean isShowMapBottomHudButtons() {
return true;
}
@Override @Override
public int getSupportedMenuStatesPortrait() { public int getSupportedMenuStatesPortrait() {
return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN; return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN;
@ -50,7 +58,15 @@ public abstract class ContextMenuScrollFragment extends ContextMenuFragment impl
if (view != null) { if (view != null) {
setListener(this); setListener(this);
getBottomScrollView().setScrollingEnabled(true); getBottomScrollView().setScrollingEnabled(true);
setupControlButtons(view);
mapBottomHudButtons = view.findViewById(R.id.map_controls_container);
if (mapBottomHudButtons != null) {
if (isShowMapBottomHudButtons()) {
setupControlButtons(mapBottomHudButtons);
} else {
AndroidUiHelper.updateVisibility(mapBottomHudButtons, false);
}
}
} }
return view; return view;
} }
@ -88,12 +104,10 @@ public abstract class ContextMenuScrollFragment extends ContextMenuFragment impl
private void setupControlButtons(@NonNull View view) { private void setupControlButtons(@NonNull View view) {
MapActivity mapActivity = requireMapActivity(); MapActivity mapActivity = requireMapActivity();
mapControlsView = view.findViewById(R.id.map_controls_container); View zoomInButtonView = view.findViewById(R.id.map_zoom_in_button);
View zoomOutButtonView = view.findViewById(R.id.map_zoom_out_button);
View zoomInButtonView = mapControlsView.findViewById(R.id.map_zoom_in_button); View myLocButtonView = view.findViewById(R.id.map_my_location_button);
View zoomOutButtonView = mapControlsView.findViewById(R.id.map_zoom_out_button); View mapRulerView = view.findViewById(R.id.map_ruler_layout);
View myLocButtonView = mapControlsView.findViewById(R.id.map_my_location_button);
View mapRulerView = mapControlsView.findViewById(R.id.map_ruler_layout);
MapActivityLayers mapLayers = mapActivity.getMapLayers(); MapActivityLayers mapLayers = mapActivity.getMapLayers();
@ -110,7 +124,7 @@ public abstract class ContextMenuScrollFragment extends ContextMenuFragment impl
} }
public void updateMapControlsPos(@NonNull ContextMenuFragment fragment, int y, boolean animated) { public void updateMapControlsPos(@NonNull ContextMenuFragment fragment, int y, boolean animated) {
View mapControlsView = this.mapControlsView; View mapControlsView = this.mapBottomHudButtons;
if (mapControlsView != null) { if (mapControlsView != null) {
int zoomY = y - getMapControlsHeight(); int zoomY = y - getMapControlsHeight();
if (animated) { if (animated) {
@ -122,19 +136,19 @@ public abstract class ContextMenuScrollFragment extends ContextMenuFragment impl
} }
private int getMapControlsHeight() { private int getMapControlsHeight() {
View mapControlsContainer = this.mapControlsView; View mapControlsContainer = this.mapBottomHudButtons;
return mapControlsContainer != null ? mapControlsContainer.getHeight() : 0; return mapControlsContainer != null ? mapControlsContainer.getHeight() : 0;
} }
private void updateMapControlsVisibility(int menuState) { private void updateMapControlsVisibility(int menuState) {
if (mapControlsView != null) { if (mapBottomHudButtons != null) {
if (menuState == MenuState.HEADER_ONLY) { if (menuState == MenuState.HEADER_ONLY) {
if (mapControlsView.getVisibility() != View.VISIBLE) { if (mapBottomHudButtons.getVisibility() != View.VISIBLE) {
mapControlsView.setVisibility(View.VISIBLE); mapBottomHudButtons.setVisibility(View.VISIBLE);
} }
} else { } else {
if (mapControlsView.getVisibility() == View.VISIBLE) { if (mapBottomHudButtons.getVisibility() == View.VISIBLE) {
mapControlsView.setVisibility(View.INVISIBLE); mapBottomHudButtons.setVisibility(View.INVISIBLE);
} }
} }
} }