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

fixed some bug

Browse Source
This commit is contained in:
llsajjad
2025-08-25 15:23:39 +03:30
parent c54bdbe4f7
commit b0d5a23a9a
6 changed files with 185 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/view_models/home_view_model.dart
+11 -4
View File
@@ -13,7 +13,7 @@ class HomeViewModel with ChangeNotifier {
final HomeRepository _homeRepository; final HomeRepository _homeRepository;
HomeViewModel({required HomeRepository homeRepository}) HomeViewModel({required HomeRepository homeRepository})
: _homeRepository = homeRepository { : _homeRepository = homeRepository {
init(); init();
} }
@@ -34,9 +34,14 @@ class HomeViewModel with ChangeNotifier {
int _currentPage = 0; int _currentPage = 0;
bool _isLoadingMore = false; bool _isLoadingMore = false;
bool _hasMore = true; bool _hasMore = true;
/// آیا الان در حالت Recommended هستیم یا YourTenders
bool _isRecommendedMode = false;
List<TenderData> get tenders => _tenders; List<TenderData> get tenders => _tenders;
bool get isLoadingMore => _isLoadingMore; bool get isLoadingMore => _isLoadingMore;
bool get hasMore => _hasMore; bool get hasMore => _hasMore;
bool get isRecommendedMode => _isRecommendedMode;
void init() async { void init() async {
await getApprovedStates(); await getApprovedStates();
@@ -66,9 +71,7 @@ class HomeViewModel with ChangeNotifier {
} }
Future<void> getHomeRecommandTenders({bool reset = false}) async { Future<void> getHomeRecommandTenders({bool reset = false}) async {
if (_isLoadingMore || (!_hasMore && !reset)) { if (_isLoadingMore || (!_hasMore && !reset)) return;
return;
}
if (reset) { if (reset) {
_currentPage = 0; _currentPage = 0;
@@ -78,6 +81,7 @@ class HomeViewModel with ChangeNotifier {
_isLoadingMore = true; _isLoadingMore = true;
_errorMessage = null; _errorMessage = null;
_isRecommendedMode = true; // ✅ اینجا یعنی در حالت Recommended هستیم
notifyListeners(); notifyListeners();
final result = await _homeRepository.getHomeRecommendedTenders( final result = await _homeRepository.getHomeRecommendedTenders(
@@ -98,6 +102,7 @@ class HomeViewModel with ChangeNotifier {
_hasMore = false; _hasMore = false;
} }
break; break;
case Error<RecommendedTendersResponse>(): case Error<RecommendedTendersResponse>():
_errorMessage = result.error.toString(); _errorMessage = result.error.toString();
break; break;
@@ -109,6 +114,7 @@ class HomeViewModel with ChangeNotifier {
Future<void> getYourTenders() async { Future<void> getYourTenders() async {
_isLoading = true; _isLoading = true;
_isRecommendedMode = false; // ✅ وقتی YourTenders میاد → بدون pagination
notifyListeners(); notifyListeners();
final result = await _homeRepository.getYourTenders(); final result = await _homeRepository.getYourTenders();
@@ -119,6 +125,7 @@ class HomeViewModel with ChangeNotifier {
_errorMessage = null; _errorMessage = null;
if (data?.data?.isEmpty ?? true) { if (data?.data?.isEmpty ?? true) {
// اگه YourTenders خالی بود → برو سمت Recommended
await getHomeRecommandTenders(reset: true); await getHomeRecommandTenders(reset: true);
} else { } else {
_tenders.clear(); _tenders.clear();
lib/views/home/pages/d_home_page.dart
+76 -55
View File
@@ -27,24 +27,35 @@ class DesktopHomePage extends StatelessWidget {
return Center(child: Text(homeViewModel.errorMessage!)); return Center(child: Text(homeViewModel.errorMessage!));
} }
return SingleChildScrollView( return Center(
child: Column( child: SizedBox(
crossAxisAlignment: CrossAxisAlignment.center, width: 780,
children: [
SizedBox(height: 55), child: SingleChildScrollView(
// SizedBox(width: 780, child: NotificationCard()), child: Column(
SizedBox(height: 40.0), crossAxisAlignment: CrossAxisAlignment.center,
_progressBarsRow(homeViewModel.tenderApprovalsStateResponse!), children: [
SizedBox(height: 32.0.h()), SizedBox(height: 55),
_firstTenderCardsRow( // SizedBox(width: 780, child: NotificationCard()),
context, SizedBox(height: 40.0),
homeViewModel.tenderApprovalsStateResponse!, _progressBarsRow(
homeViewModel.tenderApprovalsStateResponse!,
),
SizedBox(height: 32.0.h()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 15.0.w()),
child: _firstTenderCardsRow(
context,
homeViewModel.tenderApprovalsStateResponse!,
),
),
SizedBox(height: 32.0.h()),
_yourTenderText(homeViewModel),
SizedBox(height: 8.0.h()),
_bottomListView(homeViewModel),
],
), ),
SizedBox(height: 32.0.h()), ),
_yourTenderText(),
SizedBox(height: 8.0.h()),
_bottomListView(homeViewModel),
],
), ),
); );
}, },
@@ -81,7 +92,7 @@ class DesktopHomePage extends StatelessWidget {
circularProgressIndicatorWidth: 176, circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176, circularProgressIndicatorHeight: 176,
), ),
SizedBox(width: 106), //SizedBox(width: 106),
// ProgressBarColumn( // ProgressBarColumn(
// text: AppStrings.contracting, // text: AppStrings.contracting,
// value: double.parse(homeResponse.contracting ?? '0'), // value: double.parse(homeResponse.contracting ?? '0'),
@@ -100,39 +111,44 @@ class DesktopHomePage extends StatelessWidget {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
TenderCard( Expanded(
backgroundColor: AppColors.primary20, child: TenderCard(
iconPath: 'assets/icons/arrows.svg', backgroundColor: AppColors.primary20,
title: AppStrings.tenderSubmitted, iconPath: 'assets/icons/arrows.svg',
amount: tenderApprovalsStateResponse.data!.approvedTenders.toString(), title: AppStrings.tenderSubmitted,
// tenderApprovalsStateResponse amount:
// .data! tenderApprovalsStateResponse.data!.approvedTenders.toString(),
// .approvalsBySubmission! // tenderApprovalsStateResponse
// .selfApply // .data!
// .toString(), // .approvalsBySubmission!
textColor: Color(0xFF0164FF), // .selfApply
enableTap: true, // .toString(),
width: 178, textColor: Color(0xFF0164FF),
height: 148, enableTap: true,
onTap: () { width: 178,
YourTendersRouteData().push(context); height: 148,
}, onTap: () {
YourTendersRouteData().push(context);
},
),
), ),
SizedBox(width: 10), SizedBox(width: 10),
TenderCard( Expanded(
backgroundColor: AppColors.primary10, child: TenderCard(
iconPath: 'assets/icons/thumb.svg', backgroundColor: AppColors.primary10,
title: AppStrings.approvedTenders, iconPath: 'assets/icons/thumb.svg',
amount: '0', title: AppStrings.approvedTenders,
textColor: Color(0xFF24848E), amount: '0',
enableTap: true, textColor: Color(0xFF24848E),
width: 178, enableTap: true,
height: 148, width: 178,
onTap: () { height: 148,
YourTendersRouteData().push(context); onTap: () {
}, YourTendersRouteData().push(context);
},
),
), ),
SizedBox(width: 10), // SizedBox(width: 10),
// TenderCard( // TenderCard(
// backgroundColor: AppColors.orange10, // backgroundColor: AppColors.orange10,
// iconPath: 'assets/icons/shield.svg', // iconPath: 'assets/icons/shield.svg',
@@ -160,13 +176,16 @@ class DesktopHomePage extends StatelessWidget {
); );
} }
Widget _yourTenderText() { Widget _yourTenderText(HomeViewModel homeViewModel) {
final isYourTenders = homeViewModel.data?.data?.isNotEmpty ?? false;
return ConstrainedBox( return ConstrainedBox(
constraints: BoxConstraints(maxWidth: 740), constraints: BoxConstraints(maxWidth: 740),
child: Align( child: Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
AppStrings.recommendation, isYourTenders
? AppStrings.yourTenders
: AppStrings.recommendedTenders,
style: TextStyle( style: TextStyle(
fontSize: 18.0.sp(), fontSize: 18.0.sp(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@@ -179,15 +198,17 @@ class DesktopHomePage extends StatelessWidget {
Widget _bottomListView(HomeViewModel homeViewModel) { Widget _bottomListView(HomeViewModel homeViewModel) {
final controller = ScrollController(); final controller = ScrollController();
controller.addListener(() { controller.addListener(() {
if (controller.position.pixels >= if (homeViewModel.isRecommendedMode) {
controller.position.maxScrollExtent - 200) { if (controller.position.pixels >=
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) { controller.position.maxScrollExtent - 200) {
homeViewModel.getHomeRecommandTenders(); if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
} }
} }
}); });
return SizedBox( return SizedBox(
width: 740, width: 740,
height: 387.0, height: 387.0,
lib/views/home/pages/m_home_page.dart
+6 -4
View File
@@ -195,10 +195,12 @@ class MobileHomePage extends StatelessWidget {
final controller = ScrollController(); final controller = ScrollController();
controller.addListener(() { controller.addListener(() {
if (controller.position.pixels >= if (homeViewModel.isRecommendedMode) {
controller.position.maxScrollExtent - 200) { if (controller.position.pixels >=
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) { controller.position.maxScrollExtent - 200) {
homeViewModel.getHomeRecommandTenders(); if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
} }
} }
}); });
lib/views/home/pages/t_home_page.dart
+14 -10
View File
@@ -50,7 +50,7 @@ class TabletHomePage extends StatelessWidget {
SizedBox(height: 8.0.h()), SizedBox(height: 8.0.h()),
//_secondTenderCardsRow(homeViewModel.homeResponse!), //_secondTenderCardsRow(homeViewModel.homeResponse!),
SizedBox(height: 32.0.h()), SizedBox(height: 32.0.h()),
_yourTenderText(), _yourTenderText(homeViewModel),
SizedBox(height: 8.0.h()), SizedBox(height: 8.0.h()),
_bottomListView(homeViewModel), _bottomListView(homeViewModel),
], ],
@@ -192,9 +192,10 @@ class TabletHomePage extends StatelessWidget {
); );
} }
Widget _yourTenderText() { Widget _yourTenderText(HomeViewModel homeViewModel) {
final isYourTenders = homeViewModel.data?.data?.isNotEmpty ?? false;
return Text( return Text(
AppStrings.recommendation, isYourTenders ? AppStrings.yourTenders : AppStrings.recommendedTenders,
style: TextStyle( style: TextStyle(
fontSize: 18.0.sp(), fontSize: 18.0.sp(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@@ -206,14 +207,17 @@ class TabletHomePage extends StatelessWidget {
Widget _bottomListView(HomeViewModel homeViewModel) { Widget _bottomListView(HomeViewModel homeViewModel) {
final controller = ScrollController(); final controller = ScrollController();
controller.addListener(() { controller.addListener(() {
if (controller.position.pixels >= if (homeViewModel.isRecommendedMode) {
controller.position.maxScrollExtent - 200) { if (controller.position.pixels >=
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) { controller.position.maxScrollExtent - 200) {
homeViewModel.getHomeRecommandTenders(); if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
} homeViewModel.getHomeRecommandTenders();
} }
}); }
}
});
return SizedBox( return SizedBox(
width: double.infinity, width: double.infinity,
height: 387.0.h(), height: 387.0.h(),
lib/views/login/pages/login_desktop_page.dart
+14 -10
View File
@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -50,7 +51,8 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
body: Center( body: Center(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment:
kIsWeb ? MainAxisAlignment.spaceAround : MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
width: 526, width: 526,
@@ -111,15 +113,17 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
}, },
), ),
), ),
Padding( kIsWeb
padding: EdgeInsets.symmetric(vertical: 20.0.h()), ? Padding(
child: Image.asset( padding: EdgeInsets.symmetric(vertical: 20.0.h()),
AssetsManager.webLoginImage, child: Image.asset(
width: 796.0, AssetsManager.webLoginImage,
height: 944.0, width: 796.0,
fit: BoxFit.fitWidth, height: 944.0,
), fit: BoxFit.fitWidth,
), ),
)
: Container(),
], ],
), ),
), ),
lib/views/profile/pages/t_profile_page.dart
+64 -9
View File
@@ -1,5 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/routes/app_routes.dart'; import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/view_models/profile_view_model.dart'; import 'package:tm_app/view_models/profile_view_model.dart';
@@ -87,17 +90,69 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
TitleDescription(title: 'Founded', description: '2010'), TitleDescription(title: 'Founded', description: '2010'),
SizedBox(height: 24.0.h()), SizedBox(height: 24.0.h()),
// Theme Toggle // Theme Toggle
Container( Align(
padding: EdgeInsets.symmetric( alignment: AlignmentDirectional.centerStart,
horizontal: 16.0.w(), child: Text(
vertical: 12.0.h(), AppStrings.settings,
style: TextStyle(
fontSize: 20.0.sp(),
fontWeight: FontWeight.w600,
color: AppColors.grey70,
),
), ),
decoration: BoxDecoration( ),
color: AppColors.surfaceColor, SizedBox(height: 36.0.h()),
borderRadius: BorderRadius.circular(8), Padding(
border: Border.all(color: AppColors.borderColor), padding: EdgeInsets.symmetric(horizontal: 8.0.w()),
child: Row(
children: [
Text(
AppStrings.appTheme,
style: TextStyle(
fontSize: 16.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey70,
),
),
Spacer(),
SvgPicture.asset(AssetsManager.sun),
SizedBox(width: 12.0.w()),
SizedBox(
width: 52.0.w(),
height: 32.0.h(),
child: ThemeToggle(),
),
SizedBox(width: 12.0.w()),
SvgPicture.asset(AssetsManager.moon),
],
),
),
SizedBox(height: 24.0.h()),
Divider(color: AppColors.dividerColor, thickness: 1),
SizedBox(height: 24.0.h()),
// Spacer(),
Align(
alignment: Alignment.centerRight,
child: InkWell(
onTap: () => viewModel.logout(),
child: Container(
width: 156,
height: 56.0.h(),
decoration: BoxDecoration(
color: AppColors.primary20,
borderRadius: BorderRadius.circular(100),
),
alignment: Alignment.center,
child: Text(
'Logout',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.primaryColor,
),
),
),
), ),
child: const ThemeToggle(),
), ),
], ],
), ),