kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #6319 from goblinr/MAPSME-4683-remove-slot-frame

Browse source 
[android] Remove routing slot frame
This commit is contained in:
Arsentiy Milchakov 2017-06-22 15:45:23 +03:00 • committed by GitHub
commit 0a583dfcdf
28 changed files with 40 additions and 849 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/res/drawable/routing_slot_background.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/routing_slot_background_pressed"
android:state_pressed="true"/>
<item android:drawable="@drawable/routing_slot_background_normal"/>
</selector>

7
android/res/drawable/routing_slot_background_night.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/routing_slot_background_pressed_night"
android:state_pressed="true"/>
<item android:drawable="@drawable/routing_slot_background_normal_night"/>
</selector>

6
android/res/drawable/routing_slot_background_normal.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/routing_slot_background"/>
<corners android:radius="2dp"/>
</shape>

6
android/res/drawable/routing_slot_background_normal_night.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/routing_slot_background_night"/>
<corners android:radius="2dp"/>
</shape>

6
android/res/drawable/routing_slot_background_pressed.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="2dp"/>
<solid android:color="@color/routing_slot_background_pressed"/>
</shape>

6
android/res/drawable/routing_slot_background_pressed_night.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="2dp"/>
<solid android:color="@color/routing_slot_background_pressed_night"/>
</shape>

6
android/res/drawable/routing_slot_background_shadow.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="2dp"/>
<solid android:color="@color/routing_slot_shadow"/>
</shape>

6
android/res/drawable/routing_slot_marker.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp"/>
<solid android:color="@color/base_accent"/>
</shape>

6
android/res/drawable/routing_slot_marker_night.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp"/>
<solid android:color="@color/base_accent_night"/>
</shape>

4
android/res/layout-land/routing_plan_slots.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge>
<include layout="@layout/routing_plan_slots_horizontal"/>
</merge>

4
android/res/layout-w1020dp/routing_plan_slots.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge>
<include layout="@layout/routing_plan_slots_vertical"/>
</merge>

15
android/res/layout/routing_plan.xml
View file

@ -10,12 +10,6 @@
android:clipToPadding="false">
<FrameLayout android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
layout="@layout/routing_plan_slots"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="?attr/actionBarSize"
android:clickable="true"/>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
@ -135,15 +129,6 @@
</LinearLayout>
<ImageView
android:id="@+id/toggle"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="center"
tools:src="@drawable/ic_down" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>

4
android/res/layout/routing_plan_slots.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge>
<include layout="@layout/routing_plan_slots_vertical"/>
</merge>

23
android/res/layout/routing_plan_slots_horizontal.xml
View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mapswithme.maps.routing.SlotFrame
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slots"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?colorPrimary">
<include
android:id="@+id/from"
layout="@layout/routing_point_slot"
android:layout_width="0dp"
android:layout_height="@dimen/routing_slot_height"
android:layout_weight="1"
android:layout_marginRight="8dp"/>
<include
android:id="@+id/to"
layout="@layout/routing_point_slot"
android:layout_width="0dp"
android:layout_height="@dimen/routing_slot_height"
android:layout_weight="1"/>
</com.mapswithme.maps.routing.SlotFrame>

21
android/res/layout/routing_plan_slots_vertical.xml
View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mapswithme.maps.routing.SlotFrame
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slots"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?colorPrimary">
<include
android:id="@+id/from"
layout="@layout/routing_point_slot"
android:layout_width="match_parent"
android:layout_height="@dimen/routing_slot_height"
android:layout_marginBottom="8dp"/>
<include
android:id="@+id/to"
layout="@layout/routing_point_slot"
android:layout_width="match_parent"
android:layout_height="@dimen/routing_slot_height"/>
</com.mapswithme.maps.routing.SlotFrame>

52
android/res/layout/routing_point_slot.xml
View file

@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View
android:id="@+id/shadow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/routing_shadow_top_margin"
android:background="@drawable/routing_slot_background_shadow"/>
<LinearLayout
android:id="@+id/shadowed_frame"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/routing_shadow_top_margin"
android:layout_marginBottom="@dimen/routing_shadow_bottom_margin"
android:background="?routingSlot">
<TextView
android:id="@+id/order"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="?routingSlotMarker"
android:gravity="center"
android:layout_margin="@dimen/margin_half_plus"
android:textAppearance="@style/MwmTextAppearance.Body3.Light"
android:textStyle="bold"
tools:text="1"/>
<TextView
android:id="@+id/text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:textSize="@dimen/text_size_body_1"
android:singleLine="true"
android:ellipsize="end"
tools:text="Current position"/>
<ImageView
android:id="@+id/drag_handle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="?iconTintLight"
android:src="@drawable/ic_move"/>
</LinearLayout>
</FrameLayout>

