dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Show the correct date for all-day events in the coming year

Browse Source
This commit is contained in:
azuo 2021-12-29 23:45:32 +08:00
parent fb3f28d035
commit 1667d9c22c
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
View File

@ -496,8 +496,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
context, context,
now.timeInMillis, now.timeInMillis,
nextEvent.startDate nextEvent.startDate
) ).toLowerCase(Locale.getDefault())
.toLowerCase(Locale.getDefault())
} else { } else {
SettingsStringHelper.getAllDayEventDifferenceText( SettingsStringHelper.getAllDayEventDifferenceText(
context, context,
@ -577,11 +576,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
} else { } else {
val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate } val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get( bindingView.subLineText.text = if (now.after(start)) {
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)) {
DateHelper.getDateText(context, now) DateHelper.getDateText(context, now)
} else { } else {
DateHelper.getDateText(context, start) DateHelper.getDateText(context, start)
@ -716,8 +711,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
context, context,
now.timeInMillis, now.timeInMillis,
nextEvent.startDate nextEvent.startDate
) ).toLowerCase(Locale.getDefault())
.toLowerCase(Locale.getDefault())
} else { } else {
SettingsStringHelper.getAllDayEventDifferenceText( SettingsStringHelper.getAllDayEventDifferenceText(
context, context,

12
app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
View File

@ -528,8 +528,7 @@ class StandardWidget(val context: Context) {
context, context,
now.timeInMillis, now.timeInMillis,
nextEvent.startDate nextEvent.startDate
) ).toLowerCase(Locale.getDefault())
.toLowerCase(Locale.getDefault())
} else { } else {
SettingsStringHelper.getAllDayEventDifferenceText( SettingsStringHelper.getAllDayEventDifferenceText(
context, context,
@ -609,11 +608,7 @@ class StandardWidget(val context: Context) {
} else { } else {
val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate } val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get( bindingView.subLineText.text = if (now.after(start)) {
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)) {
DateHelper.getDateText(context, now) DateHelper.getDateText(context, now)
} else { } else {
DateHelper.getDateText(context, start) DateHelper.getDateText(context, start)
@ -748,8 +743,7 @@ class StandardWidget(val context: Context) {
context, context,
now.timeInMillis, now.timeInMillis,
nextEvent.startDate nextEvent.startDate
) ).toLowerCase(Locale.getDefault())
.toLowerCase(Locale.getDefault())
} else { } else {
SettingsStringHelper.getAllDayEventDifferenceText( SettingsStringHelper.getAllDayEventDifferenceText(
context, context,