refactor image handling

lib/src/models/image_response.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/foundation.dart';
+
+class ImageResponse {
+  final Uint8List data;
+  final bool isSvg;
+
+  const ImageResponse({
+    required this.data,
+    required this.isSvg,
+  });
+}

lib/src/screens/category/category_screen.dart

@@ -13,10 +13,9 @@ import 'package:nextcloud_cookbook_flutter/src/screens/recipe_create_screen.dart
 import 'package:nextcloud_cookbook_flutter/src/screens/recipe_import_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/recipes_list_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/timer_screen.dart';
-import 'package:nextcloud_cookbook_flutter/src/services/services.dart';
-import 'package:nextcloud_cookbook_flutter/src/widget/authentication_cached_network_image.dart';
-import 'package:nextcloud_cookbook_flutter/src/widget/authentication_cached_network_recipe_image.dart';
 import 'package:nextcloud_cookbook_flutter/src/widget/category_card.dart';
+import 'package:nextcloud_cookbook_flutter/src/widget/recipe_image.dart';
+import 'package:nextcloud_cookbook_flutter/src/widget/user_image.dart';
 import 'package:search_page/search_page.dart';
 
 class CategoryScreen extends StatefulWidget {
@@ -54,13 +53,8 @@ class _CategoryScreenState extends State<CategoryScreen> {
                   decoration: BoxDecoration(
                     color: Theme.of(context).primaryColor,
                   ),
-                  child: Center(
-                    child: ClipOval(
-                      child: AuthenticationCachedNetworkImage(
-                        url: DataRepository().getUserAvatarUrl(),
-                        boxFit: BoxFit.fill,
-                      ),
-                    ),
+                  child: const Center(
+                    child: UserImage(),
                   ),
                 ),
                 ListTile(
@@ -155,10 +149,9 @@ class _CategoryScreenState extends State<CategoryScreen> {
                             ],
                             builder: (recipe) => ListTile(
                               title: Text(recipe.name),
-                              trailing: AuthenticationCachedNetworkRecipeImage(
-                                recipeId: recipe.recipeId,
-                                full: false,
-                                width: 50,
+                              trailing: RecipeImage(
+                                id: recipe.recipeId,
+                                size: const Size.square(50),
                               ),
                               onTap: () =>
                                   Navigator.of(context).pushReplacement(
@@ -290,21 +283,25 @@ class _CategoryScreenState extends State<CategoryScreen> {
         mainAxisSpacing: 10,
         padding: const EdgeInsets.only(top: 10),
         semanticChildCount: categories.length,
-        children: categories
-            .map(
-              (category) => GestureDetector(
-                child: CategoryCard(category, recipe?.first?.imageUrl),
-                onTap: () => Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) {
-                      return RecipesListScreen(category: category.name);
-                    },
-                  ),
+        children: [
+          for (int i = 0; i < categories.length; i++)
+            GestureDetector(
+              child: CategoryCard(
+                categories.elementAt(i),
+                recipe?.elementAt(i)?.recipeId,
+              ),
+              onTap: () => Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) {
+                    return RecipesListScreen(
+                      category: categories.elementAt(i).name,
+                    );
+                  },
                 ),
               ),
-            )
-            .toList(),
+            ),
+        ],
       ),
     );
   }

lib/src/screens/recipe/recipe_screen.dart

@@ -14,8 +14,8 @@ import 'package:nextcloud_cookbook_flutter/src/screens/recipe_edit_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/services/services.dart';
 import 'package:nextcloud_cookbook_flutter/src/util/setting_keys.dart';
 import 'package:nextcloud_cookbook_flutter/src/widget/animated_time_progress_bar.dart';
-import 'package:nextcloud_cookbook_flutter/src/widget/authentication_cached_network_recipe_image.dart';
 import 'package:nextcloud_cookbook_flutter/src/widget/duration_indicator.dart';
+import 'package:nextcloud_cookbook_flutter/src/widget/recipe_image.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -165,12 +165,9 @@ class RecipeScreenState extends State<RecipeScreen> {
               width: double.infinity,
               height: 200,
               child: Center(
-                child: AuthenticationCachedNetworkRecipeImage(
-                  recipeId: recipe.id!,
-                  full: true,
-                  width: double.infinity,
-                  height: 200,
-                  boxFit: BoxFit.cover,
+                child: RecipeImage(
+                  id: recipe.id,
+                  size: const Size(double.infinity, 200),
                 ),
               ),
             ),

