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

refactors on codes

Browse Source
This commit is contained in:
amirrezaghabeli
2025-09-18 10:27:16 +03:30
parent 1242252b25
commit 5689e98a43
18 changed files with 857 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/your_tenders/pages/your_tenders_desktop_page.dart
+96 -99
View File
@@ -4,10 +4,10 @@ import 'package:tm_app/core/constants/tender_feedback.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/your_tenders_view_model.dart';
import 'package:tm_app/views/shared/tablet_desktop_appbar.dart';
import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
import 'package:tm_app/views/your_tenders/widgets/tablet_desktop_appbar.dart';
import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
import '../../shared/desktop_navigation_widget.dart';
@@ -48,7 +48,9 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
child: Column(
children: [
SizedBox(height: 64.0.h()),
const TabletDesktopAppbar(),
const TabletDesktopAppbar(
title: YourTendersStrings.yourTenders,
),
SizedBox(height: 20.0.h()),
const FilterButton(platformType: PlatformType.tabletDesktop),
@@ -106,103 +108,7 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
Expanded(child: content),
SizedBox(height: 10.0.h()),
Row(
children: [
const Spacer(),
Text(
YourTendersStrings.page,
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w300,
color: AppColors.grey60,
),
),
SizedBox(width: 10.0.w()),
InkWell(
onTap: () async {
final selectedPage = await showDialog<int>(
context: context,
builder: (context) {
return AlertDialog(
backgroundColor:
AppColors.backgroundColor,
title: const Text(
YourTendersStrings.selectPage,
),
content: SizedBox(
width: 200.0.w(),
height: 300.0.h(),
child: ListView.builder(
itemCount: viewModel.totalPages,
itemBuilder: (context, index) {
final pageNumber = index + 1;
return ListTile(
title: Text(
'${YourTendersStrings.page} $pageNumber',
),
onTap:
() => Navigator.pop(
context,
pageNumber,
),
);
},
),
),
);
},
);
if (selectedPage != null) {
await viewModel.jumpToPage(selectedPage);
}
},
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: AppColors.grey30,
width: 1,
),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
SizedBox(width: 5.0.w()),
Text(
'${viewModel.currentPage}',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey70,
),
),
SizedBox(width: 5.0.w()),
const Icon(Icons.arrow_drop_down),
SizedBox(width: 5.0.w()),
],
),
),
),
SizedBox(width: 5.0.w()),
Text(
YourTendersStrings.of,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
SizedBox(width: 5.0.w()),
Text(
'${viewModel.totalPages}',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
],
),
_listPagesControll(context, viewModel),
SizedBox(height: 30.0.h()),
],
@@ -218,4 +124,95 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
),
);
}
Widget _listPagesControll(
BuildContext context,
YourTendersViewModel viewModel,
) {
return Row(
children: [
const Spacer(),
Text(
YourTendersStrings.page,
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w300,
color: AppColors.grey60,
),
),
SizedBox(width: 10.0.w()),
InkWell(
onTap: () async {
final selectedPage = await showDialog<int>(
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: AppColors.backgroundColor,
title: const Text(YourTendersStrings.selectPage),
content: SizedBox(
width: 200.0.w(),
height: 300.0.h(),
child: ListView.builder(
itemCount: viewModel.totalPages,
itemBuilder: (context, index) {
final pageNumber = index + 1;
return ListTile(
title: Text('${YourTendersStrings.page} $pageNumber'),
onTap: () => Navigator.pop(context, pageNumber),
);
},
),
),
);
},
);
if (selectedPage != null) {
await viewModel.jumpToPage(selectedPage);
}
},
child: Container(
decoration: BoxDecoration(
border: Border.all(color: AppColors.grey30, width: 1),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
SizedBox(width: 5.0.w()),
Text(
'${viewModel.currentPage}',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey70,
),
),
SizedBox(width: 5.0.w()),
const Icon(Icons.arrow_drop_down),
SizedBox(width: 5.0.w()),
],
),
),
),
SizedBox(width: 5.0.w()),
Text(
YourTendersStrings.of,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
SizedBox(width: 5.0.w()),
Text(
'${viewModel.totalPages}',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
],
);
}
}
lib/views/your_tenders/pages/your_tenders_tablet_page.dart
+96 -99
View File
@@ -3,9 +3,9 @@ import 'package:provider/provider.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/your_tenders_view_model.dart';
import 'package:tm_app/views/shared/tablet_desktop_appbar.dart';
import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
import 'package:tm_app/views/your_tenders/widgets/tablet_desktop_appbar.dart';
import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
import '../../../core/constants/tender_feedback.dart';
@@ -52,7 +52,9 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
const SizedBox(height: 64.0),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8.0.w()),
child: const TabletDesktopAppbar(),
child: const TabletDesktopAppbar(
title: YourTendersStrings.yourTenders,
),
),
SizedBox(height: 24.0.h()),
const FilterButton(platformType: PlatformType.tabletDesktop),
@@ -111,103 +113,7 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
Expanded(child: content),
SizedBox(height: 10.0.h()),
Row(
children: [
const Spacer(),
Text(
YourTendersStrings.page,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.w300,
color: AppColors.grey60,
),
),
SizedBox(width: 10.0.w()),
InkWell(
onTap: () async {
final selectedPage = await showDialog<int>(
context: context,
builder: (context) {
return AlertDialog(
backgroundColor:
AppColors.backgroundColor,
title: const Text(
YourTendersStrings.selectPage,
),
content: SizedBox(
width: 200.0.w(),
height: 300.0.h(),
child: ListView.builder(
itemCount: viewModel.totalPages,
itemBuilder: (context, index) {
final pageNumber = index + 1;
return ListTile(
title: Text(
'${YourTendersStrings.page} $pageNumber',
),
onTap:
() => Navigator.pop(
context,
pageNumber,
),
);
},
),
),
);
},
);
if (selectedPage != null) {
await viewModel.jumpToPage(selectedPage);
}
},
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: AppColors.grey30,
width: 1,
),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
SizedBox(width: 5.0.w()),
Text(
'${viewModel.currentPage}',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey70,
),
),
SizedBox(width: 5.0.w()),
const Icon(Icons.arrow_drop_down),
SizedBox(width: 5.0.w()),
],
),
),
),
const SizedBox(width: 5.0),
Text(
YourTendersStrings.page,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
SizedBox(width: 5.0.w()),
Text(
'${viewModel.totalPages}',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
],
),
_listPagesControll(context, viewModel),
const SizedBox(height: 30.0),
],
@@ -221,4 +127,95 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
),
);
}
Widget _listPagesControll(
BuildContext context,
YourTendersViewModel viewModel,
) {
return Row(
children: [
const Spacer(),
Text(
YourTendersStrings.page,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.w300,
color: AppColors.grey60,
),
),
SizedBox(width: 10.0.w()),
InkWell(
onTap: () async {
final selectedPage = await showDialog<int>(
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: AppColors.backgroundColor,
title: const Text(YourTendersStrings.selectPage),
content: SizedBox(
width: 200.0.w(),
height: 300.0.h(),
child: ListView.builder(
itemCount: viewModel.totalPages,
itemBuilder: (context, index) {
final pageNumber = index + 1;
return ListTile(
title: Text('${YourTendersStrings.page} $pageNumber'),
onTap: () => Navigator.pop(context, pageNumber),
);
},
),
),
);
},
);
if (selectedPage != null) {
await viewModel.jumpToPage(selectedPage);
}
},
child: Container(
decoration: BoxDecoration(
border: Border.all(color: AppColors.grey30, width: 1),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
SizedBox(width: 5.0.w()),
Text(
'${viewModel.currentPage}',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey70,
),
),
SizedBox(width: 5.0.w()),
const Icon(Icons.arrow_drop_down),
SizedBox(width: 5.0.w()),
],
),
),
),
const SizedBox(width: 5.0),
Text(
YourTendersStrings.page,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
SizedBox(width: 5.0.w()),
Text(
'${viewModel.totalPages}',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
],
);
}
}
lib/views/your_tenders/widgets/tablet_desktop_appbar.dart
-33
View File
@@ -1,33 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../strings/your_tenders_strings.dart';
class TabletDesktopAppbar extends StatelessWidget {
const TabletDesktopAppbar({super.key});
@override
Widget build(BuildContext context) {
return Row(
children: [
InkWell(
onTap: () => context.pop(),
child: SvgPicture.asset(AssetsManager.arrowLeft),
),
SizedBox(width: 8.0.w()),
Text(
YourTendersStrings.yourTenders,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
color: AppColors.grey70,
),
),
],
);
}
}
lib/views/your_tenders/widgets/tender_card.dart
+10 -31
View File
@@ -1,13 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart';
import 'package:tm_app/core/utils/date_utils.dart';
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
import '../../../core/constants/assets.dart';
import '../../../core/constants/tender_approval_status.dart';
import '../../../core/constants/tender_feedback.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/size_config.dart';
import '../../../view_models/your_tenders_view_model.dart';
import '../../shared/flag.dart';
class TenderCard extends StatelessWidget {
@@ -26,29 +27,7 @@ class TenderCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
// Determine styling based on tender status
Color backgroundColor = AppColors.grey0;
Color borderColor = AppColors.grey30;
String? statusIcon;
Color statusCardColor = AppColors.grey0;
Color statusTextColor = AppColors.grey60;
if (status == TenderFeedback.liked.value ||
status == TenderApprovalStatus.submitted.value) {
backgroundColor = AppColors.green0;
borderColor = AppColors.green10;
statusIcon = AssetsManager.tickCircle;
statusCardColor = AppColors.green20;
statusTextColor = AppColors.green30;
}
if (status == TenderFeedback.disliked.value ||
status == TenderApprovalStatus.rejected.value) {
backgroundColor = AppColors.red0;
borderColor = AppColors.red10;
statusIcon = AssetsManager.closeCircle;
statusCardColor = AppColors.red10;
statusTextColor = AppColors.red20;
}
final viewModel = context.read<YourTendersViewModel>();
return Container(
height: isDesktop ? 182.0.h() : 240.0.h(),
@@ -59,9 +38,9 @@ class TenderCard extends StatelessWidget {
bottom: 12.0.h(),
),
decoration: BoxDecoration(
color: backgroundColor,
color: viewModel.getBackGroundColorByStatus(status),
borderRadius: BorderRadius.circular(12),
border: Border.all(color: borderColor),
border: Border.all(color: viewModel.getBorderColorByStatus(status)),
),
child: Padding(
padding: EdgeInsets.all(16.0.w()),
@@ -88,18 +67,18 @@ class TenderCard extends StatelessWidget {
vertical: 4.0.h(),
),
decoration: BoxDecoration(
color: statusCardColor,
color: viewModel.getStatusCardColorByStatus(status),
borderRadius: BorderRadius.circular(8),
),
child: Row(
children: [
if (statusIcon != null)
if (viewModel.getStatusIconByStatus(status) != null)
SvgPicture.asset(
statusIcon,
viewModel.getStatusIconByStatus(status)!,
width: 16.0.w(),
height: 16.0.h(),
colorFilter: ColorFilter.mode(
statusTextColor,
viewModel.getStatusTextColorByStatus(status),
BlendMode.srcIn,
),
),
@@ -107,7 +86,7 @@ class TenderCard extends StatelessWidget {
Text(
status,
style: TextStyle(
color: statusTextColor,
color: viewModel.getStatusTextColorByStatus(status),
fontSize: 12.0.sp(),
fontWeight: FontWeight.w500,
),