Skip to content

Commit 6e0deec

Browse files
efremidzeefremidze
authored
Update folders to properly follow SPM conventions (#61)
1 parent 7e3918b commit 6e0deec

File tree

5 files changed

+35
-53
lines changed

5 files changed

+35
-53
lines changed

Sources/UIViewEffectView+Helpers.swift renamed to Sources/VisualEffectView/UIViewEffectView+Helpers.swift

File renamed without changes.

Sources/VisualEffectView+SwiftUI.swift renamed to Sources/VisualEffectView/VisualEffectView+SwiftUI.swift

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ public struct VisualEffect: UIViewRepresentable {
3737
*/
3838
let blurRadius: CGFloat
3939

40-
/**
41-
The saturation factor.
42-
43-
Values above 1.0 increase saturation, values below 1.0 decrease saturation, and 1.0 maintains original saturation.
44-
45-
The default value is `1.0`.
46-
*/
47-
let saturation: CGFloat
48-
4940
/**
5041
The scale factor for the blur effect.
5142

@@ -60,14 +51,12 @@ public struct VisualEffect: UIViewRepresentable {
6051
- colorTint: The tint color to apply to the blur effect. Defaults to `nil`.
6152
- colorTintAlpha: The alpha component of the tint color. Defaults to `0.0`.
6253
- blurRadius: The radius of the blur effect. Defaults to `0.0`.
63-
- saturation: The saturation adjustment factor. Values above 1.0 increase saturation, values below 1.0 decrease saturation. Defaults to `1.0`.
6454
- scale: The scale factor for the blur effect. Defaults to `1.0`.
6555
*/
66-
public init(colorTint: Color? = nil, colorTintAlpha: CGFloat = 0, blurRadius: CGFloat = 0, saturation: CGFloat = 1, scale: CGFloat = 1) {
56+
public init(colorTint: Color? = nil, colorTintAlpha: CGFloat = 0, blurRadius: CGFloat = 0, scale: CGFloat = 1) {
6757
self.colorTint = colorTint
6858
self.colorTintAlpha = colorTintAlpha
6959
self.blurRadius = blurRadius
70-
self.saturation = saturation
7160
self.scale = scale
7261
}
7362

@@ -80,7 +69,6 @@ public struct VisualEffect: UIViewRepresentable {
8069
}
8170
view.colorTintAlpha = colorTintAlpha
8271
view.blurRadius = blurRadius
83-
view.saturation = saturation
8472
view.scale = scale
8573

8674
return view
@@ -92,7 +80,6 @@ public struct VisualEffect: UIViewRepresentable {
9280
}
9381
uiView.colorTintAlpha = colorTintAlpha
9482
uiView.blurRadius = blurRadius
95-
uiView.saturation = saturation
9683
uiView.scale = scale
9784
}
9885
}
@@ -103,7 +90,7 @@ public struct VisualEffect: UIViewRepresentable {
10390
.frame(width: 400, height: 400)
10491
Color.red
10592
.frame(width: 200, height: 100)
106-
VisualEffect(colorTint: .white, colorTintAlpha: 0.5, blurRadius: 18, saturation: 2.0)
93+
VisualEffect(colorTint: .white, colorTintAlpha: 0.5, blurRadius: 18)
10794
.frame(width: 300, height: 200)
10895
}
10996
}

Sources/VisualEffectView.h renamed to Sources/VisualEffectView/VisualEffectView.h

File renamed without changes.

Sources/VisualEffectView.swift renamed to Sources/VisualEffectView/VisualEffectView.swift

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ open class VisualEffectView: UIVisualEffectView {
6060
}
6161
}
6262

