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

formatting some code and removing warnings

Browse Source
This commit is contained in:
Tibor Kaputa
2022-02-09 11:25:44 +01:00
committed by GitHub
parent 3db07639bf
commit a5a9ed667b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
View File

@@ -461,7 +461,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} }
eventTimeRanges.forEach { daycode, eventDayList -> eventTimeRanges.forEach { daycode, eventDayList ->
var eventsCollisionChecked = ArrayList<Long>() val eventsCollisionChecked = ArrayList<Long>()
eventDayList.forEach { eventId, eventWeeklyView -> eventDayList.forEach { eventId, eventWeeklyView ->
if (eventWeeklyView.slot == 0) { if (eventWeeklyView.slot == 0) {
eventWeeklyView.slot = 1 eventWeeklyView.slot = 1
@@ -474,14 +474,14 @@ class WeekFragment : Fragment(), WeeklyCalendar {
if (eventWeeklyView.range.touch(eventWeeklyViewToCheck.range)) { if (eventWeeklyView.range.touch(eventWeeklyViewToCheck.range)) {
if (eventWeeklyViewToCheck.slot == 0) { if (eventWeeklyViewToCheck.slot == 0) {
val nextSlot = eventWeeklyView.slot_max + 1 val nextSlot = eventWeeklyView.slot_max + 1
val slotRange = Array<Int>(eventWeeklyView.slot_max) {it+1} val slotRange = Array(eventWeeklyView.slot_max) { it + 1 }
val collisionEventWeeklyViews = eventDayList.filter {eventWeeklyView.collisions.contains(it.key)} val collisionEventWeeklyViews = eventDayList.filter { eventWeeklyView.collisions.contains(it.key) }
collisionEventWeeklyViews.forEach { collision_id, collisionEventWeeklyView -> collisionEventWeeklyViews.forEach { collision_id, collisionEventWeeklyView ->
if (collisionEventWeeklyView.range.touch(eventWeeklyViewToCheck.range)) { if (collisionEventWeeklyView.range.touch(eventWeeklyViewToCheck.range)) {
slotRange[collisionEventWeeklyView.slot - 1] = nextSlot slotRange[collisionEventWeeklyView.slot - 1] = nextSlot
} }
} }
slotRange[eventWeeklyView.slot-1] = nextSlot slotRange[eventWeeklyView.slot - 1] = nextSlot
val slot = slotRange.minOrNull() val slot = slotRange.minOrNull()
eventWeeklyViewToCheck.slot = slot!! eventWeeklyViewToCheck.slot = slot!!
if (slot == nextSlot) { if (slot == nextSlot) {
@@ -490,8 +490,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
collisionEventWeeklyViews.forEach { collision_id, collisionEventWeeklyView -> collisionEventWeeklyViews.forEach { collision_id, collisionEventWeeklyView ->
collisionEventWeeklyView.slot_max++ collisionEventWeeklyView.slot_max++
} }
} } else {
else {
eventWeeklyViewToCheck.slot_max = eventWeeklyView.slot_max eventWeeklyViewToCheck.slot_max = eventWeeklyView.slot_max
} }
} }
@@ -535,9 +534,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
dayColumn.addView(this) dayColumn.addView(this)
y = currentEventWeeklyView!!.range.lower * minuteHeight y = currentEventWeeklyView!!.range.lower * minuteHeight
(layoutParams as RelativeLayout.LayoutParams).apply { (layoutParams as RelativeLayout.LayoutParams).apply {
width = (dayColumn.width - 1) / currentEventWeeklyView!!.slot_max width = (dayColumn.width - 1) / currentEventWeeklyView.slot_max
x = (width * (currentEventWeeklyView!!.slot - 1)).toFloat() x = (width * (currentEventWeeklyView.slot - 1)).toFloat()
if (currentEventWeeklyView!!.slot > 1) { if (currentEventWeeklyView.slot > 1) {
x += density x += density
width -= density width -= density
} }