From 130b4fe1e395a2877353e650c9b98022e7b74f19 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 2 Jun 2017 23:34:36 +0200
Subject: [PATCH] prefill more pages into the viewpagers

---
 .../calendar/activities/MainActivity.kt             |  6 +++---
 .../calendar/helpers/MonthlyCalendarImpl.kt         | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index 88f9761bf..d4ffcc5b5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -45,9 +45,9 @@ import java.util.*
 import kotlin.collections.ArrayList
 
 class MainActivity : SimpleActivity(), NavigationListener {
-    private val PREFILLED_MONTHS = 73
-    private val PREFILLED_YEARS = 21
-    private val PREFILLED_WEEKS = 41
+    private val PREFILLED_MONTHS = 97
+    private val PREFILLED_YEARS = 31
+    private val PREFILLED_WEEKS = 61
     private val STORAGE_PERMISSION_IMPORT = 1
     private val STORAGE_PERMISSION_EXPORT = 2
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
index e5ea03ca3..a8a5033d0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
@@ -61,7 +61,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
         for (i in 0..DAYS_CNT - 1) {
             if (i < firstDayIndex) {
                 isThisMonth = false
-                curDay = mTargetDate.minusMonths(1)
+                curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
             } else if (i == firstDayIndex) {
                 value = 1
                 isThisMonth = true
@@ -69,7 +69,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
             } else if (value == currMonthDays + 1) {
                 value = 1
                 isThisMonth = false
-                curDay = mTargetDate.plusMonths(1)
+                curDay = mTargetDate.withDayOfMonth(1).plusMonths(1)
             }
 
             isToday = isThisMonth && isToday(mTargetDate, value)
@@ -124,8 +124,13 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
         }
     }
 
-    private fun isToday(targetDate: DateTime, curDayInMonth: Int) =
-            targetDate.withDayOfMonth(curDayInMonth).toString(Formatter.DAYCODE_PATTERN) == mToday
+    private fun isToday(targetDate: DateTime, curDayInMonth: Int): Boolean {
+        try {
+            return targetDate.withDayOfMonth(curDayInMonth).toString(Formatter.DAYCODE_PATTERN) == mToday
+        } catch(ignored: Exception) {
+            return false
+        }
+    }
 
     private val monthName: String
         get() {