qzl/social-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 优化日历状态管理与首页输入框，添加API客户端抽象

Browse Source
This commit is contained in:
qzl
2026-02-27 18:36:21 +08:00
parent 80d04688fc
commit 3d6ae7695f
20 changed files with 2146 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/lib/features/calendar/ui/calendar_state_manager.dart
+51
View File
@@ -0,0 +1,51 @@
import 'package:flutter/material.dart';
enum CalendarViewType { day, month }
class CalendarState {
final CalendarViewType viewType;
final DateTime selectedDate;
CalendarState({required this.viewType, required this.selectedDate});
CalendarState copyWith({CalendarViewType? viewType, DateTime? selectedDate}) {
return CalendarState(
viewType: viewType ?? this.viewType,
selectedDate: selectedDate ?? this.selectedDate,
);
}
}
class CalendarStateManager extends ChangeNotifier {
CalendarState _state;
CalendarStateManager()
: _state = CalendarState(
viewType: CalendarViewType.month,
selectedDate: DateTime.now(),
);
CalendarState get state => _state;
CalendarViewType get viewType => _state.viewType;
DateTime get selectedDate => _state.selectedDate;
void setViewType(CalendarViewType type) {
_state = _state.copyWith(viewType: type);
notifyListeners();
}
void setSelectedDate(DateTime date) {
_state = _state.copyWith(selectedDate: date);
notifyListeners();
}
void resetToToday() {
final now = DateTime.now();
_state = CalendarState(
viewType: CalendarViewType.month,
selectedDate: DateTime(now.year, now.month, now.day),
);
notifyListeners();
}
}
apps/lib/features/calendar/ui/calendar_time_utils.dart
+58
View File
@@ -0,0 +1,58 @@
DateTime weekStartFor(DateTime date) {
return date.subtract(Duration(days: date.weekday % 7));
}
bool isSameDay(DateTime a, DateTime b) {
return a.year == b.year && a.month == b.month && a.day == b.day;
}
bool shouldShowCurrentMarker(DateTime selectedDate, DateTime now) {
return isSameDay(selectedDate, now);
}
String formatHm(DateTime dateTime) {
final hour = dateTime.hour.toString().padLeft(2, '0');
final minute = dateTime.minute.toString().padLeft(2, '0');
return '$hour:$minute';
}
String formatHour(int hour) {
if (hour == 24) {
return '00:00';
}
return '${hour.toString().padLeft(2, '0')}:00';
}
DateTime? parseYmd(String? ymd) {
if (ymd == null) {
return null;
}
final matched = RegExp(r'^(\d{4})-(\d{2})-(\d{2})$').firstMatch(ymd);
if (matched == null) {
return null;
}
final year = int.parse(matched.group(1)!);
final month = int.parse(matched.group(2)!);
final day = int.parse(matched.group(3)!);
final parsed = DateTime(year, month, day);
if (parsed.year != year || parsed.month != month || parsed.day != day) {
return null;
}
return parsed;
}
String formatYmd(DateTime dateTime) {
final year = dateTime.year.toString().padLeft(4, '0');
final month = dateTime.month.toString().padLeft(2, '0');
final day = dateTime.day.toString().padLeft(2, '0');
return '$year-$month-$day';
}
List<DateTime> monthDatesFor(DateTime date) {
final monthStart = DateTime(date.year, date.month, 1);
final monthEnd = DateTime(date.year, date.month + 1, 0);
return List.generate(
monthEnd.day,
(index) => DateTime(monthStart.year, monthStart.month, index + 1),
);
}
apps/lib/features/calendar/ui/screens/calendar_dayweek_screen.dart
+125 -97
View File
@@ -1,34 +1,66 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:lucide_icons/lucide_icons.dart';
import '../../../../core/di/injection.dart';
import '../../../../core/theme/design_tokens.dart';
import '../calendar_state_manager.dart';
import '../calendar_time_utils.dart';
import '../widgets/bottom_dock.dart';
class CalendarDayWeekScreen extends StatefulWidget {
const CalendarDayWeekScreen({super.key});
final DateTime? initialDate;
final bool resetToToday;
const CalendarDayWeekScreen({
super.key,
this.initialDate,
this.resetToToday = false,
});
@override
State<CalendarDayWeekScreen> createState() => _CalendarDayWeekScreenState();
}
class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
DateTime _selectedDate = DateTime(2026, 2, 9);
late DateTime _weekStart;
static const double _dayItemWidth = 44;
static const double _dayItemGap = 12;
late final CalendarStateManager _calendarManager;
late DateTime _selectedDate;
late List<DateTime> _monthDates;
final ScrollController _dayStripController = ScrollController();
@override
void initState() {
super.initState();
_weekStart = _getWeekStart(_selectedDate);
_calendarManager = sl<CalendarStateManager>();
if (widget.resetToToday) {
_calendarManager.resetToToday();
}
_selectedDate = _calendarManager.selectedDate;
_updateMonthDates();
WidgetsBinding.instance.addPostFrameCallback((_) {
_scrollToSelectedDate();
});
}
DateTime _getWeekStart(DateTime date) {
return date.subtract(Duration(days: date.weekday % 7));
void _updateMonthDates() {
_monthDates = monthDatesFor(_selectedDate);
}
@override
void dispose() {
_dayStripController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xFFF8FAFC),
backgroundColor: AppColors.todoBg,
body: SafeArea(
child: Column(
children: [
@@ -37,8 +69,8 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(
left: 16,
right: 16,
left: AppSpacing.lg,
right: AppSpacing.lg,
top: 2,
bottom: 104,
),
@@ -67,14 +99,14 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
child: Row(
children: [
GestureDetector(
onTap: () => Navigator.of(context).pop(),
onTap: () => context.go('/calendar/month'),
child: Container(
height: 36,
padding: const EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: const Color(0xFFF8FAFF),
borderRadius: BorderRadius.circular(18),
border: Border.all(color: const Color(0xFFDEE7F6)),
color: AppColors.messageBtnWrap,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.messageBtnBorder),
),
child: Row(
mainAxisSize: MainAxisSize.min,
@@ -106,29 +138,70 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
Widget _buildWeekStrip() {
return SizedBox(
height: 86,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(7, (index) {
final date = _weekStart.add(Duration(days: index));
final isSelected =
date.day == _selectedDate.day &&
date.month == _selectedDate.month &&
date.year == _selectedDate.year;
final isWeekend = index == 0 || index == 6;
child: ListView.separated(
controller: _dayStripController,
scrollDirection: Axis.horizontal,
itemCount: _monthDates.length,
separatorBuilder: (context, index) =>
const SizedBox(width: _dayItemGap),
itemBuilder: (context, index) {
final date = _monthDates[index];
final isSelected = isSameDay(date, _selectedDate);
final isWeekend = date.weekday % 7 == 0 || date.weekday % 7 == 6;
return GestureDetector(
onTap: () {
setState(() {
_selectedDate = date;
});
_calendarManager.setSelectedDate(date);
_updateMonthDates();
_scrollToSelectedDate(animate: true);
},
child: _buildDayItem(date, isSelected, isWeekend),
child: SizedBox(
width: _dayItemWidth,
child: _buildDayItem(date, isSelected, isWeekend),
),
);
}),
},
),
);
}
void _scrollToSelectedDate({bool animate = false}) {
if (!_dayStripController.hasClients) {
return;
}
final index = _monthDates.indexWhere(
(date) => isSameDay(date, _selectedDate),
);
if (index < 0) {
return;
}
final targetCenter =
index * (_dayItemWidth + _dayItemGap) + (_dayItemWidth / 2);
final viewport = _dayStripController.position.viewportDimension;
var offset = targetCenter - (viewport / 2);
final max = _dayStripController.position.maxScrollExtent;
if (offset < 0) {
offset = 0;
}
if (offset > max) {
offset = max;
}
if (animate) {
_dayStripController.animateTo(
offset,
duration: const Duration(milliseconds: 180),
curve: Curves.easeOut,
);
return;
}
_dayStripController.jumpTo(offset);
}
Widget _buildDayItem(DateTime date, bool isSelected, bool isWeekend) {
final dayNames = ['日', '一', '二', '三', '四', '五', '六'];
@@ -146,7 +219,7 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
Text(
'${date.day}',
style: TextStyle(
fontSize: isSelected ? 17 : (isWeekend ? 17 : 17),
fontSize: 17,
fontWeight: isSelected ? FontWeight.w700 : FontWeight.w600,
color: isSelected
? AppColors.blue600
@@ -158,49 +231,23 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
}
Widget _buildTimelineBoard() {
return Column(
children: [
_buildTimelineRow('07:00', false),
_buildTimelineRow('08:00', false),
_buildTimelineRow(
'09:00',
true,
eventText: '购票提醒',
eventColor: AppColors.slate500,
),
_buildTimelineRow('10:00', false),
_buildTimelineRow('11:00', false),
_buildTimelineRow('12:00', false),
_buildTimelineRow('13:00', false),
_buildTimelineRow('14:00', false),
_buildTimelineRow('15:00', false),
_buildTimelineRow('15:28', false, isCurrentTime: true),
_buildTimelineRow(
'16:00',
true,
eventText: '购票提醒',
eventColor: const Color(0xFF6B21A8),
eventBg: const Color(0xFFE9D5FF),
eventBorder: const Color(0xFFD8B4FE),
),
_buildTimelineRow('17:00', false),
_buildTimelineRow('18:00', false),
_buildTimelineRow('19:00', false),
_buildTimelineRow('20:00', false),
_buildTimelineRow('21:00', false),
_buildTimelineRow('22:00', false),
_buildTimelineRow('00:00', false, isDisabled: true),
],
);
final now = DateTime.now();
final showCurrent = shouldShowCurrentMarker(_selectedDate, now);
final rows = <Widget>[];
for (var hour = 7; hour <= 22; hour++) {
rows.add(_buildTimelineRow(formatHour(hour)));
if (showCurrent && now.hour == hour) {
rows.add(_buildTimelineRow(formatHm(now), isCurrentTime: true));
}
}
rows.add(_buildTimelineRow(formatHour(24), isDisabled: true));
return Column(children: rows);
}
Widget _buildTimelineRow(
String time,
bool hasEvent, {
String? eventText,
Color? eventColor,
Color? eventBg,
Color? eventBorder,
String time, {
bool isCurrentTime = false,
bool isDisabled = false,
}) {
@@ -215,7 +262,7 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
width: 44,
height: 18,
decoration: BoxDecoration(
color: const Color(0xFFEF4444),
color: AppColors.red500,
borderRadius: BorderRadius.circular(9),
),
child: Center(
@@ -237,7 +284,7 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
fontWeight: FontWeight.w600,
color: isDisabled
? AppColors.slate300
: const Color(0xFF9CA3AF),
: AppColors.slate400,
),
),
),
@@ -247,38 +294,13 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
? Container(
height: 2,
decoration: BoxDecoration(
color: const Color(0xFFEF4444),
color: AppColors.red500,
borderRadius: BorderRadius.circular(99),
),
)
: hasEvent
? Container(
height: 22,
padding: const EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(
color: eventBg ?? const Color(0xFFE5E7EB),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: eventBorder ?? const Color(0xFFD1D5DB),
),
),
child: Align(
alignment: Alignment.centerLeft,
child: Text(
eventText ?? '',
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: eventColor ?? const Color(0xFF6B7280),
),
),
),
)
: Container(
height: 1,
color: isDisabled
? const Color(0xFFECEFF4)
: const Color(0xFFE5E7EB),
color: isDisabled ? AppColors.blue50 : AppColors.border,
),
),
],
@@ -289,9 +311,15 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen> {
Widget _buildBottomDock() {
return BottomDock(
activeTab: DockTab.calendar,
onTodoTap: () => context.push('/todo'),
onCalendarTap: () {},
onHomeTap: () => Navigator.of(context).pop(),
onTodoTap: () {
_calendarManager.setViewType(CalendarViewType.day);
context.push('/todo');
},
onCalendarTap: () {
_calendarManager.setViewType(CalendarViewType.day);
context.go('/calendar/month');
},
onHomeTap: () => context.go('/home'),
);
}
}
apps/lib/features/calendar/ui/screens/calendar_month_screen.dart
+41 -68
View File
@@ -2,24 +2,44 @@ import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:go_router/go_router.dart';
import 'package:lucide_icons/lucide_icons.dart';
import '../../../../core/di/injection.dart';
import '../../../../core/theme/design_tokens.dart';
import '../calendar_state_manager.dart';
import '../calendar_time_utils.dart';
import '../widgets/bottom_dock.dart';
class CalendarMonthScreen extends StatefulWidget {
const CalendarMonthScreen({super.key});
final bool resetToToday;
const CalendarMonthScreen({super.key, this.resetToToday = false});
@override
State<CalendarMonthScreen> createState() => _CalendarMonthScreenState();
}
class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
DateTime _currentMonth = DateTime(2026, 2, 1);
DateTime? _selectedDate;
late final CalendarStateManager _calendarManager;
late DateTime _currentMonth;
late DateTime _selectedDate;
@override
void initState() {
super.initState();
_calendarManager = sl<CalendarStateManager>();
if (widget.resetToToday) {
_calendarManager.resetToToday();
}
final savedDate = _calendarManager.selectedDate;
_selectedDate = savedDate;
_currentMonth = DateTime(savedDate.year, savedDate.month, 1);
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xFFF8FAFC),
backgroundColor: AppColors.todoBg,
body: SafeArea(
child: Column(
children: [
@@ -84,7 +104,7 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
return Column(
children: [
_buildWeekdayHeader(),
Container(height: 1, color: const Color(0xFFE5E7EB)),
Container(height: 1, color: AppColors.border),
..._buildWeeks(),
],
);
@@ -108,7 +128,7 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
style: const TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xFF9CA3AF),
color: AppColors.slate400,
),
),
),
@@ -140,7 +160,7 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
for (var weekStart = 0; weekStart < totalCells; weekStart += 7) {
weeks.add(_buildWeekRow(weekStart, startWeekday, daysInMonth));
if (weekStart + 7 < totalCells) {
weeks.add(Container(height: 1, color: const Color(0xFFE5E7EB)));
weeks.add(Container(height: 1, color: AppColors.border));
}
}
@@ -165,24 +185,23 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
_currentMonth.month,
dayIndex,
);
final isSelected =
_selectedDate != null &&
_selectedDate!.day == dayIndex &&
_selectedDate!.month == _currentMonth.month;
final isSelected = isSameDay(_selectedDate, date);
return GestureDetector(
onTap: () {
setState(() {
_selectedDate = date;
});
_calendarManager.setSelectedDate(date);
_calendarManager.setViewType(CalendarViewType.month);
final ymd = formatYmd(date);
context.push('/calendar/dayweek?date=$ymd');
},
child: Container(
width: 36,
height: 36,
decoration: BoxDecoration(
color: isSelected
? const Color(0xFFDBEAFE)
: Colors.transparent,
color: isSelected ? AppColors.blue100 : Colors.transparent,
borderRadius: BorderRadius.circular(18),
),
child: Center(
@@ -217,64 +236,15 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(7, (index) {
final dayIndex = weekStart + index - startWeekday + 1;
if (dayIndex == 10) {
return _buildEventDot();
if (dayIndex < 1 || dayIndex > daysInMonth) {
return const SizedBox(width: 38, height: 1);
}
return const SizedBox(width: 38, height: 1);
return const SizedBox(width: 38, height: 20);
}),
),
);
}
Widget _buildEventDot() {
return SizedBox(
width: 76,
height: 100,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
height: 20,
padding: const EdgeInsets.symmetric(horizontal: 6),
decoration: BoxDecoration(
color: const Color(0xFFE5E7EB),
borderRadius: BorderRadius.circular(6),
),
child: const Center(
child: Text(
'购票提醒',
style: TextStyle(
fontSize: 9,
fontWeight: FontWeight.w500,
color: Color(0xFF6B7280),
),
),
),
),
const SizedBox(height: 4),
Container(
height: 20,
padding: const EdgeInsets.symmetric(horizontal: 6),
decoration: BoxDecoration(
color: const Color(0xFFE9D5FF),
borderRadius: BorderRadius.circular(6),
),
child: const Center(
child: Text(
'购票提醒',
style: TextStyle(
fontSize: 9,
fontWeight: FontWeight.w500,
color: Color(0xFF6B21A8),
),
),
),
),
],
),
);
}
void _showMonthPicker() {
showModalBottomSheet(
context: context,
@@ -351,9 +321,12 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen> {
Widget _buildBottomDock() {
return BottomDock(
activeTab: DockTab.calendar,
onTodoTap: () => context.push('/todo'),
onTodoTap: () {
_calendarManager.setViewType(CalendarViewType.month);
context.push('/todo');
},
onCalendarTap: () {},
onHomeTap: () => Navigator.of(context).pop(),
onHomeTap: () => context.go('/home'),
);
}
}
apps/lib/features/calendar/ui/widgets/bottom_dock.dart
+25 -13
View File
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:lucide_icons/lucide_icons.dart';
import '../../../../core/theme/design_tokens.dart';
enum DockTab { todo, calendar }
@@ -20,8 +21,13 @@ class BottomDock extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
height: 61,
padding: const EdgeInsets.only(left: 20, right: 20, top: 12, bottom: 18),
height: 72,
padding: const EdgeInsets.only(
left: AppSpacing.xl,
right: AppSpacing.xl,
top: AppSpacing.md,
bottom: AppSpacing.lg,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [_buildToggle(), _buildHomeBtn()],
@@ -33,9 +39,9 @@ class BottomDock extends StatelessWidget {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 4),
decoration: BoxDecoration(
color: const Color(0xFFFDFEFF),
borderRadius: BorderRadius.circular(24),
border: Border.all(color: const Color(0xFFDCE6F4)),
color: AppColors.todoToggleBg,
borderRadius: BorderRadius.circular(AppRadius.xxl),
border: Border.all(color: AppColors.todoToggleBorder),
),
child: Row(
mainAxisSize: MainAxisSize.min,
@@ -67,16 +73,18 @@ class BottomDock extends StatelessWidget {
width: 44,
height: 44,
decoration: BoxDecoration(
color: isActive ? const Color(0xFFD6E6FF) : Colors.transparent,
borderRadius: BorderRadius.circular(18),
color: isActive ? AppColors.todoToggleActiveBg : Colors.transparent,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(
color: isActive ? const Color(0xFFBFD6FB) : Colors.transparent,
color: isActive
? AppColors.todoToggleActiveBorder
: Colors.transparent,
),
),
child: Icon(
icon,
size: 20,
color: isActive ? const Color(0xFF1D4ED8) : const Color(0xFF334155),
color: isActive ? AppColors.blue600 : AppColors.slate700,
),
),
);
@@ -89,11 +97,15 @@ class BottomDock extends StatelessWidget {
width: 44,
height: 44,
decoration: BoxDecoration(
color: const Color(0xFFE6EEFB),
borderRadius: BorderRadius.circular(18),
border: Border.all(color: const Color(0xFFC9D8EE)),
color: AppColors.todoHomeBtnBg,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.todoHomeBtnBorder),
),
child: const Icon(
LucideIcons.home,
size: 20,
color: AppColors.slate700,
),
child: const Icon(LucideIcons.home, size: 20, color: Color(0xFF1E3A8A)),
),
);
}