diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java index 0cd4751a..e951a236 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java @@ -29,6 +29,18 @@ public class CalendarUtil { } /** + * Returns the time elapsed so far last N days in milliseconds. + * + * @return Time elapsed since N days in milliseconds. + */ + public long getElapsedDays(int numDays) { + long elapsed = getElapsedToday(); + elapsed += numDays * MS_PER_DAY; + + return elapsed; + } + + /** * Returns the time elapsed so far this week in milliseconds. * * @return Time elapsed this week in milliseconds. diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java index 4abf7398..f0a2074a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java @@ -290,6 +290,10 @@ public final class PreferenceUtil { interval = calendarUtil.getElapsedWeek(); break; + case "past_seven_days": + interval = calendarUtil.getElapsedDays(7); + break; + case "past_three_months": interval = calendarUtil.getElapsedMonths(3); break; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 104c0324..52996cc9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,6 +106,7 @@ Never Today This week + Past 7 days This month Past 3 months This year diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml index b5bf7546..53990342 100644 --- a/app/src/main/res/values/strings_activity_settings.xml +++ b/app/src/main/res/values/strings_activity_settings.xml @@ -27,6 +27,7 @@ @string/today @string/this_week + @string/past_seven_days @string/this_month @string/past_three_months @string/this_year @@ -35,6 +36,7 @@ today this_week + past_seven_days this_month past_three_months this_year @@ -43,6 +45,7 @@ @string/today @string/this_week + @string/past_seven_days @string/this_month @string/past_three_months @string/this_year @@ -51,6 +54,7 @@ today this_week + past_seven_days this_month past_three_months this_year