fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

increase the alpha of dimmed events at the monthly view

Browse Source
This commit is contained in:
tibbi
2019-01-25 23:23:21 +01:00
parent 712cafbee8
commit 3449a5a0f5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt
View File

@@ -14,6 +14,7 @@ import com.simplemobiletools.calendar.pro.extensions.config
import com.simplemobiletools.calendar.pro.extensions.seconds import com.simplemobiletools.calendar.pro.extensions.seconds
import com.simplemobiletools.calendar.pro.helpers.Formatter import com.simplemobiletools.calendar.pro.helpers.Formatter
import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA
import com.simplemobiletools.calendar.pro.helpers.MEDIUM_ALPHA
import com.simplemobiletools.calendar.pro.models.DayMonthly import com.simplemobiletools.calendar.pro.models.DayMonthly
import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.calendar.pro.models.Event
import com.simplemobiletools.calendar.pro.models.MonthViewEvent import com.simplemobiletools.calendar.pro.models.MonthViewEvent
@@ -257,7 +258,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
} }
if (!startDay.isThisMonth) { if (!startDay.isThisMonth) {
paintColor = paintColor.adjustAlpha(LOW_ALPHA) paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
} }
return getColoredPaint(paintColor) return getColoredPaint(paintColor)
@@ -272,7 +273,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
private fun getEventBackgroundColor(event: MonthViewEvent, startDay: DayMonthly, endDay: DayMonthly): Paint { private fun getEventBackgroundColor(event: MonthViewEvent, startDay: DayMonthly, endDay: DayMonthly): Paint {
var paintColor = event.color var paintColor = event.color
if ((!startDay.isThisMonth && !endDay.isThisMonth) || (dimPastEvents && event.isPastEvent)) { if ((!startDay.isThisMonth && !endDay.isThisMonth) || (dimPastEvents && event.isPastEvent)) {
paintColor = paintColor.adjustAlpha(LOW_ALPHA) paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
} }
return getColoredPaint(paintColor) return getColoredPaint(paintColor)
@@ -281,7 +282,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
private fun getEventTitlePaint(event: MonthViewEvent, startDay: DayMonthly, endDay: DayMonthly): Paint { private fun getEventTitlePaint(event: MonthViewEvent, startDay: DayMonthly, endDay: DayMonthly): Paint {
var paintColor = event.color.getContrastColor() var paintColor = event.color.getContrastColor()
if ((!startDay.isThisMonth && !endDay.isThisMonth) || (dimPastEvents && event.isPastEvent)) { if ((!startDay.isThisMonth && !endDay.isThisMonth) || (dimPastEvents && event.isPastEvent)) {
paintColor = paintColor.adjustAlpha(LOW_ALPHA) paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
} }
val curPaint = Paint(eventTitlePaint) val curPaint = Paint(eventTitlePaint)
@@ -293,7 +294,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
val curPaint = Paint(paint) val curPaint = Paint(paint)
var paintColor = primaryColor var paintColor = primaryColor
if (!day.isThisMonth) { if (!day.isThisMonth) {
paintColor = paintColor.adjustAlpha(LOW_ALPHA) paintColor = paintColor.adjustAlpha(MEDIUM_ALPHA)
} }
curPaint.color = paintColor curPaint.color = paintColor
return curPaint return curPaint