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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2018-01-26 11:05:27 +01:00
commit 23f12c498f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -391,9 +391,10 @@ public class WaypointDialogHelper {
boolean startPoint = notFlatTargets && ((TargetPoint) point.point).start; boolean startPoint = notFlatTargets && ((TargetPoint) point.point).start;
final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper(); final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
boolean canRemove = !targetPointsHelper.getIntermediatePoints().isEmpty(); boolean canRemove = !targetPointsHelper.getIntermediatePoints().isEmpty();
int iconResId = nightMode ? R.color.marker_circle_button_color_dark : R.color.ctx_menu_title_color_dark;
remove.setVisibility(View.VISIBLE); remove.setVisibility(View.VISIBLE);
remove.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_remove_dark, !nightMode)); remove.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_remove_dark, iconResId));
remove.setEnabled(canRemove); remove.setEnabled(canRemove);
remove.setAlpha(canRemove ? 1 : .5f); remove.setAlpha(canRemove ? 1 : .5f);
if (canRemove) { if (canRemove) {
@ -423,7 +424,7 @@ public class WaypointDialogHelper {
move.setVisibility(notFlatTargets ? View.VISIBLE : View.GONE); move.setVisibility(notFlatTargets ? View.VISIBLE : View.GONE);
if (notFlatTargets) { if (notFlatTargets) {
move.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_reorder, !nightMode)); move.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_reorder, iconResId));
move.setTag(new DragIcon() { move.setTag(new DragIcon() {
@Override @Override
public void onClick() { public void onClick() {