feat:更新UI布局

2025-12-03 11:49:50 +08:00
parent e2853483f7
commit e672442d6a
9 changed files with 196 additions and 189 deletions
--- a/lib/widget/record/goal_progress.dart
+++ b/lib/widget/record/goal_progress.dart
@@ -1,3 +1,4 @@
+import 'package:fitnote/config/app_config.dart';
 import 'package:fitnote/models/health.dart';
 import 'package:fitnote/provider/health_provider.dart';
 import 'package:fitnote/service/health_service.dart';
@@ -19,11 +20,6 @@ class GoalProgress extends StatefulWidget {
 class _GoalProgressState extends State<GoalProgress> {
  final HealthService service = HealthService();

-  final int initWeight = 72;
-  final int goalWeight = 70;
-  final int goalTotalSpot = 600;
-  final int goalAvgSleep = 8;
-
  @override
  void initState() {
    super.initState();
@@ -55,27 +51,35 @@ class _GoalProgressState extends State<GoalProgress> {
          _buildProgressItem(
            title: '目标体重',
            current: provider.latestWeight.toString(),
-            target: goalWeight.toString(),
+            target: AppConfig.goalWeight.toString(),
            unit: 'kg',
-            progress: calWeightProgress(provider.latestWeight, goalWeight, initWeight),
+            progress: calWeightProgress(
+              provider.latestWeight,
+              AppConfig.goalWeight,
+              AppConfig.initWeight,
+            ),
            color: RecordType.weight.color,
          ),
          const SizedBox(height: 28),
          _buildProgressItem(
            title: '运动总时长',
            current: provider.totalSpot.toString(),
-            target: goalTotalSpot.toString(),
+            target: AppConfig.goalTotalSpot.toString(),
            unit: '分钟',
-            progress: formatProgress(provider.totalSpot / goalTotalSpot),
+            progress: formatProgress(
+              provider.totalSpot / AppConfig.goalTotalSpot,
+            ),
            color: RecordType.sport.color,
          ),
          const SizedBox(height: 28),
          _buildProgressItem(
            title: '日均睡眠',
            current: provider.avgSleep.toString(),
-            target: goalAvgSleep.toString(),
+            target: AppConfig.goalAvgSleep.toString(),
            unit: '小时',
-            progress: formatProgress(provider.avgSleep / goalAvgSleep),
+            progress: formatProgress(
+              provider.avgSleep / AppConfig.goalAvgSleep,
+            ),
            color: RecordType.sleep.color,
          ),
        ],
@@ -111,7 +115,7 @@ class _GoalProgressState extends State<GoalProgress> {
          percentage: progress,
          progressBarColor: color,
          child: Text(
-            '${progress * 100}%',
+            '${roundNum(progress * 100)}%',
            textAlign: TextAlign.end,
            style: TextStyle(color: Colors.white),
          ),
--- a/lib/widget/record/record_calendar.dart
+++ b/lib/widget/record/record_calendar.dart
@@ -0,0 +1,40 @@
+import 'package:fitnote/provider/health_provider.dart';
+import 'package:fitnote/service/health_service.dart';
+import 'package:flutter/material.dart';
+import 'package:table_calendar/table_calendar.dart';
+import 'package:provider/provider.dart';
+
+class RecordCalendar extends StatefulWidget {
+  const RecordCalendar({super.key});
+
+  @override
+  State<RecordCalendar> createState() => _RecordCalendarState();
+}
+
+class _RecordCalendarState extends State<RecordCalendar> {
+  final HealthService service = HealthService();
+
+  @override
+  Widget build(BuildContext context) {
+    final provider = context.watch<HealthProvider>();
+
+    return TableCalendar(
+        locale: 'zh_CN',
+        headerStyle: const HeaderStyle(
+          headerPadding: EdgeInsets.symmetric(vertical: 0),
+          formatButtonVisible: false,
+          titleCentered: true,
+        ),
+        firstDay: DateTime.utc(2010, 1, 1),
+        lastDay: DateTime.utc(2100, 12, 31),
+        focusedDay: provider.selectedDate,
+        selectedDayPredicate: (day) => isSameDay(provider.selectedDate, day),
+        onDaySelected: (selectedDay, focusedDay) {
+          if (!isSameDay(provider.selectedDate, selectedDay)) {
+            provider.updateSelectDate(selectedDay);
+            provider.updateRecord(service.getRecordByDate(provider.selectedDate));
+          }
+        }
+    );
+  }
+}
--- a/lib/widget/record/record_daily.dart
+++ b/lib/widget/record/record_daily.dart
@@ -1,3 +1,4 @@
+import 'package:fitnote/config/app_config.dart';
 import 'package:fitnote/models/health.dart';
 import 'package:fitnote/provider/health_provider.dart';
 import 'package:fitnote/service/health_service.dart';
@@ -21,7 +22,7 @@ class RecordDaily extends StatefulWidget {

 class _RecordDailyState extends State<RecordDaily> {
  final HealthService service = HealthService();
-  
+
  @override
  Widget build(BuildContext context) {
    return CommonCard(
@@ -61,16 +62,12 @@ class _RecordDailyState extends State<RecordDaily> {
    return Container(
      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
      decoration: BoxDecoration(
-        color: const Color(0xFFF1F5F9),
+        color: Colors.grey.shade100,
        borderRadius: BorderRadius.circular(16),
      ),
      child: Text(
        DateFormat('MM月dd日').format(provider.selectedDate),
-        style: const TextStyle(
-          fontSize: 12,
-          color: Color(0xFF64748B),
-          fontWeight: FontWeight.w500,
-        ),
+        style: const TextStyle(fontSize: 12),
      ),
    );
  }
@@ -108,14 +105,7 @@ class _RecordDailyState extends State<RecordDaily> {
          crossAxisAlignment: CrossAxisAlignment.start,
          mainAxisSize: MainAxisSize.min,
          children: [
-            Text(
-              type.title,
-              style: TextStyle(
-                fontSize: 16,
-                fontWeight: FontWeight.bold,
-                color: type.color,
-              ),
-            ),
+            _buildRecordTitle(type),
            const SizedBox(height: 4),
            _buildRecordContent(provider.currentRecord, type),
          ],
@@ -174,7 +164,7 @@ class _RecordDailyState extends State<RecordDaily> {
          provider.updateWeight(70);
          break;
        case RecordType.sport:
-          provider.updateSportProject('跑步');
+          provider.updateSportProject(AppConfig.sportProjectList[0]);
          provider.updateSportDuration(30);
          break;
        case RecordType.sleep:
@@ -184,18 +174,18 @@ class _RecordDailyState extends State<RecordDaily> {
      }
    }

-    showDialog(
-      context: context,
-      builder:
-          (context) => Dialog(
-            child: Padding(
-              padding: EdgeInsets.all(20),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [RecordForm(type: type), _buildDialogButton()],
-              ),
-            ),
-          ),
+    showDialog(context: context, builder: (context) => _buildDialog(type));
+  }
+
+  Widget _buildDialog(RecordType type) {
+    return Dialog(
+      child: Padding(
+        padding: EdgeInsets.all(20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [RecordForm(type: type), _buildDialogButton()],
+        ),
+      ),
    );
  }

@@ -210,7 +200,7 @@ class _RecordDailyState extends State<RecordDaily> {
              Navigator.of(context).pop();
              _resetRecord();
            },
-            color: colors.secondary,
+            color: Colors.grey,
            text: "取消",
          ),
        ),
@@ -250,7 +240,7 @@ class _RecordDailyState extends State<RecordDaily> {

  void _saveRecord() async {
    final provider = context.read<HealthProvider>();
-    
+
    final newRecord = HealthRecord(
      date: formatDate(provider.selectedDate),
      weight: provider.formItem.weight,
@@ -261,48 +251,32 @@ class _RecordDailyState extends State<RecordDaily> {
    );

    await service.updateRecord(newRecord);
-
    provider.updateRecord(service.getRecordByDate(provider.selectedDate));

+    _refreshGoalProcess(provider);
+  }
+
+  void _refreshGoalProcess(HealthProvider provider) {
    provider.updateLatestWeight(service.getLatestWeight());
    provider.updateTotalSpot(service.getTotalSport());
    provider.updateAvgSleep(service.getAvgSleep());
  }

+  Widget _buildRecordTitle(RecordType type) {
+    return Text(
+      type.title,
+      style: TextStyle(fontWeight: FontWeight.bold, color: type.color),
+    );
+  }
+
  Widget _buildRecordContent(HealthRecord record, RecordType type) {
    if (!checkHasRecordValue(record, type)) {
      return Text(
        "尚未记录今日数据，点击添加",
-        style: TextStyle(fontSize: 12, color: Colors.grey[500]),
+        style: TextStyle(fontSize: 14, color: Colors.grey[500]),
      );
    }

-    late String title;
-    switch (type) {
-      case RecordType.weight:
-        title = "${record.weight} kg";
-      case RecordType.sport:
-        title = "${record.sportProject} · ${record.sportDuration}分钟";
-      case RecordType.sleep:
-        final startTime = record.sleepStartTime;
-        final endTime = record.sleepEndTime;
-        if (startTime.isNotEmpty && endTime.isNotEmpty) {
-          final duration = calSleepDuration(startTime, endTime);
-          title = "入睡 $startTime · 起床 $endTime · ${duration}";
-        } else if (startTime.isNotEmpty) {
-          title = "入睡 $startTime";
-        } else if (endTime.isNotEmpty) {
-          title = "起床 $endTime";
-        }
-    }
-
-    return Text(
-      title,
-      style: TextStyle(
-        fontSize: 14,
-        fontWeight: FontWeight.w500,
-        color: Colors.grey[800],
-      ),
-    );
+    return Text(formatContent(record, type), style: TextStyle(fontSize: 14));
  }
 }
--- a/lib/widget/record/record_form.dart
+++ b/lib/widget/record/record_form.dart
@@ -1,3 +1,4 @@
+import 'package:fitnote/config/app_config.dart';
 import 'package:fitnote/models/health.dart';
 import 'package:fitnote/provider/health_provider.dart';
 import 'package:fitnote/service/health_service.dart';
@@ -109,7 +110,7 @@ class _RecordFormState extends State<RecordForm> {
                SizedBox(width: 10),
                DropdownSelect(
                  value: provider.formItem.sportProject,
-                  items: ['羽毛球', '乒乓球', '篮球', '跑步'],
+                  items: AppConfig.sportProjectList,
                  onChanged: (value) => provider.updateSportProject(value!),
                ),
              ],
--- a/lib/widget/record/welcome.dart
+++ b/lib/widget/record/welcome.dart
@@ -0,0 +1,68 @@
+import 'package:fitnote/provider/health_provider.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_common/widget/common_widget.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+class Welcome extends StatefulWidget {
+  const Welcome({super.key});
+
+  @override
+  State<Welcome> createState() => _WelcomeState();
+}
+
+class _WelcomeState extends State<Welcome> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  String _formatCurrentDate() {
+    final now = DateTime.now();
+    return "${DateFormat('yyyy年MM月dd日').format(now)} ${_getWeekday(now.weekday)}";
+  }
+
+  // 数字星期转中文
+  String _getWeekday(int weekday) {
+    const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+    return weekdays[weekday - 1];
+  }
+
+  String getGreeting() {
+    int hour = DateTime.now().hour;
+
+    if (hour >= 5 && hour < 12) {
+      return '早上好';
+    } else if (hour >= 12 && hour < 18) {
+      return '下午好';
+    } else {
+      return '晚上好';
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonCard(
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                getGreeting(),
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              ),
+              const SizedBox(height: 4),
+              Text(
+                '今天是 ${_formatCurrentDate()}',
+                style: const TextStyle(fontSize: 12, color: Colors.grey),
+              ),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}