merge conflicts

This commit is contained in:
amirrezaghabeli
2025-09-27 13:39:36 +03:30
parent 206553735e
commit ebcce6b9f8
6 changed files with 128 additions and 91 deletions
+9 -4
View File
@@ -52,8 +52,13 @@ class DesktopHomePage extends StatelessWidget {
_progressBarsRow(homeViewModel),
SizedBox(height: 32.0.h()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 15.0.w()),
child: _firstTenderCardsRow(context, homeViewModel),
padding: EdgeInsets.symmetric(
horizontal: 15.0.w(),
),
child: _firstTenderCardsRow(
context,
homeViewModel,
),
),
SizedBox(height: 32.0.h()),
_yourTenderText(homeViewModel),
@@ -166,8 +171,8 @@ class DesktopHomePage extends StatelessWidget {
iconPath: AssetsManager.thumbLike,
title: HomeStrings.likedTenders,
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
textColor: AppColors.grey80,
enableTap: true,
textColor: AppColors.grey50,
enableTap: (homeViewModel.feedbackStats?.totalLikes ?? 0) != 0,
width: 178,
height: 148,
onTap: () {
+2 -2
View File
@@ -151,8 +151,8 @@ class MobileHomePage extends StatelessWidget {
iconPath: AssetsManager.thumbLike,
title: HomeStrings.likedTenders,
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
textColor: AppColors.grey80,
enableTap: true,
textColor: AppColors.grey50,
enableTap: (homeViewModel.feedbackStats?.totalLikes ?? 0) != 0,
onTap: () {
const LikedTendersRouteData().push(context).then((value) {
homeViewModel.init();
+2 -4
View File
@@ -141,7 +141,6 @@ class TabletHomePage extends StatelessWidget {
iconPath: AssetsManager.approve,
title: HomeStrings.approvedTenders,
amount: '0',
textColor: AppColors.jellyBean,
enableTap: true,
width: double.infinity,
@@ -155,7 +154,6 @@ class TabletHomePage extends StatelessWidget {
);
}
// ignore: unused_element
Widget _secondTenderCardsRow(
HomeViewModel homeViewModel,
BuildContext context,
@@ -183,8 +181,8 @@ class TabletHomePage extends StatelessWidget {
iconPath: AssetsManager.thumbLike,
title: HomeStrings.likedTenders,
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
textColor: AppColors.grey80,
enableTap: true,
textColor: AppColors.grey50,
enableTap: (homeViewModel.feedbackStats?.totalLikes ?? 0) != 0,
width: double.infinity,
height: 148,
onTap: () {