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

Add search favorites

Browse source
This commit is contained in:
Victor Shcherb 2014-06-04 16:30:06 +02:00
parent 2501f5475a
commit 08a6083d66
3 changed files with 196 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
View file

@ -3,15 +3,12 @@
*/ */
package net.osmand.plus.activities; package net.osmand.plus.activities;
import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
@ -41,12 +38,11 @@ public class FavouritesActivity extends SherlockFragmentActivity {
//This has to be called before setContentView and you must use the //This has to be called before setContentView and you must use the
//class in com.actionbarsherlock.view and NOT android.view //class in com.actionbarsherlock.view and NOT android.view
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW); // getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
super.onCreate(icicle); super.onCreate(icicle);
setContentView(R.layout.tab_content); setContentView(R.layout.tab_content);
getSupportActionBar().setTitle(R.string.favourites_activity);
setSupportProgressBarIndeterminateVisibility(false); setSupportProgressBarIndeterminateVisibility(false);
TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost); TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost);
tabHost.setup(); tabHost.setup();
@ -63,12 +59,24 @@ public class FavouritesActivity extends SherlockFragmentActivity {
FavouritesTreeFragment.class, null); FavouritesTreeFragment.class, null);
tabHost.setCurrentTab(tab); tabHost.setCurrentTab(tab);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle("");
// getSupportActionBar().setIcon(R.drawable.tab_search_favorites_icon); // getSupportActionBar().setIcon(R.drawable.tab_search_favorites_icon);
} }
@Override
public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
int itemId = item.getItemId();
switch (itemId) {
case android.R.id.home:
finish();
return true;
}
return false;
}
/** /**
* This is a helper class that implements the management of tabs and all * This is a helper class that implements the management of tabs and all

245
OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java
View file

@ -6,11 +6,15 @@ import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.TreeMap;
import net.londatiga.android.ActionItem; import net.londatiga.android.ActionItem;
import net.londatiga.android.QuickAction; import net.londatiga.android.QuickAction;
@ -43,6 +47,8 @@ import android.widget.AutoCompleteTextView;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ExpandableListView; import android.widget.ExpandableListView;
import android.widget.Filter;
import android.widget.Filterable;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -52,16 +58,18 @@ import com.actionbarsherlock.view.ActionMode.Callback;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.widget.SearchView;
import com.actionbarsherlock.widget.SearchView.OnQueryTextListener;
public class FavouritesTreeFragment extends OsmandExpandableListFragment { public class FavouritesTreeFragment extends OsmandExpandableListFragment {
public static final int SEARCH_ID = -1;
public static final int EXPORT_ID = 0; public static final int EXPORT_ID = 0;
public static final int IMPORT_ID = 1; public static final int IMPORT_ID = 1;
public static final int DELETE_ID = 2; public static final int DELETE_ID = 2;
public static final int DELETE_ACTION_ID = 3; public static final int DELETE_ACTION_ID = 3;
public static final int SHARE_ID = 4; public static final int SHARE_ID = 4;
private FavouritesAdapter favouritesAdapter; private FavouritesAdapter favouritesAdapter;
private FavouritesDbHelper helper; private FavouritesDbHelper helper;
@ -70,14 +78,15 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
private Set<String> groupsToDelete = new LinkedHashSet<String>(); private Set<String> groupsToDelete = new LinkedHashSet<String>();
private Comparator<FavouritePoint> favoritesComparator; private Comparator<FavouritePoint> favoritesComparator;
private ActionMode actionMode; private ActionMode actionMode;
private SearchView searchView;
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
super.onAttach(activity); super.onAttach(activity);
final Collator collator = Collator.getInstance(); final Collator collator = Collator.getInstance();
collator.setStrength(Collator.SECONDARY); collator.setStrength(Collator.SECONDARY);
favoritesComparator = new Comparator<FavouritePoint>(){ favoritesComparator = new Comparator<FavouritePoint>() {
@Override @Override
public int compare(FavouritePoint object1, FavouritePoint object2) { public int compare(FavouritePoint object1, FavouritePoint object2) {
@ -85,21 +94,20 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
}; };
helper = getMyApplication().getFavorites(); helper = getMyApplication().getFavorites();
favouritesAdapter = new FavouritesAdapter(); favouritesAdapter = new FavouritesAdapter();
favouritesAdapter.setFavoriteGroups(helper.getFavoriteGroups()); favouritesAdapter.setFavoriteGroups(helper.getFavoriteGroups());
setAdapter(favouritesAdapter); setAdapter(favouritesAdapter);
} }
private void deleteFavorites() { private void deleteFavorites() {
new AsyncTask<Void, Object, String>(){ new AsyncTask<Void, Object, String>() {
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
showProgressBar(); showProgressBar();
}; };
@Override @Override
protected void onPostExecute(String result) { protected void onPostExecute(String result) {
hideProgressBar(); hideProgressBar();
@ -109,10 +117,10 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
@Override @Override
protected void onProgressUpdate(Object... values) { protected void onProgressUpdate(Object... values) {
for(Object o : values){ for (Object o : values) {
if(o instanceof FavouritePoint){ if (o instanceof FavouritePoint) {
favouritesAdapter.deleteFavoritePoint((FavouritePoint) o); favouritesAdapter.deleteFavoritePoint((FavouritePoint) o);
} else if(o instanceof String){ } else if (o instanceof String) {
favouritesAdapter.deleteCategory((String) o); favouritesAdapter.deleteCategory((String) o);
} }
} }
@ -140,21 +148,21 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
// final LatLon mapLocation = getMyApplication().getSettings().getLastKnownMapLocation(); // final LatLon mapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
favouritesAdapter.synchronizeGroups(); favouritesAdapter.synchronizeGroups();
// Sort Favs by distance on Search tab, but sort alphabetically here // Sort Favs by distance on Search tab, but sort alphabetically here
favouritesAdapter.sort(favoritesComparator); favouritesAdapter.sort(favoritesComparator);
} }
@Override @Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
if(selectionMode){ if (selectionMode) {
CheckBox ch = (CheckBox) v.findViewById(R.id.check_item); CheckBox ch = (CheckBox) v.findViewById(R.id.check_item);
FavouritePoint model = favouritesAdapter.getChild(groupPosition, childPosition); FavouritePoint model = favouritesAdapter.getChild(groupPosition, childPosition);
ch.setChecked(!ch.isChecked()); ch.setChecked(!ch.isChecked());
if(ch.isChecked()){ if (ch.isChecked()) {
favoritesToDelete.add(model); favoritesToDelete.add(model);
} else { } else {
favoritesToDelete.remove(model); favoritesToDelete.remove(model);
@ -171,8 +179,8 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
settings.SHOW_FAVORITES.set(true); settings.SHOW_FAVORITES.set(true);
} }
}; };
MapActivityActions.createDirectionsActions(qa, location, point, name, settings.getLastKnownMapZoom(), getActivity(), MapActivityActions.createDirectionsActions(qa, location, point, name, settings.getLastKnownMapZoom(),
true, onshow, false); getActivity(), true, onshow, false);
if (point.isStored()) { if (point.isStored()) {
ActionItem edit = new ActionItem(); ActionItem edit = new ActionItem();
edit.setIcon(getResources().getDrawable(R.drawable.ic_action_edit_light)); edit.setIcon(getResources().getDrawable(R.drawable.ic_action_edit_light));
@ -204,23 +212,25 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
return true; return true;
} }
private boolean editPoint(final FavouritePoint point) { private boolean editPoint(final FavouritePoint point) {
Builder builder = new AlertDialog.Builder(getActivity()); Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.favourites_context_menu_edit); builder.setTitle(R.string.favourites_context_menu_edit);
final View v = getActivity().getLayoutInflater().inflate(R.layout.favourite_edit_dialog, getExpandableListView(), false); final View v = getActivity().getLayoutInflater().inflate(R.layout.favourite_edit_dialog,
final AutoCompleteTextView cat = (AutoCompleteTextView) v.findViewById(R.id.Category); getExpandableListView(), false);
final EditText editText = (EditText) v.findViewById(R.id.Name); final AutoCompleteTextView cat = (AutoCompleteTextView) v.findViewById(R.id.Category);
final EditText editText = (EditText) v.findViewById(R.id.Name);
builder.setView(v); builder.setView(v);
editText.setText(point.getName()); editText.setText(point.getName());
cat.setText(point.getCategory()); cat.setText(point.getCategory());
cat.setThreshold(1); cat.setThreshold(1);
cat.setAdapter(new ArrayAdapter<String>(getActivity(), R.layout.list_textview, helper.getFavoriteGroups().keySet().toArray(new String[] {}))); cat.setAdapter(new ArrayAdapter<String>(getActivity(), R.layout.list_textview, helper.getFavoriteGroups()
.keySet().toArray(new String[] {})));
builder.setNegativeButton(R.string.default_buttons_cancel, null); builder.setNegativeButton(R.string.default_buttons_cancel, null);
builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
boolean editied = helper.editFavouriteName(point, editText.getText().toString().trim(), cat.getText().toString()); boolean editied = helper.editFavouriteName(point, editText.getText().toString().trim(), cat.getText()
.toString());
if (editied) { if (editied) {
favouritesAdapter.synchronizeGroups(); favouritesAdapter.synchronizeGroups();
favouritesAdapter.sort(favoritesComparator); favouritesAdapter.sort(favoritesComparator);
@ -233,7 +243,6 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
return true; return true;
} }
private boolean deletePoint(final FavouritePoint point) { private boolean deletePoint(final FavouritePoint point) {
final Resources resources = this.getResources(); final Resources resources = this.getResources();
Builder builder = new AlertDialog.Builder(getActivity()); Builder builder = new AlertDialog.Builder(getActivity());
@ -244,9 +253,10 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
boolean deleted = helper.deleteFavourite(point); boolean deleted = helper.deleteFavourite(point);
if (deleted) { if (deleted) {
AccessibleToast.makeText(getActivity(), AccessibleToast.makeText(
MessageFormat.format(resources.getString(R.string.favourites_remove_dialog_success), point.getName()), getActivity(),
Toast.LENGTH_SHORT).show(); MessageFormat.format(resources.getString(R.string.favourites_remove_dialog_success),
point.getName()), Toast.LENGTH_SHORT).show();
favouritesAdapter.synchronizeGroups(); favouritesAdapter.synchronizeGroups();
favouritesAdapter.sort(favoritesComparator); favouritesAdapter.sort(favoritesComparator);
} }
@ -279,35 +289,53 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
} }
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
createMenuItem(menu, EXPORT_ID, R.string.export_fav, R.drawable.ic_action_gsave_light, R.drawable.ic_action_gsave_dark, MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.export_fav, R.drawable.ic_action_search_light,
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); R.drawable.ic_action_search_dark, MenuItem.SHOW_AS_ACTION_ALWAYS
createMenuItem(menu, SHARE_ID, R.string.share_fav, R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark, | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); searchView = new com.actionbarsherlock.widget.SearchView(getActivity());
createMenuItem(menu, IMPORT_ID, R.string.import_fav, R.drawable.ic_action_grefresh_light, R.drawable.ic_action_grefresh_dark, mi.setActionView(searchView);
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); searchView.setOnQueryTextListener(new OnQueryTextListener() {
createMenuItem(menu, DELETE_ID, R.string.default_buttons_delete, R.drawable.ic_action_delete_light, R.drawable.ic_action_delete_dark,
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT) ; @Override
public boolean onQueryTextSubmit(String query) {
favouritesAdapter.getFilter().filter(query);
return true;
}
@Override
public boolean onQueryTextChange(String newText) {
favouritesAdapter.getFilter().filter(newText);
return true;
}
});
createMenuItem(menu, EXPORT_ID, R.string.export_fav, R.drawable.ic_action_gsave_light,
R.drawable.ic_action_gsave_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM);
createMenuItem(menu, SHARE_ID, R.string.share_fav, R.drawable.ic_action_gshare_light,
R.drawable.ic_action_gshare_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM);
createMenuItem(menu, IMPORT_ID, R.string.import_fav, R.drawable.ic_action_grefresh_light,
R.drawable.ic_action_grefresh_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
createMenuItem(menu, DELETE_ID, R.string.default_buttons_delete, R.drawable.ic_action_delete_light,
R.drawable.ic_action_delete_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM);
} }
public void showProgressBar(){ public void showProgressBar() {
getSherlockActivity().setSupportProgressBarIndeterminateVisibility(true); getSherlockActivity().setSupportProgressBarIndeterminateVisibility(true);
} }
public void hideProgressBar(){ public void hideProgressBar() {
getSherlockActivity().setSupportProgressBarIndeterminateVisibility(false); getSherlockActivity().setSupportProgressBarIndeterminateVisibility(false);
} }
private void enterDeleteMode() { private void enterDeleteMode() {
actionMode = getSherlockActivity().startActionMode(new Callback() { actionMode = getSherlockActivity().startActionMode(new Callback() {
@Override @Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) { public boolean onCreateActionMode(ActionMode mode, Menu menu) {
selectionMode = true; selectionMode = true;
createMenuItem(menu, DELETE_ACTION_ID, R.string.default_buttons_delete, R.drawable.ic_action_delete_light, R.drawable.ic_action_delete_dark, createMenuItem(menu, DELETE_ACTION_ID, R.string.default_buttons_delete,
R.drawable.ic_action_delete_light, R.drawable.ic_action_delete_dark,
MenuItem.SHOW_AS_ACTION_IF_ROOM); MenuItem.SHOW_AS_ACTION_IF_ROOM);
favoritesToDelete.clear(); favoritesToDelete.clear();
groupsToDelete.clear(); groupsToDelete.clear();
@ -328,13 +356,12 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
@Override @Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) { public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
if(item.getItemId() == DELETE_ACTION_ID) { if (item.getItemId() == DELETE_ACTION_ID) {
deleteFavoritesAction(); deleteFavoritesAction();
} }
return true; return true;
} }
}); });
} }
@ -347,7 +374,7 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
b.setPositiveButton(R.string.default_buttons_delete, new DialogInterface.OnClickListener() { b.setPositiveButton(R.string.default_buttons_delete, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if(actionMode != null) { if (actionMode != null) {
actionMode.finish(); actionMode.finish();
} }
deleteFavorites(); deleteFavorites();
@ -361,7 +388,8 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
private void importFile() { private void importFile() {
final File tosave = getMyApplication().getAppPath(FavouritesDbHelper.FILE_TO_SAVE); final File tosave = getMyApplication().getAppPath(FavouritesDbHelper.FILE_TO_SAVE);
if (!tosave.exists()) { if (!tosave.exists()) {
AccessibleToast.makeText(getActivity(), MessageFormat.format(getString(R.string.fav_file_to_load_not_found), tosave.getAbsolutePath()), AccessibleToast.makeText(getActivity(),
MessageFormat.format(getString(R.string.fav_file_to_load_not_found), tosave.getAbsolutePath()),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
} else { } else {
new AsyncTask<Void, FavouritePoint, String>() { new AsyncTask<Void, FavouritePoint, String>() {
@ -416,7 +444,8 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
protected void onPostExecute(String warning) { protected void onPostExecute(String warning) {
hideProgressBar(); hideProgressBar();
if (warning == null) { if (warning == null) {
AccessibleToast.makeText(getActivity(), R.string.fav_imported_sucessfully, Toast.LENGTH_SHORT).show(); AccessibleToast.makeText(getActivity(), R.string.fav_imported_sucessfully, Toast.LENGTH_SHORT)
.show();
} else { } else {
AccessibleToast.makeText(getActivity(), warning, Toast.LENGTH_LONG).show(); AccessibleToast.makeText(getActivity(), warning, Toast.LENGTH_LONG).show();
} }
@ -481,9 +510,10 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
protected void onPostExecute(String warning) { protected void onPostExecute(String warning) {
hideProgressBar(); hideProgressBar();
if (warning == null) { if (warning == null) {
AccessibleToast.makeText(getActivity(), AccessibleToast.makeText(
MessageFormat.format(getString(R.string.fav_saved_sucessfully), tosave.getAbsolutePath()), getActivity(),
Toast.LENGTH_LONG).show(); MessageFormat.format(getString(R.string.fav_saved_sucessfully),
tosave.getAbsolutePath()), Toast.LENGTH_LONG).show();
} else { } else {
AccessibleToast.makeText(getActivity(), warning, Toast.LENGTH_LONG).show(); AccessibleToast.makeText(getActivity(), warning, Toast.LENGTH_LONG).show();
} }
@ -507,12 +537,12 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
} }
class FavouritesAdapter extends OsmandBaseExpandableListAdapter implements Filterable {
class FavouritesAdapter extends OsmandBaseExpandableListAdapter {
Map<String, List<FavouritePoint>> sourceFavoriteGroups; Map<String, List<FavouritePoint>> sourceFavoriteGroups;
Map<String, List<FavouritePoint>> favoriteGroups = new LinkedHashMap<String, List<FavouritePoint>>(); Map<String, List<FavouritePoint>> favoriteGroups = new LinkedHashMap<String, List<FavouritePoint>>();
List<String> groups = new ArrayList<String>(); List<String> groups = new ArrayList<String>();
Filter myFilter;
public void setFavoriteGroups(Map<String, List<FavouritePoint>> favoriteGroups) { public void setFavoriteGroups(Map<String, List<FavouritePoint>> favoriteGroups) {
this.sourceFavoriteGroups = favoriteGroups; this.sourceFavoriteGroups = favoriteGroups;
@ -520,13 +550,14 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
public void sort(Comparator<FavouritePoint> comparator) { public void sort(Comparator<FavouritePoint> comparator) {
for(List<FavouritePoint> ps : favoriteGroups.values()) { for (List<FavouritePoint> ps : favoriteGroups.values()) {
Collections.sort(ps, comparator); Collections.sort(ps, comparator);
} }
} }
public void addFavoritePoint(FavouritePoint p) { public void addFavoritePoint(FavouritePoint p) {
if(!favoriteGroups.containsKey(p.getCategory())){
if (!favoriteGroups.containsKey(p.getCategory())) {
favoriteGroups.put(p.getCategory(), new ArrayList<FavouritePoint>()); favoriteGroups.put(p.getCategory(), new ArrayList<FavouritePoint>());
groups.add(p.getCategory()); groups.add(p.getCategory());
} }
@ -535,7 +566,7 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
public void deleteFavoritePoint(FavouritePoint p) { public void deleteFavoritePoint(FavouritePoint p) {
if(favoriteGroups.containsKey(p.getCategory())){ if (favoriteGroups.containsKey(p.getCategory())) {
favoriteGroups.get(p.getCategory()).remove(p); favoriteGroups.get(p.getCategory()).remove(p);
} }
notifyDataSetChanged(); notifyDataSetChanged();
@ -547,10 +578,10 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
notifyDataSetChanged(); notifyDataSetChanged();
} }
public void synchronizeGroups(){ public void synchronizeGroups() {
favoriteGroups.clear(); favoriteGroups.clear();
groups.clear(); groups.clear();
for(String key : sourceFavoriteGroups.keySet()){ for (String key : sourceFavoriteGroups.keySet()) {
groups.add(key); groups.add(key);
favoriteGroups.put(key, new ArrayList<FavouritePoint>(sourceFavoriteGroups.get(key))); favoriteGroups.put(key, new ArrayList<FavouritePoint>(sourceFavoriteGroups.get(key)));
} }
@ -587,7 +618,6 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
return groupPosition; return groupPosition;
} }
@Override @Override
public boolean hasStableIds() { public boolean hasStableIds() {
return false; return false;
@ -612,7 +642,7 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
label.setText(model); label.setText(model);
final CheckBox ch = (CheckBox) row.findViewById(R.id.check_item); final CheckBox ch = (CheckBox) row.findViewById(R.id.check_item);
if(selectionMode){ if (selectionMode) {
ch.setVisibility(View.VISIBLE); ch.setVisibility(View.VISIBLE);
ch.setChecked(groupsToDelete.contains(model)); ch.setChecked(groupsToDelete.contains(model));
@ -638,7 +668,8 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
@Override @Override
public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView,
ViewGroup parent) {
View row = convertView; View row = convertView;
if (row == null) { if (row == null) {
LayoutInflater inflater = getActivity().getLayoutInflater(); LayoutInflater inflater = getActivity().getLayoutInflater();
@ -649,7 +680,7 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
ImageView icon = (ImageView) row.findViewById(R.id.favourite_icon); ImageView icon = (ImageView) row.findViewById(R.id.favourite_icon);
final FavouritePoint model = (FavouritePoint) getChild(groupPosition, childPosition); final FavouritePoint model = (FavouritePoint) getChild(groupPosition, childPosition);
row.setTag(model); row.setTag(model);
if(model.isStored()){ if (model.isStored()) {
icon.setImageResource(R.drawable.list_favorite); icon.setImageResource(R.drawable.list_favorite);
} else { } else {
icon.setImageResource(R.drawable.opened_poi); icon.setImageResource(R.drawable.opened_poi);
@ -659,9 +690,11 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude())); lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + " "; String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + " ";
label.setText(distance + model.getName(), TextView.BufferType.SPANNABLE); label.setText(distance + model.getName(), TextView.BufferType.SPANNABLE);
((Spannable) label.getText()).setSpan(new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1, 0); ((Spannable) label.getText()).setSpan(
new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1,
0);
final CheckBox ch = (CheckBox) row.findViewById(R.id.check_item); final CheckBox ch = (CheckBox) row.findViewById(R.id.check_item);
if(selectionMode && model.isStored()){ if (selectionMode && model.isStored()) {
ch.setVisibility(View.VISIBLE); ch.setVisibility(View.VISIBLE);
ch.setChecked(favoritesToDelete.contains(model)); ch.setChecked(favoritesToDelete.contains(model));
row.findViewById(R.id.favourite_icon).setVisibility(View.GONE); row.findViewById(R.id.favourite_icon).setVisibility(View.GONE);
@ -669,11 +702,11 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if(ch.isChecked()){ if (ch.isChecked()) {
favoritesToDelete.add(model); favoritesToDelete.add(model);
} else { } else {
favoritesToDelete.remove(model); favoritesToDelete.remove(model);
if(groupsToDelete.contains(model.getCategory())){ if (groupsToDelete.contains(model.getCategory())) {
groupsToDelete.remove(model.getCategory()); groupsToDelete.remove(model.getCategory());
favouritesAdapter.notifyDataSetInvalidated(); favouritesAdapter.notifyDataSetInvalidated();
} }
@ -686,5 +719,93 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment {
} }
return row; return row;
} }
@Override
public Filter getFilter() {
if (myFilter == null) {
myFilter = new FavoritesFilter();
}
return myFilter;
}
} }
public class FavoritesFilter extends Filter {
public FavoritesFilter() {
}
@Override
protected FilterResults performFiltering(CharSequence constraint) {
FilterResults results = new FilterResults();
if (constraint == null || constraint.length() == 0) {
results.values = helper.getFavoriteGroups();
results.count = 1;
} else {
TreeMap<String, List<FavouritePoint>> filter = new TreeMap<String, List<FavouritePoint>>(helper.getFavoriteGroups());
TreeMap<String, List<FavouritePoint>> filterLists = new TreeMap<String, List<FavouritePoint>>();
String cs = constraint.toString().toLowerCase();
Iterator<Entry<String, List<FavouritePoint>>> ti = filter.entrySet().iterator();
while(ti.hasNext()) {
Entry<String, List<FavouritePoint>> next = ti.next();
if(next.getKey().toLowerCase().indexOf(cs) == -1) {
ti.remove();
filterLists.put(next.getKey(), next.getValue());
}
}
ti = filterLists.entrySet().iterator();
while(ti.hasNext()) {
Entry<String, List<FavouritePoint>> next = ti.next();
final List<FavouritePoint> list = next.getValue();
LinkedList<FavouritePoint> ll = new LinkedList<FavouritePoint>();
for(FavouritePoint l : list) {
if(l.getName().toLowerCase().indexOf(cs) != -1) {
ll.add(l);
}
}
if(ll.size() > 0) {
filter.put(next.getKey(), ll);
}
}
results.values = filter;
results.count = filter.size();
}
return results;
}
@SuppressWarnings("unchecked")
@Override
protected void publishResults(CharSequence constraint, FilterResults results) {
synchronized (favouritesAdapter) {
favouritesAdapter.setFavoriteGroups((Map<String, List<FavouritePoint>>) results.values);
}
favouritesAdapter.notifyDataSetChanged();
if(constraint != null && constraint.length() > 1) {
collapseTrees();
}
}
}
public void collapseTrees() {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
synchronized (favouritesAdapter) {
final ExpandableListView expandableListView = getExpandableListView();
for (int i = 0; i < favouritesAdapter.getGroupCount(); i++) {
int cp = favouritesAdapter.getChildrenCount(i);
if (cp < 5) {
expandableListView.expandGroup(i);
} else {
expandableListView.collapseGroup(i);
}
}
}
}
});
}
} }

1
OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
View file

@ -14,7 +14,6 @@ import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.format.DateFormat;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;