From c8950c51196f9d098f0f2f8008e5f1f846c6755b Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 4 Jun 2023 14:33:46 +0200 Subject: [PATCH] minor --- lib/utils/time_utils.dart | 2 +- lib/widgets/common/basic/draggable_scrollbar/scrollbar.dart | 2 +- test/utils/time_utils_test.dart | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/utils/time_utils.dart b/lib/utils/time_utils.dart index d3d2d08a3..83a989b1b 100644 --- a/lib/utils/time_utils.dart +++ b/lib/utils/time_utils.dart @@ -52,7 +52,7 @@ DateTime? dateTimeFromMillis(int? millis, {bool isUtc = false}) { final _unixStampMillisPattern = RegExp(r'\d{13}'); final _unixStampSecPattern = RegExp(r'\d{10}'); final _dateYMD8Hms6Sub3Pattern = RegExp(r'(\d{8})([_\s-](\d{6})([_\s-](\d{3}))?)?'); -final _dateY4M2D2H2m2s2Sub3Pattern = RegExp(r'(\d{4})-(\d{1,2})-(\d{1,2})[ -](\d{1,2})[.-](\d{1,2})[.-](\d{1,2})([.-](\d{1,3})?)?'); +final _dateY4M2D2H2m2s2Sub3Pattern = RegExp(r'(\d{4})-(\d{1,2})-(\d{1,2})[_\s-](\d{1,2})[.-](\d{1,2})[.-](\d{1,2})([.-](\d{1,3})?)?'); final _dateY4M2D2Hms6Pattern = RegExp(r'(\d{4})-(\d{1,2})-(\d{1,2}) (\d{6})'); DateTime? parseUnknownDateFormat(String? s) { diff --git a/lib/widgets/common/basic/draggable_scrollbar/scrollbar.dart b/lib/widgets/common/basic/draggable_scrollbar/scrollbar.dart index 9e4bf83c9..40f91e8bc 100644 --- a/lib/widgets/common/basic/draggable_scrollbar/scrollbar.dart +++ b/lib/widgets/common/basic/draggable_scrollbar/scrollbar.dart @@ -296,7 +296,7 @@ class _DraggableScrollbarState extends State with TickerProv void _onVerticalDragUpdate(double deltaY) { _showThumb(); - if (_isDragInProcess) { + if (_isDragInProcess && thumbMinScrollExtent < thumbMaxScrollExtent) { // thumb offset _boundlessThumbOffset += deltaY; _thumbOffsetNotifier.value = _boundlessThumbOffset.clamp(thumbMinScrollExtent, thumbMaxScrollExtent); diff --git a/test/utils/time_utils_test.dart b/test/utils/time_utils_test.dart index b3b6c6b87..a16b3eed9 100644 --- a/test/utils/time_utils_test.dart +++ b/test/utils/time_utils_test.dart @@ -36,5 +36,6 @@ void main() { expect(parseUnknownDateFormat('2019-02-18 16.00.12-DCM'), DateTime(2019, 2, 18, 16, 0, 12, 0)); expect(parseUnknownDateFormat('2020-11-01 00.31.02'), DateTime(2020, 11, 1, 0, 31, 2, 0)); expect(parseUnknownDateFormat('2019-10-31 135703'), DateTime(2019, 10, 31, 13, 57, 3, 0)); + expect(parseUnknownDateFormat('Foo_2023-03-12_01-59-23.614_1920x1080'), DateTime(2023, 3, 12, 1, 59, 23, 614)); }); }