mirror of https://github.com/tasks/tasks
Fix weekly repeat bugs
Alex Baker
8 years ago
parent
e839d0b870
commit
8ea915a9f5
@ -0,0 +1,57 @@
|
||||
package org.tasks.repeats;
|
||||
|
||||
import android.support.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.google.ical.values.RRule;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.tasks.locale.Locale;
|
||||
|
||||
import java.text.ParseException;
|
||||
|
||||
import static android.support.test.InstrumentationRegistry.getTargetContext;
|
||||
import static junit.framework.Assert.assertEquals;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class RepeatRuleToStringTest {
|
||||
|
||||
@Test
|
||||
public void weekly() {
|
||||
assertEquals("Repeats weekly", toString("RRULE:FREQ=WEEKLY;INTERVAL=1"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void weeklyPlural() {
|
||||
assertEquals("Repeats every 2 weeks", toString("RRULE:FREQ=WEEKLY;INTERVAL=2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void weeklyByDay() {
|
||||
assertEquals("Repeats weekly on Mon, Tue, Wed, Thu, Fri", toString("RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void printDaysInRepeatRuleOrder() {
|
||||
assertEquals("Repeats weekly on Fri, Thu, Wed, Tue, Mon", toString("RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR,TH,WE,TU,MO"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void useLocaleForDays() {
|
||||
assertEquals("Wiederhole wöchentlich am Sa., So.", toString("de", "RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SA,SU"));
|
||||
}
|
||||
|
||||
private String toString(String rrule) {
|
||||
return toString(null, rrule);
|
||||
}
|
||||
|
||||
private String toString(String language, String rrule) {
|
||||
try {
|
||||
Locale locale = new Locale(java.util.Locale.getDefault(), language, -1);
|
||||
return new RepeatRuleToString(locale.createConfigurationContext(getTargetContext()), locale)
|
||||
.toString(new RRule(rrule));
|
||||
} catch (ParseException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,131 @@
|
||||
package org.tasks.repeats;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.ical.values.Frequency;
|
||||
import com.google.ical.values.RRule;
|
||||
import com.google.ical.values.Weekday;
|
||||
import com.google.ical.values.WeekdayNum;
|
||||
import com.todoroo.andlib.utility.DateUtilities;
|
||||
|
||||
import org.tasks.R;
|
||||
import org.tasks.injection.ForApplication;
|
||||
import org.tasks.locale.Locale;
|
||||
import org.tasks.time.DateTime;
|
||||
|
||||
import java.text.DateFormatSymbols;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import static com.google.ical.values.Frequency.WEEKLY;
|
||||
|
||||
public class RepeatRuleToString {
|
||||
|
||||
private final Context context;
|
||||
private final Locale locale;
|
||||
private final List<Weekday> weekdays = Arrays.asList(Weekday.values());
|
||||
|
||||
@Inject
|
||||
public RepeatRuleToString(@ForApplication Context context, Locale locale) {
|
||||
this.context = context;
|
||||
this.locale = locale;
|
||||
}
|
||||
|
||||
public String toString(RRule rrule) {
|
||||
int interval = rrule.getInterval();
|
||||
Frequency frequency = rrule.getFreq();
|
||||
DateTime repeatUntil = rrule.getUntil() == null ? null : DateTime.from(rrule.getUntil());
|
||||
int count = rrule.getCount();
|
||||
String countString = count > 0 ? context.getResources().getQuantityString(R.plurals.repeat_times, count) : "";
|
||||
if (interval == 1) {
|
||||
String frequencyString = context.getString(getSingleFrequencyResource(frequency));
|
||||
if (frequency == WEEKLY && !rrule.getByDay().isEmpty()) {
|
||||
String dayString = getDayString(rrule);
|
||||
if (count > 0) {
|
||||
return context.getString(R.string.repeats_single_on_number_of_times, frequencyString, dayString, count, countString);
|
||||
} else if (repeatUntil == null) {
|
||||
return context.getString(R.string.repeats_single_on, frequencyString, dayString);
|
||||
} else {
|
||||
return context.getString(R.string.repeats_single_on_until, frequencyString, dayString, DateUtilities.getLongDateString(repeatUntil));
|
||||
}
|
||||
} else if (count > 0) {
|
||||
return context.getString(R.string.repeats_single_number_of_times, frequencyString, count, countString);
|
||||
} else if (repeatUntil == null) {
|
||||
return context.getString(R.string.repeats_single, frequencyString);
|
||||
} else {
|
||||
return context.getString(R.string.repeats_single_until, frequencyString, DateUtilities.getLongDateString(repeatUntil));
|
||||
}
|
||||
} else {
|
||||
int plural = getFrequencyPlural(frequency);
|
||||
String frequencyPlural = context.getResources().getQuantityString(plural, interval, interval);
|
||||
if (frequency == WEEKLY && !rrule.getByDay().isEmpty()) {
|
||||
String dayString = getDayString(rrule);
|
||||
if (count > 0) {
|
||||
return context.getString(R.string.repeats_plural_on_number_of_times, frequencyPlural, dayString, count, countString);
|
||||
} else if (repeatUntil == null) {
|
||||
return context.getString(R.string.repeats_plural_on, frequencyPlural, dayString);
|
||||
} else {
|
||||
return context.getString(R.string.repeats_plural_on_until, frequencyPlural, dayString, DateUtilities.getLongDateString(repeatUntil));
|
||||
}
|
||||
} else if (count > 0) {
|
||||
return context.getString(R.string.repeats_plural_number_of_times, frequencyPlural, count, countString);
|
||||
} else if (repeatUntil == null) {
|
||||
return context.getString(R.string.repeats_plural, frequencyPlural);
|
||||
} else {
|
||||
return context.getString(R.string.repeats_plural_until, frequencyPlural, DateUtilities.getLongDateString(repeatUntil));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private String getDayString(RRule rrule) {
|
||||
DateFormatSymbols dfs = new DateFormatSymbols(locale.getLocale());
|
||||
String[] shortWeekdays = dfs.getShortWeekdays();
|
||||
List<String> days = new ArrayList<>();
|
||||
for (WeekdayNum weekday : rrule.getByDay()) {
|
||||
days.add(shortWeekdays[weekdays.indexOf(weekday.wday) + 1]);
|
||||
}
|
||||
return Joiner.on(context.getString(R.string.list_separator_with_space)).join(days);
|
||||
}
|
||||
|
||||
private int getSingleFrequencyResource(Frequency frequency) {
|
||||
switch (frequency) {
|
||||
case MINUTELY:
|
||||
return R.string.repeats_minutely;
|
||||
case HOURLY:
|
||||
return R.string.repeats_hourly;
|
||||
case DAILY:
|
||||
return R.string.repeats_daily;
|
||||
case WEEKLY:
|
||||
return R.string.repeats_weekly;
|
||||
case MONTHLY:
|
||||
return R.string.repeats_monthly;
|
||||
case YEARLY:
|
||||
return R.string.repeats_yearly;
|
||||
default:
|
||||
throw new RuntimeException("Invalid frequency: " + frequency);
|
||||
}
|
||||
}
|
||||
|
||||
private int getFrequencyPlural(Frequency frequency) {
|
||||
switch (frequency) {
|
||||
case MINUTELY:
|
||||
return R.plurals.repeat_n_minutes;
|
||||
case HOURLY:
|
||||
return R.plurals.repeat_n_hours;
|
||||
case DAILY:
|
||||
return R.plurals.repeat_n_days;
|
||||
case WEEKLY:
|
||||
return R.plurals.repeat_n_weeks;
|
||||
case MONTHLY:
|
||||
return R.plurals.repeat_n_months;
|
||||
case YEARLY:
|
||||
return R.plurals.repeat_n_years;
|
||||
default:
|
||||
throw new RuntimeException("Invalid frequency: " + frequency);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue