Skip to content

On change fix #59

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
Chalebgwa wants to merge 7 commits into
base: master
Choose a base branch
from
Open

On change fix #59

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
277068f
Fixed onChange bug.
ceranco Jun 15, 2023
903f65b
added optional center widget to counter
Chalebgwa Oct 12, 2023
9d7cb06
Update circular_countdown_timer.dart
Chalebgwa Oct 12, 2023
e6af13d
Update circular_countdown_timer.dart
Chalebgwa Oct 12, 2023
580ce30
Update circular_countdown_timer.dart
Chalebgwa Oct 12, 2023
8b53355
Update circular_countdown_timer.dart
Chalebgwa Oct 12, 2023
99d49c0
Merge branch 'master' into on_change_fix
Chalebgwa Oct 15, 2023
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
51 changes: 34 additions & 17 deletions lib/circular_countdown_timer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ class CircularCountDownTimer extends StatefulWidget {
/// Handles the timer start.
final bool autoStart;

/// Center Widget
final Widget? center;


/*
* Function to format the text.
* Allows you to format the current duration to any String.
Expand Down Expand Up @@ -113,6 +117,7 @@ class CircularCountDownTimer extends StatefulWidget {
this.autoStart = true,
this.textFormat,
this.controller,
this.center,
}) : assert(initialDuration <= duration);

@override
Expand All @@ -131,16 +136,17 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
!widget.autoStart &&
!countDownController!.isStarted) {
if (widget.timeFormatterFunction != null) {
return Function.apply(widget.timeFormatterFunction!,
timeStamp = Function.apply(widget.timeFormatterFunction!,
[_getTime, Duration(seconds: widget.duration)]).toString();
} else {
timeStamp = _getTime(Duration(seconds: widget.duration));
}
} else {
Duration? duration = _controller!.duration! * _controller!.value;
if (widget.timeFormatterFunction != null) {
return Function.apply(
widget.timeFormatterFunction!, [_getTime, duration]).toString();
timeStamp =
Function.apply(widget.timeFormatterFunction!, [_getTime, duration])
.toString();
} else {
timeStamp = _getTime(duration);
}
Expand Down Expand Up @@ -301,20 +307,7 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
backgroundGradient: widget.backgroundGradient),
),
),
widget.isTimerTextShown
? Align(
alignment: FractionalOffset.center,
child: Text(
time,
style: widget.textStyle ??
const TextStyle(
fontSize: 16.0,
color: Colors.black,
),
textAlign: widget.textAlign,
),
)
: Container(),
_buildCenter(),
],
),
),
Expand All @@ -323,6 +316,30 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
);
}

Widget _buildCenter(){
if(widget.center != null){
return Align(
child:widget.center!,
alignment: FractionalOffset.center,
);
}
return widget.isTimerTextShown
? Align(
alignment: FractionalOffset.center,
child: Text(
time,
style: widget.textStyle ??
const TextStyle(
fontSize: 16.0,
color: Colors.black,
),
textAlign: widget.textAlign,
),
)
: Container();

}

@override
void dispose() {
_controller!.stop();
Expand Down