organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android] Added third party anchor bottom sheet behavior and adapted it for place page

Browse source
This commit is contained in:
Александр Зацепин 2019-01-29 18:38:28 +03:00 • committed by yoksnod
parent 38ffb1a6e6
commit 4533ed3364
6 changed files with 63 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/build.gradle
View file

@ -18,6 +18,7 @@ allprojects {
google()
mavenCentral()
jcenter()
maven { url 'https://jitpack.io' }
}
}
@ -110,6 +111,7 @@ dependencies {
implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.1'
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
implementation 'com.google.android:flexbox:1.0.0'
implementation 'com.trafi:anchor-bottom-sheet-behavior:0.13-alpha'
}
def getDate() {

3
android/res/layout/activity_map.xml
View file

@ -80,7 +80,8 @@
android:layout_height="wrap_content"
android:fillViewport="true"
app:behavior_hideable="true"
app:layout_behavior="@string/bottom_sheet_behavior"/>
app:behavior_defaultState="hidden"
app:layout_behavior="@string/placepage_behavior"/>
<FrameLayout
android:id="@+id/pp_buttons_layout"
android:layout_width="match_parent"

11
android/res/values/attrs.xml
View file

@ -102,4 +102,15 @@
<attr name="filterPropertyTextColor" format="color"/>
<attr name="adsRemovalOptionsBg" format="reference"/>
<attr name="adsRemovalOptionsDivider" format="color"/>
<declare-styleable name="AnchorBottomSheetBehavior_Layout">
<attr name="behavior_anchorOffset" format="dimension" />
<attr name="behavior_defaultState" format="enum">
<enum name="expanded" value="3" />
<enum name="collapsed" value="4" />
<enum name="hidden" value="5" />
<enum name="anchored" value="6" />
</attr>
<attr name="behavior_skipAnchored" format="boolean" />
</declare-styleable>
</resources>

1
android/res/values/donottranslate.xml
View file

@ -97,4 +97,5 @@
<string name="always_enum_value" translatable="false">ALWAYS</string>
<string name="auto_enum_value" translatable="false">AUTO</string>
<string name="placepage_toolbar_behavior" translatable="false">com.mapswithme.maps.widget.placepage.ToolbarBehavior</string>
<string name="placepage_behavior" translatable="false">com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior</string>
</resources>

73
android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
View file

@ -6,7 +6,6 @@ import android.app.Activity;
import android.graphics.Rect;
import android.location.Location;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetBehavior;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.ViewGroup;
@ -20,18 +19,20 @@ import com.mapswithme.util.UiUtils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import com.mapswithme.util.statistics.PlacePageTracker;
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();
@NonNull
private final Activity mActivity;
@SuppressWarnings("NullableProblems")
@NonNull
private BottomSheetBehavior<View> mPlacePageBehavior;
private AnchorBottomSheetBehavior<View> mPlacePageBehavior;
@SuppressWarnings("NullableProblems")
@NonNull
private View mButtonsLayout;
@ -47,20 +48,21 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
private int mLastPeekHeight;
private int mViewportMinHeight;
@NonNull
private final BottomSheetBehavior.BottomSheetCallback mSheetCallback
= new BottomSheetBehavior.BottomSheetCallback()
private final AnchorBottomSheetBehavior.BottomSheetCallback mSheetCallback
= new AnchorBottomSheetBehavior.BottomSheetCallback()
{
@Override
public void onStateChanged(@NonNull View bottomSheet, int newState)
public void onStateChanged(@NonNull View bottomSheet, int oldState, int newState)
{
LOGGER.d(TAG, "State change, new = " + BottomSheetPlacePageController.toString(newState)
+ " old = " + BottomSheetPlacePageController.toString(oldState)
+ " placepage height = " + mPlacePage.getHeight());
if (newState == BottomSheetBehavior.STATE_SETTLING
|| newState == BottomSheetBehavior.STATE_DRAGGING)
if (newState == AnchorBottomSheetBehavior.STATE_SETTLING
|| newState == AnchorBottomSheetBehavior.STATE_DRAGGING)
return;
if (newState == BottomSheetBehavior.STATE_HIDDEN)
if (newState == AnchorBottomSheetBehavior.STATE_HIDDEN)
{
hideButtons();
return;
@ -90,9 +92,8 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
UiUtils.showHomeUpButton(mToolbar);
mToolbar.setNavigationOnClickListener(v -> close());
mPlacePage = mActivity.findViewById(R.id.placepage);
mPlacePageBehavior = BottomSheetBehavior.from(mPlacePage);
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
mPlacePageBehavior.setBottomSheetCallback(mSheetCallback);
mPlacePageBehavior = AnchorBottomSheetBehavior.from(mPlacePage);
mPlacePageBehavior.addBottomSheetCallback(mSheetCallback);
mPlacePage.addOnLayoutChangeListener(this);
mButtonsLayout = mActivity.findViewById(R.id.pp_buttons_layout);
ViewGroup buttons = mButtonsLayout.findViewById(R.id.container);
@ -115,28 +116,40 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
mPlacePage.setMapObject(object, false, () -> {
if (object.isExtendedView())
{
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_EXPANDED);
return;
}
openBottomSheet();
openPlacePage();
});
mToolbar.setTitle(object.getTitle());
mPlacePageTracker.setMapObject(object);
Framework.logLocalAdsEvent(Framework.LocalAdsEventType.LOCAL_ADS_EVENT_OPEN_INFO, object);
}
private void openBottomSheet()
private void openPlacePage()
{
mPlacePage.post(() -> {
int peekHeight = getPeekHeight();
LOGGER.d(TAG, "Peek height = " + peekHeight);
mLastPeekHeight = peekHeight;
mPlacePageBehavior.setPeekHeight(mLastPeekHeight);
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
collapsePlacePage();
setPlacePageAnchor();
});
}
private void collapsePlacePage()
{
int peekHeight = getPeekHeight();
LOGGER.d(TAG, "Peek height = " + peekHeight);
mLastPeekHeight = peekHeight;
mPlacePageBehavior.setPeekHeight(mLastPeekHeight);
mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_COLLAPSED);
}
private void setPlacePageAnchor()
{
View parent = (View) mPlacePage.getParent();
mPlacePageBehavior.setAnchorOffset((int) (parent.getHeight() * ANCHOR_RATIO));
}
private int getPeekHeight()
{
return mPlacePage.getPreviewHeight() + mButtonsLayout.getHeight();
@ -145,7 +158,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
@Override
public void close()
{
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_HIDDEN);
mPlacePage.hide();
}
@ -186,7 +199,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
@Override
public boolean isClosed()
{
return mPlacePageBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN;
return mPlacePageBehavior.getState() == AnchorBottomSheetBehavior.STATE_HIDDEN;
}
@Override
@ -213,13 +226,13 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
oldTop, int oldRight, int oldBottom)
{
LOGGER.d(TAG, "Layout changed, current state = " + toString(mPlacePageBehavior.getState()));
if (mPlacePageBehavior.getState() != BottomSheetBehavior.STATE_COLLAPSED)
if (mPlacePageBehavior.getState() != AnchorBottomSheetBehavior.STATE_COLLAPSED)
return;
if (getPeekHeight() == mLastPeekHeight)
return;
openBottomSheet();
openPlacePage();
}
private void updateViewPortRect()
@ -243,19 +256,21 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
}
@NonNull
private static String toString(@BottomSheetBehavior.State int state)
private static String toString(@AnchorBottomSheetBehavior.State int state)
{
switch (state)
{
case BottomSheetBehavior.STATE_EXPANDED:
case AnchorBottomSheetBehavior.STATE_EXPANDED:
return "EXPANDED";
case BottomSheetBehavior.STATE_COLLAPSED:
case AnchorBottomSheetBehavior.STATE_COLLAPSED:
return "COLLAPSED";
case BottomSheetBehavior.STATE_DRAGGING:
case AnchorBottomSheetBehavior.STATE_ANCHORED:
return "ANCHORED";
case AnchorBottomSheetBehavior.STATE_DRAGGING:
return "DRAGGING";
case BottomSheetBehavior.STATE_SETTLING:
case AnchorBottomSheetBehavior.STATE_SETTLING:
return "SETTLING";
case BottomSheetBehavior.STATE_HIDDEN:
case AnchorBottomSheetBehavior.STATE_HIDDEN:
return "HIDDEN";
default:
throw new AssertionError("Unsupported state detected: " + state);

3
data/copyright.html
View file

@ -210,6 +210,9 @@
<li class="android"><a href="https://github.com/timehop/sticky-headers-recyclerview">sticky-headers-recyclerview</a><br>
&copy; 2014 Jacob Tabak; <a href="#apache2-license" class="license">Apache License</a></li>
<Li><a href="https://github.com/trafi/anchor-bottom-sheet-behavior">AnchorBottomSheetBehavior</a><br>
<a href="#apache2-license" class="license">Apache License</a></li>
</ul>
<p lang="en">We also use these wonderful fonts for labels on the map:</p>