fix waypoint vs. dest icn behavior on context menu

This commit is contained in:
sonora 2015-11-15 09:54:15 +01:00
parent 52953620b1
commit 5f3636c39b
2 changed files with 8 additions and 3 deletions

View file

@ -309,7 +309,7 @@
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/dashboard_button" android:background="?attr/dashboard_button"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_action_flag_dark"/> android:src="@drawable/map_action_waypoints"/>
<View <View
android:layout_width="1dp" android:layout_width="1dp"

View file

@ -36,6 +36,7 @@ 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;
@ -424,9 +425,13 @@ 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);
//buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoints, if (getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark, 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) {