chore: Upgrade dependencies

Author: TomBursch

backend/uv.lock

@@ -32,6 +32,7 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
+/lib/gen
 
 # Symbolication related
 app.*.symbols

flutter

@@ -1,3 +1,4 @@
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
-output-localization-file: app_localizations.dart
+output-localization-file: app_localizations.dart
+output-dir: lib/gen/l10n

kitchenowl/.gitignore

@@ -7,7 +7,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
 import 'package:kitchenowl/config.dart';
 import 'package:kitchenowl/cubits/auth_cubit.dart';

kitchenowl/l10n.yaml

@@ -1,4 +1,4 @@
-export 'package:flutter_gen/gen_l10n/app_localizations.dart';
+export 'package:kitchenowl/gen/l10n/app_localizations.dart';
 export 'widgets/_export.dart';
 export 'models/nullable.dart';
 export 'styles/dynamic.dart';

kitchenowl/lib/app.dart

@@ -163,7 +163,7 @@ class _RecipeCookingPageState extends State<RecipeCookingPage> {
                                 },
                                 textScaler: TextScaler.linear(textScaleFactor),
                                 extensionSet: extensionSet,
-                                imageBuilder: (uri, title, alt) => Image(
+                                imageBuilder: (config) => Image(
                                   fit: BoxFit.cover,
                                   frameBuilder: (context, child, frame,
                                           wasSynchronouslyLoaded) =>
@@ -176,9 +176,10 @@ class _RecipeCookingPageState extends State<RecipeCookingPage> {
                                   ),
                                   image: getImageProvider(
                                     context,
-                                    int.tryParse(uri.toString()) == 0
-                                        ? widget.recipe.image ?? uri.toString()
-                                        : uri.toString(),
+                                    int.tryParse(config.uri.toString()) == 0
+                                        ? widget.recipe.image ??
+                                            config.uri.toString()
+                                        : config.uri.toString(),
                                   ),
                                   loadingBuilder: (context, child, progress) =>
                                       progress == null

kitchenowl/lib/kitchenowl.dart

@@ -60,7 +60,7 @@ abstract class AppThemes {
         backgroundColor: colorScheme.surface,
         height: 70,
       ),
-      cardTheme: CardTheme(
+      cardTheme: CardThemeData(
         clipBehavior: Clip.antiAlias,
         color: colorScheme.surface,
         surfaceTintColor: colorScheme.surfaceTint,
@@ -89,7 +89,7 @@ abstract class AppThemes {
       colorScheme: colorScheme,
       useMaterial3: true,
     ).copyWith(
-      cardTheme: CardTheme(
+      cardTheme: CardThemeData(
         clipBehavior: Clip.antiAlias,
         elevation: 0,
         color: colorScheme.surfaceBright,

kitchenowl/lib/pages/recipe_cooking_page.dart

@@ -82,7 +82,7 @@ class KitchenOwlMarkdownBuilder extends StatefulWidget {
   final md.ExtensionSet? extensionSet;
 
   /// Call when build an image widget.
-  final MarkdownImageBuilder? imageBuilder;
+  final MarkdownSizedImageBuilder? imageBuilder;
 
   /// Call when build a checkbox widget.
   final MarkdownCheckboxBuilder? checkboxBuilder;
@@ -186,13 +186,13 @@ class _KitchenOwlMarkdownBuilderState extends State<KitchenOwlMarkdownBuilder>
             textScaler: widget.textScaler,
           ),
       imageDirectory: widget.imageDirectory,
-      imageBuilder: widget.imageBuilder ??
-          (uri, title, alt) => Padding(
+      sizedImageBuilder: widget.imageBuilder ??
+          (config) => Padding(
                 padding: const EdgeInsets.symmetric(vertical: 8),
                 child: ClipRRect(
                   borderRadius: BorderRadius.circular(16),
                   child: CachedNetworkImage(
-                    imageUrl: uri.toString(),
+                    imageUrl: config.uri.toString(),
                     placeholder: (context, url) =>
                         const Center(child: CircularProgressIndicator()),
                     errorWidget: (context, url, error) =>

kitchenowl/lib/styles/themes.dart

@@ -89,7 +89,7 @@ class RecipeMarkdownBody extends StatelessWidget {
                 ),
           },
           extensionSet: extensionSet,
-          imageBuilder: (uri, title, alt) => Image(
+          imageBuilder: (config) => Image(
             fit: BoxFit.cover,
             frameBuilder: (context, child, frame, wasSynchronouslyLoaded) =>
                 Padding(
@@ -101,9 +101,9 @@ class RecipeMarkdownBody extends StatelessWidget {
             ),
             image: getImageProvider(
               context,
-              int.tryParse(uri.toString()) == 0
-                  ? recipe.image ?? uri.toString()
-                  : uri.toString(),
+              int.tryParse(config.uri.toString()) == 0
+                  ? recipe.image ?? config.uri.toString()
+                  : config.uri.toString(),
             ),
             loadingBuilder: (context, child, progress) => progress == null
                 ? child