Updated Map to drop pin for each event. Renamed even details class/xml. Renamed lat/long getters and setters.

app/src/main/AndroidManifest.xml

@@ -58,7 +58,7 @@
 
         <!-- Event Details Activity -->
         <activity
-            android:name=".EventDetailsScreen1"
+            android:name=".EventDetailsScreen"
             android:parentActivityName=".MainActivity"
             android:theme="@style/AppTheme.NoActionBar"></activity>
 

app/src/main/java/com/example/yiupang/freefoodfinder/Event.java

@@ -67,7 +67,7 @@ class Event
         return lat;
     }
 
-    public boolean setLatitude(double latitude){
+    public boolean setLat(double latitude){
         if(latitude >= -90.0 && latitude <= 90.0){
             this.lat = latitude;
             return true;
@@ -81,7 +81,7 @@ class Event
         return lng;
     }
 
-    public boolean setLongitude(double longitude){
+    public boolean setLng(double longitude){
         if(longitude >= -180.0 && longitude <= 180.0){
             this.lng = longitude;
             return true;

app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen1.java → app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java

@@ -1,27 +1,19 @@
 package com.example.yiupang.freefoodfinder;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
 import android.widget.TextView;
 
-import java.io.Serializable;
-
 import android.support.v7.app.AppCompatActivity;
 
 
-public class EventDetailsScreen1 extends AppCompatActivity
+public class EventDetailsScreen extends AppCompatActivity
 {
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_event_details_screen1);
+        setContentView(R.layout.activity_event_details_screen);
 
        // Event selectedEvent = (Event)getIntent().getSerializableExtra("selectedEvent");
 

app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -87,7 +86,7 @@ public class EventsScreen extends Fragment
 
     public void switchActivity(Event selectedEvent)
     {
-        Intent details = new Intent(getContext(), EventDetailsScreen1.class);
+        Intent details = new Intent(getContext(), EventDetailsScreen.class);
 
         details.putExtra("selectedEventName", selectedEvent.getName());
         details.putExtra("selectedEventTime", selectedEvent.getTime());

app/src/main/java/com/example/yiupang/freefoodfinder/MapScreen.java

@@ -35,6 +35,7 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
     ArrayList<Double> lngs = new ArrayList<Double>();
     ArrayList<String> titles = new ArrayList<String>();
     ArrayList<String> descrips = new ArrayList<String>();
+    GoogleMap map;
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@@ -66,6 +67,8 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
                                 typeFactory.constructCollectionType(List.class, Event.class)
                         ).readValue((JsonNode) response);
 
+                        Log.d("EVENTS NUM", "Events #: " + events.size());
+
                         for(int i = 0; i < events.size(); i++)
                         {
                             Event currEvent = events.get(i);
@@ -80,6 +83,10 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
                             titles.add(title);
                             descrips.add(desc);
 
+                            LatLng currPos = new LatLng(lats.get(i), lngs.get(i));
+
+                            map.addMarker(new MarkerOptions().position(currPos).title(titles.get(i)).snippet(descrips.get(i)));
+
                         }
 
                     } catch (IOException e) {
@@ -98,6 +105,7 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
     @Override
     public void onMapReady(GoogleMap map)
     {
+        this.map = map;
 
         /*
 
@@ -112,12 +120,17 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
 
         */
 
+        LatLng slo = new LatLng(35.2827778, -120.6586111);
+        //map.addMarker(new MarkerOptions().position(slo).title("Downtown").icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED)).snippet("Downtown of slo"));
+
+        map.moveCamera(CameraUpdateFactory.newLatLngZoom(slo, 12.0f));
+
+        Log.d("LATS NUM", "Events #: " + lats.size());
+/*
         for(int i = 0; i < lats.size(); i++)
         {
-            LatLng currPos = new LatLng(lats.get(i), lngs.get(i));
 
-            map.addMarker(new MarkerOptions().position(currPos).title(titles.get(i)).snippet(descrips.get(i)));
 
-        }
+        }*/
     }
 }

app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java

@@ -1,7 +1,6 @@
 package com.example.yiupang.freefoodfinder;
 
 //CODE SMELL: unused import
-import android.app.Fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -52,7 +51,7 @@ public class MyEventScreen extends android.support.v4.app.Fragment
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 Intent details = new Intent(getContext(), CreateEventScreen1.class);
-                /* Intent details = new Intent(getContext(), EventDetailsScreen1.class);
+                /* Intent details = new Intent(getContext(), EventDetailsScreen.class);
 
                 details.putExtra("selectedEventName", "name");
                 details.putExtra("selectedEventTime", "time");
@@ -83,7 +82,7 @@ public class MyEventScreen extends android.support.v4.app.Fragment
 
     public void switchActivity(Event selectedEvent)
     {
-        Intent details = new Intent(getContext(), EventDetailsScreen1.class);
+        Intent details = new Intent(getContext(), EventDetailsScreen.class);
 
         details.putExtra("selectedEventName", selectedEvent.getName());
         details.putExtra("selectedEventTime", selectedEvent.getTime());