Bugfix + changes the delete icon with cancel icon

[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..dd2b3bacd16a38d3dd328015009ad5af9ebaa782 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -15,10 +15,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.TextView;
+import android.widget.*;
 
 public class DisplayEventActivity extends Activity {
        private final class DeleteListener implements View.OnClickListener {
@@ -44,7 +41,7 @@ public class DisplayEventActivity extends Activity {
                                        final LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
                                        final View rowView = inflater.inflate(R.layout.alarm_row_layout, parent, false);
                                        final TextView date = (TextView) rowView.findViewById(R.id.alarm_datetime);
-                                       final Button delete = (Button) rowView.findViewById(R.id.alarm_delete);
+                                       final ImageButton delete = (ImageButton) rowView.findViewById(R.id.alarm_delete);
                                        delete.setOnClickListener(new DeleteListener(getItem(position)));
                                        date.setText(DateFormat.getDateTimeInstance().format(getItem(position)));
 
@@ -81,13 +78,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 +109,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;