Merge branch 'master' of github.com:GaecKo/flutter into feature/end_workout_button

lib/l10n/app_ca.arb

@@ -471,6 +471,26 @@
   },
   "gallery": "Galeria",
   "@gallery": {},
+  "imageFormatNotSupported": "{imageFormat} no és compatible",
+  "@imageFormatNotSupported": {
+      "description": "Label shown on the error container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "imageFormatNotSupportedDetail": "Les imatges {imageFormat} encara no són compatibles.",
+  "@imageFormatNotSupportedDetail": {
+      "description": "Label shown on the image preview container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
   "addImage": "Afegeix imatge",
   "@addImage": {},
   "dataCopied": "Dades copiades a una nova entrada",

lib/l10n/app_cs.arb

@@ -508,6 +508,26 @@
   "@takePicture": {},
   "gallery": "Galerie",
   "@gallery": {},
+  "imageFormatNotSupported": "{imageFormat} není podporován",
+  "@imageFormatNotSupported": {
+      "description": "Label shown on the error container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "imageFormatNotSupportedDetail": "Obrazy {imageFormat} zatím nejsou podporovány.",
+  "@imageFormatNotSupportedDetail": {
+      "description": "Label shown on the image preview container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
   "productFound": "Produkt nalezen",
   "@productFound": {
     "description": "Header label for dialog when product is found with barcode"

lib/l10n/app_de.arb

@@ -357,6 +357,26 @@
     "@addImage": {},
     "gallery": "Galerie",
     "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} wird nicht unterstützt",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "{imageFormat}-Bilder werden noch nicht unterstützt.",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
     "chooseFromLibrary": "Wähle aus der Bibliothek",
     "@chooseFromLibrary": {},
     "takePicture": "Bild aufnehmen",

lib/l10n/app_en.arb

@@ -771,6 +771,26 @@
   },
   "imageDetailsLicenseNotice": "By submitting this image, you agree to release it under the CC-BY-SA-4. The image must be either your own work or the author must have released it under a license compatible with it.",
   "imageDetailsLicenseNoticeLinkToLicense": "See license text.",
+  "imageFormatNotSupported": "{imageFormat} not supported",
+  "@imageFormatNotSupported": {
+      "description": "Label shown on the error container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "imageFormatNotSupportedDetail": "{imageFormat} images are not supported yet.",
+  "@imageFormatNotSupportedDetail": {
+      "description": "Label shown on the image preview container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
   "add": "add",
   "@add": {
     "description": "Add button text"
@@ -1033,4 +1053,4 @@
   "darkMode": "Always dark mode",
   "lightMode": "Always light mode",
   "systemMode": "System settings"
-}
+}

lib/l10n/app_es.arb

@@ -344,6 +344,26 @@
     "@addImage": {},
     "gallery": "Galería",
     "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} no compatible",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "Las imágenes {imageFormat} aún no son compatibles.",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
     "chooseFromLibrary": "Elije de la biblioteca de fotos",
     "@chooseFromLibrary": {},
     "takePicture": "Toma una foto",

lib/l10n/app_fr.arb

@@ -354,6 +354,26 @@
     "@addImage": {},
     "gallery": "Galerie",
     "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} non pris en charge",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "{imageFormat} non pris en charge",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
     "chooseFromLibrary": "Choisir depuis la bibliothèque",
     "@chooseFromLibrary": {},
     "takePicture": "Prendre une photo",

lib/l10n/app_ja.arb

@@ -473,6 +473,26 @@
     "@chooseFromLibrary": {},
     "gallery": "Gallery",
     "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat}はサポートされていません",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "{imageFormat}形式の画像はまだサポートされていません。",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
     "addImage": "Add image",
     "@addImage": {},
     "dataCopied": "Data copied to new entry",

lib/l10n/app_uk.arb

@@ -479,6 +479,26 @@
     "@chooseFromLibrary": {},
     "gallery": "Галерея",
     "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} не підтримується",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "Зображення {imageFormat} поки що не підтримуються.",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
     "addImage": "Додати зображення",
     "@addImage": {},
     "dataCopied": "Дані скопійовано до нового запису",

lib/widgets/gallery/overview.dart

@@ -35,6 +35,8 @@ class Gallery extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final provider = Provider.of<GalleryProvider>(context);
+    final i18n = AppLocalizations.of(context);
+    final theme = Theme.of(context);
 
     return Padding(
       padding: const EdgeInsets.all(5),
@@ -63,6 +65,23 @@ class Gallery extends StatelessWidget {
                       image: NetworkImage(currentImage.url!),
                       fit: BoxFit.cover,
                       imageSemanticLabel: currentImage.description,
+                      imageErrorBuilder: (context, error, stackTrace) {
+                        final imageFormat = currentImage.url!.split('.').last.toUpperCase();
+                        return AspectRatio(
+                          aspectRatio: 1,
+                          child: Container(
+                            color: theme.colorScheme.errorContainer,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              spacing: 8,
+                              children: [
+                                Icon(Icons.broken_image),
+                                Text(i18n.imageFormatNotSupported(imageFormat)), 
+                              ]
+                            ),
+                          ),
+                        );
+                      },
                     ),
                   );
                 },
@@ -82,6 +101,8 @@ class ImageDetail extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final theme = Theme.of(context);
     return Container(
       key: Key('image-${image.id!}-detail'),
       padding: const EdgeInsets.all(10),
@@ -92,7 +113,25 @@ class ImageDetail extends StatelessWidget {
             style: Theme.of(context).textTheme.headlineSmall,
           ),
           Expanded(
-            child: Image.network(image.url!, semanticLabel: image.description),
+            child: Image.network(
+              image.url!,
+              semanticLabel: image.description,
+              errorBuilder: (context, error, stackTrace) {
+                final imageFormat = image.url!.split('.').last.toUpperCase();
+
+                return Container(
+                  color: theme.colorScheme.errorContainer,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    spacing: 8,
+                    children: [
+                      Icon(Icons.broken_image),
+                      Text(i18n.imageFormatNotSupportedDetail(imageFormat))
+                    ]
+                  ),
+                );
+              },
+            ),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 8),