Add Activity to display a list of events

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f2d66b46e73c1a5895cddeca1f08c44472302902..2ba8ef0c7af5851dd970131f40b4eb7911173106 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,7 @@
         </activity>
         <activity android:name=".AddEventActivity"></activity>
         <activity android:name=".DisplayEventActivity"></activity>
+        <activity android:name=".EventListActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file

diff --git a/gson/com/google/gson/JsonNull.java b/gson/com/google/gson/JsonNull.java
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gson/com/google/gson/JsonParser.java b/gson/com/google/gson/JsonParser.java
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/layout/event_list.xml b/res/layout/event_list.xml
new file mode 100644 (file)
index 0000000..cc212a8
--- /dev/null
+++ b/res/layout/event_list.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/eventlistlayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <LinearLayout
+            android:id="@+id/eventslayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>

diff --git a/res/menu/event.xml b/res/menu/event.xml
index 9a454e1327ac472754730b580d8098516b23a981..f4ce2755e5e45d5a44a818db75dc747a76d5fb4e 100644 (file)
--- a/res/menu/event.xml
+++ b/res/menu/event.xml
@@ -7,6 +7,12 @@
     android:titleCondensed="NEW">
         
     </item>
+    <item android:id="@+id/eventlist" 
+        android:title="@string/eventlist" 
+        android:visible="true" 
+        android:showAsAction="never" >
+        
+    </item>
     
 
 </menu>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 482b58adaeb42c820b857c3df1cae8185967a781..f3b0ab1ec1879f76d494b1af336c12574cd22b08 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11,6 +11,8 @@
     <string name="password">Password</string>
     <string name="locationlabel">Location: </string>
     <string name="repeatlabel">Repeating</string>
+    <string name="today">Today</string>
+    <string name="eventlist">Event List</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="askdeleteevent">Delete this event ?</string>

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 6208d232378701a6f04227ee93f652449119a767..af682248a8ec7db1f7a8c964f71ecd3f36deef23 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -1,5 +1,6 @@
 package ro.ieval.unical;
 
+import java.util.Arrays;
 import java.util.Date;
 
 import android.app.Activity;
@@ -25,10 +26,12 @@ public class DisplayEventActivity extends Activity {
                super.onCreate(savedInstanceState);
                final Event e=getIntent().getParcelableExtra(EXTRA_EVENT);
                setContentView(R.layout.event_view);
+               
            final TextView eventTitle= (TextView) findViewById(R.id.eventTitle);
                final TextView date=(TextView) findViewById(R.id.date);
                final TextView description=(TextView) findViewById(R.id.description);
                final TextView location= (TextView) findViewById(R.id.location);
+               
                eventTitle.setText(e.title);
                date.setText(new Date(e.dtstart).toString());
                description.setText(e.description);
@@ -45,7 +48,7 @@ public class DisplayEventActivity extends Activity {
        @Override
        public boolean onOptionsItemSelected(final MenuItem item) {
            // Handle item selection
-           switch (item.getItemId()) {
+           switch (item. getItemId()) {
                case R.id.NewEvent:
                        final Intent i=new Intent(this,AddEventActivity.class);
                                startActivity(i);
@@ -54,6 +57,10 @@ public class DisplayEventActivity extends Activity {
                        final DeleteEventDialog d=new DeleteEventDialog();
                        d.show(getFragmentManager(), "Delete");
                        return true;
+               case R.id.eventlist:
+                       final Intent it=new Intent(this,EventListActivity.class);
+                       startActivity(it);
+                       return true;
                default:
                    return true;
            }

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index 23ccd74d5488b9ba411464bc294bf315c540a7ee..cdeafaf5befb0300d5751c790080404492477380 100644 (file)
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -1,6 +1,7 @@
 package ro.ieval.unical;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import android.content.ContentResolver;
 import android.content.Context;

diff --git a/src/ro/ieval/unical/EventListActivity.java b/src/ro/ieval/unical/EventListActivity.java
new file mode 100644 (file)
index 0000000..793573b
--- /dev/null
+++ b/src/ro/ieval/unical/EventListActivity.java
@@ -0,0 +1,40 @@
+package ro.ieval.unical;
+
+import java.util.Arrays;
+import java.util.GregorianCalendar;
+import java.text.DateFormat;
+import java.util.Date;
+
+import ro.ieval.unical.R;
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.format.DateUtils;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+
+public class EventListActivity extends Activity {
+       GregorianCalendar gc;
+       
+       @Override
+       protected void onCreate(Bundle savedInstanceState) {
+               // TODO Auto-generated method stub
+               super.onCreate(savedInstanceState);
+               setContentView(R.layout.event_list);
+               
+               Date d=new Date();
+               d.getTime();
+               gc=new GregorianCalendar();
+               gc.setTime(d);
+               
+           Event r[]=Event.getAllEvents(getBaseContext());
+           LinearLayout ll = (LinearLayout)findViewById(R.id.eventslayout);
+           Button[] b=new Button[10];
+               Arrays.sort(r,new EventComparator());
+               for(int i=0; i<r.length; ++i) if(r[i].dtstart<=gc.getTimeInMillis()){
+                       Button EventButton=new Button(getBaseContext());
+                       EventButton.setText(r[i].title);
+                       ll.addView(EventButton);
+               }
+       }
+}