Refine: Enforce timer display constraints (seconds require minutes)
This commit is contained in:
@@ -475,10 +475,13 @@ class _PadTrackerScreenState extends ConsumerState<PadTrackerScreen> {
|
||||
final minutes = d.inMinutes % 60;
|
||||
final seconds = d.inSeconds % 60;
|
||||
|
||||
final bool showMins = user.showPadTimerMinutes;
|
||||
final bool showSecs = user.showPadTimerSeconds && showMins; // Enforce minutes must be shown to show seconds
|
||||
|
||||
List<String> parts = [];
|
||||
if (hours > 0) parts.add('${hours}h');
|
||||
if (user.showPadTimerMinutes) parts.add('${minutes}m');
|
||||
if (user.showPadTimerSeconds) parts.add('${seconds}s');
|
||||
if (showMins) parts.add('${minutes}m');
|
||||
if (showSecs) parts.add('${seconds}s');
|
||||
|
||||
if (parts.isEmpty) {
|
||||
if (hours == 0 && minutes == 0 && seconds == 0) return 'Just now';
|
||||
@@ -495,12 +498,15 @@ class _PadTrackerScreenState extends ConsumerState<PadTrackerScreen> {
|
||||
final minutes = absRemaining.inMinutes % 60;
|
||||
final seconds = absRemaining.inSeconds % 60;
|
||||
|
||||
final bool showMins = user.showPadTimerMinutes;
|
||||
final bool showSecs = user.showPadTimerSeconds && showMins; // Enforce minutes must be shown to show seconds
|
||||
|
||||
List<String> parts = [];
|
||||
if (hours > 0) parts.add('${hours}h');
|
||||
if (user.showPadTimerMinutes) {
|
||||
if (showMins) {
|
||||
parts.add('${minutes}m');
|
||||
}
|
||||
if (user.showPadTimerSeconds) {
|
||||
if (showSecs) {
|
||||
parts.add('${seconds}s');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user