ingredient popup: fix image rendering

wger-project · Jul 12, 2024 · d99ca41 · d99ca41
1 parent 5fa0889
commit d99ca41
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart
@@ -454,7 +454,11 @@ class IngredientFormState extends State<IngredientForm> {
                           IconButton(
                             icon: const Icon(Icons.info_outline),
                             onPressed: () {
-                              showIngredientDetails(context, suggestions[index].ingredient.id);
+                              showIngredientDetails(
+                                context,
+                                suggestions[index].ingredient.id,
+                                image: suggestions[index].ingredient.image?.image,
+                              );
                             },
                           ),
                           const SizedBox(width: 5),

diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart
@@ -102,12 +102,6 @@ String getKcalConsumedVsPlanned(Meal meal, BuildContext context) {
 }
 
 void showIngredientDetails(BuildContext context, int id, {String? image}) {
-  // when loading recently used ingredients, we never get an image :'(
-  // we also don't get an image when querying the API
-  // however, the typeahead suggestion does get an image, so we allow passing it...
-
-  final serverURL = context.read<NutritionPlansProvider>().baseProvider.auth.serverUrl;
-
   showDialog(
     context: context,
     builder: (context) => FutureBuilder<Ingredient>(
@@ -133,8 +127,7 @@ void showIngredientDetails(BuildContext context, int id, {String? image}) {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                if (image != null)
-                  CircleAvatar(backgroundImage: NetworkImage(serverURL! + image), radius: 128),
+                if (image != null) CircleAvatar(backgroundImage: NetworkImage(image), radius: 128),
                 if (image != null) const SizedBox(height: 12),
                 if (snapshot.hasError)
                   Text(

diff --git a/lib/widgets/nutrition/widgets.dart b/lib/widgets/nutrition/widgets.dart
@@ -163,7 +163,11 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
               trailing: IconButton(
                 icon: const Icon(Icons.info_outline),
                 onPressed: () {
-                  showIngredientDetails(context, suggestion.data.id, image: suggestion.data.image);
+                  showIngredientDetails(
+                    context,
+                    suggestion.data.id,
+                    image: suggestion.data.image != null ? url! + suggestion.data.image! : null,
+                  );
                 },
               ),
             );