swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SwiftFormat wraparguments (#579)

Browse Source 
Matches the wrapparameters rule, seems it was missed.
This commit is contained in:
Doug 2023-02-15 08:53:10 +00:00 committed by GitHub
parent 96363b117d
commit afc660a1ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.swiftformat
View File

@ -1,6 +1,6 @@
--swiftversion 5.6 --swiftversion 5.6
--exclude ElementX/Sources/Generated,vendor --exclude ElementX/Sources/Generated,vendor,**/Package.swift
--disable wrapMultiLineStatementBraces --disable wrapMultiLineStatementBraces
--disable hoistPatternLet --disable hoistPatternLet
@ -10,6 +10,7 @@
--nospaceoperators ...,..< --nospaceoperators ...,..<
--stripunusedargs closure-only --stripunusedargs closure-only
--trimwhitespace nonblank-lines --trimwhitespace nonblank-lines
--wraparguments after-first
--wrapparameters after-first --wrapparameters after-first
--redundanttype inferred --redundanttype inferred
--emptybraces spaced --emptybraces spaced

8
ElementX/Sources/Other/BlurHashDecode.swift
View File

@ -80,11 +80,9 @@ private func decodeAC(_ value: Int, maximumValue: Float) -> (Float, Float, Float
let quantG = (value / 19) % 19 let quantG = (value / 19) % 19
let quantB = value % 19 let quantB = value % 19
let rgb = ( let rgb = (signPow((Float(quantR) - 9) / 9, 2) * maximumValue,
signPow((Float(quantR) - 9) / 9, 2) * maximumValue, signPow((Float(quantG) - 9) / 9, 2) * maximumValue,
signPow((Float(quantG) - 9) / 9, 2) * maximumValue, signPow((Float(quantB) - 9) / 9, 2) * maximumValue)
signPow((Float(quantB) - 9) / 9, 2) * maximumValue
)
return rgb return rgb
} }

52
ElementX/Sources/Other/UserAgentBuilder.swift
View File

@ -31,39 +31,31 @@ final class UserAgentBuilder {
let clientVersion = InfoPlistReader.main.bundleShortVersionString let clientVersion = InfoPlistReader.main.bundleShortVersionString
#if os(iOS) #if os(iOS)
return String( return String(format: "%@/%@ (%@; iOS %@; Scale/%0.2f)",
format: "%@/%@ (%@; iOS %@; Scale/%0.2f)", clientName,
clientName, clientVersion,
clientVersion, Device.current.safeDescription,
Device.current.safeDescription, UIDevice.current.systemVersion,
UIDevice.current.systemVersion, UIScreen.main.scale)
UIScreen.main.scale
)
#elseif os(tvOS) #elseif os(tvOS)
return String( return String(format: "%@/%@ (%@; tvOS %@; Scale/%0.2f)",
format: "%@/%@ (%@; tvOS %@; Scale/%0.2f)", clientName,
clientName, clientVersion,
clientVersion, Device.current.safeDescription,
Device.current.safeDescription, UIDevice.current.systemVersion,
UIDevice.current.systemVersion, UIScreen.main.scale)
UIScreen.main.scale
)
#elseif os(watchOS) #elseif os(watchOS)
return String( return String(format: "%@/%@ (%@; watchOS %@; Scale/%0.2f)",
format: "%@/%@ (%@; watchOS %@; Scale/%0.2f)", clientName,
clientName, clientVersion,
clientVersion, Device.current.safeDescription,
Device.current.safeDescription, WKInterfaceDevice.current.systemVersion,
WKInterfaceDevice.current.systemVersion, WKInterfaceDevice.currentDevice.screenScale)
WKInterfaceDevice.currentDevice.screenScale
)
#elseif os(OSX) #elseif os(OSX)
return String( return String(format: "%@/%@ (Mac; Mac OS X %@)",
format: "%@/%@ (Mac; Mac OS X %@)", clientName,
clientName, clientVersion,
clientVersion, NSProcessInfo.processInfo.operatingSystemVersionString)
NSProcessInfo.processInfo.operatingSystemVersionString
)
#else #else
return nil return nil
#endif #endif

16
ElementX/Sources/Services/Authentication/OIDCService.swift
View File

@ -64,15 +64,13 @@ class OIDCService {
"policy_uri": "https://element.io/privacy" "policy_uri": "https://element.io/privacy"
] ]
let nonTemplatizedRequest = OIDRegistrationRequest( let nonTemplatizedRequest = OIDRegistrationRequest(configuration: metadata,
configuration: metadata, redirectURIs: [redirectURI],
redirectURIs: [redirectURI], responseTypes: nil,
responseTypes: nil, grantTypes: [OIDGrantTypeAuthorizationCode, OIDGrantTypeRefreshToken],
grantTypes: [OIDGrantTypeAuthorizationCode, OIDGrantTypeRefreshToken], subjectType: nil,
subjectType: nil, tokenEndpointAuthMethod: "none",
tokenEndpointAuthMethod: "none", additionalParameters: extraParams)
additionalParameters: extraParams
)
let registrationResponse = try await OIDAuthorizationService.perform(nonTemplatizedRequest) let registrationResponse = try await OIDAuthorizationService.perform(nonTemplatizedRequest)

8
UnitTests/Sources/NotificationManager/UNNotification+Creator.swift
View File

@ -22,11 +22,9 @@ extension UNNotification {
static func with(userInfo: [AnyHashable: Any], actionIdentifier: String = UNNotificationDefaultActionIdentifier) throws -> UNNotification { static func with(userInfo: [AnyHashable: Any], actionIdentifier: String = UNNotificationDefaultActionIdentifier) throws -> UNNotification {
let content = UNMutableNotificationContent() let content = UNMutableNotificationContent()
content.userInfo = userInfo content.userInfo = userInfo
let request = UNNotificationRequest( let request = UNNotificationRequest(identifier: "",
identifier: "", content: content,
content: content, trigger: nil)
trigger: nil
)
let archiver = MockCoder(requiringSecureCoding: false) let archiver = MockCoder(requiringSecureCoding: false)
let notification = try XCTUnwrap(UNNotification(coder: archiver)) let notification = try XCTUnwrap(UNNotification(coder: archiver))
notification.setValue(request, forKey: "request") notification.setValue(request, forKey: "request")

8
UnitTests/Sources/NotificationManager/UNTextInputNotificationResponse+Creator.swift
View File

@ -21,11 +21,9 @@ extension UNTextInputNotificationResponse {
static func with(userInfo: [AnyHashable: Any], actionIdentifier: String = UNNotificationDefaultActionIdentifier) throws -> UNNotificationResponse { static func with(userInfo: [AnyHashable: Any], actionIdentifier: String = UNNotificationDefaultActionIdentifier) throws -> UNNotificationResponse {
let content = UNMutableNotificationContent() let content = UNMutableNotificationContent()
content.userInfo = userInfo content.userInfo = userInfo
let request = UNNotificationRequest( let request = UNNotificationRequest(identifier: "",
identifier: "", content: content,
content: content, trigger: nil)
trigger: nil
)
let archiver = MockCoder(requiringSecureCoding: false) let archiver = MockCoder(requiringSecureCoding: false)
let notification = try XCTUnwrap(UNNotification(coder: archiver)) let notification = try XCTUnwrap(UNNotification(coder: archiver))
notification.setValue(request, forKey: "request") notification.setValue(request, forKey: "request")