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

use a contrast text color if the background is the primary color

This commit is contained in:
tibbi 2017-10-23 16:33:16 +02:00
parent d162441edc
commit e2327dd1a6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
View File

@ -22,7 +22,9 @@ import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.interfaces.WeeklyCalendar import com.simplemobiletools.calendar.interfaces.WeeklyCalendar
import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.calendar.views.MyScrollView import com.simplemobiletools.calendar.views.MyScrollView
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.beGone import com.simplemobiletools.commons.extensions.beGone
import com.simplemobiletools.commons.extensions.getContrastColor
import kotlinx.android.synthetic.main.fragment_week.* import kotlinx.android.synthetic.main.fragment_week.*
import kotlinx.android.synthetic.main.fragment_week.view.* import kotlinx.android.synthetic.main.fragment_week.view.*
import org.joda.time.DateTime import org.joda.time.DateTime
@ -266,7 +268,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val duration = endDateTime.minuteOfDay - startMinutes val duration = endDateTime.minuteOfDay - startMinutes
(inflater.inflate(R.layout.week_event_marker, null, false) as TextView).apply { (inflater.inflate(R.layout.week_event_marker, null, false) as TextView).apply {
background = ColorDrawable(MainActivity.eventTypeColors.get(event.eventType, primaryColor)) val backgroundColor = MainActivity.eventTypeColors.get(event.eventType, primaryColor)
background = ColorDrawable(backgroundColor)
setTextColor(backgroundColor.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
text = event.title text = event.title
layout.addView(this) layout.addView(this)
y = startMinutes * minuteHeight y = startMinutes * minuteHeight
@ -333,7 +337,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
if (activity == null) if (activity == null)
return return
background = ColorDrawable(MainActivity.eventTypeColors.get(event.eventType, primaryColor)) val backgroundColor = MainActivity.eventTypeColors.get(event.eventType, primaryColor)
background = ColorDrawable(backgroundColor)
setTextColor(backgroundColor.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
text = event.title text = event.title
val startDateTime = Formatter.getDateTimeFromTS(event.startTS) val startDateTime = Formatter.getDateTimeFromTS(event.startTS)