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

Lots of changes

Browse Source
This commit is contained in:
Phillip Hsu
2016-06-08 12:44:12 -07:00
parent 938f1a62a7
commit 8dc71ae34b
8 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/philliphsu/clock2/editalarm/AlarmUtilsHelper.java
+1 -1
View File
@@ -7,5 +7,5 @@ import com.philliphsu.clock2.Alarm;
*/
public interface AlarmUtilsHelper {
void scheduleAlarm(Alarm alarm);
void cancelAlarm(Alarm alarm);
void cancelAlarm(Alarm alarm, boolean showToast);
}
app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java
+2 -2
View File
@@ -431,8 +431,8 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
}
@Override
public void cancelAlarm(Alarm alarm) {
AlarmUtils.cancelAlarm(this, alarm);
public void cancelAlarm(Alarm alarm, boolean showToast) {
AlarmUtils.cancelAlarm(this, alarm, showToast);
}
@Override
app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmPresenter.java
+3 -3
View File
@@ -75,7 +75,7 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
.build();
a.setEnabled(mView.isEnabled());
if (mAlarm != null) {
mAlarmUtilsHelper.cancelAlarm(mAlarm);
mAlarmUtilsHelper.cancelAlarm(mAlarm, false);
mRepository.updateItem(mAlarm, a);
} else {
mRepository.addItem(a);
@@ -92,7 +92,7 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
public void delete() {
if (mAlarm != null) {
if (mAlarm.isEnabled()) {
mAlarmUtilsHelper.cancelAlarm(mAlarm); // (1)
mAlarmUtilsHelper.cancelAlarm(mAlarm, false); // (1)
}
mRepository.deleteItem(mAlarm); // TOneverDO: before (1)
}
@@ -101,7 +101,7 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
@Override
public void dismissNow() {
mAlarmUtilsHelper.cancelAlarm(checkNotNull(mAlarm));
mAlarmUtilsHelper.cancelAlarm(checkNotNull(mAlarm), true);
// cancelAlarm() should have turned off this alarm if appropriate
mView.showEnabled(mAlarm.isEnabled());
}