wbrawner/Simple-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1579 from Aga-C/squash-multiple-lines

Browse source 
Squashed multiple lines of description on event list (#1379)
This commit is contained in:
Tibor Kaputa 2021-12-20 19:49:39 +01:00 committed by GitHub
commit 1d2cd13942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt
View file

@ -89,7 +89,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
event_item_time.text = "${event_item_time.text} - ${Formatter.getTimeFromTS(context, event.endTS)}"
}
event_item_description.text = if (replaceDescriptionWithLocation) event.location else event.description
event_item_description.text = if (replaceDescriptionWithLocation) event.location else event.description.replace("\n", " ")
event_item_description.beVisibleIf(displayDescription && event_item_description.text.isNotEmpty())
event_item_color_bar.background.applyColorFilter(event.color)

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt
View file

@ -147,7 +147,7 @@ class EventListAdapter(
}
}
event_item_description.text = if (replaceDescription) listEvent.location else listEvent.description
event_item_description.text = if (replaceDescription) listEvent.location else listEvent.description.replace("\n", " ")
event_item_description.beVisibleIf(displayDescription && event_item_description.text.isNotEmpty())
event_item_color_bar.background.applyColorFilter(listEvent.color)

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListWidgetAdapter.kt
View file

@ -92,7 +92,7 @@ class EventListWidgetAdapter(val context: Context) : RemoteViewsService.RemoteVi
setText(R.id.event_item_time, timeText)
// we cannot change the event_item_color_bar rules dynamically, so do it like this
val descriptionText = if (replaceDescription) item.location else item.description
val descriptionText = if (replaceDescription) item.location else item.description.replace("\n", " ")
if (displayDescription && descriptionText.isNotEmpty()) {
setText(R.id.event_item_time, "$timeText\n$descriptionText")
}