fix: lifecycle refactoring (#995)

Renamed file: * `lifecycle_manager.dart`: was `scanner_state_manager.dart`; renamed `onStop` in `onPause` Impacted files: * `continuous_scan_page.dart`: refactored * `labeler.yaml`: refactored * `ml_kit_scan_page.dart`: refactored
openfoodfacts · Jan 22, 2022 · 3d4bc59 · 3d4bc59
1 parent 72a2f27
commit 3d4bc59
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -34,7 +34,7 @@ scan:
 - packages/smooth_app/lib/pages/scan/continuous_scan_page.dart
 - packages/smooth_app/lib/pages/scan/scan_page.dart
 - packages/smooth_app/lib/pages/scan/scanner_overlay.dart
-- packages/smooth_app/lib/pages/scan/scanner_state_manager.dart
+- packages/smooth_app/lib/pages/scan/lifecycle_manager.dart
 
 mlkit:
 - packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart

diff --git a/packages/smooth_app/lib/pages/scan/continuous_scan_page.dart b/packages/smooth_app/lib/pages/scan/continuous_scan_page.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:qr_code_scanner/qr_code_scanner.dart';
 import 'package:smooth_app/data_models/continuous_scan_model.dart';
-import 'package:smooth_app/pages/scan/scanner_state_manager.dart';
+import 'package:smooth_app/pages/scan/lifecycle_manager.dart';
 
 class ContinuousScanPage extends StatefulWidget {
   const ContinuousScanPage();
@@ -27,7 +27,7 @@ class _ContinuousScanPageState extends State<ContinuousScanPage> {
 
         return LifeCycleManager(
           onResume: _resumeLiveFeed,
-          onStop: _stopLiveFeed,
+          onPause: _stopLiveFeed,
           child: QRView(
             overlay: QrScannerOverlayShape(
               // We use [SmoothViewFinder] instead of the overlay.

diff --git a/...lib/pages/scan/scanner_state_manager.dart → ...app/lib/pages/scan/lifecycle_manager.dart b/...lib/pages/scan/scanner_state_manager.dart → ...app/lib/pages/scan/lifecycle_manager.dart
@@ -6,13 +6,13 @@ import 'package:visibility_detector/visibility_detector.dart';
 class LifeCycleManager extends StatefulWidget {
   const LifeCycleManager({
     required this.onResume,
-    required this.onStop,
+    required this.onPause,
     required this.child,
     Key? key,
   }) : super(key: key);
 
   final Function() onResume;
-  final Function() onStop;
+  final Function() onPause;
   final Widget child;
 
   @override
@@ -41,7 +41,7 @@ class LifeCycleManagerState extends State<LifeCycleManager>
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.inactive) {
-      widget.onStop.call();
+      widget.onPause.call();
     } else if (state == AppLifecycleState.resumed) {
       widget.onResume.call();
     }
@@ -53,7 +53,7 @@ class LifeCycleManagerState extends State<LifeCycleManager>
       key: const ValueKey<String>('VisibilityDetector'),
       onVisibilityChanged: (VisibilityInfo info) {
         if (info.visibleFraction == 0.0) {
-          widget.onStop.call();
+          widget.onPause.call();
         } else {
           widget.onResume.call();
         }

diff --git a/packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart b/packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart
@@ -8,7 +8,7 @@ import 'package:google_ml_barcode_scanner/google_ml_barcode_scanner.dart';
 import 'package:provider/provider.dart';
 import 'package:smooth_app/data_models/continuous_scan_model.dart';
 import 'package:smooth_app/main.dart';
-import 'package:smooth_app/pages/scan/scanner_state_manager.dart';
+import 'package:smooth_app/pages/scan/lifecycle_manager.dart';
 
 class MLKitScannerPage extends StatefulWidget {
   const MLKitScannerPage({Key? key}) : super(key: key);
@@ -71,7 +71,7 @@ class MLKitScannerPageState extends State<MLKitScannerPage> {
 
     return LifeCycleManager(
       onResume: _startLiveFeed,
-      onStop: _stopImageStream,
+      onPause: _stopImageStream,
       child: _buildScannerWidget(),
     );
   }