diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift index 624a733..b9336a5 100644 --- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift +++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift @@ -219,6 +219,6 @@ extension BadgeIndicatorViewController: ComponentSampleable { component.number = 23 component.kind = .simple component.size = .medium - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift index 712bd9f..3e37bd9 100644 --- a/VDSSample/ViewControllers/BadgeViewController.swift +++ b/VDSSample/ViewControllers/BadgeViewController.swift @@ -115,6 +115,6 @@ extension BadgeViewController: ComponentSampleable { component.text = "Terms and conditions" component.maxWidth = 70 component.numberOfLines = 3 - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift index 67ad873..60bc010 100644 --- a/VDSSample/ViewControllers/ButtonGroupViewController.swift +++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift @@ -210,6 +210,6 @@ extension ButtonGroupViewController: ComponentSampleable { TextLinkCaret().with { $0.text = "Text Link Caret" } ] - return ComponentSample(component: component, canPinTrailing: true) + return ComponentSample(component: component) } } diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift index 7a0275a..35ca693 100644 --- a/VDSSample/ViewControllers/ButtonIconViewController.swift +++ b/VDSSample/ViewControllers/ButtonIconViewController.swift @@ -175,6 +175,6 @@ extension ButtonIconViewController: ComponentSampleable { let component = Self.makeComponent() component.iconName = .addToFavorite component.size = .large - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift index 4fbccb3..7f10d8c 100644 --- a/VDSSample/ViewControllers/ButtonViewController.swift +++ b/VDSSample/ViewControllers/ButtonViewController.swift @@ -106,6 +106,6 @@ extension ButtonViewController: ComponentSampleable { component.onClick = { c in print("\(c.text!) Click")} component.use = .primary component.size = .large - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift index b3df8c4..c329a6a 100644 --- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift +++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift @@ -138,6 +138,6 @@ extension CheckboxGroupViewController: ComponentSampleable { component.selectorModels = [checkbox1, checkbox2] - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift index f95720a..22da3a0 100644 --- a/VDSSample/ViewControllers/CheckboxItemViewController.swift +++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift @@ -101,6 +101,6 @@ extension CheckboxItemViewController: ComponentSampleable { component.childText = "I agree to Verizon's terms and conditions click here" component.errorText = "Error Text" - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift index 8a9f10e..cb07f63 100644 --- a/VDSSample/ViewControllers/CheckboxViewController.swift +++ b/VDSSample/ViewControllers/CheckboxViewController.swift @@ -65,6 +65,6 @@ class CheckboxViewController: BaseViewController { extension CheckboxViewController: ComponentSampleable { static func makeSample() -> ComponentSample { let component = Self.makeComponent() - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift index d621e49..692663c 100644 --- a/VDSSample/ViewControllers/IconViewController.swift +++ b/VDSSample/ViewControllers/IconViewController.swift @@ -96,6 +96,6 @@ extension IconViewController: ComponentSampleable { component.color = color.uiColor component.name = name component.customSize = 50 - return ComponentSample(component: component, canPinTrailing: false, canPinBottom: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual, bottomPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift index 8b5ee88..8642dfd 100644 --- a/VDSSample/ViewControllers/InputFieldViewController.swift +++ b/VDSSample/ViewControllers/InputFieldViewController.swift @@ -179,6 +179,6 @@ extension InputFieldViewController: ComponentSampleable { component.successText = "Good job entering a valid address!" component.tooltipTitle = "Check the formatting of your address" component.tooltipContent = "House/Building number then street name" - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift index 65c9687..f2b484a 100644 --- a/VDSSample/ViewControllers/LabelViewController.swift +++ b/VDSSample/ViewControllers/LabelViewController.swift @@ -346,6 +346,6 @@ extension LabelViewController: ComponentSampleable { static func makeSample() -> ComponentSample { let component = Self.makeComponent() component.text = "Helg¹ worldg Hell¹ worldg" - return ComponentSample(component: component, canPinTrailing: true) + return ComponentSample(component: component) } } diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift index 03a1199..3c8737e 100644 --- a/VDSSample/ViewControllers/NotificationViewController.swift +++ b/VDSSample/ViewControllers/NotificationViewController.swift @@ -160,6 +160,6 @@ extension NotificationViewController: ComponentSampleable { component.primaryButtonModel = .init(text: firstButtonDefaultText, onClick: {b in print("\(b.text!) click")}) component.secondaryButtonModel = .init(text: secondButtonDefaultText, onClick: {b in print("\(b.text!) click")}) component.onCloseClick = {_ in print("notification on close click")} - return ComponentSample(component: component, canPinTrailing: true) + return ComponentSample(component: component) } } diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift index e5fc2fb..ebb0abe 100644 --- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift +++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift @@ -131,6 +131,6 @@ extension RadioBoxGroupViewController: ComponentSampleable { component.selectorModels = [radioBox1, radioBox2] - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift index 57afab3..f5bf1ad 100644 --- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift +++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift @@ -133,6 +133,6 @@ extension RadioButtonGroupViewController: ComponentSampleable { component.selectorModels = [radioButton1, radioButton2, radioButton3] - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift index f211c02..28ebc74 100644 --- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift +++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift @@ -105,6 +105,6 @@ extension RadioButtonItemViewController: ComponentSampleable { component.childText = "I agree to Verizon's terms and conditions click here" component.errorText = "Error Text" - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift index 19b9eb4..0325c28 100644 --- a/VDSSample/ViewControllers/RadioButtonViewController.swift +++ b/VDSSample/ViewControllers/RadioButtonViewController.swift @@ -69,6 +69,6 @@ class RadioButtonViewController: BaseViewController { extension RadioButtonViewController: ComponentSampleable { static func makeSample() -> ComponentSample { let component = Self.makeComponent() - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift index 42e020b..80bcda1 100644 --- a/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift +++ b/VDSSample/ViewControllers/RadioSwatchGroupViewController.swift @@ -152,7 +152,7 @@ extension RadioSwatchGroupViewController: ComponentSampleable { component.selectorModels = [radioSwatch1, radioSwatch2, radioSwatch3, radioSwatch4, radioSwatch5, radioSwatch6, radioSwatch7, radioSwatch8] - return ComponentSample(component: component, canPinTrailing: true) + return ComponentSample(component: component) } } diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift index ff8457b..191791b 100644 --- a/VDSSample/ViewControllers/TableViewTestController.swift +++ b/VDSSample/ViewControllers/TableViewTestController.swift @@ -1,4 +1,3 @@ -// // TableViewTestController.swift // VDSSample // @@ -14,17 +13,76 @@ public typealias ComponentSampleView = UIView & Surfaceable public struct ComponentSample { public var component: ComponentSampleView - public var canPinLeading: Bool - public var canPinTrailing: Bool - public var canPinTop: Bool - public var canPinBottom: Bool + public enum GreaterThanPinningType: String { + case none, equalTo, greaterThanOrEqual + } - public init(component: ComponentSampleView, canPinLeading: Bool = true, canPinTrailing: Bool = true, canPinTop: Bool = true, canPinBottom: Bool = true) { + public enum LessThanPinningType: String { + case none, equalTo, lessThanOrEqual + } + + public var top: GreaterThanPinningType = .equalTo + public var leading: GreaterThanPinningType = .equalTo + public var trailing: LessThanPinningType = .equalTo + public var bottom: LessThanPinningType = .equalTo + + public init(component: ComponentSampleView, + topPinningType: GreaterThanPinningType = .equalTo, + leadingPinningType: GreaterThanPinningType = .equalTo, + trailingPinningType: LessThanPinningType = .equalTo, + bottomPinningType: LessThanPinningType = .equalTo) { + self.component = component - self.canPinLeading = canPinLeading - self.canPinTrailing = canPinTrailing - self.canPinTop = canPinTop - self.canPinBottom = canPinBottom + self.top = topPinningType + self.leading = leadingPinningType + self.trailing = trailingPinningType + self.bottom = bottomPinningType + } + + public func pin(edgeInset: UIEdgeInsets = .zero) { + + guard let superview = component.superview else { return } + switch top { + case .equalTo: + component.pinTop(anchor: superview.topAnchor, constant: edgeInset.top) + + case .greaterThanOrEqual: + component.pinTopGreaterThanOrEqualTo(anchor: superview.topAnchor, constant: edgeInset.top) + + case .none: break + } + + switch leading { + case .equalTo: + component.pinLeading(anchor: superview.leadingAnchor, constant: edgeInset.left) + + case .greaterThanOrEqual: + component.pinLeadingGreaterThanOrEqualTo(anchor: superview.leadingAnchor, constant: edgeInset.left) + + case .none: break + + } + + switch trailing { + case .equalTo: + component.pinTrailing(anchor: superview.trailingAnchor, constant: edgeInset.right) + + case .lessThanOrEqual: + component.pinTrailingLessThanOrEqualTo(anchor: superview.trailingAnchor, constant: edgeInset.right) + + case .none: break + } + + switch bottom { + case .equalTo: + component.pinBottom(anchor: superview.bottomAnchor, constant: edgeInset.bottom) + + case .lessThanOrEqual: + component.pinBottomLessThanOrEqualTo(anchor: superview.bottomAnchor, constant: edgeInset.bottom) + + case .none: break + } + } } @@ -32,9 +90,15 @@ protocol ComponentSampleable { static func makeSample() -> ComponentSample } -public class TableViewTestController: UITableViewController, Initable, Surfaceable { - +public class TableViewTestController: UIViewController, Initable, Surfaceable { + var components:[ComponentSample] = [] + lazy var tableView = UITableView().with { + $0.translatesAutoresizingMaskIntoConstraints = false + $0.delegate = self + $0.dataSource = self + } + public var surface: Surface = .light { didSet { tableView.reloadData() @@ -46,113 +110,121 @@ public class TableViewTestController: UITableViewController, Initable, Surfaceab required public init() { super.init(nibName: nil, bundle: nil) } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - + public override func viewDidLoad() { super.viewDidLoad() - MenuViewController.items.forEach { menuItem in - if let componentable = menuItem.viewController as? ComponentSampleable.Type { - components.append(componentable.makeSample()) - } - } - tableView.register(VDSCell.self, forCellReuseIdentifier: "cell") - tableView.allowsSelection = false - tableView.estimatedRowHeight = 45 - tableView.separatorStyle = .none - tableView.rowHeight = UITableView.automaticDimension - tableView.reloadData() - let view = View(frame: .init(origin: .zero, size: .init(width: tableView.bounds.width, height: 100))) + let toggle = Toggle().with { $0.showText = true - $0.textPosition = .right + //$0.textPosition = .right $0.offText = "Light" $0.onText = "Dark" $0.onChange = { [weak self] toggle in self?.surface = toggle.isOn ? .dark : .light } } - view.addSubview(toggle) - toggle.pinToSuperView(.init(top: 5, left: 16, bottom: 5, right: 16)) - tableView.tableHeaderView = view - tableView.tableHeaderView?.frame.size.height = 40 + + let toggleSample = ComponentSample(component: toggle, leadingPinningType: .none) + let wrapper = UIView().with { $0.translatesAutoresizingMaskIntoConstraints = false } + wrapper.addSubview(toggle) + toggleSample.pin(edgeInset: .init(top: 5, left: 5, bottom: 5, right: 5)) + + let stackView = UIStackView(arrangedSubviews: [wrapper, tableView]).with { + $0.translatesAutoresizingMaskIntoConstraints = false + $0.axis = .vertical + $0.spacing = 4 + $0.distribution = .fill + } + view.backgroundColor = Surface.light.color + view.addSubview(stackView) + + NSLayoutConstraint.activate([ + stackView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor), + stackView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor), + stackView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor), + stackView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor) + ]) + + //var items = MenuViewController.items + let items = [ + MenuComponent(title: "Badge", completed: true, viewController: BadgeViewController.self), + MenuComponent(title: "Button", completed: true, viewController: ButtonViewController.self), + MenuComponent(title: "ButtonGroup", completed: true, viewController: ButtonGroupViewController.self), + MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self), + MenuComponent(title: "Line", completed: true, viewController: LineViewController.self), + MenuComponent(title: "Loader", completed: true, viewController: LoaderViewController.self), + MenuComponent(title: "Tabs", completed: true, viewController: TabsViewController.self), + MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self), + MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self), + MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self), + MenuComponent(title: "Tooltip", completed: true, viewController: TooltipViewController.self) + ] + + items.forEach { menuItem in + if let componentable = menuItem.viewController as? ComponentSampleable.Type { + components.append(componentable.makeSample()) + } + } + + tableView.register(VDSCell.self, forCellReuseIdentifier: "cell") + tableView.allowsSelection = false + tableView.estimatedRowHeight = 45 + tableView.separatorStyle = .singleLine + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + tableView.reloadData() } - public override func numberOfSections(in tableView: UITableView) -> Int { - components.count + public func refresh() { + DispatchQueue.main.async { [self] in + tableView.beginUpdates() + tableView.endUpdates() + } } +} + +extension TableViewTestController : UITableViewDelegate, UITableViewDataSource { - public override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - "\(type(of: components[section].component))" - } - - public override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { - 40 - } - - public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + public func numberOfSections(in tableView: UITableView) -> Int { 1 } + + public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + components.count + } - public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { guard let cell = tableView.dequeueReusableCell(withIdentifier: "cell") as? VDSCell else { return UITableViewCell() } cell.prepareForReuse() cell.surface = surface - cell.sample = components[indexPath.section] + cell.sample = components[indexPath.row] return cell } - } -public class VDSCell: UITableViewCell, AppleGuidlinesTouchable, Surfaceable { +public class VDSCell: UITableViewCell, Surfaceable { public var surface: Surface = .light public var sample: ComponentSample? { didSet { contentView.subviews.forEach { $0.removeFromSuperview() } - let edges: UIEdgeInsets = .init(top: 16, left: 16, bottom: 16, right: 16) + guard let sample else { return } + var component = sample.component component.surface = surface - - let wrapper = View() - wrapper.addSubview(component) - if sample.canPinTop { - component.pinTop(anchor: wrapper.topAnchor, constant: edges.top) - } else { - component.pinTopGreaterThanOrEqualTo(anchor: wrapper.topAnchor, constant: edges.top) - } - - if sample.canPinLeading { - component.pinLeading(anchor: wrapper.leadingAnchor, constant: edges.left) - } else { - component.pinLeadingGreaterThanOrEqualTo(anchor: wrapper.leadingAnchor, constant: edges.left) - } - - if sample.canPinTrailing { - component.pinTrailing(anchor: wrapper.trailingAnchor, constant: edges.right) - } else { - component.pinTrailingLessThanOrEqualTo(anchor: wrapper.trailingAnchor, constant: edges.right) - } + contentView.addSubview(component) + sample.pin(edgeInset: .init(top: 16, left: 16, bottom: 16, right: 16)) - if sample.canPinBottom { - component.pinBottom(anchor: wrapper.bottomAnchor, constant: edges.bottom) - } else { - component.pinBottomLessThanOrEqualTo(anchor: wrapper.bottomAnchor, constant: edges.bottom) - } - - contentView.addSubview(wrapper) - wrapper.pinToSuperView(edges) - - backgroundColor = .systemYellow //surface.color + backgroundColor = surface.color } } - - override open func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - Self.acceptablyOutsideBounds(point: point, bounds: bounds) - } - } + diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift index ef13e68..97c3ddd 100644 --- a/VDSSample/ViewControllers/TabsViewController.swift +++ b/VDSSample/ViewControllers/TabsViewController.swift @@ -153,6 +153,6 @@ extension TabsViewController: ComponentSampleable { .init(text: "Contact Us") ] - return ComponentSample(component: component, canPinTrailing: true) + return ComponentSample(component: component) } } diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift index c919552..6ddb8ed 100644 --- a/VDSSample/ViewControllers/TextAreaViewController.swift +++ b/VDSSample/ViewControllers/TextAreaViewController.swift @@ -148,6 +148,6 @@ extension TextAreaViewController: ComponentSampleable { component.errorText = "Enter a valid address." component.tooltipTitle = "Check the formatting of your address" component.tooltipContent = "House/Building number then street name" - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift index 8f689e9..05b1903 100644 --- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift +++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift @@ -78,6 +78,6 @@ extension TextLinkCaretViewController: ComponentSampleable { let component = Self.makeComponent() component.text = "Text Link Caret" component.onClick = { c in print("\(c.text!) Click")} - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift index ffc26a2..ab5516e 100644 --- a/VDSSample/ViewControllers/TextLinkViewController.swift +++ b/VDSSample/ViewControllers/TextLinkViewController.swift @@ -80,6 +80,6 @@ extension TextLinkViewController: ComponentSampleable { let component = Self.makeComponent() component.text = "Text Link" component.onClick = { c in print("\(c.text!) Click")} - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift index 77a7022..ec374ad 100644 --- a/VDSSample/ViewControllers/TileContainerViewController.swift +++ b/VDSSample/ViewControllers/TileContainerViewController.swift @@ -153,6 +153,6 @@ extension TileContainerViewController: ComponentSampleable { let component = Self.makeComponent() component.width = 150 component.color = .black - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift index 59177f1..e6872ac 100644 --- a/VDSSample/ViewControllers/TileletViewController.swift +++ b/VDSSample/ViewControllers/TileletViewController.swift @@ -240,6 +240,6 @@ extension TileletViewController: ComponentSampleable { component.titleModel = titleModel component.subTitleModel = subTitleModel component.width = 250 - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift index 9d424f2..2e2c686 100644 --- a/VDSSample/ViewControllers/TitleLockupViewController.swift +++ b/VDSSample/ViewControllers/TitleLockupViewController.swift @@ -184,6 +184,6 @@ extension TitleLockupViewController: ComponentSampleable { component.titleModel = titleModel component.subTitleModel = subTitleModel component.debugBorder(show: true) - return ComponentSample(component: component, canPinTrailing: true) + return ComponentSample(component: component) } } diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift index 5978d86..b95471f 100644 --- a/VDSSample/ViewControllers/ToggleViewController.swift +++ b/VDSSample/ViewControllers/ToggleViewController.swift @@ -119,6 +119,6 @@ class ToggleViewController: BaseViewController { extension ToggleViewController: ComponentSampleable { static func makeSample() -> ComponentSample { let component = Self.makeComponent() - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift index 44f1667..5e80f57 100644 --- a/VDSSample/ViewControllers/TooltipViewController.swift +++ b/VDSSample/ViewControllers/TooltipViewController.swift @@ -106,7 +106,7 @@ extension TooltipViewController: ComponentSampleable { let component = Self.makeComponent() component.title = "5G Ultra Wideband is available in your area." component.content = "$799.99 (128 GB only) " - return ComponentSample(component: component, canPinTrailing: false, canPinBottom: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual, bottomPinningType: .lessThanOrEqual) } } diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift index 6534535..4398884 100644 --- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift +++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift @@ -174,7 +174,7 @@ extension TrailingTooltipLabelViewController: ComponentSampleable { component.labelText = "5G Ultra Wideband is available in your area" component.tooltipTitle = "5G Ultra Wideband is available in your area." component.tooltipContent = "$799.99 (128 GB only)" - return ComponentSample(component: component, canPinTrailing: false) + return ComponentSample(component: component, trailingPinningType: .lessThanOrEqual) } }