diff --git a/lib/views/app_style/colors.dart b/lib/views/app_style/colors.dart index 02759ff..65c9db8 100644 --- a/lib/views/app_style/colors.dart +++ b/lib/views/app_style/colors.dart @@ -30,22 +30,35 @@ class AColors { static Color statusBlueLight = const Color(0xFFA2E2F8); static Color statusDefault = const Color(0xFF3B3D4A); - // Color getRequestStatusColor(String status) { - // switch (status) { - // case "in progress": - // return AColors.statusYellowLight; - // case "completed": - // return AColors.statusGreenLight; - // case "high priority": - // return AColors.statusRedLight; - // case "low priority": - // return AColors.statusGreenLight; - // case "open": - // return AColors.statusBlueLight; - // default: - // return AColors.statusDefault; - // } - // } + static Color getRequestStatusTextColorByName(String status) { + switch ((status ?? "").toLowerCase()) { + case "in progress": + return AColors.statusYellow; + case "high priority": + return AColors.statusRed; + default: + return AColors.white; + } + } + + static Color getRequestStatusColorByName(String status) { + switch ((status ?? "").toLowerCase()) { + case "in progress": + return AColors.statusYellowLight; + case "completed": + return AColors.statusGreenLight; + case "closed": + return AColors.statusGreenLight; + case "high priority": + return AColors.statusRedLight; + case "low priority": + return AColors.statusGreenLight; + case "open": + return AColors.statusBlueLight; + default: + return AColors.statusDefault; + } + } static Color getRequestStatusColor(int id) { switch (id) { diff --git a/lib/views/pages/user/visits/visit_details.dart b/lib/views/pages/user/visits/visit_details.dart index dea919c..739656f 100644 --- a/lib/views/pages/user/visits/visit_details.dart +++ b/lib/views/pages/user/visits/visit_details.dart @@ -54,8 +54,8 @@ class VisitDetailsPage extends StatelessWidget { StatusLabel( label: visit.status.name, id: visit.status.id, - textColor: AColors.getRequestStatusTextColor(visit.status.value), - backgroundColor: AColors.getRequestStatusColor(visit.status.value), + textColor: AColors.getRequestStatusTextColorByName(visit.status.name), + backgroundColor: AColors.getRequestStatusColorByName(visit.status.name), ), 1.width.expanded, ], diff --git a/lib/views/widgets/visits/visit_item.dart b/lib/views/widgets/visits/visit_item.dart index b88e880..83822e9 100644 --- a/lib/views/widgets/visits/visit_item.dart +++ b/lib/views/widgets/visits/visit_item.dart @@ -47,8 +47,8 @@ class VisitItem extends StatelessWidget { StatusLabel( label: visit.status.name, id: visit.status.id, - textColor: AColors.getRequestStatusTextColor(visit.status.value), - backgroundColor: AColors.getRequestStatusColor(visit.status.value), + textColor: AColors.getRequestStatusTextColorByName(visit.status.name), + backgroundColor: AColors.getRequestStatusColorByName(visit.status.name), ), 1.width.expanded, ],