From a7e205c1812ec2d9d8e794981323c14de0bc41c5 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <arnaud.vergnet@mailo.com>
Date: Sat, 22 Oct 2022 22:25:18 +0200
Subject: [PATCH] [android] call onSlideFinish only when bottomsheet is settled

Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
---
 .../widget/placepage/BottomSheetChangedListener.java  |  1 -
 .../widget/placepage/DefaultBottomSheetCallback.java  | 11 ++---------
 .../widget/placepage/RichPlacePageController.java     |  7 -------
 .../widget/placepage/SimplePlacePageController.java   |  6 ------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java
index fdb8cdf78f..edc8ea6a8c 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java
@@ -3,7 +3,6 @@ package com.mapswithme.maps.widget.placepage;
 public interface BottomSheetChangedListener
 {
   void onSheetHidden();
-  void onSheetDirectionIconChange();
   void onSheetDetailsOpened();
   void onSheetCollapsed();
   void onSheetSliding(int top);
diff --git a/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java b/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java
index 7050544f7b..312569010f 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java
@@ -24,9 +24,9 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC
   {
     Logger.d(TAG, "State change, new = " + PlacePageUtils.toString(newState));
     if (PlacePageUtils.isSettlingState(newState) || PlacePageUtils.isDraggingState(newState))
-    {
       return;
-    }
+
+    mSheetChangedListener.onSheetSlideFinish();
 
     if (PlacePageUtils.isHiddenState(newState))
     {
@@ -34,8 +34,6 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC
       return;
     }
 
-    mSheetChangedListener.onSheetDirectionIconChange();
-
     if (isExpandedState(newState))
     {
       mSheetChangedListener.onSheetDetailsOpened();
@@ -49,10 +47,5 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC
   public void onSlide(@NonNull View bottomSheet, float slideOffset)
   {
     mSheetChangedListener.onSheetSliding(bottomSheet.getTop());
-
-    if (slideOffset < 0)
-      return;
-
-    mSheetChangedListener.onSheetSlideFinish();
   }
 }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
index 103e1aaca8..a267de559a 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
@@ -7,7 +7,6 @@ import android.location.Location;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowInsets;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -53,12 +52,6 @@ public class RichPlacePageController implements PlacePageController, LocationLis
       onHiddenInternal();
     }
 
-    @Override
-    public void onSheetDirectionIconChange()
-    {
-      // No op.
-    }
-
     @Override
     public void onSheetDetailsOpened()
     {
diff --git a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
index 163c19e024..5a5ba72436 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
@@ -52,12 +52,6 @@ public class SimplePlacePageController implements PlacePageController
             mStateListener.onPlacePageClosed();
         }
 
-        @Override
-        public void onSheetDirectionIconChange()
-        {
-          // No op.
-        }
-
         @Override
         public void onSheetDetailsOpened()
         {