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

Merge pull request 'fixe_dark_design' (#100) from fixe_dark_design into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/100
This commit is contained in:
a.ghabeli
2025-09-06 10:37:17 +03:30
parent fed73e5eda ef34952988
commit 2fbd8018c8
8 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/your_tenders/pages/your_tenders_desktop_page.dart
+3
View File
@@ -99,6 +99,7 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
return LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: 'liked',
isDesctop: true,
);
} else if (viewModel.selectedStatus ==
YourTendersStrings.dislikeTenders &&
@@ -106,10 +107,12 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
return LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: 'disliked',
isDesctop: true,
);
} else if (viewModel.data != null) {
return TendersSubmitted(
approvedTenders: viewModel.data!,
isDesktop: true,
);
} else {
return const Center(child: Text('No data available'));
lib/views/your_tenders/pages/your_tenders_mobile_page.dart
+3
View File
@@ -63,6 +63,7 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
child: LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: 'liked tenders',
isDesctop: false,
),
)
else if (viewModel.selectedStatus ==
@@ -72,12 +73,14 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
child: LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: 'disliked',
isDesctop: false,
),
)
else if (viewModel.data != null)
Expanded(
child: TendersSubmitted(
approvedTenders: viewModel.data!,
isDesktop: false,
),
)
else
lib/views/your_tenders/pages/your_tenders_tablet_page.dart
+3 -1
View File
@@ -103,6 +103,7 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
return LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: 'liked',
isDesctop: false,
);
} else if (viewModel.selectedStatus ==
YourTendersStrings.dislikeTenders &&
@@ -110,9 +111,10 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
return LikedDislikedTendersList(
data: viewModel.likedTendersData!,
status: 'disliked',
isDesctop: false,
);
} else if (viewModel.data != null) {
return TendersSubmitted(approvedTenders: viewModel.data!);
return TendersSubmitted(approvedTenders: viewModel.data!,isDesktop: false,);
} else {
return const Center(child: Text('No data available'));
}
lib/views/your_tenders/widgets/approved_tenders.dart
+3 -1
View File
@@ -6,9 +6,10 @@ import 'package:tm_app/views/your_tenders/widgets/tender_card.dart';
import '../../../data/services/model/your_tender_model/your_tender_model.dart';
class ApprovedTenders extends StatelessWidget {
const ApprovedTenders({required this.tendersSubmitted, super.key});
const ApprovedTenders({required this.tendersSubmitted,required this.isDesktop, super.key});
final List<YourTenderModel> tendersSubmitted;
final bool isDesktop;
@override
Widget build(BuildContext context) {
@@ -26,6 +27,7 @@ class ApprovedTenders extends StatelessWidget {
status: tender.status,
countryCode: '',
projectStatus: tender.projectStatus,
isDesktop: isDesktop,
backgroundColor:
tender.status == 'Won'
? AppColors.green0
lib/views/your_tenders/widgets/filter_button.dart
+3 -2
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
import 'tenders_filter_dialog.dart';
@@ -14,7 +15,7 @@ class FilterButton extends StatelessWidget {
showModalBottomSheet(
context: context,
isScrollControlled: true,
backgroundColor: Colors.white,
backgroundColor: AppColors.backgroundColor,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
@@ -25,7 +26,7 @@ class FilterButton extends StatelessWidget {
context: context,
builder:
(_) => Dialog(
backgroundColor: Colors.white,
backgroundColor: AppColors.backgroundColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
),
lib/views/your_tenders/widgets/liked_disliked_tenders_list.dart
+3
View File
@@ -9,10 +9,12 @@ import 'package:tm_app/views/your_tenders/widgets/tender_card.dart';
class LikedDislikedTendersList extends StatefulWidget {
final LikedTendersResponse data;
final String status;
final bool isDesctop;
const LikedDislikedTendersList({
required this.data,
required this.status,
required this.isDesctop,
super.key,
});
@@ -85,6 +87,7 @@ class _LikedDislikedTendersListState extends State<LikedDislikedTendersList> {
countryCode: feedback.tender!.countryCode ?? '',
status: feedback.tender!.status ?? '',
projectStatus: feedback.tender!.procurementTypeCode!,
isDesktop: widget.isDesctop,
),
);
},
lib/views/your_tenders/widgets/tender_card.dart
+7 -3
View File
@@ -21,6 +21,7 @@ class TenderCard extends StatelessWidget {
final Color? statusCardColor;
final Color? statusTextColor;
final String countryCode;
final bool isDesktop;
const TenderCard({
required this.date,
@@ -28,6 +29,7 @@ class TenderCard extends StatelessWidget {
required this.description,
required this.location,
required this.countryCode,
required this.isDesktop,
this.countryFlag = 'assets/icons/SE.png',
this.status = 'Completed',
this.projectStatus = 'Self Control',
@@ -42,6 +44,7 @@ class TenderCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
height: isDesktop ? 182.0.h() : 240.0.h(),
width: double.infinity,
margin: EdgeInsets.only(
left: 24.0.w(),
@@ -112,6 +115,8 @@ class TenderCard extends StatelessWidget {
// Title
Text(
title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: AppColors.grey80,
fontSize: 16.0.sp(),
@@ -124,17 +129,16 @@ class TenderCard extends StatelessWidget {
// Description
Text(
description,
maxLines: isDesktop ? 2 : 3,
style: TextStyle(
color: AppColors.grey70,
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
height: 1.4,
),
maxLines: 3,
overflow: TextOverflow.ellipsis,
),
SizedBox(height: 24.0.h()),
Spacer(),
// Bottom section with location and action button
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
lib/views/your_tenders/widgets/tenders_submitted.dart
+7 -1
View File
@@ -6,9 +6,14 @@ import 'package:tm_app/views/your_tenders/widgets/tender_card.dart';
import '../../../data/services/model/tender_approvals_response/tender_approvals_response.dart';
class TendersSubmitted extends StatelessWidget {
const TendersSubmitted({required this.approvedTenders, super.key});
const TendersSubmitted({
required this.approvedTenders,
required this.isDesktop,
super.key,
});
final TenderApprovalsResponse approvedTenders;
final bool isDesktop;
@override
Widget build(BuildContext context) {
@@ -28,6 +33,7 @@ class TendersSubmitted extends StatelessWidget {
status: tender.status,
countryCode: tender.tender!.countryCode!,
projectStatus: tender.tender!.status!,
isDesktop: isDesktop,
backgroundColor:
tender.status == 'Won'
? AppColors.green0