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

[android] Added squeezing the large drawable when they are greater the transit step view height

Browse source
This commit is contained in:
Александр Зацепин 2017-11-18 14:52:01 +03:00 • committed by Daria Volvenkova
parent efb58fa6e6
commit f980b65304
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
android/src/com/mapswithme/maps/routing/TransitStepView.java
View file

@ -89,14 +89,26 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
mDrawable = getResources().getDrawable(mStepType == TransitStepType.INTERMEDIATE_POINT
? getIntermediatePointDrawableId(info.getIntermediateIndex())
: mStepType.getDrawable());
mBackgroundPaint.setColor(mStepType == TransitStepType.PEDESTRIAN
? ThemeUtils.getColor(getContext(), R.attr.transitPedestrianBackground)
: info.getColor());
mBackgroundPaint.setColor(getBackgroundColor(getContext(), info));
mText = info.getNumber();
invalidate();
requestLayout();
}
@ColorInt
private static int getBackgroundColor(@NonNull Context context, @NonNull TransitStepInfo info)
{
switch (info.getType())
{
case PEDESTRIAN:
return ThemeUtils.getColor(context, R.attr.transitPedestrianBackground);
case INTERMEDIATE_POINT:
return Color.TRANSPARENT;
default:
return info.getColor();
}
}
@DrawableRes
private static int getIntermediatePointDrawableId(int index)
{
@ -153,13 +165,17 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
{
// If the clear view height, i.e. without top/bottom padding, is greater than the drawable height
// the drawable should be centered vertically by adding additional vertical top/bottom padding.
// If the drawable height is greater than the clear view height the drawable will be fitted
// (squeezed) into the parent container.
int clearHeight = height - getPaddingTop() - getPaddingBottom();
int vPad = 0;
if (clearHeight > drawable.getIntrinsicHeight())
if (clearHeight >= drawable.getIntrinsicHeight())
vPad = (clearHeight - drawable.getIntrinsicHeight()) / 2;
int acceptableDrawableHeight = clearHeight >= drawable.getIntrinsicHeight() ? drawable.getIntrinsicHeight()
: clearHeight;
mDrawableBounds.set(getPaddingLeft(), getPaddingTop() + vPad,
drawable.getIntrinsicWidth() + getPaddingLeft(),
getPaddingTop() + vPad + drawable.getIntrinsicHeight());
getPaddingTop() + vPad + acceptableDrawableHeight);
}
@Override