Some improvements

[unical.git] / src / ro / ieval / unical / DisplayEventActivity.java

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 4f160696bd6f3cc5aee6a0496ba3d8bb60c37174..2ed4aab5d4bf6413be1abde3da9ac01ce090ad55 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -81,13 +81,16 @@ public class DisplayEventActivity extends Activity {
                final DateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
 
                startDay.setText(dayOfWeekFormat.format(start));
+               startDate.setText(dateFormat.format(start));
                if(!dateFormat.format(start).equals(dateFormat.format(end))) {
                        endDay.setText(dayOfWeekFormat.format(end));
                        endDate.setText(dateFormat.format(end));
                }
-               startDate.setText(dateFormat.format(start));
+
                startTime.setText(timeFormat.format(start));
-               endTime.setText(timeFormat.format(end));
+               if(!start.equals(end))
+                       endTime.setText(timeFormat.format(end));
+
                description.setText(event.description);
                setAdapter();
        }
@@ -109,18 +112,12 @@ public class DisplayEventActivity extends Activity {
             d.setArguments(b);
                        d.show(getFragmentManager(), "Delete");
 
-                       return true;
-               case R.id.eventlist:
-                       final Intent it=new Intent(this, EventListActivity.class);
-                       startActivity(it);
                        return true;
                case R.id.edit_event:
                        AddEventActivity.editEvent(this, event);
                        return true;
                case R.id.add_alarm:
-                       final Intent intent = new Intent(this, AddAlarmActivity.class);
-                       intent.putExtra(AddAlarmActivity.EXTRA_EVENT, event._id);
-            startActivity(intent);
+                       AddAlarmActivity.addAlarm(this,event);
                        return true;
                default:
                        return false;