From 06b0910cc2656cc2c3cab477684350191492e2ab Mon Sep 17 00:00:00 2001 From: AlessandroLazzari Date: Mon, 2 Feb 2015 22:07:32 +0100 Subject: [PATCH] Fix issue https://github.com/moneymanagerex/android-money-manager-ex/issues/13 --- res/values/arrays.xml | 6 ++++++ src/com/money/manager/ex/utils/DateUtils.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 90edca7606..4fda7f4b7c 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -164,6 +164,8 @@ 12 13 14 + 15 + 16 @@ -182,6 +184,8 @@ @string/in_x_months @string/every_x_days @string/every_x_months + @string/montly_last_days + @string/montly_last_bussines_day @@ -310,4 +314,6 @@ @string/sort_by_usage + Montly (last day) + Montly (last business day) \ No newline at end of file diff --git a/src/com/money/manager/ex/utils/DateUtils.java b/src/com/money/manager/ex/utils/DateUtils.java index f7cb61dfd5..072080c548 100644 --- a/src/com/money/manager/ex/utils/DateUtils.java +++ b/src/com/money/manager/ex/utils/DateUtils.java @@ -168,6 +168,14 @@ public static Date getDateNextOccurence(Date date, int repeats) { case 12: //in_x_months case 13: //every_x_days case 14: //every_x_months + break; + case 15: //month (last day) + calendar.add(Calendar.MONTH, 1); + calendar.set(Calendar.DAY_OF_MONTH, 1); + calendar.add(Calendar.DATE, -1); + break; + case 16: //month (last business day) + } return calendar.getTime(); }