lib/src/screens/recipes_list_screen.dart

@@ -5,7 +5,7 @@ import 'package:flutter_translate/flutter_translate.dart';
 import 'package:nc_cookbook_api/nc_cookbook_api.dart';
 import 'package:nextcloud_cookbook_flutter/src/blocs/recipes_short/recipes_short_bloc.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/recipe/recipe_screen.dart';
-import 'package:nextcloud_cookbook_flutter/src/widget/authentication_cached_network_recipe_image.dart';
+import 'package:nextcloud_cookbook_flutter/src/widget/recipe_image.dart';
 
 class RecipesListScreen extends StatefulWidget {
   final String category;
@@ -95,11 +95,9 @@ class RecipesListScreenState extends State<RecipesListScreen> {
   ListTile _buildRecipeStubScreen(RecipeStub recipe) {
     return ListTile(
       title: Text(recipe.name),
-      trailing: AuthenticationCachedNetworkRecipeImage(
-        recipeId: recipe.recipeId,
-        full: false,
-        width: 60,
-        height: 60,
+      trailing: RecipeImage(
+        id: recipe.recipeId,
+        size: const Size.square(60),
       ),
       onTap: () {
         Navigator.push(

lib/src/screens/timer_screen.dart

@@ -4,7 +4,7 @@ import 'package:nextcloud_cookbook_flutter/src/models/timer.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/recipe/recipe_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/services/services.dart';
 import 'package:nextcloud_cookbook_flutter/src/widget/animated_time_progress_bar.dart';
-import 'package:nextcloud_cookbook_flutter/src/widget/authentication_cached_network_recipe_image.dart';
+import 'package:nextcloud_cookbook_flutter/src/widget/recipe_image.dart';
 
 class TimerScreen extends StatefulWidget {
   const TimerScreen({super.key});
@@ -66,11 +66,9 @@ class _TimerScreen extends State<TimerScreen> {
   ListTile _buildListItem(Timer timer) {
     return ListTile(
       key: UniqueKey(),
-      leading: AuthenticationCachedNetworkRecipeImage(
-        recipeId: timer.recipeId,
-        full: false,
-        width: 60,
-        height: 60,
+      leading: RecipeImage(
+        id: timer.recipeId,
+        size: const Size.square(60),
       ),
       title: Text(timer.title),
       subtitle: AnimatedTimeProgressBar(

lib/src/services/data_repository.dart

@@ -87,12 +87,8 @@ class DataRepository {
   Future<RecipeStub?> _fetchCategoryMainRecipe(Category category) async {
     try {
       final categoryRecipes = await fetchRecipesShort(category: category.name);
-      if (categoryRecipes != null) {
-        for (final category in categoryRecipes) {
-          if (category.imageUrl.isNotEmpty) {
-            return category;
-          }
-        }
+      if (categoryRecipes != null && categoryRecipes.isNotEmpty) {
+        return categoryRecipes.first;
       }
     } catch (e) {
       log("Could not load main recipe of Category!");
@@ -117,4 +113,31 @@ class DataRepository {
 
     return matches?.map((e) => e.name) ?? [];
   }
+
+  Future<ImageResponse?> fetchImage(String recipeId, Size size) async {
+    final String sizeParam;
+    if (size.longestSide <= 16) {
+      sizeParam = "thumb16";
+    } else if (size.longestSide <= 250) {
+      sizeParam = "thumb";
+    } else {
+      sizeParam = "full";
+    }
+
+    final response = await api.recipeApi.getImage(
+      id: recipeId,
+      headers: {
+        "Accept": "image/jpeg, image/svg+xml",
+      },
+      size: sizeParam,
+    );
+    if (response.data != null) {
+      return ImageResponse(
+        data: response.data!,
+        isSvg: response.headers.value("content-type") == "image/svg+xml",
+      );
+    }
+
+    return null;
+  }
 }

lib/src/services/services.dart

@@ -12,6 +12,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_translate/flutter_translate.dart';
 import 'package:nc_cookbook_api/nc_cookbook_api.dart';
 import 'package:nextcloud_cookbook_flutter/src/models/app_authentication.dart';
+import 'package:nextcloud_cookbook_flutter/src/models/image_response.dart';
 import 'package:nextcloud_cookbook_flutter/src/models/timer.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/recipe_import_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/util/url_validator.dart';