feat: Refactor project selection handling and update UI across various screens

lib/controller/project_controller.dart

@@ -16,6 +16,11 @@ class ProjectController extends GetxController {
   RxBool isLoading = true.obs;
   RxBool isLoadingProjects = true.obs;
   RxMap<String, RxBool> uploadingStates = <String, RxBool>{}.obs;
+  ProjectModel? get selectedProject {
+    if (selectedProjectId == null || selectedProjectId!.value.isEmpty)
+      return null;
+    return projects.firstWhereOrNull((p) => p.id == selectedProjectId!.value);
+  }
 
   @override
   void onInit() {

lib/view/dashboard/Attendence/attendance_screen.dart

@@ -3,15 +3,12 @@ import 'package:get/get.dart';
 import 'package:marco/helpers/theme/app_theme.dart';
 import 'package:marco/helpers/utils/mixins/ui_mixin.dart';
 import 'package:marco/helpers/utils/my_shadow.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb_item.dart';
 import 'package:marco/helpers/widgets/my_card.dart';
 import 'package:marco/helpers/widgets/my_container.dart';
 import 'package:marco/helpers/widgets/my_flex.dart';
 import 'package:marco/helpers/widgets/my_flex_item.dart';
 import 'package:marco/helpers/widgets/my_spacing.dart';
 import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:marco/view/layouts/layout.dart';
 import 'package:marco/controller/dashboard/attendance_screen_controller.dart';
 import 'package:marco/controller/permission_controller.dart';
 import 'package:intl/intl.dart';
@@ -20,7 +17,7 @@ import 'package:marco/model/attendance/log_details_view.dart';
 import 'package:marco/model/attendance/attendence_action_button.dart';
 import 'package:marco/model/attendance/regualrize_action_button.dart';
 import 'package:marco/model/attendance/attendence_filter_sheet.dart';
-import 'package:marco/controller/project_controller.dart'; // adjust if needed
+import 'package:marco/controller/project_controller.dart';
 
 class AttendanceScreen extends StatefulWidget {
   AttendanceScreen({super.key});
@@ -57,7 +54,55 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
 
   @override
   Widget build(BuildContext context) {
-    return Layout(
+    return Scaffold(
+      appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(80),
+        child: AppBar(
+          backgroundColor: const Color(0xFFF5F5F5),
+          elevation: 0.5,
+          foregroundColor: Colors.black,
+          titleSpacing: 0,
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios_new,
+                color: Colors.black, size: 20),
+            onPressed: () {
+              Get.offNamed('/dashboard');
+            },
+          ),
+          title: Padding(
+            padding: const EdgeInsets.only(top: 12.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                MyText.titleLarge(
+                  'Attendance',
+                  fontWeight: 700,
+                  color: Colors.black,
+                ),
+                const SizedBox(height: 4),
+                GetBuilder<ProjectController>(
+                  builder: (projectController) {
+                    final projectName =
+                        projectController.selectedProject?.name ??
+                            'Select Project';
+                    return MyText.bodySmall(
+                      projectName,
+                      fontWeight: 600,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      color: Colors.grey[700],
+                    );
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+      body: SafeArea(
+        child: SingleChildScrollView(
+          padding: MySpacing.x(0),
           child: GetBuilder<AttendanceController>(
             init: attendanceController,
             tag: 'attendance_dashboard_controller',
@@ -65,43 +110,24 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-              Padding(
-                padding: MySpacing.x(flexSpacing),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    MyText.titleMedium("Attendance",
-                        fontSize: 18, fontWeight: 600),
-                    MyBreadcrumb(
-                      children: [
-                        MyBreadcrumbItem(name: 'Dashboard'),
-                        MyBreadcrumbItem(name: 'Attendance', active: true),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
                   MySpacing.height(flexSpacing),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: [
-                  MyText.bodyMedium(
+                      MyText.bodyMedium("Filter", fontWeight: 600),
-                    "Filter",
-                    fontWeight: 600,
-                  ),
                       Tooltip(
                         message: 'Filter Project',
                         child: InkWell(
                           borderRadius: BorderRadius.circular(24),
                           onTap: () async {
-                        final result =
+                            final result = await showModalBottomSheet<
-                            await showModalBottomSheet<Map<String, dynamic>>(
+                                Map<String, dynamic>>(
                               context: context,
                               isScrollControlled: true,
                               backgroundColor: Colors.white,
                               shape: const RoundedRectangleBorder(
-                            borderRadius:
+                                borderRadius: BorderRadius.vertical(
-                                BorderRadius.vertical(top: Radius.circular(12)),
+                                    top: Radius.circular(12)),
                               ),
                               builder: (context) => AttendanceFilterBottomSheet(
                                 controller: attendanceController,
@@ -116,7 +142,8 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                                       .selectedProjectId
                                       ?.value;
 
-                          final selectedView = result['selectedTab'] as String?;
+                              final selectedView =
+                                  result['selectedTab'] as String?;
 
                               if (selectedProjectId != null &&
                                   selectedProjectId !=
@@ -125,16 +152,18 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                                     selectedProjectId;
                                 try {
                                   await attendanceController
-                                  .fetchEmployeesByProject(selectedProjectId);
+                                      .fetchEmployeesByProject(
+                                          selectedProjectId);
                                   await attendanceController
                                       .fetchAttendanceLogs(selectedProjectId);
                                   await attendanceController
-                                  .fetchRegularizationLogs(selectedProjectId);
+                                      .fetchRegularizationLogs(
+                                          selectedProjectId);
                                   await attendanceController
                                       .fetchProjectData(selectedProjectId);
                                 } catch (_) {}
-                            attendanceController
+                                attendanceController.update(
-                                .update(['attendance_dashboard_controller']);
+                                    ['attendance_dashboard_controller']);
                               }
 
                               if (selectedView != null &&
@@ -159,10 +188,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                         ),
                       ),
                       const SizedBox(width: 4),
-                  MyText.bodyMedium(
+                      MyText.bodyMedium("Refresh", fontWeight: 600),
-                    "Refresh",
-                    fontWeight: 600,
-                  ),
                       Tooltip(
                         message: 'Refresh Data',
                         child: InkWell(
@@ -182,8 +208,8 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                                     .fetchRegularizationLogs(projectId);
                                 await attendanceController
                                     .fetchProjectData(projectId);
-                            attendanceController
+                                attendanceController.update(
-                                .update(['attendance_dashboard_controller']);
+                                    ['attendance_dashboard_controller']);
                               } catch (e) {
                                 debugPrint("Error refreshing data: $e");
                               }
@@ -204,9 +230,8 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                       ),
                     ],
                   ),
-              Padding(
+                  MySpacing.height(flexSpacing),
-                padding: MySpacing.x(0),
+                  MyFlex(children: [
-                child: MyFlex(children: [
                     MyFlexItem(
                       sizes: 'lg-12 md-12 sm-12',
                       child: selectedTab == 'todaysAttendance'
@@ -216,11 +241,12 @@ class _AttendanceScreenState extends State<AttendanceScreen> with UIMixin {
                               : regularizationScreen(),
                     ),
                   ]),
-              ),
                 ],
               );
             },
           ),
+        ),
+      ),
     );
   }
 

lib/view/employees/employees_screen.dart

@@ -8,14 +8,13 @@ import 'package:marco/helpers/widgets/my_breadcrumb_item.dart';
 import 'package:marco/helpers/widgets/my_card.dart';
 import 'package:marco/helpers/widgets/my_spacing.dart';
 import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:marco/view/layouts/layout.dart';
 import 'package:marco/controller/permission_controller.dart';
 import 'package:marco/model/employees/employees_screen_filter_sheet.dart';
 import 'package:marco/model/employees/add_employee_bottom_sheet.dart';
 import 'package:marco/controller/dashboard/employees_screen_controller.dart';
 import 'package:marco/helpers/widgets/avatar.dart';
 import 'package:marco/model/employees/employee_detail_bottom_sheet.dart';
-
+import 'package:marco/controller/project_controller.dart';
 class EmployeesScreen extends StatefulWidget {
   const EmployeesScreen({super.key});
 
@@ -79,7 +78,52 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
 
   @override
   Widget build(BuildContext context) {
-    return Layout(
+    return Scaffold(
+      backgroundColor: const Color(0xFFF5F5F5),
+      appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(80),
+        child: AppBar(
+          backgroundColor: const Color(0xFFF5F5F5),
+          elevation: 0.5,
+          foregroundColor: Colors.black,
+          titleSpacing: 0,
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios_new),
+            onPressed: () {
+              Get.offNamed('/dashboard');
+            },
+          ),
+          title: Padding(
+            padding: const EdgeInsets.only(top: 12.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                MyText.titleLarge(
+                  'Employees',
+                  fontWeight: 700,
+                  color: Colors.black,
+                ),
+                const SizedBox(height: 4),
+                GetBuilder<ProjectController>(
+                  builder: (projectController) {
+                    final projectName =
+                        projectController.selectedProject?.name ??
+                            'Select Project';
+                    return MyText.bodySmall(
+                      projectName,
+                      fontWeight: 600,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      color: Colors.grey[700],
+                    );
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
       floatingActionButton: InkWell(
         onTap: () async {
           final result = await showModalBottomSheet<bool>(
@@ -120,13 +164,14 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
           ),
         ),
       ),
+      body: SafeArea(
         child: GetBuilder<EmployeesScreenController>(
           init: employeeScreenController,
           tag: 'employee_screen_controller',
           builder: (controller) {
-          return Stack(
+            return SingleChildScrollView(
-            children: [
+              padding: const EdgeInsets.only(bottom: 80),
-              Column(
+              child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Padding(
@@ -134,11 +179,6 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        MyText.titleMedium(
-                          "Employees",
-                          fontSize: 18,
-                          fontWeight: 600,
-                        ),
                         MyBreadcrumb(
                           children: [
                             MyBreadcrumbItem(name: 'Dashboard'),
@@ -154,10 +194,7 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
-                        MyText.bodyMedium(
+                        MyText.bodyMedium("Filter", fontWeight: 600),
-                          "Filter",
-                          fontWeight: 600,
-                        ),
                         Tooltip(
                           message: 'Project',
                           child: InkWell(
@@ -177,10 +214,7 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
                           ),
                         ),
                         const SizedBox(width: 8),
-                        MyText.bodyMedium(
+                        MyText.bodyMedium("Refresh", fontWeight: 600),
-                          "Refresh",
-                          fontWeight: 600,
-                        ),
                         Tooltip(
                           message: 'Refresh Data',
                           child: InkWell(
@@ -208,10 +242,10 @@ class _EmployeesScreenState extends State<EmployeesScreen> with UIMixin {
                   ),
                 ],
               ),
-            ],
             );
           },
         ),
+      ),
     );
   }
 

lib/view/layouts/layout.dart

@@ -9,6 +9,7 @@ import 'package:marco/helpers/services/api_endpoints.dart';
 import 'package:marco/images.dart';
 import 'package:marco/controller/project_controller.dart';
 import 'package:marco/view/layouts/user_profile_right_bar.dart';
+
 class Layout extends StatefulWidget {
   final Widget? child;
   final Widget? floatingActionButton;
@@ -51,8 +52,8 @@ class _LayoutState extends State<Layout> {
             Expanded(
               child: SingleChildScrollView(
                 key: controller.scrollKey,
-              padding: EdgeInsets.symmetric(horizontal: 0, vertical: isMobile ? 16 : 32),
+                padding: EdgeInsets.symmetric(
-
+                    horizontal: 0, vertical: isMobile ? 16 : 32),
                 child: widget.child,
               ),
             ),
@@ -64,7 +65,7 @@ class _LayoutState extends State<Layout> {
 
   Widget _buildHeader(BuildContext context, bool isMobile) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 0),
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
       child: Obx(() {
         final isExpanded = projectController.isProjectSelectionExpanded.value;
         final selectedProjectId = projectController.selectedProjectId?.value;
@@ -77,22 +78,14 @@ class _LayoutState extends State<Layout> {
               .updateSelectedProject(projectController.projects.first.id);
         }
 
-        return AnimatedContainer(
+        return Card(
-          duration: const Duration(milliseconds: 300),
+          elevation: 4,
-          decoration: BoxDecoration(
+          shape: RoundedRectangleBorder(
-            color: Colors.white,
+            borderRadius: BorderRadius.circular(isExpanded ? 16 : 12),
-            borderRadius: BorderRadius.vertical(
-              bottom: Radius.circular(isExpanded ? 16 : 0),
           ),
-            boxShadow: [
+          margin: EdgeInsets.zero,
-              BoxShadow(
+          child: Padding(
-                color: const Color.fromARGB(255, 67, 73, 84),
+            padding: const EdgeInsets.all(10),
-                blurRadius: 4,
-                offset: Offset(0, 2),
-              ),
-            ],
-          ),
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -110,8 +103,9 @@ class _LayoutState extends State<Layout> {
                     const SizedBox(width: 12),
                     Expanded(
                       child: GestureDetector(
-                      onTap: () =>
+                        onTap: () => projectController
-                          projectController.isProjectSelectionExpanded.toggle(),
+                            .isProjectSelectionExpanded
+                            .toggle(),
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
@@ -174,6 +168,7 @@ class _LayoutState extends State<Layout> {
                 if (isExpanded) _buildProjectList(context, isMobile),
               ],
             ),
+          ),
         );
       }),
     );

lib/view/taskPlaning/daily_progress.dart

@@ -4,13 +4,10 @@ import 'package:intl/intl.dart';
 import 'package:marco/helpers/theme/app_theme.dart';
 import 'package:marco/helpers/utils/mixins/ui_mixin.dart';
 import 'package:marco/helpers/utils/my_shadow.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb_item.dart';
 import 'package:marco/helpers/widgets/my_card.dart';
 import 'package:marco/helpers/widgets/my_container.dart';
 import 'package:marco/helpers/widgets/my_spacing.dart';
 import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:marco/view/layouts/layout.dart';
 import 'package:marco/controller/permission_controller.dart';
 import 'package:marco/controller/dashboard/daily_task_controller.dart';
 import 'package:marco/model/dailyTaskPlaning/daily_progress_report_filter.dart';
@@ -68,7 +65,53 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
 
   @override
   Widget build(BuildContext context) {
-    return Layout(
+    return Scaffold(
+      appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(80),
+        child: AppBar(
+          backgroundColor: const Color(0xFFF5F5F5),
+          elevation: 0.5,
+          foregroundColor: Colors.black,
+          titleSpacing: 0,
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios_new),
+            onPressed: () {
+              Get.offNamed('/dashboard');
+            },
+          ),
+          title: Padding(
+            padding: const EdgeInsets.only(top: 12.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                MyText.titleLarge(
+                  'Daily Task Progress Report',
+                  fontWeight: 700,
+                  color: Colors.black,
+                ),
+                const SizedBox(height: 4),
+                GetBuilder<ProjectController>(
+                  builder: (projectController) {
+                    final projectName =
+                        projectController.selectedProject?.name ??
+                            'Select Project';
+                    return MyText.bodySmall(
+                      projectName,
+                      fontWeight: 600,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      color: Colors.grey[700],
+                    );
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+      body: SafeArea(
+        child: SingleChildScrollView(
+          padding: MySpacing.x(0),
           child: GetBuilder<DailyTaskController>(
             init: dailyTaskController,
             tag: 'daily_progress_report_controller',
@@ -76,7 +119,6 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-              _buildHeader(),
                   MySpacing.height(flexSpacing),
                   _buildActionBar(),
                   Padding(
@@ -87,28 +129,10 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
               );
             },
           ),
-    );
-  }
-
-  Widget _buildHeader() {
-    return Padding(
-      padding: MySpacing.x(flexSpacing),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          MyText.titleMedium("Daily Progress Report",
-              fontSize: 18, fontWeight: 600),
-          MyBreadcrumb(
-            children: [
-              MyBreadcrumbItem(name: 'Dashboard'),
-              MyBreadcrumbItem(name: 'Daily Progress Report', active: true),
-            ],
         ),
-        ],
       ),
     );
   }
-
   Widget _buildActionBar() {
     return Padding(
       padding: MySpacing.x(flexSpacing),

lib/view/taskPlaning/daily_task_planing.dart

@@ -3,12 +3,9 @@ import 'package:get/get.dart';
 import 'package:marco/helpers/theme/app_theme.dart';
 import 'package:marco/helpers/utils/mixins/ui_mixin.dart';
 import 'package:marco/helpers/utils/my_shadow.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb.dart';
-import 'package:marco/helpers/widgets/my_breadcrumb_item.dart';
 import 'package:marco/helpers/widgets/my_card.dart';
 import 'package:marco/helpers/widgets/my_spacing.dart';
 import 'package:marco/helpers/widgets/my_text.dart';
-import 'package:marco/view/layouts/layout.dart';
 import 'package:marco/controller/permission_controller.dart';
 import 'package:marco/controller/task_planing/daily_task_planing_controller.dart';
 import 'package:marco/controller/project_controller.dart';
@@ -50,7 +47,54 @@ class _DailyTaskPlaningScreenState extends State<DailyTaskPlaningScreen>
 
   @override
   Widget build(BuildContext context) {
-    return Layout(
+    return Scaffold(
+      appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(80),
+        child: AppBar(
+          backgroundColor: const Color(0xFFF5F5F5),
+          elevation: 0.5,
+          foregroundColor: Colors.black,
+          titleSpacing: 0,
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios_new),
+            onPressed: () {
+              Get.offNamed('/dashboard');
+            },
+          ),
+          title: Padding(
+            padding: const EdgeInsets.only(top: 12.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                MyText.titleLarge(
+                  'Daily Task Planning',
+                  fontWeight: 700,
+                  color: Colors.black,
+                ),
+                const SizedBox(height: 4),
+                GetBuilder<ProjectController>(
+                  builder: (projectController) {
+                    final projectName =
+                        projectController.selectedProject?.name ??
+                            'Select Project';
+                    return MyText.bodySmall(
+                      projectName,
+                      fontWeight: 600,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      color: Colors.grey[700],
+                    );
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+      body: SafeArea(
+        child: SingleChildScrollView(
+          padding: MySpacing.x(0),
           child: GetBuilder<DailyTaskPlaningController>(
             init: dailyTaskPlaningController,
             tag: 'daily_task_planing_controller',
@@ -58,23 +102,6 @@ class _DailyTaskPlaningScreenState extends State<DailyTaskPlaningScreen>
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-              Padding(
-                padding: MySpacing.x(flexSpacing),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    MyText.titleMedium("Daily Task Planning",
-                        fontSize: 18, fontWeight: 600),
-                    MyBreadcrumb(
-                      children: [
-                        MyBreadcrumbItem(name: 'Dashboard'),
-                        MyBreadcrumbItem(
-                            name: 'Daily Task Planning', active: true),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
                   MySpacing.height(flexSpacing),
                   Padding(
                     padding: MySpacing.x(flexSpacing),
@@ -82,10 +109,7 @@ class _DailyTaskPlaningScreenState extends State<DailyTaskPlaningScreen>
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
                         const SizedBox(width: 8),
-                    MyText.bodyMedium(
+                        MyText.bodyMedium("Refresh", fontWeight: 600),
-                      "Refresh",
-                      fontWeight: 600,
-                    ),
                         Tooltip(
                           message: 'Refresh Data',
                           child: InkWell(
@@ -107,11 +131,8 @@ class _DailyTaskPlaningScreenState extends State<DailyTaskPlaningScreen>
                               cursor: SystemMouseCursors.click,
                               child: Padding(
                                 padding: const EdgeInsets.all(8.0),
-                            child: Icon(
+                                child: Icon(Icons.refresh,
-                              Icons.refresh,
+                                    color: Colors.green, size: 28),
-                              color: Colors.green,
-                              size: 28,
-                            ),
                               ),
                             ),
                           ),
@@ -127,6 +148,8 @@ class _DailyTaskPlaningScreenState extends State<DailyTaskPlaningScreen>
               );
             },
           ),
+        ),
+      ),
     );
   }