63-
/**
64-
Saturation factor.
65-
66-
Values above 1.0 increase saturation, values below 1.0 decrease saturation, and 1.0 maintains original saturation.
67-
68-
The default value is 1.0.
69-
*/
70-
open var saturation: CGFloat {
71-
get { return _value(forKey: .saturationDeltaFactor) ?? 1.0 }
72-
set { _setValue(newValue, forKey: .saturationDeltaFactor) }
73-
}
74-
7563
/**
7664
Scale factor.
7765

@@ -115,7 +103,7 @@ private extension VisualEffectView {
115103
}
116104

117105
enum Key: String {
118-
case colorTint, colorTintAlpha, blurRadius, saturationDeltaFactor, scale
106+
case colorTint, colorTintAlpha, blurRadius, scale
119107
}
120108

121109
}

‎VisualEffectView.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
8B3244031E07D7CB00712FEA /* VisualEffectView.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B3244011E07D7CB00712FEA /* VisualEffectView.h */; settings = {ATTRIBUTES = (Public, ); }; };
11-
8B3DFCE01E07D8F5009EAFA2 /* VisualEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B3DFCDF1E07D8F5009EAFA2 /* VisualEffectView.swift */; };
12-
C0864C842A6FB2D2006B0F49 /* VisualEffectView+SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0864C832A6FB2D2006B0F49 /* VisualEffectView+SwiftUI.swift */; };
1310
F449249E206F2D5100117F6B /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = F449249B206F2D5100117F6B /* README.md */; };
1411
F449249F206F2D5100117F6B /* VisualEffectView.podspec in Resources */ = {isa = PBXBuildFile; fileRef = F449249C206F2D5100117F6B /* VisualEffectView.podspec */; };
1512
F44924A0206F2D5100117F6B /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = F449249D206F2D5100117F6B /* CHANGELOG.md */; };
1613
F49B90F72E4DED7500B8431A /* VisualEffectView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B3243FE1E07D7CB00712FEA /* VisualEffectView.framework */; };
1714
F49B90F82E4DED7500B8431A /* VisualEffectView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8B3243FE1E07D7CB00712FEA /* VisualEffectView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
18-
F4BE05CB25108C0000500B57 /* UIViewEffectView+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE05CA25108C0000500B57 /* UIViewEffectView+Helpers.swift */; };
1915
F4EFB65C2E4E5DA000348AC7 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4EFB6592E4E5DA000348AC7 /* ContentView.swift */; };
2016
F4EFB65D2E4E5DA000348AC7 /* ExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4EFB65A2E4E5DA000348AC7 /* ExampleApp.swift */; };
2117
F4EFB65E2E4E5DA000348AC7 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F4EFB6562E4E5DA000348AC7 /* Preview Assets.xcassets */; };
2218
F4EFB65F2E4E5DA000348AC7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F4EFB6582E4E5DA000348AC7 /* Assets.xcassets */; };
19+
F4FDC4A92E614F1A0026D226 /* VisualEffectView.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FDC4A42E614F1A0026D226 /* VisualEffectView.h */; };
20+
F4FDC4AA2E614F1A0026D226 /* UIViewEffectView+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FDC4A32E614F1A0026D226 /* UIViewEffectView+Helpers.swift */; };
21+
F4FDC4AB2E614F1A0026D226 /* VisualEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FDC4A52E614F1A0026D226 /* VisualEffectView.swift */; };
22+
F4FDC4AC2E614F1A0026D226 /* VisualEffectView+SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FDC4A62E614F1A0026D226 /* VisualEffectView+SwiftUI.swift */; };
2323
/* End PBXBuildFile section */
2424

2525
/* Begin PBXContainerItemProxy section */
@@ -48,18 +48,18 @@
4848

4949
/* Begin PBXFileReference section */
5050
8B3243FE1E07D7CB00712FEA /* VisualEffectView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VisualEffectView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
51-
8B3244011E07D7CB00712FEA /* VisualEffectView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VisualEffectView.h; sourceTree = "<group>"; };
52-
8B3DFCDF1E07D8F5009EAFA2 /* VisualEffectView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VisualEffectView.swift; sourceTree = "<group>"; };
53-
C0864C832A6FB2D2006B0F49 /* VisualEffectView+SwiftUI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "VisualEffectView+SwiftUI.swift"; sourceTree = "<group>"; };
5451
F4487E682E4DE4BE00884226 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
5552
F449249B206F2D5100117F6B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
5653
F449249C206F2D5100117F6B /* VisualEffectView.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VisualEffectView.podspec; sourceTree = "<group>"; };
5754
F449249D206F2D5100117F6B /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
58-
F4BE05CA25108C0000500B57 /* UIViewEffectView+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewEffectView+Helpers.swift"; sourceTree = "<group>"; };
5955
F4EFB6562E4E5DA000348AC7 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
6056
F4EFB6582E4E5DA000348AC7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6157
F4EFB6592E4E5DA000348AC7 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
6258
F4EFB65A2E4E5DA000348AC7 /* ExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleApp.swift; sourceTree = "<group>"; };
59+
F4FDC4A32E614F1A0026D226 /* UIViewEffectView+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewEffectView+Helpers.swift"; sourceTree = "<group>"; };
60+
F4FDC4A42E614F1A0026D226 /* VisualEffectView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VisualEffectView.h; sourceTree = "<group>"; };
61+
F4FDC4A52E614F1A0026D226 /* VisualEffectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualEffectView.swift; sourceTree = "<group>"; };
62+
F4FDC4A62E614F1A0026D226 /* VisualEffectView+SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VisualEffectView+SwiftUI.swift"; sourceTree = "<group>"; };
6363
/* End PBXFileReference section */
6464

