Skip to content

Fix DateRange used directly as key in stickyHeader (fixes #64) #65

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

Merged
opatry merged 1 commit into from
Oct 15, 2024
Merged

Fix DateRange used directly as key in stickyHeader (fixes #64) #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tasks-app-shared/src/commonMain/kotlin/net/opatry/tasks/app/ui/TaskListsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private fun TaskListDataModel.asTaskListUIModel(): TaskListUIModel {
.groupBy { task ->
when (task.dateRange) {
// merge all overdue tasks to the same range
is DateRange.Overdue -> DateRange.Overdue(LocalDate.fromEpochDays(-1), 1)
is DateRange.Overdue -> DateRange.Overdue(LocalDate.fromEpochDays(0), -1)
else -> task.dateRange
}
}
Expand Down
14 changes: 11 additions & 3 deletions tasks-app-shared/src/commonMain/kotlin/net/opatry/tasks/app/ui/screen/tasksPane.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ fun TasksColumn(

taskList.remainingTasks.forEach { (dateRange, tasks) ->
if (dateRange != null) {
stickyHeader(key = dateRange) {
stickyHeader(key = dateRange.key) {
Box(
Modifier
.fillMaxWidth()
Expand Down Expand Up @@ -689,8 +689,16 @@ fun TasksColumn(
}
}

private val DateRange.key: String
get() = when (this) {
is DateRange.Overdue -> "overdue${numberOfDays}"
is DateRange.Today -> "today"
is DateRange.Later -> "later${numberOfDays}"
DateRange.None -> "none"
}

@Composable
fun DateRange?.toColor(): Color = when (this) {
private fun DateRange?.toColor(): Color = when (this) {
is DateRange.Overdue -> MaterialTheme.colorScheme.error
is DateRange.Today -> MaterialTheme.colorScheme.primary
is DateRange.Later,
Expand All @@ -699,7 +707,7 @@ fun DateRange?.toColor(): Color = when (this) {
}

@Composable
fun DateRange.toLabel(sectionLabel: Boolean = false): String = when (this) {
private fun DateRange.toLabel(sectionLabel: Boolean = false): String = when (this) {
is DateRange.Overdue -> {
val numberOfDays = abs(numberOfDays)
when {
Expand Down