Skip to content

fix: Monthly widget doesn't show multiple-day events properly #15 #1068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
P4u14 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Monthly widget doesn't show multiple-day events properly #15 #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf9d1d1
#15 adapt styling for multi-day events on monthlyWidget to look like …
Feb 20, 2026
ae554ff
refactor to avoid exceeding method length
Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 97 additions & 28 deletions app/src/main/kotlin/org/fossify/calendar/helpers/MyWidgetMonthlyProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
val dimCompletedTasks = context.config.dimCompletedTasks
val smallerFontSize = context.getWidgetFontSize() - 3f
val res = context.resources
val len = days.size
val packageName = context.packageName
views.apply {
setTextColor(R.id.week_num, textColor)
Expand All @@ -117,51 +116,121 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
}
}

for (i in 0 until len) {
val day = days[i]
val eventDayIndices = mutableMapOf<Pair<Long, Long>, MutableList<Int>>()
val eventByKey = mutableMapOf<Pair<Long, Long>, Event>()
for (i in days.indices) {
for (event in days[i].dayEvents) {
val key = Pair(event.id ?: 0L, event.startTS)
eventDayIndices.getOrPut(key) { mutableListOf() }.add(i)
if (key !in eventByKey) eventByKey[key] = event
}
}

val sortedKeys = eventDayIndices.keys.sortedWith(
compareBy(
{ -(eventDayIndices[it]!!.size) },
{ (eventByKey[it]!!.flags and FLAG_ALL_DAY) == 0 },
{ eventByKey[it]!!.startTS },
{ eventByKey[it]!!.endTS },
{ eventDayIndices[it]!!.firstOrNull() ?: 0 },
{ eventByKey[it]!!.title }
)
)

val daySlotLists = buildDaySlotLists(days.size, sortedKeys, eventDayIndices, eventByKey)

val titleShownForKey = mutableSetOf<Pair<Long, Long>>()
for (i in days.indices) {
val day = days[i]
val dayTextColor = if (context.config.highlightWeekends && day.isWeekend) {
context.config.highlightWeekendsColor
} else {
textColor
}

val weakTextColor = dayTextColor.adjustAlpha(MEDIUM_ALPHA)
val currTextColor = if (day.isThisMonth) dayTextColor else weakTextColor
val id = res.getIdentifier("day_$i", "id", packageName)
views.removeAllViews(id)
addDayNumber(context, views, day, currTextColor, id)
setupDayOpenIntent(context, views, id, day.code)

day.dayEvents = day.dayEvents.asSequence().sortedWith(compareBy({ it.flags and FLAG_ALL_DAY == 0 }, { it.startTS }, { it.title }))
.toMutableList() as ArrayList<Event>

day.dayEvents.forEach {
val backgroundColor = it.color
var eventTextColor = backgroundColor.getContrastColor()
val shouldDim = (it.isTask() && it.isTaskCompleted() && dimCompletedTasks)
|| (dimPastEvents && it.isPastEvent && !it.isTask())
if (shouldDim) {
eventTextColor = eventTextColor.adjustAlpha(MEDIUM_ALPHA)
for (slotEvent in daySlotLists[i]) {
if (slotEvent == null) {
views.addView(id, createSpacerView(packageName))
} else {
val key = Pair(slotEvent.id ?: 0L, slotEvent.startTS)
val showTitle = titleShownForKey.add(key) || i % 7 == 0
var eventTextColor = slotEvent.color.getContrastColor()
val shouldDim = (slotEvent.isTask() && slotEvent.isTaskCompleted() && dimCompletedTasks)
|| (dimPastEvents && slotEvent.isPastEvent && !slotEvent.isTask())
if (shouldDim) {
eventTextColor = eventTextColor.adjustAlpha(MEDIUM_ALPHA)
}
val dayIndices = eventDayIndices[key]!!
val prevInRun = i > 0 && i % 7 != 0 && dayIndices.contains(i - 1)
val nextInRun = i < days.size - 1 && (i + 1) % 7 != 0 && dayIndices.contains(i + 1)
val eventLayout = when {
prevInRun && nextInRun -> R.layout.day_monthly_event_view_widget_event_middle
prevInRun -> R.layout.day_monthly_event_view_widget_event_end
nextInRun -> R.layout.day_monthly_event_view_widget_event_start
else -> R.layout.day_monthly_event_view_widget
}
val newRemoteView = RemoteViews(packageName, eventLayout).apply {
setTextColor(R.id.day_monthly_event_id, eventTextColor)
setTextSize(R.id.day_monthly_event_id, smallerFontSize - 3f)
setInt(R.id.day_monthly_event_background, "setColorFilter", slotEvent.color)
if (showTitle) {
setText(R.id.day_monthly_event_id, slotEvent.title.replace(" ", "\u00A0"))
setVisibleIf(R.id.day_monthly_task_image, slotEvent.isTask())
applyColorFilter(R.id.day_monthly_task_image, eventTextColor)
if (slotEvent.shouldStrikeThrough()) {
setInt(R.id.day_monthly_event_id, "setPaintFlags", Paint.ANTI_ALIAS_FLAG or Paint.STRIKE_THRU_TEXT_FLAG)
} else {
setInt(R.id.day_monthly_event_id, "setPaintFlags", Paint.ANTI_ALIAS_FLAG)
}
} else {
setText(R.id.day_monthly_event_id, "")
setVisibleIf(R.id.day_monthly_task_image, false)
setInt(R.id.day_monthly_event_id, "setPaintFlags", Paint.ANTI_ALIAS_FLAG)
}
}
views.addView(id, newRemoteView)
}
}
}
}

val newRemoteView = RemoteViews(packageName, R.layout.day_monthly_event_view_widget).apply {
setText(R.id.day_monthly_event_id, it.title.replace(" ", "\u00A0"))
setTextColor(R.id.day_monthly_event_id, eventTextColor)
setTextSize(R.id.day_monthly_event_id, smallerFontSize - 3f)
setVisibleIf(R.id.day_monthly_task_image, it.isTask())
applyColorFilter(R.id.day_monthly_task_image, eventTextColor)
setInt(R.id.day_monthly_event_background, "setColorFilter", it.color)

if (it.shouldStrikeThrough()) {
setInt(R.id.day_monthly_event_id, "setPaintFlags", Paint.ANTI_ALIAS_FLAG or Paint.STRIKE_THRU_TEXT_FLAG)
} else {
setInt(R.id.day_monthly_event_id, "setPaintFlags", Paint.ANTI_ALIAS_FLAG)
}
private fun buildDaySlotLists(
daysSize: Int,
sortedKeys: List<Pair<Long, Long>>,
eventDayIndices: Map<Pair<Long, Long>, List<Int>>,
eventByKey: Map<Pair<Long, Long>, Event>
): Array<MutableList<Event?>> {
val daySlotIndex = IntArray(daysSize) { 0 }
val daySlotLists = Array(daysSize) { mutableListOf<Event?>() }
for (key in sortedKeys) {
val dayIndices = eventDayIndices[key]!!
val event = eventByKey[key]!!
val slot = dayIndices.maxOf { daySlotIndex[it] }
for (dayIdx in dayIndices) {
while (daySlotIndex[dayIdx] < slot) {
daySlotLists[dayIdx].add(null) // invisible spacer
daySlotIndex[dayIdx]++
}
views.addView(id, newRemoteView)
daySlotLists[dayIdx].add(event)
daySlotIndex[dayIdx]++
}
}
return daySlotLists
}

private fun createSpacerView(packageName: String): RemoteViews {
return RemoteViews(packageName, R.layout.day_monthly_event_view_widget).apply {
setText(R.id.day_monthly_event_id, " ")
setViewVisibility(R.id.day_monthly_event_background, View.INVISIBLE)
setViewVisibility(R.id.day_monthly_task_image, View.GONE)
setInt(R.id.day_monthly_event_id, "setPaintFlags", Paint.ANTI_ALIAS_FLAG)
}
}

private fun addDayNumber(context: Context, views: RemoteViews, day: DayMonthly, textColor: Int, id: Int) {
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/day_monthly_event_background_widget_end.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:topLeftRadius="0dp"
android:bottomLeftRadius="0dp"
android:topRightRadius="2dp"
android:bottomRightRadius="2dp" />
<solid android:color="@android:color/white" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/day_monthly_event_background_widget_middle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/white" />
</shape>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/day_monthly_event_background_widget_start.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:topLeftRadius="2dp"
android:bottomLeftRadius="2dp"
android:topRightRadius="0dp"
android:bottomRightRadius="0dp" />
<solid android:color="@android:color/white" />
</shape>
49 changes: 49 additions & 0 deletions app/src/main/res/layout/day_monthly_event_view_widget_event_end.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/day_monthly_event_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/day_monthly_event_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/day_monthly_event_id"
android:layout_marginTop="@dimen/one_dp"
android:layout_marginBottom="@dimen/one_dp"
android:layout_marginStart="0dp"
android:layout_marginEnd="@dimen/one_dp"
android:contentDescription="@null"
android:src="@drawable/day_monthly_event_background_widget_end" />

<ImageView
android:id="@+id/day_monthly_task_image"
android:layout_width="@dimen/activity_margin"
android:layout_height="@dimen/activity_margin"
android:layout_alignTop="@+id/day_monthly_event_id"
android:layout_alignBottom="@+id/day_monthly_event_id"
android:adjustViewBounds="true"
android:contentDescription="@string/task"
android:paddingStart="@dimen/one_dp"
android:paddingTop="@dimen/one_dp"
android:paddingBottom="@dimen/one_dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_task_vector" />

<TextView
android:id="@+id/day_monthly_event_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/day_monthly_task_image"
android:ellipsize="none"
android:gravity="start"
android:hyphenationFrequency="none"
android:maxLines="1"
android:paddingStart="@dimen/tiny_margin"
android:paddingEnd="@dimen/tiny_margin"
android:textSize="@dimen/day_monthly_text_size"
tools:targetApi="m"
tools:text="My event" />

</RelativeLayout>
49 changes: 49 additions & 0 deletions app/src/main/res/layout/day_monthly_event_view_widget_event_middle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/day_monthly_event_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/day_monthly_event_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/day_monthly_event_id"
android:layout_marginTop="@dimen/one_dp"
android:layout_marginBottom="@dimen/one_dp"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:contentDescription="@null"
android:src="@drawable/day_monthly_event_background_widget_middle" />

<ImageView
android:id="@+id/day_monthly_task_image"
android:layout_width="@dimen/activity_margin"
android:layout_height="@dimen/activity_margin"
android:layout_alignTop="@+id/day_monthly_event_id"
android:layout_alignBottom="@+id/day_monthly_event_id"
android:adjustViewBounds="true"
android:contentDescription="@string/task"
android:paddingStart="@dimen/one_dp"
android:paddingTop="@dimen/one_dp"
android:paddingBottom="@dimen/one_dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_task_vector" />

<TextView
android:id="@+id/day_monthly_event_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/day_monthly_task_image"
android:ellipsize="none"
android:gravity="start"
android:hyphenationFrequency="none"
android:maxLines="1"
android:paddingStart="@dimen/tiny_margin"
android:paddingEnd="@dimen/tiny_margin"
android:textSize="@dimen/day_monthly_text_size"
tools:targetApi="m"
tools:text="My event" />

</RelativeLayout>
49 changes: 49 additions & 0 deletions app/src/main/res/layout/day_monthly_event_view_widget_event_start.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/day_monthly_event_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/day_monthly_event_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/day_monthly_event_id"
android:layout_marginTop="@dimen/one_dp"
android:layout_marginBottom="@dimen/one_dp"
android:layout_marginStart="@dimen/one_dp"
android:layout_marginEnd="0dp"
android:contentDescription="@null"
android:src="@drawable/day_monthly_event_background_widget_start" />

<ImageView
android:id="@+id/day_monthly_task_image"
android:layout_width="@dimen/activity_margin"
android:layout_height="@dimen/activity_margin"
android:layout_alignTop="@+id/day_monthly_event_id"
android:layout_alignBottom="@+id/day_monthly_event_id"
android:adjustViewBounds="true"
android:contentDescription="@string/task"
android:paddingStart="@dimen/one_dp"
android:paddingTop="@dimen/one_dp"
android:paddingBottom="@dimen/one_dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_task_vector" />

<TextView
android:id="@+id/day_monthly_event_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/day_monthly_task_image"
android:ellipsize="none"
android:gravity="start"
android:hyphenationFrequency="none"
android:maxLines="1"
android:paddingStart="@dimen/tiny_margin"
android:paddingEnd="@dimen/tiny_margin"
android:textSize="@dimen/day_monthly_text_size"
tools:targetApi="m"
tools:text="My event" />

</RelativeLayout>
Loading