[Issue 19] Use SystemImage enum for default close button image (#25)

Author: Mark Pospesel

Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2023 Y Media Labs. All rights reserved.
 //
 
-import Foundation
 import UIKit
 
 internal extension BottomSheetController {

Sources/YBottomSheet/Enums/BottomSheetController+Images.swift

@@ -0,0 +1,20 @@
+//
+//  BottomSheetController+Images.swift
+//  YBottomSheet
+//
+//  Created by Mark Pospesel on 4/26/23.
+//  Copyright © 2023 Y Media Labs. All rights reserved.
+//
+
+import UIKit
+import YCoreUI
+
+extension BottomSheetController {
+    /// Images
+    enum Images: String, SystemImage, CaseIterable {
+        /// xmark
+        case xmark
+        
+        static var renderingMode: UIImage.RenderingMode { .alwaysTemplate }
+    }
+}

Sources/YBottomSheet/SheetHeaderView/SheetHeaderView+Appearance.swift

@@ -20,17 +20,20 @@ extension SheetHeaderView {
         /// Header view layout properties such as spacing between views. Default is `.default`.
         public let layout: Layout
 
-        /// Default appearance.
+        /// Default appearance
         public static let `default` = Appearance()
-                
+
+        /// Default close button image (SF symbol `xmark`)
+        public static let defaultCloseButtonImage: UIImage = BottomSheetController.Images.xmark.image
+
         /// Initializes a sheet header appearance.
         /// - Parameters:
         ///   - title: tuple consisting of `textColor` and `typography` for the title label.
         ///   - closeButtonImage: close button image or pass `nil` to hide the button.
         ///   - layout: sheet header view layout properties such as spacing between views.
         public init(
             title: (textColor: UIColor, typography: Typography) = (.label, .systemLabel.fontWeight(.semibold)),
-            closeButtonImage: UIImage? = UIImage(systemName: "xmark"),
+            closeButtonImage: UIImage? = defaultCloseButtonImage,
             layout: Layout = .default
         ) {
             self.title = title

Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift

@@ -26,8 +26,14 @@ open class SheetHeaderView: UIView {
     public let titleLabel = TypographyLabel(typography: .systemLabel.fontWeight(.semibold))
 
     /// Close button to dismiss the bottom sheet.
-    public let closeButton = UIButton()
-    
+    public let closeButton: UIButton = {
+        let button = UIButton()
+        button.adjustsImageSizeForAccessibilityContentSizeCategory = true
+        button.imageView?.contentMode = .scaleAspectFit
+        button.imageView?.constrainAspectRatio(1)
+        return button
+    }()
+
     private let buttonSize = CGSize(width: 44, height: 44)
     private weak var closeButtonLeadingConstraint: NSLayoutConstraint?
     private weak var closeButtonTrailingConstraint: NSLayoutConstraint?

Tests/YBottomSheetTests/Enums/BottomSheetController+ImagesTests.swift

@@ -0,0 +1,18 @@
+//
+//  BottomSheetController+ImagesTests.swift
+//  YBottomSheet
+//
+//  Created by Mark Pospesel on 4/26/23.
+//  Copyright © 2023 Y Media Labs. All rights reserved.
+//
+
+import XCTest
+@testable import YBottomSheet
+
+final class BottomSheetControllerImagesTests: XCTestCase {
+    func test_loadImages() {
+        BottomSheetController.Images.allCases.forEach {
+            XCTAssertNotNil($0.loadImage())
+        }
+    }
+}

Tests/YBottomSheetTests/SheetHeaderView/SheetHeaderViewAppearanceTests.swift

@@ -15,12 +15,17 @@ final class SheetHeaderViewAppearanceTests: XCTestCase {
         let sut = SheetHeaderView.Appearance.default
         let expected = SheetHeaderView.Appearance(
             title: (.label, .systemLabel.fontWeight(.semibold)),
-            closeButtonImage: UIImage(systemName: "xmark"),
+            closeButtonImage: SheetHeaderView.Appearance.defaultCloseButtonImage,
             layout: .default
         )
 
         XCTAssertHeaderAppearanceEqual(sut, expected)
     }
+
+    func test_defaultCloseButtonImage() {
+        let sut = SheetHeaderView.Appearance.defaultCloseButtonImage
+        XCTAssertEqual(sut, BottomSheetController.Images.xmark.image)
+    }
 }
 
 extension XCTestCase {