From ee7e1cf8b69eb80d16bf4633e7b728d2e3c825f8 Mon Sep 17 00:00:00 2001 From: Colby Mehmen Date: Sun, 19 May 2024 11:20:22 -0500 Subject: [PATCH] Made Day Of Week Indicators customizable --- .../CalendarColumnDayOfWeekIndicatorView.swift | 14 -------------- .../Enums/CalendarDayOfWeekIndicatorView.swift | 14 ++++++++++++++ .../Views/DayViews/ClassicCalendarDayView.swift | 1 - .../MooCal/Views/TimeViews/CalendarMonthView.swift | 4 ++-- .../MooCal/Views/TimeViews/CalendarYearView.swift | 4 ++-- .../Views/TimeViews/ScrollableCalendarView.swift | 4 ++-- 6 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 Sources/MooCal/Enums/CalendarColumnDayOfWeekIndicatorView.swift create mode 100644 Sources/MooCal/Enums/CalendarDayOfWeekIndicatorView.swift diff --git a/Sources/MooCal/Enums/CalendarColumnDayOfWeekIndicatorView.swift b/Sources/MooCal/Enums/CalendarColumnDayOfWeekIndicatorView.swift deleted file mode 100644 index 37466ca..0000000 --- a/Sources/MooCal/Enums/CalendarColumnDayOfWeekIndicatorView.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// SwiftUIView.swift -// -// -// Created by Colby Mehmen on 5/18/24. -// - -import SwiftUI - -public enum CalendarColumnDayOfWeekIndicatorView { - case custom((DayOfWeek) -> (DayOfWeekIndicatorView)) - case singleLetter - case abreviated -} diff --git a/Sources/MooCal/Enums/CalendarDayOfWeekIndicatorView.swift b/Sources/MooCal/Enums/CalendarDayOfWeekIndicatorView.swift new file mode 100644 index 0000000..8f3078b --- /dev/null +++ b/Sources/MooCal/Enums/CalendarDayOfWeekIndicatorView.swift @@ -0,0 +1,14 @@ +// +// SwiftUIView.swift +// +// +// Created by Colby Mehmen on 5/18/24. +// + +import SwiftUI + +public enum CalendarDayOfWeekIndicatorView { + case custom((DayOfWeek) -> (DayOfWeekIndicatorView)) + case singleLetter(DayOfWeekIndicatorView = EmptyView()) + case abreviated(DayOfWeekIndicatorView = EmptyView()) +} diff --git a/Sources/MooCal/Views/DayViews/ClassicCalendarDayView.swift b/Sources/MooCal/Views/DayViews/ClassicCalendarDayView.swift index f9702ff..18c9d05 100644 --- a/Sources/MooCal/Views/DayViews/ClassicCalendarDayView.swift +++ b/Sources/MooCal/Views/DayViews/ClassicCalendarDayView.swift @@ -21,7 +21,6 @@ public struct ClassicNumberedDayViewConfig { self.highlightColor = highlightColor self.cornerRadius = cornerRadius } - } public struct ClassicNumberedDayView: View { diff --git a/Sources/MooCal/Views/TimeViews/CalendarMonthView.swift b/Sources/MooCal/Views/TimeViews/CalendarMonthView.swift index 78bd4be..5f19e66 100644 --- a/Sources/MooCal/Views/TimeViews/CalendarMonthView.swift +++ b/Sources/MooCal/Views/TimeViews/CalendarMonthView.swift @@ -11,10 +11,10 @@ public struct CalendarMonthView public var calendarDayView: CalendarDayView - public var calendarDayOfWeekInidcatorView: CalendarColumnDayOfWeekIndicatorView + public var calendarDayOfWeekInidcatorView: CalendarDayOfWeekIndicatorView public var onSelection: ((CalendarDay) -> ())? - public init(calendarMonth: CalendarMonth, calendarHeaderView: CalendarMonthHeaderView, calendarDayView: CalendarDayView, calendarDayOfWeekInidcatorView: CalendarColumnDayOfWeekIndicatorView, onSelection: ( (CalendarDay) -> Void)? = nil) { + public init(calendarMonth: CalendarMonth, calendarHeaderView: CalendarMonthHeaderView, calendarDayView: CalendarDayView, calendarDayOfWeekInidcatorView: CalendarDayOfWeekIndicatorView, onSelection: ( (CalendarDay) -> Void)? = nil) { self.calendarMonth = calendarMonth self.calendarHeaderView = calendarHeaderView self.calendarDayView = calendarDayView diff --git a/Sources/MooCal/Views/TimeViews/CalendarYearView.swift b/Sources/MooCal/Views/TimeViews/CalendarYearView.swift index 99cd83d..045b19c 100644 --- a/Sources/MooCal/Views/TimeViews/CalendarYearView.swift +++ b/Sources/MooCal/Views/TimeViews/CalendarYearView.swift @@ -11,10 +11,10 @@ public struct CalendarYearViewMoo public var calendarDayView: CalendarDayView - public var calendarDayOfWeekInidcatorView: CalendarColumnDayOfWeekIndicatorView + public var calendarDayOfWeekInidcatorView: CalendarDayOfWeekIndicatorView public var onSelection: ((CalendarDay) -> ())? - public init(calendarMonths: [CalendarMonth], calendarHeaderView: CalendarMonthHeaderView, calendarDayView: CalendarDayView, calendarDayOfWeekInidcatorView: CalendarColumnDayOfWeekIndicatorView, onSelection: ( (CalendarDay) -> Void)? = nil) { + public init(calendarMonths: [CalendarMonth], calendarHeaderView: CalendarMonthHeaderView, calendarDayView: CalendarDayView, calendarDayOfWeekInidcatorView: CalendarDayOfWeekIndicatorView, onSelection: ( (CalendarDay) -> Void)? = nil) { self.calendarMonths = calendarMonths self.calendarDayView = calendarDayView self.calendarHeaderView = calendarHeaderView diff --git a/Sources/MooCal/Views/TimeViews/ScrollableCalendarView.swift b/Sources/MooCal/Views/TimeViews/ScrollableCalendarView.swift index 5ceaffe..91c6d96 100644 --- a/Sources/MooCal/Views/TimeViews/ScrollableCalendarView.swift +++ b/Sources/MooCal/Views/TimeViews/ScrollableCalendarView.swift @@ -12,10 +12,10 @@ public struct ScrollableCalendarView public var calendarDayView: CalendarDayView - public var calendarDayOfWeekInidcatorView: CalendarColumnDayOfWeekIndicatorView + public var calendarDayOfWeekInidcatorView: CalendarDayOfWeekIndicatorView public var onSelection: ((CalendarDay) -> ())? - public init(viewModel: ScrollableCalendarViewViewModel = ScrollableCalendarViewViewModel(), calendarHeaderView: CalendarMonthHeaderView = .monthLabel(), calendarDayView: CalendarDayView, calendarDayOfWeekInidcatorView: CalendarColumnDayOfWeekIndicatorView = .singleLetter, onSelection: ( (CalendarDay) -> Void)? = nil) { + public init(viewModel: ScrollableCalendarViewViewModel = ScrollableCalendarViewViewModel(), calendarHeaderView: CalendarMonthHeaderView = .monthLabel(), calendarDayView: CalendarDayView, calendarDayOfWeekInidcatorView: CalendarDayOfWeekIndicatorView = .singleLetter(), onSelection: ( (CalendarDay) -> Void)? = nil) { self.viewModel = viewModel self.calendarHeaderView = calendarHeaderView self.calendarDayView = calendarDayView