refactor: close button - WPB-15211

WireUI/Sources/WireFolderPickerUI/FolderPicker.swift

@@ -63,14 +63,10 @@ public struct FolderPicker: View {
             .toolbar {
                 if showCloseButton {
                     ToolbarItem(placement: .topBarTrailing) {
-                        CloseButton(
-                            action: didTapClose,
-                            accessibilityLabel: String(
-                                localized: "folderPicker.close.label",
-                                table: "Accessibility",
-                                bundle: .module
+                        CloseButton(action: didTapClose)
+                            .accessibilityLabel(
+                                Text("folderPicker.close.label", tableName: "Accessibility", bundle: .module)
                             )
-                        )
                     }
                 }
             }

WireUI/Sources/WireMoveToFolderUI/Views/FolderPicker/FolderPicker.swift

@@ -50,14 +50,10 @@ public struct FolderPicker: View {
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
                 ToolbarItem(placement: .navigationBarLeading) {
-                    CloseButton(
-                        action: didTapClose,
-                        accessibilityLabel: String(
-                            localized: "folderPicker.close.label",
-                            table: "Accessibility",
-                            bundle: .module
+                    CloseButton(action: didTapClose)
+                        .accessibilityLabel(
+                            Text("folderPicker.close.label", tableName: "Accessibility", bundle: .module)
                         )
-                    )
                 }
                 ToolbarItem(placement: .navigationBarTrailing) {
                     NavigationLink {

WireUI/Sources/WireReusableUIComponents/Buttons/CloseButton.swift

@@ -22,21 +22,18 @@ import WireDesign
 public struct CloseButton: View {
 
     private let action: () -> Void
-    private let accessibilityLabel: String
 
     public var body: some View {
         Button(action: action) {
-            Image.close
+            Image(.close)
         }
         .buttonStyle(.plain)
         .foregroundColor(Color(uiColor: SemanticColors.Icon.foregroundDefaultBlack))
-        .accessibilityLabel(Text(accessibilityLabel))
         .accessibilityIdentifier("close")
     }
 
-    public init(action: @escaping @MainActor () -> Void, accessibilityLabel: String) {
+    public init(action: @escaping @MainActor () -> Void) {
         self.action = action
-        self.accessibilityLabel = accessibilityLabel
     }
 
 }
@@ -46,7 +43,7 @@ public struct CloseButton: View {
         Text("Hello, World!")
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) {
-                    CloseButton(action: { print("Close") }, accessibilityLabel: "Close")
+                    CloseButton { print("Close") }
                 }
             }
     }

WireUI/Sources/WireReusableUIComponents/SDKExtensions/UIKit/UIBarButtonItem+CloseButton.swift

@@ -31,7 +31,7 @@ public extension UIBarButtonItem {
     ///
     /// - Returns: A UIBarButtonItem configured as a close button.
     static func closeButton(action: UIAction, accessibilityLabel: String) -> UIBarButtonItem {
-        let closeImage = UIImage.close
+        let closeImage = UIImage(resource: .close)
 
         let closeItem = UIBarButtonItem(title: accessibilityLabel, primaryAction: action)
 

wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/openid/AppAuth-iOS.git",
         "state": {
           "branch": null,
-          "revision": "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2",
-          "version": "1.7.5"
+          "revision": "2781038865a80e2c425a1da12cc1327bcd56501f",
+          "version": "1.7.6"
         }
       },
       {
@@ -141,8 +141,8 @@
         "repositoryURL": "https://github.com/apple/swift-log",
         "state": {
           "branch": null,
-          "revision": "9cb486020ebf03bfa5b5df985387a14a98744537",
-          "version": "1.6.1"
+          "revision": "96a2f8a0fa41e9e09af4585e2724c4e825410b91",
+          "version": "1.6.2"
         }
       },
       {

wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/Views/E2EIdentityCertificateDetailsView.swift

@@ -19,6 +19,7 @@
 import SwiftUI
 import WireCommonComponents
 import WireDesign
+import WireReusableUIComponents
 
 struct E2EIdentityCertificateDetailsView: View {
     @Environment(\.dismiss) private var dismiss
@@ -44,18 +45,12 @@ struct E2EIdentityCertificateDetailsView: View {
         .overlay {
             HStack {
                 Spacer()
-                Button(
-                    action: {
-                        dismiss()
-                        didDismiss?()
-                    },
-                    label: {
-                        Image
-                            .close
-                            .foregroundColor(Color(uiColor: SemanticColors.Icon.foregroundDefaultBlack))
-                    }
-                )
+                CloseButton {
+                    dismiss()
+                    didDismiss?()
+                }
                 .accessibilityIdentifier("CloseButton")
+                .accessibilityLabel(Text(L10n.Localizable.General.close))
                 .padding(.all, ViewConstants.Padding.standard)
             }
         }