From 7bd01d93d42a7fe989b295b23870ae55dd1a09eb Mon Sep 17 00:00:00 2001
From: Petru <l3asketballplayer@yahoo.com>
Date: Thu, 22 Aug 2013 14:29:24 +0300
Subject: [PATCH] Bugfix + changes the delete icon with cancel icon

---
 res/layout/alarm_row_layout.xml               | 6 ++++--
 src/ro/ieval/unical/AddAlarmActivity.java     | 2 +-
 src/ro/ieval/unical/DisplayEventActivity.java | 7 ++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/res/layout/alarm_row_layout.xml b/res/layout/alarm_row_layout.xml
index 62aa676..87f8857 100644
--- a/res/layout/alarm_row_layout.xml
+++ b/res/layout/alarm_row_layout.xml
@@ -10,8 +10,10 @@
 			android:layout_weight="1"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-  <Button android:id="@+id/alarm_delete"
+  <ImageButton android:id="@+id/alarm_delete"
+               android:src="@android:drawable/ic_menu_close_clear_cancel"
 		  android:layout_width="wrap_content"
 		  android:layout_height="wrap_content"
-		  android:text="@string/delete"/>
+          android:background="@android:color/transparent"
+		  />
 </LinearLayout>
diff --git a/src/ro/ieval/unical/AddAlarmActivity.java b/src/ro/ieval/unical/AddAlarmActivity.java
index 527250e..b79256c 100644
--- a/src/ro/ieval/unical/AddAlarmActivity.java
+++ b/src/ro/ieval/unical/AddAlarmActivity.java
@@ -63,7 +63,7 @@ public class AddAlarmActivity  extends ListActivity {
 			final TimePicker timePicker = (TimePicker) findViewById(R.id.timePicker);
 			final GregorianCalendar calendar = new GregorianCalendar(datePicker.getYear(), datePicker.getMonth(), datePicker.getDayOfMonth(), timePicker.getCurrentHour(), timePicker.getCurrentMinute(), 0);
 			try {
-                Utils.addAlarm((Application) getApplication(), calendar.getTimeInMillis(), getIntent().getLongExtra(EXTRA_EVENT, 0));
+                Utils.addAlarm((Application) getApplication(), calendar.getTimeInMillis(), event._id);
                 finish();
             }catch(SQLException e)  {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 2ed4aab..dd2b3ba 100644
--- 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)));
 
-- 
2.30.2