From b894c623c04174e2e3f03e4046a09a5ea44fc382 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 24 Jul 2011 21:35:27 -0500 Subject: [PATCH] Fixed widget start and end dates --- .../src/com/baker/vm/VMAccount.java | 4 +++- .../src/com/baker/vm/ui/MinutesGraphDrawable.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/VirginMobileMinutesChecker/src/com/baker/vm/VMAccount.java b/VirginMobileMinutesChecker/src/com/baker/vm/VMAccount.java index 299aaf8..05846d5 100644 --- a/VirginMobileMinutesChecker/src/com/baker/vm/VMAccount.java +++ b/VirginMobileMinutesChecker/src/com/baker/vm/VMAccount.java @@ -170,7 +170,9 @@ public Calendar getChargedOnCal() // This won't throw NumberFormatExceptions because the matches must be digits cal = new GregorianCalendar(Integer.parseInt("20" + m.group(3)), Integer.parseInt(m.group(1)) - 1, - Integer.parseInt(m.group(2))); + Integer.parseInt(m.group(2)), + 23, + 59); } return cal; diff --git a/VirginMobileMinutesChecker/src/com/baker/vm/ui/MinutesGraphDrawable.java b/VirginMobileMinutesChecker/src/com/baker/vm/ui/MinutesGraphDrawable.java index 5bed953..583f2c5 100644 --- a/VirginMobileMinutesChecker/src/com/baker/vm/ui/MinutesGraphDrawable.java +++ b/VirginMobileMinutesChecker/src/com/baker/vm/ui/MinutesGraphDrawable.java @@ -55,9 +55,11 @@ protected void updateModel(final VMAccount iAccount) { final Calendar end = account.getChargedOnCal(); final Calendar start = (Calendar) end.clone(); - start.set(Calendar.MONTH, end.get(Calendar.MONTH) - 1); + start.add(Calendar.MONTH, -1); + start.set(Calendar.HOUR_OF_DAY, 0); + start.set(Calendar.MINUTE, 0); final Calendar now = new GregorianCalendar(); - + final long total = end.getTimeInMillis() - start.getTimeInMillis(); final long millis = now.getTimeInMillis() - start.getTimeInMillis(); @@ -74,7 +76,7 @@ protected void updateModel(final VMAccount iAccount) private String toString(final Calendar end) { - return end.get(Calendar.MONTH) + "/" + end.get(Calendar.DAY_OF_MONTH) + "/" + end.get(Calendar.YEAR); + return end.get(Calendar.MONTH) + "/" + end.get(Calendar.DAY_OF_MONTH) + "/" + end.get(Calendar.YEAR) + " " + end.get(Calendar.HOUR_OF_DAY) + ":" + end.get(Calendar.MINUTE); } /**