From f3dfe0f69fb17ff280dcf6ed5acce25bcb9bfe96 Mon Sep 17 00:00:00 2001 From: Tran Quang Ha Date: Fri, 10 Apr 2026 09:46:00 +0700 Subject: [PATCH] fix: error screen in main.dart --- .../statistics/model/StatisticsModel.dart | 4 +-- .../tasks/view/screens/home_screen.dart | 36 ++----------------- src/lib/main.dart | 9 ++--- 3 files changed, 9 insertions(+), 40 deletions(-) diff --git a/src/lib/features/statistics/model/StatisticsModel.dart b/src/lib/features/statistics/model/StatisticsModel.dart index b6376e4..1e2a720 100644 --- a/src/lib/features/statistics/model/StatisticsModel.dart +++ b/src/lib/features/statistics/model/StatisticsModel.dart @@ -42,7 +42,7 @@ class UserStatisticsModel { final int thisWeekTotal; final double growthPercentage; final List recentTasks; - final List dailyCounts; // <--- THÊM DÒNG NÀY (Hứng mảng 7 ngày) + final List dailyCounts; UserStatisticsModel({ required this.today, @@ -50,7 +50,7 @@ class UserStatisticsModel { required this.thisWeekTotal, required this.growthPercentage, required this.recentTasks, - required this.dailyCounts, // <--- Cập nhật constructor + required this.dailyCounts, }); factory UserStatisticsModel.fromJson(Map json) { diff --git a/src/lib/features/tasks/view/screens/home_screen.dart b/src/lib/features/tasks/view/screens/home_screen.dart index 882458d..7a9f9b0 100644 --- a/src/lib/features/tasks/view/screens/home_screen.dart +++ b/src/lib/features/tasks/view/screens/home_screen.dart @@ -177,42 +177,10 @@ class HomeScreen extends StatelessWidget { color: viewModel.sortByPriority ? Colors.white : AppColors.primaryBlue, - // --- SỬ DỤNG MOCK DATA VÀO TASKCARD --- - TaskCard( - task: task1, // Truyền task1 vào đây - leading: Stack( - children: [ - const CircleAvatar(radius: 15, backgroundImage: NetworkImage('https://i.pravatar.cc/150?u=user2')), - const Positioned(left: 10, child: CircleAvatar(radius: 15, backgroundImage: NetworkImage('https://i.pravatar.cc/150?u=user3'))), - const Positioned(left: 20, child: CircleAvatar(radius: 15, backgroundImage: NetworkImage('https://i.pravatar.cc/150?u=user4'))), - Positioned( - left: 30, - child: Container( - padding: const EdgeInsets.all(4), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - shape: BoxShape.circle, - ), - child: Icon( - Icons.add_rounded, - size: 20, - color: Theme.of(context).colorScheme.primary, - ), ), - const SizedBox(width: 5), - Text( - 'Sort', - style: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w600, - color: viewModel.sortByPriority - ? Colors.white - : AppColors.primaryBlue, - ), - ), - ], + ] ), - ), + ) ), const SizedBox(width: 8), diff --git a/src/lib/main.dart b/src/lib/main.dart index c97c2fc..1ab3077 100644 --- a/src/lib/main.dart +++ b/src/lib/main.dart @@ -2,13 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:task_management_app/features/auth/presentation/view/auth_gate.dart'; -import 'package:task_management_app/features/auth/presentation/view/login_view.dart'; import 'package:task_management_app/features/main/view/screens/main_screen.dart'; +import 'package:task_management_app/features/tasks/viewmodel/task_viewmodel.dart'; import 'core/theme/app_theme.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -import 'package:provider/provider.dart'; -import 'features/tasks/viewmodel/task_viewmodel.dart'; import 'core/theme/theme_provider.dart'; @@ -34,6 +32,9 @@ Future main() async { MultiProvider( providers: [ ChangeNotifierProvider(create: (_) => ThemeProvider()), + ChangeNotifierProvider( + create: (_) => TaskViewModel(), + ), ], child: const TaskApp())); } @@ -51,7 +52,7 @@ class TaskApp extends StatelessWidget { themeMode: themeProvider.themeMode, theme: AppTheme.lightTheme, // Bộ màu sáng ông vừa map xong darkTheme: AppTheme.darkTheme, - home: const MainScreen(), + home: const AuthGate(), debugShowCheckedModeBanner: false, ); }