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

Merge pull request 'tender screen changes' (#24) from tender_changes into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/24
This commit is contained in:
a.ghabeli
2025-08-10 08:29:13 +03:30
parent 1973097a42 988380e95e
commit 33afa5f0c3
8 changed files with 174 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/icons/tick.svg
+3
View File
@@ -0,0 +1,3 @@
<svg width="14" height="10" viewBox="0 0 14 10" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 4.9999L4.77333 8.77323L12.3333 1.22656" stroke="#777777" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 240 B

lib/core/constants/assets.dart
+1
View File
@@ -22,6 +22,7 @@ class AssetsManager {
static const arrowCircleRight = 'assets/icons/arrow-circle-right.svg';
static const arrowLeftSmall = 'assets/icons/arrow-left-small.svg';
static const arrowRightSmall = 'assets/icons/arrow-right-small.svg';
static const tick = 'assets/icons/tick.svg';
//home page
static const arrows = 'assets/icons/arrows.svg';
lib/core/utils/size_config.dart
+1
View File
@@ -34,6 +34,7 @@ extension SizeDoubleExt on double {
final double screenWidth = SizeConfig.screenWidth;
final double res = (this / 412.0) * screenWidth;
if (displaySize == DisplaySize.extraSmall
// ||
// displaySize == DisplaySize.small
) {
return res;
lib/data/services/home_service.dart
-3
View File
@@ -25,9 +25,6 @@ class HomeService {
await Future.delayed(Duration(seconds: 2));
appLogger.info('get home success');
// TODO: will change when api is ready
appLogger.debug(
HomeResponseModel.fromJson(jsonDecode(homeMockData)['data']),
);
return Result.ok(
HomeResponseModel.fromJson(jsonDecode(homeMockData)['data']),
);
lib/views/tenders/tenders_screen.dart
+2 -31
View File
@@ -6,33 +6,9 @@ import '../../core/theme/colors.dart';
import '../../core/utils/size_config.dart';
import 'widgets/main_tenders_slider.dart';
class TendersScreen extends StatefulWidget {
class TendersScreen extends StatelessWidget {
const TendersScreen({super.key});
@override
State<TendersScreen> createState() => _TendersScreenState();
}
class _TendersScreenState extends State<TendersScreen>
with SingleTickerProviderStateMixin {
late final TabController controller;
@override
void initState() {
super.initState();
controller = TabController(length: 2, vsync: this);
// Add listener to rebuild when tab changes
controller.addListener(() {
setState(() {});
});
}
@override
void dispose() {
controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return SafeArea(
@@ -42,12 +18,7 @@ class _TendersScreenState extends State<TendersScreen>
body: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(vertical: 24.0.h()),
child: Column(
children: [
// MainTabBar(controller: controller),
MainTendersSlider(),
],
),
child: MainTendersSlider(),
),
),
),
lib/views/tenders/widgets/main_tenders_slider.dart
+26 -1
View File
@@ -21,6 +21,8 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
List<Tender> likedTenders = [];
List<Tender> dislikedTenders = [];
int currentPage = 1;
List<Tender> rejectedTenders = [];
List<Tender> submittedTenders = [];
void _onDislike(Tender tender) {
if (likedTenders.contains(tender)) {
@@ -74,6 +76,25 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
});
}
void _onReject(Tender tender) {
if (rejectedTenders.contains(tender)) {
rejectedTenders.remove(tender);
} else {
rejectedTenders.add(tender);
}
setState(() {});
}
void _onSubmit(Tender tender) {
if (submittedTenders.contains(tender)) {
submittedTenders.remove(tender);
} else {
submittedTenders.add(tender);
}
setState(() {});
}
@override
void dispose() {
pageController.dispose();
@@ -86,7 +107,7 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
children: [
SizedBox(
width: double.infinity,
height: 694.0.h(),
height: 717.0.h(),
child: PageView.builder(
controller: pageController,
scrollDirection: Axis.horizontal,
@@ -112,6 +133,10 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
onDislike: () => _onDislike(tender),
onLike: () => _onLike(tender),
onApply: () => TenderDetailRouteData().push(context),
onReject: () => _onReject(tender),
onSubmit: () => _onSubmit(tender),
rejected: rejectedTenders.contains(tender),
submitted: submittedTenders.contains(tender),
);
},
),
lib/views/tenders/widgets/tender_action_buttons.dart
+126 -20
View File
@@ -9,16 +9,24 @@ class TenderActionButtons extends StatelessWidget {
final VoidCallback? onLike;
final VoidCallback? onDislike;
final VoidCallback? onClose;
final VoidCallback? onReject;
final VoidCallback? onSubmit;
final bool isLiked;
final bool isDisliked;
final bool rejected;
final bool submitted;
const TenderActionButtons({
super.key,
this.onLike,
this.onDislike,
this.onClose,
this.onReject,
this.onSubmit,
this.isLiked = false,
this.isDisliked = false,
this.rejected = false,
this.submitted = false,
});
@override
@@ -31,31 +39,129 @@ class TenderActionButtons extends StatelessWidget {
// Dislike button
GestureDetector(
onTap: onDislike,
child: SvgPicture.asset(
width: 32.0.w(),
height: 32.0.w(),
fit: BoxFit.cover,
AssetsManager.dislike,
colorFilter: ColorFilter.mode(
isDisliked ? AppColors.errorColor : AppColors.grey50,
BlendMode.srcATop,
),
child: Column(
children: [
SvgPicture.asset(
width: 32.0.w(),
height: 32.0.w(),
fit: BoxFit.cover,
AssetsManager.dislike,
colorFilter: ColorFilter.mode(
isDisliked ? AppColors.errorColor : AppColors.grey50,
BlendMode.srcATop,
),
),
SizedBox(height: 8.0.h()),
Text(
'Like',
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color: isDisliked ? AppColors.errorColor : AppColors.grey50,
),
),
],
),
),
SizedBox(width: 48.0.w()),
SizedBox(width: 32.0.w()),
//reject button
GestureDetector(
onTap: onReject,
child: Column(
children: [
Container(
width: 32.0.w(),
height: 32.0.w(),
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color: rejected ? AppColors.errorColor : AppColors.grey60,
width: 1.5.w(),
),
),
alignment: Alignment.center,
child: Icon(
Icons.close,
color: rejected ? AppColors.errorColor : AppColors.grey60,
size: 16,
),
),
SizedBox(height: 8.0.h()),
Text(
'Reject',
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color: rejected ? AppColors.errorColor : AppColors.grey60,
),
),
],
),
),
SizedBox(width: 32.0.w()),
//submit button
GestureDetector(
onTap: onSubmit,
child: Column(
children: [
Container(
width: 32.0.w(),
height: 32.0.w(),
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color:
submitted ? AppColors.successColor : AppColors.grey60,
width: 1.5.w(),
),
),
alignment: Alignment.center,
child: SvgPicture.asset(
AssetsManager.tick,
colorFilter: ColorFilter.mode(
submitted ? AppColors.successColor : AppColors.grey60,
BlendMode.srcATop,
),
),
),
SizedBox(height: 8.0.h()),
Text(
'Submit',
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color: submitted ? AppColors.successColor : AppColors.grey60,
),
),
],
),
),
SizedBox(width: 32.0.w()),
// Like button
GestureDetector(
onTap: onLike,
child: SvgPicture.asset(
width: 32.0.w(),
height: 32.0.w(),
fit: BoxFit.cover,
AssetsManager.like,
colorFilter: ColorFilter.mode(
isLiked ? AppColors.successColor : AppColors.grey50,
BlendMode.srcATop,
),
child: Column(
children: [
SvgPicture.asset(
width: 32.0.w(),
height: 32.0.w(),
fit: BoxFit.cover,
AssetsManager.like,
colorFilter: ColorFilter.mode(
isLiked ? AppColors.successColor : AppColors.grey50,
BlendMode.srcATop,
),
),
SizedBox(height: 8.0.h()),
Text(
'Like',
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color: isLiked ? AppColors.successColor : AppColors.grey50,
),
),
],
),
),
],
lib/views/tenders/widgets/tender_card.dart
+15 -2
View File
@@ -22,7 +22,10 @@ class TenderCard extends StatelessWidget {
final VoidCallback? onClose;
final bool isLiked;
final bool isDisliked;
final VoidCallback? onReject;
final VoidCallback? onSubmit;
final bool rejected;
final bool submitted;
const TenderCard({
required this.date,
required this.deadline,
@@ -38,6 +41,10 @@ class TenderCard extends StatelessWidget {
this.onClose,
this.isLiked = false,
this.isDisliked = false,
this.onReject,
this.onSubmit,
this.rejected = false,
this.submitted = false,
super.key,
});
@@ -46,7 +53,9 @@ class TenderCard extends StatelessWidget {
return Column(
children: [
Container(
width: 364.0.w(),
// width: 364.0.w(),
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal: 16.0.w()),
height: 587.0.h(),
decoration: BoxDecoration(
color: AppColors.grey0,
@@ -255,6 +264,10 @@ class TenderCard extends StatelessWidget {
onDislike: onDislike,
onLike: onLike,
onClose: onClose,
onReject: onReject,
onSubmit: onSubmit,
rejected: rejected,
submitted: submitted,
),
],
);