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

fix #531, set LinkMovementDescriptor only if event Description is empty

This commit is contained in:
tibbi 2018-07-04 14:43:07 +02:00
parent 3f0c5b83fc
commit 0ff1457aee
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@ -146,7 +146,9 @@ class EventActivity : SimpleActivity() {
event_title.setText(mEvent.title) event_title.setText(mEvent.title)
event_location.setText(mEvent.location) event_location.setText(mEvent.location)
event_description.setText(mEvent.description) event_description.setText(mEvent.description)
event_description.movementMethod = LinkMovementMethod.getInstance() if (event_description.value.isNotEmpty()) {
event_description.movementMethod = LinkMovementMethod.getInstance()
}
mReminder1Minutes = mEvent.reminder1Minutes mReminder1Minutes = mEvent.reminder1Minutes
mReminder2Minutes = mEvent.reminder2Minutes mReminder2Minutes = mEvent.reminder2Minutes
@ -175,7 +177,9 @@ class EventActivity : SimpleActivity() {
event_title.setText(intent.getStringExtra("title")) event_title.setText(intent.getStringExtra("title"))
event_location.setText(intent.getStringExtra("eventLocation")) event_location.setText(intent.getStringExtra("eventLocation"))
event_description.setText(intent.getStringExtra("description")) event_description.setText(intent.getStringExtra("description"))
event_description.movementMethod = LinkMovementMethod.getInstance() if (event_description.value.isNotEmpty()) {
event_description.movementMethod = LinkMovementMethod.getInstance()
}
} else { } else {
val startTS = intent.getIntExtra(NEW_EVENT_START_TS, 0) val startTS = intent.getIntExtra(NEW_EVENT_START_TS, 0)
val dateTime = Formatter.getDateTimeFromTS(startTS) val dateTime = Formatter.getDateTimeFromTS(startTS)