Class formatting cleanup (change spaces for tabs)
This commit is contained in:
madwasp79
parent
2a96932eeb
commit
2a88d48190
2 changed files with 405 additions and 383 deletions
|
|
@ -41,7 +41,6 @@ public class DayNightModeAction extends QuickAction {
|
|||
.inflate(R.layout.quick_action_with_text, parent, false);
|
||||
((TextView) view.findViewById(R.id.text))
|
||||
.setText(R.string.quick_action_switch_day_night_descr);
|
||||
|
||||
parent.addView(view);
|
||||
}
|
||||
|
||||
|
|
@ -61,6 +60,5 @@ public class DayNightModeAction extends QuickAction {
|
|||
} else {
|
||||
return String.format(application.getString(R.string.quick_action_day_night_mode), DayNightMode.DAY.toHumanString(application));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,470 +52,494 @@ import static net.osmand.plus.views.ContextMenuLayer.VIBRATE_SHORT;
|
|||
* Created by okorsun on 23.12.16.
|
||||
*/
|
||||
|
||||
public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRegistry.QuickActionUpdatesListener, QuickAction.QuickActionSelectionListener {
|
||||
public class MapQuickActionLayer extends OsmandMapLayer implements
|
||||
QuickActionRegistry.QuickActionUpdatesListener, QuickAction.QuickActionSelectionListener {
|
||||
|
||||
private final ContextMenuLayer contextMenuLayer;
|
||||
private final MeasurementToolLayer measurementToolLayer;
|
||||
private final MapMarkersLayer mapMarkersLayer;
|
||||
private ImageView contextMarker;
|
||||
private final MapActivity mapActivity;
|
||||
private final OsmandApplication app;
|
||||
private final OsmandSettings settings;
|
||||
private final QuickActionRegistry quickActionRegistry;
|
||||
private final ContextMenuLayer contextMenuLayer;
|
||||
private final MeasurementToolLayer measurementToolLayer;
|
||||
private final MapMarkersLayer mapMarkersLayer;
|
||||
private ImageView contextMarker;
|
||||
private final MapActivity mapActivity;
|
||||
private final OsmandApplication app;
|
||||
private final OsmandSettings settings;
|
||||
private final QuickActionRegistry quickActionRegistry;
|
||||
|
||||
private ImageButton quickActionButton;
|
||||
private QuickActionsWidget quickActionsWidget;
|
||||
private ImageButton quickActionButton;
|
||||
private QuickActionsWidget quickActionsWidget;
|
||||
|
||||
private OsmandMapTileView view;
|
||||
private boolean wasCollapseButtonVisible;
|
||||
private int previousMapPosition;
|
||||
private OsmandMapTileView view;
|
||||
private boolean wasCollapseButtonVisible;
|
||||
private int previousMapPosition;
|
||||
|
||||
private boolean inMovingMarkerMode;
|
||||
private boolean isLayerOn;
|
||||
private boolean inMovingMarkerMode;
|
||||
private boolean isLayerOn;
|
||||
|
||||
private boolean nightMode;
|
||||
private boolean prevWidgetState;
|
||||
private boolean nightMode;
|
||||
private boolean prevWidgetState;
|
||||
|
||||
public MapQuickActionLayer(MapActivity activity, ContextMenuLayer contextMenuLayer) {
|
||||
this.mapActivity = activity;
|
||||
this.contextMenuLayer = contextMenuLayer;
|
||||
app = activity.getMyApplication();
|
||||
settings = activity.getMyApplication().getSettings();
|
||||
quickActionRegistry = activity.getMapLayers().getQuickActionRegistry();
|
||||
public MapQuickActionLayer(MapActivity activity, ContextMenuLayer contextMenuLayer) {
|
||||
this.mapActivity = activity;
|
||||
this.contextMenuLayer = contextMenuLayer;
|
||||
app = activity.getMyApplication();
|
||||
settings = activity.getMyApplication().getSettings();
|
||||
quickActionRegistry = activity.getMapLayers().getQuickActionRegistry();
|
||||
measurementToolLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
|
||||
mapMarkersLayer = mapActivity.getMapLayers().getMapMarkersLayer();
|
||||
}
|
||||
mapMarkersLayer = mapActivity.getMapLayers().getMapMarkersLayer();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void initLayer(OsmandMapTileView view) {
|
||||
this.view = view;
|
||||
@Override
|
||||
public void initLayer(OsmandMapTileView view) {
|
||||
this.view = view;
|
||||
|
||||
quickActionsWidget = (QuickActionsWidget) mapActivity.findViewById(R.id.quick_action_widget);
|
||||
quickActionButton = (ImageButton) mapActivity.findViewById(R.id.map_quick_actions_button);
|
||||
setQuickActionButtonMargin();
|
||||
isLayerOn = quickActionRegistry.isQuickActionOn();
|
||||
quickActionsWidget = (QuickActionsWidget) mapActivity.findViewById(R.id.quick_action_widget);
|
||||
quickActionButton = (ImageButton) mapActivity.findViewById(R.id.map_quick_actions_button);
|
||||
setQuickActionButtonMargin();
|
||||
isLayerOn = quickActionRegistry.isQuickActionOn();
|
||||
nightMode = app.getDaynightHelper().isNightModeForMapControls();
|
||||
updateQuickActionButton(false);
|
||||
quickActionButton.setContentDescription(mapActivity.getString(R.string.configure_screen_quick_action));
|
||||
quickActionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
quickActionButton.setContentDescription(mapActivity.getString(R.string.configure_screen_quick_action));
|
||||
quickActionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
mapActivity.dismissCardDialog();
|
||||
if (!showTutorialIfNeeded()) {
|
||||
setLayerState(!isWidgetVisible());
|
||||
}
|
||||
}
|
||||
});
|
||||
if (!showTutorialIfNeeded()) {
|
||||
setLayerState(!isWidgetVisible());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Context context = view.getContext();
|
||||
contextMarker = new ImageView(context);
|
||||
contextMarker.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT));
|
||||
contextMarker.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.map_pin_context_menu));
|
||||
contextMarker.setClickable(true);
|
||||
int minw = contextMarker.getDrawable().getMinimumWidth();
|
||||
int minh = contextMarker.getDrawable().getMinimumHeight();
|
||||
contextMarker.layout(0, 0, minw, minh);
|
||||
Context context = view.getContext();
|
||||
contextMarker = new ImageView(context);
|
||||
contextMarker.setLayoutParams(
|
||||
new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
|
||||
FrameLayout.LayoutParams.WRAP_CONTENT));
|
||||
contextMarker.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.map_pin_context_menu));
|
||||
contextMarker.setClickable(true);
|
||||
int minw = contextMarker.getDrawable().getMinimumWidth();
|
||||
int minh = contextMarker.getDrawable().getMinimumHeight();
|
||||
contextMarker.layout(0, 0, minw, minh);
|
||||
|
||||
quickActionButton.setOnLongClickListener(new View.OnLongClickListener() {
|
||||
@Override
|
||||
public boolean onLongClick(View v) {
|
||||
Vibrator vibrator = (Vibrator) mapActivity.getSystemService(Context.VIBRATOR_SERVICE);
|
||||
vibrator.vibrate(VIBRATE_SHORT);
|
||||
quickActionButton.setScaleX(1.5f);
|
||||
quickActionButton.setScaleY(1.5f);
|
||||
quickActionButton.setAlpha(0.95f);
|
||||
quickActionButton.setOnTouchListener(onQuickActionTouchListener);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
quickActionButton.setOnLongClickListener(new View.OnLongClickListener() {
|
||||
@Override
|
||||
public boolean onLongClick(View v) {
|
||||
Vibrator vibrator = (Vibrator) mapActivity.getSystemService(Context.VIBRATOR_SERVICE);
|
||||
vibrator.vibrate(VIBRATE_SHORT);
|
||||
quickActionButton.setScaleX(1.5f);
|
||||
quickActionButton.setScaleY(1.5f);
|
||||
quickActionButton.setAlpha(0.95f);
|
||||
quickActionButton.setOnTouchListener(onQuickActionTouchListener);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
public void refreshLayer() {
|
||||
setLayerState(false);
|
||||
isLayerOn = quickActionRegistry.isQuickActionOn();
|
||||
setupQuickActionBtnVisibility();
|
||||
}
|
||||
|
||||
public void refreshLayer() {
|
||||
setLayerState(false);
|
||||
isLayerOn = quickActionRegistry.isQuickActionOn();
|
||||
setupQuickActionBtnVisibility();
|
||||
}
|
||||
private boolean showTutorialIfNeeded() {
|
||||
if (isLayerOn && !app.accessibilityEnabled()
|
||||
&& !settings.IS_QUICK_ACTION_TUTORIAL_SHOWN.get() && android.os.Build.VERSION.SDK_INT >= 14) {
|
||||
TapTargetView.showFor(mapActivity, // `this` is an Activity
|
||||
TapTarget.forView(quickActionButton,
|
||||
mapActivity.getString(R.string.quick_action_btn_tutorial_title),
|
||||
mapActivity.getString(R.string.quick_action_btn_tutorial_descr))
|
||||
// All options below are optional
|
||||
.outerCircleColor(R.color.osmand_orange) // Specify a color for the outer circle
|
||||
.targetCircleColor(R.color.color_white) // Specify a color for the target circle
|
||||
.titleTextSize(20) // Specify the size (in sp) of the title text
|
||||
.descriptionTextSize(16) // Specify the size (in sp) of the description text
|
||||
.descriptionTextColor(R.color.color_white) // Specify a color for both the title and description text
|
||||
.titleTextColor(R.color.color_white) // Specify a color for both the title and description text
|
||||
.drawShadow(true) // Whether to draw a drop shadow or not
|
||||
.cancelable(false) // Whether tapping outside the outer circle dismisses the view
|
||||
.tintTarget(false) // Whether to tint the target view's color
|
||||
.transparentTarget(false) // Specify whether the target is transparent (displays the content underneath)
|
||||
.targetRadius(50), // Specify the target radius (in dp)
|
||||
new TapTargetView.Listener() { // The listener can listen for regular clicks, long clicks or cancels
|
||||
@Override
|
||||
public void onTargetClick(TapTargetView view) {
|
||||
super.onTargetClick(view); // This call is optional
|
||||
settings.IS_QUICK_ACTION_TUTORIAL_SHOWN.set(true);
|
||||
}
|
||||
});
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean showTutorialIfNeeded() {
|
||||
if (isLayerOn && !app.accessibilityEnabled() && !settings.IS_QUICK_ACTION_TUTORIAL_SHOWN.get() && android.os.Build.VERSION.SDK_INT >= 14) {
|
||||
TapTargetView.showFor(mapActivity, // `this` is an Activity
|
||||
TapTarget.forView(quickActionButton, mapActivity.getString(R.string.quick_action_btn_tutorial_title), mapActivity.getString(R.string.quick_action_btn_tutorial_descr))
|
||||
// All options below are optional
|
||||
.outerCircleColor(R.color.osmand_orange) // Specify a color for the outer circle
|
||||
.targetCircleColor(R.color.color_white) // Specify a color for the target circle
|
||||
.titleTextSize(20) // Specify the size (in sp) of the title text
|
||||
.descriptionTextSize(16) // Specify the size (in sp) of the description text
|
||||
.descriptionTextColor(R.color.color_white) // Specify a color for both the title and description text
|
||||
.titleTextColor(R.color.color_white) // Specify a color for both the title and description text
|
||||
.drawShadow(true) // Whether to draw a drop shadow or not
|
||||
.cancelable(false) // Whether tapping outside the outer circle dismisses the view
|
||||
.tintTarget(false) // Whether to tint the target view's color
|
||||
.transparentTarget(false) // Specify whether the target is transparent (displays the content underneath)
|
||||
.targetRadius(50), // Specify the target radius (in dp)
|
||||
new TapTargetView.Listener() { // The listener can listen for regular clicks, long clicks or cancels
|
||||
@Override
|
||||
public void onTargetClick(TapTargetView view) {
|
||||
super.onTargetClick(view); // This call is optional
|
||||
settings.IS_QUICK_ACTION_TUTORIAL_SHOWN.set(true);
|
||||
}
|
||||
});
|
||||
return true;
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
private void setQuickActionButtonMargin() {
|
||||
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) quickActionButton.getLayoutParams();
|
||||
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
|
||||
Pair<Integer, Integer> fabMargin = settings.getPortraitFabMargin();
|
||||
if (fabMargin != null) {
|
||||
param.rightMargin = fabMargin.first;
|
||||
param.bottomMargin = fabMargin.second;
|
||||
} else {
|
||||
param.bottomMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing) * 2;
|
||||
}
|
||||
} else {
|
||||
Pair<Integer, Integer> fabMargin = settings.getLandscapeFabMargin();
|
||||
if (fabMargin != null) {
|
||||
param.rightMargin = fabMargin.first;
|
||||
param.bottomMargin = fabMargin.second;
|
||||
} else {
|
||||
param.rightMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing_land) * 2;
|
||||
}
|
||||
}
|
||||
quickActionButton.setLayoutParams(param);
|
||||
}
|
||||
|
||||
private void setQuickActionButtonMargin() {
|
||||
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) quickActionButton.getLayoutParams();
|
||||
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
|
||||
Pair<Integer, Integer> fabMargin = settings.getPortraitFabMargin();
|
||||
if (fabMargin != null) {
|
||||
param.rightMargin = fabMargin.first;
|
||||
param.bottomMargin = fabMargin.second;
|
||||
} else {
|
||||
param.bottomMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing) * 2;
|
||||
}
|
||||
} else {
|
||||
Pair<Integer, Integer> fabMargin = settings.getLandscapeFabMargin();
|
||||
if (fabMargin != null) {
|
||||
param.rightMargin = fabMargin.first;
|
||||
param.bottomMargin = fabMargin.second;
|
||||
} else {
|
||||
param.rightMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing_land) * 2;
|
||||
}
|
||||
}
|
||||
quickActionButton.setLayoutParams(param);
|
||||
}
|
||||
|
||||
private int calculateTotalSizePx(@DimenRes int... dimensId) {
|
||||
int result = 0;
|
||||
for (int id : dimensId) {
|
||||
result += mapActivity.getResources().getDimensionPixelSize(id);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
private int calculateTotalSizePx(@DimenRes int... dimensId) {
|
||||
int result = 0;
|
||||
for (int id : dimensId) {
|
||||
result += mapActivity.getResources().getDimensionPixelSize(id);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public boolean isWidgetVisible() {
|
||||
return quickActionsWidget.getVisibility() == View.VISIBLE;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param showWidget
|
||||
* @return true, if state was changed
|
||||
*/
|
||||
public boolean setLayerState(boolean showWidget) {
|
||||
/**
|
||||
* @param showWidget
|
||||
* @return true, if state was changed
|
||||
*/
|
||||
public boolean setLayerState(boolean showWidget) {
|
||||
prevWidgetState = showWidget;
|
||||
if (isWidgetVisible() == showWidget) // check if state change is needed
|
||||
return false;
|
||||
if (isWidgetVisible() == showWidget) { // check if state change is needed
|
||||
return false;
|
||||
}
|
||||
|
||||
updateQuickActionButton(showWidget);
|
||||
if (settings.DO_NOT_USE_ANIMATIONS.get()) {
|
||||
quickActionsWidget.setVisibility(!showWidget ? View.GONE : View.VISIBLE);
|
||||
} else {
|
||||
animateWidget(showWidget);
|
||||
}
|
||||
mapActivity.updateStatusBarColor();
|
||||
quickActionsWidget.setVisibility(!showWidget ? View.GONE : View.VISIBLE);
|
||||
} else {
|
||||
animateWidget(showWidget);
|
||||
}
|
||||
mapActivity.updateStatusBarColor();
|
||||
|
||||
if (!showWidget) {
|
||||
quitMovingMarker();
|
||||
quickActionRegistry.setUpdatesListener(null);
|
||||
quickActionsWidget.setSelectionListener(null);
|
||||
} else {
|
||||
enterMovingMode(mapActivity.getMapView().getCurrentRotatedTileBox());
|
||||
quickActionsWidget.setActions(quickActionRegistry.getFilteredQuickActions());
|
||||
quickActionRegistry.setUpdatesListener(MapQuickActionLayer.this);
|
||||
quickActionsWidget.setSelectionListener(MapQuickActionLayer.this);
|
||||
}
|
||||
if (!showWidget) {
|
||||
quitMovingMarker();
|
||||
quickActionRegistry.setUpdatesListener(null);
|
||||
quickActionsWidget.setSelectionListener(null);
|
||||
} else {
|
||||
enterMovingMode(mapActivity.getMapView().getCurrentRotatedTileBox());
|
||||
quickActionsWidget.setActions(quickActionRegistry.getFilteredQuickActions());
|
||||
quickActionRegistry.setUpdatesListener(MapQuickActionLayer.this);
|
||||
quickActionsWidget.setSelectionListener(MapQuickActionLayer.this);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void animateWidget(final boolean show) {
|
||||
AnimatorSet set = new AnimatorSet();
|
||||
List<Animator> animators = new ArrayList<>();
|
||||
int[] animationCoordinates = AndroidUtils.getCenterViewCoordinates(quickActionButton);
|
||||
int centerX = quickActionsWidget.getWidth() / 2;
|
||||
int centerY = quickActionsWidget.getHeight() / 2;
|
||||
float initialValueX = show ? animationCoordinates[0] - centerX : 0;
|
||||
float finalValueX = show ? 0 : animationCoordinates[0] - centerX;
|
||||
float initialValueY = show ? animationCoordinates[1] - centerY : 0;
|
||||
float finalValueY = show ? 0 : animationCoordinates[1] - centerY;
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.TRANSLATION_X, initialValueX, finalValueX));
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.TRANSLATION_Y, initialValueY, finalValueY));
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||
float initialRadius = show ? 0 : (float) Math.sqrt(Math.pow(quickActionsWidget.getWidth() / 2, 2) + Math.pow(quickActionsWidget.getHeight() / 2, 2));
|
||||
float finalRadius = show ? (float) Math.sqrt(Math.pow(quickActionsWidget.getWidth() / 2, 2) + Math.pow(quickActionsWidget.getHeight() / 2, 2)) : 0;
|
||||
Animator circleAnimator = ViewAnimationUtils.createCircularReveal(quickActionsWidget, centerX, centerY, initialRadius, finalRadius);
|
||||
animators.add(circleAnimator);
|
||||
}
|
||||
float initialValueScale = show ? 0f : 1f;
|
||||
float finalValueScale = show ? 1f : 0f;
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.SCALE_X, initialValueScale, finalValueScale));
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.SCALE_Y, initialValueScale, finalValueScale));
|
||||
set.setDuration(300).playTogether(animators);
|
||||
set.addListener(new AnimatorListenerAdapter() {
|
||||
@Override
|
||||
public void onAnimationStart(Animator animation) {
|
||||
super.onAnimationStart(animation);
|
||||
if (show) {
|
||||
quickActionsWidget.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
private void animateWidget(final boolean show) {
|
||||
AnimatorSet set = new AnimatorSet();
|
||||
List<Animator> animators = new ArrayList<>();
|
||||
int[] animationCoordinates = AndroidUtils.getCenterViewCoordinates(quickActionButton);
|
||||
int centerX = quickActionsWidget.getWidth() / 2;
|
||||
int centerY = quickActionsWidget.getHeight() / 2;
|
||||
float initialValueX = show ? animationCoordinates[0] - centerX : 0;
|
||||
float finalValueX = show ? 0 : animationCoordinates[0] - centerX;
|
||||
float initialValueY = show ? animationCoordinates[1] - centerY : 0;
|
||||
float finalValueY = show ? 0 : animationCoordinates[1] - centerY;
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.TRANSLATION_X, initialValueX, finalValueX));
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.TRANSLATION_Y, initialValueY, finalValueY));
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||
float initialRadius = show ? 0 : (float) Math.sqrt(Math.pow(quickActionsWidget.getWidth() / 2, 2) + Math.pow(quickActionsWidget.getHeight() / 2, 2));
|
||||
float finalRadius = show ? (float) Math.sqrt(Math.pow(quickActionsWidget.getWidth() / 2, 2) + Math.pow(quickActionsWidget.getHeight() / 2, 2)) : 0;
|
||||
Animator circleAnimator = ViewAnimationUtils.createCircularReveal(quickActionsWidget, centerX, centerY, initialRadius,
|
||||
finalRadius);
|
||||
animators.add(circleAnimator);
|
||||
}
|
||||
float initialValueScale = show ? 0f : 1f;
|
||||
float finalValueScale = show ? 1f : 0f;
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.SCALE_X, initialValueScale, finalValueScale));
|
||||
animators.add(ObjectAnimator.ofFloat(quickActionsWidget, View.SCALE_Y, initialValueScale, finalValueScale));
|
||||
set.setDuration(300).playTogether(animators);
|
||||
set.addListener(new AnimatorListenerAdapter() {
|
||||
@Override
|
||||
public void onAnimationStart(Animator animation) {
|
||||
super.onAnimationStart(animation);
|
||||
if (show) {
|
||||
quickActionsWidget.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
super.onAnimationEnd(animation);
|
||||
if (!show) {
|
||||
quickActionsWidget.setVisibility(View.GONE);
|
||||
quickActionsWidget.setTranslationX(0);
|
||||
quickActionsWidget.setTranslationY(0);
|
||||
}
|
||||
}
|
||||
});
|
||||
set.start();
|
||||
}
|
||||
@Override
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
super.onAnimationEnd(animation);
|
||||
if (!show) {
|
||||
quickActionsWidget.setVisibility(View.GONE);
|
||||
quickActionsWidget.setTranslationX(0);
|
||||
quickActionsWidget.setTranslationY(0);
|
||||
}
|
||||
}
|
||||
});
|
||||
set.start();
|
||||
}
|
||||
|
||||
private void updateQuickActionButton(boolean widgetVisible) {
|
||||
quickActionButton.setImageDrawable(app.getUIUtilities().getIcon(
|
||||
!widgetVisible ? R.drawable.map_quick_action : R.drawable.map_action_cancel, !nightMode));
|
||||
!widgetVisible ? R.drawable.map_quick_action : R.drawable.map_action_cancel, !nightMode));
|
||||
quickActionButton.setBackgroundResource(
|
||||
nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle_trans);
|
||||
nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle_trans);
|
||||
quickActionButton.setContentDescription(mapActivity.getString(!widgetVisible ? R.string.configure_screen_quick_action : R.string.shared_string_cancel));
|
||||
}
|
||||
|
||||
private void enterMovingMode(RotatedTileBox tileBox) {
|
||||
previousMapPosition = view.getMapPosition();
|
||||
view.setMapPosition(OsmandSettings.MIDDLE_BOTTOM_CONSTANT);
|
||||
MapContextMenu menu = mapActivity.getContextMenu();
|
||||
private void enterMovingMode(RotatedTileBox tileBox) {
|
||||
previousMapPosition = view.getMapPosition();
|
||||
view.setMapPosition(OsmandSettings.MIDDLE_BOTTOM_CONSTANT);
|
||||
MapContextMenu menu = mapActivity.getContextMenu();
|
||||
|
||||
LatLon ll = menu.isActive() && tileBox.containsLatLon(menu.getLatLon()) ? menu.getLatLon() : tileBox.getCenterLatLon();
|
||||
boolean isFollowPoint = isFolowPoint(tileBox, menu);
|
||||
LatLon ll = menu.isActive() && tileBox.containsLatLon(menu.getLatLon()) ? menu.getLatLon()
|
||||
: tileBox.getCenterLatLon();
|
||||
boolean isFollowPoint = isFolowPoint(tileBox, menu);
|
||||
|
||||
menu.updateMapCenter(null);
|
||||
menu.close();
|
||||
menu.updateMapCenter(null);
|
||||
menu.close();
|
||||
|
||||
RotatedTileBox rb = new RotatedTileBox(tileBox);
|
||||
if (!isFollowPoint && previousMapPosition != OsmandSettings.BOTTOM_CONSTANT)
|
||||
rb.setCenterLocation(0.5f, 0.3f);
|
||||
RotatedTileBox rb = new RotatedTileBox(tileBox);
|
||||
if (!isFollowPoint && previousMapPosition != OsmandSettings.BOTTOM_CONSTANT) {
|
||||
rb.setCenterLocation(0.5f, 0.3f);
|
||||
}
|
||||
|
||||
rb.setLatLonCenter(ll.getLatitude(), ll.getLongitude());
|
||||
double lat = rb.getLatFromPixel(tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
|
||||
double lon = rb.getLonFromPixel(tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
|
||||
view.setLatLon(lat, lon);
|
||||
rb.setLatLonCenter(ll.getLatitude(), ll.getLongitude());
|
||||
double lat = rb.getLatFromPixel(tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
|
||||
double lon = rb.getLonFromPixel(tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
|
||||
view.setLatLon(lat, lon);
|
||||
|
||||
inMovingMarkerMode = true;
|
||||
mark(View.INVISIBLE, R.id.map_ruler_layout,
|
||||
R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
|
||||
inMovingMarkerMode = true;
|
||||
mark(View.INVISIBLE, R.id.map_ruler_layout,
|
||||
R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
|
||||
|
||||
View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
|
||||
if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
|
||||
wasCollapseButtonVisible = true;
|
||||
collapseButton.setVisibility(View.INVISIBLE);
|
||||
} else {
|
||||
wasCollapseButtonVisible = false;
|
||||
}
|
||||
View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
|
||||
if (collapseButton != null && collapseButton.getVisibility() == View.VISIBLE) {
|
||||
wasCollapseButtonVisible = true;
|
||||
collapseButton.setVisibility(View.INVISIBLE);
|
||||
} else {
|
||||
wasCollapseButtonVisible = false;
|
||||
}
|
||||
|
||||
view.refreshMap();
|
||||
}
|
||||
view.refreshMap();
|
||||
}
|
||||
|
||||
private boolean isFolowPoint(RotatedTileBox tileBox, MapContextMenu menu) {
|
||||
return OsmAndLocationProvider.isLocationPermissionAvailable(mapActivity) &&
|
||||
mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation() ||
|
||||
menu.isActive() && tileBox.containsLatLon(menu.getLatLon()); // remove if not to folow if there is selected point on map
|
||||
}
|
||||
private boolean isFolowPoint(RotatedTileBox tileBox, MapContextMenu menu) {
|
||||
return OsmAndLocationProvider.isLocationPermissionAvailable(mapActivity) &&
|
||||
mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation() ||
|
||||
menu.isActive() && tileBox.containsLatLon(
|
||||
menu.getLatLon()); // remove if not to folow if there is selected point on map
|
||||
}
|
||||
|
||||
private void quitMovingMarker() {
|
||||
private void quitMovingMarker() {
|
||||
|
||||
RotatedTileBox tileBox = mapActivity.getMapView().getCurrentRotatedTileBox();
|
||||
if (!isFolowPoint(tileBox, mapActivity.getContextMenu()) && previousMapPosition != OsmandSettings.BOTTOM_CONSTANT){
|
||||
RotatedTileBox rb = tileBox.copy();
|
||||
rb.setCenterLocation(0.5f, 0.5f);
|
||||
LatLon ll = tileBox.getCenterLatLon();
|
||||
rb.setLatLonCenter(ll.getLatitude(), ll.getLongitude());
|
||||
double lat = tileBox.getLatFromPixel(rb.getCenterPixelX(), rb.getCenterPixelY());
|
||||
double lon = tileBox.getLonFromPixel(rb.getCenterPixelX(), rb.getCenterPixelY());
|
||||
view.setLatLon(lat, lon);
|
||||
}
|
||||
view.setMapPosition(previousMapPosition);
|
||||
RotatedTileBox tileBox = mapActivity.getMapView().getCurrentRotatedTileBox();
|
||||
if (!isFolowPoint(tileBox, mapActivity.getContextMenu())
|
||||
&& previousMapPosition != OsmandSettings.BOTTOM_CONSTANT) {
|
||||
RotatedTileBox rb = tileBox.copy();
|
||||
rb.setCenterLocation(0.5f, 0.5f);
|
||||
LatLon ll = tileBox.getCenterLatLon();
|
||||
rb.setLatLonCenter(ll.getLatitude(), ll.getLongitude());
|
||||
double lat = tileBox.getLatFromPixel(rb.getCenterPixelX(), rb.getCenterPixelY());
|
||||
double lon = tileBox.getLonFromPixel(rb.getCenterPixelX(), rb.getCenterPixelY());
|
||||
view.setLatLon(lat, lon);
|
||||
}
|
||||
view.setMapPosition(previousMapPosition);
|
||||
|
||||
inMovingMarkerMode = false;
|
||||
mark(View.VISIBLE, R.id.map_ruler_layout,
|
||||
R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
|
||||
inMovingMarkerMode = false;
|
||||
mark(View.VISIBLE, R.id.map_ruler_layout,
|
||||
R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
|
||||
|
||||
View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
|
||||
if (collapseButton != null && wasCollapseButtonVisible) {
|
||||
collapseButton.setVisibility(View.VISIBLE);
|
||||
}
|
||||
view.refreshMap();
|
||||
}
|
||||
View collapseButton = mapActivity.findViewById(R.id.map_collapse_button);
|
||||
if (collapseButton != null && wasCollapseButtonVisible) {
|
||||
collapseButton.setVisibility(View.VISIBLE);
|
||||
}
|
||||
view.refreshMap();
|
||||
}
|
||||
|
||||
private void mark(int status, int... widgets) {
|
||||
for (int widget : widgets) {
|
||||
View v = mapActivity.findViewById(widget);
|
||||
if (v != null) {
|
||||
v.setVisibility(status);
|
||||
}
|
||||
}
|
||||
}
|
||||
private void mark(int status, int... widgets) {
|
||||
for (int widget : widgets) {
|
||||
View v = mapActivity.findViewById(widget);
|
||||
if (v != null) {
|
||||
v.setVisibility(status);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
|
||||
if (isInMovingMarkerMode() && !pressedQuickActionWidget(point.x, point.y)) {
|
||||
setLayerState(false);
|
||||
return true;
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
|
||||
if (isInMovingMarkerMode() && !pressedQuickActionWidget(point.x, point.y)) {
|
||||
setLayerState(false);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean pressedQuickActionWidget(float px, float py) {
|
||||
return py <= quickActionsWidget.getHeight();
|
||||
}
|
||||
private boolean pressedQuickActionWidget(float px, float py) {
|
||||
return py <= quickActionsWidget.getHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDraw(Canvas canvas, RotatedTileBox box, DrawSettings settings) {
|
||||
@Override
|
||||
public void onDraw(Canvas canvas, RotatedTileBox box, DrawSettings settings) {
|
||||
boolean nightMode = app.getDaynightHelper().isNightModeForMapControls();
|
||||
if (isInMovingMarkerMode()) {
|
||||
canvas.translate(box.getCenterPixelX() - contextMarker.getWidth() / 2, box.getCenterPixelY() - contextMarker.getHeight());
|
||||
contextMarker.draw(canvas);
|
||||
}
|
||||
if (isInMovingMarkerMode()) {
|
||||
canvas.translate(box.getCenterPixelX() - contextMarker.getWidth() / 2,
|
||||
box.getCenterPixelY() - contextMarker.getHeight());
|
||||
contextMarker.draw(canvas);
|
||||
}
|
||||
if (this.nightMode != nightMode) {
|
||||
this.nightMode = nightMode;
|
||||
updateQuickActionButton(prevWidgetState);
|
||||
}
|
||||
setupQuickActionBtnVisibility();
|
||||
}
|
||||
setupQuickActionBtnVisibility();
|
||||
}
|
||||
|
||||
private void setupQuickActionBtnVisibility() {
|
||||
MapContextMenu contextMenu = mapActivity.getContextMenu();
|
||||
MapMultiSelectionMenu multiSelectionMenu = contextMenu.getMultiSelectionMenu();
|
||||
WeakReference<MapContextMenuFragment> contextMenuMenuFragmentRef = contextMenu.findMenuFragment();
|
||||
MapContextMenuFragment contextMenuMenuFragment = contextMenuMenuFragmentRef != null ? contextMenuMenuFragmentRef.get() : null;
|
||||
Fragment multiMenuFragment = multiSelectionMenu.getFragmentByTag();
|
||||
boolean hideQuickButton = !isLayerOn ||
|
||||
contextMenuLayer.isInChangeMarkerPositionMode() ||
|
||||
contextMenuLayer.isInGpxDetailsMode() ||
|
||||
measurementToolLayer.isInMeasurementMode() ||
|
||||
mapMarkersLayer.isInPlanRouteMode() ||
|
||||
contextMenu.isVisible() && contextMenuMenuFragment != null && !contextMenuMenuFragment.isRemoving() ||
|
||||
contextMenu.isVisible() && contextMenuMenuFragment != null && contextMenuMenuFragment.isAdded() ||
|
||||
multiSelectionMenu.isVisible() && multiMenuFragment != null && multiMenuFragment.isAdded() ||
|
||||
multiSelectionMenu.isVisible() && multiMenuFragment != null && !multiMenuFragment.isRemoving();
|
||||
quickActionButton.setVisibility(hideQuickButton ? View.GONE : View.VISIBLE);
|
||||
}
|
||||
private void setupQuickActionBtnVisibility() {
|
||||
MapContextMenu contextMenu = mapActivity.getContextMenu();
|
||||
MapMultiSelectionMenu multiSelectionMenu = contextMenu.getMultiSelectionMenu();
|
||||
WeakReference<MapContextMenuFragment> contextMenuMenuFragmentRef = contextMenu
|
||||
.findMenuFragment();
|
||||
MapContextMenuFragment contextMenuMenuFragment =
|
||||
contextMenuMenuFragmentRef != null ? contextMenuMenuFragmentRef.get() : null;
|
||||
Fragment multiMenuFragment = multiSelectionMenu.getFragmentByTag();
|
||||
boolean hideQuickButton = !isLayerOn ||
|
||||
contextMenuLayer.isInChangeMarkerPositionMode() ||
|
||||
contextMenuLayer.isInGpxDetailsMode() ||
|
||||
measurementToolLayer.isInMeasurementMode() ||
|
||||
mapMarkersLayer.isInPlanRouteMode() ||
|
||||
contextMenu.isVisible() && contextMenuMenuFragment != null && !contextMenuMenuFragment.isRemoving() ||
|
||||
contextMenu.isVisible() && contextMenuMenuFragment != null && contextMenuMenuFragment.isAdded() ||
|
||||
multiSelectionMenu.isVisible() && multiMenuFragment != null && multiMenuFragment.isAdded() ||
|
||||
multiSelectionMenu.isVisible() && multiMenuFragment != null && !multiMenuFragment.isRemoving();
|
||||
quickActionButton.setVisibility(hideQuickButton ? View.GONE : View.VISIBLE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void destroyLayer() {
|
||||
@Override
|
||||
public void destroyLayer() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean drawInScreenPixels() {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean drawInScreenPixels() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onActionsUpdated() {
|
||||
quickActionsWidget.setActions(quickActionRegistry.getFilteredQuickActions());
|
||||
}
|
||||
@Override
|
||||
public void onActionsUpdated() {
|
||||
quickActionsWidget.setActions(quickActionRegistry.getFilteredQuickActions());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActionSelected(QuickAction action) {
|
||||
QuickActionFactory.produceAction(action).execute(mapActivity);
|
||||
setLayerState(false);
|
||||
}
|
||||
@Override
|
||||
public void onActionSelected(QuickAction action) {
|
||||
QuickActionFactory.produceAction(action).execute(mapActivity);
|
||||
setLayerState(false);
|
||||
}
|
||||
|
||||
public PointF getMovableCenterPoint(RotatedTileBox tb) {
|
||||
return new PointF(tb.getPixWidth() / 2, tb.getPixHeight() / 2);
|
||||
}
|
||||
public PointF getMovableCenterPoint(RotatedTileBox tb) {
|
||||
return new PointF(tb.getPixWidth() / 2, tb.getPixHeight() / 2);
|
||||
}
|
||||
|
||||
public boolean isInMovingMarkerMode() {
|
||||
return isLayerOn && inMovingMarkerMode;
|
||||
}
|
||||
public boolean isInMovingMarkerMode() {
|
||||
return isLayerOn && inMovingMarkerMode;
|
||||
}
|
||||
|
||||
public boolean isLayerOn() {
|
||||
return isLayerOn;
|
||||
}
|
||||
public boolean isLayerOn() {
|
||||
return isLayerOn;
|
||||
}
|
||||
|
||||
public boolean onBackPressed() {
|
||||
return setLayerState(false);
|
||||
}
|
||||
public boolean onBackPressed() {
|
||||
return setLayerState(false);
|
||||
}
|
||||
|
||||
View.OnTouchListener onQuickActionTouchListener = new View.OnTouchListener() {
|
||||
private int initialMarginX;
|
||||
private int initialMarginY;
|
||||
private float initialTouchX;
|
||||
private float initialTouchY;
|
||||
View.OnTouchListener onQuickActionTouchListener = new View.OnTouchListener() {
|
||||
private int initialMarginX;
|
||||
private int initialMarginY;
|
||||
private float initialTouchX;
|
||||
private float initialTouchY;
|
||||
|
||||
@Override
|
||||
public boolean onTouch(View v, MotionEvent event) {
|
||||
switch (event.getAction()) {
|
||||
case MotionEvent.ACTION_DOWN:
|
||||
setUpInitialValues(v, event);
|
||||
return true;
|
||||
case MotionEvent.ACTION_UP:
|
||||
quickActionButton.setOnTouchListener(null);
|
||||
quickActionButton.setPressed(false);
|
||||
quickActionButton.setScaleX(1);
|
||||
quickActionButton.setScaleY(1);
|
||||
quickActionButton.setAlpha(1f);
|
||||
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams();
|
||||
if (AndroidUiHelper.isOrientationPortrait(mapActivity))
|
||||
settings.setPortraitFabMargin(params.rightMargin, params.bottomMargin);
|
||||
else
|
||||
settings.setLandscapeFabMargin(params.rightMargin, params.bottomMargin);
|
||||
return true;
|
||||
case MotionEvent.ACTION_MOVE:
|
||||
if (initialMarginX == 0 && initialMarginY == 0 && initialTouchX == 0 && initialTouchY == 0)
|
||||
setUpInitialValues(v, event);
|
||||
@Override
|
||||
public boolean onTouch(View v, MotionEvent event) {
|
||||
switch (event.getAction()) {
|
||||
case MotionEvent.ACTION_DOWN:
|
||||
setUpInitialValues(v, event);
|
||||
return true;
|
||||
case MotionEvent.ACTION_UP:
|
||||
quickActionButton.setOnTouchListener(null);
|
||||
quickActionButton.setPressed(false);
|
||||
quickActionButton.setScaleX(1);
|
||||
quickActionButton.setScaleY(1);
|
||||
quickActionButton.setAlpha(1f);
|
||||
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v
|
||||
.getLayoutParams();
|
||||
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
|
||||
settings.setPortraitFabMargin(params.rightMargin, params.bottomMargin);
|
||||
} else {
|
||||
settings.setLandscapeFabMargin(params.rightMargin, params.bottomMargin);
|
||||
}
|
||||
return true;
|
||||
case MotionEvent.ACTION_MOVE:
|
||||
if (initialMarginX == 0 && initialMarginY == 0 && initialTouchX == 0
|
||||
&& initialTouchY == 0) {
|
||||
setUpInitialValues(v, event);
|
||||
}
|
||||
|
||||
int padding = calculateTotalSizePx(R.dimen.map_button_margin);
|
||||
FrameLayout parent = (FrameLayout) v.getParent();
|
||||
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) v.getLayoutParams();
|
||||
int padding = calculateTotalSizePx(R.dimen.map_button_margin);
|
||||
FrameLayout parent = (FrameLayout) v.getParent();
|
||||
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) v.getLayoutParams();
|
||||
|
||||
int deltaX = (int) (initialTouchX - event.getRawX());
|
||||
int deltaY = (int) (initialTouchY - event.getRawY());
|
||||
int deltaX = (int) (initialTouchX - event.getRawX());
|
||||
int deltaY = (int) (initialTouchY - event.getRawY());
|
||||
|
||||
int newMarginX = interpolate(initialMarginX + deltaX, v.getWidth(), parent.getWidth() - padding * 2);
|
||||
int newMarginY = interpolate(initialMarginY + deltaY, v.getHeight(), parent.getHeight() - padding * 2);
|
||||
int newMarginX = interpolate(initialMarginX + deltaX, v.getWidth(),
|
||||
parent.getWidth() - padding * 2);
|
||||
int newMarginY = interpolate(initialMarginY + deltaY, v.getHeight(),
|
||||
parent.getHeight() - padding * 2);
|
||||
|
||||
if (v.getHeight() + newMarginY <= parent.getHeight() - padding * 2 && newMarginY > 0)
|
||||
param.bottomMargin = newMarginY;
|
||||
if (v.getHeight() + newMarginY <= parent.getHeight() - padding * 2 && newMarginY > 0) {
|
||||
param.bottomMargin = newMarginY;
|
||||
}
|
||||
|
||||
if (v.getWidth() + newMarginX <= parent.getWidth() - padding * 2 && newMarginX > 0) {
|
||||
param.rightMargin = newMarginX;
|
||||
}
|
||||
if (v.getWidth() + newMarginX <= parent.getWidth() - padding * 2 && newMarginX > 0) {
|
||||
param.rightMargin = newMarginX;
|
||||
}
|
||||
|
||||
v.setLayoutParams(param);
|
||||
v.setLayoutParams(param);
|
||||
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private int interpolate(int value, int divider, int boundsSize) {
|
||||
int viewSize = divider;
|
||||
if (value <= divider && value > 0)
|
||||
return value * value / divider;
|
||||
else {
|
||||
int leftMargin = boundsSize - value - viewSize;
|
||||
if (leftMargin <= divider && value < boundsSize - viewSize)
|
||||
return leftMargin - (leftMargin * leftMargin / divider) + value;
|
||||
else
|
||||
return value;
|
||||
}
|
||||
}
|
||||
private int interpolate(int value, int divider, int boundsSize) {
|
||||
int viewSize = divider;
|
||||
if (value <= divider && value > 0) {
|
||||
return value * value / divider;
|
||||
} else {
|
||||
int leftMargin = boundsSize - value - viewSize;
|
||||
if (leftMargin <= divider && value < boundsSize - viewSize) {
|
||||
return leftMargin - (leftMargin * leftMargin / divider) + value;
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void setUpInitialValues(View v, MotionEvent event) {
|
||||
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams();
|
||||
private void setUpInitialValues(View v, MotionEvent event) {
|
||||
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams();
|
||||
|
||||
initialMarginX = params.rightMargin;
|
||||
initialMarginY = params.bottomMargin;
|
||||
initialMarginX = params.rightMargin;
|
||||
initialMarginY = params.bottomMargin;
|
||||
|
||||
initialTouchX = event.getRawX();
|
||||
initialTouchY = event.getRawY();
|
||||
}
|
||||
};
|
||||
initialTouchX = event.getRawX();
|
||||
initialTouchY = event.getRawY();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue