Implement priority and tag selection in task creation version 1

README.md

@@ -1,25 +1,11 @@
-# Task Management App - Life Organizer
+## 📁 Chi tiết các file thay đổi
 
-## 1. Introduction
-This repository contains the source code for the **Task Management App (Life Organizer)**, developed as a project for the **SE346** course at the University of Information Technology - VNUHCM (UIT).
+* **`task_model.dart`**: Thêm thuộc tính `Priority` và tích hợp `TagModel`.
+* **`task_viewmodel.dart`**: Cập nhật logic xử lý trạng thái cho Provider.
+* **`priority_selector.dart`**: Thêm UI Widget hỗ trợ chọn mức độ ưu tiên.
+* **`tag_selector.dart`**: Thêm UI Widget hỗ trợ chọn các loại tag.
+* **`create_task_screen.dart`**: Tích hợp 2 widget chọn Priority và Tag vào form tạo nhiệm vụ.
+* **`main.dart`**: Đăng ký Provider mới cho hệ thống.
+* **`home_screen.dart`**: Cập nhật giao diện, hiển thị danh sách task được nhóm theo mức độ ưu tiên.
 
-Going beyond a traditional to-do list, this application is designed to be a comprehensive personal assistant. It helps users easily organize various life contexts, such as tracking utility bills, managing grocery shopping lists, building daily habits, and handling household chores efficiently.
-
-## 2. Authors
-This project is built and maintained by a dedicated team of 4 members:
-* [Trần Quang Hạ](https://github.com/tqha1011) 
-* [Nguyễn Lê Hoàng Hảo](https://github.com/hoanghaoz) 
-* [Nguyễn Anh Kiệt](https://github.com/anhkietbienhoa-crypto) 
-* [Nguyễn Trí Kiệt](https://github.com/Ender-Via)
-
-## 3. Tech Stack
-The application is built with a focus on performance, security, and clean code principles, strictly following the **Feature-Based MVVM** architecture:
-* **Frontend:** Flutter
-* **Backend & Database:** Supabase (PostgreSQL, Auth, Row Level Security)
-* **Code Quality & CI/CD:** GitHub Actions, SonarCloud
-
-## 4. Documentation
-For a deeper dive into our system design and development workflows, please explore the attached documentation:
-* [Flutter App Architecture](documentation/architecture/flutter-architecture.md)
-* [Database Schema & ERD](documentation/architecture/database-schema.md)
-* [Git & Conventional Commits Guidelines](documentation/guidelines/conventional-commit.md)
+<img width="464" height="195" alt="image" src="https://github.com/user-attachments/assets/7a2244b4-82e4-4354-8029-1559c6c7766e" />

src/lib/features/tasks/model/task_model.dart

@@ -1,13 +1,69 @@
 import 'package:flutter/material.dart';
 
+// ─── Priority Enum ───────────────────────────────────────────
+enum Priority { low, medium, high, urgent }
+
+extension PriorityExtension on Priority {
+  String get label {
+    switch (this) {
+      case Priority.low:
+        return 'Low';
+      case Priority.medium:
+        return 'Medium';
+      case Priority.high:
+        return 'High';
+      case Priority.urgent:
+        return 'Urgent';
+    }
+  }
+
+  Color get color {
+    switch (this) {
+      case Priority.low:
+        return const Color(0xFF4CAF50); // xanh lá
+      case Priority.medium:
+        return const Color(0xFF2196F3); // xanh dương
+      case Priority.high:
+        return const Color(0xFFFF9800); // cam
+      case Priority.urgent:
+        return const Color(0xFFF44336); // đỏ
+    }
+  }
+
+  IconData get icon {
+    switch (this) {
+      case Priority.low:
+        return Icons.flag_outlined;
+      case Priority.medium:
+        return Icons.flag;
+      case Priority.high:
+        return Icons.flag;
+      case Priority.urgent:
+        return Icons.flag;
+    }
+  }
+}
+
+// ─── Tag Model ───────────────────────────────────────────────
+class TagModel {
+  final String id;
+  final String name;
+  final Color color;
+
+  const TagModel({required this.id, required this.name, required this.color});
+}
+
+// ─── Task Model ──────────────────────────────────────────────
 class TaskModel {
-  final String id; // ID duy nhất để làm Hero tag và gọi API sau này
+  final String id;
   String title;
   String description;
   String category;
   TimeOfDay startTime;
   TimeOfDay endTime;
   DateTime date;
+  Priority priority;
+  List<TagModel> tags;
 
   TaskModel({
     required this.id,
@@ -17,5 +73,7 @@ class TaskModel {
     required this.startTime,
     required this.endTime,
     required this.date,
+    this.priority = Priority.medium,
+    this.tags = const [],
   });
-}
+}

src/lib/features/tasks/view/screens/create_task_screen.dart

@@ -1,7 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import '../../../../core/theme/app_colors.dart';
 import '../../../../core/widgets/custom_input_field.dart';
+import '../../model/task_model.dart';
+import '../../viewmodel/task_viewmodel.dart';
 import '../widgets/task_widgets.dart';
+import '../widgets/priority_selector.dart';
+import '../widgets/tag_selector.dart';
 
 class CreateTaskScreen extends StatefulWidget {
   const CreateTaskScreen({super.key});
@@ -11,8 +17,12 @@ class CreateTaskScreen extends StatefulWidget {
 }
 
 class _CreateTaskScreenState extends State<CreateTaskScreen> {
-  final TextEditingController _nameController = TextEditingController(text: 'Team Meeting');
-  final TextEditingController _descController = TextEditingController(text: 'Discuss all questions about new projects');
+  final TextEditingController _nameController = TextEditingController(
+    text: 'Team Meeting',
+  );
+  final TextEditingController _descController = TextEditingController(
+    text: 'Discuss all questions about new projects',
+  );
   DateTime _selectedDate = DateTime.now();
   TimeOfDay _startTime = const TimeOfDay(hour: 10, minute: 0);
   TimeOfDay _endTime = const TimeOfDay(hour: 11, minute: 0);
@@ -28,15 +38,20 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
       body: SafeArea(
         child: Column(
           children: [
+            // ─── Header ───────────────────────────────────────
             Container(
               decoration: BoxDecoration(
                 color: Theme.of(context).colorScheme.surface,
                 borderRadius: const BorderRadius.only(
-                    bottomLeft: Radius.circular(30), bottomRight: Radius.circular(30)),
+                  bottomLeft: Radius.circular(30),
+                  bottomRight: Radius.circular(30),
+                ),
                 boxShadow: [
                   BoxShadow(
-                      color: Colors.black.withValues(alpha: 0.05),
-                      blurRadius: 10, offset: const Offset(0, 5))
+                    color: Colors.black.withValues(alpha: 0.05),
+                    blurRadius: 10,
+                    offset: const Offset(0, 5),
+                  ),
                 ],
               ),
               padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 15),
@@ -61,25 +76,46 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
                 ],
               ),
             ),
+
+            // ─── Body ─────────────────────────────────────────
             Expanded(
               child: SingleChildScrollView(
                 padding: const EdgeInsets.all(25.0),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Text('Create New Task', style: Theme.of(context).textTheme.headlineMedium),
+                    Text(
+                      'Create New Task',
+                      style: Theme.of(context).textTheme.headlineMedium,
+                    ),
                     const SizedBox(height: 25),
-                    CustomInputField(label: 'Task Name', hint: 'Enter task name', controller: _nameController),
+
+                    // Task Name
+                    CustomInputField(
+                      label: 'Task Name',
+                      hint: 'Enter task name',
+                      controller: _nameController,
+                    ),
                     const SizedBox(height: 20),
-                    Text('Select Category', style: Theme.of(context).textTheme.labelLarge),
+
+                    // Category
+                    Text(
+                      'Select Category',
+                      style: Theme.of(context).textTheme.labelLarge,
+                    ),
                     const SizedBox(height: 10),
                     SizedBox(
                       height: 40,
                       child: ListView.builder(
                         scrollDirection: Axis.horizontal,
                         itemCount: 4,
                         itemBuilder: (context, index) {
-                          List<String> categories = ['Development', 'Research', 'Design', 'Backend'];
+                          List<String> categories = [
+                            'Development',
+                            'Research',
+                            'Design',
+                            'Backend',
+                          ];
                           bool isSelected = index == _selectedCategoryIndex;
                           return Padding(
                             padding: const EdgeInsets.only(right: 10),
@@ -112,20 +148,38 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
                       ),
                     ),
                     const SizedBox(height: 20),
+
+                    // ─── PRIORITY SELECTOR (MỚI) ──────────────
+                    const PrioritySelector(),
+                    const SizedBox(height: 20),
+
+                    // ─── TAG SELECTOR (MỚI) ───────────────────
+                    const TagSelector(),
+                    const SizedBox(height: 20),
+
+                    // Date
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            Text('Date', style: Theme.of(context).textTheme.labelLarge),
+                            Text(
+                              'Date',
+                              style: Theme.of(context).textTheme.labelLarge,
+                            ),
                             const SizedBox(height: 5),
                             InkWell(
                               onTap: () async {
                                 final DateTime? picked = await showDatePicker(
-                                    context: context, initialDate: _selectedDate,
-                                    firstDate: DateTime(2000), lastDate: DateTime(2100));
-                                if (picked != null) setState(() => _selectedDate = picked);
+                                  context: context,
+                                  initialDate: _selectedDate,
+                                  firstDate: DateTime(2000),
+                                  lastDate: DateTime(2100),
+                                );
+                                if (picked != null) {
+                                  setState(() => _selectedDate = picked);
+                                }
                               },
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -146,7 +200,7 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
                                   )
                                 ],
                               ),
-                            )
+                            ),
                           ],
                         ),
                         Container(
@@ -160,15 +214,24 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
                       ],
                     ),
                     const SizedBox(height: 25),
