Merge pull request #700 from zinvob/develop

martijn00 · web-flow · commit 84e270a9cb2c · 2021-10-07T11:59:46.000+02:00
Fixed NaN issues with Android 9 and 10 when using multiple popups
diff --git a/Rg.Plugins.Popup/Animations/ScaleAnimation.cs b/Rg.Plugins.Popup/Animations/ScaleAnimation.cs
@@ -131,7 +131,6 @@ public async override Task Disappearing(View content, PopupPage page)
                     taskList.Add(content.TranslateTo(leftOffset, _defaultTranslationY, DurationOut, EasingOut));
                 }
             }
-
             await Task.WhenAll(taskList);
         }
 
@@ -141,7 +140,7 @@ private Task Scale(View content, Easing easing, double start, double end, bool i
 
             content.Animate("popIn", d =>
             {
-                content.Scale = d;
+                content.Scale = double.IsNaN(d) ? 1 : d;
             }, start, end,
             easing: easing,
             length: isAppearing ? DurationIn : DurationOut,

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ public async override Task Disappearing(View content, PopupPage page)`
`131`	`131`	`taskList.Add(content.TranslateTo(leftOffset, _defaultTranslationY, DurationOut, EasingOut));`
`132`	`132`	`}`
`133`	`133`	`}`
`134`		`-`
`135`	`134`	`await Task.WhenAll(taskList);`
`136`	`135`	`}`
`137`	`136`
`@@ -141,7 +140,7 @@ private Task Scale(View content, Easing easing, double start, double end, bool i`
`141`	`140`
`142`	`141`	`content.Animate("popIn", d =>`
`143`	`142`	`{`
`144`		`- content.Scale = d;`
	`143`	`+ content.Scale = double.IsNaN(d) ? 1 : d;`
`145`	`144`	`}, start, end,`
`146`	`145`	`easing: easing,`
`147`	`146`	`length: isAppearing ? DurationIn : DurationOut,`