mirror/Calendar
1
0
Fork 0
mirror of https://github.com/FossifyOrg/Calendar.git synced 2026-05-01 03:14:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from jonas-w/fix/google_pixel_bug

Browse Source 
Fix google pixel month view
This commit is contained in:
Naveen Singh
2024-03-11 01:10:20 +05:30
committed by GitHub
parent f6da127492 9a0b350384
commit f70268bb52
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/kotlin/org/fossify/calendar/views/MonthViewWrapper.kt
View File

@@ -74,7 +74,7 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
child.layout(childLeft.toInt(), childTop.toInt(), childRight.toInt(), childBottom.toInt())
if (curLeft + childWidth < end) {
if (curLeft + childWidth <= end) {
curLeft += childWidth
x++
} else {
@@ -107,41 +107,29 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
}
private fun measureSizes() {
dayWidth = (width - horizontalOffset) / 7f
dayHeight = (height - weekDaysLetterHeight) / 6f
dayWidth = (width - horizontalOffset) / COLUMN_COUNT.toFloat()
dayHeight = (height - weekDaysLetterHeight) / ROW_COUNT.toFloat()
}
private fun addClickableBackgrounds() {
removeAllViews()
binding = MonthViewBinding.inflate(inflater, this, true)
wereViewsAdded = true
var curId = 0
for (y in 0 until ROW_COUNT) {
for (x in 0 until COLUMN_COUNT) {
val day = days.getOrNull(curId)
if (day != null) {
addViewBackground(x, y, day)
}
curId++
}
days.forEachIndexed { index, day ->
addViewBackground(index % COLUMN_COUNT, index / COLUMN_COUNT, day)
}
}
private fun addViewBackground(viewX: Int, viewY: Int, day: DayMonthly) {
val xPos = viewX * dayWidth + horizontalOffset
val yPos = viewY * dayHeight + weekDaysLetterHeight
MonthViewBackgroundBinding.inflate(inflater, this, false).root.apply {
if (isMonthDayView) {
background = null
}
//Accessible label composed by day and month
contentDescription = "${day.value} ${Formatter.getMonthName(context, Formatter.getDateTimeFromCode(day.code).monthOfYear)}"
contentDescription = "${day.value} ${Formatter.getMonthName(context, Formatter.getDateTimeFromCode(day.code).monthOfYear)}"
layoutParams.width = dayWidth.toInt()
layoutParams.height = dayHeight.toInt()
x = xPos
y = yPos
setOnClickListener {
dayClickCallback?.invoke(day)