fix: #1395 - show newly added product in carousel

packages/smooth_app/lib/cards/product_cards/smooth_product_card_not_found.dart

@@ -12,7 +12,7 @@ class SmoothProductCardNotFound extends StatelessWidget {
     this.elevation = 0.0,
   });
 
-  final VoidCallback? callback;
+  final Function(String?)? callback;
   final double elevation;
   final String barcode;
 
@@ -48,16 +48,16 @@ class SmoothProductCardNotFound extends StatelessWidget {
                   text: appLocalizations.add_product_information_button_label,
                   icon: Icons.add,
                   padding: const EdgeInsets.symmetric(vertical: LARGE_SPACE),
-                  onPressed: () {
-                    Navigator.push<Widget>(
+                  onPressed: () async {
+                    final String? result = await Navigator.push<String>(
                       context,
-                      MaterialPageRoute<Widget>(
+                      MaterialPageRoute<String>(
                         builder: (BuildContext context) =>
                             AddNewProductPage(barcode),
                       ),
                     );
                     if (callback != null) {
-                      callback!();
+                      await callback!(result);
                     }
                   },
                 ),

packages/smooth_app/lib/data_models/continuous_scan_model.dart

@@ -105,6 +105,13 @@ class ContinuousScanModel with ChangeNotifier {
     _addBarcode(code);
   }
 
+  Future<bool> onCreateProduct(String? barcode) async {
+    if (barcode == null) {
+      return false;
+    }
+    return _addBarcode(barcode);
+  }
+
   Future<void> retryBarcodeFetch(String barcode) async {
     _setBarcodeState(barcode, ScannedProductState.LOADING);
     await _updateBarcode(barcode);
@@ -113,7 +120,9 @@ class ContinuousScanModel with ChangeNotifier {
   Future<bool> _addBarcode(final String barcode) async {
     final ScannedProductState? state = getBarcodeState(barcode);
     if (state == null) {
-      _barcodes.add(barcode);
+      if (!_barcodes.contains(barcode)) {
+        _barcodes.add(barcode);
+      }
       _setBarcodeState(barcode, ScannedProductState.LOADING);
       _cacheOrLoadBarcode(barcode);
       return true;

packages/smooth_app/lib/helpers/picture_capture_helper.dart

@@ -1,6 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
+import 'package:provider/provider.dart';
+import 'package:smooth_app/data_models/continuous_scan_model.dart';
+import 'package:smooth_app/database/local_database.dart';
 import 'package:smooth_app/database/product_query.dart';
 import 'package:smooth_app/generic_lib/loading_dialog.dart';
 
@@ -32,5 +35,13 @@ Future<bool> uploadCapturedPicture(
     );
     return false;
   }
+  await _updateContinuousScanModel(context, barcode);
   return true;
 }
+
+Future<void> _updateContinuousScanModel(
+    BuildContext context, String barcode) async {
+  final ContinuousScanModel? model =
+      await ContinuousScanModel().load(context.read<LocalDatabase>());
+  await model?.onCreateProduct(barcode);
+}

packages/smooth_app/lib/pages/product/add_new_product_page.dart

@@ -35,12 +35,14 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
   final Map<ImageField, List<File>> _uploadedImages =
       <ImageField, List<File>>{};
 
+  bool _isProductLoaded = false;
+
   @override
   Widget build(BuildContext context) {
     final AppLocalizations appLocalizations = AppLocalizations.of(context)!;
     final ThemeData themeData = Theme.of(context);
     return Scaffold(
-      appBar: AppBar(),
+      appBar: AppBar(automaticallyImplyLeading: !_isProductLoaded),
       body: Padding(
         padding: const EdgeInsets.only(
           top: VERY_LARGE_SPACE,
@@ -75,7 +77,10 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
                 alignment: Alignment.bottomRight,
                 child: SmoothActionButton(
                   text: appLocalizations.finish,
-                  onPressed: () => Navigator.pop(context),
+                  onPressed: () {
+                    Navigator.maybePop(
+                        context, _isProductLoaded ? widget.barcode : null);
+                  },
                 ),
               ),
             ),
@@ -138,7 +143,9 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
           if (finalPhoto != null) {
             _uploadedImages[imageType] = _uploadedImages[imageType] ?? <File>[];
             _uploadedImages[imageType]!.add(initialPhoto);
-            setState(() {});
+            setState(() {
+              _isProductLoaded = true;
+            });
           }
           initialPhoto.delete();
         },

packages/smooth_app/lib/widgets/smooth_product_carousel.dart

@@ -33,12 +33,13 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
   bool _returnToSearchCard = false;
 
   int get _searchCardAdjustment => widget.containSearchCard ? 1 : 0;
+  late ContinuousScanModel _model;
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    final ContinuousScanModel model = context.watch<ContinuousScanModel>();
-    barcodes = model.getBarcodes();
+    _model = context.watch<ContinuousScanModel>();
+    barcodes = _model.getBarcodes();
     _returnToSearchCard = InheritedDataManager.of(context).showSearchCard;
     if (_controller.ready) {
       if (_returnToSearchCard && widget.containSearchCard) {
@@ -51,6 +52,7 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
 
   @override
   Widget build(BuildContext context) {
+    barcodes = _model.getBarcodes();
     return CarouselSlider.builder(
       itemCount: barcodes.length + _searchCardAdjustment,
       itemBuilder: (BuildContext context, int itemIndex, int itemRealIndex) {
@@ -87,21 +89,24 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
       return Container();
     }
     final String barcode = barcodes[index];
-    final ContinuousScanModel model = context.watch<ContinuousScanModel>();
-    switch (model.getBarcodeState(barcode)!) {
+    switch (_model.getBarcodeState(barcode)!) {
       case ScannedProductState.FOUND:
       case ScannedProductState.CACHED:
-        final Product product = model.getProduct(barcode);
+        final Product product = _model.getProduct(barcode);
         return ScanProductCard(product);
       case ScannedProductState.LOADING:
         return SmoothProductCardLoading(barcode: barcode);
       case ScannedProductState.NOT_FOUND:
         return SmoothProductCardNotFound(
           barcode: barcode,
-          callback: () {
+          callback: (String? barcodeLoaded) async {
             // Remove the "Add New Product" card. The user may have added it
             // already.
-            model.getBarcodes().remove(barcode);
+            if (barcodeLoaded == null) {
+              _model.getBarcodes().remove(barcode);
+            } else {
+              await _model.refresh();
+            }
             setState(() {});
           },
         );