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

[android] Review fixes.

Browse source
This commit is contained in:
Roman Romanov 2016-11-09 08:21:00 +04:00 • committed by Ilya Grechuhin
parent 2a79215ea0
commit 2f2b580f74
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/src/com/mapswithme/maps/widget/placepage/BottomPlacePageAnimationController.java
View file

@ -169,8 +169,10 @@ class BottomPlacePageAnimationController extends BasePlacePageAnimationControlle
mIsDragging = true;
if (!translateBy(-distanceY))
{
if ((isDetailContentScrollable() && mDetailsScroll.getTranslationY() == 0)
|| (!isDetailContentScrollable() && mDetailsScroll.getTranslationY() <= mDetailsScroll.getHeight() - mDetailsContent.getHeight()))
boolean scrollable = isDetailContentScrollable();
int maxTranslationY = mDetailsScroll.getHeight() - mDetailsContent.getHeight();
if ((scrollable && mDetailsScroll.getTranslationY() == 0)
|| (!scrollable && mDetailsScroll.getTranslationY() <= maxTranslationY))
{
mDetailsScroll.scrollBy((int) distanceX, (int) distanceY);
mState = State.FULLSCREEN;
@ -329,7 +331,8 @@ class BottomPlacePageAnimationController extends BasePlacePageAnimationControlle
mPreview.addOnLayoutChangeListener(new View.OnLayoutChangeListener()
{
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom)
public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom)
{
mPreview.removeOnLayoutChangeListener(this);
showPreview(currentState);