diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index 13df271..95cd9ef 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -704,7 +704,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 63; + CURRENT_PROJECT_VERSION = 65; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77; GENERATE_INFOPLIST_FILE = YES; @@ -739,7 +739,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 63; + CURRENT_PROJECT_VERSION = 65; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = FCMA4QKS77; GENERATE_INFOPLIST_FILE = YES; diff --git a/VDSSample/ViewControllers/BreadcrumbsViewController.swift b/VDSSample/ViewControllers/BreadcrumbsViewController.swift index e0d5e94..7c24fe8 100644 --- a/VDSSample/ViewControllers/BreadcrumbsViewController.swift +++ b/VDSSample/ViewControllers/BreadcrumbsViewController.swift @@ -18,18 +18,20 @@ class BreadcrumbsViewController: BaseViewController { var selectedCrumbLabel = Label().with { $0.textStyle = .boldBodyMedium } var allBreadcrumbs: [Breadcrumbs.BreadcrumbItemModel] = [ .init(text: "Home"), - .init(text: "Support", enabeled: false), + .init(text: "Support"), .init(text: "Service & Apps"), .init(text: "My Verizon"), .init(text: "Bill"), - .init(text: "Mobile Billing & Payments"), .init(text: "Billing statement FAQs", selected: true) ] var some: [Breadcrumbs.BreadcrumbItemModel] = [ - .init(text: "Plans"), - .init(text: "Upgrade Plan"), - .init(text: "Billing Statement Frequently Asked Questions About Stuff You don't want to see", selected: true) + .init(text: "Home"), + .init(text: "Support"), + .init(text: "Service & Apps"), + .init(text: "My Verizon"), + .init(text: "Bill"), + .init(text: "Billing Statement Frequently Asked Questions to cause word wrap", selected: true) ] override func viewDidLoad() { @@ -47,7 +49,7 @@ class BreadcrumbsViewController: BaseViewController { super.setupForm() addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Last Crumb Selected", view: selectedSwitch) - addFormRow(label: "Large Sample", view: sampleSwitch) + addFormRow(label: "No Long Breadcrumbs", view: sampleSwitch) selectedSwitch.onChange = { [weak self] sender in guard let self else { return } @@ -96,7 +98,7 @@ extension BreadcrumbsViewController: ComponentSampleable { let component = Self.makeComponent() component.breadcrumbModels = [ .init(text: "Home"), - .init(text: "Support", enabeled: false), + .init(text: "Support"), .init(text: "Service & Apps"), .init(text: "My Verizon"), .init(text: "Bill"), diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift index 3c5c460..b3c8303 100644 --- a/VDSSample/ViewControllers/DatePickerViewController.swift +++ b/VDSSample/ViewControllers/DatePickerViewController.swift @@ -81,12 +81,12 @@ class DatePickerViewController: BaseViewController { addFormRow(label: "onChange", view: label) addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch) + addFormRow(label: "Read Only", view: readonlySwitch) addFormRow(label: "Required", view: requiredSwitch) + addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Date Format", view: dateFormatPickerSelectorView) addFormRow(label: "Label Text", view: labelTextField) addFormRow(label: "Helper Text", view: helperTextField) - addFormRow(label: "Readonly", view: readonlySwitch) - addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch)) addFormRow(label: "Error Text", view: errorTextField) addFormRow(label: "Width", view: widthTextField) @@ -411,8 +411,10 @@ extension DatePickerViewController { updateIndicatorData(label: legendThreeField.text ?? "", date: sender.date, index: 2) case minDatePickerTag: minDate = sender.date + updateCalendarModel() case maxDatePickerTag: maxDate = sender.date + updateCalendarModel() case activeDatePickerTag: activeDates.append(sender.date) var text = activeDatesField.text @@ -424,6 +426,7 @@ extension DatePickerViewController { text?.append("\(self.getSelectedDate(with: sender.date))") clearActiveDatesSwitch.isOn = false activeDatesField.text = text + updateCalendarModel() case inactiveDatePickerTag: inactiveDates.append(sender.date) var text = inactiveDatesField.text @@ -435,6 +438,7 @@ extension DatePickerViewController { text?.append("\(self.getSelectedDate(with: sender.date))") clearInactiveDatesSwitch.isOn = false inactiveDatesField.text = text + updateCalendarModel() default: break } } diff --git a/VDSSample/ViewControllers/DropdownSelectViewController.swift b/VDSSample/ViewControllers/DropdownSelectViewController.swift index 1d5002e..75077d4 100644 --- a/VDSSample/ViewControllers/DropdownSelectViewController.swift +++ b/VDSSample/ViewControllers/DropdownSelectViewController.swift @@ -65,13 +65,13 @@ class DropdownSelectViewController: BaseViewController { override func setupForm(){ addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Disabled", view: disabledSwitch) + addFormRow(label: "Read Only", view: readonlySwitch) addFormRow(label: "Required", view: requiredSwitch) + addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Label Text", view: labelTextField) addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView) addFormRow(label: "Helper Text", view: helperTextField) addFormRow(label: "Inline Label", view: .makeWrapper(for: inlineLabelSwitch)) - addFormRow(label: "Readonly", view: readonlySwitch) - addFormRow(label: "Transparent Background", view: transparentBgSwitch) addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch)) addFormRow(label: "Error Text", view: errorTextField) addFormRow(label: "Width", view: widthTextField) diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift index 35a4bf0..180d12d 100644 --- a/VDSSample/ViewControllers/InputFieldViewController.swift +++ b/VDSSample/ViewControllers/InputFieldViewController.swift @@ -27,6 +27,8 @@ class InputFieldViewController: BaseViewController { var disabledSwitch = Toggle() var requiredSwitch = Toggle() + var readonlySwitch = Toggle() + var transparentBgSwitch = Toggle() var labelTextField = TextField() var errorTextField = TextField() var successTextField = TextField() @@ -103,9 +105,11 @@ class InputFieldViewController: BaseViewController { $0.title = "\n\nGeneral Settings" } - general.addFormRow(label: "Disabled", view: disabledSwitch) - general.addFormRow(label: "Required", view: requiredSwitch) general.addFormRow(label: "Surface", view: surfacePickerSelectorView) + general.addFormRow(label: "Disabled", view: disabledSwitch) + general.addFormRow(label: "Read Only", view: readonlySwitch) + general.addFormRow(label: "Required", view: requiredSwitch) + general.addFormRow(label: "Transparent Background", view: transparentBgSwitch) general.addFormRow(label: "Label Text", view: labelTextField) general.addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView) general.addFormRow(label: "Helper Text", view: helperTextField) @@ -147,6 +151,14 @@ class InputFieldViewController: BaseViewController { disabledSwitch.onChange = { [weak self] sender in self?.component.isEnabled = !sender.isOn } + + readonlySwitch.onChange = { [weak self] sender in + self?.component.isReadOnly = sender.isOn + } + + transparentBgSwitch.onChange = { [weak self] sender in + self?.component.transparentBackground = sender.isOn + } labelTextField .textPublisher diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift index 4161d7e..0870bad 100644 --- a/VDSSample/ViewControllers/TextAreaViewController.swift +++ b/VDSSample/ViewControllers/TextAreaViewController.swift @@ -15,6 +15,7 @@ class TextAreaViewController: BaseViewController