Repository navigation
Conversation
Contributor
|
Will this PR resolve the animation doubled duration issue? #1231 |
Contributor
Author
|
Yes it will |
Contributor
Author
|
I believe I have already addressed that issue in this PR I'm just struggling to get the unit test to prove it |
bijington
commented
Sep 4, 2023
Contributor
Author
|
As far as I can tell it might be down to our use of |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-Authored-By: Claude Code <noreply@anthropic.com>
Base Ticker.IsRunning reported on a Timer the mock never created, so every Tweener.Start spawned an extra concurrent tick loop and animation timing ran fast and uneven. The loop now tracks its own running state, Stop() clears it before cancelling so a segment restarting inline from the finished callback gets a fresh loop, and the loop captures its token so the dying loop cannot be resurrected. Run the timing test on a single thread like FadeAnimationTests. Co-Authored-By: Claude Code <noreply@anthropic.com>
…ir original values - RotateAnimation, ScaleAnimation, ShakeAnimation, FlipHorizontalAnimation and FlipVerticalAnimation use [BindableProperty] partial properties and Defaults classes, like FadeAnimation on main. - Each animation returns the view to the value it had before it started (Rotate and Shake used to snap to 0). - AnimatedPropertyTracker generalizes FadeAnimation's per-view tracking to every animated property: an animation started while another one runs (e.g. AnimationBehavior triggered again) returns the view to its true original value; the interrupted animation stops where it is instead of fighting the new one. - Animate throws ArgumentNullException synchronously and OperationCanceledException for a cancelled token. - ShakeAnimation throws ArgumentOutOfRangeException for ReducingAmount <= 0, which used to hang the app. - ShakeAnimation keeps the view's TranslationY instead of resetting it to 0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
FadeAnimation faded out over Length and back over Length again, so it took twice its Length (#1231). It now spends half of Length on each direction, like every other animation, and FadeAnimationTests inherits the BaseAnimationTests duration check. Breaking change: FadeAnimation now plays twice as fast for the same Length. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…the view on Windows The flip cleanup cleared every PlaneProjection once RotationX and RotationY were back at 0. A flip with Rotation 0 (or one stopped before its first frame) never makes .NET MAUI write a projection, so the cleanup removed a PlaneProjection the app had set. MAUI writes a new PlaneProjection instance whenever the view turns, so the flip now remembers the projection it started with and clears only a different one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…seeker's value Bounce, Shake and Wobble compose their offset on top of a running TranslateToAsync. The composer told the other writer's writes apart by comparing values, so a write equal to the composed value went unseen (BindableObject raises no PropertyChanged for it) and the seeker later restored an older translation: a Bounce started after the first frame of a linear 0 to -105 translation left TranslationY at -78.75. The composer now remembers the boxed value it left in the property and treats any other stored box as another writer's write, because BindableObject stores the new box even for an equal value. A .NET MAUI that boxed on every read falls back to comparing values, today's behavior. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…uring it MAUI ticks animations in the order they started, so a TranslateToAsync that starts while Bounce, Shake or Wobble runs writes its absolute value after the seeker in every frame, and the frame showed the translation alone until it ended. The composer now also listens to VisualElement.BatchCommitted, which every MAUI animation tick raises after its writes, and puts its offset back on top when another writer wrote. It stops listening as soon as the run ends, before the view is restored, and ignores a BatchCommitted raised inside its own write, where a PropertyChanged handler that batches the view would otherwise make it loop. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… its offset Bounce, Shake and Wobble now put their offset on top of a TranslateToAsync that starts while they run, not only one that was already running when they started. The XML remarks of the three animations say so. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ntion seeker take over An app's own .NET MAUI ScaleToAsync, ScaleXToAsync, ScaleYToAsync or RotateToAsync (and RelScaleToAsync, RelRotateToAsync) that started while Heartbeat, Tada, RubberBand, Swing or Wobble animated the same property ticked after the seeker in every frame, so it hid the seeker, and the seeker's restore then undid the app's target. The later-started animation now takes over, as a toolkit ScaleAnimation or RotateAnimation already does: in its next frame the seeker sees the app's animation handle running, ends, and its Task completes. The seeker leaves the taken-over property to the app's animation and returns its other properties to their original values. A direct write by the app still does not stop a seeker. Unit tests cover every seeker and property pair, same-value, zero-length and cancelled animations, a To started inside the seeker's start, and AnimationBehavior. One device theory runs five seeker and To pairs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ng a seeker takes over Adds one sentence to the remarks of Heartbeat, Tada, RubberBand, Swing and Wobble: the seeker ends in its next frame, its Task completes, its other properties return to rest, and the view keeps the value the app's animation reaches. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…e seeker writes The takeover tests accepted any value between the app's start and target, so a seeker that played its keyframes before checking for the takeover still passed (mutation: 9 of 24 rows green). They now require every write after the app's start to be one of the app's own frame values, which makes that mutation fail 10 tests. Comments no longer claim the app's animation always ticks after the seeker, as one started inside the seeker's start ticks before it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…s the seeker running Tests only, no behavior change. An app's ScaleToAsync, ScaleXToAsync, ScaleYToAsync or RotateToAsync, and a toolkit RotateAnimation, that animate a property the running seeker does not animate must not end it. A change that ended every seeker whenever any of those animations ran passed all existing tests; the new rows (Heartbeat, Tada, RubberBand, Swing, Wobble, Bounce and Shake) fail under it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Merged
6 of 7 tasks
…e run still going On a shared runner that stalls the UI thread, a whole run (or both 500 ms legs of a To animation) can pass between the frame that met a test's mid-run wait and the moment the test resumes. The test then waited out its timeout for a mid-run value that never came, or cancelled, triggered, switched animations off or checked the platform view after the run had already ended (Windows packaged, ab28da4: Scale and Heartbeat rows). StartAndActMidRunAsync waits for a mid-run write or the run's end, then re-checks the mid-run condition on the current value and runs the test's action synchronously in that same UI-thread turn, so no frame can end the run in between. An attempt whose run ended first proves nothing and is repeated with a fresh run, at most five times, with a clear failure after that. Every attempt that acted keeps every assertion. DisableSystemAnimations now switches in the caller's turn (MAUI's DispatchAsync always posts), the Fade tests await their faded-opacity waits instead of racing the wait's continuation, and waitTimeout is 30 s since it only bounds a hang. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The tests that start a seeker or a TranslateToAsync and act once it moves now act through StartAndActMidRunAsync, with conditions that are false at rest and at the end of the run, so a run that a stall let end is never taken for one in progress. Seekers that only the test itself stops run for 60 s, so a stall cannot end them before the test checks that they still run. The surviving-Swing test repeats an attempt only when the Swing had its whole length before the test looked, and the two frame-sampling Bounce tests only when no frame showed the hop and a gap between frames was long enough to skip it. Every other attempt keeps every assertion. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
AnimationStartedMidRunAfterALateFrameReachesItsPeak sleeps a whole run length after the start, which ends the first leg of every two-leg To animation at once. Rotate has one leg, the whole run, so that frame ended the run itself: the old wait then acted on a run that had already ended, and the new helper rightly never finds Rotate in progress. Rotate's late frame now lands half way, which keeps a second run starting mid-run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
StartAndActMidRunAsync now checks run.IsCompleted before it acts, so a run that already ended can never pass for one in progress. A run that ended with its last value still mid-run is a product bug (the view was left mid-animation), so the helper fails the test with the written values instead of acting on the finished run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The cancel in AnimateCalledOffTheUIThreadChangesTheViewOnlyOnTheUIThread and the trigger in AnimationBehaviorTriggeredOffTheUIThread... queue their abort or start through the dispatcher. After a stall, a frame can run ahead of an already queued item on some platforms (Android draws at the vsync time), so with a 1-3 s run the run could end before the queued item runs. A 10 s run leaves several seconds after the action. The behavior's second run gets its normal length back inside the action, because the running run read its length when it started. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… the translation A stall before the first frame after the action is invisible to a stopwatch started in the action, but MAUI hands the whole stall to the bounce's first step. The two frame-sampling Bounce tests therefore read the bounce's own ticker time: a linear sampler committed in the bounce's turn gets the same milliseconds every frame. An attempt repeats only when no frame's ticker time fell inside the span where the hop shows (computed from Bounce's CubicOut/CubicIn keyframes) while the TranslateToAsync still ran; every other attempt keeps every assertion. BounceStartedWhileTranslateToRuns compares the hop with the translation's own TranslationY in the same frame (derived from TranslationX, since one linear tween moves both axes), so it holds wherever a stall lets the translation get to before the first hop peaks. RotateAnimationStopsASwing... no longer checks that Rotate is still running after the Swing's posted end, which a stalled frame can jump; the 60 s Swing already proves that only Rotate ended it in time, and the test now checks that the stopped Swing completes normally. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
7 tasks
…issed run's fault BounceDuringAHorizontalTranslateToHoldsTheFirstHopsPeakUntilItFalls, TranslateToStartedDuringABounceKeepsTheHopsVisibleOnTopOfTheTranslation and SwingWhoseStartAbortsARotateTo...KeepsTheTopEdgeAnchorUntilItEnds ran their translate, restore and native-view checks only when a sampled frame proved the scenario. A missed attempt dropped those checks although they hold under any stall, so they now run after a missed attempt too. AnimateCompletesAndReturnsTheViewToItsOriginalValues and FlipFromZeroWithOtherTransformsSetReturnsThePlatformViewToRest check the final values after a missed run. The helper awaits a missed run, so its fault is not lost, and its mid-run failure message reports the run's exception. The ticker-time comment no longer claims a platform-specific stall behavior. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…-hardened device tests Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Comment and assertion-message wording only. No code changes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Renames two unit tests and a local that used animation jargon: LeavesNoTweenTickingAfterItEnds becomes LeavesNoAnimationTickingAfterItEnds, TokenCancelledWhileTheRunStartsItsTween_EndsCanceledWithoutPlayingTheTween becomes TokenCancelledWhileTheRunStartsItsAnimation_EndsCanceledWithoutPlayingIt, and isTweenRunning becomes isKeyframeAnimationRunning. No behavior change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
AnimateLegAsync is now AnimateAndRestoreIfStoppedAsync, the wrappers and helpers are renamed to match, and "leg" in comments and test names is plain words. No behavior change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Methods are verbs, past tense is only for events, success-bool methods follow the Try-Parse pattern, and bools are questions. Added to CONTRIBUTING.md, the Copilot and codestyle instructions, the codestyle prompt, and a short Naming section in AGENTS.md. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Applies the approved rename plan to the code PR #1232 declares. - Tracker: For, Start, End, ReturnedToOriginalValue and HandedOverToApp become GetOrCreate, StartAnimationAndGetOriginalValue, EndAnimation, RecordReturnToOriginalValue and RecordHandOverToApp. - Bool methods follow the Try-Parse pattern: TryFindPropertiesTakenOverByTheApp (out list, null when false), TryAnimateAndRestoreIfStoppedAsync and the Try...Async wrappers in the Fade, Scale and Flip animations. - Keyframe builders become Create<Motion>Keyframe, KeyframeTarget getters start with Get, and the keyframe Start becomes StartRun. - Tasks end in Task, TaskCompletionSources in Source, the one ManualResetEventSlim in Signal; bool locals read as questions. - Test helpers, parameters and test-name prefixes follow the same rules. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Add the On<EventName> handler and callback rule and the Task and TaskCompletionSource suffix rule to the Naming Conventions sections and the short version in AGENTS.md. Fix older guide content that contradicted the rules: fold the old Try Pattern section into the Try-Parse rule, rename the Success tuple element to WasParsed, readyToPlay to readyToPlaySource and _tcs to orderSource, drop the range-indexer and nullability-attribute comments that said what, point the stale best practices bullet at the naming section, and say "number" instead of "tense" for enums. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Collaborator
|
Hi Shaun (@bijington)! This is Brandon's Claude. Thank you for requesting the last Copilot review! Its 3 comments are fixed, replied to and resolved, and CI is green. Could you request one more Copilot review when you get a chance? The fixes:
Also new since then:
|
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change
Adds 11 animations and reworks
FadeAnimation, soAnimationBehaviorships 12 ready-made animations. Each one returns the view to its original values.FadeAnimation(reworked),ScaleAnimation,RotateAnimation,FlipHorizontalAnimation,FlipVerticalAnimation.ShakeAnimation,TadaAnimation,HeartbeatAnimation,RubberBandAnimation,BounceAnimation,SwingAnimation,WobbleAnimation. They share one internal keyframe helper, so a view runs one seeker at a time.AnimationBehaviorstops a running attention seeker before it starts, swallows the cancellation of its ownAnimateCommandtoken, and stops and starts on the view's dispatcher in one UI turn.AnimationBehaviorPagedemos all 12 animations, plus a spin you can cancel with its token or withCancelAnimations().CONTRIBUTING.mdand to the agent instructions (AGENTS.md,.github/copilot-instructions.md, the code-style instructions and prompt), and the code this PR adds follows it.CHANGED BEHAVIOUR (not breaking)
Animateis safe to call from any thread. Every animation moves to the view's dispatcher first, so it never writes the view from the thread pool.AnimateCommandswallows the caller's own cancel. Onmain, a token cancelled before the command ran threwOperationCanceledExceptionout of the asyncvoidcommand, which crashed the app unlessSetShouldSuppressExceptionsInAnimations(true)was set. Other exceptions still reach the app.AnimateCommandstops the running animations and starts the new one in one UI turn, from any thread. From a background thread, the interrupted run no longer returns the view to rest for a frame before the new run starts.AnimationType.Animate, including a custom animation's, now runs on the view's dispatcher.CancelAnimations(), or a secondAnimationBehavioron the same view, the view is back at its original values and theTaskcompletes. Onmain, an interruptedFadeAnimationfaded back over anotherLength, or stayed partly faded when stopped on its way back.RotateToAsync,ScaleToAsync,ScaleXToAsyncandScaleYToAsyncanimations of the properties they animate (the toolkit's and the app's), and a toolkit "To" animation stops a running attention seeker that animates its property. An app's ownScaleToAsync,ScaleXToAsync,ScaleYToAsyncorRotateToAsyncthat starts while Heartbeat, Tada, RubberBand, Swing or Wobble animates the same property takes over the same way: the seeker ends and returns its other properties to their original values. A direct write by the app does not stop a seeker.TranslateToAsynckeeps running and still reaches its target: Bounce, Shake and Wobble add their offset on top of the live translation, also when the translation starts while they run. The view ends at the translation's value, even when the translation writes exactly the value the seeker showed. APropertyChangedhandler that re-writes the translation during the seeker's write counts as part of that write.PropertyChangedhandler) faults the animation'sTaskinstead of escaping into MAUI's ticker, soSetShouldSuppressExceptionsInAnimationsapplies.PlaneProjectionthat .NET MAUI leaves when another transform is set. A projection the app set itself stays, unless the flip turns the view: .NET MAUI replaces it then, and the flip clears MAUI's stale one.RotateAnimationmakes one full turn relative to the view's rotation: defaultRotation360,Length400 ms. Xamarin Community Toolkit'sRotateAnimationrotated to an absolute 180 degrees in 200 ms and snapped back to 0.FlipHorizontalAnimationandFlipVerticalAnimationstill turn to an absolute angle.Test coverage
tr-TR. That includes 579 tests inAnimations(contract, timing, interruption, cancellation, system animations off, dispatch) and 750 inBehaviors, which also pass in Release.Category=FadeAnimation,Category=ScaleAnimation, ...).AsyncContextthat is never disposed (UndisposedAsyncContext).AsyncContext.Runcould crash the test host whenAnimateCommand's asyncvoidended on a pool thread while the context was being disposed, a race that also exists onmain.Stopwatchinstead ofTask.Delay(16), which slow CI runners stretch to 75-115 ms. Under macOS background priority, theAnimationsandBehaviorstests take about 2 minutes instead of 14, and no test uses more than a third of its timeout.AnimateCommand's stop and start across UI turns, fails a unit test.Linked Issues
CompoundAnimationBaseor repeat support)TouchBehavior's, onto the guards this PR adds and testsPR Checklist
approved(bug) orChampioned(feature/proposal)mainat time of PRAdditional information
tr-TR), local device tests (Android API 36 and 28, iOS 27, Mac Catalyst, Windows), and the full device-test matrix in this PR's CI (Android, iOS, Mac Catalyst, Windows).main'sExpanderTests.HeaderTapInAScrolledCollectionViewResizesTheContainerOfTheTappedItem(from Add Device Tests, Apply Fixes for Bugs Found #3344). The test looked up the item'sExpanderbefore WinUI had put it in the item's container; it now waits for it there. Test-only change.VisualElement.BatchCommitted, which .NET MAUI raises after every animation tick, to keep their offset on top of aTranslateToAsyncthat started after them. The event is public but marked[EditorBrowsable(Never)]. Unit and device tests fail if a future .NET MAUI stops raising it on every tick.Breaking changes
FadeAnimation.Lengthnow covers the whole animation, fading out and back (Discussion FadeAnimation takes twice as long as expected #1231). Each half takesLength / 2. Onmain, bothFadeToAsynccalls usedLength, so the default 300 ms fade took 600 ms.FadeAnimation.Animatecall ends as canceled. Onmain, MAUI'sFadeToAsyncreturnedtrueon cancel and the fade back returned at once with the cancelled token, so the view stayed partly faded and theTaskcompleted successfully. ThroughAnimateCommand, the view also returns, and the command still ends without an exception.FadeAnimation.Opacitynow defaults toBindingMode.OneWay(wasTwoWay), and assigningNaNor an infinity is ignored. This matches the new animations' properties. A non-finite value would be written to the platform view on every frame.🤖 Generated with Claude Code