From e030b460cea8dc6fdc95ae2b124267c55d409ec4 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 20 Aug 2024 14:19:22 -0500 Subject: [PATCH] added final properties --- .../FormFields/DatePickerEntryField.swift | 8 +++++-- .../DatePickerEntryFieldModel.swift | 22 ++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryField.swift index b798b068..5c1086df 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryField.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryField.swift @@ -23,8 +23,12 @@ open class DatePickerEntryField: VDS.DatePicker, VDSMoleculeViewProtocol { public func viewModelDidUpdate() { surface = viewModel.surface - labelText = "Date" - helperText = "Pick a date" + labelText = viewModel.title + helperText = viewModel.feedback + helperTextPlacement = viewModel.feedbackTextPlacement + tooltipModel = viewModel.tooltip?.convertToVDSTooltipModel() + transparentBackground = viewModel.transparentBackground + width = viewModel.width selectedDate = viewModel.selectedDate calendarModel = viewModel.calendar.convertToVDSCalendarModel() FormValidator.setupValidation(for: viewModel, delegate: delegateObject?.formHolderDelegate) diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift index 68b63309..3ce2773a 100644 --- a/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift +++ b/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift @@ -31,7 +31,13 @@ open class DatePickerEntryFieldModel: FormFieldModel { public var selectedDate: Date? public var calendar: CalendarViewModel = .init() - + public var title: String? + public var feedback: String? + public var feedbackTextPlacement: VDS.DatePicker.HelperTextPlacement = .bottom + public var tooltip: TooltipModel? + public var transparentBackground: Bool = false + public var width: CGFloat? + //-------------------------------------------------- // MARK: - Keys //-------------------------------------------------- @@ -39,6 +45,12 @@ open class DatePickerEntryFieldModel: FormFieldModel { case dateFormat case selectedDate case calendar + case title + case feedback + case feedbackTextPlacement + case tooltip + case transparentBackground + case width } //-------------------------------------------------- @@ -70,6 +82,14 @@ open class DatePickerEntryFieldModel: FormFieldModel { self.calendar = calendar } + title = try container.decodeIfPresent(String.self, forKey: .title) + feedback = try container.decodeIfPresent(String.self, forKey: .feedback) + feedbackTextPlacement = try container.decodeIfPresent(VDS.EntryFieldBase.HelperTextPlacement.self, forKey: .feedbackTextPlacement) ?? .bottom + + tooltip = try container.decodeIfPresent(TooltipModel.self, forKey: .tooltip) + transparentBackground = try container.decodeIfPresent(Bool.self, forKey: .transparentBackground) ?? false + width = try container.decodeIfPresent(CGFloat.self, forKey: .width) + try super.init(from: decoder) }