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

[android] Close search wheel when closing search toolbar

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-02-04 11:42:56 +01:00 • committed by Viktor Govako
parent 275f09c0f2
commit c434af7dc6
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -383,7 +383,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
args.putBoolean(DownloaderActivity.EXTRA_OPEN_DOWNLOADED, openDownloaded);
if (mIsTabletLayout)
{
closeSearchToolbar(false);
closeSearchToolbar(false, true);
replaceFragment(DownloaderFragment.class, args, null);
}
else
@ -558,7 +558,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
else
{
closeSearchToolbar(true);
closeSearchToolbar(true, true);
}
}
@ -707,18 +707,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
return false;
}
private boolean closeSearchToolbar(boolean clearText)
{
return closeSearchToolbar(clearText, true);
}
private boolean closeSearchToolbar(boolean clearText, boolean stopSearch)
{
if (UiUtils.isVisible(mSearchController.getToolbar()) || mSearchController.hasQuery())
if (UiUtils.isVisible(mSearchController.getToolbar()) || !TextUtils.isEmpty(SearchEngine.INSTANCE.getQuery()))
{
if (stopSearch)
{
mSearchController.cancelSearchApiAndHide(clearText);
mNavigationController.resetSearchWheel();
}
else
{
@ -1115,7 +1111,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
return;
}
if (closeSearchToolbar(true))
if (closeSearchToolbar(true, true))
{
return;
}
@ -1627,7 +1623,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
closeAllFloatingPanelsTablet();
mNavigationController.resetSearchWheel();
if (completionListener != null)
completionListener.run();
@ -1695,7 +1690,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mOnmapDownloader.updateState(false);
if (show)
{
closeFloatingToolbarsAndPanels(true, false);
closeFloatingToolbarsAndPanels(false, false);
if (mFilterController != null)
mFilterController.show(false);
}
@ -1768,7 +1763,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!RoutingController.get().isPlanning())
return;
mNavigationController.resetSearchWheel();
closeSearchToolbar(true, true);
}
@Override
@ -1959,7 +1954,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onSearchRoutePoint(@RoutePointInfo.RouteMarkType int pointType)
{
RoutingController.get().waitForPoiPick(pointType);
mNavigationController.resetSearchWheel();
closeSearchToolbar(true, true);
showSearch("");
}

7
android/src/com/mapswithme/maps/routing/SearchWheel.java
View file

@ -236,10 +236,7 @@ class SearchWheel implements View.OnClickListener
if (mCurrentOption != null || !TextUtils.isEmpty(SearchEngine.INSTANCE.getQuery()))
{
SearchEngine.INSTANCE.cancelInteractiveSearch();
mCurrentOption = null;
mIsExpanded = false;
resetSearchButtonImage();
reset();
refreshSearchVisibility();
return;
}
@ -284,8 +281,8 @@ class SearchWheel implements View.OnClickListener
mCurrentOption = searchOption;
final String query = mFrame.getContext().getString(searchOption.mQueryId);
SearchEngine.INSTANCE.searchInteractive(mFrame.getContext(), query, System.nanoTime(), false /* isMapAndTable */);
SearchEngine.INSTANCE.setQuery(query);
refreshSearchButtonImage();
toggleSearchLayout();
}
}