Skip to content

Commit 3fbf6fb

Browse files
MichaelVerdonMichaelVerdon
committed
chore: format all swift code
1 parent e548cc3 commit 3fbf6fb

File tree

10 files changed

+1400
-1294
lines changed

10 files changed

+1400
-1294
lines changed

‎packages/firebase_database/firebase_database/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎packages/firebase_database/firebase_database/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
464464
GCC_WARN_UNUSED_FUNCTION = YES;
465465
GCC_WARN_UNUSED_VARIABLE = YES;
466-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
466+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
467467
MTL_ENABLE_DEBUG_INFO = NO;
468468
SDKROOT = iphoneos;
469469
SUPPORTED_PLATFORMS = iphoneos;
@@ -594,7 +594,7 @@
594594
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
595595
GCC_WARN_UNUSED_FUNCTION = YES;
596596
GCC_WARN_UNUSED_VARIABLE = YES;
597-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
597+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
598598
MTL_ENABLE_DEBUG_INFO = YES;
599599
ONLY_ACTIVE_ARCH = YES;
600600
SDKROOT = iphoneos;
@@ -645,7 +645,7 @@
645645
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
646646
GCC_WARN_UNUSED_FUNCTION = YES;
647647
GCC_WARN_UNUSED_VARIABLE = YES;
648-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
648+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
649649
MTL_ENABLE_DEBUG_INFO = NO;
650650
SDKROOT = iphoneos;
651651
SUPPORTED_PLATFORMS = iphoneos;

‎packages/firebase_database/firebase_database/ios/firebase_database/Package.swift‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ enum ConfigurationError: Error {
1414
case invalidFormat(String)
1515
}
1616

