HyperNet/Surface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Bug fixes on special days

Browse Source
This commit is contained in:
LittleSheep 2024-12-23 23:02:47 +08:00
parent dc1c285de1
commit 82fe9e287a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/screens/home.dart
View File

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