From ebfc4ddc05e60c87aca7fd618880a9e487c94123 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 25 May 2025 01:14:18 -0700 Subject: [PATCH] Switch to using the new LibAC time/duration API --- lib/data.dart | 15 +++------------ pubspec.yaml | 4 ++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/lib/data.dart b/lib/data.dart index 6947538..f3e4632 100644 --- a/lib/data.dart +++ b/lib/data.dart @@ -9,6 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_background/flutter_background.dart'; import 'package:geolocator/geolocator.dart'; import 'package:libac_dart/nbt/Stream.dart'; +import 'package:libac_dart/utils/TimeUtils.dart'; import 'package:timetrack/consts.dart'; class SessionData { @@ -362,19 +363,9 @@ class SessionData { } static String Duration2Notation(Duration time) { - int days = time.inDays; - int hours = time.inHours.remainder(24); - int minutes = time.inMinutes.remainder(60); - int seconds = time.inSeconds.remainder(60); + Time tm = Time.fromDuration(time); - List parts = []; - - if (days > 0) parts.add('${days}d'); - if (hours > 0) parts.add('${hours}h'); - if (minutes > 0) parts.add('${minutes}m'); - if (seconds > 0) parts.add('${seconds}s'); - - return parts.join(' '); + return tm.toString(); } } diff --git a/pubspec.yaml b/pubspec.yaml index 01d98f1..85fa00d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,10 +36,10 @@ dependencies: cupertino_icons: ^1.0.8 libac_dart: hosted: https://git.zontreck.com/api/packages/Packages/pub/ - version: 1.4.20325+1215 + version: ^1.4.052525+0002 libacflutter: hosted: https://git.zontreck.com/api/packages/Packages/pub/ - version: 1.0.31525+0222 + version: ^1.0.052525+0051 dio: ^5.8.0+1 ota_update: ^7.0.1 geolocator: ^14.0.0