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 2017-03-11 10:20:37 +01:00
commit b734cf76e2
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
View file

@ -33,6 +33,7 @@ public class WptPtEditorFragment extends PointEditorFragment {
private boolean saved;
private int color;
private int defaultColor;
private boolean skipDialog;
@Override
@ -41,6 +42,7 @@ public class WptPtEditorFragment extends PointEditorFragment {
savingTrackHelper = getMapActivity().getMyApplication().getSavingTrackHelper();
selectedGpxHelper = getMapActivity().getMyApplication().getSelectedGpxHelper();
editor = getMapActivity().getContextMenu().getWptPtPointEditor();
defaultColor = getResources().getColor(R.color.gpx_color_point);
}
@Override
@ -52,18 +54,19 @@ public class WptPtEditorFragment extends PointEditorFragment {
FavoriteGroup group = getMyApplication().getFavorites().getGroup(wpt.category);
if (group == null) {
int defaultColor = getResources().getColor(R.color.gpx_color_point);
color = wpt.getColor(defaultColor);
} else color = group.color;
color = wpt.getColor(0);
} else {
color = group.color;
}
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
if (skipDialog) save(true);
if (skipDialog) {
save(true);
}
}
@Override
@ -247,12 +250,12 @@ public class WptPtEditorFragment extends PointEditorFragment {
@Override
public Drawable getNameIcon() {
return FavoriteImageDrawable.getOrCreate(getMapActivity(), color, false);
return FavoriteImageDrawable.getOrCreate(getMapActivity(), color == 0 ? defaultColor : color, false);
}
@Override
public Drawable getCategoryIcon() {
return getPaintedIcon(R.drawable.ic_action_folder_stroke, color);
return getPaintedIcon(R.drawable.ic_action_folder_stroke, color == 0 ? defaultColor : color);
}
private static class SaveGpxAsyncTask extends AsyncTask<Void, Void, Void> {

2
OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
View file

@ -818,7 +818,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
groupColor = gpxItem.locationStart.getColor(groupColor);
}
if (groupColor == 0) {
groupColor = getMyActivity().getResources().getColor(R.color.gpx_track);
groupColor = getMyActivity().getResources().getColor(R.color.gpx_color_point);
}
icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), groupColor, false));
} else {