UNT-T11872 Bounce animation updated

Author: mansi-prajapati-simformsolutions

SSSwiftUIAnimations/SSSwiftUIAnimations/Examples/ExampleProgressView.swift

@@ -20,7 +20,6 @@ struct ExampleProgressView: View {
                 }, onProgressCompletion: {
                     timer?.invalidate()
                 }, onCancelProgress: {
-                    progress = 0.0
                     timer?.invalidate()
                 })
         }.navigationBarTitle("ProgressView Example", displayMode: .inline)

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/ArrowView.swift

@@ -13,6 +13,7 @@ struct Arrow: View {
     var arrowStyle: ArrowViewParams
     var style: SSProgressViewStyle
     @Binding var progress: Float
+    @Binding var bounceEffect: CGFloat
 
     var body: some View {
         VStack(spacing: 0) {
@@ -25,7 +26,7 @@ struct Arrow: View {
                 )
                 .opacity(arrowStyle.showVerticalLine ? 1 : 0)
                 .foregroundColor(style.arrowColor)
-                .offset(y: arrowStyle.isAnimating ? (!arrowStyle.animationStarted ? -5 : -(style.circleSize/2)) : 0)
+                .offset(y: arrowStyle.isAnimating ? (!arrowStyle.animationStarted ? -10 : -(style.circleSize/2)) : 0)
                 .animation(Animation.linear.speed(!arrowStyle.animationStarted ? 100 : .zero), value: 0)
 
             if progress < 0.1 {
@@ -36,7 +37,7 @@ struct Arrow: View {
                     isDownward: arrowStyle.isDownward,
                     progress: Float(progress),
                     circleSize: style.circleSize,
-                    isAnimating: arrowStyle.isAnimating
+                    isAnimating: arrowStyle.isAnimating, bounceEffect: bounceEffect
                 )
                 .stroke(style: StrokeStyle(lineWidth: style.arrowStrokeWidth, lineCap: .round))
                 .frame(width: 10, height: 50)

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/DownArrow.swift

@@ -15,11 +15,15 @@ struct DownArrow: Shape {
     var progress: Float
     var circleSize: CGFloat
     var isAnimating: Bool
+    var bounceEffect: CGFloat
 
-    // MARK: - Animatable Data
-    var animatableData: CGFloat {
-        get { initialAnim }
-        set { initialAnim = newValue }
+    var animatableData: AnimatablePair<CGFloat, CGFloat> {
+        get { AnimatablePair(initialAnim, bounceEffect)}
+        
+        set {
+            self.initialAnim = newValue.first
+            self.bounceEffect = newValue.second
+        }
     }
 
     func path(in rect: CGRect) -> Path {
@@ -30,10 +34,10 @@ struct DownArrow: Shape {
         var controlY: CGFloat
 
         if isDownward {
-            controlY = centerY + (initialAnim * (rect.height / 2))
+            controlY = centerY + (initialAnim * (rect.height / 2)) * (bounceEffect)
         } else {
             let bounceProgress = bounce(initialAnim)
-            controlY = centerY - (bounceProgress * (rect.height / 4))
+            controlY = centerY - (bounceProgress * (rect.height / 4)) - (bounceEffect * 6)
         }
 
         let controlX = rect.midX
@@ -62,8 +66,9 @@ struct DownArrow: Shape {
 
     // Function to apply bounce effect
     private func bounce(_ progress: CGFloat) -> CGFloat {
-        let numberOfBounces = 2
+        let numberOfBounces = 1
         let bounces = CGFloat(numberOfBounces)
         return abs((circleSize * 0.01 - progress) * sin(progress * .pi * bounces))
     }
 }
+

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/ProgressView.swift

@@ -55,6 +55,8 @@ struct SSProgressView: View {
     // Call back for restarting animation in between
     var onCancelProgress: (() -> Void)?
 
+    @State var bounceEffect: CGFloat = 1.0
+    
     var body: some View {
         ZStack {
             // Progress Circle with animation
@@ -68,7 +70,7 @@ struct SSProgressView: View {
             let arrowStyle = ArrowViewParams(isAnimating: isAnimating, progress: Double(progress), initialAnim: initialAnim, isDownward: isDownArrow, animationStarted: startDotAnim, showVerticalLine: showVerticalLine)
 
             // Arrow view
-            Arrow(arrowStyle: arrowStyle, style: style, progress: $progress)
+            Arrow(arrowStyle: arrowStyle, style: style, progress: $progress, bounceEffect: $bounceEffect)
         }.allowsHitTesting(canTap)
             .onTapGesture {
                 if style.allowCancelProgress && !isReset {
@@ -103,6 +105,12 @@ struct SSProgressView: View {
             }
         }
 
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+            withAnimation(.linear(duration: 0.7)) {
+                bounceEffect = 2
+            }
+        }
+        
         // Allowing view to reset properly before starting the progress again
         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
             canTap = style.allowCancelProgress ? true : false
@@ -189,6 +197,7 @@ struct SSProgressView: View {
         isAnimating = false
         initialAnim = 1.0
         isDownArrow = true
+        bounceEffect = 1.0
         startDotAnim = false
         showVerticalLine = true
         showPercent = false