From 9999898c37def7f95ca6601d089c4cfb1fcef31c Mon Sep 17 00:00:00 2001
From: Javinator9889 <dev@javinator9889.com>
Date: Thu, 2 Jul 2020 20:24:02 +0200
Subject: [PATCH] Solved an error with dates sorting

---
 .../fragments/diseases/DiseasesFragment.kt     |  5 +++++
 .../utils/calendar/Calendar.kt                 | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
index 147958e..0d8f2c8 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
@@ -123,6 +123,7 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange,
                     countChart.notifyDataSetChanged()
                     countChart.fitScreen()
                     countChart.moveViewToX(0F)
+                    countChart.setVisibleXRangeMaximum(7F)
                     countChart.invalidate()
                     val todayAmount =
                         handwashingViewModel.getAsync(CalendarUtils.today.time)
@@ -195,6 +196,9 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange,
                         )
                     )
                 handwashingViewModel.increment(CalendarUtils.today.time)
+                Timber.d("${CalendarUtils.lastWeek.time}")
+                Timber.d("${CalendarUtils.lastMonth.time}")
+                handwashingViewModel.create(Handwashing(CalendarUtils.lastWeek.time, 12))
                 leaves.visibility = View.VISIBLE
                 if (!leaves.isAnimating)
                     leaves.playAnimation()
@@ -211,6 +215,7 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange,
                         )
                     )
                 handwashingViewModel.decrement(CalendarUtils.today.time)
+                handwashingViewModel.create(Handwashing(CalendarUtils.lastMonth.time, 123))
             }
         }
     }
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/utils/calendar/Calendar.kt b/app/src/main/java/com/javinator9889/handwashingreminder/utils/calendar/Calendar.kt
index 11275ed..58f2a1d 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/utils/calendar/Calendar.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/utils/calendar/Calendar.kt
@@ -32,25 +32,27 @@ object CalendarUtils {
         }
 
     val lastWeek: Calendar
-        get() = with(today) {
-            today.add(Calendar.DAY_OF_YEAR, -7)
-            today
+        get() {
+            val aWeekAgo = today
+            aWeekAgo.add(Calendar.DAY_OF_MONTH, -7)
+            return aWeekAgo
         }
 
     val lastMonth: Calendar
-        get() = with(today) {
-            today.add(Calendar.MONTH, -1)
-            today
+        get() {
+            val aMonthAgo = today
+            aMonthAgo.add(Calendar.MONTH, -1)
+            return aMonthAgo
         }
 
     fun timeBetweenIn(
         unit: TimeUnit,
         to: Long,
-        from: Long = Calendar.getInstance().timeInMillis
+        from: Long = today.timeInMillis
     ): Long = unit.convert(timeBetween(to, from), TimeUnit.MILLISECONDS)
 
     fun timeBetween(
         to: Long,
-        from: Long = Calendar.getInstance().timeInMillis
+        from: Long = today.timeInMillis
     ): Long = from - to
 }
\ No newline at end of file