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

renaming a variable

Browse Source
This commit is contained in:
tibbi
2020-06-08 19:16:30 +02:00
parent 1e214d58a7
commit e6df4e9f31
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,8 +388,6 @@ class WeekFragment : Fragment(), WeeklyCalendar {
continue continue
} }
val layout = dayColumns[dayOfWeek]
val startMinutes = startDateTime.minuteOfDay val startMinutes = startDateTime.minuteOfDay
val duration = endDateTime.minuteOfDay - startMinutes val duration = endDateTime.minuteOfDay - startMinutes
val range = Range(startMinutes, startMinutes + duration) val range = Range(startMinutes, startMinutes + duration)
@@ -412,6 +410,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} }
} }
val dayColumn = dayColumns[dayOfWeek]
(inflater.inflate(R.layout.week_event_marker, null, false) as TextView).apply { (inflater.inflate(R.layout.week_event_marker, null, false) as TextView).apply {
var backgroundColor = eventTypeColors.get(event.eventType, primaryColor) var backgroundColor = eventTypeColors.get(event.eventType, primaryColor)
var textColor = backgroundColor.getContrastColor() var textColor = backgroundColor.getContrastColor()
@@ -424,10 +423,10 @@ class WeekFragment : Fragment(), WeeklyCalendar {
setTextColor(textColor) setTextColor(textColor)
text = event.title text = event.title
contentDescription = text contentDescription = text
layout.addView(this) dayColumn.addView(this)
y = startMinutes * minuteHeight y = startMinutes * minuteHeight
(layoutParams as RelativeLayout.LayoutParams).apply { (layoutParams as RelativeLayout.LayoutParams).apply {
width = layout.width - 1 width = dayColumn.width - 1
width /= Math.max(overlappingEvents, 1) width /= Math.max(overlappingEvents, 1)
if (overlappingEvents > 1) { if (overlappingEvents > 1) {
x = width * currentEventOverlapIndex.toFloat() x = width * currentEventOverlapIndex.toFloat()