From efa389fcaf97550608c3b65323b2be11ec55a4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Wed, 9 Aug 2023 19:34:25 +0200 Subject: [PATCH] Fixed holidays in past showing negative countdown --- .gitignore | 2 ++ lib/view/pages/more/holidays/holidays.dart | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 44a23da..5112d1f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ doc/api/ .flutter-plugins-dependencies *.aab + +*.idea/* \ No newline at end of file diff --git a/lib/view/pages/more/holidays/holidays.dart b/lib/view/pages/more/holidays/holidays.dart index 21fcf98..160b86d 100644 --- a/lib/view/pages/more/holidays/holidays.dart +++ b/lib/view/pages/more/holidays/holidays.dart @@ -135,10 +135,17 @@ class _HolidaysState extends State { leading: const Icon(Icons.arrow_back), title: Text("bis zum ${parseString(holiday.end)}"), ), - ListTile( - leading: const CenteredLeading(Icon(Icons.timer_outlined)), - title: AnimatedTime(callback: () => DateTime.parse(holiday.start).difference(DateTime.now())), - subtitle: Text(Jiffy.parse(holiday.start).fromNow()), + Visibility( + visible: !DateTime.parse(holiday.start).difference(DateTime.now()).isNegative, + replacement: ListTile( + leading: const CenteredLeading(Icon(Icons.content_paste_search_outlined)), + title: Text(Jiffy.parse(holiday.start).fromNow()), + ), + child: ListTile( + leading: const CenteredLeading(Icon(Icons.timer_outlined)), + title: AnimatedTime(callback: () => DateTime.parse(holiday.start).difference(DateTime.now())), + subtitle: Text(Jiffy.parse(holiday.start).fromNow()), + ), ), DebugTile(holiday.toJson()).asTile(context), ],