Mutate crossfade start/end drawables #572
Merged
Conversation
This file contains 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
colinrtwhite
reviewed
Nov 3, 2020
| @@ -24,14 +24,14 @@ import kotlin.math.roundToInt | |||
| * | |||
| * NOTE: The animation can only be executed once as the [start] drawable is dereferenced at the end of the transition. | |||
| * | |||
| * @param start The [Drawable] to crossfade from. | |||
| * @param start The [Drawable] to crossfade from. Will be mutated to prevent modifying alpha of original drawable | |||
There was a problem hiding this comment.
I don't think we need to mention mutation in the docs.
colinrtwhite
reviewed
Nov 3, 2020
| * @param end The [Drawable] to crossfade to. | ||
| * @param scale The scaling algorithm for [start] and [end]. | ||
| * @param durationMillis The duration of the crossfade animation. | ||
| * @param fadeStart If false, the start drawable will not fade out while the end drawable fades in. | ||
| */ | ||
| class CrossfadeDrawable @JvmOverloads constructor( | ||
| private var start: Drawable?, | ||
| start: Drawable?, | ||
| private val end: Drawable?, |
There was a problem hiding this comment.
We should probably mutate end as well since it could be loaded from resources.
There was a problem hiding this comment.
Yep, didn't think about that! Since we can provide something like error placeholder. Tested it in sample, same bug
#571 (comment)
There was a problem hiding this comment.
Fixed. Not sure if tests are good enough, they are testing drawable changes, but with a bit of a hack - since percent of animation is tied to SystemClock and can't be influenced directly.
colinrtwhite
reviewed
Nov 3, 2020
| private var startTimeMillis = 0L | ||
| private var maxAlpha = 255 | ||
| private var state = STATE_START | ||
|
|
||
| init { | ||
| require(durationMillis > 0) { "durationMillis must be > 0." } | ||
|
|
||
| this.start = start?.mutate() | ||
| start?.callback = this | ||
| end?.callback = this |
There was a problem hiding this comment.
Should this be this.start and this.end? drawable.mutate is supposed to return the same drawable, but there's nothing to prevent a bad drawable from returning a new drawable.
|
Thanks for finding + fixing this! |
Raenar4k
changed the title
Raenar4k
force-pushed
the
mutate_crossfade_drawable
branch
from
dc45bb0 to
faff35d
Compare
…es (coil-kt#571) Remove mention of drawable mutation from CrossfadeDrawable doc (coil-kt#571)
Raenar4k
force-pushed
the
mutate_crossfade_drawable
branch
from
faff35d to
fb0c458
Compare
IljaKosynkin
pushed a commit
to IljaKosynkin/coil
that referenced
this pull request
Nov 6, 2020
* Add failing test for crossfade drawable alpha bug (coil-kt#571) * Change CrossfadeDrawable constructor to mutate start drawable (coil-kt#571) * Add test for both start/end drawables in CrossfadeDrawableTest (coil-kt#571) * Change CrossfadeDrawable constructor to mutate both start/end drawables (coil-kt#571) Remove mention of drawable mutation from CrossfadeDrawable doc (coil-kt#571)
colinrtwhite
pushed a commit
that referenced
this pull request
Oct 5, 2022
* Add failing test for crossfade drawable alpha bug (#571) * Change CrossfadeDrawable constructor to mutate start drawable (#571) * Add test for both start/end drawables in CrossfadeDrawableTest (#571) * Change CrossfadeDrawable constructor to mutate both start/end drawables (#571) Remove mention of drawable mutation from CrossfadeDrawable doc (#571)
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.
Fixes #571