admin/marco.pms.mobileapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Refactor EmployeeScreen to use Flexible widget for better layout and enhance project selection display with dropdown icon' (#25) from Vaibhav_Enhancement-#289 into main

Browse Source 
Reviewed-on: #25
This commit is contained in:
vaibhav.surve 2025-05-16 11:09:24 +00:00
commit 8333910de4
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/view/dashboard/employee_screen.dart
View File

@ -72,7 +72,7 @@ class _EmployeeScreenState extends State<EmployeeScreen> with UIMixin {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( Flexible(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
@ -120,19 +120,33 @@ class _EmployeeScreenState extends State<EmployeeScreen> with UIMixin {
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 12.0, vertical: 8.0), horizontal: 12.0, vertical: 8.0),
child: Text( child: Row(
employeesScreenController.selectedProjectId == mainAxisSize: MainAxisSize.min,
null children: [
? 'All Employees' Flexible(
: employeesScreenController.projects child: Text(
.firstWhere((project) => employeesScreenController
project.id == .selectedProjectId ==
employeesScreenController null
.selectedProjectId) ? 'All Employees'
.name, : employeesScreenController.projects
overflow: TextOverflow .firstWhere((project) =>
.ellipsis, project.id ==
style: TextStyle(fontWeight: FontWeight.w600), employeesScreenController
.selectedProjectId)
.name,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontWeight: FontWeight.w600),
),
),
const SizedBox(width: 4),
const Icon(
Icons.arrow_drop_down,
size: 20,
color: Colors.black,
),
],
), ),
), ),
), ),