17-
let databaseDirectory = String(URL(string: #file)!.deletingLastPathComponent().absoluteString
18-
.dropLast())
17+
let databaseDirectory = String(
18+
URL(string: #file)!.deletingLastPathComponent().absoluteString
19+
.dropLast())
1920

2021
func loadFirebaseSDKVersion() throws -> String {
2122
let firebaseCoreScriptPath = NSString.path(withComponents: [
@@ -28,7 +29,8 @@ func loadFirebaseSDKVersion() throws -> String {
2829
.trimmingCharacters(in: .whitespacesAndNewlines)
2930
return version
3031
} catch {
31-
throw ConfigurationError
32+
throw
33+
ConfigurationError
3234
.fileNotFound("Error loading or parsing generated_firebase_sdk_version.txt: \(error)")
3335
}
3436
}
@@ -48,7 +50,8 @@ func loadPubspecVersions() throws -> (packageVersion: String, firebaseCoreVersio
4850
packageVersion = packageVersion.replacingOccurrences(of: "^", with: "")
4951

5052
guard let firebaseCoreVersionLine = lines.first(where: { $0.contains("firebase_core:") }) else {
51-
throw ConfigurationError
53+
throw
54+
ConfigurationError
5255
.invalidFormat("No firebase_core dependency version line found in pubspec.yaml")
5356
}
5457
var firebaseCoreVersion = firebaseCoreVersionLine.split(separator: ":")[1]
@@ -85,10 +88,10 @@ guard let shared_spm_version = Version("\(firebase_core_version_string)\(shared_
8588
let package = Package(
8689
name: "firebase_database",
8790
platforms: [
88-
.iOS("15.0"),
91+
.iOS("15.0")
8992
],
9093
products: [
91-
.library(name: "firebase-database", targets: ["firebase_database"]),
94+
.library(name: "firebase-database", targets: ["firebase_database"])
9295
],
9396
dependencies: [
9497
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: firebase_sdk_version),
@@ -103,13 +106,13 @@ let package = Package(
103106
.product(name: "firebase-core-shared", package: "flutterfire"),
104107
],
105108
resources: [
106-
.process("Resources"),
109+
.process("Resources")
107110
],
108111
cSettings: [
109112
.headerSearchPath("include"),
110113
.define("LIBRARY_VERSION", to: "\"\(library_version)\""),
111114
.define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""),
112115
]
113-
),
116+
)
114117
]
115118
)

‎packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift‎

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,68 @@ import FirebaseDatabase
66
import Flutter
77

88
@objc class FLTFirebaseDatabaseObserveStreamHandler: NSObject, FlutterStreamHandler {
9-
private var databaseHandle: DatabaseHandle = 0
10-
private let databaseQuery: DatabaseQuery
11-
private let disposeBlock: () -> Void
12-
13-
init(databaseQuery: DatabaseQuery, disposeBlock: @escaping () -> Void) {
14-
self.databaseQuery = databaseQuery
15-
self.disposeBlock = disposeBlock
16-
super.init()
9+
private var databaseHandle: DatabaseHandle = 0
10+
private let databaseQuery: DatabaseQuery
11+
private let disposeBlock: () -> Void
12+
13+
init(databaseQuery: DatabaseQuery, disposeBlock: @escaping () -> Void) {
14+
self.databaseQuery = databaseQuery
15+
self.disposeBlock = disposeBlock
16+
super.init()
17+
}
18+
19+
func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink)
20+
-> FlutterError?
21+
{
22+
guard let args = arguments as? [String: Any],
23+
let eventTypeString = args["eventType"] as? String
24+
else {
25+
return nil
1726
}
18-
19-
func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
20-
guard let args = arguments as? [String: Any],
21-
let eventTypeString = args["eventType"] as? String else {
22-
return nil
23-
}
24-
25-
let observeBlock: (DataSnapshot, String?) -> Void = { [weak self] snapshot, previousChildKey in
26-
var eventDictionary: [String: Any] = [
27-
"eventType": eventTypeString
28-
]
29-
30-
let snapshotDict = FLTFirebaseDatabaseUtils.dictionary(from: snapshot, withPreviousChildKey: previousChildKey)
31-
eventDictionary.merge(snapshotDict) { _, new in new }
32-
33-
DispatchQueue.main.async {
34-
events(eventDictionary)
35-
}
36-
}
37-
38-
let cancelBlock: (Error) -> Void = { [weak self] error in
39-
let codeAndMessage = FLTFirebaseDatabaseUtils.codeAndMessage(from: error)
40-
let code = codeAndMessage[0]
41-
let message = codeAndMessage[1]
42-
let details: [String: Any] = [
43-
"code": code,
44-
"message": message
45-
]
46-
47-
DispatchQueue.main.async {
48-
let flutterError = FlutterError(
49-
code: code,
50-
message: message,
51-
details: details
52-
)
53-
events(flutterError)
54-
}
55-
}
56-
57-
let eventType = FLTFirebaseDatabaseUtils.eventType(from: eventTypeString)
58-
databaseHandle = databaseQuery.observe(eventType, andPreviousSiblingKeyWith: observeBlock, withCancel: cancelBlock)
59-
60-
return nil
27+
28+
let observeBlock: (DataSnapshot, String?) -> Void = { [weak self] snapshot, previousChildKey in
29+
var eventDictionary: [String: Any] = [
30+
"eventType": eventTypeString
31+
]
32+
33+
let snapshotDict = FLTFirebaseDatabaseUtils.dictionary(
34+
from: snapshot, withPreviousChildKey: previousChildKey)
35+
eventDictionary.merge(snapshotDict) { _, new in new }
36+
37+
DispatchQueue.main.async {
38+
events(eventDictionary)
39+
}
6140
}
62-
63-
func onCancel(withArguments arguments: Any?) -> FlutterError? {
64-
disposeBlock()
65-
databaseQuery.removeObserver(withHandle: databaseHandle)
66-
return nil
41+
42+
let cancelBlock: (Error) -> Void = { [weak self] error in
43+
let codeAndMessage = FLTFirebaseDatabaseUtils.codeAndMessage(from: error)
44+
let code = codeAndMessage[0]
45+
let message = codeAndMessage[1]
46+
let details: [String: Any] = [
47+
"code": code,
48+
"message": message,
49+
]
50+
51+
DispatchQueue.main.async {
52+
let flutterError = FlutterError(
53+
code: code,
54+
message: message,
55+
details: details
56+
)
57+
events(flutterError)
58+
}
6759
}
60+
61+
let eventType = FLTFirebaseDatabaseUtils.eventType(from: eventTypeString)
62+
databaseHandle = databaseQuery.observe(
63+
eventType, andPreviousSiblingKeyWith: observeBlock, withCancel: cancelBlock)
64+
65+
return nil
66+
}
67+
68+
func onCancel(withArguments arguments: Any?) -> FlutterError? {
69+
disposeBlock()
70+
databaseQuery.removeObserver(withHandle: databaseHandle)
71+
return nil
72+
}
6873
}

0 commit comments

Comments
 (0)