From e5b4e954d2f5abb44f260fa61b2b7667e1b383c0 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 26 Mar 2020 11:43:37 -0700 Subject: [PATCH] inlinable styles --- Examples/SlidersExamples macOS/Info.plist | 2 ++ Examples/SlidersExamples.xcodeproj/project.pbxproj | 4 ++-- Sources/Sliders/PointSlider/Style/AnyPointSliderStyle.swift | 6 +++--- .../Style/EnvironmentValues+PointSliderStyle.swift | 6 +++--- Sources/Sliders/RangeSlider/Style/AnyRangeSliderStyle.swift | 6 +++--- .../Style/EnvironmentValues+RangeSliderStyle.swift | 6 +++--- Sources/Sliders/ValueSlider/Style/AnyValueSliderStyle.swift | 6 +++--- .../Style/EnvironmentValues+ValueSliderStyle.swift | 6 +++--- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Examples/SlidersExamples macOS/Info.plist b/Examples/SlidersExamples macOS/Info.plist index 34963b5..026b4e0 100644 --- a/Examples/SlidersExamples macOS/Info.plist +++ b/Examples/SlidersExamples macOS/Info.plist @@ -20,6 +20,8 @@ $(MARKETING_VERSION) CFBundleVersion 1 + LSApplicationCategoryType + public.app-category.developer-tools LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSMainStoryboardFile diff --git a/Examples/SlidersExamples.xcodeproj/project.pbxproj b/Examples/SlidersExamples.xcodeproj/project.pbxproj index 9d89ab9..df2d425 100644 --- a/Examples/SlidersExamples.xcodeproj/project.pbxproj +++ b/Examples/SlidersExamples.xcodeproj/project.pbxproj @@ -573,7 +573,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_ASSET_PATHS = "\"SlidersExamples iOS\"/Preview\\ Content"; - DEVELOPMENT_TEAM = Z8L4G5WZR3; + DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -652,7 +652,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_ASSET_PATHS = "\"SlidersExamples iOS\"/Preview\\ Content"; - DEVELOPMENT_TEAM = Z8L4G5WZR3; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_PREVIEWS = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/Sources/Sliders/PointSlider/Style/AnyPointSliderStyle.swift b/Sources/Sliders/PointSlider/Style/AnyPointSliderStyle.swift index 7b6e5a9..9fc795d 100644 --- a/Sources/Sliders/PointSlider/Style/AnyPointSliderStyle.swift +++ b/Sources/Sliders/PointSlider/Style/AnyPointSliderStyle.swift @@ -1,13 +1,13 @@ import SwiftUI -struct AnyPointSliderStyle: PointSliderStyle { +public struct AnyPointSliderStyle: PointSliderStyle { private let styleMakeBody: (PointSliderStyle.Configuration) -> AnyView - init(_ style: S) { + public init(_ style: S) { self.styleMakeBody = style.makeTypeErasedBody } - func makeBody(configuration: PointSliderStyle.Configuration) -> AnyView { + public func makeBody(configuration: PointSliderStyle.Configuration) -> AnyView { self.styleMakeBody(configuration) } } diff --git a/Sources/Sliders/PointSlider/Style/EnvironmentValues+PointSliderStyle.swift b/Sources/Sliders/PointSlider/Style/EnvironmentValues+PointSliderStyle.swift index 89cf4e9..87869a1 100644 --- a/Sources/Sliders/PointSlider/Style/EnvironmentValues+PointSliderStyle.swift +++ b/Sources/Sliders/PointSlider/Style/EnvironmentValues+PointSliderStyle.swift @@ -1,6 +1,6 @@ import SwiftUI -extension EnvironmentValues { +public extension EnvironmentValues { var pointSliderStyle: AnyPointSliderStyle { get { return self[PointSliderStyleKey.self] @@ -17,9 +17,9 @@ struct PointSliderStyleKey: EnvironmentKey { ) } -extension View { +public extension View { /// Sets the style for `PointSlider` within the environment of `self`. - public func pointSliderStyle(_ style: S) -> some View where S : PointSliderStyle { + @inlinable func pointSliderStyle(_ style: S) -> some View where S : PointSliderStyle { self.environment(\.pointSliderStyle, AnyPointSliderStyle(style)) } } diff --git a/Sources/Sliders/RangeSlider/Style/AnyRangeSliderStyle.swift b/Sources/Sliders/RangeSlider/Style/AnyRangeSliderStyle.swift index bf6ebb5..9257a5d 100644 --- a/Sources/Sliders/RangeSlider/Style/AnyRangeSliderStyle.swift +++ b/Sources/Sliders/RangeSlider/Style/AnyRangeSliderStyle.swift @@ -1,13 +1,13 @@ import SwiftUI -struct AnyRangeSliderStyle: RangeSliderStyle { +public struct AnyRangeSliderStyle: RangeSliderStyle { private let styleMakeBody: (RangeSliderStyle.Configuration) -> AnyView - init(_ style: S) { + public init(_ style: S) { self.styleMakeBody = style.makeTypeErasedBody } - func makeBody(configuration: RangeSliderStyle.Configuration) -> AnyView { + public func makeBody(configuration: RangeSliderStyle.Configuration) -> AnyView { self.styleMakeBody(configuration) } } diff --git a/Sources/Sliders/RangeSlider/Style/EnvironmentValues+RangeSliderStyle.swift b/Sources/Sliders/RangeSlider/Style/EnvironmentValues+RangeSliderStyle.swift index 0f6f474..e76d550 100644 --- a/Sources/Sliders/RangeSlider/Style/EnvironmentValues+RangeSliderStyle.swift +++ b/Sources/Sliders/RangeSlider/Style/EnvironmentValues+RangeSliderStyle.swift @@ -1,6 +1,6 @@ import SwiftUI -extension EnvironmentValues { +public extension EnvironmentValues { var rangeSliderStyle: AnyRangeSliderStyle { get { return self[RangeSliderStyleKey.self] @@ -17,9 +17,9 @@ struct RangeSliderStyleKey: EnvironmentKey { ) } -extension View { +public extension View { /// Sets the style for `RangeSlider` within the environment of `self`. - public func rangeSliderStyle(_ style: S) -> some View where S : RangeSliderStyle { + @inlinable func rangeSliderStyle(_ style: S) -> some View where S : RangeSliderStyle { self.environment(\.rangeSliderStyle, AnyRangeSliderStyle(style)) } } diff --git a/Sources/Sliders/ValueSlider/Style/AnyValueSliderStyle.swift b/Sources/Sliders/ValueSlider/Style/AnyValueSliderStyle.swift index d747610..ed9eaa1 100644 --- a/Sources/Sliders/ValueSlider/Style/AnyValueSliderStyle.swift +++ b/Sources/Sliders/ValueSlider/Style/AnyValueSliderStyle.swift @@ -1,13 +1,13 @@ import SwiftUI -struct AnyValueSliderStyle: ValueSliderStyle { +public struct AnyValueSliderStyle: ValueSliderStyle { private let styleMakeBody: (ValueSliderStyle.Configuration) -> AnyView - init(_ style: S) { + public init(_ style: S) { self.styleMakeBody = style.makeTypeErasedBody } - func makeBody(configuration: ValueSliderStyle.Configuration) -> AnyView { + public func makeBody(configuration: ValueSliderStyle.Configuration) -> AnyView { self.styleMakeBody(configuration) } } diff --git a/Sources/Sliders/ValueSlider/Style/EnvironmentValues+ValueSliderStyle.swift b/Sources/Sliders/ValueSlider/Style/EnvironmentValues+ValueSliderStyle.swift index fab5069..96cfa2c 100644 --- a/Sources/Sliders/ValueSlider/Style/EnvironmentValues+ValueSliderStyle.swift +++ b/Sources/Sliders/ValueSlider/Style/EnvironmentValues+ValueSliderStyle.swift @@ -1,6 +1,6 @@ import SwiftUI -extension EnvironmentValues { +public extension EnvironmentValues { var valueSliderStyle: AnyValueSliderStyle { get { return self[ValueSliderStyleKey.self] @@ -17,9 +17,9 @@ struct ValueSliderStyleKey: EnvironmentKey { ) } -extension View { +public extension View { /// Sets the style for `ValueSlider` within the environment of `self`. - public func valueSliderStyle(_ style: S) -> some View where S : ValueSliderStyle { + @inlinable func valueSliderStyle(_ style: S) -> some View where S : ValueSliderStyle { self.environment(\.valueSliderStyle, AnyValueSliderStyle(style)) } }