refactor(apps): 主题系统迁移至 ColorScheme + 扩展架构并支持 Dark Mode

This commit is contained in:
qzl
2026-03-27 19:07:39 +08:00
parent ecc1ec6ce4
commit ae29a8209b
146 changed files with 4301 additions and 3200 deletions
@@ -5,7 +5,6 @@ import 'package:lucide_icons/lucide_icons.dart';
import '../../../../app/di/injection.dart';
import '../../../../app/router/app_routes.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/back_title_page_header.dart';
import '../../../../shared/widgets/detail_header_action_menu.dart';
import '../../../../shared/widgets/destructive_action_sheet.dart';
@@ -84,30 +83,31 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
}
}
Color _getPriorityColor(int priority) {
Color _getPriorityColor(int priority, ColorScheme colorScheme) {
switch (priority) {
case 1:
return AppColors.g1Text;
return colorScheme.error;
case 2:
return AppColors.g3Text;
return colorScheme.tertiary;
case 3:
return AppColors.g2Text;
return colorScheme.primary;
default:
return AppColors.slate500;
return colorScheme.onSurfaceVariant;
}
}
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return Scaffold(
backgroundColor: AppColors.todoBg,
backgroundColor: colorScheme.surface,
body: SafeArea(
child: Container(
decoration: const BoxDecoration(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [AppColors.homeBackgroundTop, AppColors.todoBg],
colors: [colorScheme.surfaceContainerHigh, colorScheme.surface],
),
),
child: Column(
@@ -164,6 +164,7 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
}
Widget _buildContent() {
final colorScheme = Theme.of(context).colorScheme;
if (_isLoading) {
return const FullScreenLoading();
}
@@ -192,7 +193,7 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
fontFamily: 'Inter',
fontSize: 12,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
color: colorScheme.onSurfaceVariant,
),
),
const SizedBox(height: 10),
@@ -201,7 +202,7 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
id: item.id,
title: item.title,
time: _formatEventTime(item.startAt, item.endAt),
borderColor: AppColors.todoEventBorder1,
borderColor: colorScheme.outlineVariant,
onTap: () =>
context.push(AppRoutes.calendarEventDetail(item.id)),
),
@@ -225,60 +226,61 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
}
Widget _buildMainCard() {
final colorScheme = Theme.of(context).colorScheme;
return Container(
width: double.infinity,
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: AppColors.todoCardBg,
color: colorScheme.surface,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: AppColors.todoDetailCardBorder, width: 1),
border: Border.all(color: colorScheme.outlineVariant, width: 1),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_todo!.title,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 18,
fontWeight: FontWeight.w700,
color: AppColors.slate900,
color: colorScheme.onSurface,
),
),
const SizedBox(height: 4),
Text(
_buildSubtitle(),
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 12,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
color: colorScheme.onSurfaceVariant,
),
),
if (_todo!.description != null && _todo!.description!.isNotEmpty) ...[
const SizedBox(height: 8),
Text(
_todo!.description!,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 13,
color: AppColors.slate600,
color: colorScheme.onSurfaceVariant,
),
),
],
const SizedBox(height: 8),
Container(height: 1, color: AppColors.border),
Container(height: 1, color: colorScheme.outlineVariant),
const SizedBox(height: 8),
_buildInfoRow(
label: context.l10n.todoPriorityQuadrant,
value: _getPriorityLabel(_todo!.priority),
valueColor: _getPriorityColor(_todo!.priority),
valueColor: _getPriorityColor(_todo!.priority, colorScheme),
),
const SizedBox(height: 8),
_buildInfoRow(
label: context.l10n.todoLinkedCalendarEvents,
value: context.l10n.todoItemCount(_todo!.scheduleItems.length),
valueColor: AppColors.g3Text,
valueColor: colorScheme.tertiary,
),
const SizedBox(height: 8),
_buildInfoRow(
@@ -287,8 +289,8 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
? context.l10n.todoStatusDone
: context.l10n.todoStatusInProgress,
valueColor: _todo!.status == 'done'
? AppColors.success
: AppColors.blue600,
? colorScheme.tertiary
: colorScheme.primary,
),
],
),
@@ -311,16 +313,17 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
required String value,
required Color valueColor,
}) {
final colorScheme = Theme.of(context).colorScheme;
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
label,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 12,
fontWeight: FontWeight.w600,
color: AppColors.slate400,
color: colorScheme.outline,
),
),
Text(
@@ -343,6 +346,7 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
required Color borderColor,
VoidCallback? onTap,
}) {
final colorScheme = Theme.of(context).colorScheme;
return GestureDetector(
onTap: onTap,
child: Container(
@@ -350,7 +354,7 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
padding: const EdgeInsets.all(10),
margin: const EdgeInsets.only(bottom: 10),
decoration: BoxDecoration(
color: AppColors.todoCardBg,
color: colorScheme.surface,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: borderColor, width: 1),
),
@@ -359,21 +363,21 @@ class _TodoDetailScreenState extends State<TodoDetailScreen> {
children: [
Text(
title,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 13,
fontWeight: FontWeight.w600,
color: AppColors.slate700,
color: colorScheme.onSurfaceVariant,
),
),
const SizedBox(height: 8),
Text(
time,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 12,
fontWeight: FontWeight.w500,
color: AppColors.slate500,
color: colorScheme.onSurfaceVariant,
),
),
],
@@ -3,6 +3,8 @@ import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
import '../../../../app/di/injection.dart';
import '../../../../data/repositories/calendar_event_repository.dart';
import '../../../../data/repositories/models/calendar_event.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../../shared/widgets/app_button.dart';
@@ -13,8 +15,6 @@ import '../../../../shared/widgets/error_retry_surface.dart';
import '../../../../shared/widgets/full_screen_loading.dart';
import '../../../../shared/widgets/toast/toast.dart';
import '../../../../shared/widgets/toast/toast_type.dart';
import '../../../calendar/data/calendar_api.dart';
import '../../../calendar/data/models/schedule_item_model.dart';
import '../../data/todo_api.dart';
class TodoEditScreen extends StatefulWidget {
@@ -32,7 +32,8 @@ class TodoEditScreen extends StatefulWidget {
class _TodoEditScreenState extends State<TodoEditScreen> {
final TodoApi _todoApi = sl<TodoApi>();
final CalendarApi _calendarApi = sl<CalendarApi>();
final CalendarEventRepository _calendarRepository =
sl<CalendarEventRepository>();
final TextEditingController _titleController = TextEditingController();
final TextEditingController _descriptionController = TextEditingController();
@@ -46,6 +47,8 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
final Set<String> _selectedScheduleItemIds = <String>{};
List<_ScheduleItemSimple> _scheduleItems = const <_ScheduleItemSimple>[];
ColorScheme get _colorScheme => Theme.of(context).colorScheme;
@override
void initState() {
super.initState();
@@ -69,7 +72,7 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
final now = DateTime.now();
final start = now.subtract(const Duration(days: 30));
final end = now.add(const Duration(days: 90));
final scheduleItems = await _calendarApi.listByRange(
final scheduleItems = await _calendarRepository.listByRange(
startAt: start,
endAt: end,
);
@@ -91,7 +94,7 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
..clear()
..addAll(todo?.scheduleItems.map((item) => item.id) ?? const []);
_scheduleItems = scheduleItems
.where((item) => item.status == ScheduleStatus.active)
.where((item) => item.status == CalendarEventStatus.active)
.map(
(item) => _ScheduleItemSimple(
id: item.id,
@@ -118,18 +121,21 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColors.todoBg,
backgroundColor: _colorScheme.surface,
resizeToAvoidBottomInset: false,
body: SafeArea(
child: GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () => FocusScope.of(context).unfocus(),
child: Container(
decoration: const BoxDecoration(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [AppColors.homeBackgroundTop, AppColors.todoBg],
colors: [
_colorScheme.surfaceContainerLow,
_colorScheme.surface,
],
),
),
child: Column(
@@ -184,15 +190,21 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
}
Widget _buildHeaderCard() {
final headerDesc = widget.isCreateMode
? context.l10n.todoInfoDescCreate
: _todo?.status == 'done'
? context.l10n.todoInfoDescDone
: context.l10n.todoInfoDescDefault;
return Container(
padding: const EdgeInsets.all(AppSpacing.lg),
decoration: BoxDecoration(
color: AppColors.white,
color: _colorScheme.surface,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.borderTertiary),
border: Border.all(color: _colorScheme.outlineVariant),
boxShadow: [
BoxShadow(
color: AppColors.slate200.withValues(alpha: 0.34),
color: _colorScheme.shadow.withValues(alpha: 0.18),
blurRadius: AppRadius.lg,
offset: const Offset(0, AppSpacing.xs),
),
@@ -206,17 +218,16 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
color: AppColors.slate900,
color: _colorScheme.onSurface,
),
),
const SizedBox(height: AppSpacing.xs),
Text(
widget.isCreateMode
? context.l10n.todoInfoDescCreate
: _todo?.status == 'done'
? context.l10n.todoInfoDescDone
: context.l10n.todoInfoDescDefault,
style: const TextStyle(fontSize: 13, color: AppColors.slate500),
headerDesc,
style: TextStyle(
fontSize: 13,
color: _colorScheme.onSurfaceVariant,
),
),
],
),
@@ -227,9 +238,9 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
return Container(
padding: const EdgeInsets.all(AppSpacing.lg),
decoration: BoxDecoration(
color: AppColors.white,
color: _colorScheme.surface,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.borderSecondary),
border: Border.all(color: _colorScheme.outlineVariant),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -252,7 +263,7 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppColors.slate700,
color: _colorScheme.onSurface,
),
),
const SizedBox(height: AppSpacing.sm),
@@ -263,22 +274,22 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
_PriorityPill(
label: context.l10n.todoQuadrantImportantUrgent,
selected: _priority == 1,
borderColor: AppColors.g1Border,
activeColor: AppColors.g1Text,
borderColor: _colorScheme.error,
activeColor: _colorScheme.error,
onTap: () => setState(() => _priority = 1),
),
_PriorityPill(
label: context.l10n.todoQuadrantUrgentNotImportant,
selected: _priority == 3,
borderColor: AppColors.g2Border,
activeColor: AppColors.g2Text,
borderColor: _colorScheme.primary,
activeColor: _colorScheme.primary,
onTap: () => setState(() => _priority = 3),
),
_PriorityPill(
label: context.l10n.todoQuadrantImportantNotUrgent,
selected: _priority == 2,
borderColor: AppColors.g3Border,
activeColor: AppColors.g3Text,
borderColor: _colorScheme.tertiary,
activeColor: _colorScheme.tertiary,
onTap: () => setState(() => _priority = 2),
),
],
@@ -292,9 +303,9 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
return Container(
padding: const EdgeInsets.all(AppSpacing.lg),
decoration: BoxDecoration(
color: AppColors.surfaceSecondary,
color: _colorScheme.surfaceContainerLow,
borderRadius: BorderRadius.circular(AppRadius.xl),
border: Border.all(color: AppColors.borderSecondary),
border: Border.all(color: _colorScheme.outlineVariant),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -307,16 +318,16 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppColors.slate700,
color: _colorScheme.onSurface,
),
),
const Spacer(),
Text(
context.l10n.todoItemCount(_selectedScheduleItemIds.length),
style: const TextStyle(
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: AppColors.slate500,
color: _colorScheme.onSurfaceVariant,
),
),
],
@@ -328,7 +339,7 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
child: Center(
child: Text(
context.l10n.todoNoSelectableCalendarEvents,
style: const TextStyle(color: AppColors.slate500),
style: TextStyle(color: _colorScheme.onSurfaceVariant),
),
),
)
@@ -375,8 +386,8 @@ class _TodoEditScreenState extends State<TodoEditScreen> {
AppSpacing.lg,
),
decoration: BoxDecoration(
color: AppColors.white.withValues(alpha: 0.9),
border: const Border(top: BorderSide(color: AppColors.borderSecondary)),
color: _colorScheme.surface.withValues(alpha: 0.9),
border: Border(top: BorderSide(color: _colorScheme.outlineVariant)),
),
child: AppButton(
text: _saving
@@ -479,6 +490,8 @@ class _PriorityPill extends StatelessWidget {
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return AppPressable(
onTap: onTap,
borderRadius: BorderRadius.circular(AppRadius.full),
@@ -492,10 +505,10 @@ class _PriorityPill extends StatelessWidget {
decoration: BoxDecoration(
color: selected
? borderColor.withValues(alpha: 0.28)
: AppColors.white,
: colorScheme.surface,
borderRadius: BorderRadius.circular(AppRadius.full),
border: Border.all(
color: selected ? borderColor : AppColors.slate300,
color: selected ? borderColor : colorScheme.outlineVariant,
width: selected ? 1.5 : 1,
),
),
@@ -504,7 +517,7 @@ class _PriorityPill extends StatelessWidget {
style: TextStyle(
fontSize: 12,
fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
color: selected ? activeColor : AppColors.slate600,
color: selected ? activeColor : colorScheme.onSurfaceVariant,
),
),
),
@@ -527,6 +540,8 @@ class _ScheduleSelectableTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return AppPressable(
onTap: onTap,
borderRadius: BorderRadius.circular(AppRadius.lg),
@@ -535,10 +550,10 @@ class _ScheduleSelectableTile extends StatelessWidget {
curve: Curves.easeOut,
padding: const EdgeInsets.all(AppSpacing.md),
decoration: BoxDecoration(
color: selected ? AppColors.surfaceInfoLight : AppColors.white,
color: selected ? colorScheme.primaryContainer : colorScheme.surface,
borderRadius: BorderRadius.circular(AppRadius.lg),
border: Border.all(
color: selected ? AppColors.borderQuaternary : AppColors.border,
color: selected ? colorScheme.primary : colorScheme.outlineVariant,
),
),
child: Row(
@@ -552,18 +567,18 @@ class _ScheduleSelectableTile extends StatelessWidget {
title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: AppColors.slate800,
color: colorScheme.onSurface,
),
),
const SizedBox(height: AppSpacing.xs),
Text(
subtitle,
style: const TextStyle(
style: TextStyle(
fontSize: 12,
color: AppColors.slate500,
color: colorScheme.onSurfaceVariant,
),
),
],
@@ -575,14 +590,16 @@ class _ScheduleSelectableTile extends StatelessWidget {
width: AppSpacing.lg,
height: AppSpacing.lg,
decoration: BoxDecoration(
color: selected ? AppColors.blue600 : AppColors.white,
color: selected ? colorScheme.primary : colorScheme.surface,
borderRadius: BorderRadius.circular(AppRadius.full),
border: Border.all(
color: selected ? AppColors.blue600 : AppColors.slate300,
color: selected
? colorScheme.primary
: colorScheme.outlineVariant,
),
),
child: selected
? const Icon(Icons.check, size: 12, color: AppColors.white)
? Icon(Icons.check, size: 12, color: colorScheme.onPrimary)
: null,
),
],
@@ -4,18 +4,18 @@ import 'package:go_router/go_router.dart';
import 'package:lucide_icons/lucide_icons.dart';
import '../../../../app/di/injection.dart';
import '../../../../app/router/app_routes.dart';
import '../../../../app/router/home_return_policy.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/theme/design_tokens.dart';
import '../../../home/presentation/navigation/home_return_policy.dart';
import '../../../../shared/widgets/app_pull_refresh_feedback.dart';
import '../../../../shared/widgets/app_pressable.dart';
import '../../../../shared/widgets/back_title_page_header.dart';
import '../../../../shared/widgets/error_retry_surface.dart';
import '../../../../shared/widgets/full_screen_loading.dart';
import '../../../../shared/widgets/bottom_dock.dart';
import '../../../../shared/state/calendar_state_manager.dart';
import '../../../../shared/widgets/toast/toast.dart';
import '../../../../shared/widgets/toast/toast_type.dart';
import '../../../calendar/presentation/calendar_state_manager.dart';
import '../../../calendar/presentation/widgets/bottom_dock.dart';
import '../../data/todo_api.dart';
import '../../data/todo_repository.dart';
@@ -305,8 +305,9 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return Scaffold(
backgroundColor: AppColors.todoBg,
backgroundColor: colorScheme.surface,
body: PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, result) {
@@ -328,6 +329,7 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
}
Widget _buildHeader() {
final colorScheme = Theme.of(context).colorScheme;
return BackTitlePageHeader(
title: context.l10n.todoScreenTitle,
showBackButton: false,
@@ -342,20 +344,20 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
width: 36,
height: 36,
decoration: BoxDecoration(
color: AppColors.blue600,
color: colorScheme.primary,
borderRadius: BorderRadius.circular(AppRadius.full),
boxShadow: [
BoxShadow(
color: AppColors.blue300.withValues(alpha: 0.28),
color: colorScheme.primary.withValues(alpha: 0.28),
blurRadius: AppRadius.lg,
offset: const Offset(0, AppSpacing.xs),
),
],
),
child: const Icon(
child: Icon(
LucideIcons.plus,
size: 18,
color: AppColors.white,
color: colorScheme.onPrimary,
),
),
),
@@ -394,29 +396,31 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
}
Widget _buildDragBoard() {
final colorScheme = Theme.of(context).colorScheme;
final palette = Theme.of(context).extension<AppColorPalette>()!;
final quadrants = [
_QuadrantMeta(
value: 1,
title: context.l10n.todoQuadrantImportantUrgent,
textColor: AppColors.g1Text,
dividerColor: AppColors.g1Divider,
borderColor: AppColors.g1Border,
textColor: palette.g1Text,
dividerColor: palette.g1Divider,
borderColor: palette.g1Border,
items: _importantUrgent,
),
_QuadrantMeta(
value: 3,
title: context.l10n.todoQuadrantUrgentNotImportant,
textColor: AppColors.g2Text,
dividerColor: AppColors.g2Divider,
borderColor: AppColors.g2Border,
textColor: palette.g3Text,
dividerColor: palette.g3Divider,
borderColor: palette.g3Border,
items: _urgentNotImportant,
),
_QuadrantMeta(
value: 2,
title: context.l10n.todoQuadrantImportantNotUrgent,
textColor: AppColors.g3Text,
dividerColor: AppColors.g3Divider,
borderColor: AppColors.g3Border,
textColor: palette.g2Text,
dividerColor: palette.g2Divider,
borderColor: palette.g2Border,
items: _importantNotUrgent,
),
];
@@ -429,7 +433,7 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
contentsWhenEmpty: _buildEmptyQuadrant(),
lastTarget: const SizedBox(height: AppSpacing.lg),
decoration: BoxDecoration(
color: AppColors.todoCardBg,
color: colorScheme.surface,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: meta.borderColor),
),
@@ -468,16 +472,16 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
listDivider: const SizedBox(height: AppSpacing.md),
itemDivider: Padding(
padding: const EdgeInsets.symmetric(horizontal: AppSpacing.md),
child: Container(height: 1, color: AppColors.slate100),
child: Container(height: 1, color: colorScheme.surfaceContainerHigh),
),
listPadding: EdgeInsets.zero,
itemDecorationWhileDragging: BoxDecoration(
color: AppColors.todoCardBg,
color: colorScheme.surface,
borderRadius: BorderRadius.circular(AppRadius.md),
border: Border.all(color: AppColors.borderSecondary),
border: Border.all(color: colorScheme.outlineVariant),
boxShadow: [
BoxShadow(
color: AppColors.slate200.withValues(alpha: 0.6),
color: colorScheme.shadow.withValues(alpha: 0.16),
blurRadius: AppRadius.md,
offset: const Offset(0, AppSpacing.xs),
),
@@ -530,6 +534,7 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
}
Widget _buildEmptyQuadrant() {
final colorScheme = Theme.of(context).colorScheme;
return SizedBox(
height: 60,
child: Center(
@@ -538,7 +543,7 @@ class _TodoQuadrantsScreenState extends State<TodoQuadrantsScreen> {
style: TextStyle(
fontFamily: 'Inter',
fontSize: 13,
color: AppColors.slate400,
color: colorScheme.outline,
),
),
),
@@ -645,6 +650,7 @@ class _TodoItemWidgetState extends State<_TodoItemWidget>
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return GestureDetector(
onTap: widget.onTap,
child: SizedBox(
@@ -656,11 +662,11 @@ class _TodoItemWidgetState extends State<_TodoItemWidget>
Expanded(
child: Text(
widget.item.title,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Inter',
fontSize: 13,
fontWeight: FontWeight.w600,
color: AppColors.slate700,
color: colorScheme.onSurfaceVariant,
),
),
),
@@ -673,11 +679,13 @@ class _TodoItemWidgetState extends State<_TodoItemWidget>
width: 20,
height: 20,
decoration: BoxDecoration(
color: _isChecked ? AppColors.blue600 : Colors.white,
color: _isChecked
? colorScheme.primary
: colorScheme.surface,
border: Border.all(
color: _isChecked
? AppColors.blue600
: AppColors.slate300,
? colorScheme.primary
: colorScheme.outlineVariant,
width: 1.5,
),
borderRadius: BorderRadius.circular(4),
@@ -685,10 +693,10 @@ class _TodoItemWidgetState extends State<_TodoItemWidget>
child: _isChecked
? Transform.scale(
scale: _scaleAnimation.value,
child: const Icon(
child: Icon(
Icons.check,
size: 14,
color: Colors.white,
color: colorScheme.onPrimary,
),
)
: null,