+
+                    // Time
                     Row(
                       children: [
                         Expanded(
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text('Start time', style: Theme.of(context).textTheme.labelLarge),
+                              Text(
+                                'Start time',
+                                style: Theme.of(context).textTheme.labelLarge,
+                              ),
                               const SizedBox(height: 5),
-                              TimePickerWidget(time: _startTime, onChanged: (newTime) => setState(() => _startTime = newTime)),
+                              TimePickerWidget(
+                                time: _startTime,
+                                onChanged: (t) =>
+                                    setState(() => _startTime = t),
+                              ),
                             ],
                           ),
                         ),
@@ -177,27 +240,73 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text('End time', style: Theme.of(context).textTheme.labelLarge),
+                              Text(
+                                'End time',
+                                style: Theme.of(context).textTheme.labelLarge,
+                              ),
                               const SizedBox(height: 5),
-                              TimePickerWidget(time: _endTime, onChanged: (newTime) => setState(() => _endTime = newTime)),
+                              TimePickerWidget(
+                                time: _endTime,
+                                onChanged: (t) => setState(() => _endTime = t),
+                              ),
                             ],
                           ),
                         ),
                       ],
                     ),
                     const SizedBox(height: 25),
-                    CustomInputField(label: 'Description', hint: 'Enter task description', controller: _descController, maxLines: 2),
+
+                    // Description
+                    CustomInputField(
+                      label: 'Description',
+                      hint: 'Enter task description',
+                      controller: _descController,
+                      maxLines: 2,
+                    ),
                     const SizedBox(height: 40),
