fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prefill more pages into the viewpagers

This commit is contained in:
tibbi 2017-06-02 23:34:36 +02:00
parent e7cb174e25
commit 130b4fe1e3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

@ -45,9 +45,9 @@ import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
class MainActivity : SimpleActivity(), NavigationListener { class MainActivity : SimpleActivity(), NavigationListener {
private val PREFILLED_MONTHS = 73 private val PREFILLED_MONTHS = 97
private val PREFILLED_YEARS = 21 private val PREFILLED_YEARS = 31
private val PREFILLED_WEEKS = 41 private val PREFILLED_WEEKS = 61
private val STORAGE_PERMISSION_IMPORT = 1 private val STORAGE_PERMISSION_IMPORT = 1
private val STORAGE_PERMISSION_EXPORT = 2 private val STORAGE_PERMISSION_EXPORT = 2

13
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
View File

@ -61,7 +61,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
for (i in 0..DAYS_CNT - 1) { for (i in 0..DAYS_CNT - 1) {
if (i < firstDayIndex) { if (i < firstDayIndex) {
isThisMonth = false isThisMonth = false
curDay = mTargetDate.minusMonths(1) curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
} else if (i == firstDayIndex) { } else if (i == firstDayIndex) {
value = 1 value = 1
isThisMonth = true isThisMonth = true
@ -69,7 +69,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
} else if (value == currMonthDays + 1) { } else if (value == currMonthDays + 1) {
value = 1 value = 1
isThisMonth = false isThisMonth = false
curDay = mTargetDate.plusMonths(1) curDay = mTargetDate.withDayOfMonth(1).plusMonths(1)
} }
isToday = isThisMonth && isToday(mTargetDate, value) isToday = isThisMonth && isToday(mTargetDate, value)
@ -124,8 +124,13 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
} }
} }
private fun isToday(targetDate: DateTime, curDayInMonth: Int) = private fun isToday(targetDate: DateTime, curDayInMonth: Int): Boolean {
targetDate.withDayOfMonth(curDayInMonth).toString(Formatter.DAYCODE_PATTERN) == mToday try {
return targetDate.withDayOfMonth(curDayInMonth).toString(Formatter.DAYCODE_PATTERN) == mToday
} catch(ignored: Exception) {
return false
}
}
private val monthName: String private val monthName: String
get() { get() {