From c2a482d3ffee4e009d1dafb9cd9fa37be1103f4b Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Fri, 26 Jan 2024 15:26:45 -0500 Subject: [PATCH 1/9] Fix the countdown bug --- lib/pages/timer/timer.dart | 120 ++++++++++++--------- lib/pages/timer/widgets/next_button.dart | 28 +++++ lib/providers/break_provider.dart | 2 +- lib/providers/mob_controller_provider.dart | 4 +- lib/providers/mob_state_provider.dart | 2 +- lib/providers/timer_provider.dart | 3 + lib/providers/turns_provider.dart | 13 +-- pubspec.lock | 42 +++++--- 8 files changed, 132 insertions(+), 82 deletions(-) create mode 100644 lib/providers/timer_provider.dart diff --git a/lib/pages/timer/timer.dart b/lib/pages/timer/timer.dart index 863199b..6638709 100644 --- a/lib/pages/timer/timer.dart +++ b/lib/pages/timer/timer.dart @@ -1,12 +1,16 @@ +import 'dart:async'; + import 'package:audioplayers/audioplayers.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:mob_app/pages/timer/helpers/ticker.dart'; import 'package:mob_app/providers/break_provider.dart'; import 'package:mob_app/providers/driver_provider.dart'; import 'package:mob_app/providers/mob_controller_provider.dart'; import 'package:mob_app/providers/mob_state_provider.dart'; +import 'package:mob_app/providers/timer_provider.dart'; import 'package:mob_app/providers/turn_length_provider.dart'; +import 'package:mob_app/providers/turns_provider.dart'; import 'widgets/appbar_factory.dart'; import 'widgets/break_button.dart'; @@ -23,36 +27,52 @@ class TimerPage extends ConsumerStatefulWidget { } class _TimerPageState extends ConsumerState { - late final _ticker = Ticker( - onTick: _update, - onStop: _playAlarm, - ); - - @override - void initState() { - super.initState(); - _start(); - } + late Timer _ticker = Timer.periodic(const Duration(seconds: 1), (timer) { + timer.cancel(); + }); - @override - void dispose() { - _ticker.stop(); - super.dispose(); - } + void _start({int? seconds}) { + ref.read(timerProvider.notifier).state = + seconds ?? ref.read(turnLengthProvider); - void _update() { - setState(() {}); - } + setState(() { + _ticker = Timer.periodic( + const Duration(seconds: 1), + (timer) { + ref.read(timerProvider.notifier).state -= 1; - void _start({int? seconds}) { - setState(() => _ticker.start(seconds ?? ref.read(turnLengthProvider))); + if (ref.read(timerProvider) == 0) { + _playAlarm(); + _stop(); + } + }, + ); + }); } void _stop() { - setState(() => _ticker.stop()); + setState(() => _ticker.cancel()); + + if (ref.read(mobStateProvider) == MobState.onBreak) { + ref.read(mobControllerProvider).reset(); + } else { + ref.read(turnsProvider.notifier).state += 1; + } + + final timeToBreak = ref.watch(breakProvider); + if (timeToBreak) { + ref.read(mobStateProvider.notifier).update(MobState.timeToBreak); + return; + } + + ref.read(mobStateProvider.notifier).update(MobState.waiting); } void _playAlarm() async { + if (kDebugMode) { + return; + } + await widget.audioPlayer.play( UrlSource('sounds/alarm.mp3'), volume: 1.0, @@ -61,7 +81,6 @@ class _TimerPageState extends ConsumerState { @override Widget build(BuildContext context) { - final timeToBreak = ref.watch(breakProvider); final mobState = ref.watch(mobStateProvider); final driver = ref.watch(driverProvider); final navigator = ref.watch(navigatorProvider); @@ -78,33 +97,35 @@ class _TimerPageState extends ConsumerState { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - TimerDisplay(seconds: _ticker.secondsRemaining), + TimerDisplay(seconds: ref.watch(timerProvider)), const SizedBox(height: 16), - _ticker.isActive - ? Text( - title, - textAlign: TextAlign.center, - style: const TextStyle(fontSize: 36), - ) - : timeToBreak - ? BreakButton( - onPressed: () { - ref - .read(mobStateProvider.notifier) - .update(MobState.onBreak); - _start(seconds: 600); - }, - ) - : NextButton( - labelText: navigator.name, - onPressed: () { - ref - .read(mobStateProvider.notifier) - .update(MobState.mobbing); - ref.read(driverIndexProvider.notifier).next(); - _start(); - }, - ), + if (mobState == MobState.initialLoad) + StartButton(onPressed: () { + ref.read(mobStateProvider.notifier).update(MobState.mobbing); + _start(); + }), + if (mobState == MobState.mobbing || mobState == MobState.onBreak) + Text( + title, + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 36), + ), + if (mobState == MobState.timeToBreak) + BreakButton( + onPressed: () { + ref.read(mobStateProvider.notifier).update(MobState.onBreak); + _start(seconds: 600); + }, + ), + if (mobState == MobState.waiting) + NextButton( + labelText: navigator.name, + onPressed: () { + ref.read(mobStateProvider.notifier).update(MobState.mobbing); + ref.read(driverIndexProvider.notifier).next(); + _start(); + }, + ), ], ), ), @@ -113,7 +134,6 @@ class _TimerPageState extends ConsumerState { child: FloatingActionButton( onPressed: () { _stop(); - ref.read(mobStateProvider.notifier).update(MobState.waiting); }, backgroundColor: Colors.amber, child: const Icon( diff --git a/lib/pages/timer/widgets/next_button.dart b/lib/pages/timer/widgets/next_button.dart index 5d276b7..7c440f3 100644 --- a/lib/pages/timer/widgets/next_button.dart +++ b/lib/pages/timer/widgets/next_button.dart @@ -29,3 +29,31 @@ class NextButton extends StatelessWidget { ); } } + +class StartButton extends StatelessWidget { + const StartButton({ + super.key, + required this.onPressed, + }); + + final Function() onPressed; + + @override + Widget build(BuildContext context) { + return ElevatedButton.icon( + onPressed: onPressed, + icon: const Icon( + Icons.play_arrow, + size: 36, + ), + label: const Padding( + padding: EdgeInsets.fromLTRB(8, 0, 8, 0), + child: Text( + 'Start', + style: TextStyle(fontSize: 36), + ), + ), + style: ElevatedButton.styleFrom(shape: const StadiumBorder()), + ); + } +} diff --git a/lib/providers/break_provider.dart b/lib/providers/break_provider.dart index bfbf7f2..1e760fd 100644 --- a/lib/providers/break_provider.dart +++ b/lib/providers/break_provider.dart @@ -2,7 +2,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mob_app/providers/turn_length_provider.dart'; import 'package:mob_app/providers/turns_provider.dart'; -const int fortyFiveMinutes = 2700; +const int fortyFiveMinutes = 10; final breakProvider = Provider((ref) { final turns = ref.watch(turnsProvider); diff --git a/lib/providers/mob_controller_provider.dart b/lib/providers/mob_controller_provider.dart index 52b4636..25d9edc 100644 --- a/lib/providers/mob_controller_provider.dart +++ b/lib/providers/mob_controller_provider.dart @@ -6,8 +6,10 @@ import 'package:mob_app/providers/turns_provider.dart'; const int fortyFiveMinutes = 2700; enum MobState { + initialLoad, mobbing, waiting, + timeToBreak, onBreak, } @@ -17,7 +19,7 @@ class MobController { final Ref ref; void reset() { - ref.read(turnsProvider.notifier).reset(); + ref.read(turnsProvider.notifier).state = 0; ref.read(driverIndexProvider.notifier).reset(); ref.read(mobStateProvider.notifier).update(MobState.waiting); } diff --git a/lib/providers/mob_state_provider.dart b/lib/providers/mob_state_provider.dart index 0ffb420..2762f3d 100644 --- a/lib/providers/mob_state_provider.dart +++ b/lib/providers/mob_state_provider.dart @@ -4,7 +4,7 @@ import 'package:mob_app/providers/mob_controller_provider.dart'; class MobStateNotifier extends Notifier { @override MobState build() { - return MobState.waiting; + return MobState.initialLoad; } void update(MobState newState) { diff --git a/lib/providers/timer_provider.dart b/lib/providers/timer_provider.dart new file mode 100644 index 0000000..6707c57 --- /dev/null +++ b/lib/providers/timer_provider.dart @@ -0,0 +1,3 @@ +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +final timerProvider = StateProvider((ref) => 0); diff --git a/lib/providers/turns_provider.dart b/lib/providers/turns_provider.dart index 1a13d4c..22f5402 100644 --- a/lib/providers/turns_provider.dart +++ b/lib/providers/turns_provider.dart @@ -1,14 +1,3 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; -class TurnsNotifier extends Notifier { - @override - int build() { - return 0; - } - - void reset() { - state = 0; - } -} - -final turnsProvider = NotifierProvider(TurnsNotifier.new); +final turnsProvider = StateProvider((ref) => 0); diff --git a/pubspec.lock b/pubspec.lock index a2274cc..cf7eb90 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -221,10 +221,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" convert: dependency: transitive description: @@ -452,26 +452,26 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -665,18 +665,18 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" state_notifier: dependency: transitive description: @@ -689,10 +689,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -729,10 +729,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -781,6 +781,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -814,5 +822,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0" From 574d886c71349f68bdcb7f3d3011999c46e7003a Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Fri, 26 Jan 2024 16:00:49 -0500 Subject: [PATCH 2/9] Move logic to controller, pause on exit --- lib/pages/timer/timer.dart | 57 ++------------------- lib/pages/timer/widgets/appbar_factory.dart | 9 +++- lib/pages/timer/widgets/end_mob_alert.dart | 9 +++- lib/providers/mob_controller_provider.dart | 51 +++++++++++++++++- lib/providers/timer_provider.dart | 21 ++++++++ 5 files changed, 89 insertions(+), 58 deletions(-) diff --git a/lib/pages/timer/timer.dart b/lib/pages/timer/timer.dart index 6638709..4d7d589 100644 --- a/lib/pages/timer/timer.dart +++ b/lib/pages/timer/timer.dart @@ -1,16 +1,10 @@ -import 'dart:async'; - -import 'package:audioplayers/audioplayers.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:mob_app/providers/break_provider.dart'; import 'package:mob_app/providers/driver_provider.dart'; import 'package:mob_app/providers/mob_controller_provider.dart'; import 'package:mob_app/providers/mob_state_provider.dart'; import 'package:mob_app/providers/timer_provider.dart'; import 'package:mob_app/providers/turn_length_provider.dart'; -import 'package:mob_app/providers/turns_provider.dart'; import 'widgets/appbar_factory.dart'; import 'widgets/break_button.dart'; @@ -18,65 +12,22 @@ import 'widgets/display.dart'; import 'widgets/next_button.dart'; class TimerPage extends ConsumerStatefulWidget { - TimerPage({super.key}); - - final AudioPlayer audioPlayer = AudioPlayer(playerId: '#timer'); + const TimerPage({super.key}); @override ConsumerState createState() => _TimerPageState(); } class _TimerPageState extends ConsumerState { - late Timer _ticker = Timer.periodic(const Duration(seconds: 1), (timer) { - timer.cancel(); - }); - void _start({int? seconds}) { ref.read(timerProvider.notifier).state = seconds ?? ref.read(turnLengthProvider); - setState(() { - _ticker = Timer.periodic( - const Duration(seconds: 1), - (timer) { - ref.read(timerProvider.notifier).state -= 1; - - if (ref.read(timerProvider) == 0) { - _playAlarm(); - _stop(); - } - }, - ); - }); + ref.read(mobControllerProvider).resume(); } void _stop() { - setState(() => _ticker.cancel()); - - if (ref.read(mobStateProvider) == MobState.onBreak) { - ref.read(mobControllerProvider).reset(); - } else { - ref.read(turnsProvider.notifier).state += 1; - } - - final timeToBreak = ref.watch(breakProvider); - if (timeToBreak) { - ref.read(mobStateProvider.notifier).update(MobState.timeToBreak); - return; - } - - ref.read(mobStateProvider.notifier).update(MobState.waiting); - } - - void _playAlarm() async { - if (kDebugMode) { - return; - } - - await widget.audioPlayer.play( - UrlSource('sounds/alarm.mp3'), - volume: 1.0, - ); + ref.read(mobControllerProvider).endTurn(); } @override @@ -130,7 +81,7 @@ class _TimerPageState extends ConsumerState { ), ), floatingActionButton: Visibility( - visible: _ticker.isActive, + visible: ref.watch(newTimerProvider).isActive, child: FloatingActionButton( onPressed: () { _stop(); diff --git a/lib/pages/timer/widgets/appbar_factory.dart b/lib/pages/timer/widgets/appbar_factory.dart index 6bd08e2..73d9a9c 100644 --- a/lib/pages/timer/widgets/appbar_factory.dart +++ b/lib/pages/timer/widgets/appbar_factory.dart @@ -13,12 +13,19 @@ class AppBarFactory { elevation: 0, leading: IconButton( onPressed: () { - controller.reset(); + controller.pause(); + showDialog( context: context, builder: (context) { return EndMobAlertDialog( + onCancel: () { + Navigator.of(context).pop(); + controller.resume(); + }, onConfirm: () { + controller.reset(); + Navigator.of(context).pop(); Navigator.of(context).pop(MaterialPageRoute( builder: (_) => const SetupPage(), diff --git a/lib/pages/timer/widgets/end_mob_alert.dart b/lib/pages/timer/widgets/end_mob_alert.dart index 6a9c28e..f8a9ad0 100644 --- a/lib/pages/timer/widgets/end_mob_alert.dart +++ b/lib/pages/timer/widgets/end_mob_alert.dart @@ -1,8 +1,13 @@ import 'package:flutter/material.dart'; class EndMobAlertDialog extends StatelessWidget { - const EndMobAlertDialog({super.key, required this.onConfirm}); + const EndMobAlertDialog({ + super.key, + required this.onCancel, + required this.onConfirm, + }); + final Function() onCancel; final Function() onConfirm; @override @@ -14,7 +19,7 @@ class EndMobAlertDialog extends StatelessWidget { ), actions: [ TextButton( - onPressed: () => Navigator.of(context).pop(), + onPressed: onCancel, style: TextButton.styleFrom(foregroundColor: Colors.grey.shade200), child: const Text( 'Cancel', diff --git a/lib/providers/mob_controller_provider.dart b/lib/providers/mob_controller_provider.dart index 25d9edc..f3654f5 100644 --- a/lib/providers/mob_controller_provider.dart +++ b/lib/providers/mob_controller_provider.dart @@ -1,8 +1,13 @@ +import 'package:audioplayers/audioplayers.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mob_app/providers/driver_provider.dart'; import 'package:mob_app/providers/mob_state_provider.dart'; +import 'package:mob_app/providers/timer_provider.dart'; import 'package:mob_app/providers/turns_provider.dart'; +import 'break_provider.dart'; + const int fortyFiveMinutes = 2700; enum MobState { @@ -14,14 +19,56 @@ enum MobState { } class MobController { - const MobController(this.ref); + MobController(this.ref); final Ref ref; + final AudioPlayer audioPlayer = AudioPlayer(playerId: '#timer'); + + void _playAlarm() async { + if (kDebugMode) { + return; + } + + await audioPlayer.play( + UrlSource('sounds/alarm.mp3'), + volume: 1.0, + ); + } + + void pause() { + ref.read(newTimerProvider).cancel(); + } + + void resume() { + ref.read(newTimerProvider.notifier).state = getTimer(ref, () { + _playAlarm(); + endTurn(); + }); + } + + void endTurn() { + ref.read(newTimerProvider).cancel(); + + if (ref.read(mobStateProvider) == MobState.onBreak) { + reset(); + } else { + ref.read(turnsProvider.notifier).state += 1; + } + + final timeToBreak = ref.read(breakProvider); + if (timeToBreak) { + ref.read(mobStateProvider.notifier).update(MobState.timeToBreak); + return; + } + + ref.read(mobStateProvider.notifier).update(MobState.waiting); + } + void reset() { ref.read(turnsProvider.notifier).state = 0; ref.read(driverIndexProvider.notifier).reset(); - ref.read(mobStateProvider.notifier).update(MobState.waiting); + ref.read(mobStateProvider.notifier).update(MobState.initialLoad); } } diff --git a/lib/providers/timer_provider.dart b/lib/providers/timer_provider.dart index 6707c57..a1035e6 100644 --- a/lib/providers/timer_provider.dart +++ b/lib/providers/timer_provider.dart @@ -1,3 +1,24 @@ +import 'dart:async'; + import 'package:flutter_riverpod/flutter_riverpod.dart'; final timerProvider = StateProvider((ref) => 0); + +final newTimerProvider = StateProvider((ref) { + return Timer.periodic(const Duration(seconds: 1), (timer) { + timer.cancel(); + }); +}); + +Timer getTimer(Ref ref, Function() onStop) { + return Timer.periodic( + const Duration(seconds: 1), + (timer) { + ref.read(timerProvider.notifier).state -= 1; + + if (ref.read(timerProvider) == 0) { + onStop(); + } + }, + ); +} From 87098612e2ce7e57887e01f29658b934cd8d07ba Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Mon, 29 Jan 2024 09:51:27 -0500 Subject: [PATCH 3/9] Remove remaining logic from timer page --- lib/common/alarm.dart | 17 ++++++++++ lib/pages/timer/timer.dart | 38 +++++----------------- lib/providers/mob_controller_provider.dart | 30 ++++++++++------- 3 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 lib/common/alarm.dart diff --git a/lib/common/alarm.dart b/lib/common/alarm.dart new file mode 100644 index 0000000..610dba4 --- /dev/null +++ b/lib/common/alarm.dart @@ -0,0 +1,17 @@ +import 'package:audioplayers/audioplayers.dart'; +import 'package:flutter/foundation.dart'; + +class Alarm { + static final AudioPlayer audioPlayer = AudioPlayer(playerId: '#alarm'); + + void play() async { + if (kDebugMode) { + return; + } + + await audioPlayer.play( + UrlSource('sounds/alarm.mp3'), + volume: 1.0, + ); + } +} diff --git a/lib/pages/timer/timer.dart b/lib/pages/timer/timer.dart index 4d7d589..dab168b 100644 --- a/lib/pages/timer/timer.dart +++ b/lib/pages/timer/timer.dart @@ -4,7 +4,6 @@ import 'package:mob_app/providers/driver_provider.dart'; import 'package:mob_app/providers/mob_controller_provider.dart'; import 'package:mob_app/providers/mob_state_provider.dart'; import 'package:mob_app/providers/timer_provider.dart'; -import 'package:mob_app/providers/turn_length_provider.dart'; import 'widgets/appbar_factory.dart'; import 'widgets/break_button.dart'; @@ -19,28 +18,19 @@ class TimerPage extends ConsumerStatefulWidget { } class _TimerPageState extends ConsumerState { - void _start({int? seconds}) { - ref.read(timerProvider.notifier).state = - seconds ?? ref.read(turnLengthProvider); - - ref.read(mobControllerProvider).resume(); - } - - void _stop() { - ref.read(mobControllerProvider).endTurn(); - } - @override Widget build(BuildContext context) { + final controller = ref.read(mobControllerProvider); final mobState = ref.watch(mobStateProvider); final driver = ref.watch(driverProvider); final navigator = ref.watch(navigatorProvider); + String title = mobState == MobState.onBreak ? 'Break' : driver.name; return Scaffold( appBar: AppBarFactory.build( context: context, - controller: ref.read(mobControllerProvider), + controller: controller, ), body: Center( child: Column( @@ -51,10 +41,9 @@ class _TimerPageState extends ConsumerState { TimerDisplay(seconds: ref.watch(timerProvider)), const SizedBox(height: 16), if (mobState == MobState.initialLoad) - StartButton(onPressed: () { - ref.read(mobStateProvider.notifier).update(MobState.mobbing); - _start(); - }), + StartButton( + onPressed: () => controller.start(), + ), if (mobState == MobState.mobbing || mobState == MobState.onBreak) Text( title, @@ -63,19 +52,12 @@ class _TimerPageState extends ConsumerState { ), if (mobState == MobState.timeToBreak) BreakButton( - onPressed: () { - ref.read(mobStateProvider.notifier).update(MobState.onBreak); - _start(seconds: 600); - }, + onPressed: () => controller.startBreak(), ), if (mobState == MobState.waiting) NextButton( labelText: navigator.name, - onPressed: () { - ref.read(mobStateProvider.notifier).update(MobState.mobbing); - ref.read(driverIndexProvider.notifier).next(); - _start(); - }, + onPressed: () => controller.startNextTurn(), ), ], ), @@ -83,9 +65,7 @@ class _TimerPageState extends ConsumerState { floatingActionButton: Visibility( visible: ref.watch(newTimerProvider).isActive, child: FloatingActionButton( - onPressed: () { - _stop(); - }, + onPressed: () => controller.endTurn(), backgroundColor: Colors.amber, child: const Icon( Icons.skip_next_rounded, diff --git a/lib/providers/mob_controller_provider.dart b/lib/providers/mob_controller_provider.dart index f3654f5..739c88c 100644 --- a/lib/providers/mob_controller_provider.dart +++ b/lib/providers/mob_controller_provider.dart @@ -1,12 +1,12 @@ -import 'package:audioplayers/audioplayers.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:mob_app/common/alarm.dart'; import 'package:mob_app/providers/driver_provider.dart'; import 'package:mob_app/providers/mob_state_provider.dart'; import 'package:mob_app/providers/timer_provider.dart'; import 'package:mob_app/providers/turns_provider.dart'; import 'break_provider.dart'; +import 'turn_length_provider.dart'; const int fortyFiveMinutes = 2700; @@ -23,17 +23,23 @@ class MobController { final Ref ref; - final AudioPlayer audioPlayer = AudioPlayer(playerId: '#timer'); + final _alarm = Alarm(); - void _playAlarm() async { - if (kDebugMode) { - return; - } + void start() { + ref.read(mobStateProvider.notifier).update(MobState.mobbing); + ref.read(timerProvider.notifier).state = ref.read(turnLengthProvider); + resume(); + } + + void startNextTurn() { + ref.read(driverIndexProvider.notifier).next(); + start(); + } - await audioPlayer.play( - UrlSource('sounds/alarm.mp3'), - volume: 1.0, - ); + void startBreak() { + ref.read(mobStateProvider.notifier).update(MobState.onBreak); + ref.read(timerProvider.notifier).state = 600; + resume(); } void pause() { @@ -42,7 +48,7 @@ class MobController { void resume() { ref.read(newTimerProvider.notifier).state = getTimer(ref, () { - _playAlarm(); + _alarm.play(); endTurn(); }); } From e5d9454bed4f8f42efa71b4845a9f306cb12ba9d Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Mon, 29 Jan 2024 09:59:36 -0500 Subject: [PATCH 4/9] Allow skipping turns when waiting --- lib/pages/timer/timer.dart | 10 ++++++++-- lib/providers/mob_controller_provider.dart | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/pages/timer/timer.dart b/lib/pages/timer/timer.dart index dab168b..31f7524 100644 --- a/lib/pages/timer/timer.dart +++ b/lib/pages/timer/timer.dart @@ -63,9 +63,15 @@ class _TimerPageState extends ConsumerState { ), ), floatingActionButton: Visibility( - visible: ref.watch(newTimerProvider).isActive, + visible: controller.isTurnSkipppable, child: FloatingActionButton( - onPressed: () => controller.endTurn(), + onPressed: () { + if (mobState == MobState.mobbing) { + controller.endTurn(); + } else { + controller.skipTurn(); + } + }, backgroundColor: Colors.amber, child: const Icon( Icons.skip_next_rounded, diff --git a/lib/providers/mob_controller_provider.dart b/lib/providers/mob_controller_provider.dart index 739c88c..06639cb 100644 --- a/lib/providers/mob_controller_provider.dart +++ b/lib/providers/mob_controller_provider.dart @@ -25,6 +25,13 @@ class MobController { final _alarm = Alarm(); + bool get isTurnSkipppable { + final state = ref.read(mobStateProvider); + return state == MobState.mobbing || + state == MobState.onBreak || + state == MobState.waiting; + } + void start() { ref.read(mobStateProvider.notifier).update(MobState.mobbing); ref.read(timerProvider.notifier).state = ref.read(turnLengthProvider); @@ -42,6 +49,10 @@ class MobController { resume(); } + void skipTurn() { + ref.read(driverIndexProvider.notifier).next(); + } + void pause() { ref.read(newTimerProvider).cancel(); } From 58227c83d8b6fd9cf2f3558939382922a06a98f4 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Mon, 29 Jan 2024 10:20:26 -0500 Subject: [PATCH 5/9] Remove explicit bg color from FAB --- lib/pages/timer/timer.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/pages/timer/timer.dart b/lib/pages/timer/timer.dart index 31f7524..04bd99b 100644 --- a/lib/pages/timer/timer.dart +++ b/lib/pages/timer/timer.dart @@ -72,7 +72,6 @@ class _TimerPageState extends ConsumerState { controller.skipTurn(); } }, - backgroundColor: Colors.amber, child: const Icon( Icons.skip_next_rounded, size: 36, From 62e24e1f8be6c8c09d641c848bcd0ef9e2e9b01b Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Wed, 31 Jan 2024 09:39:39 -0500 Subject: [PATCH 6/9] Rename providers, fix skipping when on break --- lib/pages/timer/timer.dart | 19 +++++++------------ lib/providers/mob_controller_provider.dart | 12 ++++++------ lib/providers/timer_provider.dart | 8 ++++---- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/lib/pages/timer/timer.dart b/lib/pages/timer/timer.dart index 04bd99b..aed7786 100644 --- a/lib/pages/timer/timer.dart +++ b/lib/pages/timer/timer.dart @@ -10,16 +10,11 @@ import 'widgets/break_button.dart'; import 'widgets/display.dart'; import 'widgets/next_button.dart'; -class TimerPage extends ConsumerStatefulWidget { +class TimerPage extends ConsumerWidget { const TimerPage({super.key}); @override - ConsumerState createState() => _TimerPageState(); -} - -class _TimerPageState extends ConsumerState { - @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final controller = ref.read(mobControllerProvider); final mobState = ref.watch(mobStateProvider); final driver = ref.watch(driverProvider); @@ -38,7 +33,7 @@ class _TimerPageState extends ConsumerState { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - TimerDisplay(seconds: ref.watch(timerProvider)), + TimerDisplay(seconds: ref.watch(secondsProvider)), const SizedBox(height: 16), if (mobState == MobState.initialLoad) StartButton( @@ -63,13 +58,13 @@ class _TimerPageState extends ConsumerState { ), ), floatingActionButton: Visibility( - visible: controller.isTurnSkipppable, + visible: controller.isTurnSkippable, child: FloatingActionButton( onPressed: () { - if (mobState == MobState.mobbing) { - controller.endTurn(); - } else { + if (mobState == MobState.waiting) { controller.skipTurn(); + } else { + controller.endTurn(); } }, child: const Icon( diff --git a/lib/providers/mob_controller_provider.dart b/lib/providers/mob_controller_provider.dart index 06639cb..15d7488 100644 --- a/lib/providers/mob_controller_provider.dart +++ b/lib/providers/mob_controller_provider.dart @@ -25,7 +25,7 @@ class MobController { final _alarm = Alarm(); - bool get isTurnSkipppable { + bool get isTurnSkippable { final state = ref.read(mobStateProvider); return state == MobState.mobbing || state == MobState.onBreak || @@ -34,7 +34,7 @@ class MobController { void start() { ref.read(mobStateProvider.notifier).update(MobState.mobbing); - ref.read(timerProvider.notifier).state = ref.read(turnLengthProvider); + ref.read(secondsProvider.notifier).state = ref.read(turnLengthProvider); resume(); } @@ -45,7 +45,7 @@ class MobController { void startBreak() { ref.read(mobStateProvider.notifier).update(MobState.onBreak); - ref.read(timerProvider.notifier).state = 600; + ref.read(secondsProvider.notifier).state = 600; resume(); } @@ -54,18 +54,18 @@ class MobController { } void pause() { - ref.read(newTimerProvider).cancel(); + ref.read(timerProvider).cancel(); } void resume() { - ref.read(newTimerProvider.notifier).state = getTimer(ref, () { + ref.read(timerProvider.notifier).state = getTimer(ref, () { _alarm.play(); endTurn(); }); } void endTurn() { - ref.read(newTimerProvider).cancel(); + ref.read(timerProvider).cancel(); if (ref.read(mobStateProvider) == MobState.onBreak) { reset(); diff --git a/lib/providers/timer_provider.dart b/lib/providers/timer_provider.dart index a1035e6..bc9f1b5 100644 --- a/lib/providers/timer_provider.dart +++ b/lib/providers/timer_provider.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -final timerProvider = StateProvider((ref) => 0); +final secondsProvider = StateProvider((ref) => 0); -final newTimerProvider = StateProvider((ref) { +final timerProvider = StateProvider((ref) { return Timer.periodic(const Duration(seconds: 1), (timer) { timer.cancel(); }); @@ -14,9 +14,9 @@ Timer getTimer(Ref ref, Function() onStop) { return Timer.periodic( const Duration(seconds: 1), (timer) { - ref.read(timerProvider.notifier).state -= 1; + ref.read(secondsProvider.notifier).state -= 1; - if (ref.read(timerProvider) == 0) { + if (ref.read(secondsProvider) == 0) { onStop(); } }, From 25a8398c1150d434200736108c96fb30a732c7ce Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Thu, 8 Feb 2024 15:17:49 -0500 Subject: [PATCH 7/9] Revert change to break length --- lib/providers/break_provider.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/providers/break_provider.dart b/lib/providers/break_provider.dart index 1e760fd..bfbf7f2 100644 --- a/lib/providers/break_provider.dart +++ b/lib/providers/break_provider.dart @@ -2,7 +2,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mob_app/providers/turn_length_provider.dart'; import 'package:mob_app/providers/turns_provider.dart'; -const int fortyFiveMinutes = 10; +const int fortyFiveMinutes = 2700; final breakProvider = Provider((ref) { final turns = ref.watch(turnsProvider); From a89a0799f9ce5c40bdb527a2842ce22fdd96a003 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Thu, 8 Feb 2024 15:20:20 -0500 Subject: [PATCH 8/9] Bump version to 1.2 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 4a7bc38..b6a6160 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.1.0 +version: 1.2.0 environment: sdk: '>=2.18.2 <3.0.0' From a2796e547e1a3abf35d5101ed6e451d85ad6dd96 Mon Sep 17 00:00:00 2001 From: Dillon Fagan Date: Thu, 8 Feb 2024 15:44:14 -0500 Subject: [PATCH 9/9] Prevent negative countdowns when resuming from InitialLoad or Waiting states --- lib/providers/mob_controller_provider.dart | 4 ++++ lib/providers/timer_provider.dart | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/providers/mob_controller_provider.dart b/lib/providers/mob_controller_provider.dart index 15d7488..4b49d6f 100644 --- a/lib/providers/mob_controller_provider.dart +++ b/lib/providers/mob_controller_provider.dart @@ -58,6 +58,10 @@ class MobController { } void resume() { + if (ref.read(mobStateProvider) == MobState.initialLoad) { + return; + } + ref.read(timerProvider.notifier).state = getTimer(ref, () { _alarm.play(); endTurn(); diff --git a/lib/providers/timer_provider.dart b/lib/providers/timer_provider.dart index bc9f1b5..fbf56b7 100644 --- a/lib/providers/timer_provider.dart +++ b/lib/providers/timer_provider.dart @@ -14,11 +14,12 @@ Timer getTimer(Ref ref, Function() onStop) { return Timer.periodic( const Duration(seconds: 1), (timer) { - ref.read(secondsProvider.notifier).state -= 1; - - if (ref.read(secondsProvider) == 0) { + if (ref.read(secondsProvider) <= 0) { onStop(); + return; } + + ref.read(secondsProvider.notifier).state -= 1; }, ); }