2
android/res/values/anim.xml
View file

@ -8,6 +8,4 @@
<integer name="anim_location_pending_item">50</integer>
<integer name="anim_spinner_pending_item">50</integer>
<integer name="anim_traffic_loading_item">900</integer>
<integer name="anim_slots_swap">@integer/anim_default</integer>
<integer name="anim_slots_toggle">@integer/anim_default</integer>
</resources>

5
android/res/values/colors.xml
View file

@ -121,11 +121,6 @@
<!-- Routing-->
<color name="bg_routing_progress">#1F000000</color>
<color name="routing_slot_background">#FFFFFFFF</color>
<color name="routing_slot_background_night">@color/bg_panel_night</color>
<color name="routing_slot_background_pressed">#FFF0F0F0</color>
<color name="routing_slot_background_pressed_night">@color/bg_window_night</color>
<color name="routing_slot_shadow">#3D000000</color>
<color name="routing_button_tint">#FFFFFFFF</color>
<color name="routing_button_activated_tint">@color/bg_statusbar</color>
<color name="routing_button_activated_tint_night">@color/bg_statusbar_night</color>

2
android/res/values/dimens.xml
View file

@ -72,8 +72,6 @@
<dimen name="routing_selector_size">48dp</dimen>
<dimen name="routing_selector_wheel_size">40dp</dimen>
<dimen name="routing_selector_wheel_margin">4dp</dimen>
<dimen name="routing_slot_height">52dp</dimen>
<dimen name="routing_slot_overlap_margin">12dp</dimen>
<dimen name="routing_shadow_top_margin">3dp</dimen>
<dimen name="routing_shadow_top_margin_dragging">0dp</dimen>
<dimen name="routing_shadow_bottom_margin">2dp</dimen>

3
android/res/values/themes-attrs.xml
View file

@ -28,9 +28,6 @@
<attr name="ppPositive" format="reference"/>
<attr name="ppNegative" format="reference"/>
<attr name="routingSlot" format="reference"/>
<attr name="routingSlotPressed" format="reference"/>
<attr name="routingSlotMarker" format="reference"/>
<attr name="navNextTurnFrame" format="reference"/>
<attr name="navNextNextTurnFrame" format="reference"/>

6
android/res/values/themes-base.xml
View file

@ -39,9 +39,6 @@
<item name="ppPreviewHeadOpen">@drawable/bg_place_page_head_open</item>
<item name="ppPreviewHeadClosed">@drawable/bg_place_page_head_closed</item>
<item name="routingSlot">@drawable/routing_slot_background</item>
<item name="routingSlotPressed">@drawable/routing_slot_background_pressed</item>
<item name="routingSlotMarker">@drawable/routing_slot_marker</item>
<item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
<item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>
@ -146,9 +143,6 @@
<item name="ppPreviewHeadOpen">@drawable/bg_place_page_head_open_night</item>
<item name="ppPreviewHeadClosed">@drawable/bg_place_page_head_closed_night</item>
<item name="routingSlot">@drawable/routing_slot_background_night</item>
<item name="routingSlotPressed">@drawable/routing_slot_background_pressed_night</item>
<item name="routingSlotMarker">@drawable/routing_slot_marker_night</item>
<item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
<item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>

