Yiupang преди 9 години
родител
ревизия
179098ff55

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

@@ -22,9 +22,9 @@ class Event
 
     Event(String name, String foodType, String description)
     {
-        this.name = name;
-        this.foodType = foodType;
-        this.description = description;
+        setName(name);
+        setFoodType(foodType);
+        setDescription(description);
     }
 
     public String getName() {

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

@@ -4,6 +4,8 @@ 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;
 import android.view.ViewGroup;
@@ -54,12 +56,15 @@ public class EventsScreen extends Fragment
                         events = mapper.reader(
                                 typeFactory.constructCollectionType(List.class, Event.class)
                         ).readValue((JsonNode) response);
+                        ListView listView = (ListView) view.findViewById(R.id.events_screen);
+
+                        listView.setAdapter(new EventArrayAdapter(view.getContext(), R.layout.events_list_item, events));
+                        setItemListener(listView);
                     } catch (IOException e) {
                         /*handle error*/
+                        Log.d("size:  ", e +"");
                     }
-                    ListView listView = (ListView) view.findViewById(R.id.events_screen);
-                    listView.setAdapter(new EventArrayAdapter(view.getContext(), R.layout.events_list_item, events));
-                    setItemListener(listView);
+
                 }
             }
         }.execute(httpCall);
@@ -75,9 +80,7 @@ public class EventsScreen extends Fragment
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id)
             {
                 Event selectedEvent = (Event) adapterView.getAdapter().getItem(position);
-
                 switchActivity(selectedEvent);
-
             }
         });
     }

+ 0 - 3
app/src/test/java/com/example/yiupang/freefoodfinder/TestMainActivity.java

@@ -1,11 +1,8 @@
 package com.example.yiupang.freefoodfinder;
 
 import org.junit.Test;
-
 import java.lang.reflect.Method;
-
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 /**