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

[android] Added place page toolbar roll back when back is pressed in boomark toolbar if track is shown, i.e. when place page is now shown

Browse source
This commit is contained in:
alexzatsepin 2020-10-10 19:00:10 +03:00 • committed by Arsentiy Milchakov
parent 569df241d9
commit bb23ad5f72
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2735,15 +2735,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onPlacePageClosed()
{
AppBarLayout appBarLayout = (AppBarLayout) mPlacePageToolbar.getParent();
CoordinatorLayout.LayoutParams params
= (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
if (params.getBehavior() == null)
{
params.setBehavior(new ToolbarBehavior());
UiUtils.hide(appBarLayout);
mPlacePageToolbar.setNavigationOnClickListener(v -> closePlacePage());
}
setupToolbarForPlacePage();
}
public void showTrackOnMap(long trackId)
@ -2773,10 +2765,28 @@ public class MwmActivity extends BaseMwmFragmentActivity
mPlacePageToolbar.setNavigationOnClickListener(v -> {
BookmarkCategory category = BookmarkManager.INSTANCE.getCategoryById(categoryId);
BookmarkCategoriesActivity.startForResult(this, category);
closePlacePage();
if (!mPlacePageController.isClosed())
{
closePlacePage();
return;
}
setupToolbarForPlacePage();
});
}
private void setupToolbarForPlacePage()
{
AppBarLayout appBarLayout = (AppBarLayout) mPlacePageToolbar.getParent();
CoordinatorLayout.LayoutParams params
= (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
if (params.getBehavior() == null)
{
params.setBehavior(new ToolbarBehavior());
UiUtils.hide(appBarLayout);
mPlacePageToolbar.setNavigationOnClickListener(v -> closePlacePage());
}
}
private class CurrentPositionClickListener implements OnClickListener
{
@Override