80
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -57,7 +57,6 @@ import com.mapswithme.maps.location.CompassData;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.routing.NavigationController;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.maps.routing.RoutingPlanController;
import com.mapswithme.maps.routing.RoutingPlanFragment;
import com.mapswithme.maps.routing.RoutingPlanInplaceController;
import com.mapswithme.maps.search.FloatingSearchToolbarController;
@ -115,10 +114,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
CustomNavigateUpListener,
RoutingController.Container,
LocationHelper.UiCallback,
RoutingPlanController.OnToggleListener,
RoutingPlanController.SearchPoiTransitionListener,
FloatingSearchToolbarController.VisibilityListener,
NativeSearchListener, NavigationButtonsAnimationController.OnTranslationChangedListener
NativeSearchListener,
NavigationButtonsAnimationController.OnTranslationChangedListener,
RoutingPlanInplaceController.RoutingPlanListener
{
public static final String EXTRA_TASK = "map_task";
private static final String EXTRA_CONSUMED = "mwm.extra.intent.processed";
@ -523,9 +522,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!mIsFragmentContainer)
{
mRoutingPlanInplaceController = new RoutingPlanInplaceController(this);
mRoutingPlanInplaceController.setOnToggleListener(this);
mRoutingPlanInplaceController.setPoiTransitionListener(this);
mRoutingPlanInplaceController = new RoutingPlanInplaceController(this, this);
removeCurrentFragment(false);
}
@ -1730,14 +1727,21 @@ public class MwmActivity extends BaseMwmFragmentActivity
mNavAnimationController.setTopLimit(limit);
}
@Override
public void onRoutingPlanStartAnimate(boolean show)
{
if (mNavAnimationController == null)
return;
mNavAnimationController.setTopLimit(!show ? 0 : mRoutingPlanInplaceController.getHeight());
mNavAnimationController.setBottomLimit(!show ? 0 : getCurrentMenu().getFrame().getHeight());
adjustCompassAndTraffic(!show ? UiUtils.getStatusBarHeight(getApplicationContext())
: mRoutingPlanInplaceController.getHeight());
}
@Override
public void showRoutePlan(boolean show, @Nullable Runnable completionListener)
{
if (mNavAnimationController != null && !mIsFragmentContainer)
{
mNavAnimationController.setBottomLimit(!show ? 0 : getCurrentMenu().getFrame().getHeight());
mNavAnimationController.slide(show, getCurrentMenu().getFrame().getHeight());
}
if (show)
{
mSearchController.hide();
@ -1756,20 +1760,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
mRoutingPlanInplaceController.show(true);
if (completionListener != null)
completionListener.run();
int routingPlanPanelHeight = mRoutingPlanInplaceController.getHeight();
if (routingPlanPanelHeight > 0)
{
adjustCompassAndTraffic(routingPlanPanelHeight);
setNavButtonsTopLimit(routingPlanPanelHeight);
}
}
}
else
{
if (mIsFragmentContainer)
{
adjustTraffic(0, UiUtils.getStatusBarHeight(getApplicationContext()));
adjustCompassAndTraffic(UiUtils.getStatusBarHeight(getApplicationContext()));
setNavButtonsTopLimit(0);
if (mNavigationController != null)
mNavigationController.adjustSearchButtons(0);
}
@ -1783,9 +1781,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (completionListener != null)
completionListener.run();
adjustCompassAndTraffic(UiUtils.getStatusBarHeight(getApplicationContext()));
setNavButtonsTopLimit(0);
updateSearchBar();
}
@ -1804,17 +1799,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
mTraffic.setOffset(offsetX, offsetY);
}
@Override
public void onToggle(boolean state)
{
if (mNavAnimationController == null)
return;
int routingPlanPanelHeight = mRoutingPlanInplaceController.getHeight();
adjustCompassAndTraffic(routingPlanPanelHeight);
setNavButtonsTopLimit(routingPlanPanelHeight + UiUtils.dimen(R.dimen.compass_height));
}
@Override
public void onSearchVisibilityChanged(boolean visible)
{
@ -1865,21 +1849,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
@Override
public void updatePoints()
{
if (mIsFragmentContainer)
{
RoutingPlanFragment fragment = (RoutingPlanFragment) getFragment(RoutingPlanFragment.class);
if (fragment != null)
fragment.updatePoints();
}
else
{
mRoutingPlanInplaceController.updatePoints();
}
}
@Override
public void updateBuildProgress(int progress, @Framework.RouterType int router)
{
@ -1895,13 +1864,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
@Override
public void animateSearchPoiTransition(@NonNull final Rect startRect,
@Nullable final Runnable runnable)
{
Animations.riseTransition(mRootView, startRect, runnable);
}
@Override
public void onUberInfoReceived(@NonNull UberInfo info)
{
@ -2024,14 +1986,16 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onFadeInZoomButtons()
{
if (mNavigationController != null)
if (mNavigationController != null
&& (RoutingController.get().isPlanning() || RoutingController.get().isNavigating()))
mNavigationController.fadeInSearchButtons();
}
@Override
public void onFadeOutZoomButtons()
{
if (mNavigationController != null)
if (mNavigationController != null
&& (RoutingController.get().isPlanning() || RoutingController.get().isNavigating()))
mNavigationController.fadeOutSearchButtons();
}

2
android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java
View file

@ -17,7 +17,7 @@ import com.mapswithme.util.UiUtils;
class NavigationButtonsAnimationController
{
private static final int ANIM_TOGGLE = MwmApplication.get().getResources().getInteger(R.integer.anim_slots_toggle);
private static final int ANIM_TOGGLE = MwmApplication.get().getResources().getInteger(R.integer.anim_default);
private static final String STATE_VISIBLE = "state_visible";
@NonNull

8
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -66,7 +66,6 @@ public class RoutingController
void showNavigation(boolean show);
void showDownloader(boolean openDownloaded);
void updateMenu();
void updatePoints();
void onUberInfoReceived(@NonNull UberInfo info);
void onUberError(@NonNull Uber.ErrorCode code);
void onNavigationCancelled();
@ -268,7 +267,6 @@ public class RoutingController
mContainer.showNavigation(isNavigating());
mContainer.updateMenu();
mContainer.updatePoints();
}
processRoutingEvent();
}
@ -686,8 +684,6 @@ public class RoutingController
{
if (isWaitingPoiPick())
showRoutePlan();
mContainer.updatePoints();
}
if (mStartPoint != null && mEndPoint != null)
@ -703,9 +699,6 @@ public class RoutingController
{
mLogger.d(TAG, "setStartFromMyPosition: no my position - skip");
if (mContainer != null)
mContainer.updatePoints();
setPointsInternal();
return false;
}
@ -857,7 +850,6 @@ public class RoutingController
if (mContainer != null)
{
mContainer.updatePoints();
mContainer.updateMenu();
showRoutePlan();
}

171
android/src/com/mapswithme/maps/routing/RoutingPlanController.java
View file

@ -1,19 +1,13 @@
package com.mapswithme.maps.routing;
import android.animation.Animator;
import android.animation.ValueAnimator;
import android.app.Activity;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@ -22,7 +16,6 @@ import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.uber.Uber;
import com.mapswithme.maps.uber.UberInfo;
import com.mapswithme.maps.widget.RotateDrawable;
import com.mapswithme.maps.widget.RoutingToolbarButton;
import com.mapswithme.maps.widget.ToolbarController;
import com.mapswithme.maps.widget.WheelProgressView;
@ -30,13 +23,11 @@ import com.mapswithme.util.UiUtils;
import com.mapswithme.util.statistics.AlohaHelper;
import com.mapswithme.util.statistics.Statistics;
public class RoutingPlanController extends ToolbarController implements SlotFrame.SlotClickListener
public class RoutingPlanController extends ToolbarController
{
static final int ANIM_TOGGLE = MwmApplication.get().getResources().getInteger(R.integer.anim_slots_toggle);
static final int ANIM_TOGGLE = MwmApplication.get().getResources().getInteger(R.integer.anim_default);
protected final View mFrame;
private final ImageView mToggle;
private final SlotFrame mSlotFrame;
private final RadioGroup mRouterTypes;
private final WheelProgressView mProgressVehicle;
private final WheelProgressView mProgressPedestrian;
@ -46,27 +37,7 @@ public class RoutingPlanController extends ToolbarController implements SlotFram
@NonNull
private final RoutingBottomMenuController mRoutingBottomMenuController;
private final RotateDrawable mToggleImage = new RotateDrawable(R.drawable.ic_down);
int mFrameHeight;
private int mToolbarHeight;
private boolean mOpen;
@Nullable
private OnToggleListener mToggleListener;
@Nullable
private SearchPoiTransitionListener mPoiTransitionListener;
public interface OnToggleListener
{
void onToggle(boolean state);
}
public interface SearchPoiTransitionListener
{
void animateSearchPoiTransition(@NonNull final Rect startRect,
@Nullable final Runnable runnable);
}
private RadioButton setupRouterButton(@IdRes int buttonId, final @DrawableRes int iconRes, View.OnClickListener clickListener)
{
@ -96,9 +67,6 @@ public class RoutingPlanController extends ToolbarController implements SlotFram
super(root, activity);
mFrame = root;
mToggle = (ImageView) mToolbar.findViewById(R.id.toggle);
mSlotFrame = (SlotFrame) root.findViewById(R.id.slots);
mSlotFrame.setSlotClickListener(this);
mRouterTypes = (RadioGroup) mToolbar.findViewById(R.id.route_type);
setupRouterButton(R.id.vehicle, R.drawable.ic_car, new View.OnClickListener()
@ -152,16 +120,6 @@ public class RoutingPlanController extends ToolbarController implements SlotFram
mProgressTaxi = (WheelProgressView) progressFrame.findViewById(R.id.progress_taxi);
mRoutingBottomMenuController = RoutingBottomMenuController.newInstance(mActivity, mFrame);
mToggle.setImageDrawable(mToggleImage);
mToggle.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
toggleSlots();
}
});
}
@Override
@ -172,53 +130,15 @@ public class RoutingPlanController extends ToolbarController implements SlotFram
RoutingController.get().cancel();
}
@Override
public void onSlotClicked(final int order, @NonNull Rect rect)
{
if (mPoiTransitionListener != null)
{
mPoiTransitionListener.animateSearchPoiTransition(rect, new Runnable()
{
@Override
public void run()
{
RoutingController.get().searchPoi();
}
});
}
else
{
RoutingController.get().searchPoi();
}
}
public void setPoiTransitionListener(@Nullable SearchPoiTransitionListener poiTransitionListener)
{
mPoiTransitionListener = poiTransitionListener;
}
boolean checkFrameHeight()
{
if (mFrameHeight > 0)
return true;
mFrameHeight = mSlotFrame.getHeight();
mToolbarHeight = mToolbar.getHeight();
mFrameHeight = mFrame.getHeight();
return (mFrameHeight > 0);
}
private void animateSlotFrame(int offset)
{
ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) mSlotFrame.getLayoutParams();
lp.topMargin = (mToolbarHeight - offset);
mSlotFrame.setLayoutParams(lp);
}
public void updatePoints()
{
mSlotFrame.update();
}
private void updateProgressLabels()
{
RoutingController.BuildState buildState = RoutingController.get().getBuildState();
@ -292,89 +212,11 @@ public class RoutingPlanController extends ToolbarController implements SlotFram
progressView.setProgress(progress);
}
private void toggleSlots()
{
AlohaHelper.logClick(AlohaHelper.ROUTING_TOGGLE);
Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_TOGGLE);
showSlots(!mOpen, true);
}
void showSlots(final boolean show, final boolean animate)
{
if (!checkFrameHeight())
{
mFrame.post(new Runnable()
{
@Override
public void run()
{
showSlots(show, animate);
}
});
return;
}
mOpen = show;
if (animate)
{
ValueAnimator animator = ValueAnimator.ofFloat(mOpen ? 1.0f : 0, mOpen ? 0 : 1.0f);
animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener()
{
@Override
public void onAnimationUpdate(ValueAnimator animation)
{
float fraction = (float)animation.getAnimatedValue();
animateSlotFrame((int)(fraction * mFrameHeight));
mToggleImage.setAngle((1.0f - fraction) * 180.0f);
}
});
animator.addListener(new UiUtils.SimpleAnimatorListener() {
@Override
public void onAnimationEnd(Animator animation)
{
if (mToggleListener != null)
mToggleListener.onToggle(mOpen);
}
});
animator.setDuration(ANIM_TOGGLE);
animator.start();
mSlotFrame.fadeSlots(!mOpen);
}
else
{
animateSlotFrame(mOpen ? 0 : mFrameHeight);
mToggleImage.setAngle(mOpen ? 180.0f : 0.0f);
mSlotFrame.unfadeSlots();
mSlotFrame.post(new Runnable()
{
@Override
public void run()
{
if (mToggleListener != null)
mToggleListener.onToggle(mOpen);
}
});
}
}
private boolean isTaxiRouterType()
{
return RoutingController.get().isTaxiRouterType();
}
void disableToggle()
{
UiUtils.hide(mToggle);
showSlots(true, false);
}
public boolean isOpen()
{
return mOpen;
}
public void showUberInfo(@NonNull UberInfo info)
{
mRoutingBottomMenuController.showUberInfo(info);
@ -426,12 +268,7 @@ public class RoutingPlanController extends ToolbarController implements SlotFram
public int getHeight()
{
return mFrame.getHeight();
}
public void setOnToggleListener(@Nullable OnToggleListener listener)
{
mToggleListener = listener;
return mFrameHeight;
}
public void showAddStartFrame()

12
android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java
View file

@ -26,22 +26,10 @@ public class RoutingPlanFragment extends BaseMwmFragment
View res = inflater.inflate(R.layout.fragment_routing, container, false);
mPlanController = new RoutingPlanController(res, getActivity());
updatePoints();
return res;
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
{
mPlanController.disableToggle();
}
public void updatePoints()
{
mPlanController.updatePoints();
}
public void updateBuildProgress(int progress, @Framework.RouterType int router)
{
mPlanController.updateBuildProgress(progress, router);

36
android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java
View file

@ -8,18 +8,18 @@ import android.support.annotation.Nullable;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.util.UiUtils;
public class RoutingPlanInplaceController extends RoutingPlanController
{
private static final String STATE_OPEN = "slots panel open";
@Nullable
private RoutingPlanListener mRoutingPlanListener;
private Boolean mSlotsRestoredState;
public RoutingPlanInplaceController(MwmActivity activity)
public RoutingPlanInplaceController(@NonNull MwmActivity activity,
@Nullable RoutingPlanListener routingPlanListener)
{
super(activity.findViewById(R.id.routing_plan_frame), activity);
mRoutingPlanListener = routingPlanListener;
}
public void show(final boolean show)
@ -28,21 +28,7 @@ public class RoutingPlanInplaceController extends RoutingPlanController
return;
if (show)
{
final MapObject start = RoutingController.get().getStartPoint();
final MapObject end = RoutingController.get().getEndPoint();
boolean open = (mSlotsRestoredState == null
? (!MapObject.isOfType(MapObject.MY_POSITION, start) || end == null)
: mSlotsRestoredState);
showSlots(open, false);
mSlotsRestoredState = null;
}
if (show)
{
UiUtils.show(mFrame);
updatePoints();
}
animateFrame(show, new Runnable()
{
@ -57,15 +43,11 @@ public class RoutingPlanInplaceController extends RoutingPlanController
public void onSaveState(@NonNull Bundle outState)
{
outState.putBoolean(STATE_OPEN, isOpen());
saveRoutingPanelState(outState);
}
public void restoreState(@NonNull Bundle state)
{
if (state.containsKey(STATE_OPEN))
mSlotsRestoredState = state.getBoolean(STATE_OPEN);
restoreRoutingPanelState(state);
}
@ -84,6 +66,9 @@ public class RoutingPlanInplaceController extends RoutingPlanController
return;
}
if (mRoutingPlanListener != null)
mRoutingPlanListener.onRoutingPlanStartAnimate(show);
ValueAnimator animator =
ValueAnimator.ofFloat(show ? -mFrameHeight : 0, show ? 0 : -mFrameHeight);
animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener()
@ -106,4 +91,9 @@ public class RoutingPlanInplaceController extends RoutingPlanController
animator.setDuration(ANIM_TOGGLE);
animator.start();
}
public interface RoutingPlanListener
{
void onRoutingPlanStartAnimate(boolean show);
}
}

383
android/src/com/mapswithme/maps/routing/SlotFrame.java
View file

@ -1,383 +0,0 @@
package com.mapswithme.maps.routing;
import android.animation.Animator;
import android.content.Context;
import android.graphics.PointF;
import android.graphics.Rect;
import android.os.Build;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UiUtils;
public class SlotFrame extends LinearLayout
{
private static final int ANIM_SWAP = MwmApplication.get().getResources().getInteger(R.integer.anim_slots_swap);
private Slot mSlotFrom;
private Slot mSlotTo;
private Slot mDraggedSlot;
private Slot mNotDraggedSlot;
private final PointF mDragStartPoint = new PointF();
private boolean mSwapProgress;
private int mTextColor;
private int mHintColor;
@Nullable
private SlotClickListener mSlotClickListener;
interface SlotClickListener
{
void onSlotClicked(int order, @NonNull Rect rect);
}
private class Slot
{
private final View mFrame;
private final View mShadowedFrame;
private final View mShadow;
private final TextView mOrderText;
private final TextView mText;
private final View mDragHandle;
private Rect mOverlapRect;
private Rect mHitRect;
private final int mOrder;
private MapObject mMapObject;
private final Animator.AnimatorListener mCancelAnimationListener = new UiUtils.SimpleAnimatorListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
cancelDrag();
mFrame.animate().setListener(null);
RoutingController.get().swapPoints();
}
};
Slot(View frame, @IdRes int id, int order)
{
mFrame = frame.findViewById(id);
mShadowedFrame = mFrame.findViewById(R.id.shadowed_frame);
mShadow = mFrame.findViewById(R.id.shadow);
mOrderText = (TextView) mFrame.findViewById(R.id.order);
mText = (TextView) mFrame.findViewById(R.id.text);
mDragHandle = mFrame.findViewById(R.id.drag_handle);
mFrame.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
Rect rect = new Rect();
mFrame.getGlobalVisibleRect(rect);
if (mSlotClickListener != null)
mSlotClickListener.onSlotClicked(mOrder, rect);
}
});
mOrder = order;
mOrderText.setText(String.valueOf(mOrder));
setMapObject(null);
}
private void updateText()
{
if (mMapObject == null)
{
if (mOrder == 1)
mText.setText(R.string.p2p_from);
else
mText.setText(R.string.p2p_to);
mText.setTextColor(mHintColor);
return;
}
if (MapObject.isOfType(MapObject.MY_POSITION, mMapObject))
mText.setText(R.string.p2p_your_location);
else
{
String text = mMapObject.getTitle();
if (TextUtils.isEmpty(text))
{
text = mMapObject.getAddress();
if (TextUtils.isEmpty(text))
text = mMapObject.getSubtitle();
}
mText.setText(text);
}
mText.setTextColor(mTextColor);
}
void setMapObject(MapObject mapObject)
{
mMapObject = mapObject;
updateText();
}
private void checkHitRect()
{
if (mHitRect == null)
{
mHitRect = new Rect();
mFrame.getHitRect(mHitRect);
}
}
boolean overlaps(Slot slot)
{
if (mOverlapRect == null)
{
mOverlapRect = new Rect();
mFrame.getHitRect(mOverlapRect);
int margin = UiUtils.dimen(R.dimen.routing_slot_overlap_margin);
mOverlapRect.inset(margin, margin);
}
slot.checkHitRect();
mOverlapRect.offset((int)mFrame.getTranslationX(), (int)mFrame.getTranslationY());
boolean res = Rect.intersects(slot.mHitRect, mOverlapRect);
mOverlapRect.offset((int)-mFrame.getTranslationX(), (int)-mFrame.getTranslationY());
return res;
}
boolean handleHit(MotionEvent event)
{
checkHitRect();
return (mHitRect.contains((int)event.getX(), (int)event.getY()) &&
event.getX() > mDragHandle.getLeft() + mHitRect.left);
}
void setDragging(boolean dragging)
{
MarginLayoutParams lp = (MarginLayoutParams) mShadowedFrame.getLayoutParams();
lp.topMargin = UiUtils.dimen(dragging ? R.dimen.routing_shadow_top_margin_dragging
: R.dimen.routing_shadow_top_margin);
lp.bottomMargin = UiUtils.dimen(dragging ? R.dimen.routing_shadow_bottom_margin_dragging
: R.dimen.routing_shadow_bottom_margin);
mShadowedFrame.setLayoutParams(lp);
mShadow.setAlpha(dragging ? 0.6f : 1.0f);
mShadowedFrame.setBackgroundResource(ThemeUtils.getResource(getContext(), dragging ? R.attr.routingSlotPressed
: R.attr.routingSlot));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
mFrame.setElevation(dragging ? 1.0f : 0.0f);
}
void moveViewTo(float x, float y)
{
if (getOrientation() == HORIZONTAL)
mFrame.setTranslationX(x - mDragStartPoint.x);
else
mFrame.setTranslationY(y - mDragStartPoint.y);
}
void swapAnimated(Slot other)
{
mSwapProgress = true;
MapObject point = other.mMapObject;
other.setMapObject(mMapObject);
setMapObject(point);
setDragging(false);
checkHitRect();
other.checkHitRect();
float offsetX = (other.mHitRect.left - mHitRect.left);
float offsetY = (other.mHitRect.top - mHitRect.top);
float otherOffsetX = (mFrame.getTranslationX() - offsetX);
float otherOffsetY = (mFrame.getTranslationY() - offsetY);
mFrame.setTranslationX(offsetX);
mFrame.setTranslationY(offsetY);
mFrame.animate()
.setDuration(ANIM_SWAP)
.translationX(0.0f)
.translationY(0.0f)
.setListener(mCancelAnimationListener)
.start();
other.mFrame.setTranslationX(otherOffsetX);
other.mFrame.setTranslationY(otherOffsetY);
other.mFrame.animate()
.setDuration(ANIM_SWAP)
.translationX(0.0f)
.translationY(0.0f)
.setListener(null)
.start();
}
}
@Override
protected void onFinishInflate()
{
super.onFinishInflate();
mTextColor = ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary);
mHintColor = ThemeUtils.getColor(getContext(), R.attr.secondary);
setBaselineAligned(false);
setClipChildren(false);
setClipToPadding(false);
setClickable(true);
int padding = UiUtils.toPx(8);
setPadding(padding, padding / 4, padding, padding);
mSlotFrom = new Slot(this, R.id.from, 1);
mSlotTo = new Slot(this, R.id.to, 2);
}
private boolean isDragging()
{
return (mDraggedSlot != null);
}
private void cancelDrag()
{
if (mDraggedSlot == null)
return;
mDraggedSlot.moveViewTo(mDragStartPoint.x, mDragStartPoint.y);
mDraggedSlot.setDragging(false);
mDraggedSlot = null;
mNotDraggedSlot = null;
mSwapProgress = false;
}
private void startDrag(Slot slotToDrag, MotionEvent event)
{
if (isDragging() || event.getAction() != MotionEvent.ACTION_DOWN)
return;
mDraggedSlot = slotToDrag;
mDraggedSlot.setDragging(true);
mNotDraggedSlot = (mDraggedSlot == mSlotFrom ? mSlotTo : mSlotFrom);
mDragStartPoint.set(event.getX(), event.getY());
}
@Override
public boolean onInterceptTouchEvent(MotionEvent event)
{
switch (event.getActionMasked())
{
case MotionEvent.ACTION_DOWN:
if (mSlotFrom.handleHit(event))
{
startDrag(mSlotFrom, event);
return true;
}
if (mSlotTo.handleHit(event))
{
startDrag(mSlotTo, event);
return true;
}
break;
}
return false;
}
@Override
public boolean onTouchEvent(@NonNull MotionEvent event)
{
if (mSwapProgress)
return false;
if (!isDragging())
return super.onTouchEvent(event);
switch (event.getActionMasked())
{
case MotionEvent.ACTION_MOVE:
if (mDraggedSlot.overlaps(mNotDraggedSlot))
{
mDraggedSlot.swapAnimated(mNotDraggedSlot);
break;
}
mDraggedSlot.moveViewTo(event.getX(), event.getY());
break;
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
cancelDrag();
break;
}
return true;
}
public SlotFrame(Context context)
{
super(context);
}
public SlotFrame(Context context, AttributeSet attrs)
{
super(context, attrs);
}
public SlotFrame(Context context, AttributeSet attrs, int defStyleAttr)
{
super(context, attrs, defStyleAttr);
}
public void setSlotClickListener(@Nullable SlotClickListener slotClickListener)
{
mSlotClickListener = slotClickListener;
}
public void update()
{
mSlotFrom.setMapObject(RoutingController.get().getStartPoint());
mSlotTo.setMapObject(RoutingController.get().getEndPoint());
}
private void fadeSlot(Slot slot, boolean out)
{
slot.mFrame.setAlpha(out ? 1.0f : 0.1f);
slot.mFrame.animate()
.alpha(out ? 0.1f : 1.0f)
.setDuration(RoutingPlanController.ANIM_TOGGLE)
.start();
}
public void fadeSlots(boolean out)
{
fadeSlot(mSlotFrom, out);
fadeSlot(mSlotTo, out);
}
public void unfadeSlots()
{
mSlotFrom.mFrame.clearAnimation();
mSlotFrom.mFrame.setAlpha(1.0f);
mSlotTo.mFrame.clearAnimation();
mSlotTo.mFrame.setAlpha(1.0f);
}
}