GitHub/ActivityIndicatorView
1
0
Fork 0
mirror of https://github.com/exyte/ActivityIndicatorView.git synced 2026-04-07 19:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source 
Conflicts:
	Source/ActivityIndicatorView.swift
This commit is contained in:
Daniil Manin
2020-09-30 18:00:00 +07:00
parent 7b01a523ff c40d87b944
commit 5ba38c5a91
4 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
Generated
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>
ActivityIndicatorView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Source/ActivityIndicatorView.swift
+23 -10
View File
@@ -20,7 +20,7 @@ public struct ActivityIndicatorView: View {
case equalizer
case growingArc(Color = Color.red)
case growingCircle
case gradient([Color])
case gradient([Color], CGLineCap = .butt)
}
@Binding var isVisible: Bool
@@ -56,8 +56,8 @@ public struct ActivityIndicatorView: View {
indicator = createGrowingArcIndicator(color: color)
case .growingCircle:
indicator = createGrowingCircleIndicator()
case .gradient(let colors):
indicator = createGradientIndicator(colors: colors)
case .gradient(let colors, let lineCap):
indicator = createGradientIndicator(colors: colors, lineCap: lineCap)
}
if isVisible {
@@ -306,19 +306,32 @@ public struct ActivityIndicatorView: View {
return AnyView(indicator)
}
func createGradientIndicator(colors: [Color]) -> AnyView {
let colors = Gradient(colors: colors)
let conic = AngularGradient(gradient: colors, center: .center, startAngle: .zero, endAngle: .degrees(360))
func createGradientIndicator(colors: [Color], lineCap: CGLineCap) -> AnyView {
let gradientColors = Gradient(colors: colors)
let conic = AngularGradient(gradient: gradientColors, center: .center, startAngle: .zero, endAngle: .degrees(360))
let lineWidth: CGFloat = 4
let indicator = Circle()
.strokeBorder(conic, lineWidth: 4)
.rotationEffect(.degrees(parameters[0]))
.onAppear {
let indicator = ZStack {
Circle()
.stroke(colors.first ?? .white, lineWidth: lineWidth)
Circle()
.trim(from: lineWidth / 500, to: 1 - lineWidth / 100)
.stroke(conic, style: StrokeStyle(lineWidth: lineWidth, lineCap: lineCap))
.rotationEffect(.degrees(parameters[0]))
.onAppear {
self.parameters[0] = 0
withAnimation(Animation.linear(duration: 1.5).repeatForever(autoreverses: false)) {
self.parameters[0] = 360
}
self.parameters[0] = 0
withAnimation(Animation.linear(duration: 1.5).repeatForever(autoreverses: false)) {
self.parameters[0] = 360
}
}
}
}
}
return AnyView(indicator)
}