Merge branch 'master' of github.com:neuf/DNSapp

src/com/studentersamfundet/app/DataHandler.java

@@ -22,7 +22,19 @@ public class DataHandler {
 		return null;
 	}
 	
-    public Event[] populateList() {
-    	return events.toArray(new Event[events.size()]);
+	public Event[] populateList(String category) {
+		LinkedList<Event> sorted = new LinkedList<Event>();
+
+		if (category == "all") {
+			return events.toArray(new Event[events.size()]);
+		} else {
+			for (int i = 0; i < events.size(); i++) {
+				Event tmp = events.get(i);
+
+				if (category.equals(tmp.category))
+					sorted.add(tmp);
+			}
+			return sorted.toArray(new Event[sorted.size()]);
+		}
     }
 }

src/com/studentersamfundet/app/ui/ProgramListActivity.java

@@ -84,7 +84,7 @@ public class ProgramListActivity extends BaseDnsActivity {
     }
     
     protected ListAdapter createAdapter() {
-    	Event[] events = dataHandler.populateList();
+    	Event[] events = dataHandler.populateList("all");
     	
     	ListAdapter adapter = new ArrayAdapter<Event>(this, R.layout.event_list_row, R.id.event_list_row_text, events) {
     		@Override