Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added RTL support for Colorize animation. Resolves #109 #164

Merged
merged 1 commit into from
Dec 6, 2020
Merged

Added RTL support for Colorize animation. Resolves #109 #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions lib/src/colorize.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ class ColorizeAnimatedText extends AnimatedText {
/// The [List] should contain at least two values of [Color] in it.
final List<Color> colors;

/// Specifies the [TextDirection] for animation direction.
///
/// By default it is set to [TextDirection.ltr]
final TextDirection textDirection;

ColorizeAnimatedText(
String text, {
TextAlign textAlign = TextAlign.start,
@required TextStyle textStyle,
this.speed = const Duration(milliseconds: 200),
@required this.colors,
this.textDirection = TextDirection.ltr,
}) : assert(null != speed),
assert(null != colors && colors.length > 1),
super(
Expand All @@ -32,6 +38,8 @@ class ColorizeAnimatedText extends AnimatedText {
);

Animation<double> _colorShifter, _fadeIn, _fadeOut;
// Copy of colors that may be reversed when RTL.
List<Color> _colors;

@override
void initAnimation(AnimationController controller) {
Expand All @@ -54,18 +62,33 @@ class ColorizeAnimatedText extends AnimatedText {
),
);

_colorShifter =
Tween<double>(begin: 0.0, end: colors.length * tuning).animate(
final colorShift = colors.length * tuning;
final colorTween = textDirection == TextDirection.ltr
? Tween<double>(
begin: 0.0,
end: colorShift,
)
: Tween<double>(
begin: colorShift,
end: 0.0,
);
_colorShifter = colorTween.animate(
CurvedAnimation(
parent: controller,
curve: const Interval(0.0, 1.0, curve: Curves.easeIn),
),
);

// With RTL, colors need to be reversed to compensate for colorTween
// counting down instead of up.
_colors = textDirection == TextDirection.ltr
? colors
: colors.reversed.toList(growable: false);
}

@override
Widget completeText() {
final linearGradient = LinearGradient(colors: colors).createShader(
final linearGradient = LinearGradient(colors: _colors).createShader(
Rect.fromLTWH(0.0, 0.0, _colorShifter.value, 0.0),
);
return Text(
Expand Down Expand Up @@ -94,6 +117,7 @@ class ColorizeAnimatedTextKit extends AnimatedTextKit {
Key key,
@required List<String> text,
TextAlign textAlign = TextAlign.start,
TextDirection textDirection = TextDirection.ltr,
TextStyle textStyle,
List<Color> colors,
Duration speed = const Duration(milliseconds: 200),
Expand All @@ -109,8 +133,8 @@ class ColorizeAnimatedTextKit extends AnimatedTextKit {
bool stopPauseOnTap = false,
}) : super(
key: key,
animatedTexts:
_animatedTexts(text, textAlign, textStyle, speed, colors),
animatedTexts: _animatedTexts(
text, textAlign, textStyle, speed, colors, textDirection),
pause: pause,
displayFullTextOnTap: displayFullTextOnTap,
stopPauseOnTap: stopPauseOnTap,
Expand All @@ -129,6 +153,7 @@ class ColorizeAnimatedTextKit extends AnimatedTextKit {
TextStyle textStyle,
Duration speed,
List<Color> colors,
TextDirection textDirection,
) =>
text
.map((_) => ColorizeAnimatedText(
Expand All @@ -137,6 +162,7 @@ class ColorizeAnimatedTextKit extends AnimatedTextKit {
textStyle: textStyle,
speed: speed,
colors: colors,
textDirection: textDirection,
))
.toList();
}