Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Append cycle info to events only when active days is greater then 1 #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2025
Merged

Append cycle info to events only when active days is greater then 1 #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions app/src/androidTest/java/com/futsch1/medtimer/ReminderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,4 +322,79 @@ public void intervalReminderTest() {
sleep(1000);
assertContains(context.getString(R.string.interval_time, "0 min"));
}

@Test
//@AllowFlaky(attempts = 1)
public void cyclicReminderTest() {
CyclicReminderInfo[] reminders = {
new CyclicReminderInfo(1, 0, false),
new CyclicReminderInfo(1, 1, false),
new CyclicReminderInfo(1, 2, false),
new CyclicReminderInfo(2, 0, false),
new CyclicReminderInfo(2, 1, true),
};

// Create medicine
AndroidTestHelper.createMedicine("Test");

for (CyclicReminderInfo reminder : reminders) {
// Create reminder
AndroidTestHelper.createReminder("1", LocalTime.of(20, 0));

// Set active and pause days
clickOn(R.id.openAdvancedSettings);
writeTo(R.id.consecutiveDays, Integer.toString(reminder.consecutiveDays));
writeTo(R.id.pauseDays, Integer.toString(reminder.pauseDays));

// Set cycle start date of the reminder
Calendar cycleStart = Calendar.getInstance();
// The month here is 7, not 8, since it is zero-indexed (so January is 0)
cycleStart.set(2025, 7, 1);
writeTo(R.id.cycleStartDate, AndroidTestHelper.dateToString(cycleStart.getTime()));

// Go back to medicines list
pressBack();
pressBack();

// Mark event as taken
AndroidTestHelper.navigateTo(AndroidTestHelper.MainMenu.OVERVIEW);
clickOn(R.id.stateButton);
clickOn(R.id.takenButton);

// Check if cyclic information is present
clickOn(R.id.overviewContentContainer);
if (reminder.shouldHaveInfo) {
assertContains(R.id.editEventName, String.format("Test (1/%d)", reminder.consecutiveDays));
} else {
assertNotContains(R.id.editEventName, "Test (");
assertContains(R.id.editEventName, "Test");
}
pressBack();

// Remove event
clickOn(R.id.stateButton);
clickOn(R.id.deleteButton);
clickDialogPositiveButton();

// Remove reminder
AndroidTestHelper.navigateTo(AndroidTestHelper.MainMenu.MEDICINES);
clickListItem(R.id.medicineList, 0);
clickOn(R.id.openAdvancedSettings);
openMenu();
clickOn(R.string.delete);
clickDialogPositiveButton();
}
}

private class CyclicReminderInfo {
public int consecutiveDays;
public int pauseDays;
public boolean shouldHaveInfo;

public CyclicReminderInfo(int consecutiveDays, int pauseDays, boolean shouldHaveInfo) {
this.consecutiveDays = consecutiveDays;
this.pauseDays = pauseDays;
this.shouldHaveInfo = shouldHaveInfo;
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/futsch1/medtimer/reminders/scheduling/CyclesHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private CyclesHelper() {

@SuppressLint("DefaultLocale")
public static String getCycleCountString(Reminder reminder) {
if (reminder.pauseDays != 0) {
if (reminder.pauseDays != 0 && reminder.consecutiveDays != 1) {
long cycleStartDay = reminder.cycleStartDay;
long dayInCycle = LocalDate.now().toEpochDay() - cycleStartDay;
int cycleLength = reminder.consecutiveDays + reminder.pauseDays;
Expand Down
Loading