From 33ef354f0b2a0640d622cd0642769011afc31948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Thu, 31 Jan 2019 13:24:28 +0300
Subject: [PATCH] [android] Removed place page buttons animation

---
 .../src/com/mapswithme/maps/MwmActivity.java  |  3 ++
 .../BottomSheetPlacePageController.java       | 47 ++-----------------
 .../widget/placepage/PlacePageController.java |  1 -
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index e149c23678..5652373f49 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -696,6 +696,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   public boolean closePlacePage()
   {
+    if (mPlacePageController.isClosed())
+      return false;
+
     mPlacePageController.close();
     return true;
   }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
index e7cbf7d6df..ba4bf919f7 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
@@ -1,7 +1,5 @@
 package com.mapswithme.maps.widget.placepage;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.graphics.Rect;
 import android.location.Location;
@@ -25,7 +23,6 @@ import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior;
 public class BottomSheetPlacePageController implements PlacePageController, LocationListener,
                                                        View.OnLayoutChangeListener
 {
-  private static final int BUTTONS_ANIMATION_DURATION = 100;
   private static final float ANCHOR_RATIO = 0.3f;
   private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
   private static final String TAG = BottomSheetPlacePageController.class.getSimpleName();
@@ -62,16 +59,15 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
                     + " placepage height = " + mPlacePage.getHeight());
       if (newState == AnchorBottomSheetBehavior.STATE_SETTLING
           || newState == AnchorBottomSheetBehavior.STATE_DRAGGING)
+      {
         return;
+      }
 
       if (newState == AnchorBottomSheetBehavior.STATE_HIDDEN)
       {
         Framework.nativeDeactivatePopup();
-        hideButtons();
-        return;
+        UiUtils.invisible(mButtonsLayout);
       }
-
-      showButtons();
     }
 
     @Override
@@ -123,6 +119,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
         return;
       }
 
+      UiUtils.show(mButtonsLayout);
       openPlacePage();
     });
     mToolbar.setTitle(object.getTitle());
@@ -165,40 +162,6 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
     mPlacePage.hide();
   }
 
-  private void showButtons()
-  {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(mButtonsLayout, "translationY",
-                                                     0);
-    animator.setDuration(BUTTONS_ANIMATION_DURATION);
-    animator.addListener(new UiUtils.SimpleAnimatorListener()
-    {
-      @Override
-      public void onAnimationStart(Animator animation)
-      {
-        UiUtils.show(mButtonsLayout);
-        super.onAnimationStart(animation);
-      }
-    });
-    animator.start();
-  }
-
-  private void hideButtons()
-  {
-    ObjectAnimator animator = ObjectAnimator.ofFloat(mButtonsLayout, "translationY",
-                                                     mButtonsLayout.getMeasuredHeight());
-    animator.setDuration(BUTTONS_ANIMATION_DURATION);
-    animator.addListener(new UiUtils.SimpleAnimatorListener()
-    {
-      @Override
-      public void onAnimationEnd(Animator animation)
-      {
-        super.onAnimationEnd(animation);
-        UiUtils.invisible(mButtonsLayout);
-      }
-    });
-    animator.start();
-  }
-
   @Override
   public boolean isClosed()
   {
@@ -314,7 +277,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
     mPlacePage.post(() -> {
       setPeekHeight();
       setPlacePageAnchor();
-      showButtons();
+      UiUtils.show(mButtonsLayout);
     });
   }
 }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java
index 8e2ea46cad..33a09ca982 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java
@@ -11,6 +11,5 @@ public interface PlacePageController extends Initializable, Savable<Bundle>
 {
   void openFor(@NonNull MapObject object);
   void close();
-  // TODO: probably this method is redundant
   boolean isClosed();
 }