Fix Swiftlint in Maps iOS (#7829)

(cherry picked from commit d42b55e83e70ae351ca150e9b7dececc56e2170f)

GitOrigin-RevId: 957e7d40200b9c82096b0e32b4521746dbd99768

Author: persidskiy

.swiftlint.yml

@@ -5,12 +5,14 @@ included:
   - Tests
 excluded:
   - "**/Generated"
+  - "Sources/Vendors/**"
 disabled_rules:
   - comment_spacing
   - computed_accessors_order
   - force_try
   - identifier_name
   - line_length
+  - nesting
   - shorthand_operator
   - todo
   - trailing_comma

Sources/Examples/ExamplesSettingsView.swift

@@ -11,8 +11,8 @@ struct ClearableTextField: View {
     @Binding var text: String
     var keyboardType: UIKeyboardType = .default
     var autocapitalization: TextInputAutocapitalization = .never
-    var focused: FocusState<Bool>.Binding? = nil
-    var onSubmit: (() -> Void)? = nil
+    var focused: FocusState<Bool>.Binding?
+    var onSubmit: (() -> Void)?
 
     var body: some View {
         HStack {
@@ -30,9 +30,9 @@ struct ClearableTextField: View {
                 }
 
             if !text.isEmpty {
-                Button(action: {
+                Button {
                     text = ""
-                }) {
+                } label: {
                     Image(systemName: "xmark.circle.fill")
                         .foregroundColor(.secondary)
                 }
@@ -174,12 +174,12 @@ struct StyleChooserView: View {
                 }
             res += previouslyUsedURIs
         }
-        
+
         for style in predefinedStyles {
             if res.contains(where: { $0.uri == style.uri }) { continue }
             res.append(style)
         }
-        
+
         return res
     }
 
@@ -205,9 +205,10 @@ struct StyleChooserView: View {
 
                 Section {
                     ForEach(suggestions, id: \.uri) { suggestion in
-                        Button(action: {
+                        Button {
                             customURL = suggestion.uri
-                        }) {
+                        }
+                        label: {
                             HStack {
                                 VStack(alignment: .leading, spacing: 2) {
                                     if let name = suggestion.name {
@@ -312,9 +313,9 @@ struct StyleOverrideEditView: View {
     var body: some View {
         Form {
             Section {
-                Button(action: {
+                Button {
                     showingBaseStyleChooser = true
-                }) {
+                } label: {
                     if !baseStyle.isEmpty {
                         Text(baseStyle)
                             .monospaced()
@@ -328,9 +329,9 @@ struct StyleOverrideEditView: View {
                 Text("This style will be replaced.")
             }
             Section {
-                Button(action: {
+                Button {
                     showingReplacementStyleChooser = true
-                }) {
+                } label: {
                     if !style.isEmpty {
                         Text(style)
                             .monospaced()
@@ -344,13 +345,12 @@ struct StyleOverrideEditView: View {
                 Text("This style will be used instead.")
             }
 
-
             Section {
                 ForEach(options) { keyValue in
-                    Button(action: {
+                    Button {
                         editingConfigKey = keyValue.key
                         showingConfigEditor = true
-                    }) {
+                    } label: {
                         HStack( spacing: 2) {
                             Text(keyValue.key)
                                 .foregroundColor(.primary)
@@ -366,10 +366,10 @@ struct StyleOverrideEditView: View {
                     options.remove(atOffsets: indexSet)
                 }
 
-                Button(action: {
+                Button {
                     editingConfigKey = nil
                     showingConfigEditor = true
-                }) {
+                } label: {
                     Text("Add")
                 }
             } header: {
@@ -383,10 +383,10 @@ struct StyleOverrideEditView: View {
                     Toggle("Active", isOn: $active)
 
                     if let onDelete {
-                        Button(action: {
+                        Button {
                             onDelete()
                             dismiss()
-                        }) {
+                        } label: {
                             Text("Delete")
                                 .frame(maxWidth: .infinity)
                         }

Sources/Examples/StyleOverridesModel.swift

@@ -9,13 +9,13 @@ class StyleOverridesModel: ObservableObject {
             applyOverrides()
         }
     }
-    
+
     @Published var previouslyUsedURIs: [String: Date] = [:] {
         didSet {
            savePreviouslyUsed()
         }
     }
-    
+
     var activeCount: Int {
         overrides.filter { $0.active }.count
     }
@@ -33,13 +33,13 @@ class StyleOverridesModel: ObservableObject {
             userDefaults.set(encoded, forKey: "styleOverrides")
         }
     }
-    
+
     private func savePreviouslyUsed() {
         if let encoded = try? JSONEncoder().encode(previouslyUsedURIs) {
             userDefaults.set(encoded, forKey: "previouslyUsedURIs")
         }
     }
-    
+
     private func loadPreviouslyUsedURIs() {
         guard let data = userDefaults.data(forKey: "previouslyUsedURIs"),
               let decoded = try? JSONDecoder().decode([String: Date].self, from: data)
@@ -75,7 +75,7 @@ class StyleOverridesModel: ObservableObject {
                 overrides[i].active = false
             }
         }
-        
+
         previouslyUsedURIs[override.style.rawValue] = Date()
         previouslyUsedURIs[override.baseStyle.rawValue] = Date()
     }

Sources/Examples/SwiftUI Examples/LocateMeExample.swift

@@ -7,7 +7,7 @@ struct LocateMeExample: View {
     @State var viewport: Viewport = .followPuck(zoom: 13, bearing: .constant(0))
 
     var body: some View {
-        MapReader { proxy in
+        MapReader { _ in
             Map(viewport: $viewport) {
                 Puck2D(bearing: .heading)
                     .showsAccuracyRing(true)
@@ -21,15 +21,14 @@ struct LocateMeExample: View {
     }
 }
 
-
 /// The example demonstrates Puck and Viewport configuration that allow to follow user location.
 /// In this example the CoreLocationProvider is use instead of default `AppleLocationProvider`.
 struct LocateMeCoreLocationProviderExample: View {
     @State var locaionModel = LocationDataModel.createCore()
     @State var viewport: Viewport = .followPuck(zoom: 13, bearing: .constant(0))
 
     var body: some View {
-        MapReader { proxy in
+        MapReader { _ in
             Map(viewport: $viewport) {
                 Puck2D(bearing: .heading)
                     .showsAccuracyRing(true)
@@ -54,7 +53,6 @@ struct LocateMeCoreLocationProviderExample: View {
     }
 }
 
-
 struct LocateMeButton: View {
     @Binding var viewport: Viewport
 

Sources/Examples/SwiftUI Examples/LocationOverrideExample.swift

@@ -17,23 +17,21 @@ struct LocationOverrideExample: View {
     @State private var provider = LocationProvider()
 
     var body: some View {
-        MapReader { proxy in
-            Map {
-                /// The location indicator puck position and heading is controlled by the location provider.
-                Puck2D(bearing: .heading)
+        Map {
+            /// The location indicator puck position and heading is controlled by the location provider.
+            Puck2D(bearing: .heading)
 
-                /// Handle tap on the map.
-                TapInteraction { context in
-                    /// As a demonstration, override location with the last tap coordinate.
-                    let direction = provider.location.coordinate.direction(to: context.coordinate)
-                    provider.location = Location(coordinate: context.coordinate)
-                    provider.heading = Heading(direction: direction, accuracy: 0)
+            /// Handle tap on the map.
+            TapInteraction { context in
+                /// As a demonstration, override location with the last tap coordinate.
+                let direction = provider.location.coordinate.direction(to: context.coordinate)
+                provider.location = Location(coordinate: context.coordinate)
+                provider.heading = Heading(direction: direction, accuracy: 0)
 
-                    return false
-                }
+                return false
             }
-            .locationDataModel(provider.model)
         }
+        .locationDataModel(provider.model)
         .ignoresSafeArea()
         .overlay(alignment: .bottom) {
             Text("Tap on map to move the puck")

Sources/MapboxMaps/Foundation/Extensions/Bundle+MapboxMaps.swift

@@ -25,6 +25,7 @@ extension Bundle {
         #endif
     }
 
+    /// :nodoc:
     @_spi(Internal)
     public static var mapboxMapsMetadata: MapboxMapsMetadata = {
         guard let metadataPath = Bundle.mapboxMaps.url(forResource: "MapboxMaps", withExtension: "json") else {

Sources/MapboxMaps/Foundation/ForwardingDispalyLinkTarget.swift

@@ -10,7 +10,7 @@ import QuartzCore
 /// The class is designed to be used as a target for `CADisplayLink`, forwarding
 /// all update callbacks to the provided closure handler.
 internal final class ForwardingDisplayLinkTarget {
-    
+
     /// The closure that will be called when the display link fires.
     private let handler: (CADisplayLink) -> Void
 

Sources/MapboxMaps/Foundation/InterfaceOrientationProvider.swift

@@ -27,12 +27,11 @@ internal final class DefaultInterfaceOrientationProvider {
         self.notificationCenter = notificationCenter
         self.device = device
     }
-    
+
     convenience init() {
         self.init(notificationCenter: NotificationCenter.default, device: UIDevice.current)
     }
 
-
     private func startUpdatingInterfaceOrientation() {
         device.beginGeneratingDeviceOrientationNotifications()
         notificationCenter.addObserver(self,

Sources/MapboxMaps/Foundation/MapViewDependencyProvider.swift

@@ -17,18 +17,18 @@ import MetalKit
 protocol MapViewDependencyProviderProtocol: AnyObject {
     /// The notification center used for system event notifications.
     var notificationCenter: NotificationCenterProtocol { get }
-    
+
     /// The bundle used for accessing app resources and configuration.
     var bundle: BundleProtocol { get }
-    
+
     /// Creates a Metal view for rendering the map content.
     ///
     /// - Parameters:
     ///   - frame: The frame rectangle for the Metal view.
     ///   - device: The Metal device to use for rendering, or nil to use the default device.
     /// - Returns: A configured Metal view ready for map rendering.
     func makeMetalView(frame: CGRect, device: MTLDevice?) -> MetalView
-    
+
     /// Creates a display link for synchronizing rendering with the display refresh rate.
     ///
     /// - Parameters:
@@ -37,7 +37,7 @@ protocol MapViewDependencyProviderProtocol: AnyObject {
     ///   - selector: The selector to call on the target when the display link fires.
     /// - Returns: A display link instance, or nil if creation fails.
     func makeDisplayLink(window: UIWindow, target: Any, selector: Selector) -> DisplayLinkProtocol?
-    
+
     /// Creates a camera animators runner for managing camera animations.
     ///
     /// - Parameter mapboxMap: The map instance to animate.

Sources/MapboxMaps/Foundation/RetroactiveConformances/DisplayLinkProtocol.swift

@@ -13,26 +13,26 @@ import QuartzCore
 ///
 /// - SeeAlso: `CADisplayLink` for the concrete implementation used in production.
 internal protocol DisplayLinkProtocol: AnyObject {
-    
+
     /// The timestamp of the current frame, measured in seconds since system startup.
     ///
     /// This value is typically used to calculate frame deltas for smooth animations
     /// and to synchronize rendering with the display refresh rate.
     var timestamp: CFTimeInterval { get }
-    
+
     /// The duration of the previous frame, measured in seconds.
     ///
     /// This value represents the time it took to render the previous frame and can be
     /// used for performance monitoring and adaptive frame rate adjustments.
     var duration: CFTimeInterval { get }
-    
+
     /// The preferred number of frames per second for the display link.
     ///
     /// Setting this property allows you to control the rendering frequency,
     /// which can help balance performance and visual quality. The actual frame rate
     /// may be lower than the preferred rate depending on system performance.
     var preferredFramesPerSecond: Int { get set }
-    
+
     /// The preferred frame rate range for the display link.
     ///
     /// This property provides more granular control over frame rate than
@@ -42,14 +42,14 @@ internal protocol DisplayLinkProtocol: AnyObject {
     /// - Note: Available on iOS 15.0 and later.
     @available(iOS 15.0, *)
     var preferredFrameRateRange: CAFrameRateRange { get set }
-    
+
     /// A boolean value indicating whether the display link is currently running.
     ///
     /// When `true`, the display link will fire callbacks at the specified frame rate.
     /// When `false`, the display link is paused and no callbacks will be fired.
     /// This property is essential for managing rendering lifecycle and performance.
     var isRunning: Bool { get set }
-    
+
     /// Adds the display link to the specified run loop and mode.
     ///
     /// This method starts the display link by adding it to the run loop, which will
@@ -59,7 +59,7 @@ internal protocol DisplayLinkProtocol: AnyObject {
     ///   - runloop: The run loop to add the display link to.
     ///   - mode: The run loop mode for the display link.
     func add(to runloop: RunLoop, forMode mode: RunLoop.Mode)
-    
+
     /// Invalidates the display link and removes it from the run loop.
     ///
     /// This method stops the display link and cleans up its resources.