pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Changed up navigation logic in search fragment.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-07-17 19:11:57 +03:00 • committed by Alex Zolotarev
parent c22a1dfa11
commit 7b73fa0e3a
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/search/SearchAdapter.java
View file

@ -191,7 +191,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
if (result != null)
{
if (result.mType == SearchResult.TYPE_FEATURE)
mSearchFragment.showSearchResultOnMap(resIndex);
mSearchFragment.showSingleResultOnMap(resIndex);
else
mSearchFragment.setSearchQuery(result.mSuggestion);
}

21
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -78,6 +78,23 @@ public class SearchFragment extends BaseMwmRecyclerFragment implements View.OnCl
refreshContent();
nativeConnectSearchListener();
readArguments(getArguments());
if (getToolbar() != null)
getToolbar().setNavigationOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
if (getSearchQuery().isEmpty())
{
navigateUpToParent();
return;
}
setSearchQuery("");
SearchToolbarController.cancelSearch();
refreshContent();
}
});
}
@Override
@ -300,11 +317,11 @@ public class SearchFragment extends BaseMwmRecyclerFragment implements View.OnCl
}
// FIXME: This code only for demonstration purposes and will be removed soon
protected void showSearchResultOnMap(int resIndex)
protected void showSingleResultOnMap(int resultIndex)
{
SearchToolbarController.cancelApiCall();
SearchToolbarController.setQuery("");
nativeShowItem(resIndex);
nativeShowItem(resultIndex);
InputUtils.hideKeyboard(mEtSearchQuery);
navigateUpToParent();
}

1
android/src/com/mapswithme/maps/search/SearchToolbarController.java
View file

@ -34,6 +34,7 @@ public class SearchToolbarController implements OnClickListener
@Override
public void onClick(View v)
{
MWMActivity.startSearch(mActivity, mSearchQuery.getText().toString());
cancelSearchApiAndHide();
}
});