Yiupang 9 tahun lalu
induk
melakukan
ea536444c5

+ 1 - 0
app/src/main/java/com/example/yiupang/freefoodfinder/CreateEventScreen.java

@@ -79,6 +79,7 @@ public class CreateEventScreen extends AppCompatActivity {
         e.setFoodType(food);
         e.setDescription(desc);
     }
+
     public float[] place2Coordinates(String place){
         float[] coords;
 

+ 15 - 2
app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java

@@ -1,9 +1,14 @@
 package com.example.yiupang.freefoodfinder;
 
 import android.os.Bundle;
+import android.view.View;
 import android.widget.TextView;
 import android.support.v7.app.AppCompatActivity;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
 public class EventDetailsScreen extends AppCompatActivity
 {
 
@@ -13,21 +18,29 @@ public class EventDetailsScreen extends AppCompatActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_event_details_screen);
 
+        SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
+
         String selectedEventName = (String)getIntent().getExtras().getSerializable("selectedEventName");
         String selectedEventTime = (String)getIntent().getExtras().getSerializable("selectedEventTime");
         String selectedEventPlace = (String)getIntent().getExtras().getSerializable("selectedEventPlace");
         String selectedEventDesc = (String)getIntent().getExtras().getSerializable("selectedEventDesc");
         String selectedEventFoodType = (String)getIntent().getExtras().getSerializable("selectedEventFoodType");
 
+        TextView timeLabel = (TextView) findViewById(R.id.timelabel);
+        timeLabel.setVisibility(View.GONE);
+        TextView dateText = (TextView) findViewById(R.id.datetext);
+        dateText.setVisibility(View.GONE);
 
         TextView nameText = (TextView) findViewById(R.id.nameText);
         nameText.setText(selectedEventName);
 
         TextView timeText = (TextView) findViewById(R.id.timeText);
-        timeText.setText(selectedEventTime);
+        timeText.setText(selectedEventTime == null ? "TBA" :
+                dayFormat.format(new Date(Long.parseLong(selectedEventTime))));
 
         TextView placeText = (TextView) findViewById(R.id.placeText);
-        placeText.setText(selectedEventPlace);
+        placeText.setText(selectedEventPlace == null || selectedEventPlace.equals("") ?
+                "TBA" : selectedEventPlace);
 
         TextView foodText = (TextView) findViewById(R.id.foodText);
         foodText.setText(selectedEventFoodType);

+ 2 - 2
app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java

@@ -52,8 +52,8 @@ public class EventsScreen extends Fragment
             super.onResponse(response, code);
             if (code != HttpURLConnection.HTTP_OK)
                 Log.d("ON RESPONSE ERROR", "HTTP ERR: NOT OK");
-            else {
-
+            else
+            {
                 List<Event> events = Utility.parseFromJSONToEventObjs((JsonNode) response);
                 ListView listView = (ListView) view.findViewById(R.id.events_screen);
                 listView.setAdapter(new EventArrayAdapter(view.getContext(), R.layout.events_list_item, events));

+ 3 - 3
app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java

@@ -22,10 +22,10 @@ public class MyEventScreen extends android.support.v4.app.Fragment
     {
         final View view = inflater.inflate(R.layout.myevent_screen, container, false);
         Event google = new Event("Google Networking Session", "A Pizza", "We're hiring");
-        google.setPlace("14");
+        google.setPlace("Kennedy Library");
         google.setDate("2017-06-21");
         Event amazon = new Event("Amazon Networking Session", "Two Pizzas", "We're hiring!");
-        amazon.setPlace("Computer Science Building");
+        amazon.setPlace("20");
         amazon.setDate("2017-06-22");
         Event microsoft = new Event("Microsoft Networking Session", "Three Pizzas", "We're hiring!!!");
         microsoft.setPlace("University Union");
@@ -34,7 +34,7 @@ public class MyEventScreen extends android.support.v4.app.Fragment
         airbnb.setPlace("Kennedy Library");
         airbnb.setDate("2017-06-24");
         Event facebook = new Event("Facebook Networking Session", "Five Pizzas", "We are hiring!");
-        facebook.setPlace("Engineering West");
+        facebook.setPlace("20");
         facebook.setDate("2017-06-25");
 
         ArrayList<Event> myEventsArray = new ArrayList<>();