From 794f68a67f19eb85a5b07d0a19a14356aba31393 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 30 Aug 2023 16:57:15 -0500 Subject: [PATCH] formatted Signed-off-by: Matt Bruce --- VDS/BaseClasses/Selector/SelectorBase.swift | 8 ++--- .../Selector/SelectorItemBase.swift | 16 +++++----- .../BadgeIndicator/BadgeIndicator.swift | 28 ++++++++--------- VDS/Components/Buttons/Button/Button.swift | 4 +-- VDS/Components/Buttons/ButtonBase.swift | 4 +-- .../Buttons/ButtonGroup/ButtonGroup.swift | 4 +-- .../Buttons/TextLink/TextLink.swift | 2 +- VDS/Components/Checkbox/Checkbox.swift | 2 +- VDS/Components/Checkbox/CheckboxItem.swift | 2 +- .../Icon/ButtonIcon/ButtonIcon.swift | 2 +- VDS/Components/Icon/Icon.swift | 6 ++-- .../Notification/Notification.swift | 12 ++++---- VDS/Components/RadioBox/RadioBoxItem.swift | 18 +++++------ .../TextFields/EntryFieldBase.swift | 30 +++++++++---------- .../TextFields/InputField/InputField.swift | 6 ++-- .../TextFields/TextArea/TextArea.swift | 2 +- .../TileContainer/TileContainer.swift | 14 ++++----- VDS/Components/Tilelet/Tilelet.swift | 8 ++--- VDS/Components/TitleLockup/TitleLockup.swift | 8 ++--- VDS/Components/Toggle/Toggle.swift | 18 +++++------ VDS/Components/Toggle/ToggleView.swift | 6 ++-- VDS/Components/Tooltip/Tooltip.swift | 12 ++++---- VDS/Components/Tooltip/TooltipDialog.swift | 6 ++-- .../Tooltip/TrailingTooltipLabel.swift | 4 +-- .../UIView+NSLayoutConstraint.swift | 2 +- 25 files changed, 112 insertions(+), 112 deletions(-) diff --git a/VDS/BaseClasses/Selector/SelectorBase.swift b/VDS/BaseClasses/Selector/SelectorBase.swift index 6a938b15..8d0bfea1 100644 --- a/VDS/BaseClasses/Selector/SelectorBase.swift +++ b/VDS/BaseClasses/Selector/SelectorBase.swift @@ -55,7 +55,7 @@ open class SelectorBase: Control, SelectorControlable { } } - open var size = CGSize(width: 20, height: 20) { didSet { setNeedsUpdate() }} + open var size = CGSize(width: 20, height: 20) { didSet { setNeedsUpdate() } } var _showError: Bool = false /// Whether not to show the error. @@ -82,11 +82,11 @@ open class SelectorBase: Control, SelectorControlable { } } - open var backgroundColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() }} + open var backgroundColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() } } - open var borderColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() }} + open var borderColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() } } - open var selectorColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() }} + open var selectorColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() } } /// The natural size for the receiving view, considering only properties of the view itself. open override var intrinsicContentSize: CGSize { size } diff --git a/VDS/BaseClasses/Selector/SelectorItemBase.swift b/VDS/BaseClasses/Selector/SelectorItemBase.swift index 611f15d0..1745ae65 100644 --- a/VDS/BaseClasses/Selector/SelectorItemBase.swift +++ b/VDS/BaseClasses/Selector/SelectorItemBase.swift @@ -91,13 +91,13 @@ open class SelectorItemBase: Control, Errorable, /// Generic Object used to allow the user to 'Select'. open var selectorView = Selector() - open override var isSelected: Bool { didSet { setNeedsUpdate() }} + open override var isSelected: Bool { didSet { setNeedsUpdate() } } /// Text shown in the label. - open var labelText: String? { didSet { setNeedsUpdate() }} + open var labelText: String? { didSet { setNeedsUpdate() } } /// Array of LabelAttributeModel objects used in rendering the labelText. - open var labelTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} + open var labelTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } /// Instead of use labelText and labelTextAttirbutes, this is a fully baked NSAttributedString with both text and attributes. open var labelAttributedText: NSAttributedString? { @@ -109,10 +109,10 @@ open class SelectorItemBase: Control, Errorable, } /// Text shown in the childLabel. - open var childText: String? { didSet { setNeedsUpdate() }} + open var childText: String? { didSet { setNeedsUpdate() } } /// Array of LabelAttributeModel objects used in rendering the childText. - open var childTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} + open var childTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } /// Instead of use childText and childTextAttirbutes, this is a fully baked NSAttributedString with both text and attributes. open var childAttributedText: NSAttributedString? { @@ -146,11 +146,11 @@ open class SelectorItemBase: Control, Errorable, } } - open var errorText: String? { didSet { setNeedsUpdate() }} + open var errorText: String? { didSet { setNeedsUpdate() } } - open var inputId: String? { didSet { setNeedsUpdate() }} + open var inputId: String? { didSet { setNeedsUpdate() } } - open var value: AnyHashable? { didSet { setNeedsUpdate() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Overrides diff --git a/VDS/Components/BadgeIndicator/BadgeIndicator.swift b/VDS/Components/BadgeIndicator/BadgeIndicator.swift index 922f774d..4ab72bb7 100644 --- a/VDS/Components/BadgeIndicator/BadgeIndicator.swift +++ b/VDS/Components/BadgeIndicator/BadgeIndicator.swift @@ -169,46 +169,46 @@ open class BadgeIndicator: View { /// This will render the badges fill color based on the available options. /// When used in conjunction with the surface prop, this fill color will change its tint automatically based on a light or dark surface. - open var fillColor: FillColor = .red { didSet { setNeedsUpdate() }} + open var fillColor: FillColor = .red { didSet { setNeedsUpdate() } } /// Badge Number that will be shown if you are using Kind.numbered. - open var number: Int? { didSet { setNeedsUpdate() }} + open var number: Int? { didSet { setNeedsUpdate() } } /// Type of Badge Indicator, simple is a dot, whereas numbered shows a number. - open var kind: Kind = .simple { didSet { setNeedsUpdate() }} + open var kind: Kind = .simple { didSet { setNeedsUpdate() } } /// Character that is always at the begging. Accepts any character and if unaffected by maximumDigits. - open var leadingCharacter: String? { didSet { setNeedsUpdate() }} + open var leadingCharacter: String? { didSet { setNeedsUpdate() } } /// Accepts any text or character. It is unaffected by maximumDigits. - open var trailingText: String? { didSet { setNeedsUpdate() }} + open var trailingText: String? { didSet { setNeedsUpdate() } } /// Determines the size of the Badge Indicator as well as the textStyle and padding used. - open var size: Size = .xxlarge { didSet { setNeedsUpdate() }} + open var size: Size = .xxlarge { didSet { setNeedsUpdate() } } /// Pixel size of the dot when the kind is set to simple. - open var dotSize: CGFloat? { didSet { setNeedsUpdate() }} + open var dotSize: CGFloat? { didSet { setNeedsUpdate() } } /// Sets the padding at the top/bottom of the label. - open var verticalPadding: CGFloat? { didSet { setNeedsUpdate() }} + open var verticalPadding: CGFloat? { didSet { setNeedsUpdate() } } /// Sets the padding at the left/right of the label. - open var horitonalPadding: CGFloat? { didSet { setNeedsUpdate() }} + open var horitonalPadding: CGFloat? { didSet { setNeedsUpdate() } } /// Hides the dot when you are in Kind.simple mode. - open var hideDot: Bool = false { didSet { setNeedsUpdate() }} + open var hideDot: Bool = false { didSet { setNeedsUpdate() } } /// Will not show the border. - open var hideBorder: Bool = false { didSet { setNeedsUpdate() }} + open var hideBorder: Bool = false { didSet { setNeedsUpdate() } } /// When in Kind.numbered this is the amount of digits that will show up when the user adds a number. - open var maximumDigits: MaximumDigits = .two { didSet { setNeedsUpdate() }} + open var maximumDigits: MaximumDigits = .two { didSet { setNeedsUpdate() } } /// The Container's width. - open var width: CGFloat? { didSet { setNeedsUpdate() }} + open var width: CGFloat? { didSet { setNeedsUpdate() } } /// The Container's height. - open var height: CGFloat? { didSet { setNeedsUpdate() }} + open var height: CGFloat? { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Private Properties diff --git a/VDS/Components/Buttons/Button/Button.swift b/VDS/Components/Buttons/Button/Button.swift index 828a7dd4..81f10b6e 100644 --- a/VDS/Components/Buttons/Button/Button.swift +++ b/VDS/Components/Buttons/Button/Button.swift @@ -52,10 +52,10 @@ open class Button: ButtonBase, Useable, Buttonable { open override var availableSizes: [ButtonSize] { [.large, .small] } /// The ButtonSize for ths Button. - open var size: ButtonSize = .large { didSet { setNeedsUpdate() }} + open var size: ButtonSize = .large { didSet { setNeedsUpdate() } } /// The Use for this Button. - open var use: Use = .primary { didSet { setNeedsUpdate() }} + open var use: Use = .primary { didSet { setNeedsUpdate() } } private var _width: CGFloat? = nil diff --git a/VDS/Components/Buttons/ButtonBase.swift b/VDS/Components/Buttons/ButtonBase.swift index 9b1d53c1..e505b7f8 100644 --- a/VDS/Components/Buttons/ButtonBase.swift +++ b/VDS/Components/Buttons/ButtonBase.swift @@ -78,7 +78,7 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { /// The ButtonSize available to this type of Buttonable. open var availableSizes: [ButtonSize] { [] } - open var surface: Surface = .light { didSet { setNeedsUpdate() }} + open var surface: Surface = .light { didSet { setNeedsUpdate() } } /// Text that will be used in the titleLabel. open var text: String? { didSet { setNeedsUpdate() } } @@ -93,7 +93,7 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { open var textColor: UIColor { .black } /// Will determine if a scaled font should be used for the titleLabel font. - open var useScaledFont: Bool = false { didSet { setNeedsUpdate() }} + open var useScaledFont: Bool = false { didSet { setNeedsUpdate() } } open var userInfo = [String: Primitive]() diff --git a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift index b059089b..5f764754 100644 --- a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift +++ b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift @@ -57,10 +57,10 @@ open class ButtonGroup: View { open var rowQuantity: Int { UIDevice.isIPad ? rowQuantityTablet : rowQuantityPhone } /// If provided, aligns TextLink/TextLinkCaret alignment when rowQuantity is set one. - open var alignment: Alignment = .center { didSet { setNeedsUpdate() }} + open var alignment: Alignment = .center { didSet { setNeedsUpdate() } } /// Array of Buttonable Views that are shown in the group. - open var buttons: [Buttonable] = [] { didSet { setNeedsUpdate() }} + open var buttons: [Buttonable] = [] { didSet { setNeedsUpdate() } } private var _childWidth: ChildWidth? diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift index 3b7dedff..556c2c63 100644 --- a/VDS/Components/Buttons/TextLink/TextLink.swift +++ b/VDS/Components/Buttons/TextLink/TextLink.swift @@ -46,7 +46,7 @@ open class TextLink: ButtonBase, Buttonable { //-------------------------------------------------- // MARK: - Public Properties //-------------------------------------------------- - open var size: ButtonSize = .large { didSet { setNeedsUpdate() }} + open var size: ButtonSize = .large { didSet { setNeedsUpdate() } } /// The ButtonSize available to this type of Buttonable. open override var availableSizes: [ButtonSize] { [.large, .small] } diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index 067e8b5c..6eedeb51 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -35,7 +35,7 @@ open class Checkbox: SelectorBase { // MARK: - Public Properties //-------------------------------------------------- /// Whether or not there is animation when the checkbox changes state from non-selected to a selected state. - open var isAnimated: Bool = false { didSet { setNeedsUpdate() }} + open var isAnimated: Bool = false { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Overrides diff --git a/VDS/Components/Checkbox/CheckboxItem.swift b/VDS/Components/Checkbox/CheckboxItem.swift index 12670b2f..aa5dea5a 100644 --- a/VDS/Components/Checkbox/CheckboxItem.swift +++ b/VDS/Components/Checkbox/CheckboxItem.swift @@ -31,7 +31,7 @@ open class CheckboxItem: SelectorItemBase { // MARK: - Public Properties //-------------------------------------------------- /// Whether or not there is animation when the checkbox changes state from non-selected to a selected state. - open var isAnimated: Bool = false { didSet { setNeedsUpdate() }} + open var isAnimated: Bool = false { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Overrides diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift index e7033354..b3e7ecb9 100644 --- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift +++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift @@ -97,7 +97,7 @@ open class ButtonIcon: Control { open var size: Size = .large { didSet { setNeedsUpdate() } } /// Sets the size of button icon and icon. - open var customSize: Int? { didSet { setNeedsUpdate() }} + open var customSize: Int? { didSet { setNeedsUpdate() } } /// If provided, the button icon will have a box shadow. open var floating: Bool = false { didSet { setNeedsUpdate() } } diff --git a/VDS/Components/Icon/Icon.swift b/VDS/Components/Icon/Icon.swift index 0affea5f..39b42175 100644 --- a/VDS/Components/Icon/Icon.swift +++ b/VDS/Components/Icon/Icon.swift @@ -60,13 +60,13 @@ open class Icon: View { } /// Size of the icon. - open var size: Size = .medium { didSet { setNeedsUpdate() }} + open var size: Size = .medium { didSet { setNeedsUpdate() } } /// This will be used to render the icon with corresponding name. - open var name: Name? { didSet { setNeedsUpdate() }} + open var name: Name? { didSet { setNeedsUpdate() } } /// A custom size of the icon. - open var customSize: Int? { didSet { setNeedsUpdate() }} + open var customSize: Int? { didSet { setNeedsUpdate() } } /// The natural size for the receiving view, considering only properties of the view itself. open override var intrinsicContentSize: CGSize { diff --git a/VDS/Components/Notification/Notification.swift b/VDS/Components/Notification/Notification.swift index 2a409fd0..f51d9f11 100644 --- a/VDS/Components/Notification/Notification.swift +++ b/VDS/Components/Notification/Notification.swift @@ -121,13 +121,13 @@ open class Notification: View { } /// Text that will go into the titleLabel. - open var title: String = "" { didSet{setNeedsUpdate()}} + open var title: String = "" { didSet { setNeedsUpdate()}} /// Text that will go into the subTitleLabel. - open var subTitle: String? { didSet{setNeedsUpdate()}} + open var subTitle: String? { didSet { setNeedsUpdate()}} /// Button model representing the primaryButton. - open var primaryButtonModel: ButtonModel? { didSet{setNeedsUpdate()}} + open var primaryButtonModel: ButtonModel? { didSet { setNeedsUpdate()}} /// Button used for the primary action. open var primaryButton = Button().with { @@ -136,7 +136,7 @@ open class Notification: View { } /// Button model representing the secondaryButton. - open var secondaryButtonModel: ButtonModel? { didSet{setNeedsUpdate()}} + open var secondaryButtonModel: ButtonModel? { didSet { setNeedsUpdate()}} /// Button used for the secondary action. open var secondaryButton = Button().with { @@ -160,10 +160,10 @@ open class Notification: View { } /// If true, will hide the close button. - open var hideCloseButton: Bool = false { didSet{setNeedsUpdate()}} + open var hideCloseButton: Bool = false { didSet { setNeedsUpdate()}} /// Add this attribute determine your type of Notification. - open var style: Style = .info { didSet{setNeedsUpdate()}} + open var style: Style = .info { didSet { setNeedsUpdate()}} var _layout: Layout = .vertical diff --git a/VDS/Components/RadioBox/RadioBoxItem.swift b/VDS/Components/RadioBox/RadioBoxItem.swift index 13743343..71cf2c2e 100644 --- a/VDS/Components/RadioBox/RadioBoxItem.swift +++ b/VDS/Components/RadioBox/RadioBoxItem.swift @@ -92,10 +92,10 @@ open class RadioBoxItem: Control, Changeable, FormFieldable { } /// If provided, the RadioBox text will be rendered. - open var text: String? { didSet { setNeedsUpdate() }} + open var text: String? { didSet { setNeedsUpdate() } } /// Array of LabelAttributeModel objects used in rendering the text. - open var textAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} + open var textAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } /// If provided, the RadioBox textAttributedText will be rendered. open var textAttributedText: NSAttributedString? { @@ -107,10 +107,10 @@ open class RadioBoxItem: Control, Changeable, FormFieldable { } /// If provided, the RadioBox subtext will be rendered. - open var subText: String? { didSet { setNeedsUpdate() }} + open var subText: String? { didSet { setNeedsUpdate() } } /// Array of LabelAttributeModel objects used in rendering the subText. - open var subTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} + open var subTextAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } /// If provided, the RadioBox subTextAttributedText will be rendered. open var subTextAttributedText: NSAttributedString? { @@ -122,10 +122,10 @@ open class RadioBoxItem: Control, Changeable, FormFieldable { } /// If provided, the RadioBox subtextRight will be rendered. - open var subTextRight: String? { didSet { setNeedsUpdate() }} + open var subTextRight: String? { didSet { setNeedsUpdate() } } /// Array of LabelAttributeModel objects used in rendering the subTextRight. - open var subTextRightAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() }} + open var subTextRightAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } /// If provided, the RadioBox subTextRightAttributedText will be rendered. open var subTextRightAttributedText: NSAttributedString? { @@ -137,11 +137,11 @@ open class RadioBoxItem: Control, Changeable, FormFieldable { } /// If provided, the radio box will be rendered to show the option with a strikethrough. - open var strikethrough: Bool = false { didSet { setNeedsUpdate() }} + open var strikethrough: Bool = false { didSet { setNeedsUpdate() } } - open var inputId: String? { didSet { setNeedsUpdate() }} + open var inputId: String? { didSet { setNeedsUpdate() } } - open var value: AnyHashable? { didSet { setNeedsUpdate() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Configuration Properties diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift index a80d875f..8404afb2 100644 --- a/VDS/Components/TextFields/EntryFieldBase.swift +++ b/VDS/Components/TextFields/EntryFieldBase.swift @@ -129,12 +129,12 @@ open class EntryFieldBase: Control, Changeable { $0.size = .small } - open var labelText: String? { didSet { setNeedsUpdate() }} + open var labelText: String? { didSet { setNeedsUpdate() } } - open var helperText: String? { didSet { setNeedsUpdate() }} + open var helperText: String? { didSet { setNeedsUpdate() } } /// Whether not to show the error. - open var showError: Bool = false { didSet { setNeedsUpdate() }} + open var showError: Bool = false { didSet { setNeedsUpdate() } } /// Override UIControl state to add the .error state if showError is true. open override var state: UIControl.State { @@ -147,29 +147,29 @@ open class EntryFieldBase: Control, Changeable { } } - open var errorText: String? { didSet { setNeedsUpdate() }} + open var errorText: String? { didSet { setNeedsUpdate() } } - open var tooltipTitle: String? { didSet { setNeedsUpdate() }} + open var tooltipTitle: String? { didSet { setNeedsUpdate() } } - open var tooltipContent: String? { didSet { setNeedsUpdate() }} + open var tooltipContent: String? { didSet { setNeedsUpdate() } } - open var tooltipContentView: UIView? { didSet { setNeedsUpdate() }} + open var tooltipContentView: UIView? { didSet { setNeedsUpdate() } } - open var transparentBackground: Bool = false { didSet { setNeedsUpdate() }} + open var transparentBackground: Bool = false { didSet { setNeedsUpdate() } } - open var width: CGFloat? { didSet { setNeedsUpdate() }} + open var width: CGFloat? { didSet { setNeedsUpdate() } } - open var maxLength: Int? { didSet { setNeedsUpdate() }} + open var maxLength: Int? { didSet { setNeedsUpdate() } } - open var inputId: String? { didSet { setNeedsUpdate() }} + open var inputId: String? { didSet { setNeedsUpdate() } } - open var value: AnyHashable? { didSet { setNeedsUpdate() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() } } - open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() }} + open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() } } - open var required: Bool = false { didSet { setNeedsUpdate() }} + open var required: Bool = false { didSet { setNeedsUpdate() } } - open var readOnly: Bool = false { didSet { setNeedsUpdate() }} + open var readOnly: Bool = false { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Constraints diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift index 1e1c985e..1f891b70 100644 --- a/VDS/Components/TextFields/InputField/InputField.swift +++ b/VDS/Components/TextFields/InputField/InputField.swift @@ -76,7 +76,7 @@ open class InputField: EntryFieldBase, UITextFieldDelegate { }.eraseToAnyColorable() /// Representing the type of input. - open var fieldType: FieldType = .text { didSet { setNeedsUpdate() }} + open var fieldType: FieldType = .text { didSet { setNeedsUpdate() } } var _showError: Bool = false /// Whether not to show the error. @@ -113,10 +113,10 @@ open class InputField: EntryFieldBase, UITextFieldDelegate { } } /// If given, this will be shown if showSuccess if true. - open var successText: String? { didSet { setNeedsUpdate() }} + open var successText: String? { didSet { setNeedsUpdate() } } /// Determines the placement of the helper text. - open var helperTextPlacement: HelperTextPlacement = .bottom { didSet { setNeedsUpdate() }} + open var helperTextPlacement: HelperTextPlacement = .bottom { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Overrides diff --git a/VDS/Components/TextFields/TextArea/TextArea.swift b/VDS/Components/TextFields/TextArea/TextArea.swift index 4b4bd85b..69bacccd 100644 --- a/VDS/Components/TextFields/TextArea/TextArea.swift +++ b/VDS/Components/TextFields/TextArea/TextArea.swift @@ -63,7 +63,7 @@ open class TextArea: EntryFieldBase { open var textViewTextColorConfiguration: AnyColorable = ViewColorConfiguration().with { $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true) $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false) - }.eraseToAnyColorable() { didSet { setNeedsUpdate() }} + }.eraseToAnyColorable() { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Overrides diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index 137c84ff..ad0951e6 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -90,7 +90,7 @@ open class TileContainer: Control { // MARK: - Public Properties //-------------------------------------------------- /// This takes an image source url and applies it as a background image. - open var backgroundImage: UIImage? { didSet{ setNeedsUpdate() } } + open var backgroundImage: UIImage? { didSet { setNeedsUpdate() } } /// This is the container in which views will be pinned. open var containerView = View().with { @@ -103,16 +103,16 @@ open class TileContainer: Control { } /// This controls the aspect ratio for the component. - open var aspectRatio: AspectRatio = .ratio1x1 { didSet{ setNeedsUpdate() } } + open var aspectRatio: AspectRatio = .ratio1x1 { didSet { setNeedsUpdate() } } /// Sets the background color for the component. - open var color: BackgroundColor = .white { didSet{ setNeedsUpdate() } } + open var color: BackgroundColor = .white { didSet { setNeedsUpdate() } } /// Sets the inside padding for the component - open var padding: Padding = .padding4X { didSet{ setNeedsUpdate() } } + open var padding: Padding = .padding4X { didSet { setNeedsUpdate() } } /// Applies a background color if backgroundImage prop fails or has trouble loading. - open var imageFallbackColor: Surface = .light { didSet{ setNeedsUpdate() } } + open var imageFallbackColor: Surface = .light { didSet { setNeedsUpdate() } } private var _width: CGFloat? /// Sets the width for the component. Accepts a pixel value. @@ -143,10 +143,10 @@ open class TileContainer: Control { } /// If true, a border is rendered around the container. - open var showBorder: Bool = false { didSet{ setNeedsUpdate() } } + open var showBorder: Bool = false { didSet { setNeedsUpdate() } } /// Determines if there is a drop shadow or not. - open var showDropShadows: Bool = false { didSet{ setNeedsUpdate() } } + open var showDropShadows: Bool = false { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Constraints diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index e6f85127..c9feb0f1 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -165,16 +165,16 @@ open class Tilelet: TileContainer { } /// Determines where the text aligns vertically. - open var textPostion: TextPosition = .top { didSet { setNeedsUpdate() }} + open var textPostion: TextPosition = .top { didSet { setNeedsUpdate() } } /// If set, this is used to render the badge. - open var badgeModel: BadgeModel? { didSet { setNeedsUpdate() }} + open var badgeModel: BadgeModel? { didSet { setNeedsUpdate() } } /// If set, this is used to render the titleLabel of the TitleLockup. - open var titleModel: TitleModel? { didSet { setNeedsUpdate() }} + open var titleModel: TitleModel? { didSet { setNeedsUpdate() } } /// If set, this is used to render the subTitleLabel of the TitleLockup. - open var subTitleModel: SubTitleModel? { didSet { setNeedsUpdate() }} + open var subTitleModel: SubTitleModel? { didSet { setNeedsUpdate() } } //only 1 Icon can be active private var _descriptiveIconModel: DescriptiveIcon? diff --git a/VDS/Components/TitleLockup/TitleLockup.swift b/VDS/Components/TitleLockup/TitleLockup.swift index 391674ae..2fdd5598 100644 --- a/VDS/Components/TitleLockup/TitleLockup.swift +++ b/VDS/Components/TitleLockup/TitleLockup.swift @@ -68,7 +68,7 @@ open class TitleLockup: View { // MARK: - Public Properties //-------------------------------------------------- /// Aligns TitleLockup's subcomponent's text - open var textAlignment: TextAlignment = .left { didSet { setNeedsUpdate() }} + open var textAlignment: TextAlignment = .left { didSet { setNeedsUpdate() } } //first row /// Label used to render the eyebrow model. @@ -77,7 +77,7 @@ open class TitleLockup: View { } /// Model used in rendering the eyebrow label. - open var eyebrowModel: EyebrowModel? { didSet { setNeedsUpdate() }} + open var eyebrowModel: EyebrowModel? { didSet { setNeedsUpdate() } } //second row /// Label used to render the title model. @@ -86,7 +86,7 @@ open class TitleLockup: View { } /// Model used in rendering the title label. - open var titleModel: TitleModel? { didSet { setNeedsUpdate() }} + open var titleModel: TitleModel? { didSet { setNeedsUpdate() } } //third row /// Label used to render the subtitle model. @@ -95,7 +95,7 @@ open class TitleLockup: View { } /// Model used in rendering the subtitle label. - open var subTitleModel: SubTitleModel? { didSet { setNeedsUpdate() }} + open var subTitleModel: SubTitleModel? { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Configuration Properties diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index 6125cac5..a13cfdb9 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -127,32 +127,32 @@ open class Toggle: Control, Changeable, FormFieldable { } /// If set to true, the toggle view will include animation between state changes. - open var isAnimated: Bool = true { didSet { setNeedsUpdate() }} + open var isAnimated: Bool = true { didSet { setNeedsUpdate() } } /// If set to true, displays text either to the right or left of the toggle. - open var showText: Bool = false { didSet { setNeedsUpdate() }} + open var showText: Bool = false { didSet { setNeedsUpdate() } } /// Text that will be shown in the status text when isOn is true - open var onText: String = "On" { didSet { setNeedsUpdate() }} + open var onText: String = "On" { didSet { setNeedsUpdate() } } /// Text that will be shown in the status text when isOn is false - open var offText: String = "Off" { didSet { setNeedsUpdate() }} + open var offText: String = "Off" { didSet { setNeedsUpdate() } } /// Returns the correct text status based on the isOn state and correlates with onText or offText. open var statusText: String { isOn ? onText : offText } /// Changes the font size of the status text. - open var textSize: TextSize = .small { didSet { setNeedsUpdate() }} + open var textSize: TextSize = .small { didSet { setNeedsUpdate() } } /// Changes the font weight of the status text. - open var textWeight: TextWeight = .regular { didSet { setNeedsUpdate() }} + open var textWeight: TextWeight = .regular { didSet { setNeedsUpdate() } } /// Positions status text to either the right or left of toggle. - open var textPosition: TextPosition = .left { didSet { setNeedsUpdate() }} + open var textPosition: TextPosition = .left { didSet { setNeedsUpdate() } } - open var inputId: String? { didSet { setNeedsUpdate() }} + open var inputId: String? { didSet { setNeedsUpdate() } } - open var value: AnyHashable? { didSet { setNeedsUpdate() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() } } /// The natural size for the receiving view, considering only properties of the view itself. open override var intrinsicContentSize: CGSize { diff --git a/VDS/Components/Toggle/ToggleView.swift b/VDS/Components/Toggle/ToggleView.swift index be90ffc0..8b817e28 100644 --- a/VDS/Components/Toggle/ToggleView.swift +++ b/VDS/Components/Toggle/ToggleView.swift @@ -64,11 +64,11 @@ open class ToggleView: Control, Changeable, FormFieldable { } } /// If set to true, the toggle view will include animation between state changes. - open var isAnimated: Bool = true { didSet { setNeedsUpdate() }} + open var isAnimated: Bool = true { didSet { setNeedsUpdate() } } - open var inputId: String? { didSet { setNeedsUpdate() }} + open var inputId: String? { didSet { setNeedsUpdate() } } - open var value: AnyHashable? { didSet { setNeedsUpdate() }} + open var value: AnyHashable? { didSet { setNeedsUpdate() } } /// The natural size for the receiving view, considering only properties of the view itself. open override var intrinsicContentSize: CGSize { toggleSize } diff --git a/VDS/Components/Tooltip/Tooltip.swift b/VDS/Components/Tooltip/Tooltip.swift index c179973d..b8ce0bf6 100644 --- a/VDS/Components/Tooltip/Tooltip.swift +++ b/VDS/Components/Tooltip/Tooltip.swift @@ -66,22 +66,22 @@ open class Tooltip: Control, TooltipLaunchable { } /// Will render the text for Close button for tooltip dialog when on mobile devices - open var closeButtonText: String = "Close" { didSet { setNeedsUpdate() }} + open var closeButtonText: String = "Close" { didSet { setNeedsUpdate() } } /// Will render icon in brand colors. - open var fillColor: FillColor = .primary { didSet { setNeedsUpdate() }} + open var fillColor: FillColor = .primary { didSet { setNeedsUpdate() } } /// Size of the icon - open var size: Size = .medium { didSet { setNeedsUpdate() }} + open var size: Size = .medium { didSet { setNeedsUpdate() } } /// Text rendered for the title of the tooltip - open var title: String? { didSet { setNeedsUpdate() }} + open var title: String? { didSet { setNeedsUpdate() } } /// Text rendered for the content of the tooltip - open var content: String? { didSet { setNeedsUpdate() }} + open var content: String? { didSet { setNeedsUpdate() } } /// UIView rendered for the content area of the tooltip - open var contentView: UIView? { didSet { setNeedsUpdate() }} + open var contentView: UIView? { didSet { setNeedsUpdate() } } //-------------------------------------------------- // MARK: - Configuration diff --git a/VDS/Components/Tooltip/TooltipDialog.swift b/VDS/Components/Tooltip/TooltipDialog.swift index e53bb250..c80b8637 100644 --- a/VDS/Components/Tooltip/TooltipDialog.swift +++ b/VDS/Components/Tooltip/TooltipDialog.swift @@ -54,13 +54,13 @@ open class TooltipDialog: View, UIScrollViewDelegate { //-------------------------------------------------- // MARK: - Public Properties //-------------------------------------------------- - open var titleText: String? { didSet { setNeedsUpdate() }} + open var titleText: String? { didSet { setNeedsUpdate() } } open var titleLabel = Label().with { label in label.isAccessibilityElement = true label.textStyle = .boldTitleMedium } - open var contentText: String? { didSet { setNeedsUpdate() }} + open var contentText: String? { didSet { setNeedsUpdate() } } open var contentLabel = Label().with { label in label.isAccessibilityElement = true label.textStyle = .bodyLarge @@ -68,7 +68,7 @@ open class TooltipDialog: View, UIScrollViewDelegate { open var contentView: UIView? = nil - open var closeButtonText: String = "Close" { didSet { setNeedsUpdate() }} + open var closeButtonText: String = "Close" { didSet { setNeedsUpdate() } } open lazy var closeButton: UIButton = { let button = UIButton(type: .system) diff --git a/VDS/Components/Tooltip/TrailingTooltipLabel.swift b/VDS/Components/Tooltip/TrailingTooltipLabel.swift index dc4f1f3e..4ea09a90 100644 --- a/VDS/Components/Tooltip/TrailingTooltipLabel.swift +++ b/VDS/Components/Tooltip/TrailingTooltipLabel.swift @@ -41,7 +41,7 @@ open class TrailingTooltipLabel: View, TooltipLaunchable { open var label = Label() /// Text used to render the label. - open var labelText: String? { didSet { setNeedsUpdate() }} + open var labelText: String? { didSet { setNeedsUpdate() } } /// Attributes used to render the label. open var labelAttributes: [any LabelAttributeModel]? { didSet { setNeedsUpdate() } } @@ -55,7 +55,7 @@ open class TrailingTooltipLabel: View, TooltipLaunchable { /// Color configuration set for the label. public lazy var textColorConfiguration: AnyColorable = { label.textColorConfiguration - }() { didSet { setNeedsUpdate() }} + }() { didSet { setNeedsUpdate() } } /// Will render the text for Close button for tooltip dialog when on mobile devices open var tooltipCloseButtonText: String = "Close" { didSet { setNeedsUpdate() } } diff --git a/VDS/Extensions/UIView+NSLayoutConstraint.swift b/VDS/Extensions/UIView+NSLayoutConstraint.swift index e53dc1d5..7f9dac4d 100644 --- a/VDS/Extensions/UIView+NSLayoutConstraint.swift +++ b/VDS/Extensions/UIView+NSLayoutConstraint.swift @@ -43,7 +43,7 @@ extension NSLayoutConstraint { public var heightConstraint: NSLayoutConstraint? public var isActive: Bool = false { - didSet{ + didSet { topConstraint?.isActive = isActive bottomConstraint?.isActive = isActive leadingConstraint?.isActive = isActive