From 7462d71b3361d8e18e3dce06d10b769d1577b72e Mon Sep 17 00:00:00 2001 From: amirrezaghabeli Date: Sun, 14 Sep 2025 11:52:59 +0330 Subject: [PATCH] show eu flag if it is empty --- .../widgets/tender_location_section.dart | 5 ++-- lib/views/home/tenders_list_item.dart | 7 +++--- .../widgets/liked_tenders_list_item.dart | 5 ++-- lib/views/shared/cached_svg.dart | 6 +---- lib/views/shared/flag.dart | 23 ++++++++++--------- lib/views/tenders/widgets/tender_card.dart | 5 ++-- .../your_tenders/widgets/tender_card.dart | 5 ++-- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/views/detail/widgets/tender_location_section.dart b/lib/views/detail/widgets/tender_location_section.dart index 954e59e..f30543b 100644 --- a/lib/views/detail/widgets/tender_location_section.dart +++ b/lib/views/detail/widgets/tender_location_section.dart @@ -48,8 +48,9 @@ class TenderLocationSection extends StatelessWidget { ), ), SizedBox(width: 4.0.w()), - if (detail.countryCode != null) - Flag(countryCode: detail.countryCode!), + detail.countryCode != null + ? Flag(countryCode: detail.countryCode!) + : const Flag(countryCode: ''), ], ), SizedBox(height: 8.0.h()), diff --git a/lib/views/home/tenders_list_item.dart b/lib/views/home/tenders_list_item.dart index 7e34c71..c81f393 100644 --- a/lib/views/home/tenders_list_item.dart +++ b/lib/views/home/tenders_list_item.dart @@ -114,8 +114,9 @@ class TendersListItem extends StatelessWidget { ), ), SizedBox(width: 8.0.w()), - if (tender.countryCode != null) - Flag(countryCode: tender.countryCode!), + tender.countryCode != null + ? Flag(countryCode: tender.countryCode!) + : const Flag(countryCode: ''), Spacer(), ], ), @@ -124,4 +125,4 @@ class TendersListItem extends StatelessWidget { ), ); } -} \ No newline at end of file +} 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 31ad653..77c8596 100644 --- a/lib/views/liked_tenders/widgets/liked_tenders_list_item.dart +++ b/lib/views/liked_tenders/widgets/liked_tenders_list_item.dart @@ -166,8 +166,9 @@ class LikedListItem extends StatelessWidget { ), ), SizedBox(width: 8.0.w()), - if (tender.countryCode != null) - Flag(countryCode: tender.countryCode!), + tender.countryCode != null + ? Flag(countryCode: tender.countryCode!) + : Flag(countryCode: ''), Spacer(), InkWell( onTap: () { diff --git a/lib/views/shared/cached_svg.dart b/lib/views/shared/cached_svg.dart index f06b4b0..76f7146 100644 --- a/lib/views/shared/cached_svg.dart +++ b/lib/views/shared/cached_svg.dart @@ -75,11 +75,7 @@ class _CachedSvgState extends State { @override Widget build(BuildContext context) { if (_isLoading) { - return SizedBox( - width: widget.width ?? 20, - height: widget.height ?? 20, - child: const Center(child: CircularProgressIndicator()), - ); + return SizedBox(); } if (_svgData == null) { diff --git a/lib/views/shared/flag.dart b/lib/views/shared/flag.dart index 5e59288..cd05604 100644 --- a/lib/views/shared/flag.dart +++ b/lib/views/shared/flag.dart @@ -11,16 +11,17 @@ class Flag extends StatelessWidget { @override Widget build(BuildContext context) { - return countryCode.isNotEmpty - ? ClipRRect( - borderRadius: BorderRadius.circular(6), - child: CachedSvg( - url: '${AppConfig.flagUrl}$countryCode', - width: 32.0.w(), - height: 21.0.h(), - fit: BoxFit.cover, - ), - ) - : const SizedBox(); + return ClipRRect( + borderRadius: BorderRadius.circular(6), + child: CachedSvg( + url: + countryCode.isNotEmpty + ? '${AppConfig.flagUrl}$countryCode' + : '${AppConfig.flagUrl}EU', + width: 32.0.w(), + height: 21.0.h(), + fit: BoxFit.cover, + ), + ); } } diff --git a/lib/views/tenders/widgets/tender_card.dart b/lib/views/tenders/widgets/tender_card.dart index 0bf5a55..392a2cb 100644 --- a/lib/views/tenders/widgets/tender_card.dart +++ b/lib/views/tenders/widgets/tender_card.dart @@ -252,8 +252,9 @@ class TenderCard extends StatelessWidget { ), SizedBox(width: 8.0.w()), // Country flag placeholder - if (tender.countryCode != null) - Flag(countryCode: tender.countryCode!), + tender.countryCode != null + ? Flag(countryCode: tender.countryCode!) + : Flag(countryCode: ''), ], ), ); diff --git a/lib/views/your_tenders/widgets/tender_card.dart b/lib/views/your_tenders/widgets/tender_card.dart index e3414ab..b368aab 100644 --- a/lib/views/your_tenders/widgets/tender_card.dart +++ b/lib/views/your_tenders/widgets/tender_card.dart @@ -169,8 +169,9 @@ class TenderCard extends StatelessWidget { ), ), SizedBox(width: 8.0.w()), - if (tender.countryCode != null) - Flag(countryCode: tender.countryCode!), + tender.countryCode != null + ? Flag(countryCode: tender.countryCode!) + : Flag(countryCode: ''), ], ), ),