Merge branch 'develop' into 'release/11_4_0'

# Conflicts:
#   VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift

VDS.xcodeproj/project.pbxproj

@@ -132,6 +132,7 @@
 		EAD068922A560B65002E3A2D /* LoaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD068912A560B65002E3A2D /* LoaderViewController.swift */; };
 		EAD068942A560C13002E3A2D /* LoaderLaunchable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD068932A560C13002E3A2D /* LoaderLaunchable.swift */; };
 		EAD8D2C128BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD8D2C028BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift */; };
+		EAE785312BA0A438009428EA /* UIImage+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE785302BA0A438009428EA /* UIImage+Helper.swift */; };
 		EAEEEC922B1F807300531FC2 /* BadgeChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = EAEEEC912B1F807300531FC2 /* BadgeChangeLog.txt */; };
 		EAEEEC962B1F893B00531FC2 /* ButtonChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = EAEEEC952B1F893B00531FC2 /* ButtonChangeLog.txt */; };
 		EAEEEC982B1F8DD100531FC2 /* LineChangeLog.txt in Resources */ = {isa = PBXBuildFile; fileRef = EAEEEC972B1F8DD100531FC2 /* LineChangeLog.txt */; };
@@ -303,6 +304,7 @@
 		EAD068912A560B65002E3A2D /* LoaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoaderViewController.swift; sourceTree = "<group>"; };
 		EAD068932A560C13002E3A2D /* LoaderLaunchable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoaderLaunchable.swift; sourceTree = "<group>"; };
 		EAD8D2C028BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+Publisher.swift"; sourceTree = "<group>"; };
+		EAE785302BA0A438009428EA /* UIImage+Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Helper.swift"; sourceTree = "<group>"; };
 		EAEEEC912B1F807300531FC2 /* BadgeChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = BadgeChangeLog.txt; sourceTree = "<group>"; };
 		EAEEEC952B1F893B00531FC2 /* ButtonChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = ButtonChangeLog.txt; sourceTree = "<group>"; };
 		EAEEEC972B1F8DD100531FC2 /* LineChangeLog.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LineChangeLog.txt; sourceTree = "<group>"; };
@@ -536,6 +538,7 @@
 				EA81410F2A127066004F60D2 /* UIColor+VDSColor.swift */,
 				EA33623D2892EE950071C351 /* UIDevice.swift */,
 				EA0B18092AA78F9000F2D0CD /* UIEdgeInsets.swift */,
+				EAE785302BA0A438009428EA /* UIImage+Helper.swift */,
 				EAF7F0B6289C12A600B287F5 /* UITapGestureRecognizer.swift */,
 				EA8E40902A7D3F6300934ED3 /* UIView+Accessibility.swift */,
 				EAB5FED329267EB300998C17 /* UIView+NSLayoutConstraint.swift */,
@@ -1025,6 +1028,7 @@
 				EAF7F0AF289B144C00B287F5 /* UnderlineLabelAttribute.swift in Sources */,
 				EA0D1C412A6AD61C00E5C127 /* Typography+Additional.swift in Sources */,
 				EAC925842911C63100091998 /* Colorable.swift in Sources */,
+				EAE785312BA0A438009428EA /* UIImage+Helper.swift in Sources */,
 				EAB5FEF5292D371F00998C17 /* ButtonBase.swift in Sources */,
 				EA978EC5291D6AFE00ACC883 /* AnyLabelAttribute.swift in Sources */,
 				EAC71A1F2A2E173D00E47A9F /* RadioButton.swift in Sources */,

VDS/Classes/SelfSizingCollectionView.swift

@@ -73,7 +73,7 @@ public final class SelfSizingCollectionView: UICollectionView {
         //ensure autoLayout uses intrinsic height
         setContentHuggingPriority(.required, for: .vertical)
         setContentCompressionResistancePriority(.required, for: .vertical)
-        collectionViewHeight = heightAnchor.constraint(equalToConstant: 0).activate()
+        collectionViewHeight = height(constant: 0, priority: .defaultHigh)
         
         anyCancellable = self.publisher(for: \.contentSize, options: [.new])
             .sink { [weak self] compare in

VDS/Components/Icon/Icon.swift

@@ -44,7 +44,7 @@ open class Icon: View {
     //--------------------------------------------------
     /// UIImageView used to render the icon.
     open var imageView = UIImageView().with {
-        $0.isAccessibilityElement = false 
+        $0.isAccessibilityElement = false
         $0.translatesAutoresizingMaskIntoConstraints = false
         $0.contentMode = .scaleAspectFill
         $0.clipsToBounds = true
@@ -109,8 +109,8 @@ open class Icon: View {
                 
         //get the image name
         //set the image
-        if let name, let image = getImage(for: name.rawValue) {
+        if let name, let image = UIImage.image(for: name, color: imageColor) {
-            setImage(image: image, imageColor: imageColor)
+            imageView.image = image
         } else {
             imageView.image = nil
         }
@@ -129,17 +129,17 @@ open class Icon: View {
         super.updateAccessibility()
         accessibilityLabel = name?.rawValue ?? "icon"
     }
-               
-    //--------------------------------------------------
-    // MARK: - Private Methods
-    //--------------------------------------------------
-    private func getImage(for imageName: String) -> UIImage? {
-        
-        return BundleManager.shared.image(for: imageName)
-    }
-    
-    private func setImage(image: UIImage, imageColor: UIColor) {
-        imageView.image = image.withTintColor(imageColor)
-    }
 }
 
+extension UIImage {
+    
+    /// UIImage helper for finding images based on the Icon.Name which uses the internal BundleManager.
+    /// - Parameters:
+    ///   - name: Icon.Name rawRepresentable.
+    ///   - color: Color to Tint the image with
+    ///   - renderingMode: UIImage Rendering mode.
+    /// - Returns: UIImage for this proecess
+    public static func image(for iconName: Icon.Name, color: UIColor? = nil, renderingMode: UIImage.RenderingMode = .alwaysOriginal) -> UIImage? {
+        image(representing: iconName, color: color, renderingMode: renderingMode)
+    }
+}

VDS/Extensions/UIImage+Helper.swift

@@ -0,0 +1,26 @@
+//
+//  UIImage+Icon.swift
+//  VDS
+//
+//  Created by Matt Bruce on 3/11/24.
+//
+
+import Foundation
+import UIKit
+ 
+extension UIImage {
+    
+    /// UIImage helper for finding images based on the Icon.Name which uses the internal BundleManager.
+    /// - Parameters:
+    ///   - name: RawRepresentable.
+    ///   - color: Color to Tint the image with
+    ///   - renderingMode: UIImage Rendering mode.
+    /// - Returns: UIImage for this proecess
+    public static func image<T: RawRepresentable>(representing representable: T, color: UIColor? = nil, renderingMode: UIImage.RenderingMode = .alwaysOriginal) -> UIImage? where T.RawValue == String {
+        guard let image = BundleManager.shared.image(for: representable.rawValue) else { return nil }
+        
+        guard let color else { return image }
+        
+        return image.withTintColor(color, renderingMode: renderingMode)
+    }
+}