improvements

main_production_RSG
Sikander Saleem 2 months ago
parent 5a2a4093cb
commit b9aabf8691

@ -88,7 +88,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
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)
],

@ -80,7 +80,7 @@ class _DeviceSearchScreenState extends State<DeviceSearchScreen> {
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),
],

@ -154,7 +154,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
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)
],

@ -300,7 +300,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
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),
),
),
],

@ -108,9 +108,10 @@ class _SettingsPageState extends State<SettingsPage> {
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<SettingsPage> {
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,

@ -299,10 +299,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
),
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<MyAssetsPage> {
// 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) {

Loading…
Cancel
Save