[android] Added drawable resources for intermediate point in transit panel

android/res/values/colors.xml

@@ -126,6 +126,7 @@
   <color name="routing_button_activated_tint">@color/bg_statusbar</color>
   <color name="routing_button_activated_tint_night">@color/bg_statusbar_night</color>
   <color name="routing_button_pressed_tint">#80FFFFFF</color>
+  <color name="routing_intermediate_point">#43A047</color>
 
 
   <color name="bs_divider_color">@color/divider</color>

android/src/com/mapswithme/maps/routing/TransitStepType.java

@@ -6,7 +6,8 @@ import com.mapswithme.maps.R;
 
 public enum TransitStepType
 {
-  INTERMEDIATE_POINT(R.drawable.ic_20px_route_planning_walk),
+  // A specific icon for different intermediate points is calculated dynamically in TransitStepView.
+  INTERMEDIATE_POINT(R.drawable.ic_24px_route_point_a),
   PEDESTRIAN(R.drawable.ic_20px_route_planning_walk),
   SUBWAY(R.drawable.ic_20px_route_planning_metro),
   TRAIN(R.drawable.ic_20px_route_planning_metro),

android/src/com/mapswithme/maps/routing/TransitStepView.java

@@ -11,6 +11,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.annotation.Dimension;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
@@ -85,7 +86,9 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
   public void setTransitStepInfo(@NonNull TransitStepInfo info)
   {
     mStepType = info.getType();
-    mDrawable = getResources().getDrawable(mStepType.getDrawable());
+    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());
@@ -94,6 +97,21 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
     requestLayout();
   }
 
+  @DrawableRes
+  private static int getIntermediatePointDrawableId(int index)
+  {
+    switch (index)
+    {
+      case 0:
+        return R.drawable.ic_24px_route_point_a;
+      case 1:
+        return R.drawable.ic_24px_route_point_b;
+      case 2:
+        return R.drawable.ic_24px_route_point_c;
+    }
+    throw new AssertionError("Unknown intermediate point index: " + index);
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
   {
@@ -173,6 +191,11 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
       drawable.mutate();
       DrawableCompat.setTint(drawable, ThemeUtils.getColor(context, R.attr.iconTint));
     }
+    else if (type == TransitStepType.INTERMEDIATE_POINT)
+    {
+      drawable.mutate();
+      DrawableCompat.setTint(drawable, getResources().getColor(R.color.routing_intermediate_point));
+    }
     drawable.setBounds(mDrawableBounds);
     drawable.draw(canvas);
   }