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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-11-18 16:29:44 +01:00
commit 40c7db40e7
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -36,7 +36,6 @@ import net.osmand.plus.IconsCache;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashLocationFragment; import net.osmand.plus.dashboard.DashLocationFragment;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents; import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
@ -361,14 +360,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
}); });
final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button); final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button);
// Correct use of destination vs. waypoit icon on button: buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_flag_dark,
if (getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark)); light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
} else {
buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoints,
light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
}
buttonWaypoint.setOnClickListener(new View.OnClickListener() { buttonWaypoint.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -257,7 +257,7 @@ public abstract class MenuController extends BaseMenuController {
public Drawable getSecondLineTypeIcon() { return null; } public Drawable getSecondLineTypeIcon() { return null; }
public int getFavActionIconId() { return R.drawable.ic_action_fav_dark; } public int getFavActionIconId() { return R.drawable.map_action_fav_dark; }
public String getTypeStr() { return ""; } public String getTypeStr() { return ""; }

7
OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java
View file

@ -29,7 +29,12 @@ public class EditPOIMenuBuilder extends MenuBuilder {
OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint; OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint;
for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) { for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) {
String text = e.getKey() + "=" + e.getValue(); String text;
if (EditPoiData.POI_TYPE_TAG.equals(e.getKey())) {
text = e.getValue();
} else {
text = e.getKey() + "=" + e.getValue();
}
buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, 0); buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, 0);
} }
} }