From 448c0a043b79776968d344ab998da8c482c8c26d Mon Sep 17 00:00:00 2001
From: Thy Nguyen <thy.nguyen@what3words.com>
Date: Mon, 11 Mar 2024 02:22:11 +0700
Subject: [PATCH] [MT-6655] Fix close button image UI bug

---
 .../Views/Buttons/W3WCloseButton.swift        | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Sources/W3WSwiftDesign/Views/Buttons/W3WCloseButton.swift b/Sources/W3WSwiftDesign/Views/Buttons/W3WCloseButton.swift
index 5f6aace..1056c79 100644
--- a/Sources/W3WSwiftDesign/Views/Buttons/W3WCloseButton.swift
+++ b/Sources/W3WSwiftDesign/Views/Buttons/W3WCloseButton.swift
@@ -8,8 +8,6 @@
 import UIKit
 
 public class W3WCloseButton: W3WButton {
-  public var onTouch: (() -> Void)?
-  
   let size: CGFloat
   let inset: CGFloat
   let roundedCorners: Bool
@@ -23,23 +21,22 @@ public class W3WCloseButton: W3WButton {
     self.size = size
     self.inset = inset
     self.roundedCorners = roundedCorners
-    self.onTouch = onTouch
     
     let colors = W3WColors(foreground: .clear, tint: .white)
     
     let styles: W3WStyles = .standard
       .with(visualEffect: W3WVisualEffect(style: .thin,
-                                          fill: .fill,
+                                          fill: .tertiaryFill,
                                           padding: W3WPadding(value: inset),
                                           cornerRadius: roundedCorners ? W3WCornerRadius(value: (size - inset * 2.0) / 2.0) : 0.0))
-      .with(padding: W3WPadding(value: inset + 8.0))
+      .with(padding: W3WPadding(value: inset + 7.0))
 
     let scheme = W3WScheme(colors: colors, styles: styles)
 
-    super.init(image: .xmark, scheme: scheme)
+    super.init(image: .xmark, scheme: scheme, onTap: onTouch)
     
-    addTarget(self, action: #selector(didTouch), for: .touchUpInside)
     translatesAutoresizingMaskIntoConstraints = false
+    imageView?.contentMode = .scaleAspectFit
   }
   
   @available(iOS 13.0, *)
@@ -53,16 +50,15 @@ public class W3WCloseButton: W3WButton {
     self.size = size
     self.inset = inset
     self.roundedCorners = roundedCorners
-    self.onTouch = onTouch
     
     let colors = W3WColors(foreground: .clear, tint: .white)
     
     let styles: W3WStyles = .standard
       .with(visualEffect: W3WVisualEffect(style: .thin,
-                                          fill: .fill,
+                                          fill: .tertiaryFill,
                                           padding: W3WPadding(value: inset),
                                           cornerRadius: roundedCorners ? W3WCornerRadius(value: (size - inset * 2.0) / 2.0) : 0.0))
-      .with(padding: W3WPadding(value: inset + 8.0))
+      .with(padding: W3WPadding(value: inset + 7.0))
     
     let scheme = W3WScheme(colors: colors, styles: styles)
     
@@ -71,17 +67,13 @@ public class W3WCloseButton: W3WButton {
       w3wImage.setImageConfiguration(imageConfiguration)
     }
 
-    super.init(image: w3wImage, scheme: scheme)
+    super.init(image: w3wImage, scheme: scheme, onTap: onTouch)
     
-    addTarget(self, action: #selector(didTouch), for: .touchUpInside)
     translatesAutoresizingMaskIntoConstraints = false
+    imageView?.contentMode = .scaleAspectFit
   }
   
   required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
-  
-  @objc open func didTouch() {
-    onTouch?()
-  }
 }