From 9e2995bdf0add45c2427c19668b9c2bead6746eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Jans=F8n=20Engvik?= <engvik@gmail.com>
Date: Wed, 14 Sep 2011 19:21:16 +0200
Subject: [PATCH] List of events displays date and title.

---
 .../studentersamfundet/app/DataHandler.java   | 26 +++++++++++++++
 src/com/studentersamfundet/app/Event.java     | 18 +++++++----
 .../app/ui/ProgramList.java                   | 32 +++++++++----------
 3 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/com/studentersamfundet/app/DataHandler.java b/src/com/studentersamfundet/app/DataHandler.java
index a17419a..7d7d286 100644
--- a/src/com/studentersamfundet/app/DataHandler.java
+++ b/src/com/studentersamfundet/app/DataHandler.java
@@ -21,4 +21,30 @@ public class DataHandler {
 		}
 		return null;
 	}
+	
+    public Event[] populateList() {
+    	return events.toArray(new Event[events.size()]);
+    }
+    
+    public String toMonth(String m) {
+    	int monthInt = Integer.parseInt(m);
+    	String monthString;
+    	
+    	switch (monthInt) {
+    		case 1:  monthString = "Jan";      break;
+    		case 2:  monthString = "Feb";      break;
+    		case 3:  monthString = "Mar";      break;
+    		case 4:  monthString = "Apr";      break;
+    		case 5:  monthString = "Mai";      break;
+    		case 6:  monthString = "Jun";      break;
+    		case 7:  monthString = "Jul";      break;
+    		case 8:  monthString = "Aug";      break;
+    		case 9:  monthString = "Sep";      break;
+    		case 10: monthString = "Okt";      break;
+    		case 11: monthString = "Nov";      break;
+    		case 12: monthString = "Des";      break;
+    		default: monthString = "NA"; 	   break;
+    	}
+    	return monthString;
+    }
 }
diff --git a/src/com/studentersamfundet/app/Event.java b/src/com/studentersamfundet/app/Event.java
index 6ec7aa9..8a1a1d0 100644
--- a/src/com/studentersamfundet/app/Event.java
+++ b/src/com/studentersamfundet/app/Event.java
@@ -1,14 +1,14 @@
 package com.studentersamfundet.app;
 
 public class Event {
-	int id;
-	String title;
-	String description;
-	String date;
-	String location;
-	String category;
+	public int id;
+	public String title;
+	public String description;
+	public String date;
+	public String location;
+	public String category;
 	
-	Event(int id, String title, String description, String date, String location, String category) {
+	public Event(int id, String title, String description, String date, String location, String category) {
 		this.id = id;
 		this.title = title;
 		this.description = description;
@@ -16,4 +16,8 @@ public class Event {
 		this.location = location;
 		this.category = category;
 	}
+	
+	public String toString() {
+		return this.title;
+	}
 }
diff --git a/src/com/studentersamfundet/app/ui/ProgramList.java b/src/com/studentersamfundet/app/ui/ProgramList.java
index ba1190c..824d2e0 100644
--- a/src/com/studentersamfundet/app/ui/ProgramList.java
+++ b/src/com/studentersamfundet/app/ui/ProgramList.java
@@ -9,6 +9,7 @@ import android.widget.ListAdapter;
 import android.widget.Toast;
 
 import com.studentersamfundet.app.DataHandler;
+import com.studentersamfundet.app.Event;
 import com.studentersamfundet.app.FeedFetcher;
 import com.studentersamfundet.app.R;
 import com.studentersamfundet.app.XmlParser;
@@ -47,24 +48,21 @@ public class ProgramList extends ListActivity {
     }
     
     protected ListAdapter createAdapter() {
-    	String[] vals = populateList();
-    	ListAdapter adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, vals);
+    	Event[] events = dh.populateList();
+    	String[] titles = new String[events.length];
+    	
+    	for (int i = 0; i < events.length; i++) {
+    		Event e = events[i];
+    		String date = e.date;
+    		String month = date.substring(5, 7);
+    		String day = date.substring(8, 10);
+    		titles[i] = day + ". " + dh.toMonth(month) + ": " + e.title;
+    	}
+    	
+    	// TODO: Lag en fin liste med litt mer informasjon og slik.
+    	ListAdapter adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, titles);
     	 
     	return adapter;
-    }
-    
-    public String[] populateList() {
-    	String[] val = new String[10];
-    	val[0] = "test!";
-    	val[1] = "test2";
-    	val[2] = "test3";
-    	val[3] = "test3";
-    	val[4] = "test3";
-    	val[5] = "test3";
-    	val[6] = "test3";
-    	val[7] = "test3";
-    	val[8] = "test3";
-    	val[9] = "test3";
-    	return val;
+    	
     }
 }