From b9aabf8691a514681d568dc62dafca5f99487400 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 11 May 2026 12:10:06 +0300 Subject: [PATCH] improvements --- .../tm_module/device_transfer/device_filter_screen.dart | 2 +- .../tm_module/device_transfer/device_search_screen.dart | 2 +- .../land_page/my_request/all_requests_filter_page.dart | 2 +- .../pages/land_page/my_request/my_requests_page.dart | 2 +- lib/new_views/pages/settings_page.dart | 6 ++++-- lib/views/widgets/equipment/my_assets_page.dart | 7 ++----- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/modules/tm_module/device_transfer/device_filter_screen.dart b/lib/modules/tm_module/device_transfer/device_filter_screen.dart index 0616e728..1062bedb 100644 --- a/lib/modules/tm_module/device_transfer/device_filter_screen.dart +++ b/lib/modules/tm_module/device_transfer/device_filter_screen.dart @@ -88,7 +88,7 @@ class _DeviceFilterScreenState extends State { style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap), child: Text( 'Clear Filters', - style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.red30), ), ).paddingOnly(start: 16, end: 16) ], diff --git a/lib/modules/tm_module/device_transfer/device_search_screen.dart b/lib/modules/tm_module/device_transfer/device_search_screen.dart index d9f99f8d..74cdeeb6 100644 --- a/lib/modules/tm_module/device_transfer/device_search_screen.dart +++ b/lib/modules/tm_module/device_transfer/device_search_screen.dart @@ -80,7 +80,7 @@ class _DeviceSearchScreenState extends State { style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap), child: Text( 'Clear Filters', - style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.red30), ), ).paddingOnly(start: 16, end: 16), ], diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index 61e4e63a..1fbba0ee 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -154,7 +154,7 @@ class _AllRequestsFilterPageState extends State { style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap), child: Text( 'Clear Filters', - style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.red30), ), ).paddingOnly(start: 16, end: 16) ], diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index 596a3103..355335cb 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -300,7 +300,7 @@ class _MyRequestsPageState extends State { style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap), child: Text( 'Clear Filters', - style: AppTextStyles.tinyFont.copyWith(color: AppColor.primary10, fontWeight: FontWeight.w500), + style: AppTextStyles.tinyFont.copyWith(color: AppColor.red30), ), ), ], diff --git a/lib/new_views/pages/settings_page.dart b/lib/new_views/pages/settings_page.dart index 790785b3..8fb51e3e 100644 --- a/lib/new_views/pages/settings_page.dart +++ b/lib/new_views/pages/settings_page.dart @@ -108,9 +108,10 @@ class _SettingsPageState extends State { context.translation.arabic.heading5(context).custom(color: AppColor.textStyleColor(context)), AdvancedSwitch( controller: langController, + initialValue: langController!.value, activeColor: AppColor.green50.withOpacity(0.5), inactiveColor: AppColor.neutral10, - thumb: CircleAvatar(backgroundColor: _settingProvider!.language == "ar" ? AppColor.green50 : AppColor.neutral20), + thumb: CircleAvatar(backgroundColor: langController!.value ? AppColor.green50 : AppColor.neutral20), borderRadius: const BorderRadius.all(Radius.circular(30)), width: 42.toScreenWidth, height: 24.toScreenHeight, @@ -130,9 +131,10 @@ class _SettingsPageState extends State { context.translation.lightTheme.heading5(context).custom(color: AppColor.textStyleColor(context)), AdvancedSwitch( controller: themeController, + initialValue: themeController!.value, activeColor: AppColor.green50.withOpacity(0.5), inactiveColor: AppColor.neutral10, - thumb: CircleAvatar(backgroundColor: _settingProvider!.theme == "light" ? AppColor.green50 : AppColor.neutral20), + thumb: CircleAvatar(backgroundColor: themeController!.value ? AppColor.green50 : AppColor.neutral20), borderRadius: const BorderRadius.all(Radius.circular(30)), width: 42.toScreenWidth, height: 24.toScreenHeight, diff --git a/lib/views/widgets/equipment/my_assets_page.dart b/lib/views/widgets/equipment/my_assets_page.dart index 80a6c432..066f33f1 100644 --- a/lib/views/widgets/equipment/my_assets_page.dart +++ b/lib/views/widgets/equipment/my_assets_page.dart @@ -299,10 +299,7 @@ class _MyAssetsPageState extends State { ), child: Text( 'Clear Filters', - style: AppTextStyles.tinyFont.copyWith( - color: AppColor.primary10, - fontWeight: FontWeight.w500, - ), + style: AppTextStyles.tinyFont.copyWith(color: AppColor.red30), ), ), ], @@ -464,7 +461,7 @@ class _MyAssetsPageState extends State { // Date Range if (_searchAsset?.supplyDateFrom != null || _searchAsset?.supplyDateTo != null) { - String dateLabel = 'Supply Date: '; + String dateLabel = 'Date: '; if (_searchAsset!.supplyDateFrom != null && _searchAsset!.supplyDateTo != null) { dateLabel += '${_formatDate(_searchAsset!.supplyDateFrom!)} - ${_formatDate(_searchAsset!.supplyDateTo!)}'; } else if (_searchAsset!.supplyDateFrom != null) {