--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/06/11 11:21:36	834
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/06/11 14:05:24	835
@@ -1,5 +1,11 @@
 package dk.thoerup.traininfo;
 
+import static dk.thoerup.traininfo.R.string.departurelist_fetchdepartures;
+import static dk.thoerup.traininfo.R.string.departurelist_fetcharrivals;
+import static dk.thoerup.traininfo.R.string.generic_cancel;
+import static dk.thoerup.traininfo.R.string.generic_retry;
+
+
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,12 +21,13 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 import dk.thoerup.traininfo.provider.DepartureProvider;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.util.MessageBox;
-import static dk.thoerup.traininfo.R.string.*;
 
 public class DepartureList extends ListActivity {
 
@@ -40,6 +47,8 @@
 
 	StationBean station;
 	
+	boolean arrival = false;
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +67,30 @@
 
 		((TextView) findViewById(R.id.stationAddr)).setText( station.getAddress() );
 		
+		final Button departureBtn = (Button) findViewById(R.id.departurebtn);
+		final Button arrivalBtn = (Button) findViewById(R.id.arrivalbtn);
+		
+		departureBtn.setOnClickListener( new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {	
+				arrivalBtn.setBackgroundResource(R.drawable.custom_button);
+				departureBtn.setBackgroundResource(R.drawable.custom_button_hilight);
+				arrival = false;
+				startDepartureFetcher();
+			}
+		});
+		arrivalBtn.setOnClickListener( new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {	
+				arrivalBtn.setBackgroundResource(R.drawable.custom_button_hilight);
+				departureBtn.setBackgroundResource(R.drawable.custom_button);
+				arrival = true;			
+				startDepartureFetcher();
+			}
+		});
+		
+		
+		
 		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
@@ -76,6 +109,8 @@
 		if (station.isRegional() == false && station.isSTrain() == false) {
 			getListView().setVisibility( View.GONE );		
 			findViewById(R.id.metroonly).setVisibility( View.VISIBLE );
+			departureBtn.setVisibility( View.GONE );
+			arrivalBtn.setVisibility(View.GONE);
 			
 		} else {
 			provider = ProviderFactory.getDepartureProvider();
@@ -124,6 +159,8 @@
 		switch (id) {
 		case DLG_PROGRESS:
 			pgDialog = (ProgressDialog) dialog;
+			int messageId = arrival == false ? departurelist_fetchdepartures : departurelist_fetcharrivals;
+			pgDialog.setMessage( getString(messageId) );
 			break;
 		}
 	}
@@ -132,8 +169,8 @@
 	protected Dialog onCreateDialog(int id) {
 		switch (id) {
 		case DLG_PROGRESS:
+
 			ProgressDialog dlg = new ProgressDialog(this);
-			dlg.setMessage( getString(departurelist_fetchdata) );
 			dlg.setCancelable(true);
 			return dlg;			
 		default:
@@ -214,8 +251,8 @@
 
 		@Override
 		protected Void doInBackground(Integer... params) {
-			success = provider.lookupDepartures(params[0]);
-			departures = provider.getDepartures(params[0]);
+			success = provider.lookupDepartures(params[0], DepartureList.this.arrival);
+			departures = provider.getDepartures(params[0], DepartureList.this.arrival);
 			return null;
 		}