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

Merge pull request #4094 from osmandapp/alex_branch

Browse source 
Alex branch
This commit is contained in:
Alexey 2017-07-12 18:35:25 +03:00 committed by GitHub
commit 9a503922fb
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
View file

@ -456,30 +456,9 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
new OnClickListener() {
@Override
public void onClick(View v) {
new DialogFragment() {
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.confirmation_to_delete_history_items)
.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
SearchHistoryHelper helper = SearchHistoryHelper.getInstance(app);
List<QuickSearchListItem> selectedItems = historySearchFragment.getListAdapter().getSelectedItems();
for (QuickSearchListItem searchListItem : selectedItems) {
HistoryEntry historyEntry = (HistoryEntry) searchListItem.getSearchResult().object;
helper.remove(historyEntry);
}
reloadHistory();
enableSelectionMode(false, -1);
}
})
.setNegativeButton(R.string.shared_string_no, null);
return builder.create();
}
}.show(getChildFragmentManager(), "DeleteHistoryConfirmationFragment");
DeleteDialogFragment deleteDialog = new DeleteDialogFragment();
deleteDialog.setSelectedItems(historySearchFragment.getListAdapter().getSelectedItems());
deleteDialog.show(getChildFragmentManager(), "DeleteHistoryConfirmationFragment");
}
}
);
@ -2108,4 +2087,37 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
super(TopToolbarControllerType.QUICK_SEARCH);
}
}
public static class DeleteDialogFragment extends DialogFragment {
private List<QuickSearchListItem> selectedItems;
public void setSelectedItems(List<QuickSearchListItem> selectedItems) {
this.selectedItems = selectedItems;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.confirmation_to_delete_history_items)
.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (getParentFragment() instanceof QuickSearchDialogFragment) {
QuickSearchDialogFragment parentFragment = (QuickSearchDialogFragment) getParentFragment();
SearchHistoryHelper helper = SearchHistoryHelper.getInstance(parentFragment.getMyApplication());
for (QuickSearchListItem searchListItem : selectedItems) {
HistoryEntry historyEntry = (HistoryEntry) searchListItem.getSearchResult().object;
helper.remove(historyEntry);
}
parentFragment.reloadHistory();
parentFragment.enableSelectionMode(false, -1);
}
}
})
.setNegativeButton(R.string.shared_string_no, null);
return builder.create();
}
}
}