fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Squashed multiple lines of description on event list (#1379)

This commit is contained in:
Agnieszka C 2021-12-14 11:58:03 +01:00
parent 3c6e853156
commit 9efb94ee06
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_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_description.beVisibleIf(displayDescription && event_item_description.text.isNotEmpty())
event_item_color_bar.background.applyColorFilter(event.color) 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_description.beVisibleIf(displayDescription && event_item_description.text.isNotEmpty())
event_item_color_bar.background.applyColorFilter(listEvent.color) 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) setText(R.id.event_item_time, timeText)
// we cannot change the event_item_color_bar rules dynamically, so do it like this // 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()) { if (displayDescription && descriptionText.isNotEmpty()) {
setText(R.id.event_item_time, "$timeText\n$descriptionText") setText(R.id.event_item_time, "$timeText\n$descriptionText")
} }