wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #838 from shraavv/784-fix-timer-issue

Browse Source 
timer code is now updated and uses a better approach
This commit is contained in:
Roland Geider
2025-06-28 17:56:17 +02:00
committed by GitHub
parent 837023a838 c7c47cdc49
commit af9cc04e74
1 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/widgets/routines/gym_mode/timer.dart
View File

@@ -40,42 +40,33 @@ class TimerWidget extends StatefulWidget {
}
class _TimerWidgetState extends State<TimerWidget> {
// See https://stackoverflow.com/questions/54610121/flutter-countdown-timer
Timer? _timer;
int _seconds = 1;
late DateTime _startTime;
final _maxSeconds = 600;
DateTime today = DateTime(2000, 1, 1, 0, 0, 0);
late Timer _uiTimer;
void startTimer() {
setState(() => _seconds = 0);
@override
void initState() {
super.initState();
_startTime = DateTime.now();
_timer?.cancel();
const oneSecond = Duration(seconds: 1);
_timer = Timer.periodic(oneSecond, (Timer timer) {
if (_seconds == _maxSeconds) {
setState(() => timer.cancel());
} else {
setState(() => _seconds++);
}
_uiTimer = Timer.periodic(const Duration(seconds: 1), (_) {
// ignore: no-empty-block, avoid-empty-setstate
if (mounted) setState(() {});
});
}
@override
void dispose() {
_timer?.cancel();
_uiTimer.cancel();
super.dispose();
}
@override
void initState() {
super.initState();
startTimer();
}
@override
Widget build(BuildContext context) {
final elapsed = DateTime.now().difference(_startTime).inSeconds;
final displaySeconds = elapsed > _maxSeconds ? _maxSeconds : elapsed;
final displayTime = DateTime(2000, 1, 1, 0, 0, 0).add(Duration(seconds: displaySeconds));
return Column(
children: [
NavigationHeader(
@@ -86,7 +77,7 @@ class _TimerWidgetState extends State<TimerWidget> {
Expanded(
child: Center(
child: Text(
DateFormat('m:ss').format(today.add(Duration(seconds: _seconds))),
DateFormat('m:ss').format(displayTime),
style: Theme.of(context).textTheme.displayLarge!.copyWith(color: wgerPrimaryColor),
),
),
@@ -115,40 +106,32 @@ class TimerCountdownWidget extends StatefulWidget {
}
class _TimerCountdownWidgetState extends State<TimerCountdownWidget> {
// See https://stackoverflow.com/questions/54610121/flutter-countdown-timer
late DateTime _endTime;
late Timer _uiTimer;
Timer? _timer;
late int _seconds;
DateTime today = DateTime(2000, 1, 1, 0, 0, 0);
@override
void initState() {
super.initState();
_endTime = DateTime.now().add(Duration(seconds: widget._seconds));
void startTimer() {
_timer?.cancel();
const oneSecond = Duration(seconds: 1);
_timer = Timer.periodic(oneSecond, (Timer timer) {
if (_seconds == 0) {
setState(() => timer.cancel());
} else {
setState(() => _seconds--);
}
_uiTimer = Timer.periodic(const Duration(seconds: 1), (_) {
// ignore: no-empty-block, avoid-empty-setstate
if (mounted) setState(() {});
});
}
@override
void dispose() {
_timer?.cancel();
_uiTimer.cancel();
super.dispose();
}
@override
void initState() {
super.initState();
_seconds = widget._seconds;
startTimer();
}
@override
Widget build(BuildContext context) {
final remaining = _endTime.difference(DateTime.now());
final remainingSeconds = remaining.inSeconds <= 0 ? 0 : remaining.inSeconds;
final displayTime = DateTime(2000, 1, 1, 0, 0, 0).add(Duration(seconds: remainingSeconds));
return Column(
children: [
NavigationHeader(
@@ -159,7 +142,7 @@ class _TimerCountdownWidgetState extends State<TimerCountdownWidget> {
Expanded(
child: Center(
child: Text(
DateFormat('m:ss').format(today.add(Duration(seconds: _seconds))),
DateFormat('m:ss').format(displayTime),
style: Theme.of(context).textTheme.displayLarge!.copyWith(color: wgerPrimaryColor),
),
),