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

merge branches

Browse Source
This commit is contained in:
amirrezaghabeli
2025-08-18 08:28:18 +03:30
parent 0a54b613cd
commit 36f66bfca5
48 changed files with 2348 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/home/pages/d_home_page.dart
+1 -1
View File
@@ -100,7 +100,7 @@ class DesktopHomePage extends StatelessWidget {
width: 178,
height: 148,
onTap: () {
YourTendersRouteData().push(context);
// YourTendersRouteData().push(context);
},
),
SizedBox(width: 10),
lib/views/home/tenders_list_item.dart
+64
View File
@@ -27,6 +27,7 @@ class TendersListItem extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
<<<<<<< HEAD
SizedBox(
width: double.infinity,
child: Text(
@@ -53,6 +54,30 @@ class TendersListItem extends StatelessWidget {
children: [
Text(
'${AppStrings.tenderDeadline} :',
=======
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
// tender.createdTime ?? '',
'',
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
Container(
width: 91.0.w(),
height: 24.0.h(),
decoration: BoxDecoration(
color: AppColors.green20,
borderRadius: BorderRadius.circular(8),
),
alignment: Alignment.center,
child: Text(
'',
>>>>>>> tender_tender_detail
style: TextStyle(
fontSize: 15.0.sp(),
fontWeight: FontWeight.w500,
@@ -72,7 +97,11 @@ class TendersListItem extends StatelessWidget {
),
SizedBox(height: 12.0.h()),
Text(
<<<<<<< HEAD
tender.title!,
=======
'',
>>>>>>> tender_tender_detail
style: TextStyle(
overflow: TextOverflow.ellipsis,
fontSize: 16.0.sp(),
@@ -81,6 +110,7 @@ class TendersListItem extends StatelessWidget {
),
),
SizedBox(height: 8.0.h()),
<<<<<<< HEAD
SizedBox(
width: double.infinity,
child: Text(
@@ -93,6 +123,16 @@ class TendersListItem extends StatelessWidget {
fontWeight: FontWeight.w400,
color: AppColors.grey70,
),
=======
Text(
'',
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey70,
>>>>>>> tender_tender_detail
),
),
SizedBox(height: 18.0.h()),
@@ -104,7 +144,11 @@ class TendersListItem extends StatelessWidget {
SvgPicture.asset(AssetsManager.location),
SizedBox(width: 1.0.w()),
Text(
<<<<<<< HEAD
tender.countryCode!,
=======
'',
>>>>>>> tender_tender_detail
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
@@ -118,6 +162,7 @@ class TendersListItem extends StatelessWidget {
child: Image.asset(AssetsManager.seFlag, fit: BoxFit.cover),
),
Spacer(),
<<<<<<< HEAD
// Container(
// width: 96.0.w(),
// height: 24.0.h(),
@@ -135,6 +180,25 @@ class TendersListItem extends StatelessWidget {
// ),
// ),
// ),
=======
Container(
width: 96.0.w(),
height: 24.0.h(),
decoration: BoxDecoration(
color: AppColors.grey30,
borderRadius: BorderRadius.circular(88),
),
alignment: Alignment.center,
child: Text(
'',
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey60,
),
),
),
>>>>>>> tender_tender_detail
],
),
],