From 118a823f1cd878215451b03e9f9c0d6a83a0956f Mon Sep 17 00:00:00 2001 From: amirrezaghabeli Date: Sun, 14 Sep 2025 12:08:39 +0330 Subject: [PATCH] fixed rported jira issues --- .../detail/widgets/tender_detail_action.dart | 4 +- .../profile/strings/profile_strings.dart | 2 +- .../tenders/widgets/main_tenders_slider.dart | 68 +++++++++++-------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/lib/views/detail/widgets/tender_detail_action.dart b/lib/views/detail/widgets/tender_detail_action.dart index d1b4aab..79050f6 100644 --- a/lib/views/detail/widgets/tender_detail_action.dart +++ b/lib/views/detail/widgets/tender_detail_action.dart @@ -120,7 +120,7 @@ class TenderDetailActions extends StatelessWidget { ? BaseButton( isEnabled: true, text: TenderDetailsStrings.tenderRejectButton, - textColor: AppColors.red10, + textColor: AppColors.errorColor, backgroundColor: AppColors.backgroundColor, borderWidth: 1, onPressed: () {}, @@ -129,7 +129,7 @@ class TenderDetailActions extends StatelessWidget { : BaseButton( isEnabled: true, text: TenderDetailsStrings.tenderRejectButton, - textColor: AppColors.red10, + textColor: AppColors.errorColor, backgroundColor: AppColors.backgroundColor, borderWidth: 1, onPressed: () { diff --git a/lib/views/profile/strings/profile_strings.dart b/lib/views/profile/strings/profile_strings.dart index f3f18d3..c447325 100644 --- a/lib/views/profile/strings/profile_strings.dart +++ b/lib/views/profile/strings/profile_strings.dart @@ -10,7 +10,7 @@ class ProfileStrings { static const String registrationNumber = 'Registration No.'; static const String businessType = 'Business Type'; static const String founded = 'Founded'; - static const String logout = 'Logout'; + static const String logout = 'Log out'; static const String contracts = 'Contracts'; static const String notifications = 'Notifications'; } diff --git a/lib/views/tenders/widgets/main_tenders_slider.dart b/lib/views/tenders/widgets/main_tenders_slider.dart index eb2907c..210a89c 100644 --- a/lib/views/tenders/widgets/main_tenders_slider.dart +++ b/lib/views/tenders/widgets/main_tenders_slider.dart @@ -141,20 +141,26 @@ class _MainTendersSliderState extends State { } Widget _leftArrowButton() { - return InkWell( - borderRadius: BorderRadius.circular(100), - onTap: _goToPreviousPage, - child: Container( - width: 32.0.h(), - height: 32.0.h(), - decoration: BoxDecoration( - shape: BoxShape.circle, - border: Border.all(color: AppColors.iconColor, width: 1.5), - ), - alignment: Alignment.center, - child: SvgPicture.asset( - AssetsManager.arrowLeftSmall, - colorFilter: ColorFilter.mode(AppColors.iconColor, BlendMode.srcATop), + return Visibility( + visible: currentPage != 1, + child: InkWell( + borderRadius: BorderRadius.circular(100), + onTap: _goToPreviousPage, + child: Container( + width: 32.0.h(), + height: 32.0.h(), + decoration: BoxDecoration( + shape: BoxShape.circle, + border: Border.all(color: AppColors.iconColor, width: 1.5), + ), + alignment: Alignment.center, + child: SvgPicture.asset( + AssetsManager.arrowLeftSmall, + colorFilter: ColorFilter.mode( + AppColors.iconColor, + BlendMode.srcATop, + ), + ), ), ), ); @@ -190,20 +196,26 @@ class _MainTendersSliderState extends State { } Widget _rightArrowButton() { - return InkWell( - borderRadius: BorderRadius.circular(100), - onTap: _goToNextPage, - child: Container( - width: 32.0.h(), - height: 32.0.h(), - decoration: BoxDecoration( - shape: BoxShape.circle, - border: Border.all(color: AppColors.iconColor, width: 1.5), - ), - alignment: Alignment.center, - child: SvgPicture.asset( - AssetsManager.arrowRightSmall, - colorFilter: ColorFilter.mode(AppColors.iconColor, BlendMode.srcATop), + return Visibility( + visible: currentPage != widget.tenders.length, + child: InkWell( + borderRadius: BorderRadius.circular(100), + onTap: _goToNextPage, + child: Container( + width: 32.0.h(), + height: 32.0.h(), + decoration: BoxDecoration( + shape: BoxShape.circle, + border: Border.all(color: AppColors.iconColor, width: 1.5), + ), + alignment: Alignment.center, + child: SvgPicture.asset( + AssetsManager.arrowRightSmall, + colorFilter: ColorFilter.mode( + AppColors.iconColor, + BlendMode.srcATop, + ), + ), ), ), );