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

fix monthly view grid with visible week numbers

This commit is contained in:
tibbi 2018-04-12 22:50:24 +02:00
parent b28b35cc40
commit 15719b6430
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -46,7 +46,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.18.19' implementation 'com.simplemobiletools:commons:3.18.22'
implementation 'joda-time:joda-time:2.9.9' implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'

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

@ -151,10 +151,16 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
} }
private fun drawGrid(canvas: Canvas) { private fun drawGrid(canvas: Canvas) {
// vertical lines
for (i in 0..6) { for (i in 0..6) {
canvas.drawLine(i * dayWidth, 0f, i * dayWidth, canvas.height.toFloat(), gridPaint) var lineX = i * dayWidth
if (showWeekNumbers) {
lineX += horizontalOffset
}
canvas.drawLine(lineX, 0f, lineX, canvas.height.toFloat(), gridPaint)
} }
// horizontal lines
canvas.drawLine(0f, 0f, canvas.width.toFloat(), 0f, gridPaint) canvas.drawLine(0f, 0f, canvas.width.toFloat(), 0f, gridPaint)
for (i in 0..5) { for (i in 0..5) {
canvas.drawLine(0f, i * dayHeight + weekDaysLetterHeight, canvas.width.toFloat(), i * dayHeight + weekDaysLetterHeight, gridPaint) canvas.drawLine(0f, i * dayHeight + weekDaysLetterHeight, canvas.width.toFloat(), i * dayHeight + weekDaysLetterHeight, gridPaint)
@ -182,7 +188,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
val id = "$weekOfYear:" val id = "$weekOfYear:"
val yPos = i * dayHeight + weekDaysLetterHeight val yPos = i * dayHeight + weekDaysLetterHeight
canvas.drawText(id, horizontalOffset.toFloat(), yPos + paint.textSize, weekNumberPaint) canvas.drawText(id, horizontalOffset.toFloat() * 0.9f, yPos + paint.textSize, weekNumberPaint)
} }
} }