Merge commit

app/src/main/AndroidManifest.xml

@@ -5,6 +5,8 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:allowBackup="true"

app/src/main/java/app/insti/Constants.java

@@ -24,4 +24,9 @@ public class Constants {
     public static final String BODY_LIST_JSON = "body_list_json";
 
     public static final String LOGIN_MESSAGE = "Please login to continue!";
+
+    /* Map */
+    public static final double MAP_Xn = 19.134417, MAP_Yn = 72.901229, MAP_Zn = 1757, MAP_Zyn = 501;
+    public static final double[] MAP_WEIGHTS_X = {-11.392001766454612, -36.31634553309953, 73.91269388324432, -24.14021153064087, 3.4508817531539115, -0.1462262375477863, 5.532505074667804, -1.542391995870977, 36.14211738142935};
+    public static final double[] MAP_WEIGHTS_Y = {0.09738953520399705, -4.519868444089616, 62.38493718381985, 16.664561869057696, -2.168377988768651, 0.0919143297622087, 0.32304266159540823, 0.21688067854428716, -12.81393255320748};
 }

app/src/main/java/app/insti/MainActivity.java

@@ -318,8 +318,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 return;
             case MY_PERMISSIONS_REQUEST_ACCESS_LOCATION:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    MapFragment mapFragment = new MapFragment();
-                    updateFragment(mapFragment);
+                    MapFragment.getMainActivity().setupGPS();
                 } else {
                     Toast toast = Toast.makeText(MainActivity.this, "Need Permission", Toast.LENGTH_SHORT);
                     toast.show();

app/src/main/java/com/mrane/data/Marker.java

@@ -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 };

app/src/main/java/com/mrane/zoomview/CampusMapView.java

@@ -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;
@@ -736,26 +745,10 @@ public class CampusMapView extends SubsamplingScaleImageView {
 		return scale;
 	}
 
-//	public void setAddedMarkers(String addedMarkerString) {
-//		addedMarkerList = new ArrayList<Marker>();
-//		String[] addedMarkerNames = addedMarkerString.split("###");
-//		for (String s : addedMarkerNames) {
-//			if (!s.equals("")) {
-//				Log.d("test123","names = " + s);
-//				if (data.containsKey(s)) {
-//					addedMarkerList.add(data.get(s));
-//				}
-//			}
-//		}
-//	}
-//
-//	public String getAddedMarkerString() {
-//		String s = "";
-//		for (Marker m : addedMarkerList) {
-//			s = s + m.name + "###";
-//		}
-//		Log.d("test123","addedMarkerStringGen = " + s);
-//		return s;
-//	}
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		MapFragment.getMainActivity().setFollowingUser(false);
+		return super.onTouchEvent(event);
+	}
 
 }

app/src/main/res/layout/fragment_map.xml

@@ -140,10 +140,10 @@
     </LinearLayout>
 
     <RelativeLayout
-        android:id="@+id/loadingPanel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center">
+        android:gravity="center"
+        android:id="@+id/loadingPanel">
 
         <ProgressBar
             android:layout_width="wrap_content"
@@ -151,4 +151,20 @@
             android:indeterminate="true" />
     </RelativeLayout>
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/locate_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="96dp"
+            android:layout_marginRight="8dp"
+            android:src="@drawable/ic_my_location_black_24dp"
+            android:tint="@android:color/black" />
+    </RelativeLayout>
+
 </FrameLayout>
\ No newline at end of file