From fa9ff11376f62752c45ed3ae153668d46d5132bb Mon Sep 17 00:00:00 2001 From: amirrezaghabeli Date: Sat, 23 Aug 2025 08:35:59 +0330 Subject: [PATCH 1/2] fixed emty list text ans base button loading --- lib/views/shared/base_button.dart | 2 +- lib/views/your_tenders/widgets/approved_tenders.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/views/shared/base_button.dart b/lib/views/shared/base_button.dart index b0b193f..80b2a6e 100644 --- a/lib/views/shared/base_button.dart +++ b/lib/views/shared/base_button.dart @@ -39,7 +39,7 @@ class BaseButton extends StatelessWidget { width: double.infinity, height: 55.0.h(), decoration: BoxDecoration( - color: AppColors.mainBlue, + color: AppColors.backgroundColor, borderRadius: BorderRadius.circular(28.0.w()), ), child: Center( diff --git a/lib/views/your_tenders/widgets/approved_tenders.dart b/lib/views/your_tenders/widgets/approved_tenders.dart index dc1b00e..a2e6a2a 100644 --- a/lib/views/your_tenders/widgets/approved_tenders.dart +++ b/lib/views/your_tenders/widgets/approved_tenders.dart @@ -12,7 +12,7 @@ class ApprovedTenders extends StatelessWidget { @override Widget build(BuildContext context) { return approvedTenders.data == null - ? const Center(child: Text('No data available')) + ? const Center(child: Text('No approved projects yet.')) : ListView.builder( padding: const EdgeInsets.only(top: 20), itemCount: approvedTenders.data!.length, From ae537f3ca0618bc7dc759333cda3962a91a54e02 Mon Sep 17 00:00:00 2001 From: amirrezaghabeli Date: Sat, 23 Aug 2025 08:51:01 +0330 Subject: [PATCH 2/2] fixed laoding button --- .../detail/widgets/tender_detail_action.dart | 19 ++++++++++++------- lib/views/shared/base_button.dart | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/views/detail/widgets/tender_detail_action.dart b/lib/views/detail/widgets/tender_detail_action.dart index 3855fff..67826d5 100644 --- a/lib/views/detail/widgets/tender_detail_action.dart +++ b/lib/views/detail/widgets/tender_detail_action.dart @@ -49,13 +49,18 @@ class TenderDetailActions extends StatelessWidget { Consumer( builder: (context, viewModel, child) { return viewModel.isSubmitApprovalLoading - ? BaseButton( - isEnabled: true, - text: AppStrings.tenderSubmitButton, - backgroundColor: AppColors.primary30, - textColor: AppColors.mainBlue, - isLoading: true, - onPressed: () {}, + ? Container( + height: 56.0.h(), + width: double.infinity, + decoration: BoxDecoration( + color: AppColors.primary30, + borderRadius: BorderRadius.circular(100.0), + ), + child: Center( + child: CircularProgressIndicator( + color: AppColors.mainBlue, + ), + ), ) : BaseButton( isEnabled: true, diff --git a/lib/views/shared/base_button.dart b/lib/views/shared/base_button.dart index 80b2a6e..b0b193f 100644 --- a/lib/views/shared/base_button.dart +++ b/lib/views/shared/base_button.dart @@ -39,7 +39,7 @@ class BaseButton extends StatelessWidget { width: double.infinity, height: 55.0.h(), decoration: BoxDecoration( - color: AppColors.backgroundColor, + color: AppColors.mainBlue, borderRadius: BorderRadius.circular(28.0.w()), ), child: Center(