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

optimize monthly layout drawing

This commit is contained in:
tibbi 2017-10-07 21:24:21 +02:00
parent 381b2bc999
commit b8f53d97c2
1 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
private val mToday: String = DateTime().toString(Formatter.DAYCODE_PATTERN)
private var mEvents = ArrayList<Event>()
private var days = ArrayList<DayMonthly>(DAYS_CNT)
var mFilterEventTypes = true
lateinit var mTargetDate: DateTime
@ -37,47 +38,51 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
}
fun getDays() {
val days = ArrayList<DayMonthly>(DAYS_CNT)
if (days.isEmpty()) {
val currMonthDays = mTargetDate.dayOfMonth().maximumValue
var firstDayIndex = mTargetDate.withDayOfMonth(1).dayOfWeek
if (!mContext.config.isSundayFirst)
firstDayIndex -= 1
val prevMonthDays = mTargetDate.minusMonths(1).dayOfMonth().maximumValue
val currMonthDays = mTargetDate.dayOfMonth().maximumValue
var firstDayIndex = mTargetDate.withDayOfMonth(1).dayOfWeek
if (!mContext.config.isSundayFirst)
firstDayIndex -= 1
val prevMonthDays = mTargetDate.minusMonths(1).dayOfMonth().maximumValue
var isThisMonth = false
var isToday: Boolean
var value = prevMonthDays - firstDayIndex + 1
var curDay: DateTime = mTargetDate
var isThisMonth = false
var isToday: Boolean
var value = prevMonthDays - firstDayIndex + 1
var curDay: DateTime = mTargetDate
for (i in 0 until DAYS_CNT) {
when {
i < firstDayIndex -> {
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
}
i == firstDayIndex -> {
value = 1
isThisMonth = true
curDay = mTargetDate
}
value == currMonthDays + 1 -> {
value = 1
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).plusMonths(1)
}
}
for (i in 0 until DAYS_CNT) {
when {
i < firstDayIndex -> {
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
}
i == firstDayIndex -> {
value = 1
isThisMonth = true
curDay = mTargetDate
}
value == currMonthDays + 1 -> {
value = 1
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).plusMonths(1)
}
isToday = isThisMonth && isToday(mTargetDate, value)
val newDay = curDay.withDayOfMonth(value)
val dayCode = Formatter.getDayCodeFromDateTime(newDay)
val day = DayMonthly(value, isThisMonth, isToday, dayCode, newDay.weekOfWeekyear, ArrayList())
days.add(day)
value++
}
isToday = isThisMonth && isToday(mTargetDate, value)
val newDay = curDay.withDayOfMonth(value)
val dayCode = Formatter.getDayCodeFromDateTime(newDay)
val day = DayMonthly(value, isThisMonth, isToday, dayCode, newDay.weekOfWeekyear, ArrayList())
days.add(day)
value++
}
markDaysWithEvents(days)
if (mEvents.isEmpty()) {
mCallback.updateMonthlyCalendar(monthName, days)
} else {
markDaysWithEvents(days)
}
}
// it works more often than not, dont touch