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

Fixed search keyboard and sort cities

Browse source
This commit is contained in:
Alexey Kulish 2017-03-24 23:01:46 +03:00
parent b4858c811e
commit e11e87384c
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/search/SearchUICore.java
View file

@ -536,7 +536,7 @@ public class SearchUICore {
if (o1.getFoundWordCount() != o2.getFoundWordCount()) { if (o1.getFoundWordCount() != o2.getFoundWordCount()) {
return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount()); return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount());
} }
if (!sortByName || sp.isEmpty()) { if (!sortByName) {
double s1 = o1.getSearchDistance(loc); double s1 = o1.getSearchDistance(loc);
double s2 = o2.getSearchDistance(loc); double s2 = o2.getSearchDistance(loc);
int cmp = Double.compare(s1, s2); int cmp = Double.compare(s1, s2);

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

@ -1313,6 +1313,10 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
searchUICore.updateSettings(settings.setRadiusLevel(1)); searchUICore.updateSettings(settings.setRadiusLevel(1));
} }
runCoreSearch(txt, false, false); runCoreSearch(txt, false, false);
if (sr.objectType == ObjectType.CITY) {
searchEditText.requestFocus();
AndroidUtils.softKeyboardDelayed(searchEditText);
}
} }
public void replaceQueryWithUiFilter(PoiUIFilter filter, String nameFilter) { public void replaceQueryWithUiFilter(PoiUIFilter filter, String nameFilter) {
@ -1484,6 +1488,8 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
historySearchFragment.updateLocation(latLon, heading); historySearchFragment.updateLocation(latLon, heading);
} else if (categoriesSearchFragment != null && viewPager.getCurrentItem() == 1) { } else if (categoriesSearchFragment != null && viewPager.getCurrentItem() == 1) {
categoriesSearchFragment.updateLocation(latLon, heading); categoriesSearchFragment.updateLocation(latLon, heading);
} else if (addrSearchFragment != null && viewPager.getCurrentItem() == 2) {
addrSearchFragment.updateLocation(latLon, heading);
} }
} }
} }
@ -1499,6 +1505,9 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
if (categoriesSearchFragment != null) { if (categoriesSearchFragment != null) {
categoriesSearchFragment.getListAdapter().setUseMapCenter(useMapCenter); categoriesSearchFragment.getListAdapter().setUseMapCenter(useMapCenter);
} }
if (addrSearchFragment != null) {
addrSearchFragment.getListAdapter().setUseMapCenter(useMapCenter);
}
} }
} }