Browse Source

click on info window opens record overview

Fabio Arnold 10 years ago
parent
commit
7831c96b15

+ 4 - 2
src/de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.java

@@ -257,7 +257,7 @@ public class MainActivity extends Activity {
 		mDrawerToggle.onConfigurationChanged(newConfig);
 	}
 
-	private void displayView(int position) {
+	public void displayView(int position) {
 		if(mSelectedMenuItem != null && position == mSelectedMenuItem.value) {
 			mDrawerLayout.closeDrawer(mDrawerList);
 			return;
@@ -396,7 +396,9 @@ public class MainActivity extends Activity {
             if (value < 0 || value  >= MainMenuItem.values().length) return MainMenuItem.HOME;
             return  MainMenuItem.values()[value];
         }
-
+		public int getValue() {
+			return value;
+		}
     }
 
 	private class DrawerItemClickListener implements ListView.OnItemClickListener {

+ 5 - 4
src/de/tudarmstadt/informatik/hostage/ui2/fragment/ThreatMapFragment.java

@@ -26,13 +26,14 @@ import java.util.Map;
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.UglyDbHelper;
+import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
 
 import static com.google.android.gms.common.GooglePlayServicesUtil.*;
 
 /**
  * Created by Fabio Arnold on 10.02.14.
  */
-public class ThreatMapFragment extends Fragment implements GoogleMap.OnMarkerClickListener {
+public class ThreatMapFragment extends Fragment implements GoogleMap.OnInfoWindowClickListener {
 	private GoogleMap map = null;
 	private static View view = null;
 
@@ -51,9 +52,9 @@ public class ThreatMapFragment extends Fragment implements GoogleMap.OnMarkerCli
 	}
 
 	@Override
-	public boolean onMarkerClick(Marker marker) {
+	public void onInfoWindowClick(Marker marker) {
+		MainActivity.getInstance().displayView(MainActivity.MainMenuItem.RECORDS.getValue());
 		Log.i("MARKER", ""+marker.getId());
-		return false;
 	}
 
 	private class Point {
@@ -112,7 +113,7 @@ public class ThreatMapFragment extends Fragment implements GoogleMap.OnMarkerCli
 		}
 
 		map.setMyLocationEnabled(true);
-		map.setOnMarkerClickListener(this);
+		map.setOnInfoWindowClickListener(this);
 
 		LatLng tudarmstadt = new LatLng(49.86923, 8.6632768);
 		//LatLng mapCenter = new LatLng(41.889, -87.622);