fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix a glitch at updating synced events

Browse Source
This commit is contained in:
tibbi
2017-10-08 19:04:03 +02:00
parent 669a931224
commit 0c1c752260
3 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@@ -136,6 +136,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
val addHours = if (intent.getBooleanExtra(NEW_EVENT_SET_HOUR_DURATION, false)) 1 else 0 val addHours = if (intent.getBooleanExtra(NEW_EVENT_SET_HOUR_DURATION, false)) 1 else 0
mEventEndDateTime = mEventStartDateTime.plusHours(addHours) mEventEndDateTime = mEventStartDateTime.plusHours(addHours)
mEventCalendarId = config.lastUsedCaldavCalendar
} }
private fun showReminder1Dialog() { private fun showReminder1Dialog() {

2
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
View File

@@ -76,7 +76,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
mCalendar.apply { mCalendar.apply {
mTargetDate = Formatter.getDateTimeFromCode(mDayCode) mTargetDate = Formatter.getDateTimeFromCode(mDayCode)
getDays() // prefill the screen asap, even if without events getDays(false) // prefill the screen asap, even if without events
} }
updateCalendar() updateCalendar()
} }

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

@@ -18,7 +18,6 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
private val mToday: String = DateTime().toString(Formatter.DAYCODE_PATTERN) private val mToday: String = DateTime().toString(Formatter.DAYCODE_PATTERN)
private var mEvents = ArrayList<Event>() private var mEvents = ArrayList<Event>()
private var days = ArrayList<DayMonthly>(DAYS_CNT)
private var mFilterEventTypes = true private var mFilterEventTypes = true
lateinit var mTargetDate: DateTime lateinit var mTargetDate: DateTime
@@ -34,55 +33,53 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
} }
fun getMonth(targetDate: DateTime) { fun getMonth(targetDate: DateTime) {
days.clear()
updateMonthlyCalendar(targetDate) updateMonthlyCalendar(targetDate)
} }
fun getDays() { fun getDays(markDaysWithEvents: Boolean) {
if (days.isEmpty()) { val days = ArrayList<DayMonthly>(DAYS_CNT)
val currMonthDays = mTargetDate.dayOfMonth().maximumValue val currMonthDays = mTargetDate.dayOfMonth().maximumValue
var firstDayIndex = mTargetDate.withDayOfMonth(1).dayOfWeek var firstDayIndex = mTargetDate.withDayOfMonth(1).dayOfWeek
if (!mContext.config.isSundayFirst) if (!mContext.config.isSundayFirst)
firstDayIndex -= 1 firstDayIndex -= 1
val prevMonthDays = mTargetDate.minusMonths(1).dayOfMonth().maximumValue val prevMonthDays = mTargetDate.minusMonths(1).dayOfMonth().maximumValue
var isThisMonth = false var isThisMonth = false
var isToday: Boolean var isToday: Boolean
var value = prevMonthDays - firstDayIndex + 1 var value = prevMonthDays - firstDayIndex + 1
var curDay: DateTime = mTargetDate var curDay: DateTime = mTargetDate
for (i in 0 until DAYS_CNT) { for (i in 0 until DAYS_CNT) {
when { when {
i < firstDayIndex -> { i < firstDayIndex -> {
isThisMonth = false isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).minusMonths(1) curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
} }
i == firstDayIndex -> { i == firstDayIndex -> {
value = 1 value = 1
isThisMonth = true isThisMonth = true
curDay = mTargetDate curDay = mTargetDate
} }
value == currMonthDays + 1 -> { value == currMonthDays + 1 -> {
value = 1 value = 1
isThisMonth = false isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).plusMonths(1) 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++
} }
if (mEvents.isEmpty()) { if (markDaysWithEvents) {
mCallback.updateMonthlyCalendar(monthName, days)
} else {
markDaysWithEvents(days) markDaysWithEvents(days)
} else {
mCallback.updateMonthlyCalendar(monthName, days)
} }
} }
@@ -133,11 +130,12 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
} }
private fun gotEvents(events: ArrayList<Event>) { private fun gotEvents(events: ArrayList<Event>) {
mEvents = if (mFilterEventTypes) mEvents = if (mFilterEventTypes) {
mContext.getFilteredEvents(events) as ArrayList<Event> mContext.getFilteredEvents(events) as ArrayList<Event>
else } else {
events events
}
getDays() getDays(true)
} }
} }