diff --git a/lib/views/home/tender_card.dart b/lib/views/home/tender_card.dart index a9e1be1..b739d42 100644 --- a/lib/views/home/tender_card.dart +++ b/lib/views/home/tender_card.dart @@ -44,7 +44,7 @@ class TenderCard extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SvgPicture.asset(iconPath), + SvgPicture.asset(iconPath,width: 32.0.w(),height: 32.0.h(),), SizedBox(height: 4.0.h()), Text( title, diff --git a/lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart b/lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart index 9f776f8..8c697ab 100644 --- a/lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart +++ b/lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart @@ -118,7 +118,8 @@ class _LikedTendersDesktopPageState extends State { }, child: LikedListItem( tender: item.tender!, - approval: approval!, + approval: approval, + isDesktop: true, ), ), ); @@ -142,7 +143,7 @@ class _LikedTendersDesktopPageState extends State { ), SizedBox(width: 10.0.w()), - GestureDetector( + InkWell( onTap: () async { final selectedPage = await showDialog( context: context, diff --git a/lib/views/liked_tenders/pages/liked_tenders_mobile_page.dart b/lib/views/liked_tenders/pages/liked_tenders_mobile_page.dart index 706cb96..e727c63 100644 --- a/lib/views/liked_tenders/pages/liked_tenders_mobile_page.dart +++ b/lib/views/liked_tenders/pages/liked_tenders_mobile_page.dart @@ -116,7 +116,7 @@ class _LikedTendersMobilePageState extends State { padding: EdgeInsets.symmetric( horizontal: 20.0.w(), ), - child: SvgPicture.asset(AssetsManager.trash), + child: SvgPicture.asset(AssetsManager.trash,width: 32.0.w(),height: 32.0.h(),), ), onDismissed: (_) { if (item.tenderId != null) { diff --git a/lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart b/lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart index 371a3e0..f185b33 100644 --- a/lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart +++ b/lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart @@ -115,6 +115,7 @@ class _LikedTendersTabletPageState extends State { ), child: SvgPicture.asset( AssetsManager.trash, + width: 32.0.w(),height: 32.0.h(), ), ), onDismissed: (_) { @@ -150,7 +151,7 @@ class _LikedTendersTabletPageState extends State { ), SizedBox(width: 10.0.w()), - GestureDetector( + InkWell( onTap: () async { final selectedPage = await showDialog( context: context, diff --git a/lib/views/liked_tenders/widgets/liked_tenders_list_item.dart b/lib/views/liked_tenders/widgets/liked_tenders_list_item.dart index e139bde..9eecb80 100644 --- a/lib/views/liked_tenders/widgets/liked_tenders_list_item.dart +++ b/lib/views/liked_tenders/widgets/liked_tenders_list_item.dart @@ -1,21 +1,31 @@ import 'package:country_flags/country_flags.dart'; 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/theme/colors.dart'; import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/data/services/model/tender_data/tender_data.dart'; +import 'package:tm_app/view_models/liked_tenders_view_model.dart'; import 'package:tm_app/views/home/strings/home_strings.dart'; import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart'; class LikedListItem extends StatelessWidget { - const LikedListItem({required this.tender, this.approval, super.key}); + const LikedListItem({ + required this.tender, + this.approval, + this.isDesktop = false, + super.key, + }); final TenderData tender; final TenderApprovalsData? approval; + final bool isDesktop; + @override Widget build(BuildContext context) { + final viewModel = context.read(); return Container( decoration: BoxDecoration( color: AppColors.cardBackground, @@ -31,37 +41,88 @@ class LikedListItem extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox(height: 10.0.h()), - Container( - padding: EdgeInsets.symmetric( - horizontal: 10.0.w(), - vertical: 5.0.h(), - ), - decoration: BoxDecoration( - color: AppColors.primary30, - borderRadius: BorderRadius.circular(4), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - '${HomeStrings.tenderDeadline} :', - style: TextStyle( - fontSize: 15.0.sp(), - fontWeight: FontWeight.w500, - color: AppColors.textBlue, + isDesktop + ? Row( + children: [ + Expanded( + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 10.0.w(), + vertical: 5.0.h(), + ), + decoration: BoxDecoration( + color: AppColors.primary30, + borderRadius: BorderRadius.circular(4), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + '${HomeStrings.tenderDeadline} :', + style: TextStyle( + fontSize: 15.0.sp(), + fontWeight: FontWeight.w500, + color: AppColors.textBlue, + ), + ), + Text( + timeConvertor(tender.tenderDeadline!), + style: TextStyle( + fontSize: 14.0.sp(), + fontWeight: FontWeight.w500, + color: AppColors.grey80, + ), + ), + ], + ), + ), ), - ), - Text( - timeConvertor(tender.tenderDeadline!), - style: TextStyle( - fontSize: 14.0.sp(), - fontWeight: FontWeight.w500, - color: AppColors.grey80, + SizedBox(width: 8.0.w()), + InkWell( + child: SvgPicture.asset( + AssetsManager.trash, + width: 32.0.w(), + height: 32.0.h(), + ), + onTap: () { + if (tender.id != null) { + viewModel.removeTenderById(tender.id!); + } + }, ), + ], + ) + : Container( + padding: EdgeInsets.symmetric( + horizontal: 10.0.w(), + vertical: 5.0.h(), ), - ], - ), - ), + decoration: BoxDecoration( + color: AppColors.primary30, + borderRadius: BorderRadius.circular(4), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + '${HomeStrings.tenderDeadline} :', + style: TextStyle( + fontSize: 15.0.sp(), + fontWeight: FontWeight.w500, + color: AppColors.textBlue, + ), + ), + Text( + timeConvertor(tender.tenderDeadline!), + style: TextStyle( + fontSize: 14.0.sp(), + fontWeight: FontWeight.w500, + color: AppColors.grey80, + ), + ), + ], + ), + ), SizedBox(height: 12.0.h()), Text( tender.title!, @@ -113,7 +174,7 @@ class LikedListItem extends StatelessWidget { Spacer(), Container( width: 32.0.w(), - height: 32.0.w(), + height: 32.0.h(), decoration: BoxDecoration( shape: BoxShape.circle, border: Border.all( @@ -137,7 +198,7 @@ class LikedListItem extends StatelessWidget { SizedBox(width: 30.0.w()), Container( width: 32.0.w(), - height: 32.0.w(), + height: 32.0.h(), decoration: BoxDecoration( shape: BoxShape.circle, border: Border.all( diff --git a/lib/views/tenders/widgets/tender_action_buttons_row.dart b/lib/views/tenders/widgets/tender_action_buttons_row.dart index 38ac042..7b07606 100644 --- a/lib/views/tenders/widgets/tender_action_buttons_row.dart +++ b/lib/views/tenders/widgets/tender_action_buttons_row.dart @@ -70,8 +70,8 @@ class TenderActionButtonsRow extends StatelessWidget { child: Column( children: [ Container( - width: 32.0.w(), - height: 32.0.w(), + width: 24.0.w(), + height: 24.0.w(), decoration: BoxDecoration( shape: BoxShape.circle, border: Border.all( @@ -161,8 +161,8 @@ class TenderActionButtonsRow extends StatelessWidget { child: Column( children: [ Container( - width: 32.0.w(), - height: 32.0.w(), + width: 24.0.w(), + height: 24.0.w(), decoration: BoxDecoration( shape: BoxShape.circle, border: Border.all( @@ -215,8 +215,8 @@ class TenderActionButtonsRow extends StatelessWidget { child: Column( children: [ SvgPicture.asset( - width: 32.0.w(), - height: 32.0.w(), + width: 24.0.w(), + height: 24.0.w(), fit: BoxFit.cover, AssetsManager.dislike, colorFilter: ColorFilter.mode( @@ -259,8 +259,8 @@ class TenderActionButtonsRow extends StatelessWidget { child: Column( children: [ SvgPicture.asset( - width: 32.0.w(), - height: 32.0.w(), + width: 24.0.w(), + height: 24.0.w(), fit: BoxFit.cover, AssetsManager.like, colorFilter: ColorFilter.mode(