feat:更新主题色兼容

lib/layout/app_drawer.dart

@@ -3,10 +3,15 @@ import 'package:flisp_app/utils/theme_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class AppDrawer extends StatelessWidget {
+class AppDrawer extends StatefulWidget {
   const AppDrawer({super.key});
 
-  DrawerHeader _buildDrawerHeader(BuildContext context) {
+  @override
+  State<AppDrawer> createState() => AppDrawerState();
+}
+
+class AppDrawerState extends State<AppDrawer> {
+  DrawerHeader _buildDrawerHeader() {
     return DrawerHeader(
       decoration: BoxDecoration(color: Theme.of(context).colorScheme.primary),
       child: Column(
@@ -39,7 +44,7 @@ class AppDrawer extends StatelessWidget {
     );
   }
 
-  Widget _buildDarkModeSection(BuildContext context, AppProvider appProvider) {
+  Widget _buildDarkModeSection(AppProvider appProvider) {
     return ListTile(
       leading: Icon(
         appProvider.isDarkMode ? Icons.dark_mode : Icons.light_mode,
@@ -58,7 +63,7 @@ class AppDrawer extends StatelessWidget {
     );
   }
 
-  Widget _buildThemeSection(BuildContext context, AppProvider appProvider) {
+  Widget _buildThemeSection(AppProvider appProvider) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -66,7 +71,7 @@ class AppDrawer extends StatelessWidget {
           padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
           child: Text('主题颜色', style: Theme.of(context).textTheme.titleMedium),
         ),
-        _buildDarkModeSection(context, appProvider),
+        _buildDarkModeSection(appProvider),
         buildThemeColorList(context, appProvider),
       ],
     );
@@ -74,7 +79,6 @@ class AppDrawer extends StatelessWidget {
 
   // 构建抽屉菜单项
   Widget _buildDrawerItem({
-    required BuildContext context,
     required IconData icon,
     required String title,
     required VoidCallback onTap,
@@ -118,11 +122,10 @@ class AppDrawer extends StatelessWidget {
             child: ListView(
               padding: EdgeInsets.zero,
               children: [
-                _buildDrawerHeader(context),
+                _buildDrawerHeader(),
-                _buildThemeSection(context, appProvider),
+                _buildThemeSection(appProvider),
                 const Divider(),
                 _buildDrawerItem(
-                  context: context,
                   icon: Icons.help,
                   title: '帮助与反馈',
                   onTap: () {
@@ -136,7 +139,7 @@ class AppDrawer extends StatelessWidget {
           _buildVersionInfo(
             context: context,
             fullVersion: appProvider.fullVersion,
-          )
+          ),
         ],
       ),
     );

lib/layout/main_screen.dart

@@ -42,7 +42,11 @@ class _MainScreenState extends State<MainScreen> {
       TodoSortMode.priority,
     );
     final List<Todo> todayTodos =
-        todoResult.where((todo) => isToday(todo.scheduledTime)).toList();
+        todoResult
+            .where(
+              (todo) => !todo.isCompleted && isAfterToday(todo.scheduledTime),
+            )
+            .toList();
 
     for (Todo todo in todayTodos) {
       await notifyService.scheduleNotification(
@@ -57,7 +61,7 @@ class _MainScreenState extends State<MainScreen> {
     final List<Calendar> calendarResult = calendarService.getAllCalendars();
     final List<Calendar> todayCalendars =
         calendarResult
-            .where((calendar) => isToday(calendar.scheduledTime))
+            .where((item) => isAfterToday(item.scheduledTime))
             .toList();
 
     for (Calendar calendar in todayCalendars) {

lib/pages/todo_page.dart

@@ -86,7 +86,7 @@ class TodoPageState extends State<TodoPage> {
         ),
         ButtonSegment<TodoSortMode>(
           value: TodoSortMode.priority,
-          icon: Icon(Icons.flag_outlined, size: 16,),
+          icon: Icon(Icons.flag_outlined, size: 16),
           label: const Text('优先级', style: TextStyle(fontSize: 12)),
         ),
       ],
@@ -123,6 +123,8 @@ class TodoPageState extends State<TodoPage> {
 
   // 切换待办事项完成状态
   void _toggleTodo(Todo todo) async {
+    final bool? result = await showConfirmDialog(context, '确定已完成该待办吗？');
+    if (result == true) {
       await notifyService.cancelNotification(todo.id);
 
       setState(() {
@@ -131,6 +133,7 @@ class TodoPageState extends State<TodoPage> {
         todoService.updateTodo(todo);
       });
     }
+  }
 
   // 显示对话框
   void _showDialog(bool isEditing, Todo? todo) {

lib/utils/date_utils.dart

@@ -16,3 +16,9 @@ bool isToday(DateTime? date) {
       date.month == now.month &&
       date.day == now.day;
 }
+
+bool isAfterToday(DateTime? date) {
+  if (date == null) return false;
+
+  return date.isAfter(DateTime.now());
+}

lib/utils/todo_utils.dart

@@ -25,16 +25,23 @@ List<Todo> getActiveTodos(TodoTab currentTab, List<Todo> todos) {
 
 // 格式化截止日期
 String formatDueDate(DateTime dueDate, bool isToday, bool isTomorrow) {
-  if (isToday) return '今天截止';
-  if (isTomorrow) return '明天截止';
-
   final now = DateTime.now();
-  final difference = dueDate.difference(DateTime(now.year, now.month, now.day));
+  final today = DateTime(now.year, now.month, now.day);
+  final dueDateStart = DateTime(dueDate.year, dueDate.month, dueDate.day);
+  final difference = dueDateStart.difference(today);
 
-  if (difference.inDays < 7) {
+  // 处理过期情况
-    return '${difference.inDays}天后截止';
+  if (difference.inDays < 0) {
+    final daysPast = -difference.inDays;
+    return '已过期$daysPast天';
   }
 
+  // 处理未来日期
+  if (difference.inDays == 0) return '今天截止';
+  if (difference.inDays == 1) return '明天截止';
+  if (difference.inDays == 2) return '后天截止';
+  if (difference.inDays < 7) return '${difference.inDays}天后截止';
+
   return DateFormat("MM-dd").format(dueDate);
 }
 

lib/widgets/calendar_form.dart

@@ -80,7 +80,11 @@ class _CalendarFormState extends State<CalendarForm> {
         label: RichText(
           text: TextSpan(
             text: '内容',
-            style: TextStyle(color: Colors.grey.shade700, fontSize: 16),
+            style: TextStyle(
+              color: Colors.grey,
+              fontSize: 16,
+              fontFamily: 'CustomFont',
+            ),
             children: const [
               TextSpan(
                 text: '*',
@@ -146,9 +150,7 @@ class _CalendarFormState extends State<CalendarForm> {
       decoration: InputDecoration(
         labelText:
             startTime == null ? '选择开始时间' : '开始时间: ${formatTime(startTime)}',
-        labelStyle: TextStyle(
+        labelStyle: TextStyle(color: Colors.grey),
-          color: startTime == null ? Colors.grey : Colors.black87,
-        ),
         prefixIcon: Icon(Icons.calendar_month, color: Colors.purple),
         border: buildFormBoard(),
         enabledBorder: buildFormEnabledBoard(),
@@ -196,9 +198,7 @@ class _CalendarFormState extends State<CalendarForm> {
       },
       decoration: InputDecoration(
         labelText: endTime == null ? '选择结束时间' : '结束时间: ${formatTime(endTime)}',
-        labelStyle: TextStyle(
+        labelStyle: TextStyle(color: Colors.grey),
-          color: endTime == null ? Colors.grey : Colors.black87,
-        ),
         prefixIcon: Icon(Icons.calendar_month, color: Colors.purple),
         border: buildFormBoard(),
         enabledBorder: buildFormEnabledBoard(),
@@ -247,11 +247,9 @@ class _CalendarFormState extends State<CalendarForm> {
       decoration: InputDecoration(
         labelText:
             scheduledTime == null
-                ? '选择提醒日期'
+                ? '选择提醒时间'
-                : '提醒: ${formatTime(scheduledTime)}',
+                : '提醒时间: ${formatTime(scheduledTime)}',
-        labelStyle: TextStyle(
+        labelStyle: TextStyle(color: Colors.grey),
-          color: scheduledTime == null ? Colors.grey : Colors.black87,
-        ),
         prefixIcon: Icon(Icons.calendar_month, color: Colors.purple),
         border: buildFormBoard(),
         enabledBorder: buildFormEnabledBoard(),

lib/widgets/calendar_widget.dart

@@ -107,7 +107,7 @@ Widget buildCalendar({
     onLongPress: (CalendarLongPressDetails details) async {
       if (details.targetElement == CalendarElement.appointment) {
         if (details.appointments?.length == 1) {
-          final bool? result = await showDeleteConfirmationDialog(context);
+          final bool? result = await showConfirmDialog(context, '确定要删除这个项目吗？');
           if (result == true) {
             onDelete(details.appointments!.first);
           }

lib/widgets/common.dart

@@ -143,7 +143,7 @@ Widget buildDismissible({
     background: _buildDismissBackground(),
     confirmDismiss: (direction) async {
       // 这里实现二次确认
-      return await showDeleteConfirmationDialog(context);
+      return await showConfirmDialog(context, '确定要删除这个项目吗？');
     },
     onDismissed: (direction) {
       onDelete();
@@ -153,22 +153,27 @@ Widget buildDismissible({
 }
 
 // 确认对话框
-Future<bool?> showDeleteConfirmationDialog(BuildContext context) async {
+Future<bool?> showConfirmDialog(BuildContext context, String text) async {
+  final colors = Theme.of(context).colorScheme;
+
   return showDialog<bool>(
     context: context,
     builder: (BuildContext context) {
       return AlertDialog(
-        title: const Text('确认删除'),
+        title: const Text('确认'),
-        backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+        backgroundColor: colors.surfaceContainer,
-        content: const Text('确定要删除这个项目吗？'),
+        content: Text(text),
         actions: [
           TextButton(
             onPressed: () => Navigator.of(context).pop(false),
-            child: const Text('取消'),
+            child: Text(
+              '取消',
+              style: TextStyle(color: colors.secondary.withAlpha(150)),
+            ),
           ),
           TextButton(
             onPressed: () => Navigator.of(context).pop(true),
-            child: const Text('删除', style: TextStyle(color: Colors.red)),
+            child: Text('确认', style: TextStyle(color: colors.primary)),
           ),
         ],
       );
@@ -220,14 +225,14 @@ ButtonStyle buildSegmentStyle(ColorScheme colors) {
     side: WidgetStateProperty.all<BorderSide>(
       BorderSide(color: colors.surface, width: 0),
     ),
-    iconColor: WidgetStateProperty.resolveWith<Color>(
+    iconColor: WidgetStateProperty.resolveWith<Color>((
-          (Set<WidgetState> states) {
+      Set<WidgetState> states,
+    ) {
       if (states.contains(WidgetState.selected)) {
         return colors.onPrimary;
       }
       return Colors.grey;
-      },
+    }),
-    ),
     backgroundColor: WidgetStateProperty.resolveWith<Color>((
       Set<WidgetState> states,
     ) {

lib/widgets/flisp_form.dart

@@ -77,8 +77,6 @@ class _FlispFormState extends State<FlispForm> {
       decoration: InputDecoration(
         hintText: '记录你的灵感瞬间...',
         hintStyle: TextStyle(color: Colors.grey),
-        counterText: '',
-        suffixText: '${provider.formItem.content.length}/$maxContentCount',
         border: OutlineInputBorder(
           borderRadius: BorderRadius.circular(12),
           borderSide: BorderSide(color: Colors.grey.shade200),
@@ -98,6 +96,22 @@ class _FlispFormState extends State<FlispForm> {
       minLines: 4,
       maxLines: 8,
       maxLength: maxContentCount,
+      buildCounter: (
+          context, {
+            required currentLength,
+            required isFocused,
+            maxLength,
+          }) {
+        return Text(
+          '$currentLength/$maxContentCount',
+          style: TextStyle(
+            color:
+            currentLength > maxLength!
+                ? Colors.red
+                : Theme.of(context).colorScheme.primary,
+          ),
+        );
+      },
       validator: (value) {
         if (value != null && value.isEmpty) {
           return '请输入内容';
@@ -204,7 +218,7 @@ class _FlispFormState extends State<FlispForm> {
         width: 90,
         padding: EdgeInsets.all(8),
         decoration: BoxDecoration(
-          color: Colors.white,
+          color: Theme.of(context).colorScheme.surface,
           borderRadius: BorderRadius.circular(8),
           boxShadow: [
             BoxShadow(

lib/widgets/todo_form.dart

@@ -67,7 +67,11 @@ class _TodoFormState extends State<TodoForm> {
         label: RichText(
           text: TextSpan(
             text: '标题',
-            style: TextStyle(color: Colors.grey.shade700, fontSize: 16),
+            style: TextStyle(
+              color: Colors.grey,
+              fontSize: 16,
+              fontFamily: 'CustomFont',
+            ),
             children: const [
               TextSpan(
                 text: '*',
@@ -127,6 +131,7 @@ class _TodoFormState extends State<TodoForm> {
       },
       decoration: InputDecoration(
         labelText: '内容',
+        labelStyle: TextStyle(color: Colors.grey),
         hintText: '请输入待办事项内容...',
         hintStyle: TextStyle(color: Colors.grey),
         counterText: '',
@@ -188,11 +193,8 @@ class _TodoFormState extends State<TodoForm> {
         labelText:
             provider.formItem.dueDate == null
                 ? '选择截止日期'
-                : '截止: ${DateFormat('yyyy-MM-dd').format(provider.formItem.dueDate!)}',
+                : '截止日期: ${DateFormat('yyyy-MM-dd').format(provider.formItem.dueDate!)}',
-        labelStyle: TextStyle(
+        labelStyle: TextStyle(color: Colors.grey),
-          color:
-              provider.formItem.dueDate == null ? Colors.grey : Colors.black87,
-        ),
         prefixIcon: Icon(Icons.calendar_month, color: Colors.purple),
         border: OutlineInputBorder(
           borderRadius: BorderRadius.circular(12),
@@ -252,14 +254,9 @@ class _TodoFormState extends State<TodoForm> {
       decoration: InputDecoration(
         labelText:
             provider.formItem.scheduledTime == null
-                ? '选择提醒日期'
+                ? '选择提醒时间'
-                : '提醒: ${DateFormat('yyyy-MM-dd HH:mm:ss').format(provider.formItem.scheduledTime!)}',
+                : '提醒时间: ${DateFormat('yyyy-MM-dd HH:mm:ss').format(provider.formItem.scheduledTime!)}',
-        labelStyle: TextStyle(
+        labelStyle: TextStyle(color: Colors.grey),
-          color:
-              provider.formItem.scheduledTime == null
-                  ? Colors.grey
-                  : Colors.black87,
-        ),
         prefixIcon: Icon(Icons.calendar_month, color: Colors.purple),
         border: OutlineInputBorder(
           borderRadius: BorderRadius.circular(12),

pubspec.yaml

@@ -2,7 +2,7 @@ name: flisp_app
 description: "闪灵"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.0+1
+version: 1.0.0+2
 
 environment:
   sdk: ^3.7.0