From 3cf8fef6fd58e5cf33e9f0e626aab88d0558c3fc Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 18 Jan 2024 14:05:09 -0800 Subject: [PATCH 1/2] [various] Run swift-format on example app Swift files --- packages/animations/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- packages/dynamic_layouts/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 2 +- .../file_selector/file_selector/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 2 +- .../file_selector_ios/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 2 +- .../flutter_adaptive_scaffold/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- packages/flutter_image/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- packages/flutter_markdown/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- packages/go_router/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- packages/palette_generator/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 2 +- .../path_provider_foundation/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 2 +- packages/platform/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- .../pointer_interceptor/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 8 ++--- .../ios/Runner/DummyPlatformViewFactory.swift | 30 ++++++++----------- .../pointer_interceptor_ios/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 8 ++--- .../ios/Runner/DummyPlatformViewFactory.swift | 20 +++++-------- .../quick_actions_ios/CHANGELOG.md | 1 + .../ios/RunnerUITests/RunnerUITests.swift | 16 ++++++---- packages/rfw/CHANGELOG.md | 4 +++ .../hello/ios/Runner/AppDelegate.swift | 2 +- .../local/ios/Runner/AppDelegate.swift | 2 +- .../remote/ios/Runner/AppDelegate.swift | 2 +- .../shared_preferences/CHANGELOG.md | 1 + .../example/ios/Runner/AppDelegate.swift | 2 +- .../two_dimensional_scrollables/CHANGELOG.md | 4 +++ .../example/ios/Runner/AppDelegate.swift | 2 +- .../macos/RunnerTests/RunnerTests.swift | 2 +- 39 files changed, 95 insertions(+), 62 deletions(-) diff --git a/packages/animations/CHANGELOG.md b/packages/animations/CHANGELOG.md index d467c5d0098..2951f516cbb 100644 --- a/packages/animations/CHANGELOG.md +++ b/packages/animations/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 2.0.11 * Fixes new lint warnings. diff --git a/packages/animations/example/ios/Runner/AppDelegate.swift b/packages/animations/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/animations/example/ios/Runner/AppDelegate.swift +++ b/packages/animations/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/dynamic_layouts/CHANGELOG.md b/packages/dynamic_layouts/CHANGELOG.md index 9b2f580186d..3d63e9bf851 100644 --- a/packages/dynamic_layouts/CHANGELOG.md +++ b/packages/dynamic_layouts/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 0.0.1+1 diff --git a/packages/dynamic_layouts/example/ios/Runner/AppDelegate.swift b/packages/dynamic_layouts/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/dynamic_layouts/example/ios/Runner/AppDelegate.swift +++ b/packages/dynamic_layouts/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/file_selector/file_selector/CHANGELOG.md b/packages/file_selector/file_selector/CHANGELOG.md index 0bf3c8e1146..808556116cd 100644 --- a/packages/file_selector/file_selector/CHANGELOG.md +++ b/packages/file_selector/file_selector/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/file_selector/file_selector/example/ios/Runner/AppDelegate.swift b/packages/file_selector/file_selector/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/file_selector/file_selector/example/ios/Runner/AppDelegate.swift +++ b/packages/file_selector/file_selector/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 0206ef358ac..5dbd36829a5 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 0.5.1+8 diff --git a/packages/file_selector/file_selector_ios/example/ios/Runner/AppDelegate.swift b/packages/file_selector/file_selector_ios/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/file_selector/file_selector_ios/example/ios/Runner/AppDelegate.swift +++ b/packages/file_selector/file_selector_ios/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/flutter_adaptive_scaffold/CHANGELOG.md b/packages/flutter_adaptive_scaffold/CHANGELOG.md index 4d62cf7a688..16279edb745 100644 --- a/packages/flutter_adaptive_scaffold/CHANGELOG.md +++ b/packages/flutter_adaptive_scaffold/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 0.1.7+2 * Fixes new lint warnings. diff --git a/packages/flutter_adaptive_scaffold/example/ios/Runner/AppDelegate.swift b/packages/flutter_adaptive_scaffold/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/flutter_adaptive_scaffold/example/ios/Runner/AppDelegate.swift +++ b/packages/flutter_adaptive_scaffold/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/flutter_image/CHANGELOG.md b/packages/flutter_image/CHANGELOG.md index 987e7a5bb29..7caf825f277 100644 --- a/packages/flutter_image/CHANGELOG.md +++ b/packages/flutter_image/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 4.1.10 * Fixes image asset link to use image within package. diff --git a/packages/flutter_image/example/ios/Runner/AppDelegate.swift b/packages/flutter_image/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/flutter_image/example/ios/Runner/AppDelegate.swift +++ b/packages/flutter_image/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index 5cb6371421f..66978f608b9 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 0.6.18+3 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/flutter_markdown/example/ios/Runner/AppDelegate.swift b/packages/flutter_markdown/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/flutter_markdown/example/ios/Runner/AppDelegate.swift +++ b/packages/flutter_markdown/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index e551d260067..62c73b0163b 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 13.0.1 * Fixes new lint warnings. diff --git a/packages/go_router/example/ios/Runner/AppDelegate.swift b/packages/go_router/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/go_router/example/ios/Runner/AppDelegate.swift +++ b/packages/go_router/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/palette_generator/CHANGELOG.md b/packages/palette_generator/CHANGELOG.md index 4d125eba21d..1afd549822c 100644 --- a/packages/palette_generator/CHANGELOG.md +++ b/packages/palette_generator/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 0.3.3+3 diff --git a/packages/palette_generator/example/ios/Runner/AppDelegate.swift b/packages/palette_generator/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/palette_generator/example/ios/Runner/AppDelegate.swift +++ b/packages/palette_generator/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/path_provider/path_provider_foundation/CHANGELOG.md b/packages/path_provider/path_provider_foundation/CHANGELOG.md index 9d505e54fb9..40baf3698d7 100644 --- a/packages/path_provider/path_provider_foundation/CHANGELOG.md +++ b/packages/path_provider/path_provider_foundation/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 2.3.2 diff --git a/packages/path_provider/path_provider_foundation/example/ios/Runner/AppDelegate.swift b/packages/path_provider/path_provider_foundation/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/path_provider/path_provider_foundation/example/ios/Runner/AppDelegate.swift +++ b/packages/path_provider/path_provider_foundation/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/platform/CHANGELOG.md b/packages/platform/CHANGELOG.md index 4c96a4197de..9325305626f 100644 --- a/packages/platform/CHANGELOG.md +++ b/packages/platform/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 3.1.4 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/platform/example/ios/Runner/AppDelegate.swift b/packages/platform/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/platform/example/ios/Runner/AppDelegate.swift +++ b/packages/platform/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md b/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md index a822866f910..e9b7831a10d 100644 --- a/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md +++ b/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/AppDelegate.swift b/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/AppDelegate.swift index 41be7b25597..8891e986b16 100644 --- a/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/AppDelegate.swift +++ b/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { @@ -13,12 +13,12 @@ import Flutter ) -> Bool { GeneratedPluginRegistrant.register(with: self) - weak var registrar = self.registrar(forPlugin: "DummyPlatform"); + weak var registrar = self.registrar(forPlugin: "DummyPlatform") let factory = DummyPlatformViewFactory(messenger: registrar!.messenger()) self.registrar(forPlugin: "")!.register( - factory, - withId: "dummy_platform_view") + factory, + withId: "dummy_platform_view") return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/DummyPlatformViewFactory.swift b/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/DummyPlatformViewFactory.swift index 5ea634fa922..45f468b3acf 100644 --- a/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/DummyPlatformViewFactory.swift +++ b/packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/DummyPlatformViewFactory.swift @@ -5,9 +5,7 @@ import Flutter import UIKit -/** - * A simple factory that creates a dummy platform view for testing. - */ +/// A simple factory that creates a dummy platform view for testing. public class DummyPlatformViewFactory: NSObject, FlutterPlatformViewFactory { private var messenger: FlutterBinaryMessenger @@ -33,38 +31,34 @@ public class DummyPlatformViewFactory: NSObject, FlutterPlatformViewFactory { } } -/** - * A native view that will remove it's tag if clicked. - */ +/// A native view that will remove it's tag if clicked. public class CustomView: UIView { - var timesClicked = 0; + var timesClicked = 0 var nativeLabel = UILabel() override public func hitTest( _ point: CGPoint, with event: UIEvent? ) -> UIView? { - if (viewWithTag(1) != nil) { - viewWithTag(1)?.removeFromSuperview(); - createNativeView(view: self); + if viewWithTag(1) != nil { + viewWithTag(1)?.removeFromSuperview() + createNativeView(view: self) } - timesClicked += 1; + timesClicked += 1 nativeLabel.text = "Traversed \(timesClicked) subviews" return super.hitTest(point, with: event) } - func createNativeView(view _view: CustomView){ + func createNativeView(view _view: CustomView) { nativeLabel.text = "Traversed \(timesClicked) subviews" nativeLabel.frame = CGRect(x: 0, y: 0, width: 180, height: 48.0) _view.addSubview(nativeLabel) } } -/** - * A flutter platform view that displays a simple native view. - */ +/// A flutter platform view that displays a simple native view. class DummyPlatformView: NSObject, FlutterPlatformView { - private var _view: CustomView; + private var _view: CustomView init( frame: CGRect, @@ -81,9 +75,9 @@ class DummyPlatformView: NSObject, FlutterPlatformView { return _view } - func createNativeView(view _view: CustomView){ + func createNativeView(view _view: CustomView) { let nativeLabel = UILabel() - nativeLabel.tag = 1; + nativeLabel.tag = 1 nativeLabel.text = "Native View Not Clicked" nativeLabel.frame = CGRect(x: 0, y: 0, width: 180, height: 48.0) _view.addSubview(nativeLabel) diff --git a/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md b/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md index cd4057d6a91..a3b3898ddd6 100644 --- a/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md +++ b/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 0.10.0+2 diff --git a/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/AppDelegate.swift b/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/AppDelegate.swift index 41be7b25597..8891e986b16 100644 --- a/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/AppDelegate.swift +++ b/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { @@ -13,12 +13,12 @@ import Flutter ) -> Bool { GeneratedPluginRegistrant.register(with: self) - weak var registrar = self.registrar(forPlugin: "DummyPlatform"); + weak var registrar = self.registrar(forPlugin: "DummyPlatform") let factory = DummyPlatformViewFactory(messenger: registrar!.messenger()) self.registrar(forPlugin: "")!.register( - factory, - withId: "dummy_platform_view") + factory, + withId: "dummy_platform_view") return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/DummyPlatformViewFactory.swift b/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/DummyPlatformViewFactory.swift index 71b1bff63b1..5723fdac74f 100644 --- a/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/DummyPlatformViewFactory.swift +++ b/packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/DummyPlatformViewFactory.swift @@ -5,9 +5,7 @@ import Flutter import UIKit -/** - * A simple factory that creates a dummy platform view for testing. - */ +/// A simple factory that creates a dummy platform view for testing. public class DummyPlatformViewFactory: NSObject, FlutterPlatformViewFactory { private var messenger: FlutterBinaryMessenger @@ -33,25 +31,21 @@ public class DummyPlatformViewFactory: NSObject, FlutterPlatformViewFactory { } } -/** - * A native view that will remove its tag if clicked. - */ +/// A native view that will remove its tag if clicked. public class CustomView: UIView { override public func hitTest( _ point: CGPoint, with event: UIEvent? ) -> UIView? { - viewWithTag(1)?.removeFromSuperview(); + viewWithTag(1)?.removeFromSuperview() return super.hitTest(point, with: event) } } -/** - * A flutter platform view that displays a simple native view. - */ +/// A flutter platform view that displays a simple native view. class DummyPlatformView: NSObject, FlutterPlatformView { - private var _view: CustomView; + private var _view: CustomView init( frame: CGRect, @@ -68,10 +62,10 @@ class DummyPlatformView: NSObject, FlutterPlatformView { return _view } - func createNativeView(view _view: CustomView){ + func createNativeView(view _view: CustomView) { let nativeLabel = UILabel() _view.isUserInteractionEnabled = true - nativeLabel.tag = 1; + nativeLabel.tag = 1 nativeLabel.text = "Not Clicked" nativeLabel.frame = CGRect(x: 0, y: 0, width: 180, height: 48.0) _view.addSubview(nativeLabel) diff --git a/packages/quick_actions/quick_actions_ios/CHANGELOG.md b/packages/quick_actions/quick_actions_ios/CHANGELOG.md index c7f6a3b983c..87793c02494 100644 --- a/packages/quick_actions/quick_actions_ios/CHANGELOG.md +++ b/packages/quick_actions/quick_actions_ios/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 1.0.10 diff --git a/packages/quick_actions/quick_actions_ios/example/ios/RunnerUITests/RunnerUITests.swift b/packages/quick_actions/quick_actions_ios/example/ios/RunnerUITests/RunnerUITests.swift index 2ac4fdbc46a..ad4c03f008e 100644 --- a/packages/quick_actions/quick_actions_ios/example/ios/RunnerUITests/RunnerUITests.swift +++ b/packages/quick_actions/quick_actions_ios/example/ios/RunnerUITests/RunnerUITests.swift @@ -18,7 +18,7 @@ private let pressDurationRetryAdjustment: TimeInterval = 0.2 // This is to deflake a situation where the quick action menu is not present after // the long press. // See: https://github.com/flutter/flutter/issues/125509 -private let quickActionMaxRetries: Int = 4; +private let quickActionMaxRetries: Int = 4 class RunnerUITests: XCTestCase { @@ -40,7 +40,8 @@ class RunnerUITests: XCTestCase { let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard") let quickActionsAppIcon = springboard.icons["quick_actions_example"] - findAndTapQuickActionButton(buttonName: "Action two", quickActionsAppIcon: quickActionsAppIcon, springboard: springboard); + findAndTapQuickActionButton( + buttonName: "Action two", quickActionsAppIcon: quickActionsAppIcon, springboard: springboard) let actionTwoConfirmation = exampleApp.otherElements["action_two"] if !actionTwoConfirmation.waitForExistence(timeout: elementWaitingTime) { @@ -73,7 +74,8 @@ class RunnerUITests: XCTestCase { ) } - findAndTapQuickActionButton(buttonName: "Action one", quickActionsAppIcon: quickActionsAppIcon, springboard: springboard); + findAndTapQuickActionButton( + buttonName: "Action one", quickActionsAppIcon: quickActionsAppIcon, springboard: springboard) let actionOneConfirmation = exampleApp.otherElements["action_one"] if !actionOneConfirmation.waitForExistence(timeout: elementWaitingTime) { @@ -85,7 +87,9 @@ class RunnerUITests: XCTestCase { XCTAssert(actionOneConfirmation.exists) } - private func findAndTapQuickActionButton(buttonName: String, quickActionsAppIcon: XCUIElement, springboard: XCUIElement) { + private func findAndTapQuickActionButton( + buttonName: String, quickActionsAppIcon: XCUIElement, springboard: XCUIElement + ) { var actionButton: XCUIElement? var pressDuration = quickActionPressDuration for _ in 1...quickActionMaxRetries { @@ -111,12 +115,12 @@ class RunnerUITests: XCTestCase { // Reset to previous state. XCUIDevice.shared.press(XCUIDevice.Button.home) } - if (!actionButton!.exists) { + if !actionButton!.exists { XCTFail( "Failed due to not able to find the \(buttonName) button from springboard with \(elementWaitingTime) seconds. Springboard debug description: \(springboard.debugDescription)" ) } - actionButton!.tap(); + actionButton!.tap() } } diff --git a/packages/rfw/CHANGELOG.md b/packages/rfw/CHANGELOG.md index ae217df2218..c91622cd5c5 100644 --- a/packages/rfw/CHANGELOG.md +++ b/packages/rfw/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 1.0.17 * Adds support for tracking source locations of `BlobNode`s and diff --git a/packages/rfw/example/hello/ios/Runner/AppDelegate.swift b/packages/rfw/example/hello/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/rfw/example/hello/ios/Runner/AppDelegate.swift +++ b/packages/rfw/example/hello/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/rfw/example/local/ios/Runner/AppDelegate.swift b/packages/rfw/example/local/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/rfw/example/local/ios/Runner/AppDelegate.swift +++ b/packages/rfw/example/local/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/rfw/example/remote/ios/Runner/AppDelegate.swift b/packages/rfw/example/remote/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/rfw/example/remote/ios/Runner/AppDelegate.swift +++ b/packages/rfw/example/remote/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md index 71ab9ed8c3c..7e6d5a9f1e5 100644 --- a/packages/shared_preferences/shared_preferences/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Fixes Swift format issues in example app. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/shared_preferences/shared_preferences/example/ios/Runner/AppDelegate.swift b/packages/shared_preferences/shared_preferences/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/shared_preferences/shared_preferences/example/ios/Runner/AppDelegate.swift +++ b/packages/shared_preferences/shared_preferences/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/two_dimensional_scrollables/CHANGELOG.md b/packages/two_dimensional_scrollables/CHANGELOG.md index e2a6474c31e..27c9aa86d2e 100644 --- a/packages/two_dimensional_scrollables/CHANGELOG.md +++ b/packages/two_dimensional_scrollables/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Fixes Swift format issues in example app. + ## 0.0.5+2 * Fixes must_call_super lint warning from pending framework change. diff --git a/packages/two_dimensional_scrollables/example/ios/Runner/AppDelegate.swift b/packages/two_dimensional_scrollables/example/ios/Runner/AppDelegate.swift index caf99839333..d83c0ff0bee 100644 --- a/packages/two_dimensional_scrollables/example/ios/Runner/AppDelegate.swift +++ b/packages/two_dimensional_scrollables/example/ios/Runner/AppDelegate.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/packages/two_dimensional_scrollables/example/macos/RunnerTests/RunnerTests.swift b/packages/two_dimensional_scrollables/example/macos/RunnerTests/RunnerTests.swift index de34867bac2..6a4e9ea7896 100644 --- a/packages/two_dimensional_scrollables/example/macos/RunnerTests/RunnerTests.swift +++ b/packages/two_dimensional_scrollables/example/macos/RunnerTests/RunnerTests.swift @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import FlutterMacOS import Cocoa +import FlutterMacOS import XCTest class RunnerTests: XCTestCase { From 5b0351ee7a27dc9e661dab4f7f857d70a399cc7a Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 18 Jan 2024 20:34:32 -0800 Subject: [PATCH 2/2] Revert CHANGELOGs --- packages/animations/CHANGELOG.md | 4 ---- packages/dynamic_layouts/CHANGELOG.md | 1 - packages/file_selector/file_selector/CHANGELOG.md | 1 - packages/file_selector/file_selector_ios/CHANGELOG.md | 1 - packages/flutter_adaptive_scaffold/CHANGELOG.md | 4 ---- packages/flutter_image/CHANGELOG.md | 4 ---- packages/flutter_markdown/CHANGELOG.md | 4 ---- packages/go_router/CHANGELOG.md | 4 ---- packages/palette_generator/CHANGELOG.md | 1 - packages/path_provider/path_provider_foundation/CHANGELOG.md | 1 - packages/platform/CHANGELOG.md | 4 ---- packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md | 1 - .../pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md | 1 - packages/quick_actions/quick_actions_ios/CHANGELOG.md | 1 - packages/rfw/CHANGELOG.md | 4 ---- packages/shared_preferences/shared_preferences/CHANGELOG.md | 1 - packages/two_dimensional_scrollables/CHANGELOG.md | 4 ---- 17 files changed, 41 deletions(-) diff --git a/packages/animations/CHANGELOG.md b/packages/animations/CHANGELOG.md index 2951f516cbb..d467c5d0098 100644 --- a/packages/animations/CHANGELOG.md +++ b/packages/animations/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 2.0.11 * Fixes new lint warnings. diff --git a/packages/dynamic_layouts/CHANGELOG.md b/packages/dynamic_layouts/CHANGELOG.md index 3d63e9bf851..9b2f580186d 100644 --- a/packages/dynamic_layouts/CHANGELOG.md +++ b/packages/dynamic_layouts/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 0.0.1+1 diff --git a/packages/file_selector/file_selector/CHANGELOG.md b/packages/file_selector/file_selector/CHANGELOG.md index 808556116cd..0bf3c8e1146 100644 --- a/packages/file_selector/file_selector/CHANGELOG.md +++ b/packages/file_selector/file_selector/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 5dbd36829a5..0206ef358ac 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 0.5.1+8 diff --git a/packages/flutter_adaptive_scaffold/CHANGELOG.md b/packages/flutter_adaptive_scaffold/CHANGELOG.md index 16279edb745..4d62cf7a688 100644 --- a/packages/flutter_adaptive_scaffold/CHANGELOG.md +++ b/packages/flutter_adaptive_scaffold/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 0.1.7+2 * Fixes new lint warnings. diff --git a/packages/flutter_image/CHANGELOG.md b/packages/flutter_image/CHANGELOG.md index 7caf825f277..987e7a5bb29 100644 --- a/packages/flutter_image/CHANGELOG.md +++ b/packages/flutter_image/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 4.1.10 * Fixes image asset link to use image within package. diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index 66978f608b9..5cb6371421f 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 0.6.18+3 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index 62c73b0163b..e551d260067 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 13.0.1 * Fixes new lint warnings. diff --git a/packages/palette_generator/CHANGELOG.md b/packages/palette_generator/CHANGELOG.md index 1afd549822c..4d125eba21d 100644 --- a/packages/palette_generator/CHANGELOG.md +++ b/packages/palette_generator/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 0.3.3+3 diff --git a/packages/path_provider/path_provider_foundation/CHANGELOG.md b/packages/path_provider/path_provider_foundation/CHANGELOG.md index 40baf3698d7..9d505e54fb9 100644 --- a/packages/path_provider/path_provider_foundation/CHANGELOG.md +++ b/packages/path_provider/path_provider_foundation/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 2.3.2 diff --git a/packages/platform/CHANGELOG.md b/packages/platform/CHANGELOG.md index 9325305626f..4c96a4197de 100644 --- a/packages/platform/CHANGELOG.md +++ b/packages/platform/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 3.1.4 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md b/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md index e9b7831a10d..a822866f910 100644 --- a/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md +++ b/packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md b/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md index a3b3898ddd6..cd4057d6a91 100644 --- a/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md +++ b/packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 0.10.0+2 diff --git a/packages/quick_actions/quick_actions_ios/CHANGELOG.md b/packages/quick_actions/quick_actions_ios/CHANGELOG.md index 87793c02494..c7f6a3b983c 100644 --- a/packages/quick_actions/quick_actions_ios/CHANGELOG.md +++ b/packages/quick_actions/quick_actions_ios/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6. ## 1.0.10 diff --git a/packages/rfw/CHANGELOG.md b/packages/rfw/CHANGELOG.md index c91622cd5c5..ae217df2218 100644 --- a/packages/rfw/CHANGELOG.md +++ b/packages/rfw/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 1.0.17 * Adds support for tracking source locations of `BlobNode`s and diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md index 7e6d5a9f1e5..71ab9ed8c3c 100644 --- a/packages/shared_preferences/shared_preferences/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md @@ -1,6 +1,5 @@ ## NEXT -* Fixes Swift format issues in example app. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/two_dimensional_scrollables/CHANGELOG.md b/packages/two_dimensional_scrollables/CHANGELOG.md index 27c9aa86d2e..e2a6474c31e 100644 --- a/packages/two_dimensional_scrollables/CHANGELOG.md +++ b/packages/two_dimensional_scrollables/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Fixes Swift format issues in example app. - ## 0.0.5+2 * Fixes must_call_super lint warning from pending framework change.