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

do not show events at the month part of month/day view

Browse Source
This commit is contained in:
tibbi
2021-02-21 18:22:21 +01:00
parent 660582c41d
commit 1742ee5666
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthDayFragment.kt
View File

@ -100,8 +100,8 @@ class MonthDayFragment : Fragment(), MonthlyCalendar {
} }
private fun updateDays(days: ArrayList<DayMonthly>) { private fun updateDays(days: ArrayList<DayMonthly>) {
mHolder.month_day_view_wrapper.updateDays(days) { mHolder.month_day_view_wrapper.updateDays(days, false) {
(activity as MainActivity).openDayFromMonthly(Formatter.getDateTimeFromCode(it.code)) // (activity as MainActivity).openDayFromMonthly(Formatter.getDateTimeFromCode(it.code))
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragment.kt
View File

@ -142,7 +142,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
} }
private fun updateDays(days: ArrayList<DayMonthly>) { private fun updateDays(days: ArrayList<DayMonthly>) {
mHolder.month_view_wrapper.updateDays(days) { mHolder.month_view_wrapper.updateDays(days, true) {
(activity as MainActivity).openDayFromMonthly(Formatter.getDateTimeFromCode(it.code)) (activity as MainActivity).openDayFromMonthly(Formatter.getDateTimeFromCode(it.code))
} }
} }

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

@ -50,6 +50,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
private var dimPastEvents = true private var dimPastEvents = true
private var highlightWeekends = false private var highlightWeekends = false
private var isPrintVersion = false private var isPrintVersion = false
private var isMonthDayView = false
private var allEvents = ArrayList<MonthViewEvent>() private var allEvents = ArrayList<MonthViewEvent>()
private var bgRectF = RectF() private var bgRectF = RectF()
private var dayLetters = ArrayList<String>() private var dayLetters = ArrayList<String>()
@ -92,7 +93,8 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
setupCurrentDayOfWeekIndex() setupCurrentDayOfWeekIndex()
} }
fun updateDays(newDays: ArrayList<DayMonthly>) { fun updateDays(newDays: ArrayList<DayMonthly>, isMonthDayView: Boolean) {
this.isMonthDayView = isMonthDayView
days = newDays days = newDays
showWeekNumbers = config.showWeekNumbers showWeekNumbers = config.showWeekNumbers
horizontalOffset = if (showWeekNumbers) eventTitleHeight * 2 else 0 horizontalOffset = if (showWeekNumbers) eventTitleHeight * 2 else 0
@ -129,7 +131,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
dayVerticalOffsets.clear() dayVerticalOffsets.clear()
measureDaySize(canvas) measureDaySize(canvas)
if (config.showGrid) { if (config.showGrid && !isMonthDayView) {
drawGrid(canvas) drawGrid(canvas)
} }
@ -159,10 +161,12 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
} }
} }
if (!isMonthDayView) {
for (event in allEvents) { for (event in allEvents) {
drawEvent(event, canvas) drawEvent(event, canvas)
} }
} }
}
private fun drawGrid(canvas: Canvas) { private fun drawGrid(canvas: Canvas) {
// vertical lines // vertical lines

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

@ -17,6 +17,7 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
private var weekDaysLetterHeight = 0 private var weekDaysLetterHeight = 0
private var horizontalOffset = 0 private var horizontalOffset = 0
private var wereViewsAdded = false private var wereViewsAdded = false
private var isMonthDayView = true
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
@ -36,12 +37,12 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
if (!wereViewsAdded && days.isNotEmpty()) { if (!wereViewsAdded && days.isNotEmpty()) {
measureSizes() measureSizes()
addViews() addViews()
monthView.updateDays(days) monthView.updateDays(days, isMonthDayView)
} }
} }
} }
fun updateDays(newDays: ArrayList<DayMonthly>, callback: ((DayMonthly) -> Unit)? = null) { fun updateDays(newDays: ArrayList<DayMonthly>, addEvents: Boolean, callback: ((DayMonthly) -> Unit)? = null) {
setupHorizontalOffset() setupHorizontalOffset()
measureSizes() measureSizes()
dayClickCallback = callback dayClickCallback = callback
@ -49,7 +50,9 @@ class MonthViewWrapper(context: Context, attrs: AttributeSet, defStyle: Int) : F
if (dayWidth != 0f && dayHeight != 0f) { if (dayWidth != 0f && dayHeight != 0f) {
addViews() addViews()
} }
monthView.updateDays(days)
isMonthDayView = !addEvents
monthView.updateDays(days, isMonthDayView)
} }
private fun setupHorizontalOffset() { private fun setupHorizontalOffset() {