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 24d7699b..5eef3a5a 100644 --- a/lib/modules/tm_module/device_transfer/device_filter_screen.dart +++ b/lib/modules/tm_module/device_transfer/device_filter_screen.dart @@ -80,7 +80,7 @@ class _DeviceFilterScreenState extends State { children: [ Text( context.translation.reset, - style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary50), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.loadingColor(context)), ).paddingAll(8).onPress(() { setState(() { startDate = null; diff --git a/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart b/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart index 9adf0b97..645b9514 100644 --- a/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart +++ b/lib/new_views/common_widgets/multiple_item_drop_down_menu.dart @@ -159,11 +159,12 @@ class _MultipleItemDropDownMenuState( value: _selectedItem, diff --git a/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart b/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart index 62a4e558..8946ebc7 100644 --- a/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart +++ b/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart @@ -34,7 +34,7 @@ class CreateRequestTypeBottomSheet extends StatelessWidget { child: Container( padding: const EdgeInsets.all(16.0), width: double.infinity, - color: AppColor.background(context), + color: AppColor.bottomSheetColor(context), child: Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, 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 9b5a7441..a93eeef7 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 @@ -146,7 +146,7 @@ class _AllRequestsFilterPageState extends State { children: [ Text( context.translation.reset, - style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.loadingColor(context)), ).paddingAll(8).onPress(() { Provider.of(context, listen: false).searchedModel = null; setState(() { diff --git a/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart b/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart index 04becf6d..2a728266 100644 --- a/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart +++ b/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart @@ -44,16 +44,7 @@ class _RequestsTypeFilterState extends State { children: widget.items.keys .map( (data) => Container( - padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (_selected.contains(widget.items[data]) ? 12 : 8).toScreenWidth), - // foregroundDecoration: !_selected.contains(widget.items[data]) - // ? null - // : ShapeDecoration( - // color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1), - // shape: RoundedRectangleBorder( - // side: BorderSide(width: 1, color: AppColor.blueStatus(context)), - // borderRadius: BorderRadius.circular(7), - // ), - // ), + padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth), decoration: ShapeDecoration( color: AppColor.background(context), // _selected.contains(widget.items[data]) ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context), diff --git a/lib/views/widgets/date_and_time/date_picker.dart b/lib/views/widgets/date_and_time/date_picker.dart index 7a339a2c..790565fd 100644 --- a/lib/views/widgets/date_and_time/date_picker.dart +++ b/lib/views/widgets/date_and_time/date_picker.dart @@ -90,9 +90,9 @@ class ADatePicker extends StatelessWidget { return Theme( data: currentTheme.copyWith( datePickerTheme: DatePickerThemeData( - headerBackgroundColor: AppColor.primary10, + headerBackgroundColor: AppColor.scaffoldBackground(context), headerForegroundColor: Colors.white, - backgroundColor: currentTheme.colorScheme.surface, + backgroundColor: AppColor.bottomSheetColor(context), dayForegroundColor: MaterialStateColor.resolveWith((states) { if (states.contains(MaterialState.selected)) return Colors.white; if (states.contains(MaterialState.disabled)) return Colors.grey.withOpacity(0.6); @@ -114,7 +114,7 @@ class ADatePicker extends StatelessWidget { ), ), textButtonTheme: TextButtonThemeData( - style: TextButton.styleFrom(foregroundColor: AppColor.primary10), + style: TextButton.styleFrom(foregroundColor: AppColor.loadingColor(context)), ), iconTheme: IconThemeData(color: AppColor.primary10.withOpacity(0.7)), ), diff --git a/lib/views/widgets/equipment/commissioning_status_buttons.dart b/lib/views/widgets/equipment/commissioning_status_buttons.dart index 8646b2b9..e0ba6565 100644 --- a/lib/views/widgets/equipment/commissioning_status_buttons.dart +++ b/lib/views/widgets/equipment/commissioning_status_buttons.dart @@ -80,26 +80,32 @@ class _CommissioningStatusButtonsState extends State padding: EdgeInsetsDirectional.only(start: 16.toScreenWidth), itemBuilder: (context, index) => Container( margin: EdgeInsets.symmetric(horizontal: 4.toScreenWidth), - padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (_selectedIndex == index ? 12 : 8).toScreenWidth), + padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth), alignment: Alignment.center, - foregroundDecoration: _selectedIndex != index - ? null - : ShapeDecoration( - color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1), - shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: AppColor.blueStatus(context)), - borderRadius: BorderRadius.circular(7), - ), - ), + // foregroundDecoration: _selectedIndex != index + // ? null + // : ShapeDecoration( + // color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1), + // shape: RoundedRectangleBorder( + // side: BorderSide(width: 1, color: AppColor.blueStatus(context)), + // borderRadius: BorderRadius.circular(7), + // ), + // ), decoration: ShapeDecoration( - color: _selectedIndex == index ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context), + color: AppColor.background(context), shape: RoundedRectangleBorder( - side: _selectedIndex == index ? BorderSide(width: 1, color: AppColor.blueStatus(context)) : BorderSide.none, - borderRadius: BorderRadius.circular(7), + side: BorderSide(width: 1, color: _selectedIndex == index ? AppColor.primary10 : AppColor.border2Color(context)), + // side: _selectedIndex == index ? BorderSide(width: 1, color: AppColor.blueStatus(context)) : BorderSide.none, + borderRadius: BorderRadius.circular(6), ), shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)], ), - child: (index == 0 ? "All Assets" : snapshot.items[index - 1].name)!.tinyFont(context).custom(color: AppColor.filterButtonTextColor(context)), + child: (index == 0 ? "All Assets" : snapshot.items[index - 1].name)!.tinyFont(context).custom( + + // color: AppColor.filterButtonTextColor(context) + + color: _selectedIndex == index ? AppColor.primary10 : AppColor.filterButtonTextColor(context) + ), ).onPress(() { setState(() { _selectedIndex = index; diff --git a/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart b/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart index a4d4628b..2095e226 100644 --- a/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart +++ b/lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart @@ -88,7 +88,7 @@ class _SelectionBottomSheetState extends State(0), - backgroundColor: WidgetStateProperty.all(context.isDark ? AppColor.neutral120 : null), + backgroundColor: WidgetStateProperty.all(AppColor.background(context)), leading: Icon(Icons.search, color: AppColor.iconColor(context)), textStyle: WidgetStateProperty.all( TextStyle(color: AppColor.textColor(context), fontSize: 16.0), @@ -133,7 +133,7 @@ class _SelectionBottomSheetState extends State extends State