Merge pull request #6 from femisd/master

icons fixed...again

Author: mstainer14

.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -129,7 +129,7 @@ public void onLocationResult(LocationResult locationResult) {
                 MarkerOptions markerOptions = new MarkerOptions();
                 markerOptions.position(latLng);
                 markerOptions.title("Current Position");
-                markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_MAGENTA));
+                markerOptions.icon(BitmapDescriptorFactory.fromResource(R.drawable.running_pointer));
                 mCurrLocationMarker = mMap.addMarker(markerOptions);
 
                 //move map camera
@@ -392,26 +392,26 @@ private void setUpMap() {
                 .position(new LatLng(51.243271, -0.591590))
                 .title("Pats field")
                 .snippet("112m")
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.running_icon)));
+                .icon(BitmapDescriptorFactory.fromResource(R.drawable.money_pointer)));
 
 
         myMarker1 = mMap.addMarker(new MarkerOptions()
                 .position(new LatLng(51.242373, -0.581312))
                 .title("Friary Centre")
                 .snippet("743m")
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.running_icon)));
+                .icon(BitmapDescriptorFactory.fromResource(R.drawable.money_pointer)));
 
         myMarker2 = mMap.addMarker(new MarkerOptions()
                 .position(new LatLng(51.242007, -0.586198))
                 .title("Student Union")
                 .snippet("123m")
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.running_icon)));
+                .icon(BitmapDescriptorFactory.fromResource(R.drawable.money_pointer)));
 
         myMarker3 = mMap.addMarker(new MarkerOptions()
                 .position(new LatLng(51.243012, -0.595327))
                 .title("School Of Arts")
                 .snippet("846m")
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.running_icon)));
+                .icon(BitmapDescriptorFactory.fromResource(R.drawable.money_pointer)));
 
 
     }