From 971c6f6055f309f5e89ebd98a9ff302c936e5a48 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 29 Aug 2023 08:51:00 -0500 Subject: [PATCH] refactored protocols Signed-off-by: Matt Bruce --- VDS/Components/Buttons/Button/Button.swift | 2 +- .../ButtonGroup/ButtonGroupCollectionViewCell.swift | 9 ++++++--- VDS/Components/Buttons/TextLink/TextLink.swift | 2 +- VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/VDS/Components/Buttons/Button/Button.swift b/VDS/Components/Buttons/Button/Button.swift index c2620a64..cda4df66 100644 --- a/VDS/Components/Buttons/Button/Button.swift +++ b/VDS/Components/Buttons/Button/Button.swift @@ -22,7 +22,7 @@ public enum ButtonSize: String, CaseIterable { /// you need to ensure that one of these Horizontal Contraints is not constraint of "equatTo". If you are to pin the left/right edges /// to its parent this object will stretch to the parent's width. @objc(VDSButton) -open class Button: ButtonBase, Useable { +open class Button: ButtonBase, Useable, Buttonable { //-------------------------------------------------- // MARK: - Initializers diff --git a/VDS/Components/Buttons/ButtonGroup/ButtonGroupCollectionViewCell.swift b/VDS/Components/Buttons/ButtonGroup/ButtonGroupCollectionViewCell.swift index 7e63d749..cd9ff406 100644 --- a/VDS/Components/Buttons/ButtonGroup/ButtonGroupCollectionViewCell.swift +++ b/VDS/Components/Buttons/ButtonGroup/ButtonGroupCollectionViewCell.swift @@ -8,10 +8,13 @@ import Foundation import UIKit +extension ButtonGroup { + + public class ButtonGroupCollectionViewCell: UICollectionViewCell {} + +} -public class ButtonGroupCollectionViewCell: UICollectionViewCell {} - -extension ButtonGroupCollectionViewCell: AppleGuidlinesTouchable { +extension ButtonGroup.ButtonGroupCollectionViewCell: AppleGuidlinesTouchable { override open func point(inside point: CGPoint, with event: UIEvent?) -> Bool { Self.acceptablyOutsideBounds(point: point, bounds: bounds) diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift index 3f7d59f5..3b7dedff 100644 --- a/VDS/Components/Buttons/TextLink/TextLink.swift +++ b/VDS/Components/Buttons/TextLink/TextLink.swift @@ -18,7 +18,7 @@ import Combine /// you need to ensure that one of these Horizontal Contraints is not constraint of "equatTo". If you are to pin the left/right edges /// to its parent this object will stretch to the parent's width. @objc(VDSTextLink) -open class TextLink: ButtonBase { +open class TextLink: ButtonBase, Buttonable { //-------------------------------------------------- // MARK: - Initializers //-------------------------------------------------- diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift index 3e6c607f..f3718b81 100644 --- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift +++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift @@ -18,7 +18,7 @@ import Combine /// you need to ensure that one of these Horizontal Contraints is not constraint of "equatTo". If you are to pin the left/right edges /// to its parent this object will stretch to the parent's width. @objc(VDSTextLinkCaret) -open class TextLinkCaret: ButtonBase { +open class TextLinkCaret: ButtonBase, Buttonable { //-------------------------------------------------- // MARK: - Initializers //--------------------------------------------------