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 2015-11-12 18:47:46 +01:00
commit fca1a2db92
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
View file

@ -55,8 +55,8 @@ public class WptPtMenuController extends MenuController {
@Override
public Drawable getLeftIcon() {
return FavoriteImageDrawable.getOrCreate(getMapActivity().getMyApplication(),
wpt.getColor(getMapActivity().getResources().getColor(R.color.gpx_color_point)), false);
return getPaintedIcon(R.drawable.ic_action_fav_dark,
wpt.getColor(getMapActivity().getResources().getColor(R.color.gpx_color_point)));
}
@Override

15
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WprPtEditorFragment.java
View file

@ -3,17 +3,14 @@ package net.osmand.plus.mapcontextmenu.editors;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import net.osmand.data.LatLon;
import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.util.Algorithms;
@ -144,20 +141,12 @@ public class WprPtEditorFragment extends PointEditorFragment {
@Override
public Drawable getNameIcon() {
int color = wpt.getColor(defaultColor);
return FavoriteImageDrawable.getOrCreate(getMapActivity(), color, false);
return getPaintedIcon(R.drawable.ic_action_fav_dark, color);
}
@Override
public Drawable getCategoryIcon() {
int color = wpt.getColor(defaultColor);
return getIcon(R.drawable.ic_action_folder_stroke, color);
}
public Drawable getIcon(int resId, int color) {
OsmandApplication app = getMyApplication();
Drawable d = app.getResources().getDrawable(resId).mutate();
d.clearColorFilter();
d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
return d;
return getPaintedIcon(R.drawable.ic_action_folder_stroke, color);
}
}