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

quick action switchable list fix

Browse source
This commit is contained in:
Rosty 2017-01-10 13:24:42 +02:00
parent 3724e19a69
commit 5af7d6fb13
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -554,12 +554,16 @@ public class QuickActionFactory {
@Override @Override
public void geocodingDone(String address) { public void geocodingDone(String address) {
progressDialog.dismiss(); if (progressDialog != null) progressDialog.dismiss();
if (activity != null) {
activity.getContextMenu().getFavoritePointEditor().add(latLon, address, "", activity.getContextMenu().getFavoritePointEditor().add(latLon, address, "",
getParams().get(KEY_CATEGORY_NAME), getParams().get(KEY_CATEGORY_NAME),
Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)), Integer.valueOf(getParams().get(KEY_CATEGORY_COLOR)),
!Boolean.valueOf(getParams().get(KEY_DIALOG))); !Boolean.valueOf(getParams().get(KEY_DIALOG)));
} }
}
}, null); }, null);
@ -2574,9 +2578,15 @@ public class QuickActionFactory {
@Override @Override
public boolean fillParams(View root, MapActivity activity) { public boolean fillParams(View root, MapActivity activity) {
return !getParams().isEmpty() && (getParams().get(getListKey()) != null
|| !getParams().get(getListKey()).isEmpty() final RecyclerView list = (RecyclerView) root.findViewById(R.id.list);
|| !getParams().get(getListKey()).equals("[]")); final Adapter adapter = (Adapter) list.getAdapter();
boolean hasParams = adapter.itemsList != null && !adapter.itemsList.isEmpty();
if (hasParams) saveListToParams(adapter.itemsList);
return hasParams;
} }
protected class Adapter extends RecyclerView.Adapter<Adapter.ItemHolder> implements QuickActionItemTouchHelperCallback.OnItemMoveCallback { protected class Adapter extends RecyclerView.Adapter<Adapter.ItemHolder> implements QuickActionItemTouchHelperCallback.OnItemMoveCallback {
@ -2642,8 +2652,6 @@ public class QuickActionFactory {
} }
itemsList.remove(position); itemsList.remove(position);
saveListToParams(itemsList);
notifyItemRemoved(position); notifyItemRemoved(position);
} }
@ -2652,8 +2660,6 @@ public class QuickActionFactory {
if (!itemsList.containsAll(data)) { if (!itemsList.containsAll(data)) {
itemsList.addAll(data); itemsList.addAll(data);
saveListToParams(itemsList);
notifyDataSetChanged(); notifyDataSetChanged();
} }
} }
@ -2668,7 +2674,6 @@ public class QuickActionFactory {
int oldSize = itemsList.size(); int oldSize = itemsList.size();
itemsList.add(item); itemsList.add(item);
saveListToParams(itemsList);
notifyItemRangeInserted(oldSize, itemsList.size() - oldSize); notifyItemRangeInserted(oldSize, itemsList.size() - oldSize);
if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(defaultName)) { if (oldTitle.equals(title.getText().toString()) || title.getText().toString().equals(defaultName)) {
@ -2722,7 +2727,6 @@ public class QuickActionFactory {
@Override @Override
public void onViewDropped(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) { public void onViewDropped(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
saveListToParams(itemsList);
} }
public class ItemHolder extends RecyclerView.ViewHolder { public class ItemHolder extends RecyclerView.ViewHolder {