Skip to content

feat: add tap trigger #319

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add tap trigger #319

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
17 changes: 10 additions & 7 deletions lib/src/animated_text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ class AnimatedTextKit extends StatefulWidget {
/// By default it is set to 3
final int totalRepeatCount;

/// Return the onTap handler to outside, for triggering onTap by other event
///
/// By default it is set to null
final void Function(VoidCallback)? tapTrigger;

const AnimatedTextKit({
Key? key,
required this.animatedTexts,
Expand All @@ -124,6 +129,7 @@ class AnimatedTextKit extends StatefulWidget {
this.isRepeatingAnimation = true,
this.totalRepeatCount = 3,
this.repeatForever = false,
this.tapTrigger,
}) : assert(animatedTexts.length > 0),
assert(!isRepeatingAnimation || totalRepeatCount > 0 || repeatForever),
assert(null == onFinished || !repeatForever),
Expand All @@ -134,8 +140,7 @@ class AnimatedTextKit extends StatefulWidget {
_AnimatedTextKitState createState() => _AnimatedTextKitState();
}

class _AnimatedTextKitState extends State<AnimatedTextKit>
with TickerProviderStateMixin {
class _AnimatedTextKitState extends State<AnimatedTextKit> with TickerProviderStateMixin {
late AnimationController _controller;

late AnimatedText _currentAnimatedText;
Expand All @@ -152,6 +157,7 @@ class _AnimatedTextKitState extends State<AnimatedTextKit>
void initState() {
super.initState();
_initAnimation();
widget.tapTrigger?.call(_onTap);
}

@override
Expand Down Expand Up @@ -189,8 +195,7 @@ class _AnimatedTextKitState extends State<AnimatedTextKit>

if (isLast) {
if (widget.isRepeatingAnimation &&
(widget.repeatForever ||
_currentRepeatCount != (widget.totalRepeatCount - 1))) {
(widget.repeatForever || _currentRepeatCount != (widget.totalRepeatCount - 1))) {
_index = 0;
if (!widget.repeatForever) {
_currentRepeatCount++;
Expand Down Expand Up @@ -252,9 +257,7 @@ class _AnimatedTextKitState extends State<AnimatedTextKit>
_nextAnimation();
}
} else {
final left =
(_currentAnimatedText.remaining ?? _currentAnimatedText.duration)
.inMilliseconds;
final left = (_currentAnimatedText.remaining ?? _currentAnimatedText.duration).inMilliseconds;

_controller.stop();

Expand Down