fix: openfoodfacts#1395 - refactoring make variable private

cli1005 · Apr 11, 2022 · 52ac3c7 · 52ac3c7
1 parent 238da17
commit 52ac3c7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/packages/smooth_app/lib/data_models/continuous_scan_model.dart b/packages/smooth_app/lib/data_models/continuous_scan_model.dart
@@ -105,7 +105,7 @@ class ContinuousScanModel with ChangeNotifier {
     _addBarcode(code);
   }
 
-  Future<bool> onCreate(String? barcode) async {
+  Future<bool> onCreateProduct(String? barcode) async {
     if (barcode == null) {
       return false;
     }

diff --git a/packages/smooth_app/lib/helpers/picture_capture_helper.dart b/packages/smooth_app/lib/helpers/picture_capture_helper.dart
@@ -35,13 +35,13 @@ Future<bool> uploadCapturedPicture(
     );
     return false;
   }
-  await updateContinuousScanModel(context, barcode);
+  await _updateContinuousScanModel(context, barcode);
   return true;
 }
 
-Future<void> updateContinuousScanModel(
+Future<void> _updateContinuousScanModel(
     BuildContext context, String barcode) async {
   final ContinuousScanModel? model =
       await ContinuousScanModel().load(context.read<LocalDatabase>());
-  await model?.onCreate(barcode);
+  await model?.onCreateProduct(barcode);
 }
diff --git a/packages/smooth_app/lib/pages/product/add_new_product_page.dart b/packages/smooth_app/lib/pages/product/add_new_product_page.dart
@@ -35,14 +35,14 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
   final Map<ImageField, List<File>> _uploadedImages =
       <ImageField, List<File>>{};
 
-  bool isProductLoaded = false;
+  bool _isProductLoaded = false;
 
   @override
   Widget build(BuildContext context) {
     final AppLocalizations appLocalizations = AppLocalizations.of(context)!;
     final ThemeData themeData = Theme.of(context);
     return Scaffold(
-      appBar: AppBar(automaticallyImplyLeading: !isProductLoaded),
+      appBar: AppBar(automaticallyImplyLeading: !_isProductLoaded),
       body: Padding(
         padding: const EdgeInsets.only(
           top: VERY_LARGE_SPACE,
@@ -79,7 +79,7 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
                   text: appLocalizations.finish,
                   onPressed: () {
                     Navigator.maybePop(
-                        context, isProductLoaded ? widget.barcode : null);
+                        context, _isProductLoaded ? widget.barcode : null);
                   },
                 ),
               ),
@@ -144,7 +144,7 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
             _uploadedImages[imageType] = _uploadedImages[imageType] ?? <File>[];
             _uploadedImages[imageType]!.add(initialPhoto);
             setState(() {
-              isProductLoaded = true;
+              _isProductLoaded = true;
             });
           }
           initialPhoto.delete();

diff --git a/packages/smooth_app/lib/widgets/smooth_product_carousel.dart b/packages/smooth_app/lib/widgets/smooth_product_carousel.dart
@@ -33,13 +33,13 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
   bool _returnToSearchCard = false;
 
   int get _searchCardAdjustment => widget.containSearchCard ? 1 : 0;
-  late ContinuousScanModel model;
+  late ContinuousScanModel _model;
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    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) {
@@ -52,7 +52,7 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
 
   @override
   Widget build(BuildContext context) {
-    barcodes = model.getBarcodes();
+    barcodes = _model.getBarcodes();
     return CarouselSlider.builder(
       itemCount: barcodes.length + _searchCardAdjustment,
       itemBuilder: (BuildContext context, int itemIndex, int itemRealIndex) {
@@ -89,10 +89,10 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
       return Container();
     }
     final String barcode = barcodes[index];
-    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);
@@ -103,9 +103,9 @@ class _SmoothProductCarouselState extends State<SmoothProductCarousel> {
             // Remove the "Add New Product" card. The user may have added it
             // already.
             if (barcodeLoaded == null) {
-              model.getBarcodes().remove(barcode);
+              _model.getBarcodes().remove(barcode);
             } else {
-              await model.refresh();
+              await _model.refresh();
             }
             setState(() {});
           },