Skip to content

[various] Run swift-format on example app Swift files #5931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 2 commits into from
Jan 19, 2024
Merged

[various] Run swift-format on example app Swift files #5931

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cf8fef
[various] Run swift-format on example app Swift files
jmagman Jan 18, 2024
5b0351e
Revert CHANGELOGs
jmagman Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/animations/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Fixes Swift format issues in example app.
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Jan 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional nit: you could revert all of the CHANGELOG changes, as this would fall under the "only affect[s] development of the package" exemption; formatting of the boilerplate runner code isn't going to be of interest to clients.


## 2.0.11

* Fixes new lint warnings.
Expand Down
2 changes: 1 addition & 1 deletion packages/animations/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/dynamic_layouts/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/dynamic_layouts/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/file_selector/file_selector/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/file_selector/file_selector_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_ios/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions packages/flutter_adaptive_scaffold/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Fixes Swift format issues in example app.

## 0.1.7+2

* Fixes new lint warnings.
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_adaptive_scaffold/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions packages/flutter_image/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Fixes Swift format issues in example app.

## 4.1.10

* Fixes image asset link to use image within package.
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_image/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions packages/flutter_markdown/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_markdown/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions packages/go_router/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## NEXT

* Fixes Swift format issues in example app.

## 13.0.1

* Fixes new lint warnings.
Expand Down
2 changes: 1 addition & 1 deletion packages/go_router/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/palette_generator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/palette_generator/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/path_provider/path_provider_foundation/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/path_provider/path_provider_foundation/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions packages/platform/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/platform/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 4 additions & 4 deletions packages/pointer_interceptor/pointer_interceptor/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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: "<DummyPlatform>")!.register(
factory,
withId: "dummy_platform_view")
factory,
withId: "dummy_platform_view")

return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
Expand Down
30 changes: 12 additions & 18 deletions ...pointer_interceptor/pointer_interceptor/example/ios/Runner/DummyPlatformViewFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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,
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions packages/pointer_interceptor/pointer_interceptor_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions packages/pointer_interceptor/pointer_interceptor_ios/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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: "<DummyPlatform>")!.register(
factory,
withId: "dummy_platform_view")
factory,
withId: "dummy_platform_view")

return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
Expand Down
20 changes: 7 additions & 13 deletions ...ter_interceptor/pointer_interceptor_ios/example/ios/Runner/DummyPlatformViewFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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,
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions packages/quick_actions/quick_actions_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading