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

Fix POI search UI behavior bugs #2667 (1)-(3)

Browse source
This commit is contained in:
sonora 2016-06-07 11:29:41 +02:00
parent d71efea537
commit de4d2a2ad3
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -117,6 +117,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
private MenuItem searchPOILevel;
private static int RESULT_REQUEST_CODE = 54;
private CharSequence tChange;
@Override
public boolean onCreateOptionsMenu(Menu omenu) {
Menu menu = getClearToolbar(true).getMenu();
@ -228,7 +230,11 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
searchFilter.addTextChangedListener(new TextWatcher() {
@Override
public void afterTextChanged(Editable s) {
changeFilter(s);
tChange = s;
// Issue #2667 (3)
if (currentSearchTask == null) {
changeFilter(tChange);
}
}
@Override
@ -424,6 +430,12 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
if (filter != null) {
int maxLength = 24;
String name = filter.getGeneratedName(maxLength);
// Next displays the actual query term instead of the generic "Seach by name", can be enabled for debugging or in general
if (isNameSearch()) {
name = "'" + filter.getFilterByName() + "'";
}
if(name.length() >= maxLength) {
name = name.substring(0, maxLength) + getString(R.string.shared_string_ellipsis);
}
@ -440,8 +452,11 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
boolean enabled = taskAlreadyFinished && location != null &&
filter != null && filter.isSearchFurtherAvailable();
if(isNameSearch() && !Algorithms.objectEquals(searchFilter.getText().toString(), filter.getFilterByName())) {
enabled = true;
title = R.string.search_button;
// Issue #2667 (2)
if (currentSearchTask == null) {
enabled = true;
}
}
searchPOILevel.setEnabled(enabled);
searchPOILevel.setTitle(title);
@ -639,8 +654,13 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
} else {
amenityAdapter.setNewModel(result);
}
// Issue #2667 (1)
if (tChange != null) {
changeFilter(tChange);
tChange = null;
}
amenityAdapter.notifyDataSetChanged();
lastSearchedLocation = searchLocation;
}
@Override