passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-02-20 23:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SwiftGen

Browse Source
This commit is contained in:
Davide De Rosa 2021-07-29 16:55:10 +02:00
parent 4f95561d0d
commit 18da02e5a1
4 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Passepartout/App/macOS/Global/SwiftGen+Assets.swift
View File

@ -289,6 +289,7 @@ internal enum Asset {
internal static let pia = ImageAsset(name: "pia")
internal static let placeholder = ImageAsset(name: "placeholder")
internal static let protonvpn = ImageAsset(name: "protonvpn")
internal static let surfshark = ImageAsset(name: "surfshark")
internal static let torguard = ImageAsset(name: "torguard")
internal static let tunnelbear = ImageAsset(name: "tunnelbear")
internal static let vyprvpn = ImageAsset(name: "vyprvpn")
@ -313,7 +314,8 @@ internal struct ImageAsset {
#if os(iOS) || os(tvOS)
let image = Image(named: name, in: bundle, compatibleWith: nil)
#elseif os(macOS)
let image = bundle.image(forResource: NSImage.Name(name))
let name = NSImage.Name(self.name)
let image = (bundle == .main) ? NSImage(named: name) : bundle.image(forResource: name)
#elseif os(watchOS)
let image = Image(named: name)
#endif
@ -342,7 +344,11 @@ internal extension ImageAsset.Image {
// swiftlint:disable convenience_type
private final class BundleToken {
static let bundle: Bundle = {
Bundle(for: BundleToken.self)
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: BundleToken.self)
#endif
}()
}
// swiftlint:enable convenience_type

34
Passepartout/App/macOS/Global/SwiftGen+Scenes.swift
View File

@ -6,7 +6,7 @@ import Foundation
import AppKit
// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length
// swiftlint:disable file_length implicit_return
// MARK: - Storyboard Scenes
@ -67,6 +67,16 @@ internal struct SceneType<T> {
}
return controller
}
@available(macOS 10.15, *)
internal func instantiate(creator block: @escaping (NSCoder) -> T?) -> T where T: NSViewController {
return storyboard.storyboard.instantiateController(identifier: identifier, creator: block)
}
@available(macOS 10.15, *)
internal func instantiate(creator block: @escaping (NSCoder) -> T?) -> T where T: NSWindowController {
return storyboard.storyboard.instantiateController(identifier: identifier, creator: block)
}
}
internal struct InitialSceneType<T> {
@ -78,12 +88,32 @@ internal struct InitialSceneType<T> {
}
return controller
}
@available(macOS 10.15, *)
internal func instantiate(creator block: @escaping (NSCoder) -> T?) -> T where T: NSViewController {
guard let controller = storyboard.storyboard.instantiateInitialController(creator: block) else {
fatalError("Storyboard \(storyboard.storyboardName) does not have an initial scene.")
}
return controller
}
@available(macOS 10.15, *)
internal func instantiate(creator block: @escaping (NSCoder) -> T?) -> T where T: NSWindowController {
guard let controller = storyboard.storyboard.instantiateInitialController(creator: block) else {
fatalError("Storyboard \(storyboard.storyboardName) does not have an initial scene.")
}
return controller
}
}
// swiftlint:disable convenience_type
private final class BundleToken {
static let bundle: Bundle = {
Bundle(for: BundleToken.self)
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: BundleToken.self)
#endif
}()
}
// swiftlint:enable convenience_type

8
Passepartout/App/macOS/Global/SwiftGen+Segues.swift
View File

@ -45,11 +45,3 @@ internal extension SegueType where RawValue == String {
self.init(rawValue: identifier)
}
}
// swiftlint:disable convenience_type
private final class BundleToken {
static let bundle: Bundle = {
Bundle(for: BundleToken.self)
}()
}
// swiftlint:enable convenience_type

10
Passepartout/App/macOS/Global/SwiftGen+Strings.swift
View File

@ -8,7 +8,7 @@ import Foundation
// MARK: - Strings
// swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:disable nesting type_body_length type_name
// swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
internal enum L10n {
internal enum App {
internal enum Configuration {
@ -1140,7 +1140,7 @@ internal enum L10n {
}
}
// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:enable nesting type_body_length type_name
// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces
// MARK: - Implementation Details
@ -1154,7 +1154,11 @@ extension L10n {
// swiftlint:disable convenience_type
private final class BundleToken {
static let bundle: Bundle = {
Bundle(for: BundleToken.self)
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: BundleToken.self)
#endif
}()
}
// swiftlint:enable convenience_type