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

properly position the clickable background at month view

Browse Source
This commit is contained in:
tibbi 2018-03-27 14:12:52 +02:00
parent f794be6116
commit 80c59cb41b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthViewWrapper.kt
View File

@ -5,6 +5,7 @@ import android.util.AttributeSet
import android.view.LayoutInflater import android.view.LayoutInflater
import android.widget.FrameLayout import android.widget.FrameLayout
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.commons.extensions.onGlobalLayout import com.simplemobiletools.commons.extensions.onGlobalLayout
import kotlinx.android.synthetic.main.month_view.view.* import kotlinx.android.synthetic.main.month_view.view.*
@ -18,6 +19,7 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
private var days = ArrayList<DayMonthly>() private var days = ArrayList<DayMonthly>()
private var inflater: LayoutInflater private var inflater: LayoutInflater
private var monthView: MonthView private var monthView: MonthView
private var horizontalOffset = 0
private var dayClickCallback: ((day: DayMonthly) -> Unit)? = null private var dayClickCallback: ((day: DayMonthly) -> Unit)? = null
constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0)
@ -28,9 +30,9 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
inflater = LayoutInflater.from(context) inflater = LayoutInflater.from(context)
monthView = inflater.inflate(R.layout.month_view, this).month_view monthView = inflater.inflate(R.layout.month_view, this).month_view
setupHorizontalOffset()
onGlobalLayout { onGlobalLayout {
measureSizes()
if (!wereViewsAdded && days.isNotEmpty()) { if (!wereViewsAdded && days.isNotEmpty()) {
addViews() addViews()
monthView.updateDays(days) monthView.updateDays(days)
@ -39,22 +41,21 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
} }
fun updateDays(newDays: ArrayList<DayMonthly>, callback: ((DayMonthly) -> Unit)? = null) { fun updateDays(newDays: ArrayList<DayMonthly>, callback: ((DayMonthly) -> Unit)? = null) {
setupHorizontalOffset()
measureSizes()
dayClickCallback = callback dayClickCallback = callback
days = newDays days = newDays
if (dayWidth != 0f) { addViews()
addViews() monthView.updateDays(days)
monthView.updateDays(days) }
}
private fun setupHorizontalOffset() {
horizontalOffset = if (context.config.showWeekNumbers) resources.getDimensionPixelSize(R.dimen.smaller_text_size) * 2 else 0
} }
private fun measureSizes() { private fun measureSizes() {
if (dayWidth == 0f) { dayWidth = (width - horizontalOffset) / 7f
dayWidth = width / 7f dayHeight = (height - weekDaysLetterHeight) / 6f
}
if (dayHeight == 0f) {
dayHeight = (height - weekDaysLetterHeight) / 6f
}
} }
private fun addViews() { private fun addViews() {
@ -66,7 +67,7 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
for (x in 0..6) { for (x in 0..6) {
val day = days.getOrNull(curId) val day = days.getOrNull(curId)
if (day != null) { if (day != null) {
val xPos = x * dayWidth val xPos = x * dayWidth + horizontalOffset
val yPos = y * dayHeight + weekDaysLetterHeight val yPos = y * dayHeight + weekDaysLetterHeight
addViewBackground(xPos, yPos, day) addViewBackground(xPos, yPos, day)
} }