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

Merge pull request 'Fixed icon color of web and tablet pagination' (#211) from w_t_web_pagination_icon into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/211
This commit is contained in:
a.ghabeli
2025-10-12 11:38:09 +03:30
parent 6d247b0476 ecd6f863c2
commit 5e382e78ad
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart
+1 -1
View File
@@ -175,7 +175,7 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
), ),
), ),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
SvgPicture.asset(AssetsManager.arrowDownSmall), SvgPicture.asset(AssetsManager.arrowDownSmall,colorFilter: ColorFilter.mode(AppColors.grey60, BlendMode.srcIn),),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
], ],
), ),
lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart
+7 -1
View File
@@ -190,7 +190,13 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
), ),
), ),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
SvgPicture.asset(AssetsManager.arrowDownSmall), SvgPicture.asset(
AssetsManager.arrowDownSmall,
colorFilter: ColorFilter.mode(
AppColors.grey60,
BlendMode.srcIn,
),
),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
], ],
), ),
lib/views/your_tenders/pages/your_tenders_desktop_page.dart
+20 -9
View File
@@ -1,5 +1,7 @@
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/tender_feedback.dart'; import 'package:tm_app/core/constants/tender_feedback.dart';
import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/core/utils/size_config.dart';
@@ -53,8 +55,10 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
title: YourTendersStrings.yourTenders, title: YourTendersStrings.yourTenders,
), ),
SizedBox(height: 20.0.h()), SizedBox(height: 20.0.h()),
const FilterButton(platformType: PlatformType.tabletDesktop), const FilterButton(
platformType: PlatformType.tabletDesktop,
),
Expanded( Expanded(
child: Consumer<YourTendersViewModel>( child: Consumer<YourTendersViewModel>(
builder: (context, viewModel, child) { builder: (context, viewModel, child) {
@@ -67,13 +71,13 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
), ),
); );
} }
if (viewModel.errorMessage != null) { if (viewModel.errorMessage != null) {
return Center(child: Text(viewModel.errorMessage!)); return Center(child: Text(viewModel.errorMessage!));
} }
Widget content; Widget content;
if (viewModel.selectedStatus == if (viewModel.selectedStatus ==
YourTendersStrings.likeTenders && YourTendersStrings.likeTenders &&
viewModel.likedTendersData != null) { viewModel.likedTendersData != null) {
@@ -103,14 +107,14 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
child: Text(YourTendersStrings.noTenders), child: Text(YourTendersStrings.noTenders),
); );
} }
return Column( return Column(
children: [ children: [
Expanded(child: content), Expanded(child: content),
SizedBox(height: 10.0.h()), SizedBox(height: 10.0.h()),
_listPagesControll(context, viewModel), _listPagesControll(context, viewModel),
SizedBox(height: 30.0.h()), SizedBox(height: 30.0.h()),
], ],
); );
@@ -190,7 +194,14 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
), ),
), ),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
const Icon(Icons.arrow_drop_down), SvgPicture.asset(
AssetsManager.arrowDownSmall,
colorFilter: ColorFilter.mode(
AppColors.grey60,
BlendMode.srcIn,
),
),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
], ],
), ),
lib/views/your_tenders/pages/your_tenders_tablet_page.dart
+3 -1
View File
@@ -1,5 +1,7 @@
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/theme/colors.dart'; import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.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/view_models/your_tenders_view_model.dart';
@@ -197,7 +199,7 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
), ),
), ),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
const Icon(Icons.arrow_drop_down), SvgPicture.asset(AssetsManager.arrowDownSmall,colorFilter: ColorFilter.mode(AppColors.grey60, BlendMode.srcIn),),
SizedBox(width: 5.0.w()), SizedBox(width: 5.0.w()),
], ],
), ),