X-Git-Url: http://git.ieval.ro/?p=unical.git;a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEventListActivity.java;h=67e0a7f06b8d8e5c85cf2e8badcc3f5774f9398e;hp=1b550249938ce32a0a250244a5ab886fe9c1413a;hb=6d7e08bf032626962f50c8d9db6c1c5b3d978271;hpb=8bdd670e70d1edc6f08279c288eb8b16c9aacd80

diff --git a/src/ro/ieval/unical/EventListActivity.java b/src/ro/ieval/unical/EventListActivity.java
index 1b55024..67e0a7f 100644
--- a/src/ro/ieval/unical/EventListActivity.java
+++ b/src/ro/ieval/unical/EventListActivity.java
@@ -1,53 +1,44 @@
 package ro.ieval.unical;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 
 
 public class EventListActivity extends Activity {
 	
-	long dtstart,dtend;
 	//Used to refresh events if the user wants to display only certain events
 	//Sry for bad english
 	//Muie la comisie
 	private void displayEvents() {
 		final Event events[]=Event.getAllEvents(getBaseContext());
-	    final ListView lv = (ListView) findViewById(R.id.eventlist);
-		Arrays.sort(events,new EventComparator());
+		final ListView lv = (ListView) findViewById(R.id.eventlist);
 		
-		EventRowContainer r[]=new EventRowContainer[events.length];
-		for(int i=0; i<events.length; ++i) {
-			EventRowContainer c=new EventRowContainer(i,events[i].title, events[i].dtstart, events[i].dtend);
-			r[i]=c;
-			//System.out.println(events[i].eventColour);
-		}
-		final EventAdapter adapter = new EventAdapter(this, r);
+		Arrays.sort(events,new EventComparator());
+		int idx=-1;//index of the first event to be displayed
+		for(int i=0; i<events.length; ++i) 
+			if(idx==-1 && events[i].dtend>new Date().getTime()) idx=i;
+		if(idx==-1) idx=0;
+
+		final EventAdapter adapter = new EventAdapter(this, events);
 		lv.setAdapter(adapter);
+		lv.setSelectionFromTop(idx, 0);
 		lv.setOnItemClickListener(new OnItemClickListener() {
 
 			@Override
-			public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
-					long arg3) {
-				// TODO Auto-generated method stub
+			public void onItemClick(final AdapterView<?> arg0, final View arg1, final int arg2,
+					final long arg3) {
 				DisplayEventActivity.displayEvent(EventListActivity.this,events[arg2]);
 			}
 			
@@ -77,20 +68,20 @@ public class EventListActivity extends Activity {
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		final MenuInflater inflater = getMenuInflater();
-	    inflater.inflate(R.menu.main, menu);
+		inflater.inflate(R.menu.main, menu);
 		return true;
 	}
 	
 	@Override
 	public boolean onOptionsItemSelected(final MenuItem item) {
-	    switch (item.getItemId()) {
-	        case R.id.NewEvent:
-	        	final Intent i=new Intent(this,AddEventActivity.class);
+		switch (item.getItemId()) {
+			case R.id.add_event:
+				final Intent i=new Intent(this,AddEventActivity.class);
 				startActivity(i);
-	            return true;
-	        default:
-	            return false;
-	    }
+				return true;
+			default:
+				return false;
+		}
 	}
 	
 }