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

Selected point menu styling

Browse source
This commit is contained in:
PavelRatushny 2017-08-15 13:14:10 +03:00
parent 0b992d2b5d
commit d336451b30
3 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -299,6 +299,9 @@ public class MeasurementToolFragment extends Fragment {
@Override
public void onSelectPoint() {
if (pointsListOpened) {
hidePointsList();
}
openSelectedPointMenu(mapActivity);
}
});
@ -366,7 +369,19 @@ public class MeasurementToolFragment extends Fragment {
@Override
public void onItemClick(View view) {
measurementLayer.moveMapToPoint(pointsRv.indexOfChild(view));
int position = pointsRv.indexOfChild(view);
if (pointsListOpened) {
hidePointsList();
}
OsmandMapTileView tileView = mapActivity.getMapView();
if (portrait) {
previousMapPosition = tileView.getMapPosition();
tileView.setMapPosition(MIDDLE_TOP_CONSTANT);
}
mapActivity.refreshMap();
measurementLayer.moveMapToPoint(position);
measurementLayer.selectPoint(position);
openSelectedPointMenu(mapActivity);
}
@Override
@ -437,6 +452,11 @@ public class MeasurementToolFragment extends Fragment {
}
enterAddPointBeforeMode();
}
@Override
public void onCloseMenu() {
setPreviousMapPosition();
}
});
fragment.show(mapActivity.getSupportFragmentManager(), SelectedPointMenuBottomSheetDialogFragment.TAG);
}

8
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
View file

@ -176,7 +176,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
private void selectPoint(double x, double y) {
clearSelection();
RotatedTileBox tb = view.getCurrentRotatedTileBox();
double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 10);
double lowestDistance = AndroidUtils.dpToPx(view.getContext(), 20);
for (int i = 0; i < measurementPoints.size(); i++) {
WptPt pt = measurementPoints.get(i);
if (tb.containsLatLon(pt.getLatitude(), pt.getLongitude())) {
@ -192,6 +192,12 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
}
}
public void selectPoint(int position) {
clearSelection();
selectedCachedPoint = new WptPt(measurementPoints.get(position));
selectedPointPos = position;
}
@Override
public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
if (inMeasurementMode) {

19
OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointMenuBottomSheetDialogFragment.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.measurementtool;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
@ -161,6 +162,22 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
}
@Override
public void dismiss() {
if (listener != null) {
listener.onCloseMenu();
}
super.dismiss();
}
@Override
public void onCancel(DialogInterface dialog) {
if (listener != null) {
listener.onCloseMenu();
}
super.onCancel(dialog);
}
interface SelectedPointOptionOnClickListener {
void moveOnClick();
@ -170,5 +187,7 @@ public class SelectedPointMenuBottomSheetDialogFragment extends BottomSheetDialo
void addPointAfterOnClick();
void addPointBeforeOnClick();
void onCloseMenu();
}
}