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

Merge remote-tracking branch 'origin/plan_route_options' into plan_route_options

Browse source
This commit is contained in:
Dima-1 2020-08-04 09:04:22 +03:00
commit b2118e6865
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,10 +89,13 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import static net.osmand.IndexConstants.GPX_FILE_EXT; import static net.osmand.IndexConstants.GPX_FILE_EXT;
import static net.osmand.plus.measurementtool.MeasurementEditingContext.*; import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType;
import static net.osmand.plus.measurementtool.SelectFileBottomSheet.Mode.*; import static net.osmand.plus.measurementtool.MeasurementEditingContext.ExportAsGpxListener;
import static net.osmand.plus.measurementtool.MeasurementEditingContext.SnapToRoadProgressListener;
import static net.osmand.plus.measurementtool.SelectFileBottomSheet.Mode.ADD_TO_TRACK;
import static net.osmand.plus.measurementtool.SelectFileBottomSheet.Mode.OPEN_TRACK;
import static net.osmand.plus.measurementtool.SelectFileBottomSheet.SelectFileListener; import static net.osmand.plus.measurementtool.SelectFileBottomSheet.SelectFileListener;
import static net.osmand.plus.measurementtool.SnapTrackWarningBottomSheet.*; import static net.osmand.plus.measurementtool.SnapTrackWarningBottomSheet.SnapTrackWarningListener;
import static net.osmand.plus.measurementtool.StartPlanRouteBottomSheet.StartPlanRouteListener; import static net.osmand.plus.measurementtool.StartPlanRouteBottomSheet.StartPlanRouteListener;
public class MeasurementToolFragment extends BaseOsmAndFragment { public class MeasurementToolFragment extends BaseOsmAndFragment {
@ -226,18 +229,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
distanceToCenterTv = (TextView) mainView.findViewById(R.id.distance_to_center_text_view); distanceToCenterTv = (TextView) mainView.findViewById(R.id.distance_to_center_text_view);
mainIcon = (ImageView) mainView.findViewById(R.id.main_icon); mainIcon = (ImageView) mainView.findViewById(R.id.main_icon);
final NewGpxData newGpxData = editingCtx.getNewGpxData();
if (newGpxData != null) {
ActionType actionType = newGpxData.getActionType();
if (actionType == ActionType.ADD_SEGMENT || actionType == ActionType.EDIT_SEGMENT) {
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_polygom_dark));
} else {
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_markers_dark));
}
} else {
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
}
upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button); upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
upDownBtn.setImageDrawable(upIcon); upDownBtn.setImageDrawable(upIcon);
@ -397,6 +388,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
} else { } else {
toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark); toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
} }
final NewGpxData newGpxData = editingCtx.getNewGpxData();
if (newGpxData != null) { if (newGpxData != null) {
ActionType actionType = newGpxData.getActionType(); ActionType actionType = newGpxData.getActionType();
if (actionType == ActionType.ADD_ROUTE_POINTS) { if (actionType == ActionType.ADD_ROUTE_POINTS) {
@ -578,6 +570,20 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
progressBarVisible = true; progressBarVisible = true;
} }
private void updateMainIcon() {
NewGpxData newGpxData = editingCtx.getNewGpxData();
if (newGpxData != null) {
ActionType actionType = newGpxData.getActionType();
if (actionType == ActionType.ADD_SEGMENT || actionType == ActionType.EDIT_SEGMENT) {
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_polygom_dark));
} else {
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_markers_dark));
}
} else {
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
}
}
private void showRouteBetweenPointsMenu(boolean rememberPreviousTitle) { private void showRouteBetweenPointsMenu(boolean rememberPreviousTitle) {
MapActivity mapActivity = getMapActivity(); MapActivity mapActivity = getMapActivity();
if (mapActivity != null) { if (mapActivity != null) {
@ -1700,6 +1706,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
} else { } else {
wasCollapseButtonVisible = false; wasCollapseButtonVisible = false;
} }
updateMainIcon();
updateDistancePointsText(); updateDistancePointsText();
} }
} }