Commit e0675826 authored by Varun Patil's avatar Varun Patil

Make user marker red

parent 9e2278a3
......@@ -144,7 +144,7 @@ public class MapFragment extends Fragment implements TextWatcher,
private boolean GPSIsSetup = false;
private boolean followingUser = false;
private Marker user = new Marker("You", "", 0, 0, 1, "");
private Marker user = new Marker("You", "", 0, 0, -10, "");
private Handler mHandler = new Handler() {
@Override
......
......@@ -81,6 +81,10 @@ public class Marker {
}
public static int getColor(int group) {
if (group == -10) {
return -10;
}
Integer[] yellowGroup = new Integer[] { HOSTELS };
Integer[] blueGroup = new Integer[] { DEPARTMENTS, LABS,
HALLS_N_AUDITORIUMS };
......
......@@ -58,6 +58,7 @@ public class CampusMapView extends SubsamplingScaleImageView {
private Bitmap yellowLockedMarker;
private Bitmap greenLockedMarker;
private Bitmap grayLockedMarker;
private Bitmap userMarker;
private float pointerWidth = 12;
private float highlightedMarkerScale;
private Paint paint;
......@@ -190,6 +191,11 @@ public class CampusMapView extends SubsamplingScaleImageView {
(int) w, (int) h, true);
grayLockedMarker = Bitmap.createScaledBitmap(grayLockedMarker, (int) w,
(int) h, true);
userMarker = BitmapFactory.decodeResource(getResources(),
drawable.marker_red_s, options);
userMarker = Bitmap.createScaledBitmap(userMarker, (int) w,
(int) h, true);
}
private void initPaints() {
......@@ -541,7 +547,10 @@ public class CampusMapView extends SubsamplingScaleImageView {
markerBitmap = grayMarker;
if (isAddedMarker(marker))
markerBitmap = grayLockedMarker;
}
} else if (color == -10) {
if (isAddedMarker(marker))
markerBitmap = userMarker;
}
if (highlightedMarkerScale != 1.0f && isResultMarker(marker)) {
float w = markerBitmap.getWidth() * highlightedMarkerScale;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment