mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fixed rported jira issues' (#127) from fix_issues into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/127
This commit is contained in:
a.ghabeli
2025-09-14 12:09:23 +03:30
parent 1f4e0c5a3d 118a823f1c
commit 451fbb6e55
3 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/detail/widgets/tender_detail_action.dart
+2 -2
View File
@@ -120,7 +120,7 @@ class TenderDetailActions extends StatelessWidget {
? BaseButton( ? BaseButton(
isEnabled: true, isEnabled: true,
text: TenderDetailsStrings.tenderRejectButton, text: TenderDetailsStrings.tenderRejectButton,
textColor: AppColors.red10, textColor: AppColors.errorColor,
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
borderWidth: 1, borderWidth: 1,
onPressed: () {}, onPressed: () {},
@@ -129,7 +129,7 @@ class TenderDetailActions extends StatelessWidget {
: BaseButton( : BaseButton(
isEnabled: true, isEnabled: true,
text: TenderDetailsStrings.tenderRejectButton, text: TenderDetailsStrings.tenderRejectButton,
textColor: AppColors.red10, textColor: AppColors.errorColor,
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
borderWidth: 1, borderWidth: 1,
onPressed: () { onPressed: () {
lib/views/profile/strings/profile_strings.dart
+1 -1
View File
@@ -10,7 +10,7 @@ class ProfileStrings {
static const String registrationNumber = 'Registration No.'; static const String registrationNumber = 'Registration No.';
static const String businessType = 'Business Type'; static const String businessType = 'Business Type';
static const String founded = 'Founded'; static const String founded = 'Founded';
static const String logout = 'Logout'; static const String logout = 'Log out';
static const String contracts = 'Contracts'; static const String contracts = 'Contracts';
static const String notifications = 'Notifications'; static const String notifications = 'Notifications';
} }
lib/views/tenders/widgets/main_tenders_slider.dart
+40 -28
View File
@@ -141,20 +141,26 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
} }
Widget _leftArrowButton() { Widget _leftArrowButton() {
return InkWell( return Visibility(
borderRadius: BorderRadius.circular(100), visible: currentPage != 1,
onTap: _goToPreviousPage, child: InkWell(
child: Container( borderRadius: BorderRadius.circular(100),
width: 32.0.h(), onTap: _goToPreviousPage,
height: 32.0.h(), child: Container(
decoration: BoxDecoration( width: 32.0.h(),
shape: BoxShape.circle, height: 32.0.h(),
border: Border.all(color: AppColors.iconColor, width: 1.5), decoration: BoxDecoration(
), shape: BoxShape.circle,
alignment: Alignment.center, border: Border.all(color: AppColors.iconColor, width: 1.5),
child: SvgPicture.asset( ),
AssetsManager.arrowLeftSmall, alignment: Alignment.center,
colorFilter: ColorFilter.mode(AppColors.iconColor, BlendMode.srcATop), child: SvgPicture.asset(
AssetsManager.arrowLeftSmall,
colorFilter: ColorFilter.mode(
AppColors.iconColor,
BlendMode.srcATop,
),
),
), ),
), ),
); );
@@ -190,20 +196,26 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
} }
Widget _rightArrowButton() { Widget _rightArrowButton() {
return InkWell( return Visibility(
borderRadius: BorderRadius.circular(100), visible: currentPage != widget.tenders.length,
onTap: _goToNextPage, child: InkWell(
child: Container( borderRadius: BorderRadius.circular(100),
width: 32.0.h(), onTap: _goToNextPage,
height: 32.0.h(), child: Container(
decoration: BoxDecoration( width: 32.0.h(),
shape: BoxShape.circle, height: 32.0.h(),
border: Border.all(color: AppColors.iconColor, width: 1.5), decoration: BoxDecoration(
), shape: BoxShape.circle,
alignment: Alignment.center, border: Border.all(color: AppColors.iconColor, width: 1.5),
child: SvgPicture.asset( ),
AssetsManager.arrowRightSmall, alignment: Alignment.center,
colorFilter: ColorFilter.mode(AppColors.iconColor, BlendMode.srcATop), child: SvgPicture.asset(
AssetsManager.arrowRightSmall,
colorFilter: ColorFilter.mode(
AppColors.iconColor,
BlendMode.srcATop,
),
),
), ),
), ),
); );