diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java index aab1e5f..ad24586 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java @@ -125,7 +125,13 @@ public class AlarmsFragment extends Fragment implements LoaderCallbacks, switch (requestCode) { case REQUEST_CREATE_ALARM: + getLoaderManager().restartLoader(0, null, this); case REQUEST_EDIT_ALARM: + if (data != null && data.getBooleanExtra( + EditAlarmActivity.EXTRA_ALARM_DELETED, false)) { + // TODO: Pass in the old alarm into the intent and access it here? + onListItemDeleted(null); + } getLoaderManager().restartLoader(0, null, this); break; default: @@ -141,6 +147,8 @@ public class AlarmsFragment extends Fragment implements LoaderCallbacks, startActivityForResult(intent, REQUEST_EDIT_ALARM); } + // TODO: This doesn't need to be defined in the interface. + // TODO: Rename to showDeletedSnackbar() or something @Override public void onListItemDeleted(final Alarm item) { Snackbar.make(getActivity().findViewById(R.id.main_content), diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java b/app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java index 021333a..68f62fa 100644 --- a/app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java +++ b/app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java @@ -58,6 +58,7 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi LoaderManager.LoaderCallbacks { private static final String TAG = "EditAlarmActivity"; public static final String EXTRA_ALARM_ID = "com.philliphsu.clock2.editalarm.extra.ALARM_ID"; + public static final String EXTRA_ALARM_DELETED = "com.philliphsu.clock2.editalarm.extra.ALARM_DELETED"; private static final RelativeSizeSpan AMPM_SIZE_SPAN = new RelativeSizeSpan(0.5f); private static final int REQUEST_PICK_RINGTONE = 0; @@ -262,7 +263,10 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi } mDatabaseManager.deleteAlarm(mOldAlarm); } - setResult(RESULT_OK); + Intent intent = new Intent(); + // TODO: Pass in the old alarm into the intent? + intent.putExtra(EXTRA_ALARM_DELETED, true); + setResult(RESULT_OK, intent); showEditorClosed(); }