Merge remote-tracking branch 'origin/develop' into release/1.66

hyperskill · Jul 26, 2024 · 575c3c8 · 575c3c8
2 parents 52bab25 + 3c5a34b
commit 575c3c8
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/TextEffects/HackerTextView.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/TextEffects/HackerTextView.swift
@@ -28,13 +28,15 @@ struct HackerTextView: View {
 
                 setRandomCharacters()
                 animateText()
+                applyFinalTextCharacters()
             }
             .onChange(of: text) { _ in
                 animatedText = text
                 animationID = UUID().uuidString
 
                 setRandomCharacters()
                 animateText()
+                applyFinalTextCharacters()
             }
     }
 
@@ -95,6 +97,20 @@ struct HackerTextView: View {
             animatedText.replaceSubrange(index...index, with: String(character))
         }
     }
+
+    private func applyFinalTextCharacters() {
+        let currentID = animationID
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + duration) {
+            guard currentID == animationID else {
+                return
+            }
+
+            if animatedText != text {
+                animatedText = text
+            }
+        }
+    }
 }
 
 #if DEBUG