IOS-7990: Use explicit animations for content hiding because implicit…

… ones are broken on iOS 18+ Signed-off-by: Andrey Fedorov <[email protected]>
tangem · Sep 18, 2024 · b512c91 · b512c91
1 parent 402acdb
commit b512c91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/Tangem/Modules/Markets/Common/BaseMarketsViewModel.swift b/Tangem/Modules/Markets/Common/BaseMarketsViewModel.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import func SwiftUI.withAnimation
 
 class BaseMarketsViewModel: ObservableObject {
  /// For unknown reasons, the `@self` and `@identity` of our view change when push navigation is performed in other
@@ -19,10 +20,6 @@ class BaseMarketsViewModel: ObservableObject {
  overlayContentProgress.interpolatedProgress(inRange: Constants.overlayContentHidingProgressInterpolationRange)
  }
 
- var overlayContentHidingAnimationDuration: TimeInterval {
- Constants.overlayContentHidingAnimationDuration
- }
-
  init(
  overlayContentProgressInitialValue: CGFloat
  ) {
@@ -32,7 +29,9 @@ class BaseMarketsViewModel: ObservableObject {
  }
 
  func onOverlayContentProgressChange(_ progress: CGFloat) {
- overlayContentProgress = progress
+ withAnimation(.easeInOut(duration: Constants.overlayContentHidingAnimationDuration)) {
+ overlayContentProgress = progress
+ }
  }
 }
 

diff --git a/Tangem/Modules/Markets/TokenList/MarketsView.swift b/Tangem/Modules/Markets/TokenList/MarketsView.swift
@@ -62,10 +62,6 @@ struct MarketsView: View {
  }
  }
  .opacity(viewModel.overlayContentHidingProgress)
- .animation(
- .easeInOut(duration: viewModel.overlayContentHidingAnimationDuration),
- value: viewModel.overlayContentHidingProgress
- )
  .scrollDismissesKeyboardCompat(.immediately)
  }
  .alert(item: $viewModel.alert, content: { $0.alert })

diff --git a/Tangem/Modules/Markets/TokenMarketsDetails/TokenMarketsDetailsView.swift b/Tangem/Modules/Markets/TokenMarketsDetails/TokenMarketsDetailsView.swift
@@ -36,10 +36,6 @@ struct TokenMarketsDetailsView: View {
  .background {
  viewBackground
  }
- .animation(
- .easeInOut(duration: viewModel.overlayContentHidingAnimationDuration),
- value: viewModel.overlayContentHidingProgress
- )
  }
 
  @ViewBuilder