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

Move additional options button from start item to header

Browse source
This commit is contained in:
Alexander Sytnyk 2018-01-24 19:13:30 +02:00
parent 4c36456079
commit ad1058e451
1 changed files with 54 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -340,7 +340,7 @@ public class WaypointDialogHelper {
//Drawable d = new ColorDrawable(mapActivity.getResources().getColor(R.color.dashboard_divider_light)); //Drawable d = new ColorDrawable(mapActivity.getResources().getColor(R.color.dashboard_divider_light));
AndroidUtils.setListItemBackground(mapActivity, v, nightMode); AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
} else if (labelView) { } else if (labelView) {
v = createItemForCategory(ctx, (Integer) obj, running, position, thisAdapter, nightMode); v = createItemForCategory(ctx, (Integer) obj, running, position, thisAdapter, nightMode, helper);
AndroidUtils.setListItemBackground(mapActivity, v, nightMode); AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
} else if (topDividerView) { } else if (topDividerView) {
v = ctx.getLayoutInflater().inflate(R.layout.card_top_divider, null); v = ctx.getLayoutInflater().inflate(R.layout.card_top_divider, null);
@ -409,74 +409,7 @@ public class WaypointDialogHelper {
if (((TargetPoint) point.point).start) { if (((TargetPoint) point.point).start) {
remove.setVisibility(View.GONE); remove.setVisibility(View.GONE);
move.setVisibility(View.GONE); move.setVisibility(View.GONE);
more.setVisibility(View.VISIBLE); more.setVisibility(View.GONE);
((ImageButton) more).setImageDrawable(app.getIconsCache().getIcon(
R.drawable.map_overflow_menu_white, !nightMode));
more.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
boolean hasActivePoints = false;
if (adapter instanceof StableArrayAdapter) {
hasActivePoints = ((StableArrayAdapter) adapter).getActiveObjects().size() > 0;
}
final PopupMenu optionsMenu = new PopupMenu(ctx, more);
DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
final TargetPoint start = targetPointsHelper.getPointToStart();
final TargetPoint finish = targetPointsHelper.getPointToNavigate();
MenuItem item;
if (hasActivePoints) {
item = optionsMenu.getMenu().add(
R.string.intermediate_items_sort_by_distance).setIcon(app.getIconsCache().
getThemedIcon(R.drawable.ic_sort_waypoint_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
// sort door-to-door
sortAllTargets(app, ctx, helper);
return true;
}
});
item = optionsMenu.getMenu().add(
R.string.switch_start_finish).setIcon(app.getIconsCache().
getThemedIcon(R.drawable.ic_action_undo_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switchStartAndFinish(targetPointsHelper, finish, ctx, start, app, helper);
return true;
}
});
if (start != null) {
if (targetPointsHelper.getIntermediatePoints().size() > 0) {
item = optionsMenu.getMenu().add(R.string.shared_string_move_down)
.setIcon(app.getIconsCache().getThemedIcon(R.drawable.ic_action_arrow_drop_down));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switchStartAndFirstIntermediate(targetPointsHelper, ctx, start, helper);
return true;
}
});
}
item = optionsMenu.getMenu().add(R.string.shared_string_remove)
.setIcon(app.getIconsCache().getThemedIcon(R.drawable.ic_action_remove_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
targetPointsHelper.setStartPoint(null, true, null);
updateControls(ctx, helper);
return true;
}
});
}
}
if (optionsMenu.getMenu().size() > 0) {
optionsMenu.show();
}
}
});
} else { } else {
remove.setVisibility(View.GONE); remove.setVisibility(View.GONE);
move.setVisibility(View.VISIBLE); move.setVisibility(View.VISIBLE);
@ -707,7 +640,8 @@ public class WaypointDialogHelper {
} }
protected View createItemForCategory(final FragmentActivity ctx, final int type, final int[] running, protected View createItemForCategory(final FragmentActivity ctx, final int type, final int[] running,
final int position, final ArrayAdapter<Object> thisAdapter, boolean nightMode) { final int position, final ArrayAdapter<Object> thisAdapter,
boolean nightMode, final WaypointDialogHelper helper) {
View v; View v;
v = ctx.getLayoutInflater().inflate(R.layout.waypoint_header, null); v = ctx.getLayoutInflater().inflate(R.layout.waypoint_header, null);
final CompoundButton btn = (CompoundButton) v.findViewById(R.id.toggle_item); final CompoundButton btn = (CompoundButton) v.findViewById(R.id.toggle_item);
@ -732,6 +666,56 @@ public class WaypointDialogHelper {
}); });
final ImageButton moreBtn = (ImageButton) v.findViewById(R.id.image_button);
if (type == WaypointHelper.TARGETS) {
moreBtn.setVisibility(View.VISIBLE);
moreBtn.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_overflow_menu_white, !nightMode));
moreBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
boolean hasActivePoints = false;
if (thisAdapter instanceof StableArrayAdapter) {
hasActivePoints = ((StableArrayAdapter) thisAdapter).getActiveObjects().size() > 0;
}
final PopupMenu optionsMenu = new PopupMenu(ctx, moreBtn);
DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
MenuItem item;
if (hasActivePoints) {
item = optionsMenu.getMenu()
.add(R.string.intermediate_items_sort_by_distance)
.setIcon(app.getIconsCache().getThemedIcon(R.drawable.ic_sort_waypoint_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
// sort door-to-door
sortAllTargets(app, ctx, helper);
return true;
}
});
item = optionsMenu.getMenu()
.add(R.string.switch_start_finish)
.setIcon(app.getIconsCache().getThemedIcon(R.drawable.ic_action_undo_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
switchStartAndFinish(targetPointsHelper, targetPointsHelper.getPointToNavigate(),
ctx, targetPointsHelper.getPointToStart(), app, helper);
return true;
}
});
}
if (optionsMenu.getMenu().size() > 0) {
optionsMenu.show();
}
}
});
} else {
moreBtn.setVisibility(View.GONE);
}
TextView tv = (TextView) v.findViewById(R.id.header_text); TextView tv = (TextView) v.findViewById(R.id.header_text);
AndroidUtils.setTextPrimaryColor(mapActivity, tv, nightMode); AndroidUtils.setTextPrimaryColor(mapActivity, tv, nightMode);
tv.setText(getHeader(type, checked, ctx)); tv.setText(getHeader(type, checked, ctx));