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

quick action add favorite bugs fixes

Browse source
This commit is contained in:
Rosty 2016-12-30 15:15:32 +02:00
parent efb24f7c03
commit cde0be4de1
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,7 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
return; return;
} }
if (builder != null) { if (builder != null && !autoFill) {
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {

11
OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
View file

@ -360,16 +360,15 @@ public class QuickActionFactory {
private void fillGroupParams(View root, String name, int color) { private void fillGroupParams(View root, String name, int color) {
if (color == 0) color = R.color.color_favorite;
((AutoCompleteTextViewEx) root.findViewById(R.id.category_edit)).setText(name); ((AutoCompleteTextViewEx) root.findViewById(R.id.category_edit)).setText(name);
getParams().put(KEY_CATEGORY_NAME, name);
if (color > 0) {
((ImageView) root.findViewById(R.id.category_image)).setColorFilter(color); ((ImageView) root.findViewById(R.id.category_image)).setColorFilter(color);
getParams().put(KEY_CATEGORY_NAME, name);
getParams().put(KEY_CATEGORY_COLOR, String.valueOf(color)); getParams().put(KEY_CATEGORY_COLOR, String.valueOf(color));
} }
} }
}
public static class ShowHideFavoritesAction extends QuickAction { public static class ShowHideFavoritesAction extends QuickAction {
@ -426,7 +425,7 @@ public class QuickActionFactory {
PoiFiltersHelper pf = activity.getMyApplication().getPoiFilters(); PoiFiltersHelper pf = activity.getMyApplication().getPoiFilters();
if (pf.getSelectedPoiFilters().isEmpty()){ if (pf.getSelectedPoiFilters().isEmpty()) {
pf.loadSelectedPoiFilters(); pf.loadSelectedPoiFilters();

2
OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
View file

@ -131,7 +131,7 @@ public class QuickActionRegistry {
number++; number++;
action.setName(name + "(" + number + ")"); action.setName(name + " (" + number + ")");
if (isNameUnique(action, context)) return action; if (isNameUnique(action, context)) return action;
} }