From d0771cb4b754953df0873bc26e4be04fd9c33bc5 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 23 Aug 2023 12:14:04 +1000
Subject: [PATCH] polish loading animation

---
 Session/Onboarding/LoadingView.swift | 35 +++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/Session/Onboarding/LoadingView.swift b/Session/Onboarding/LoadingView.swift
index 6414c4a65..62d0743df 100644
--- a/Session/Onboarding/LoadingView.swift
+++ b/Session/Onboarding/LoadingView.swift
@@ -12,9 +12,11 @@ struct LoadingView: View {
     @State var animationTimer: Timer?
     
     private let flow: Onboarding.Flow
+    private let preview: Bool
     
-    public init(flow: Onboarding.Flow) {
+    public init(flow: Onboarding.Flow, preview: Bool = false) {
         self.flow = flow
+        self.preview = preview
     }
     
     var body: some View {
@@ -66,7 +68,7 @@ struct LoadingView: View {
             if percentage >= 1 {
                 self.percentage = 1
                 timer.invalidate()
-                finishLoading(success: false)
+                if !self.preview { finishLoading(success: false) }
             }
         }
     }
@@ -91,7 +93,7 @@ struct LoadingView: View {
         }
         self.animationTimer?.invalidate()
         self.animationTimer = nil
-        Timer.scheduledTimerOnMainThread(withTimeInterval: 0.3) { _ in
+        withAnimation(.linear(duration: 0.3)) {
             self.percentage = 1
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
@@ -102,6 +104,25 @@ struct LoadingView: View {
     }
 }
 
+struct AnimatableNumberModifier: AnimatableModifier {
+    var number: Double
+    
+    var animatableData: Double {
+        get { number }
+        set { number = newValue }
+    }
+    
+    func body(content: Content) -> some View {
+        content
+            .overlay(
+                Text(String(format: "%.0f%%", number))
+                    .bold()
+                    .font(.system(size: Values.superLargeFontSize))
+                    .foregroundColor(themeColor: .textPrimary)
+            )
+    }
+}
+
 struct CircularProgressView: View {
     @Binding var percentage: Double
     
@@ -137,17 +158,13 @@ struct CircularProgressView: View {
                 )
                 .rotationEffect(.degrees(117))
                 .animation(.easeOut, value: progress)
-            
-            Text(String(format: "%.0f%%", $percentage.wrappedValue * 100))
-                .bold()
-                .font(.system(size: Values.superLargeFontSize))
-                .foregroundColor(themeColor: .textPrimary)
         }
+        .modifier(AnimatableNumberModifier(number: $percentage.wrappedValue * 100))
     }
 }
 
 struct LoadingView_Previews: PreviewProvider {
     static var previews: some View {
-        LoadingView(flow: .link)
+        LoadingView(flow: .link, preview: true)
     }
 }