Skip to content

Commit c404764

Browse files
committed
Bump version 1.8.12 - code review and tidy.
1 parent 689ea72 commit c404764

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

lib/constants/colours.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Color constants used throughout the app.
22
//
3-
// Time-stamp: <Thursday 2026-03-12 12:29:14 +1100 Graham Williams>
3+
// Time-stamp: <Thursday 2026-03-12 13:25:35 +1100 Graham Williams>
44
//
55
/// Copyright (C) 2024-2026, Togaware Pty Ltd
66
///
@@ -31,6 +31,10 @@ const appBackgroundColor = Colors.white;
3131
const appButtonColor = Colors.transparent;
3232
final appShadowColor = Colors.black.withValues(alpha: 0.05);
3333

34+
/// The color used for the button most recently pressed.
35+
36+
const appSelectedColor = Colors.blue;
37+
3438
/// The background colour of the main widget of the app.
3539
//
3640
// const background = Color(0xFFE6B276);

lib/widgets/timer.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// A countdown timer and buttons for a session.
22
//
3-
// Time-stamp: <Thursday 2026-03-12 12:28:10 +1100 Graham Williams>
3+
// Time-stamp: <Thursday 2026-03-12 13:26:16 +1100 Graham Williams>
44
//
55
/// Copyright (C) 2024-2026, Togaware Pty Ltd
66
///
@@ -398,7 +398,7 @@ circle indicates an active session.
398398
},
399399
fontWeight: FontWeight.bold,
400400
backgroundColor: startBackgroundColor,
401-
textColor: _sessionType == 'bell' ? Colors.blue : null,
401+
textColor: _sessionType == 'bell' ? appSelectedColor : null,
402402
);
403403

404404
final pauseResumeButton = AppButton(
@@ -450,7 +450,7 @@ three dings. The blue progress circle indicates an active session.
450450
onPressed: _intro,
451451
fontWeight: FontWeight.bold,
452452
backgroundColor: introBackgroundColor,
453-
textColor: _sessionType == 'intro' ? Colors.blue : null,
453+
textColor: _sessionType == 'intro' ? appSelectedColor : null,
454454
);
455455

456456
final guidedButton = AppButton(
@@ -469,12 +469,11 @@ audio may take a little time to download for the Web version.
469469
onPressed: _guided,
470470
fontWeight: FontWeight.bold,
471471
backgroundColor: guidedBackgroundColor,
472-
textColor: _sessionType == 'guided' ? Colors.blue : null,
472+
textColor: _sessionType == 'guided' ? appSelectedColor : null,
473473
);
474474

475475
////////////////////////////////////
476476
// DURATION CHOICE
477-
////////////////////////////////////
478477

479478
// 20260312 gjw The early versions used specific duration choices. From
480479
// 1.8.10 we allowed any choice between 1 and 30 minutes. So
@@ -534,10 +533,6 @@ audio may take a little time to download for the Web version.
534533
],
535534
);
536535

537-
////////////////////////////////////
538-
// RETURN
539-
////////////////////////////////////
540-
541536
final timerDisplay = AppCircularCountDownTimer(
542537
duration: _duration,
543538
controller: _controller,

0 commit comments

Comments
 (0)