UNT-T11872 Bug fixes

Author: mansi-prajapati-simformsolutions

SSSwiftUIAnimations/SSSwiftUIAnimations.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		B19E0B662BF7498700E65974 /* ExampleProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B19E0B652BF7498700E65974 /* ExampleProgressView.swift */; };
 		B1DFCA512BF4FA3D00F01505 /* ProgressCircle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DFCA502BF4FA3D00F01505 /* ProgressCircle.swift */; };
 		B1DFCA532BF4FC7900F01505 /* ArrowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DFCA522BF4FC7900F01505 /* ArrowView.swift */; };
+		B1FE861E2BFF6BC000FB111C /* ViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1FE861D2BFF6BC000FB111C /* ViewExtension.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -39,6 +40,7 @@
 		B19E0B652BF7498700E65974 /* ExampleProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleProgressView.swift; sourceTree = "<group>"; };
 		B1DFCA502BF4FA3D00F01505 /* ProgressCircle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressCircle.swift; sourceTree = "<group>"; };
 		B1DFCA522BF4FC7900F01505 /* ArrowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrowView.swift; sourceTree = "<group>"; };
+		B1FE861D2BFF6BC000FB111C /* ViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewExtension.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -99,6 +101,7 @@
 				B1098E7C2BD94ED900BC19DD /* WaveView.swift */,
 				B11B98392BCE9C3F00D76016 /* CheckView.swift */,
 				B177713E2BF39A60001723EC /* ModelClass.swift */,
+				B1FE861D2BFF6BC000FB111C /* ViewExtension.swift */,
 			);
 			path = ProgressAnimation;
 			sourceTree = "<group>";
@@ -203,6 +206,7 @@
 				B11B983A2BCE9C3F00D76016 /* CheckView.swift in Sources */,
 				B1DFCA512BF4FA3D00F01505 /* ProgressCircle.swift in Sources */,
 				B14AB36C2BC41B05004B09C4 /* ProgressView.swift in Sources */,