+
+                    // ─── Create Button ────────────────────────
                     Center(
                       child: ElevatedButton(
-                        onPressed: () {},
+                        onPressed: () {
+                          final viewModel = context.read<TaskViewModel>();
+                          final List<String> categories = [
+                            'Development',
+                            'Research',
+                            'Design',
+                            'Backend',
+                          ];
+                          final newTask = TaskModel(
+                            id: DateTime.now().millisecondsSinceEpoch
+                                .toString(),
+                            title: _nameController.text,
+                            description: _descController.text,
+                            category: categories[_selectedCategoryIndex],
+                            startTime: _startTime,
+                            endTime: _endTime,
+                            date: _selectedDate,
+                            priority: viewModel.selectedPriority,
+                            tags: List.from(viewModel.selectedTags),
+                          );
+                          viewModel.addTask(newTask);
+                          viewModel.reset();
+                          Navigator.pop(context);
+                        },
                         style: ElevatedButton.styleFrom(
                           backgroundColor: Theme.of(context).colorScheme.primary,
                           foregroundColor: Colors.white,
-                          padding: const EdgeInsets.symmetric(horizontal: 100, vertical: 15),
-                          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 100,
+                            vertical: 15,
+                          ),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(15),
+                          ),
+                        ),
+                        child: const Text(
+                          'Create Task',
+                          style: TextStyle(fontSize: 18),
                         ),
-                        child: const Text('Create Task', style: TextStyle(fontSize: 18)),
                       ),
                     ),
                   ],
@@ -209,4 +318,4 @@ class _CreateTaskScreenState extends State<CreateTaskScreen> {
       ),
     );
   }
-}
+}