--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/29 20:42:34	361
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/29 21:30:16	362
@@ -27,7 +27,7 @@
 public class DepartureList extends ListActivity {
 
 	public static final int DLG_PROGRESS = 1;
-	public static final int DLG_DETAILS = 2;
+	
 	
 	DepartureListAdapter adapter;
 	DepartureProvider provider;
@@ -37,7 +37,7 @@
 	//DepartureBean currentDeparture;
 	
 	ProgressDialog pgDialog;
-	Dialog detailsDialog;
+	
 	DepartureFetcher fetcher;
 	int stationId;
 	
@@ -82,9 +82,6 @@
 			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
 			adapter.setDepartures(departures);
 			selectedItemId = savedInstanceState.getInt("selectedItemId");	
-			boolean detailsShowing = savedInstanceState.getBoolean("detailsShowing");
-			if (detailsShowing)
-				showDialog(DLG_DETAILS);
 		}
 	}
 	
@@ -93,11 +90,7 @@
     {
     	if (pgDialog != null && pgDialog.isShowing())
     		dismissDialog(DLG_PROGRESS);
-    	boolean detailsShowing = (detailsDialog != null && detailsDialog.isShowing()); 
-    	if (detailsShowing) {
-    		dismissDialog(DLG_DETAILS);
-    	}
-    	outState.putBoolean("detailsShowing", detailsShowing);
+
     	outState.putInt("selectedItemId", selectedItemId);
     	
     	outState.putSerializable("departures", (ArrayList<DepartureBean>) departures);
@@ -106,9 +99,14 @@
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
+		
+		selectedItemId = position;
 	
-		selectedItemId = position;		
-		showDialog(DLG_DETAILS);		
+		Intent intent = new Intent(this, TimetableList.class);
+		intent.putExtra("asd", 0); //Add all necessary data
+		
+		startActivity(intent);
+				
 	}
 	
 
@@ -117,18 +115,6 @@
 		super.onPrepareDialog(id, dialog);
 		
 		switch (id) {
-		case DLG_DETAILS:
-			DepartureBean currentDeparture = departures.get(selectedItemId);
-			((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime());
-			((TextView)dialog.findViewById(R.id.Train)).setText(currentDeparture.getTrainNumber());
-			((TextView)dialog.findViewById(R.id.Destination)).setText( currentDeparture.getDestination());
-			((TextView)dialog.findViewById(R.id.Origin)).setText(currentDeparture.getOrigin());
-			((TextView)dialog.findViewById(R.id.Location)).setText(currentDeparture.getLocation());
-			((TextView)dialog.findViewById(R.id.Updated)).setText(currentDeparture.getLastUpdateString());
-			((TextView)dialog.findViewById(R.id.Status)).setText(currentDeparture.getStatus());
-			((TextView)dialog.findViewById(R.id.Note)).setText(currentDeparture.getNote());
-			detailsDialog = dialog;
-			break;
 		case DLG_PROGRESS:
 			pgDialog = (ProgressDialog) dialog;
 			break;
@@ -142,18 +128,7 @@
 			ProgressDialog dlg = new ProgressDialog(this);
 			dlg.setMessage("Fetch departure data");
 			dlg.setCancelable(true);
-			return dlg;
-		case DLG_DETAILS:
-			//Context mContext = getApplicationContext();
-			Dialog dialog = new Dialog(this);
-			dialog.setCancelable(true);
-
-			dialog.setContentView(R.layout.departuredetails);
-			dialog.setTitle("Departure details");
-
-			View root = dialog.findViewById(R.id.layout_root);
-			root.setOnClickListener( new DialogDismisser(dialog) );
-			return dialog;			
+			return dlg;			
 		default:
 			return super.onCreateDialog(id);		
 		}