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

[android] remove half expanded/anchored sheet state

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-06-25 12:50:31 +02:00 • committed by Alexander Borsuk
parent eb7f50460d
commit 0735f37a00
4 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java
View file

@ -6,7 +6,6 @@ import androidx.annotation.NonNull;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.mapswithme.util.log.Logger;
import static com.mapswithme.maps.widget.placepage.PlacePageUtils.isHalfExpandedState;
import static com.mapswithme.maps.widget.placepage.PlacePageUtils.isExpandedState;
public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetCallback
@ -37,7 +36,7 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC
mSheetChangedListener.onSheetDirectionIconChange();
if (isHalfExpandedState(newState) || isExpandedState(newState))
if (isExpandedState(newState))
{
mSheetChangedListener.onSheetDetailsOpened();
return;

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageGestureListener.java
View file

@ -30,11 +30,11 @@ class PlacePageGestureListener extends GestureDetector.SimpleOnGestureListener
int state = mBottomSheetBehavior.getState();
if (PlacePageUtils.isCollapsedState(state))
{
mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED);
mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
return true;
}
if (PlacePageUtils.isHalfExpandedState(state) || PlacePageUtils.isExpandedState(state))
if (PlacePageUtils.isExpandedState(state))
{
mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
return true;

7
android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
View file

@ -79,7 +79,7 @@ class PlacePageUtils
int drawableId = UiUtils.NO_ID;
if (PlacePageUtils.isCollapsedState(state))
drawableId = R.drawable.ic_disclosure_up;
else if (PlacePageUtils.isHalfExpandedState(state) || PlacePageUtils.isExpandedState(state))
else if (PlacePageUtils.isExpandedState(state))
drawableId = R.drawable.ic_disclosure_down;
if (drawableId == UiUtils.NO_ID)
@ -105,11 +105,6 @@ class PlacePageUtils
return state == BottomSheetBehavior.STATE_COLLAPSED;
}
static boolean isHalfExpandedState(@BottomSheetBehavior.State int state)
{
return state == BottomSheetBehavior.STATE_HALF_EXPANDED;
}
static boolean isExpandedState(@BottomSheetBehavior.State int state)
{
return state == BottomSheetBehavior.STATE_EXPANDED;

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

@ -160,7 +160,7 @@ public class RichPlacePageController implements PlacePageController, LocationLis
if (object.getOpeningMode() == MapObject.OPENING_MODE_DETAILS)
{
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED);
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
return;
}
@ -175,7 +175,6 @@ public class RichPlacePageController implements PlacePageController, LocationLis
mPlacePage.post(() -> {
setPeekHeight();
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
setPlacePageAnchor();
});
}
@ -243,11 +242,6 @@ public class RichPlacePageController implements PlacePageController, LocationLis
mSlideListener.onPlacePageSlide((int) (mPlacePage.getTop() + mPlacePage.getTranslationY()));
}
private void setPlacePageAnchor()
{
mPlacePageBehavior.setHalfExpandedRatio(ANCHOR_RATIO);
}
private int calculatePeekHeight()
{
final int organicPeekHeight = mPlacePage.getPreviewHeight() + mButtonsLayout.getHeight();
@ -355,7 +349,6 @@ public class RichPlacePageController implements PlacePageController, LocationLis
private void restorePlacePageState(@NonNull MapObject object, @BottomSheetBehavior.State int state)
{
mPlacePage.post(() -> {
setPlacePageAnchor();
mPlacePageBehavior.setState(state);
UiUtils.show(mButtonsLayout);
setPeekHeight();