Fix waypoitn dialog helper

This commit is contained in:
Victor Shcherb 2014-10-26 17:47:31 +01:00
parent a581218f8b
commit ec012994dd

View file

@ -543,13 +543,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
} }
} }
}); });
if(flat) {
all.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_action_gdown_light
: R.drawable.ic_action_gdown_dark);
} else {
all.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_action_gup_light
: R.drawable.ic_action_gup_dark);
}
if(app.getTargetPointsHelper().getIntermediatePoints().size() > 0) { if(app.getTargetPointsHelper().getIntermediatePoints().size() > 0) {
sort.setVisibility(View.VISIBLE); sort.setVisibility(View.VISIBLE);
sort.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_sort_waypoint_white sort.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_sort_waypoint_white
@ -567,7 +561,17 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
} else { } else {
sort.setVisibility(View.GONE); sort.setVisibility(View.GONE);
} }
if(waypointHelper.isRouteCalculated()) {
all.setVisibility(View.GONE);
} else {
all.setVisibility(View.VISIBLE);
if(flat) {
all.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_action_gdown_light
: R.drawable.ic_action_gdown_dark);
} else {
all.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_action_gup_light
: R.drawable.ic_action_gup_dark);
}
all.setOnClickListener(new View.OnClickListener() { all.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -581,6 +585,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
} }
} }
}); });
}
return v; return v;
} }