hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deleting alarm works

Browse Source
This commit is contained in:
Phillip Hsu
2016-06-02 00:12:59 -07:00
parent aba3b534a1
commit 2f5eff6842
9 changed files with 118 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java
+48 -14
View File
@@ -1,8 +1,14 @@
package com.philliphsu.clock2.editalarm;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.SwitchCompat;
import android.text.format.DateFormat;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
@@ -19,13 +25,16 @@ import java.util.Date;
import butterknife.Bind;
import butterknife.OnClick;
import static android.text.format.DateFormat.getTimeFormat;
import static com.philliphsu.clock2.DaysOfWeek.SATURDAY;
import static com.philliphsu.clock2.DaysOfWeek.SUNDAY;
public class EditAlarmActivity extends BaseActivity {
public static final String EXTRA_ALARM_ID = "com.philliphsu.clock2.editalarm.extra.ALARM_ID";
private static final int ID_MENU_ITEM = 0;
@Nullable private Alarm mAlarm;
@Bind(R.id.save) Button mSave;
@Bind(R.id.delete) Button mDelete;
@Bind(R.id.on_off) SwitchCompat mSwitch;
@@ -39,24 +48,52 @@ public class EditAlarmActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setTitle("Snoozing until 12:40 PM");
setWeekDaysText();
long alarmId = getIntent().getLongExtra(EXTRA_ALARM_ID, -1);
if (alarmId > -1) {
Alarm alarm = AlarmsRepository.getInstance(this).getItem(alarmId);
if (alarm != null) {
mSwitch.setChecked(alarm.isEnabled());
mTimeText.setText(DateFormat.getTimeFormat(this).format(new Date(alarm.ringsAt())));
mAlarm = AlarmsRepository.getInstance(this).getItem(alarmId);
if (mAlarm != null) {
mSwitch.setChecked(mAlarm.isEnabled());
mTimeText.setText(getTimeFormat(this).format(new Date(mAlarm.ringsAt())));
for (int i = SUNDAY; i <= SATURDAY; i++) {
// What position in the week is this day located at?
int at = DaysOfWeek.getInstance(this).positionOf(i);
// Toggle the button that corresponds to this day
mDays[at].setChecked(alarm.isRecurring(i));
mDays[at].setChecked(mAlarm.isRecurring(i));
}
mLabel.setText(mAlarm.label());
Ringtone r = RingtoneManager.getRingtone(this, Uri.parse(mAlarm.ringtone()));
mRingtone.setText(r.getTitle(this));
mVibrate.setChecked(mAlarm.vibrates());
if (mAlarm.isSnoozed()) {
String title = getString(R.string.title_snoozing_until,
getTimeFormat(this).format(new Date(mAlarm.snoozingUntil()))
);
ActionBar ab = getSupportActionBar();
ab.setDisplayShowTitleEnabled(true);
ab.setTitle(title);
}
}
}
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// TODO: Read upcoming threshold preference
if (mAlarm != null && (mAlarm.ringsWithinHours(2) || mAlarm.isSnoozed())) {
if (menu.findItem(ID_MENU_ITEM) == null) {
// Create dynamically because there is almost nothing we can statically define
// in a layout resource.
menu.add(0 /*group*/, ID_MENU_ITEM, 0 /*order*/,
mAlarm.isSnoozed() ? R.string.done_snoozing : R.string.dismiss_now)
.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
.setIcon(android.R.drawable.ic_delete);
// TODO: Show correct icon based on which is happening
}
}
return super.onPrepareOptionsMenu(menu);
}
@Override
protected int layoutResId() {
return R.layout.activity_edit_alarm;
@@ -67,11 +104,6 @@ public class EditAlarmActivity extends BaseActivity {
return 0;
}
@Override
protected boolean isDisplayShowTitleEnabled() {
return true;
}
@OnClick(R.id.save)
void save() {
boolean[] days = new boolean[7];
@@ -87,7 +119,9 @@ public class EditAlarmActivity extends BaseActivity {
@OnClick(R.id.delete)
void delete() {
//AlarmsRepository.getInstance(this).deleteItem();
if (mAlarm != null) {
AlarmsRepository.getInstance(this).deleteItem(mAlarm);
}
finish();
}