keep it 100

Author: notjustinshaw

coverage/lcov.info

@@ -83,7 +83,7 @@ class DebateEvent extends Event with PrepTimeMixin {
   void initSpeechController(
     TickerProvider ticker, {
     BuildContext context,
-    void Function() onSpeechEnd,
+    void Function(BuildContext) onSpeechEnd,
   }) {
     assert(ticker != null);
     assert(context != null);
@@ -92,7 +92,7 @@ class DebateEvent extends Event with PrepTimeMixin {
         ticker,
         context,
         onSpeechEnd: () {
-          onSpeechEnd?.call();
+          onSpeechEnd?.call(context);
           if (speech.useJudgeAssistant) {
             _scrollToNextPageIfSafe();
           }

lib/models/debate_event.dart

@@ -66,7 +66,7 @@ abstract class Event extends ChangeNotifier implements Timeable {
   void initSpeechController(
     TickerProvider ticker, {
     BuildContext context,
-    void Function() onSpeechEnd,
+    void Function(BuildContext) onSpeechEnd,
   });
 
   /// Disposes the resources used by this event.

lib/models/event.dart

@@ -55,8 +55,8 @@ class PrepTimeProvider extends StatelessWidget {
           value: eventController,
         ),
         ChangeNotifierProxyProvider<EventController, Event>(
-          create: (_) => getEventFromController(eventController, context),
-          update: (_, controller, __) => getEventFromController(
+          create: (context) => getEventFromController(eventController, context),
+          update: (context, controller, _) => getEventFromController(
             controller,
             context,
           ),

lib/models/provider.dart

@@ -59,7 +59,7 @@ class Speech extends ChangeNotifier implements Timeable {
     this.showTimeSignals = false,
   }) : _timer = SimpleTimer(
           length,
-          timeBetweenTicks: Duration(milliseconds: 100),
+          timeBetweenTicks: const Duration(milliseconds: 100),
           shouldCountUp: shouldCountUp,
         ) {
     if (showTimeSignals) {
@@ -111,7 +111,7 @@ class Speech extends ChangeNotifier implements Timeable {
       vsync: ticker,
       value: shouldCountUp ? 0.0 : 1.0,
     );
-    _timer.onEnd ??= () {
+    _timer.onEnd = () {
       status = SpeechStatus.completed;
       onSpeechEnd?.call();
     };

lib/models/speech.dart

@@ -34,14 +34,14 @@ class SpeechEvent extends Event {
   void initSpeechController(
     TickerProvider ticker, {
     BuildContext context,
-    void Function() onSpeechEnd,
+    void Function(BuildContext) onSpeechEnd,
   }) {
     assert(ticker != null);
     assert(context != null);
     speech.initController(
       ticker,
       context,
-      onSpeechEnd: () => onSpeechEnd?.call(),
+      onSpeechEnd: () => onSpeechEnd?.call(context),
     );
   }
 

lib/models/speech_event.dart

@@ -128,6 +128,7 @@ class _PrepTimerState extends State<PrepTimer> {
       destructiveActionLabel: 'Reset',
       cancelActionLabel: 'Cancel',
       destructiveAction: () => _debateEvent.resetPrep(widget.team),
+      cancelAction: () => null,
     );
   }
 }

lib/screens/timer/src/prep_timers/src/prep_timer.dart

@@ -34,7 +34,6 @@ class RingPainter extends StatelessWidget {
 class _CustomRingPainter extends CustomPainter {
   static const PaintingStyle _paintStrokeStyle = PaintingStyle.stroke;
   static const StrokeCap _strokeCapStyle = StrokeCap.round;
-  static const bool _timerShouldStartEmpty = false;
   static const double _width = 7.0;
 
   /// The animation object that tracks the path of the object.
@@ -84,14 +83,8 @@ class _CustomRingPainter extends CustomPainter {
   void _drawForeground(Canvas canvas, Size size, Paint paint) {
     paint.color = Theme.of(context).primaryColor;
     Rect rect = Offset.zero & size;
-    double startAngle, sweepAngle;
-    if (_timerShouldStartEmpty) {
-      startAngle = math.pi * 1.5;
-      sweepAngle = (animation.value - 1.0) * 2 * math.pi;
-    } else {
-      startAngle = math.pi * 1.5 - (1.0 - animation.value) * 2 * math.pi;
-      sweepAngle = math.pi * -0.5 - startAngle;
-    }
+    double startAngle = math.pi * 1.5 - (1.0 - animation.value) * 2 * math.pi;
+    double sweepAngle = math.pi * -0.5 - startAngle;
     canvas.drawArc(rect, startAngle, sweepAngle, false, paint);
   }
 }

lib/screens/timer/src/timer_ring/src/ring_painter.dart

@@ -51,11 +51,13 @@ class _TimerRingState extends State<TimerRing> with TickerProviderStateMixin {
   }
 
   void _initializeAllSpeechControllersInEvent(
-      Event event, BuildContext context) {
+    Event event,
+    BuildContext context,
+  ) {
     event.initSpeechController(
       this,
       context: context,
-      onSpeechEnd: () => _askIfEitherTeamWantsToUsePrep(context),
+      onSpeechEnd: _askIfEitherTeamWantsToUsePrep,
     );
   }
 
@@ -66,8 +68,9 @@ class _TimerRingState extends State<TimerRing> with TickerProviderStateMixin {
         context,
         title: 'Time\'s up!',
         content: 'Would either team like to take prep?',
-        defaultActionLabel: 'Yes',
         secondaryActionLabel: 'No',
+        defaultActionLabel: 'Yes',
+        secondaryAction: () => null,
         defaultAction: () {
           // Must present new alert asynchronously to avoid navigator pop loop.
           Timer.run(() {

lib/screens/timer/src/timer_ring/timer_ring.dart

@@ -19,36 +19,34 @@ extension stringFormatting on Duration {
   /// foo.toStringAsClock(); // 1:30.0
   /// ```
   String toStringAsClock() {
-    String oneDigitOf(int number) {
-      String numberAsSingleDigit = '';
-      if (number >= 1000 || number < 0)
-        throw ArgumentError();
-      else if (number < 100)
-        numberAsSingleDigit = "0";
-      else
-        numberAsSingleDigit = "${number ~/ 100}";
-      assert(numberAsSingleDigit.length == 1);
-      return numberAsSingleDigit;
-    }
-
-    String twoDigitsOf(int number) {
-      String numberAsTwoDigits = '';
-      if (number >= 100 || number < 0)
-        throw ArgumentError();
-      else if (number >= 10)
-        numberAsTwoDigits = "$number";
-      else
-        numberAsTwoDigits = "0$number";
-      assert(numberAsTwoDigits.length == 2);
-      return numberAsTwoDigits;
-    }
-
     int minutes = this.inMinutes.remainder(Duration.minutesPerHour);
     int seconds = this.inSeconds.remainder(Duration.secondsPerMinute);
     int ms = this.inMilliseconds.remainder(Duration.millisecondsPerSecond);
-    String mm = twoDigitsOf(minutes);
-    String ss = twoDigitsOf(seconds);
-    String m = oneDigitOf(ms);
+    String mm = _twoDigitsOf(minutes);
+    String ss = _twoDigitsOf(seconds);
+    String m = _oneDigitOf(ms);
     return "$mm:$ss.$m";
   }
+
+  String _oneDigitOf(int number) {
+    String numberAsSingleDigit = '';
+    if (number < 100) {
+      numberAsSingleDigit = "0";
+    } else {
+      numberAsSingleDigit = "${number ~/ 100}";
+    }
+    assert(numberAsSingleDigit.length == 1);
+    return numberAsSingleDigit;
+  }
+
+  String _twoDigitsOf(int number) {
+    String numberAsTwoDigits = '';
+    if (number >= 10) {
+      numberAsTwoDigits = "$number";
+    } else {
+      numberAsTwoDigits = "0$number";
+    }
+    assert(numberAsTwoDigits.length == 2);
+    return numberAsTwoDigits;
+  }
 }