From c7600e8e2650c43410d59c70fd9999301430f33f Mon Sep 17 00:00:00 2001 From: Vaibhav Surve Date: Thu, 12 Jun 2025 22:51:44 +0530 Subject: [PATCH] feat: Align app bar elements and adjust padding in attendance and employee screens --- .../Attendence/attendance_screen.dart | 20 +++++++++------- lib/view/employees/employees_screen.dart | 21 +++++++++------- lib/view/taskPlaning/daily_progress.dart | 24 ++++++++++++------- lib/view/taskPlaning/daily_task_planing.dart | 19 +++++++++------ 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/lib/view/dashboard/Attendence/attendance_screen.dart b/lib/view/dashboard/Attendence/attendance_screen.dart index 0d47140..2e65777 100644 --- a/lib/view/dashboard/Attendence/attendance_screen.dart +++ b/lib/view/dashboard/Attendence/attendance_screen.dart @@ -76,15 +76,19 @@ class _AttendanceScreenState extends State with UIMixin { 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'); - }, + centerTitle: false, + leading: Padding( + padding: const EdgeInsets.only(top: 15.0), // Aligns with title + child: 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), + padding: const EdgeInsets.only(top: 15.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -94,7 +98,7 @@ class _AttendanceScreenState extends State with UIMixin { fontWeight: 700, color: Colors.black, ), - const SizedBox(height: 4), + const SizedBox(height: 2), GetBuilder( builder: (projectController) { final projectName = diff --git a/lib/view/employees/employees_screen.dart b/lib/view/employees/employees_screen.dart index 82370b2..6cc3960 100644 --- a/lib/view/employees/employees_screen.dart +++ b/lib/view/employees/employees_screen.dart @@ -73,21 +73,26 @@ class _EmployeesScreenState extends State with UIMixin { Widget build(BuildContext context) { return Scaffold( backgroundColor: const Color(0xFFF5F5F5), - appBar: PreferredSize( + 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'); - }, + centerTitle: false, + leading: Padding( + padding: const EdgeInsets.only(top: 15.0), // Aligns with title + child: 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), + padding: const EdgeInsets.only(top: 15.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -97,7 +102,7 @@ class _EmployeesScreenState extends State with UIMixin { fontWeight: 700, color: Colors.black, ), - const SizedBox(height: 4), + const SizedBox(height: 2), GetBuilder( builder: (projectController) { final projectName = diff --git a/lib/view/taskPlaning/daily_progress.dart b/lib/view/taskPlaning/daily_progress.dart index 87cfc17..8247041 100644 --- a/lib/view/taskPlaning/daily_progress.dart +++ b/lib/view/taskPlaning/daily_progress.dart @@ -72,30 +72,36 @@ class _DailyProgressReportScreenState extends State @override Widget build(BuildContext context) { return Scaffold( - appBar: PreferredSize( + 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'); - }, + centerTitle: false, + leading: Padding( + padding: const EdgeInsets.only(top: 15.0), // Aligns with title + child: 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), + padding: const EdgeInsets.only(top: 15.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, children: [ MyText.titleLarge( - 'Daily Task Progress Report', + 'Daily Task Progress', fontWeight: 700, color: Colors.black, ), - const SizedBox(height: 4), + const SizedBox(height: 2), GetBuilder( builder: (projectController) { final projectName = diff --git a/lib/view/taskPlaning/daily_task_planing.dart b/lib/view/taskPlaning/daily_task_planing.dart index 48997cc..eb37766 100644 --- a/lib/view/taskPlaning/daily_task_planing.dart +++ b/lib/view/taskPlaning/daily_task_planing.dart @@ -61,14 +61,19 @@ class _DailyTaskPlaningScreenState extends State elevation: 0.5, foregroundColor: Colors.black, titleSpacing: 0, - leading: IconButton( - icon: const Icon(Icons.arrow_back_ios_new), - onPressed: () { - Get.offNamed('/dashboard'); - }, + centerTitle: false, + leading: Padding( + padding: const EdgeInsets.only(top: 15.0), // Aligns with title + child: 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), + padding: const EdgeInsets.only(top: 15.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -78,7 +83,7 @@ class _DailyTaskPlaningScreenState extends State fontWeight: 700, color: Colors.black, ), - const SizedBox(height: 4), + const SizedBox(height: 2), GetBuilder( builder: (projectController) { final projectName =