lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused import;

Browse source 
Add today/tomorrow algorythm
This commit is contained in:
jacques 2021-03-20 21:33:20 +01:00
parent 7b632b18d9
commit e598d4827b
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
View file

@ -9,7 +9,6 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.icu.util.Calendar; import android.icu.util.Calendar;
import android.os.Bundle; import android.os.Bundle;
import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -38,6 +37,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import static net.foucry.pilldroid.UtilDate.date2String; import static net.foucry.pilldroid.UtilDate.date2String;
import static net.foucry.pilldroid.UtilDate.dateAtNoon;
import static net.foucry.pilldroid.Utils.intRandomExclusive; import static net.foucry.pilldroid.Utils.intRandomExclusive;
// Todo: - use same color in website and about // Todo: - use same color in website and about
@ -57,7 +57,6 @@ public class MedicamentListActivity extends AppCompatActivity {
*/ */
// TODO: Change DEMO/DBDEMO form static to non-static. In order to create fake data at only at launchtime // TODO: Change DEMO/DBDEMO form static to non-static. In order to create fake data at only at launchtime
private boolean mTwoPane;
final Boolean DEMO = false; final Boolean DEMO = false;
final Boolean DBDEMO = false; final Boolean DBDEMO = false;
public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff; public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff;
@ -368,12 +367,18 @@ public class MedicamentListActivity extends AppCompatActivity {
* scheduleAlarm() * scheduleAlarm()
*/ */
public void scheduleAlarm() { public void scheduleAlarm() {
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis());
calendar.set(Calendar.HOUR_OF_DAY, 13);
if (DateUtils.isToday(calendar.getTimeInMillis())) { Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(calendar.getTimeInMillis() + (24 * 60 * 60 * 1000)); Date today = calendar.getTime();
calendar.add(Calendar.DAY_OF_YEAR, 1);
Date tomorow = calendar.getTime();
if (today.before(dateAtNoon(today))) {
// schedule date = today
calendar.setTimeInMillis(dateAtNoon(today).getTime());
} else {
// schedule date = tomorrow
calendar.setTimeInMillis(dateAtNoon(tomorow).getTime());
} }
PendingIntent alarmIntent; PendingIntent alarmIntent;