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

[android] Fixed intermediate point drawable look in transit panel

Browse source
This commit is contained in:
Александр Зацепин 2017-11-20 13:20:52 +03:00 • committed by Roman Kuznetsov
parent d856f3ea6d
commit 8a60882e96
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
if (mDrawable != null)
{
calculateDrawableBounds(height, mDrawable);
width += mDrawable.getIntrinsicWidth();
width += mDrawableBounds.width();
}
if (!TextUtils.isEmpty(mText))
@ -173,8 +173,12 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
vPad = (clearHeight - drawable.getIntrinsicHeight()) / 2;
int acceptableDrawableHeight = clearHeight >= drawable.getIntrinsicHeight() ? drawable.getIntrinsicHeight()
: clearHeight;
// A transit icon must be squared-shaped. So, if the drawable width is greater than height the
// drawable will be squeezed horizontally to make it squared-shape.
int acceptableDrawableWidth = drawable.getIntrinsicWidth() > acceptableDrawableHeight
? acceptableDrawableHeight : drawable.getIntrinsicWidth();
mDrawableBounds.set(getPaddingLeft(), getPaddingTop() + vPad,
drawable.getIntrinsicWidth() + getPaddingLeft(),
acceptableDrawableWidth + getPaddingLeft(),
getPaddingTop() + vPad + acceptableDrawableHeight);
}