🚸 Improve stop capturing experiences (#146)

Author: AlexV525

CHANGELOG.md

@@ -8,7 +8,8 @@ that can be found in the LICENSE file. -->
 
 ### Improvements
 
-- Precache captured image for better experience. (#145)
+- Improve stop-capturing experiences. (#146)
+- Precache captured images for better experiences. (#145)
 
 ## 3.6.3
 

lib/src/states/camera_picker_state.dart

@@ -575,13 +575,7 @@ class CameraPickerState extends State<CameraPicker>
     }
     try {
       final XFile file = await controller.takePicture();
-      // Delay disposing the controller to hold the preview.
-      Future<void>.delayed(const Duration(milliseconds: 500), () {
-        innerController?.dispose();
-        safeSetState(() {
-          innerController = null;
-        });
-      });
+      await controller.pausePreview();
       final bool? isCapturedFileHandled = pickerConfig.onXFileCaptured?.call(
         file,
         CameraPickerViewType.image,
@@ -597,11 +591,12 @@ class CameraPickerState extends State<CameraPicker>
         Navigator.of(context).pop(entity);
         return;
       }
-      initCameras(currentCamera);
-      safeSetState(() {});
+      await controller.resumePreview();
     } catch (e) {
       realDebugPrint('Error when preview the captured file: $e');
       handleErrorWithHandler(e, pickerConfig.onError);
+    } finally {
+      safeSetState(() {});
     }
   }
 
@@ -688,8 +683,12 @@ class CameraPickerState extends State<CameraPicker>
       handleError();
       return;
     }
+    safeSetState(() {
+      isShootingButtonAnimate = false;
+    });
     try {
       final XFile file = await controller.stopVideoRecording();
+      await controller.pausePreview();
       final bool? isCapturedFileHandled = pickerConfig.onXFileCaptured?.call(
         file,
         CameraPickerViewType.video,
@@ -703,6 +702,8 @@ class CameraPickerState extends State<CameraPicker>
       );
       if (entity != null) {
         Navigator.of(context).pop(entity);
+      } else {
+        await controller.resumePreview();
       }
     } catch (e, s) {
       realDebugPrint('Error when stop recording video: $e');
@@ -711,7 +712,6 @@ class CameraPickerState extends State<CameraPicker>
       handleError();
       handleErrorWithHandler(e, pickerConfig.onError, s: s);
     } finally {
-      isShootingButtonAnimate = false;
       safeSetState(() {});
     }
   }
@@ -991,6 +991,7 @@ class CameraPickerState extends State<CameraPicker>
                 if ((innerController?.value.isRecordingVideo ?? false) &&
                     isRecordingRestricted)
                   CameraProgressButton(
+                    isAnimating: isShootingButtonAnimate,
                     duration: pickerConfig.maximumRecordingDuration!,
                     outerRadius: outerSize.width,
                     ringsColor: theme.indicatorColor,

lib/src/widgets/camera_progress_button.dart

@@ -12,13 +12,15 @@ import '../internals/methods.dart';
 class CameraProgressButton extends StatefulWidget {
   const CameraProgressButton({
     Key? key,
+    required this.isAnimating,
     required this.outerRadius,
     required this.ringsWidth,
     this.ringsColor = wechatThemeColor,
     this.progress = 0.0,
     this.duration = const Duration(seconds: 15),
   }) : super(key: key);
 
+  final bool isAnimating;
   final double outerRadius;
   final double ringsWidth;
   final Color ringsColor;
@@ -42,10 +44,24 @@ class _CircleProgressState extends State<CameraProgressButton>
   void initState() {
     super.initState();
     ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
-      progressController.forward();
+      if (widget.isAnimating) {
+        progressController.forward();
+      }
     });
   }
 
+  @override
+  void didUpdateWidget(CameraProgressButton oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.isAnimating != oldWidget.isAnimating) {
+      if (widget.isAnimating) {
+        progressController.forward();
+      } else {
+        progressController.stop();
+      }
+    }
+  }
+
   @override
   void dispose() {
     progressController.dispose();
@@ -112,5 +128,9 @@ class CameraProgressButtonPainter extends CustomPainter {
   }
 
   @override
-  bool shouldRepaint(CameraProgressButtonPainter oldDelegate) => true;
+  bool shouldRepaint(CameraProgressButtonPainter oldDelegate) {
+    return oldDelegate.ringsWidth != ringsWidth ||
+        oldDelegate.ringsColor != ringsColor ||
+        oldDelegate.progress != progress;
+  }
 }