From 82fe9e287a81585fafa06bee06f7bac0dc19ef63 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Mon, 23 Dec 2024 23:02:47 +0800
Subject: [PATCH] :bug: Bug fixes on special days

---
 lib/screens/home.dart | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index a8c7983..c1d8e5d 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -166,12 +166,16 @@ class _HomeDashSpecialDayWidget extends StatelessWidget {
       return Column(
           spacing: 8,
           children: days.map((ele) {
-            final (name, date) = dayz.getNextSpecialDay()!;
             return Card(
               child: ListTile(
-                leading: Text(kSpecialDaysSymbol[name] ?? '🎉').fontSize(24),
-                title: Text('celebrate$name').tr(args: [ua.user?.nick ?? 'user']),
-                subtitle: Text(date.toString()),
+                leading: Text(kSpecialDaysSymbol[ele] ?? '🎉').fontSize(24),
+                title: Text('celebrate$ele').tr(args: [ua.user?.nick ?? 'user']),
+                subtitle: Text(
+                  DateFormat('y/M/d').format(DateTime.now().copyWith(
+                    month: kSpecialDays[ele]!.$1,
+                    day: kSpecialDays[ele]!.$2,
+                  )),
+                ),
               ),
             ).padding(bottom: 8);
           }).toList());
@@ -184,7 +188,7 @@ class _HomeDashSpecialDayWidget extends StatelessWidget {
       var (name, date) = nextOne;
       date = date.add(Duration(days: 1));
       final progress = dayz.getSpecialDayProgress(lastOne.$2, date);
-      final diff = date.difference(lastOne.$2);
+      final diff = nextOne.$2.add(-const Duration(days: 1)).difference(lastOne.$2);
       return Card(
         child: ListTile(
           leading: Text(kSpecialDaysSymbol[name] ?? '🎉').fontSize(24),