Use new layouts.

1 files changed, 198 insertions, 0 deletions

diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomPlacePageAnimationController.java b/android/src/com/mapswithme/maps/widget/placepage/BottomPlacePageAnimationController.java
new file mode 100644
index 0000000000..6308cd0c5b
--- /dev/null
+++ b/android/src/com/mapswithme/maps/widget/placepage/BottomPlacePageAnimationController.java
@@ -0,0 +1,198 @@
+package com.mapswithme.maps.widget.placepage;
+
+import android.support.annotation.NonNull;
+import android.support.v4.view.GestureDetectorCompat;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+
+import com.mapswithme.maps.Framework;
+import com.mapswithme.maps.widget.placepage.PlacePageView.State;
+import com.mapswithme.util.UiUtils;
+
+public class BottomPlacePageAnimationController extends BasePlacePageAnimationController
+{
+  public BottomPlacePageAnimationController(@NonNull PlacePageView placePage)
+  {
+    super(placePage);
+    mPreview.bringToFront();
+    mDetails.requestDisallowInterceptTouchEvent(true);
+    mButtons.bringToFront();
+    mButtons.requestDisallowInterceptTouchEvent(true);
+  }
+
+  @Override
+  boolean onInterceptTouchEvent(MotionEvent event)
+  {
+    Log.d("TEST", "Intercept! Ev " + event);
+    switch (event.getAction())
+    {
+    case MotionEvent.ACTION_DOWN:
+      mIsGestureHandled = false;
+      mDownY = event.getRawY();
+      break;
+    case MotionEvent.ACTION_MOVE:
+      Log.d("TEST", "Intercept! DownY " + mDownY + "; preview Y " + mPreview.getY() + "; buttons Y " + mButtons.getY());
+      if (mDownY < mPreview.getY() || mDownY > mButtons.getY())
+        return false;
+      if (Math.abs(mDownY - event.getRawY()) > mTouchSlop)
+        return true;
+      break;
+    }
+
+    return false;
+  }
+
+  @Override
+  protected void initGestureDetector()
+  {
+    // Gestures
+    mGestureDetector = new GestureDetectorCompat(mPlacePage.getContext(), new GestureDetector.SimpleOnGestureListener()
+    {
+      private static final int Y_MIN = 1;
+      private static final int Y_MAX = 100;
+      private static final int X_TO_Y_SCROLL_RATIO = 2;
+
+      @Override
+      public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY)
+      {
+        final boolean isVertical = Math.abs(distanceY) > X_TO_Y_SCROLL_RATIO * Math.abs(distanceX);
+        final boolean isInRange = Math.abs(distanceY) > Y_MIN && Math.abs(distanceY) < Y_MAX;
+
+        if (isVertical && isInRange)
+        {
+          if (!mIsGestureHandled)
+          {
+            if (distanceY < 0)
+            {
+              if (mPlacePage.getState() == State.FULL_PLACEPAGE)
+                mPlacePage.setState(State.PREVIEW_ONLY);
+              else
+              {
+                mPlacePage.setState(State.HIDDEN);
+                Framework.deactivatePopup();
+              }
+            }
+            else
+              mPlacePage.setState(State.FULL_PLACEPAGE);
+
+            mIsGestureHandled = true;
+          }
+
+          return true;
+        }
+
+        return false;
+      }
+
+      @Override
+      public boolean onSingleTapConfirmed(MotionEvent e)
+      {
+        Log.d("TEST", "Detector, tap confirmed. Y " + mDownY + "; preview Y " + mPreview.getY() + "; details Y " + mDetails.getY());
+        if (mDownY < mPreview.getY() && mDownY < mDetails.getY())
+          return false;
+
+        if (mPlacePage.getState() == State.FULL_PLACEPAGE)
+          mPlacePage.setState(State.PREVIEW_ONLY);
+        else
+          mPlacePage.setState(State.FULL_PLACEPAGE);
+
+        return true;
+      }
+    });
+  }
+
+  protected void showPreview(final boolean show)
+  {
+    mPlacePage.setVisibility(View.VISIBLE);
+    mDetails.setVisibility(View.GONE);
+    if (mIsPreviewVisible == show)
+      return;
+
+    TranslateAnimation slide;
+    if (show)
+    {
+      slide = UiUtils.generateRelativeSlideAnimation(0, 0, 1, 0);
+      mPreview.setVisibility(View.VISIBLE);
+    }
+    else
+    {
+      slide = UiUtils.generateRelativeSlideAnimation(0, 0, 0, 1);
+      slide.setAnimationListener(new UiUtils.SimpleAnimationListener()
+      {
+        @Override
+        public void onAnimationEnd(Animation animation)
+        {
+          mPlacePage.setVisibility(View.GONE);
+        }
+      });
+    }
+    slide.setDuration(SHORT_ANIM_DURATION);
+    mPreview.startAnimation(slide);
+    mButtons.startAnimation(slide);
+    if (mVisibilityChangedListener != null)
+      mVisibilityChangedListener.onPreviewVisibilityChanged(show);
+
+    mIsPreviewVisible = show;
+  }
+
+  protected void showPlacePage(final boolean show)
+  {
+    mPlacePage.setVisibility(View.VISIBLE);
+    if (mIsPlacePageVisible == show)
+      return; // if state is already same as we need
+
+    TranslateAnimation slide;
+    if (show) // slide up
+    {
+      slide = UiUtils.generateRelativeSlideAnimation(0, 0, 1, 0);
+      slide.setDuration(SHORT_ANIM_DURATION);
+      mDetails.setVisibility(View.VISIBLE);
+    }
+    else // slide down
+    {
+      slide = UiUtils.generateRelativeSlideAnimation(0, 0, 0, 1);
+      slide.setDuration(SHORT_ANIM_DURATION);
+      slide.setAnimationListener(new UiUtils.SimpleAnimationListener()
+      {
+        @Override
+        public void onAnimationEnd(Animation animation)
+        {
+          mDetails.setVisibility(View.GONE);
+        }
+      });
+    }
+    mDetails.startAnimation(slide);
+    if (mVisibilityChangedListener != null)
+      mVisibilityChangedListener.onPlacePageVisibilityChanged(show);
+
+    mIsPlacePageVisible = show;
+  }
+
+  protected void hidePlacePage()
+  {
+    final TranslateAnimation slideDown = UiUtils.generateRelativeSlideAnimation(0, 0, 0, 1);
+    slideDown.setDuration(LONG_ANIM_DURATION);
+    slideDown.setAnimationListener(new UiUtils.SimpleAnimationListener()
+    {
+      @Override
+      public void onAnimationEnd(Animation animation)
+      {
+        mIsPlacePageVisible = false;
+        mIsPreviewVisible = false;
+
+        mPlacePage.setVisibility(View.GONE);
+        if (mVisibilityChangedListener != null)
+        {
+          mVisibilityChangedListener.onPreviewVisibilityChanged(false);
+          mVisibilityChangedListener.onPlacePageVisibilityChanged(false);
+        }
+      }
+    });
+
+    mPlacePage.startAnimation(slideDown);
+  }
+}