6565
/* Begin PBXFrameworksBuildPhase section */
@@ -87,7 +87,7 @@
8787
F449249D206F2D5100117F6B /* CHANGELOG.md */,
8888
F449249B206F2D5100117F6B /* README.md */,
8989
F449249C206F2D5100117F6B /* VisualEffectView.podspec */,
90-
8B3244001E07D7CB00712FEA /* VisualEffectView */,
90+
F4FDC4A82E614F1A0026D226 /* Sources */,
9191
F4EFB65B2E4E5DA000348AC7 /* Example */,
9292
F49B90F62E4DED7500B8431A /* Frameworks */,
9393
8B3243FF1E07D7CB00712FEA /* Products */,
@@ -103,18 +103,6 @@
103103
name = Products;
104104
sourceTree = "<group>";
105105
};
106-
8B3244001E07D7CB00712FEA /* VisualEffectView */ = {
107-
isa = PBXGroup;
108-
children = (
109-
8B3DFCDF1E07D8F5009EAFA2 /* VisualEffectView.swift */,
110-
F4BE05CA25108C0000500B57 /* UIViewEffectView+Helpers.swift */,
111-
C0864C832A6FB2D2006B0F49 /* VisualEffectView+SwiftUI.swift */,
112-
8B3244011E07D7CB00712FEA /* VisualEffectView.h */,
113-
);
114-
name = VisualEffectView;
115-
path = Sources;
116-
sourceTree = "<group>";
117-
};
118106
F49B90F62E4DED7500B8431A /* Frameworks */ = {
119107
isa = PBXGroup;
120108
children = (
@@ -141,14 +129,33 @@
141129
path = Example;
142130
sourceTree = "<group>";
143131
};
132+
F4FDC4A72E614F1A0026D226 /* VisualEffectView */ = {
133+
isa = PBXGroup;
134+
children = (
135+
F4FDC4A32E614F1A0026D226 /* UIViewEffectView+Helpers.swift */,
136+
F4FDC4A42E614F1A0026D226 /* VisualEffectView.h */,
137+
F4FDC4A52E614F1A0026D226 /* VisualEffectView.swift */,
138+
F4FDC4A62E614F1A0026D226 /* VisualEffectView+SwiftUI.swift */,
139+
);
140+
path = VisualEffectView;
141+
sourceTree = "<group>";
142+
};
143+
F4FDC4A82E614F1A0026D226 /* Sources */ = {
144+
isa = PBXGroup;
145+
children = (
146+
F4FDC4A72E614F1A0026D226 /* VisualEffectView */,
147+
);
148+
path = Sources;
149+
sourceTree = "<group>";
150+
};
144151
/* End PBXGroup section */
145152

146153
/* Begin PBXHeadersBuildPhase section */
147154
8B3243FB1E07D7CB00712FEA /* Headers */ = {
148155
isa = PBXHeadersBuildPhase;
149156
buildActionMask = 2147483647;
150157
files = (
151-
8B3244031E07D7CB00712FEA /* VisualEffectView.h in Headers */,
158+
F4FDC4A92E614F1A0026D226 /* VisualEffectView.h in Headers */,
152159
);
153160
runOnlyForDeploymentPostprocessing = 0;
154161
};
@@ -261,9 +268,9 @@
261268
isa = PBXSourcesBuildPhase;
262269
buildActionMask = 2147483647;
263270
files = (
264-
8B3DFCE01E07D8F5009EAFA2 /* VisualEffectView.swift in Sources */,
265-
F4BE05CB25108C0000500B57 /* UIViewEffectView+Helpers.swift in Sources */,
266-
C0864C842A6FB2D2006B0F49 /* VisualEffectView+SwiftUI.swift in Sources */,
271+
F4FDC4AA2E614F1A0026D226 /* UIViewEffectView+Helpers.swift in Sources */,
272+
F4FDC4AB2E614F1A0026D226 /* VisualEffectView.swift in Sources */,
273+
F4FDC4AC2E614F1A0026D226 /* VisualEffectView+SwiftUI.swift in Sources */,
267274
);
268275
runOnlyForDeploymentPostprocessing = 0;
269276
};

0 commit comments

Comments
 (0)