rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alarm: rearrange calendar logic

This commit is contained in:
RIP95 2017-03-20 03:18:57 +03:00
parent 5c3ee0a62b
commit 5c17d5556b
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
View File

@ -58,14 +58,10 @@ public class AlarmActivity extends Activity {
Calendar calendar = Calendar.getInstance();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
Log.d(TAG, "Current API functions have been executed");
calendar.set(Calendar.HOUR_OF_DAY, getCurrentHour(alarmTimePicker));
calendar.set(Calendar.MINUTE, getCurrentMinute(alarmTimePicker));
Toast.makeText(this, "Alarm has been set for " + getCurrentHour(alarmTimePicker) + " hour(s) " + getCurrentMinute(alarmTimePicker) + " minute(s)", Toast.LENGTH_SHORT).show();
setTime(calendar);
} else {
Log.d(TAG, "Legacy API functions have been executed");
calendar.set(Calendar.HOUR_OF_DAY, getCurrentHourLegacy(alarmTimePicker));
calendar.set(Calendar.MINUTE, getCurrentMinuteLegacy(alarmTimePicker));
Toast.makeText(this, "Alarm has been set for " + getCurrentHourLegacy(alarmTimePicker) + " hour(s) " + getCurrentMinuteLegacy(alarmTimePicker) + " minute(s)", Toast.LENGTH_SHORT).show();
setTimeLegacy(calendar);
}
alarmManager.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), pendingIntent);
Log.d(TAG, "Alarm On");
@ -79,22 +75,16 @@ public class AlarmActivity extends Activity {
}
@SuppressWarnings("deprecation")
public int getCurrentHourLegacy(TimePicker tp) {
return tp.getCurrentHour();
}
@SuppressWarnings("deprecation")
public int getCurrentMinuteLegacy(TimePicker tp) {
return tp.getCurrentMinute();
public void setTimeLegacy(Calendar calendar) {
calendar.set(Calendar.HOUR_OF_DAY, alarmTimePicker.getCurrentHour());
calendar.set(Calendar.MINUTE, alarmTimePicker.getCurrentHour());
Toast.makeText(this, "Alarm has been set for " + alarmTimePicker.getCurrentHour() + " hour(s) " + alarmTimePicker.getCurrentHour() + " minute(s)", Toast.LENGTH_SHORT).show();
}
@TargetApi(Build.VERSION_CODES.M)
public int getCurrentHour(TimePicker tp) {
return tp.getHour();
}
@TargetApi(Build.VERSION_CODES.M)
public int getCurrentMinute(TimePicker tp) {
return tp.getMinute();
public void setTime(Calendar calendar) {
calendar.set(Calendar.HOUR_OF_DAY, alarmTimePicker.getHour());
calendar.set(Calendar.MINUTE, alarmTimePicker.getMinute());
Toast.makeText(this, "Alarm has been set for " + alarmTimePicker.getHour() + " hour(s) " + alarmTimePicker.getMinute() + " minute(s)", Toast.LENGTH_SHORT).show();
}
}