--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/05/19 16:27:41	742
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/10 16:03:10	981
@@ -1,8 +1,13 @@
 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;
+
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -15,12 +20,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 {
 
@@ -29,7 +35,7 @@
 	
 	DepartureListAdapter adapter;
 	DepartureProvider provider;
-	List<DepartureBean> departures;
+	DepartureBean departures;
 	
 	int selectedItemId;
 	//DepartureBean currentDeparture;
@@ -40,7 +46,9 @@
 
 	StationBean station;
 	
-	@SuppressWarnings("unchecked")
+	boolean arrival = false;
+	
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -58,6 +66,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 +108,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();
@@ -83,8 +117,8 @@
 			if (savedInstanceState == null) {
 				startDepartureFetcher();
 			} else {
-				departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
-				adapter.setDepartures(departures);
+				departures = (DepartureBean) savedInstanceState.getSerializable("departures");
+				adapter.setDepartures(departures.entries);
 				selectedItemId = savedInstanceState.getInt("selectedItemId");	
 			}
 		}
@@ -98,16 +132,27 @@
 
     	outState.putInt("selectedItemId", selectedItemId);
     	
-    	outState.putSerializable("departures", (ArrayList<DepartureBean>) departures);
+    	outState.putSerializable("departures",  departures);
     }
+    
+    
 	
 	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		if (fetcher != null) {
+			fetcher.cancel(true);
+		}
+	}
+
+	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
 		
 		selectedItemId = position;
 		
-		DepartureBean dep = departures.get(selectedItemId);
+		DepartureEntry dep = departures.entries.get(selectedItemId);
 	
 		Intent intent = new Intent(this, TimetableList.class);
 		intent.putExtra("departure", dep);
@@ -124,6 +169,8 @@
 		switch (id) {
 		case DLG_PROGRESS:
 			pgDialog = (ProgressDialog) dialog;
+			int messageId = arrival == false ? departurelist_fetchdepartures : departurelist_fetcharrivals;
+			pgDialog.setMessage( getString(messageId) );
 			break;
 		}
 	}
@@ -132,8 +179,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:
@@ -183,9 +230,12 @@
 			pgDialog.dismiss();
 			
 			if (success) {
-				adapter.setDepartures(departures);
-				if (departures.size() == 0) {
-					MessageBox.showMessage(DepartureList.this, "No departures found");
+				DepartureList.this.getListView().setVisibility(View.GONE); //Experimental, inspired by http://osdir.com/ml/Android-Developers/2010-04/msg01198.html
+				adapter.setDepartures(departures.entries);
+				DepartureList.this.getListView().setVisibility(View.VISIBLE);
+				
+				if (departures.entries.size() == 0) {
+					MessageBox.showMessage(DepartureList.this, "No departures found", true);
 				}
 			} else { // communication or parse error
 				AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this);						
@@ -201,6 +251,7 @@
 				builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
+						DepartureList.this.finish();
 					}							
 				});
 				
@@ -214,8 +265,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;
 		}