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
+10 -3
View File
@@ -34,9 +34,14 @@ class HomeViewModel with ChangeNotifier {
int _currentPage = 0;
bool _isLoadingMore = false;
bool _hasMore = true;
/// آیا الان در حالت Recommended هستیم یا YourTenders
bool _isRecommendedMode = false;
List<TenderData> get tenders => _tenders;
bool get isLoadingMore => _isLoadingMore;
bool get hasMore => _hasMore;
bool get isRecommendedMode => _isRecommendedMode;
void init() async {
await getApprovedStates();
@@ -66,9 +71,7 @@ class HomeViewModel with ChangeNotifier {
}
Future<void> getHomeRecommandTenders({bool reset = false}) async {
if (_isLoadingMore || (!_hasMore && !reset)) {
return;
}
if (_isLoadingMore || (!_hasMore && !reset)) return;
if (reset) {
_currentPage = 0;
@@ -78,6 +81,7 @@ class HomeViewModel with ChangeNotifier {
_isLoadingMore = true;
_errorMessage = null;
_isRecommendedMode = true; // ✅ اینجا یعنی در حالت Recommended هستیم
notifyListeners();
final result = await _homeRepository.getHomeRecommendedTenders(
@@ -98,6 +102,7 @@ class HomeViewModel with ChangeNotifier {
_hasMore = false;
}
break;
case Error<RecommendedTendersResponse>():
_errorMessage = result.error.toString();
break;
@@ -109,6 +114,7 @@ class HomeViewModel with ChangeNotifier {
Future<void> getYourTenders() async {
_isLoading = true;
_isRecommendedMode = false; // ✅ وقتی YourTenders میاد → بدون pagination
notifyListeners();
final result = await _homeRepository.getYourTenders();
@@ -119,6 +125,7 @@ class HomeViewModel with ChangeNotifier {
_errorMessage = null;
if (data?.data?.isEmpty ?? true) {
// اگه YourTenders خالی بود → برو سمت Recommended
await getHomeRecommandTenders(reset: true);
} else {
_tenders.clear();
lib/views/home/pages/d_home_page.dart
+35 -14
View File
@@ -27,25 +27,36 @@ class DesktopHomePage extends StatelessWidget {
return Center(child: Text(homeViewModel.errorMessage!));
}
return SingleChildScrollView(
return Center(
child: SizedBox(
width: 780,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 55),
// SizedBox(width: 780, child: NotificationCard()),
SizedBox(height: 40.0),
_progressBarsRow(homeViewModel.tenderApprovalsStateResponse!),
SizedBox(height: 32.0.h()),
_firstTenderCardsRow(
context,
_progressBarsRow(
homeViewModel.tenderApprovalsStateResponse!,
),
SizedBox(height: 32.0.h()),
_yourTenderText(),
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),
],
),
),
),
);
},
),
@@ -81,7 +92,7 @@ class DesktopHomePage extends StatelessWidget {
circularProgressIndicatorWidth: 176,
circularProgressIndicatorHeight: 176,
),
SizedBox(width: 106),
//SizedBox(width: 106),
// ProgressBarColumn(
// text: AppStrings.contracting,
// value: double.parse(homeResponse.contracting ?? '0'),
@@ -100,11 +111,13 @@ class DesktopHomePage extends StatelessWidget {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
TenderCard(
Expanded(
child: TenderCard(
backgroundColor: AppColors.primary20,
iconPath: 'assets/icons/arrows.svg',
title: AppStrings.tenderSubmitted,
amount: tenderApprovalsStateResponse.data!.approvedTenders.toString(),
amount:
tenderApprovalsStateResponse.data!.approvedTenders.toString(),
// tenderApprovalsStateResponse
// .data!
// .approvalsBySubmission!
@@ -118,8 +131,10 @@ class DesktopHomePage extends StatelessWidget {
YourTendersRouteData().push(context);
},
),
),
SizedBox(width: 10),
TenderCard(
Expanded(
child: TenderCard(
backgroundColor: AppColors.primary10,
iconPath: 'assets/icons/thumb.svg',
title: AppStrings.approvedTenders,
@@ -132,7 +147,8 @@ class DesktopHomePage extends StatelessWidget {
YourTendersRouteData().push(context);
},
),
SizedBox(width: 10),
),
// SizedBox(width: 10),
// TenderCard(
// backgroundColor: AppColors.orange10,
// 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(
constraints: BoxConstraints(maxWidth: 740),
child: Align(
alignment: Alignment.centerLeft,
child: Text(
AppStrings.recommendation,
isYourTenders
? AppStrings.yourTenders
: AppStrings.recommendedTenders,
style: TextStyle(
fontSize: 18.0.sp(),
fontWeight: FontWeight.w700,
@@ -179,15 +198,17 @@ class DesktopHomePage extends StatelessWidget {
Widget _bottomListView(HomeViewModel homeViewModel) {
final controller = ScrollController();
controller.addListener(() {
if (homeViewModel.isRecommendedMode) {
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
}
}
});
return SizedBox(
width: 740,
height: 387.0,
lib/views/home/pages/m_home_page.dart
+2
View File
@@ -195,12 +195,14 @@ class MobileHomePage extends StatelessWidget {
final controller = ScrollController();
controller.addListener(() {
if (homeViewModel.isRecommendedMode) {
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
}
}
});
return Container(
lib/views/home/pages/t_home_page.dart
+7 -3
View File
@@ -50,7 +50,7 @@ class TabletHomePage extends StatelessWidget {
SizedBox(height: 8.0.h()),
//_secondTenderCardsRow(homeViewModel.homeResponse!),
SizedBox(height: 32.0.h()),
_yourTenderText(),
_yourTenderText(homeViewModel),
SizedBox(height: 8.0.h()),
_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(
AppStrings.recommendation,
isYourTenders ? AppStrings.yourTenders : AppStrings.recommendedTenders,
style: TextStyle(
fontSize: 18.0.sp(),
fontWeight: FontWeight.w700,
@@ -207,13 +208,16 @@ class TabletHomePage extends StatelessWidget {
final controller = ScrollController();
controller.addListener(() {
if (homeViewModel.isRecommendedMode) {
if (controller.position.pixels >=
controller.position.maxScrollExtent - 200) {
if (!homeViewModel.isLoadingMore && homeViewModel.hasMore) {
homeViewModel.getHomeRecommandTenders();
}
}
}
});
return SizedBox(
width: double.infinity,
height: 387.0.h(),
lib/views/login/pages/login_desktop_page.dart
+7 -3
View File
@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart';
@@ -50,7 +51,8 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
backgroundColor: AppColors.backgroundColor,
body: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisAlignment:
kIsWeb ? MainAxisAlignment.spaceAround : MainAxisAlignment.center,
children: [
SizedBox(
width: 526,
@@ -111,7 +113,8 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
},
),
),
Padding(
kIsWeb
? Padding(
padding: EdgeInsets.symmetric(vertical: 20.0.h()),
child: Image.asset(
AssetsManager.webLoginImage,
@@ -119,7 +122,8 @@ class _LoginDesktopPageState extends State<LoginDesktopPage> {
height: 944.0,
fit: BoxFit.fitWidth,
),
),
)
: Container(),
],
),
),
lib/views/profile/pages/t_profile_page.dart
+63 -8
View File
@@ -1,5 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.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/view_models/profile_view_model.dart';
@@ -87,17 +90,69 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
TitleDescription(title: 'Founded', description: '2010'),
SizedBox(height: 24.0.h()),
// Theme Toggle
Container(
padding: EdgeInsets.symmetric(
horizontal: 16.0.w(),
vertical: 12.0.h(),
Align(
alignment: AlignmentDirectional.centerStart,
child: Text(
AppStrings.settings,
style: TextStyle(
fontSize: 20.0.sp(),
fontWeight: FontWeight.w600,
color: AppColors.grey70,
),
),
),
SizedBox(height: 36.0.h()),
Padding(
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.surfaceColor,
borderRadius: BorderRadius.circular(8),
border: Border.all(color: AppColors.borderColor),
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(),
),
],
),