From 1667d9c22c6dd28f695ff652be5e38c0f8192209 Mon Sep 17 00:00:00 2001 From: azuo Date: Wed, 29 Dec 2021 23:45:32 +0800 Subject: [PATCH] Show the correct date for all-day events in the coming year --- .../anotherwidget/ui/widgets/AlignedWidget.kt | 12 +++--------- .../anotherwidget/ui/widgets/StandardWidget.kt | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt index e498fe4..c5dbdc1 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt @@ -496,8 +496,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) { context, now.timeInMillis, nextEvent.startDate - ) - .toLowerCase(Locale.getDefault()) + ).toLowerCase(Locale.getDefault()) } else { SettingsStringHelper.getAllDayEventDifferenceText( context, @@ -577,11 +576,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) { } else { val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate } - bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get( - Calendar.DAY_OF_YEAR)) { - DateHelper.getDateText(context, start) - } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get( - Calendar.YEAR) > start.get(Calendar.YEAR)) { + bindingView.subLineText.text = if (now.after(start)) { DateHelper.getDateText(context, now) } else { DateHelper.getDateText(context, start) @@ -716,8 +711,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) { context, now.timeInMillis, nextEvent.startDate - ) - .toLowerCase(Locale.getDefault()) + ).toLowerCase(Locale.getDefault()) } else { SettingsStringHelper.getAllDayEventDifferenceText( context, diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt index d9b1e83..b066fe6 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt @@ -528,8 +528,7 @@ class StandardWidget(val context: Context) { context, now.timeInMillis, nextEvent.startDate - ) - .toLowerCase(Locale.getDefault()) + ).toLowerCase(Locale.getDefault()) } else { SettingsStringHelper.getAllDayEventDifferenceText( context, @@ -609,11 +608,7 @@ class StandardWidget(val context: Context) { } else { val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate } - bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get( - Calendar.DAY_OF_YEAR)) { - DateHelper.getDateText(context, start) - } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get( - Calendar.YEAR) > start.get(Calendar.YEAR)) { + bindingView.subLineText.text = if (now.after(start)) { DateHelper.getDateText(context, now) } else { DateHelper.getDateText(context, start) @@ -748,8 +743,7 @@ class StandardWidget(val context: Context) { context, now.timeInMillis, nextEvent.startDate - ) - .toLowerCase(Locale.getDefault()) + ).toLowerCase(Locale.getDefault()) } else { SettingsStringHelper.getAllDayEventDifferenceText( context,