@@ -28,6 +28,7 @@ import android.graphics.Color
28
28
import android.os.Bundle
29
29
import android.view.View
30
30
import android.view.ViewGroup.MarginLayoutParams
31
+ import android.view.ViewPropertyAnimator
31
32
import android.view.WindowManager
32
33
import android.view.animation.DecelerateInterpolator
33
34
import android.view.animation.PathInterpolator
@@ -90,6 +91,8 @@ class BbWelcomePage : OnboardingPageFragment(R.layout.content_onboarding_welcome
90
91
}
91
92
92
93
private var welcomeAnimation: ViewPropertyAnimatorCompat ? = null
94
+ private var welcomeTitleAnimator: ViewPropertyAnimator ? = null
95
+ private var daxDialogAnimator: ValueAnimator ? = null
93
96
private var daxDialogAnimationStarted = false
94
97
private var backgroundSceneManager: BbOnboardingBackgroundSceneManager ? = null
95
98
@@ -173,6 +176,8 @@ class BbWelcomePage : OnboardingPageFragment(R.layout.content_onboarding_welcome
173
176
override fun onDestroyView () {
174
177
super .onDestroyView()
175
178
welcomeAnimation?.cancel()
179
+ welcomeTitleAnimator?.cancel()
180
+ daxDialogAnimator?.cancel()
176
181
}
177
182
178
183
override fun onActivityResult (
@@ -496,7 +501,7 @@ class BbWelcomePage : OnboardingPageFragment(R.layout.content_onboarding_welcome
496
501
applyTo(binding.longDescriptionContainer)
497
502
}
498
503
499
- ValueAnimator .ofFloat(0f , 1f )
504
+ daxDialogAnimator = ValueAnimator .ofFloat(0f , 1f )
500
505
.apply {
501
506
duration = transitionDuration.inWholeMilliseconds
502
507
startDelay = transitionDelay.inWholeMilliseconds
@@ -528,10 +533,11 @@ class BbWelcomePage : OnboardingPageFragment(R.layout.content_onboarding_welcome
528
533
height = calculateCurrentValue(initialHeight, targetHeight, progress)
529
534
}
530
535
}
536
+ }.also {
537
+ it.start()
531
538
}
532
- .start()
533
539
534
- binding.welcomeTitle.animate()
540
+ welcomeTitleAnimator = binding.welcomeTitle.animate()
535
541
.translationX(- resources.displayMetrics.widthPixels.toFloat())
536
542
.setDuration(transitionDuration.inWholeMilliseconds)
537
543
.setStartDelay(transitionDelay.inWholeMilliseconds)
0 commit comments