diff --git a/res/drawable-hdpi/dnstest.png b/res/drawable-hdpi/dnstest.png index f39af15..d64af5a 100644 Binary files a/res/drawable-hdpi/dnstest.png and b/res/drawable-hdpi/dnstest.png differ diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png index 8074c4c..cd994b4 100644 Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ diff --git a/res/drawable-ldpi/dnstest.png b/res/drawable-ldpi/dnstest.png index f39af15..d64af5a 100644 Binary files a/res/drawable-ldpi/dnstest.png and b/res/drawable-ldpi/dnstest.png differ diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png index 1095584..cd994b4 100644 Binary files a/res/drawable-ldpi/icon.png and b/res/drawable-ldpi/icon.png differ diff --git a/res/drawable-mdpi/dnstest.png b/res/drawable-mdpi/dnstest.png index f39af15..d64af5a 100644 Binary files a/res/drawable-mdpi/dnstest.png and b/res/drawable-mdpi/dnstest.png differ diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png index a07c69f..cd994b4 100644 Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ diff --git a/res/layout/main.xml b/res/layout/main.xml index 80e69ed..095ae3c 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -17,11 +17,10 @@ \ No newline at end of file diff --git a/src/com/studentersamfundet/app/DataHandler.java b/src/com/studentersamfundet/app/DataHandler.java index 5fa548d..5c6a664 100644 --- a/src/com/studentersamfundet/app/DataHandler.java +++ b/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 sorted = new LinkedList(); + + 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()]); + } } } diff --git a/src/com/studentersamfundet/app/ui/ProgramListActivity.java b/src/com/studentersamfundet/app/ui/ProgramListActivity.java index 5c5d833..95734c3 100644 --- a/src/com/studentersamfundet/app/ui/ProgramListActivity.java +++ b/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(this, R.layout.event_list_row, R.id.event_list_row_text, events) { @Override