-
-
Notifications
You must be signed in to change notification settings - Fork 324
Add additional parameters to ColorizeAnimatedText for better control #368
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
M4dhav
wants to merge
1
commit into
aagarwal1012:master
Choose a base branch
from
M4dhav:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,13 +20,23 @@ class ColorizeAnimatedText extends AnimatedText { | |
| /// By default it is set to [TextDirection.ltr] | ||
| final TextDirection textDirection; | ||
|
|
||
| ///Specifies whether to fade in text when starting to render. | ||
| /// By default it is true. | ||
| final bool fadeInOnStart; | ||
|
|
||
| /// Specifies the curve for the color transition animation. | ||
| /// By default it is set to [Curves.easeIn] | ||
| final Curve animationCurve; | ||
|
|
||
| ColorizeAnimatedText( | ||
| String text, { | ||
| TextAlign textAlign = TextAlign.start, | ||
| required TextStyle textStyle, | ||
| this.speed = const Duration(milliseconds: 200), | ||
| required this.colors, | ||
| this.textDirection = TextDirection.ltr, | ||
| this.fadeInOnStart = true, | ||
| this.animationCurve = Curves.easeIn, | ||
| }) : assert(null != textStyle.fontSize), | ||
| assert(colors.length > 1), | ||
| super( | ||
|
|
@@ -36,7 +46,7 @@ class ColorizeAnimatedText extends AnimatedText { | |
| duration: speed * text.characters.length, | ||
| ); | ||
|
|
||
| late Animation<double> _colorShifter, _fadeIn, _fadeOut; | ||
| late Animation<double> _colorShifter, _fadeIn; | ||
| // Copy of colors that may be reversed when RTL. | ||
| late List<Color> _colors; | ||
|
|
||
|
|
@@ -48,20 +58,13 @@ class ColorizeAnimatedText extends AnimatedText { | |
| 0.75 * | ||
| (textCharacters.length / 15.0); | ||
|
|
||
| _fadeIn = Tween<double>(begin: 0.0, end: 1.0).animate( | ||
| _fadeIn = Tween<double>(begin: fadeInOnStart ? 0.0 : 1.0, end: 1.0).animate( | ||
| CurvedAnimation( | ||
| parent: controller, | ||
| curve: const Interval(0.0, 0.1, curve: Curves.easeOut), | ||
| ), | ||
| ); | ||
|
|
||
| _fadeOut = Tween<double>(begin: 1.0, end: 1.0).animate( | ||
| CurvedAnimation( | ||
| parent: controller, | ||
| curve: const Interval(0.9, 1.0, curve: Curves.easeIn), | ||
| ), | ||
| ); | ||
|
|
||
|
Comment on lines
-58
to
-64
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fadeOut was animating from 1 to 1 and so essentially not doing anything, so I removed it for better code readability |
||
| final colorShift = colors.length * tuning; | ||
| final colorTween = textDirection == TextDirection.ltr | ||
| ? Tween<double>( | ||
|
|
@@ -75,7 +78,7 @@ class ColorizeAnimatedText extends AnimatedText { | |
| _colorShifter = colorTween.animate( | ||
| CurvedAnimation( | ||
| parent: controller, | ||
| curve: const Interval(0.0, 1.0, curve: Curves.easeIn), | ||
| curve: Interval(0.0, 1.0, curve: animationCurve), | ||
| ), | ||
| ); | ||
|
|
||
|
|
@@ -105,7 +108,7 @@ class ColorizeAnimatedText extends AnimatedText { | |
| @override | ||
| Widget animatedBuilder(BuildContext context, Widget? child) { | ||
| return Opacity( | ||
| opacity: _fadeIn.value != 1.0 ? _fadeIn.value : _fadeOut.value, | ||
| opacity: _fadeIn.value, | ||
| child: completeText(context), | ||
| ); | ||
| } | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change was made as Gradle version 8.1.0 is no longer supported by Flutter and the example app does not build