Merge pull request 'show eu flag if it is empty' (#126) from fixed_flags into main

Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/126

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)
+              detail.countryCode != null
-                Flag(countryCode: detail.countryCode!),
+                  ? Flag(countryCode: detail.countryCode!)
+                  : const Flag(countryCode: ''),
             ],
           ),
           SizedBox(height: 8.0.h()),

lib/views/home/tenders_list_item.dart

@@ -114,8 +114,9 @@ class TendersListItem extends StatelessWidget {
                   ),
                 ),
                 SizedBox(width: 8.0.w()),
-                if (tender.countryCode != null)
+                tender.countryCode != null
-                  Flag(countryCode: tender.countryCode!),
+                    ? Flag(countryCode: tender.countryCode!)
+                    : const Flag(countryCode: ''),
                 Spacer(),
               ],
             ),

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)
+                tender.countryCode != null
-                  Flag(countryCode: tender.countryCode!),
+                    ? Flag(countryCode: tender.countryCode!)
+                    : Flag(countryCode: ''),
                 Spacer(),
                 InkWell(
                   onTap: () {

lib/views/shared/cached_svg.dart

@@ -75,11 +75,7 @@ class _CachedSvgState extends State<CachedSvg> {
   @override
   Widget build(BuildContext context) {
     if (_isLoading) {
-      return SizedBox(
+      return SizedBox();
-        width: widget.width ?? 20,
-        height: widget.height ?? 20,
-        child: const Center(child: CircularProgressIndicator()),
-      );
     }
 
     if (_svgData == null) {

lib/views/shared/flag.dart

@@ -11,16 +11,17 @@ class Flag extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return countryCode.isNotEmpty
+    return ClipRRect(
-        ? ClipRRect(
+      borderRadius: BorderRadius.circular(6),
-          borderRadius: BorderRadius.circular(6),
+      child: CachedSvg(
-          child: CachedSvg(
+        url:
-            url: '${AppConfig.flagUrl}$countryCode',
+            countryCode.isNotEmpty
-            width: 32.0.w(),
+                ? '${AppConfig.flagUrl}$countryCode'
-            height: 21.0.h(),
+                : '${AppConfig.flagUrl}EU',
-            fit: BoxFit.cover,
+        width: 32.0.w(),
-          ),
+        height: 21.0.h(),
-        )
+        fit: BoxFit.cover,
-        : const SizedBox();
+      ),
+    );
   }
 }

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)
+          tender.countryCode != null
-            Flag(countryCode: tender.countryCode!),
+              ? Flag(countryCode: tender.countryCode!)
+              : Flag(countryCode: ''),
         ],
       ),
     );

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)
+                      tender.countryCode != null
-                        Flag(countryCode: tender.countryCode!),
+                          ? Flag(countryCode: tender.countryCode!)
+                          : Flag(countryCode: ''),
                     ],
                   ),
                 ),