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

[android] Added disabling the toolbar behaviour if app bar is shown for bookmark on map

Browse source
This commit is contained in:
alexzatsepin 2020-10-09 20:01:19 +03:00 • committed by Maria Velichko
parent 97edaf3b10
commit 7a82f0612e
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2738,11 +2738,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
AppBarLayout appBarLayout = (AppBarLayout) mPlacePageToolbar.getParent();
CoordinatorLayout.LayoutParams params
= (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
ToolbarBehavior behavior = (ToolbarBehavior) params.getBehavior();
Objects.requireNonNull(behavior);
if (behavior.isBookmarkModeEnabled())
if (params.getBehavior() == null)
{
behavior.setBookmarkModeEnabled(false);
params.setBehavior(new ToolbarBehavior());
UiUtils.hide(appBarLayout);
mPlacePageToolbar.setNavigationOnClickListener(v -> closePlacePage());
}
@ -2767,10 +2765,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void setupToolbarForUserMark(@NonNull String name, long categoryId)
{
AppBarLayout appBarLayout = (AppBarLayout) mPlacePageToolbar.getParent();
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
ToolbarBehavior behavior = (ToolbarBehavior) params.getBehavior();
Objects.requireNonNull(behavior);
behavior.setBookmarkModeEnabled(true);
CoordinatorLayout.LayoutParams params
= (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
params.setBehavior(null);
UiUtils.show(appBarLayout);
mPlacePageToolbar.setTitle(name);
mPlacePageToolbar.setNavigationOnClickListener(v -> {
BookmarkCategory category = BookmarkManager.INSTANCE.getCategoryById(categoryId);

16
android/src/com/mapswithme/maps/widget/placepage/ToolbarBehavior.java
View file

@ -33,12 +33,6 @@ public class ToolbarBehavior extends AppBarLayout.ScrollingViewBehavior
@Override
public boolean onDependentViewChanged(CoordinatorLayout parent, View toolbar, View placePage)
{
if (mBookmarkMode)
{
UiUtils.show(toolbar);
return false;
}
if (placePage.getY() == 0 && UiUtils.isHidden(toolbar))
{
UiUtils.show(toolbar);
@ -53,14 +47,4 @@ public class ToolbarBehavior extends AppBarLayout.ScrollingViewBehavior
return false;
}
public void setBookmarkModeEnabled(boolean enable)
{
mBookmarkMode = enable;
}
public boolean isBookmarkModeEnabled()
{
return mBookmarkMode;
}
}