From 40bf1eae6f1d95cc799b7f70467abc36fe8265f3 Mon Sep 17 00:00:00 2001 From: Alex Young Date: Sun, 29 Dec 2019 16:39:46 -0800 Subject: [PATCH] Products (#64) * products * tests * badge * ci --- .github/workflows/{swift.yml => ci.yml} | 2 +- .../ContentView.swift | 1 - .../Layouts/ModularGrid/ModularGridView.swift | 2 +- .../StaggeredGrid/StaggeredGridView.swift | 2 +- .../Layouts/ModularGrid/ModularGridView.swift | 2 +- .../StaggeredGrid/StaggeredGridView.swift | 2 +- .../project.pbxproj | 40 +++++++++---------- Package.swift | 25 ++++++------ README.md | 6 +-- .../AxisLabels.swift | 0 .../DataVisualization => }/Chart/Chart.swift | 0 .../Chart/Styles/Area/AreaChart.swift | 0 .../Chart/Styles/Area/AreaChartStyle.swift | 0 .../Styles/Area/StackedAreaChartStyle.swift | 0 .../Styles/Column/ColumnChartStyle.swift | 0 .../Column/StackedColumnChartStyle.swift | 0 .../Chart/Styles/Line/LineChartStyle.swift | 1 + .../Chart/Styles/Style/AnyChartStyle.swift | 0 .../Chart/Styles/Style/ChartStyle.swift | 0 .../Style/ChartStyleConfiguration.swift | 0 .../Chart/Styles/Style/ChartStyleKey.swift | 0 .../Styles/Style/Environment+ChartStyle.swift | 0 .../Chart/Styles/Style/LineType.swift | 0 .../Chart/Styles/Style/View+ChartStyle.swift | 0 .../Layouts => }/Grid/Grid+Inits.swift | 0 .../Layouts => }/Grid/Grid.swift | 0 .../Grid/Styles/Layout/LayoutMath.swift | 0 .../Grid/Styles/Layout/Tracks.swift | 0 .../Grid/Styles/ModularGridStyle.swift | 0 .../Grid/Styles/StaggeredGridStyle.swift | 0 .../Style/EnvironmentValues+GridStyle.swift | 0 .../Styles/Style/GridItemPreferences.swift | 0 .../Styles/Style/GridItemPreferencesKey.swift | 0 .../Style/GridItemPreferencesModifier.swift | 0 .../Grid/Styles/Style/GridStyle.swift | 0 .../Grid/Styles/Style/GridStyleKey.swift | 0 .../Grid/Styles/Style/View+GridStyle.swift | 0 .../Shapes/CGPoint+Extensions.swift | 0 .../Shapes/Lines/Line.swift | 0 .../Shapes/Lines/QuadCurve.swift | 0 .../Shapes/Other/HalfCapsule.swift | 0 .../Shapes/Path/Path+AddLineFromTo.swift | 0 .../Shapes/Path/Path+QuadCurves.swift | 0 .../Shapes/Patterns/GridPattern.swift | 0 .../Shapes/RegularPolygons/Decagon.swift | 0 .../Shapes/RegularPolygons/Heptagon.swift | 0 .../Shapes/RegularPolygons/Hexagon.swift | 0 .../Shapes/RegularPolygons/Nonagon.swift | 0 .../Shapes/RegularPolygons/Octagon.swift | 0 .../Shapes/RegularPolygons/Pentagon.swift | 0 .../RegularPolygons/RegularPolygon.swift | 0 .../RegularPolygons/RegularPolygonPath.swift | 0 .../Base/DefaultHorizontalValueView.swift | 0 .../Sliders/Base/DefaultThumb.swift | 0 .../Base/DefaultVerticalValueView.swift | 0 .../Sliders/Base/LinearRangeMath.swift | 0 .../Sliders/Base/LinearValueMath.swift | 0 .../Base/Point/DefaultPointTrackView.swift | 0 .../Sliders/Base/Point/PointSlider.swift | 0 .../Base/Point/PointSliderConfiguration.swift | 0 .../Range/DefaultHorizontalRangeTrack.swift | 0 .../Range/DefaultVerticalRangeTrack.swift | 0 .../Base/Range/HorizontalRangeSlider.swift | 0 .../Base/Range/HorizontalRangeTrack.swift | 0 .../Base/Range/RangeSliderConfiguration.swift | 0 .../Base/Range/RangeTrackConfiguration.swift | 0 .../Base/Range/VerticalRangeSlider.swift | 0 .../Base/Range/VerticalRangeTrack.swift | 0 .../Value/DefaultHorizontalValueTrack.swift | 0 .../Value/DefaultVerticalValueTrack.swift | 0 .../Base/Value/HorizontalValueSlider.swift | 0 .../Base/Value/HorizontalValueTrack.swift | 0 .../Base/Value/ValueSliderConfiguration.swift | 0 .../Base/Value/ValueTrackConfiguration.swift | 0 .../Base/Value/VerticalValueSlider.swift | 0 .../Base/Value/VerticalValueTrack.swift | 0 .../Sliders/ValueSlider/ValueSlider.swift | 0 .../HorizontalValueSliderStyle.swift | 0 .../AnyValueSliderStyle.swift | 0 .../EnvironmentValues+ValueSliderStyle.swift | 0 .../ValueSliderStyle/ValueSliderStyle.swift | 0 .../ValueSliderStyleConfiguration.swift | 0 .../ValueSliderStyleKey.swift | 0 .../View+ValueSliderStyle.swift | 0 .../Sliders/ValueTrack/ValueTrack.swift | 0 .../SwiftUIExtensions/SwiftUIExtensions.swift | 5 +++ .../SlidersTests/DistanceFromValueTests.swift | 2 +- .../SlidersTests/RangeDistanceTests.swift | 2 +- .../SlidersTests/ValueFromDistanceTests.swift | 2 +- 89 files changed, 49 insertions(+), 45 deletions(-) rename .github/workflows/{swift.yml => ci.yml} (95%) rename Sources/{SwiftUIExtensions/DataVisualization => Chart}/AxisLabels.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Chart.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Area/AreaChart.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Area/AreaChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Area/StackedAreaChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Column/ColumnChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Column/StackedColumnChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Line/LineChartStyle.swift (98%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/AnyChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/ChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/ChartStyleConfiguration.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/ChartStyleKey.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/Environment+ChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/LineType.swift (100%) rename Sources/{SwiftUIExtensions/DataVisualization => }/Chart/Styles/Style/View+ChartStyle.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Grid+Inits.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Grid.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Layout/LayoutMath.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Layout/Tracks.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/ModularGridStyle.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/StaggeredGridStyle.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/EnvironmentValues+GridStyle.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/GridItemPreferences.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/GridItemPreferencesKey.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/GridItemPreferencesModifier.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/GridStyle.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/GridStyleKey.swift (100%) rename Sources/{SwiftUIExtensions/Layouts => }/Grid/Styles/Style/View+GridStyle.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/CGPoint+Extensions.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/Lines/Line.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/Lines/QuadCurve.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/Other/HalfCapsule.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/Path/Path+AddLineFromTo.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/Path/Path+QuadCurves.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/Patterns/GridPattern.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/Decagon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/Heptagon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/Hexagon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/Nonagon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/Octagon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/Pentagon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/RegularPolygon.swift (100%) rename Sources/{SwiftUIExtensions => }/Shapes/RegularPolygons/RegularPolygonPath.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/DefaultHorizontalValueView.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/DefaultThumb.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/DefaultVerticalValueView.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/LinearRangeMath.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/LinearValueMath.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Point/DefaultPointTrackView.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Point/PointSlider.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Point/PointSliderConfiguration.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/DefaultHorizontalRangeTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/DefaultVerticalRangeTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/HorizontalRangeSlider.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/HorizontalRangeTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/RangeSliderConfiguration.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/RangeTrackConfiguration.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/VerticalRangeSlider.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Range/VerticalRangeTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/DefaultHorizontalValueTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/DefaultVerticalValueTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/HorizontalValueSlider.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/HorizontalValueTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/ValueSliderConfiguration.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/ValueTrackConfiguration.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/VerticalValueSlider.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/Base/Value/VerticalValueTrack.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSlider.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/HorizontalValueSliderStyle.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/AnyValueSliderStyle.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/EnvironmentValues+ValueSliderStyle.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyle.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleConfiguration.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleKey.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/View+ValueSliderStyle.swift (100%) rename Sources/{SwiftUIExtensions => }/Sliders/ValueTrack/ValueTrack.swift (100%) create mode 100644 Sources/SwiftUIExtensions/SwiftUIExtensions.swift diff --git a/.github/workflows/swift.yml b/.github/workflows/ci.yml similarity index 95% rename from .github/workflows/swift.yml rename to .github/workflows/ci.yml index 8f2478c..009663a 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: ci on: [push, pull_request] diff --git a/Demo/SwiftUIExtensionsDemo WatchKit Extension/ContentView.swift b/Demo/SwiftUIExtensionsDemo WatchKit Extension/ContentView.swift index 9785824..3561f35 100644 --- a/Demo/SwiftUIExtensionsDemo WatchKit Extension/ContentView.swift +++ b/Demo/SwiftUIExtensionsDemo WatchKit Extension/ContentView.swift @@ -1,5 +1,4 @@ import SwiftUI -import SwiftUIExtensions struct ContentView: View { var body: some View { diff --git a/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/ModularGrid/ModularGridView.swift b/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/ModularGrid/ModularGridView.swift index 7b922ce..d03b5ff 100644 --- a/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/ModularGrid/ModularGridView.swift +++ b/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/ModularGrid/ModularGridView.swift @@ -1,5 +1,5 @@ import SwiftUI -import SwiftUIExtensions +import Grid struct ModularGridView: View { @State var selection: Int = 0 diff --git a/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/StaggeredGrid/StaggeredGridView.swift b/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/StaggeredGrid/StaggeredGridView.swift index ad42c91..5f0a6c7 100644 --- a/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/StaggeredGrid/StaggeredGridView.swift +++ b/Demo/SwiftUIExtensionsDemo WatchKit Extension/Layouts/StaggeredGrid/StaggeredGridView.swift @@ -1,5 +1,5 @@ import SwiftUI -import SwiftUIExtensions +import Grid struct StaggeredGridView: View { var body: some View { diff --git a/Demo/SwiftUIExtensionsDemo tvOS/Layouts/ModularGrid/ModularGridView.swift b/Demo/SwiftUIExtensionsDemo tvOS/Layouts/ModularGrid/ModularGridView.swift index 80135c2..a1002d8 100644 --- a/Demo/SwiftUIExtensionsDemo tvOS/Layouts/ModularGrid/ModularGridView.swift +++ b/Demo/SwiftUIExtensionsDemo tvOS/Layouts/ModularGrid/ModularGridView.swift @@ -1,5 +1,5 @@ import SwiftUI -import SwiftUIExtensions +import Grid struct ModularGridView: View { @State var selection: Int = 0 diff --git a/Demo/SwiftUIExtensionsDemo tvOS/Layouts/StaggeredGrid/StaggeredGridView.swift b/Demo/SwiftUIExtensionsDemo tvOS/Layouts/StaggeredGrid/StaggeredGridView.swift index f5582df..7f78742 100644 --- a/Demo/SwiftUIExtensionsDemo tvOS/Layouts/StaggeredGrid/StaggeredGridView.swift +++ b/Demo/SwiftUIExtensionsDemo tvOS/Layouts/StaggeredGrid/StaggeredGridView.swift @@ -1,5 +1,5 @@ import SwiftUI -import SwiftUIExtensions +import Grid struct StaggeredGridView: View { var body: some View { diff --git a/Demo/SwiftUIExtensionsDemo.xcodeproj/project.pbxproj b/Demo/SwiftUIExtensionsDemo.xcodeproj/project.pbxproj index eb40fce..ec47667 100644 --- a/Demo/SwiftUIExtensionsDemo.xcodeproj/project.pbxproj +++ b/Demo/SwiftUIExtensionsDemo.xcodeproj/project.pbxproj @@ -17,12 +17,10 @@ FA2C327823A35EA1002DF6F7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FA2C327623A35EA1002DF6F7 /* LaunchScreen.storyboard */; }; FA2C328123A35F58002DF6F7 /* StaggeredGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2C328023A35F58002DF6F7 /* StaggeredGridView.swift */; }; FA2C328323A35F73002DF6F7 /* ModularGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2C328223A35F73002DF6F7 /* ModularGridView.swift */; }; - FA2C328523A35FD2002DF6F7 /* SwiftUIExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = FA2C328423A35FD2002DF6F7 /* SwiftUIExtensions */; }; FA2C328623A35FE6002DF6F7 /* Color+Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA37C458239DE7330037BFE3 /* Color+Random.swift */; }; FA2C328723A35FE6002DF6F7 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA37C459239DE7330037BFE3 /* Item.swift */; }; FA2C328823A35FE6002DF6F7 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA37C45B239DE7330037BFE3 /* Card.swift */; }; FA2C328923A35FE6002DF6F7 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA37C45A239DE7330037BFE3 /* SharedAssets.xcassets */; }; - FA2C328C23A36DB5002DF6F7 /* SwiftUIExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = FA2C328B23A36DB5002DF6F7 /* SwiftUIExtensions */; }; FA2C329123A3704B002DF6F7 /* PatternsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2C328E23A3704B002DF6F7 /* PatternsView.swift */; }; FA2C329223A3704B002DF6F7 /* RegularPolygonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2C328F23A3704B002DF6F7 /* RegularPolygonsView.swift */; }; FA2C329323A3704B002DF6F7 /* LinesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2C329023A3704B002DF6F7 /* LinesView.swift */; }; @@ -59,6 +57,9 @@ FA37C485239DEB2C0037BFE3 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA37C459239DE7330037BFE3 /* Item.swift */; }; FA37C486239DEB2C0037BFE3 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA37C45B239DE7330037BFE3 /* Card.swift */; }; FA37C487239DEB2C0037BFE3 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA37C45A239DE7330037BFE3 /* SharedAssets.xcassets */; }; + FA4AB23423B96F61007B0422 /* SwiftUIExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = FA4AB23323B96F61007B0422 /* SwiftUIExtensions */; }; + FA90447823B975620090B6DA /* Grid in Frameworks */ = {isa = PBXBuildFile; productRef = FA90447723B975620090B6DA /* Grid */; }; + FA90447A23B975CA0090B6DA /* Grid in Frameworks */ = {isa = PBXBuildFile; productRef = FA90447923B975CA0090B6DA /* Grid */; }; FAB94A0823A37B7500EBEB8C /* ChartsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB94A0723A37B7500EBEB8C /* ChartsView.swift */; }; FAB94A1323A384BA00EBEB8C /* HalfCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB94A1123A384B900EBEB8C /* HalfCapsule.swift */; }; FAB94A1423A384BA00EBEB8C /* HalfCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB94A1123A384B900EBEB8C /* HalfCapsule.swift */; }; @@ -78,7 +79,6 @@ FAD4B57323A35A2800308E28 /* NotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD4B57223A35A2800308E28 /* NotificationView.swift */; }; FAD4B57523A35A2900308E28 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FAD4B57423A35A2900308E28 /* Assets.xcassets */; }; FAD4B57823A35A2900308E28 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FAD4B57723A35A2900308E28 /* Preview Assets.xcassets */; }; - FAD4B58723A35BCA00308E28 /* SwiftUIExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = FAD4B58623A35BCA00308E28 /* SwiftUIExtensions */; }; FAD4B58C23A35C8300308E28 /* ModularGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD4B58B23A35C8300308E28 /* ModularGridView.swift */; }; FAD4B58E23A35C9500308E28 /* StaggeredGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD4B58D23A35C9500308E28 /* StaggeredGridView.swift */; }; FAD4B58F23A35CC400308E28 /* Color+Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA37C458239DE7330037BFE3 /* Color+Random.swift */; }; @@ -208,7 +208,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FA2C328523A35FD2002DF6F7 /* SwiftUIExtensions in Frameworks */, + FA90447A23B975CA0090B6DA /* Grid in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -216,7 +216,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FA2C328C23A36DB5002DF6F7 /* SwiftUIExtensions in Frameworks */, + FA4AB23423B96F61007B0422 /* SwiftUIExtensions in Frameworks */, FA37C455239DE6B60037BFE3 /* SwiftUIExtensions in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -233,7 +233,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FAD4B58723A35BCA00308E28 /* SwiftUIExtensions in Frameworks */, + FA90447823B975620090B6DA /* Grid in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -590,7 +590,7 @@ ); name = "SwiftUIExtensionsDemo tvOS"; packageProductDependencies = ( - FA2C328423A35FD2002DF6F7 /* SwiftUIExtensions */, + FA90447923B975CA0090B6DA /* Grid */, ); productName = "SwiftUIExtensionsDemo tvOS"; productReference = FA2C326B23A35EA0002DF6F7 /* SwiftUIExtensionsDemo tvOS.app */; @@ -611,7 +611,7 @@ name = "SwiftUIExtensionsDemo iOS"; packageProductDependencies = ( FA37C454239DE6B60037BFE3 /* SwiftUIExtensions */, - FA2C328B23A36DB5002DF6F7 /* SwiftUIExtensions */, + FA4AB23323B96F61007B0422 /* SwiftUIExtensions */, ); productName = "SwiftUIExtensionsDemo iOS"; productReference = FA37C433239DE2560037BFE3 /* SwiftUIExtensionsDemo iOS.app */; @@ -685,7 +685,7 @@ ); name = "SwiftUIExtensionsDemo WatchKit Extension"; packageProductDependencies = ( - FAD4B58623A35BCA00308E28 /* SwiftUIExtensions */, + FA90447723B975620090B6DA /* Grid */, ); productName = "SwiftUIExtensionsDemo WatchKit Extension"; productReference = FAD4B56523A35A2800308E28 /* SwiftUIExtensionsDemo WatchKit Extension.appex */; @@ -730,7 +730,7 @@ ); mainGroup = FA800E28239DE09A005D2211; packageReferences = ( - FA2C328A23A36DB5002DF6F7 /* XCRemoteSwiftPackageReference "SwiftUIExtensions" */, + FA4AB23223B96F61007B0422 /* XCRemoteSwiftPackageReference "swiftui-extensions" */, ); productRefGroup = FA37C434239DE2560037BFE3 /* Products */; projectDirPath = ""; @@ -1710,9 +1710,9 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - FA2C328A23A36DB5002DF6F7 /* XCRemoteSwiftPackageReference "SwiftUIExtensions" */ = { + FA4AB23223B96F61007B0422 /* XCRemoteSwiftPackageReference "swiftui-extensions" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "git@github.com:SwiftExtensions/SwiftUIExtensions.git"; + repositoryURL = "git@github.com:swift-extensions/swiftui-extensions.git"; requirement = { branch = master; kind = branch; @@ -1721,26 +1721,26 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - FA2C328423A35FD2002DF6F7 /* SwiftUIExtensions */ = { + FA37C454239DE6B60037BFE3 /* SwiftUIExtensions */ = { isa = XCSwiftPackageProductDependency; productName = SwiftUIExtensions; }; - FA2C328B23A36DB5002DF6F7 /* SwiftUIExtensions */ = { + FA37C477239DE9A50037BFE3 /* SwiftUIExtensions */ = { isa = XCSwiftPackageProductDependency; - package = FA2C328A23A36DB5002DF6F7 /* XCRemoteSwiftPackageReference "SwiftUIExtensions" */; productName = SwiftUIExtensions; }; - FA37C454239DE6B60037BFE3 /* SwiftUIExtensions */ = { + FA4AB23323B96F61007B0422 /* SwiftUIExtensions */ = { isa = XCSwiftPackageProductDependency; + package = FA4AB23223B96F61007B0422 /* XCRemoteSwiftPackageReference "swiftui-extensions" */; productName = SwiftUIExtensions; }; - FA37C477239DE9A50037BFE3 /* SwiftUIExtensions */ = { + FA90447723B975620090B6DA /* Grid */ = { isa = XCSwiftPackageProductDependency; - productName = SwiftUIExtensions; + productName = Grid; }; - FAD4B58623A35BCA00308E28 /* SwiftUIExtensions */ = { + FA90447923B975CA0090B6DA /* Grid */ = { isa = XCSwiftPackageProductDependency; - productName = SwiftUIExtensions; + productName = Grid; }; /* End XCSwiftPackageProductDependency section */ }; diff --git a/Package.swift b/Package.swift index 990c801..daedc3b 100644 --- a/Package.swift +++ b/Package.swift @@ -4,24 +4,23 @@ import PackageDescription let package = Package( - name: "SwiftUIExtensions", + name: "swiftui-extensions", platforms: [ .iOS(.v13), .macOS(.v10_15), .watchOS(.v6), .tvOS(.v13) ], products: [ - .library( - name: "SwiftUIExtensions", - targets: ["SwiftUIExtensions"]), + .library(name: "SwiftUIExtensions", targets: ["SwiftUIExtensions"]), + .library(name: "Grid", targets: ["Grid"]), + .library(name: "Sliders", targets: ["Sliders"]), + .library(name: "Shapes", targets: ["Shapes"]), + .library(name: "Chart", targets: ["Chart"]), ], targets: [ - .target( - name: "SwiftUIExtensions", - dependencies: [], - exclude: ["Demo", "Resources"] - ), - .testTarget( - name: "SwiftUIExtensionsTests", - dependencies: ["SwiftUIExtensions"] - ) + .target(name: "SwiftUIExtensions", dependencies: ["Grid", "Sliders", "Shapes", "Chart"]), + .target(name: "Grid", dependencies: []), + .target(name: "Sliders", dependencies: []), + .target(name: "Shapes", dependencies: []), + .target(name: "Chart", dependencies: ["Shapes"]), + .testTarget(name: "SwiftUIExtensionsTests", dependencies: ["SwiftUIExtensions"]) ] ) diff --git a/README.md b/README.md index c0f0cc0..c4727ee 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SwiftUI Extensions Collection of useful SwiftUI extensions and elements -[![Build Status](https://github.com/SwiftExtensions/SwiftUIExtensions/workflows/CI/badge.svg)](https://github.com/SwiftExtensions/SwiftUIExtensions/actions) +[![Build Status](https://github.com/swift-extensions/swiftui-extensions/workflows/ci/badge.svg)](https://github.com/swift-extensions/swiftui-extensions/actions) - Grid based layouts - Sliders (horizontal, vertical, point) @@ -13,7 +13,7 @@ Collection of useful SwiftUI extensions and elements Open `/Demo/SwiftUIExtensionsDemo.xcodeproj` for more examples for iOS, macOS, watchOS and tvOS -## Layouts +## Grid ### Modular Grid
@@ -198,7 +198,7 @@ XYSlider(x: $x, y: $y, .padding() ``` -## Data Visualization +## Chart Build custom charts with SwiftUI diff --git a/Sources/SwiftUIExtensions/DataVisualization/AxisLabels.swift b/Sources/Chart/AxisLabels.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/AxisLabels.swift rename to Sources/Chart/AxisLabels.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Chart.swift b/Sources/Chart/Chart.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Chart.swift rename to Sources/Chart/Chart.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Area/AreaChart.swift b/Sources/Chart/Styles/Area/AreaChart.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Area/AreaChart.swift rename to Sources/Chart/Styles/Area/AreaChart.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Area/AreaChartStyle.swift b/Sources/Chart/Styles/Area/AreaChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Area/AreaChartStyle.swift rename to Sources/Chart/Styles/Area/AreaChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Area/StackedAreaChartStyle.swift b/Sources/Chart/Styles/Area/StackedAreaChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Area/StackedAreaChartStyle.swift rename to Sources/Chart/Styles/Area/StackedAreaChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Column/ColumnChartStyle.swift b/Sources/Chart/Styles/Column/ColumnChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Column/ColumnChartStyle.swift rename to Sources/Chart/Styles/Column/ColumnChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Column/StackedColumnChartStyle.swift b/Sources/Chart/Styles/Column/StackedColumnChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Column/StackedColumnChartStyle.swift rename to Sources/Chart/Styles/Column/StackedColumnChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Line/LineChartStyle.swift b/Sources/Chart/Styles/Line/LineChartStyle.swift similarity index 98% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Line/LineChartStyle.swift rename to Sources/Chart/Styles/Line/LineChartStyle.swift index b55f4b5..e93ea8d 100644 --- a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Line/LineChartStyle.swift +++ b/Sources/Chart/Styles/Line/LineChartStyle.swift @@ -1,4 +1,5 @@ import SwiftUI +import Shapes public struct LineChartStyle: ChartStyle { private let lineType: LineType diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/AnyChartStyle.swift b/Sources/Chart/Styles/Style/AnyChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/AnyChartStyle.swift rename to Sources/Chart/Styles/Style/AnyChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/ChartStyle.swift b/Sources/Chart/Styles/Style/ChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/ChartStyle.swift rename to Sources/Chart/Styles/Style/ChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/ChartStyleConfiguration.swift b/Sources/Chart/Styles/Style/ChartStyleConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/ChartStyleConfiguration.swift rename to Sources/Chart/Styles/Style/ChartStyleConfiguration.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/ChartStyleKey.swift b/Sources/Chart/Styles/Style/ChartStyleKey.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/ChartStyleKey.swift rename to Sources/Chart/Styles/Style/ChartStyleKey.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/Environment+ChartStyle.swift b/Sources/Chart/Styles/Style/Environment+ChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/Environment+ChartStyle.swift rename to Sources/Chart/Styles/Style/Environment+ChartStyle.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/LineType.swift b/Sources/Chart/Styles/Style/LineType.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/LineType.swift rename to Sources/Chart/Styles/Style/LineType.swift diff --git a/Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/View+ChartStyle.swift b/Sources/Chart/Styles/Style/View+ChartStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/DataVisualization/Chart/Styles/Style/View+ChartStyle.swift rename to Sources/Chart/Styles/Style/View+ChartStyle.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Grid+Inits.swift b/Sources/Grid/Grid+Inits.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Grid+Inits.swift rename to Sources/Grid/Grid+Inits.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Grid.swift b/Sources/Grid/Grid.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Grid.swift rename to Sources/Grid/Grid.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Layout/LayoutMath.swift b/Sources/Grid/Styles/Layout/LayoutMath.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Layout/LayoutMath.swift rename to Sources/Grid/Styles/Layout/LayoutMath.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Layout/Tracks.swift b/Sources/Grid/Styles/Layout/Tracks.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Layout/Tracks.swift rename to Sources/Grid/Styles/Layout/Tracks.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/ModularGridStyle.swift b/Sources/Grid/Styles/ModularGridStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/ModularGridStyle.swift rename to Sources/Grid/Styles/ModularGridStyle.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/StaggeredGridStyle.swift b/Sources/Grid/Styles/StaggeredGridStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/StaggeredGridStyle.swift rename to Sources/Grid/Styles/StaggeredGridStyle.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/EnvironmentValues+GridStyle.swift b/Sources/Grid/Styles/Style/EnvironmentValues+GridStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/EnvironmentValues+GridStyle.swift rename to Sources/Grid/Styles/Style/EnvironmentValues+GridStyle.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridItemPreferences.swift b/Sources/Grid/Styles/Style/GridItemPreferences.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridItemPreferences.swift rename to Sources/Grid/Styles/Style/GridItemPreferences.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridItemPreferencesKey.swift b/Sources/Grid/Styles/Style/GridItemPreferencesKey.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridItemPreferencesKey.swift rename to Sources/Grid/Styles/Style/GridItemPreferencesKey.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridItemPreferencesModifier.swift b/Sources/Grid/Styles/Style/GridItemPreferencesModifier.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridItemPreferencesModifier.swift rename to Sources/Grid/Styles/Style/GridItemPreferencesModifier.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridStyle.swift b/Sources/Grid/Styles/Style/GridStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridStyle.swift rename to Sources/Grid/Styles/Style/GridStyle.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridStyleKey.swift b/Sources/Grid/Styles/Style/GridStyleKey.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/GridStyleKey.swift rename to Sources/Grid/Styles/Style/GridStyleKey.swift diff --git a/Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/View+GridStyle.swift b/Sources/Grid/Styles/Style/View+GridStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Layouts/Grid/Styles/Style/View+GridStyle.swift rename to Sources/Grid/Styles/Style/View+GridStyle.swift diff --git a/Sources/SwiftUIExtensions/Shapes/CGPoint+Extensions.swift b/Sources/Shapes/CGPoint+Extensions.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/CGPoint+Extensions.swift rename to Sources/Shapes/CGPoint+Extensions.swift diff --git a/Sources/SwiftUIExtensions/Shapes/Lines/Line.swift b/Sources/Shapes/Lines/Line.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/Lines/Line.swift rename to Sources/Shapes/Lines/Line.swift diff --git a/Sources/SwiftUIExtensions/Shapes/Lines/QuadCurve.swift b/Sources/Shapes/Lines/QuadCurve.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/Lines/QuadCurve.swift rename to Sources/Shapes/Lines/QuadCurve.swift diff --git a/Sources/SwiftUIExtensions/Shapes/Other/HalfCapsule.swift b/Sources/Shapes/Other/HalfCapsule.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/Other/HalfCapsule.swift rename to Sources/Shapes/Other/HalfCapsule.swift diff --git a/Sources/SwiftUIExtensions/Shapes/Path/Path+AddLineFromTo.swift b/Sources/Shapes/Path/Path+AddLineFromTo.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/Path/Path+AddLineFromTo.swift rename to Sources/Shapes/Path/Path+AddLineFromTo.swift diff --git a/Sources/SwiftUIExtensions/Shapes/Path/Path+QuadCurves.swift b/Sources/Shapes/Path/Path+QuadCurves.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/Path/Path+QuadCurves.swift rename to Sources/Shapes/Path/Path+QuadCurves.swift diff --git a/Sources/SwiftUIExtensions/Shapes/Patterns/GridPattern.swift b/Sources/Shapes/Patterns/GridPattern.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/Patterns/GridPattern.swift rename to Sources/Shapes/Patterns/GridPattern.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/Decagon.swift b/Sources/Shapes/RegularPolygons/Decagon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/Decagon.swift rename to Sources/Shapes/RegularPolygons/Decagon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/Heptagon.swift b/Sources/Shapes/RegularPolygons/Heptagon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/Heptagon.swift rename to Sources/Shapes/RegularPolygons/Heptagon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/Hexagon.swift b/Sources/Shapes/RegularPolygons/Hexagon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/Hexagon.swift rename to Sources/Shapes/RegularPolygons/Hexagon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/Nonagon.swift b/Sources/Shapes/RegularPolygons/Nonagon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/Nonagon.swift rename to Sources/Shapes/RegularPolygons/Nonagon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/Octagon.swift b/Sources/Shapes/RegularPolygons/Octagon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/Octagon.swift rename to Sources/Shapes/RegularPolygons/Octagon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/Pentagon.swift b/Sources/Shapes/RegularPolygons/Pentagon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/Pentagon.swift rename to Sources/Shapes/RegularPolygons/Pentagon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/RegularPolygon.swift b/Sources/Shapes/RegularPolygons/RegularPolygon.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/RegularPolygon.swift rename to Sources/Shapes/RegularPolygons/RegularPolygon.swift diff --git a/Sources/SwiftUIExtensions/Shapes/RegularPolygons/RegularPolygonPath.swift b/Sources/Shapes/RegularPolygons/RegularPolygonPath.swift similarity index 100% rename from Sources/SwiftUIExtensions/Shapes/RegularPolygons/RegularPolygonPath.swift rename to Sources/Shapes/RegularPolygons/RegularPolygonPath.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/DefaultHorizontalValueView.swift b/Sources/Sliders/Base/DefaultHorizontalValueView.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/DefaultHorizontalValueView.swift rename to Sources/Sliders/Base/DefaultHorizontalValueView.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/DefaultThumb.swift b/Sources/Sliders/Base/DefaultThumb.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/DefaultThumb.swift rename to Sources/Sliders/Base/DefaultThumb.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/DefaultVerticalValueView.swift b/Sources/Sliders/Base/DefaultVerticalValueView.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/DefaultVerticalValueView.swift rename to Sources/Sliders/Base/DefaultVerticalValueView.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/LinearRangeMath.swift b/Sources/Sliders/Base/LinearRangeMath.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/LinearRangeMath.swift rename to Sources/Sliders/Base/LinearRangeMath.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/LinearValueMath.swift b/Sources/Sliders/Base/LinearValueMath.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/LinearValueMath.swift rename to Sources/Sliders/Base/LinearValueMath.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Point/DefaultPointTrackView.swift b/Sources/Sliders/Base/Point/DefaultPointTrackView.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Point/DefaultPointTrackView.swift rename to Sources/Sliders/Base/Point/DefaultPointTrackView.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Point/PointSlider.swift b/Sources/Sliders/Base/Point/PointSlider.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Point/PointSlider.swift rename to Sources/Sliders/Base/Point/PointSlider.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Point/PointSliderConfiguration.swift b/Sources/Sliders/Base/Point/PointSliderConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Point/PointSliderConfiguration.swift rename to Sources/Sliders/Base/Point/PointSliderConfiguration.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/DefaultHorizontalRangeTrack.swift b/Sources/Sliders/Base/Range/DefaultHorizontalRangeTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/DefaultHorizontalRangeTrack.swift rename to Sources/Sliders/Base/Range/DefaultHorizontalRangeTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/DefaultVerticalRangeTrack.swift b/Sources/Sliders/Base/Range/DefaultVerticalRangeTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/DefaultVerticalRangeTrack.swift rename to Sources/Sliders/Base/Range/DefaultVerticalRangeTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/HorizontalRangeSlider.swift b/Sources/Sliders/Base/Range/HorizontalRangeSlider.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/HorizontalRangeSlider.swift rename to Sources/Sliders/Base/Range/HorizontalRangeSlider.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/HorizontalRangeTrack.swift b/Sources/Sliders/Base/Range/HorizontalRangeTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/HorizontalRangeTrack.swift rename to Sources/Sliders/Base/Range/HorizontalRangeTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/RangeSliderConfiguration.swift b/Sources/Sliders/Base/Range/RangeSliderConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/RangeSliderConfiguration.swift rename to Sources/Sliders/Base/Range/RangeSliderConfiguration.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/RangeTrackConfiguration.swift b/Sources/Sliders/Base/Range/RangeTrackConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/RangeTrackConfiguration.swift rename to Sources/Sliders/Base/Range/RangeTrackConfiguration.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/VerticalRangeSlider.swift b/Sources/Sliders/Base/Range/VerticalRangeSlider.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/VerticalRangeSlider.swift rename to Sources/Sliders/Base/Range/VerticalRangeSlider.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Range/VerticalRangeTrack.swift b/Sources/Sliders/Base/Range/VerticalRangeTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Range/VerticalRangeTrack.swift rename to Sources/Sliders/Base/Range/VerticalRangeTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/DefaultHorizontalValueTrack.swift b/Sources/Sliders/Base/Value/DefaultHorizontalValueTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/DefaultHorizontalValueTrack.swift rename to Sources/Sliders/Base/Value/DefaultHorizontalValueTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/DefaultVerticalValueTrack.swift b/Sources/Sliders/Base/Value/DefaultVerticalValueTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/DefaultVerticalValueTrack.swift rename to Sources/Sliders/Base/Value/DefaultVerticalValueTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/HorizontalValueSlider.swift b/Sources/Sliders/Base/Value/HorizontalValueSlider.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/HorizontalValueSlider.swift rename to Sources/Sliders/Base/Value/HorizontalValueSlider.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/HorizontalValueTrack.swift b/Sources/Sliders/Base/Value/HorizontalValueTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/HorizontalValueTrack.swift rename to Sources/Sliders/Base/Value/HorizontalValueTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/ValueSliderConfiguration.swift b/Sources/Sliders/Base/Value/ValueSliderConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/ValueSliderConfiguration.swift rename to Sources/Sliders/Base/Value/ValueSliderConfiguration.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/ValueTrackConfiguration.swift b/Sources/Sliders/Base/Value/ValueTrackConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/ValueTrackConfiguration.swift rename to Sources/Sliders/Base/Value/ValueTrackConfiguration.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/VerticalValueSlider.swift b/Sources/Sliders/Base/Value/VerticalValueSlider.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/VerticalValueSlider.swift rename to Sources/Sliders/Base/Value/VerticalValueSlider.swift diff --git a/Sources/SwiftUIExtensions/Sliders/Base/Value/VerticalValueTrack.swift b/Sources/Sliders/Base/Value/VerticalValueTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/Base/Value/VerticalValueTrack.swift rename to Sources/Sliders/Base/Value/VerticalValueTrack.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSlider.swift b/Sources/Sliders/ValueSlider/ValueSlider.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSlider.swift rename to Sources/Sliders/ValueSlider/ValueSlider.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/HorizontalValueSliderStyle.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/HorizontalValueSliderStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/HorizontalValueSliderStyle.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/HorizontalValueSliderStyle.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/AnyValueSliderStyle.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/AnyValueSliderStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/AnyValueSliderStyle.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/AnyValueSliderStyle.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/EnvironmentValues+ValueSliderStyle.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/EnvironmentValues+ValueSliderStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/EnvironmentValues+ValueSliderStyle.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/EnvironmentValues+ValueSliderStyle.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyle.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyle.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyle.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleConfiguration.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleConfiguration.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleConfiguration.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleConfiguration.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleKey.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleKey.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleKey.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/ValueSliderStyleKey.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/View+ValueSliderStyle.swift b/Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/View+ValueSliderStyle.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/View+ValueSliderStyle.swift rename to Sources/Sliders/ValueSlider/ValueSliderStyles/ValueSliderStyle/View+ValueSliderStyle.swift diff --git a/Sources/SwiftUIExtensions/Sliders/ValueTrack/ValueTrack.swift b/Sources/Sliders/ValueTrack/ValueTrack.swift similarity index 100% rename from Sources/SwiftUIExtensions/Sliders/ValueTrack/ValueTrack.swift rename to Sources/Sliders/ValueTrack/ValueTrack.swift diff --git a/Sources/SwiftUIExtensions/SwiftUIExtensions.swift b/Sources/SwiftUIExtensions/SwiftUIExtensions.swift new file mode 100644 index 0000000..0befd97 --- /dev/null +++ b/Sources/SwiftUIExtensions/SwiftUIExtensions.swift @@ -0,0 +1,5 @@ +@_exported import SwiftUI +@_exported import Grid +@_exported import Sliders +@_exported import Shapes +@_exported import Chart diff --git a/Tests/SwiftUIExtensionsTests/SlidersTests/DistanceFromValueTests.swift b/Tests/SwiftUIExtensionsTests/SlidersTests/DistanceFromValueTests.swift index 23befbf..6306ba8 100644 --- a/Tests/SwiftUIExtensionsTests/SlidersTests/DistanceFromValueTests.swift +++ b/Tests/SwiftUIExtensionsTests/SlidersTests/DistanceFromValueTests.swift @@ -1,4 +1,4 @@ -@testable import SwiftUIExtensions +@testable import Sliders import XCTest class DistanceFromValueTests: XCTestCase { diff --git a/Tests/SwiftUIExtensionsTests/SlidersTests/RangeDistanceTests.swift b/Tests/SwiftUIExtensionsTests/SlidersTests/RangeDistanceTests.swift index 2bfbd11..3b4997b 100644 --- a/Tests/SwiftUIExtensionsTests/SlidersTests/RangeDistanceTests.swift +++ b/Tests/SwiftUIExtensionsTests/SlidersTests/RangeDistanceTests.swift @@ -1,4 +1,4 @@ -@testable import SwiftUIExtensions +@testable import Sliders import XCTest class RangeDistanceTests: XCTestCase { diff --git a/Tests/SwiftUIExtensionsTests/SlidersTests/ValueFromDistanceTests.swift b/Tests/SwiftUIExtensionsTests/SlidersTests/ValueFromDistanceTests.swift index 9608308..74b6412 100644 --- a/Tests/SwiftUIExtensionsTests/SlidersTests/ValueFromDistanceTests.swift +++ b/Tests/SwiftUIExtensionsTests/SlidersTests/ValueFromDistanceTests.swift @@ -1,4 +1,4 @@ -@testable import SwiftUIExtensions +@testable import Sliders import XCTest class ValueFromDistanceTests: XCTestCase {