+				B1FE861E2BFF6BC000FB111C /* ViewExtension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/ArrowView.swift

@@ -14,23 +14,22 @@ struct Arrow: View {
     var style: SSProgressViewStyle
     @Binding var progress: Float
     @Binding var bounceEffect: CGFloat
+    @State var verticalLine = true
 
     var body: some View {
         VStack(spacing: 0) {
 
             // Vertical line of arrow
-            RoundedRectangle(cornerRadius: style.circleStrokeWidth/2)
-                .frame(
-                    width: arrowStyle.isAnimating ? style.circleStrokeWidth : style.arrowStrokeWidth + 1,
-                    height: arrowStyle.isAnimating ? (!arrowStyle.animationStarted ? style.circleStrokeWidth : style.circleStrokeWidth ) : style.circleSize * 0.40
-                )
-                .opacity(arrowStyle.showVerticalLine ? 1 : 0)
-                .foregroundColor(style.arrowColor)
-                .offset(y: arrowStyle.isAnimating ? (!arrowStyle.animationStarted ? -10 : -(style.circleSize/2)) : 0)
-                .animation(Animation.linear.speed(!arrowStyle.animationStarted ? 100 : .zero), value: 0)
+                RoundedRectangle(cornerRadius: style.circleStrokeWidth/2)
+                    .frame(
+                        width: arrowStyle.isAnimating ? style.circleStrokeWidth : style.arrowStrokeWidth + 1,
+                        height: arrowStyle.isAnimating ? (!arrowStyle.animationStarted ? style.circleStrokeWidth : style.circleStrokeWidth ) : style.circleSize * 0.40
+                    ).opacity((progress >= 0.001) ? 0 : 1)
+                    .foregroundColor(arrowStyle.isAnimating ? style.fillStrokeColor : style.arrowColor)
+                    .offset(y: arrowStyle.isAnimating ? (!arrowStyle.animationStarted ? -10 : -(style.circleSize/2)) : 0)
 
-            if progress < 0.1 {
-                
+            if progress <= 0.0 {
+
                 // if progress is less than 0.1 then showing down arrow animation
                 DownArrow(
                     initialAnim: arrowStyle.initialAnim,
@@ -45,7 +44,7 @@ struct Arrow: View {
                 .offset(y: arrowStyle.isAnimating ? 22 : .zero)
                 .foregroundColor(style.arrowColor)
                 .scaleEffect(CGSize(width:  1, height: arrowStyle.isAnimating ? 1 : style.circleSize * 0.005))
-            } else if progress >= 0.1 && progress < 1.0 {
+            } else if progress > 0.0 && progress < 1.0 {
 
                 // if progress is between >= 0.1 and < 1.0 starting wave animation
                 WaveView(

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/CheckView.swift

@@ -33,7 +33,7 @@ struct CheckView: View {
                     x: isAnimating ? 0.3 : x,
                     y: isAnimating ? 4.5 : y),
                     height: size,
-                    stright: straight)
+                    straight: straight)
                 .stroke(style: StrokeStyle(lineWidth: isAnimating ? arrowStrokeWidth / (size * 0.01) : arrowStrokeWidth, lineCap: .round))
                 .frame(width: width * 0.57, height: 105)
                 .offset(CGSize(width: 0, height: isAnimating ? offset : 0))
@@ -68,7 +68,7 @@ struct Check: Shape {
     // MARK: - Variables
     var endPoint: CGPoint
     var height: CGFloat
-    var stright: CGFloat
+    var straight: CGFloat
 
     // MARK: - Animatable data
     var animatableData: AnimatablePair<CGFloat, CGFloat> {
@@ -91,7 +91,7 @@ struct Check: Shape {
         )
         let start2 = CGPoint(
             x: rect.maxX/rightLine,
-            y: rect.midY - 21 * endPoint.x - stright
+            y: rect.midY - 21 * endPoint.x - straight
         )
         var path = Path()
         path.move(to: start)

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/ModelClass.swift

@@ -36,10 +36,10 @@ struct SSProgressViewStyle {
         self.circleSize =  max(circleSize, 100)
 
         // Circle stroke width
-        self.circleStrokeWidth = circleStrokeWidth
+        self.circleStrokeWidth = max(circleStrokeWidth, 1)
 
         // Arrow stroke width
-        self.arrowStrokeWidth = arrowStrokeWidth
+        self.arrowStrokeWidth = max(arrowStrokeWidth, 1)
 
         // Progress text font size
         self.fontSize = fontSize

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/ProgressView.swift

@@ -26,9 +26,6 @@ struct SSProgressView: View {
     // Start/stop dot animation
     @State private var startDotAnim = false
 
-    // Hide show vertical arrow
-    @State private var showVerticalLine = true
-    
     // Stating shape is down arrow or not
     @State private var isDownArrow = true
 
@@ -61,30 +58,22 @@ struct SSProgressView: View {
         ZStack {
             // Progress Circle with animation
             ProgressCircle(progress: $progress, style: style)
-                .animation(.linear, value: progress)
+                .if(progress > 0.0) {
+                $0.animation(.linear, value: progress)
+            }
 
             // Progress percentage text view
             ProgressText(showPercent: showPercent, progress: $progress, style: style)
 
             // Arrow view parameters
-            let arrowStyle = ArrowViewParams(isAnimating: isAnimating, progress: Double(progress), initialAnim: initialAnim, isDownward: isDownArrow, animationStarted: startDotAnim, showVerticalLine: showVerticalLine)
+            let arrowStyle = ArrowViewParams(isAnimating: isAnimating, progress: Double(progress), initialAnim: initialAnim, isDownward: isDownArrow, animationStarted: startDotAnim)
 
             // Arrow view
             Arrow(arrowStyle: arrowStyle, style: style, progress: $progress, bounceEffect: $bounceEffect)
         }.allowsHitTesting(canTap)
             .onTapGesture {
-                if style.allowCancelProgress && !isReset {
-                    isStarted.toggle()
-                    if isStarted {
-                        // Cancel animation on clicking again
-                        resetProgress()
-                        onCancelProgress?()
-                    } else {
-                        startAnimation()
-                    }
-                } else {
-                    isReset = false
-                    startAnimation()
+                if canTap && !(progress > 1.0) {
+                    manageAnimation()
                 }
             }
     }
@@ -122,6 +111,22 @@ struct SSProgressView: View {
         }
     }
 
+    private func manageAnimation() {
+        if style.allowCancelProgress && !isReset {
+            isStarted.toggle()
+            if isStarted {
+                // Cancel animation on clicking again
+                resetProgress()
+                onCancelProgress?()
+            } else {
+                startAnimation()
+            }
+        } else {
+            isReset = false
+            startAnimation()
+        }
+    }
+    
     private func progressAnimation() {
         // Showing percentage text once initial animation is done
         initialTimer = Timer.scheduledTimer(withTimeInterval: 0.6, repeats: false) { timer in
@@ -131,14 +136,9 @@ struct SSProgressView: View {
             }
         }
 
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+        DispatchQueue.main.asyncAfter(deadline: .now()) {
             endTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { timer in
 
-                // Hiding dot once progress starts
-                if progress > 0.0 {
-                    showVerticalLine = false
-                }
-                
                 // Reset progress after progress is completed
                 if progress >= 1.0 {
                     timer.invalidate()
@@ -149,7 +149,7 @@ struct SSProgressView: View {
                     }
 
                     // Reset progress with animation
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
                         withAnimation {
                             resetProgress()
                             isReset = true
@@ -199,7 +199,6 @@ struct SSProgressView: View {
         isDownArrow = true
         bounceEffect = 1.0
         startDotAnim = false
-        showVerticalLine = true
         showPercent = false
     }
 }

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/ViewExtension.swift

@@ -0,0 +1,23 @@
+//
+//  ViewExtension.swift
+//  SSSwiftUIAnimations
+//
+//  Created by Mansi Prajapati on 23/05/24.
+//
+
+import SwiftUI
+
+// For using property based on condition
+extension View {
+    @ViewBuilder
+    func `if`<Transform: View>(
+        _ condition: Bool,
+        transform: (Self) -> Transform
+    ) -> some View {
+        if condition {
+            transform(self)
+        } else {
+            self
+        }
+    }
+}

SSSwiftUIAnimations/SSSwiftUIAnimations/ProgressAnimation/WaveView.swift

@@ -19,8 +19,8 @@ struct WaveView: View {
 
     var body: some View {
         VStack(spacing: 0) {
-            let progresss = 1.0 / CGFloat(5)
-            let normedAmplitude = (1.5 * progresss - 0.8) * self.amplitude
+            let waveProgress = 1.0 / CGFloat(5)
+            let normedAmplitude = (1.5 * waveProgress - 0.8) * self.amplitude
 
             Wave(
                 phase: phase,
@@ -31,19 +31,19 @@ struct WaveView: View {
             .frame(width: width * 0.44, height: height)
             .onAppear {
                 Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true) { timer in
-                    if progress > 0.1 && progress < 0.90 {
+                    if progress >= 0.001 && progress < 0.92 {
                         // Wave animation
                         withAnimation( Animation.linear(duration: 2).repeatForever(autoreverses: false)) {
                             self.amplitude = 0.8
                             self.phase -= 6.0
                         }
-                    } else if progress >= 0.90 && progress <= 0.95 {
+                    } else if progress >= 0.92 && progress < 0.99 {
                         // Slowly transforming wave to straight line
                         withAnimation(Animation.linear(duration: 2)) {
                             self.amplitude = 0
                             self.phase -= 0.3
                         }
-                    } else if progress > 0.95 {
+                    } else if progress >= 0.99 {
                         timer.invalidate()
                     }
                 }