From c7494b235453416bd4678a70256ecf1899c1f0ad Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 17 May 2026 15:45:54 +0300 Subject: [PATCH] statuses and switches colors changed. --- .../components/service_request_detail_view.dart | 4 ++-- lib/new_views/app_style/app_color.dart | 1 + lib/new_views/pages/settings_page.dart | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart index b20edde5..14af307c 100644 --- a/lib/modules/cm_module/views/components/service_request_detail_view.dart +++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart @@ -172,8 +172,8 @@ class _ServiceRequestDetailViewState extends State { StatusLabel( radius: 4, label: '${workOrder.since} days', - textColor: AppColor.neutral50, - backgroundColor: AppColor.orange30, + textColor: AppColor.yellowStatusTextColor, + backgroundColor: AppColor.yellowStatusColor, ), ], ], diff --git a/lib/new_views/app_style/app_color.dart b/lib/new_views/app_style/app_color.dart index 078f9c96..70515d71 100644 --- a/lib/new_views/app_style/app_color.dart +++ b/lib/new_views/app_style/app_color.dart @@ -36,6 +36,7 @@ class AppColor { static const Color neutral160 = Color(0xffE5E5E5); static const Color neutral170 = Color(0xff6E6E6E); static const Color disableDark = Color(0xff444756); + static const Color switchBgColor = Color(0xff5A5E79); //background static const Color backgroundLight = Color(0xfff5f6fc); diff --git a/lib/new_views/pages/settings_page.dart b/lib/new_views/pages/settings_page.dart index dcead056..0222afe6 100644 --- a/lib/new_views/pages/settings_page.dart +++ b/lib/new_views/pages/settings_page.dart @@ -110,9 +110,9 @@ class _SettingsPageState extends State { AdvancedSwitch( controller: langController, initialValue: langController!.value, - activeColor: AppColor.green50.withOpacity(0.5), + activeColor: AppColor.green50.withValues(alpha: .25), inactiveColor: AppColor.neutral10, - thumb: CircleAvatar(backgroundColor: langController!.value ? AppColor.green50 : AppColor.neutral20), + thumb: CircleAvatar(backgroundColor: langController!.value ? AppColor.green50 : AppColor.switchBgColor), borderRadius: const BorderRadius.all(Radius.circular(30)), width: 42.toScreenWidth, height: 24.toScreenHeight, @@ -133,9 +133,9 @@ class _SettingsPageState extends State { AdvancedSwitch( controller: themeController, initialValue: themeController!.value, - activeColor: AppColor.green50.withOpacity(0.5), + activeColor: AppColor.green50.withValues(alpha: .25), inactiveColor: AppColor.neutral10, - thumb: CircleAvatar(backgroundColor: themeController!.value ? AppColor.green50 : AppColor.neutral20), + thumb: CircleAvatar(backgroundColor: themeController!.value ? AppColor.green50 : AppColor.switchBgColor), borderRadius: const BorderRadius.all(Radius.circular(30)), width: 42.toScreenWidth, height: 24.toScreenHeight, @@ -179,14 +179,14 @@ class _SettingsPageState extends State { height: 24.toScreenHeight, alignment: enable ? Alignment.centerRight : Alignment.centerLeft, decoration: BoxDecoration( - color: enable ? AppColor.green50.withOpacity(0.5) : AppColor.neutral10, + color: enable ? AppColor.green50.withValues(alpha: 0.25) : AppColor.neutral10, borderRadius: const BorderRadius.all(Radius.circular(30)), ), padding: const EdgeInsets.all(2), child: Container( height: 20.toScreenHeight, width: 20.toScreenWidth, - decoration: BoxDecoration(shape: BoxShape.circle, color: enable ? AppColor.green50 : AppColor.neutral20), + decoration: BoxDecoration(shape: BoxShape.circle, color: enable ? AppColor.green50 : AppColor.switchBgColor), )); } }