🐛 Make ThemeData properly wraps the content

Author: AlexV525

lib/src/states/camera_picker_state.dart

@@ -1515,7 +1515,7 @@ class CameraPickerState extends State<CameraPicker>
                             showProgressIndicator && isShootingButtonAnimate,
                         duration: pickerConfig.maximumRecordingDuration!,
                         size: size,
-                        ringsColor: theme.indicatorColor,
+                        ringsColor: Theme.of(context).indicatorColor,
                         ringsWidth: 3,
                       ),
                     ),
@@ -1536,7 +1536,7 @@ class CameraPickerState extends State<CameraPicker>
     required double gap,
   }) {
     final bool isLocked = mode == ExposureMode.locked;
-    final Color? color = isLocked ? _lockedColor : theme.iconTheme.color;
+    final color = isLocked ? _lockedColor : Theme.of(context).iconTheme.color;
     final Widget lineWidget = ValueListenableBuilder<bool>(
       valueListenable: isFocusPointDisplays,
       builder: (_, bool value, Widget? child) => AnimatedOpacity(
@@ -1716,7 +1716,7 @@ class CameraPickerState extends State<CameraPicker>
               size: pointWidth,
               color: cameraValue.exposureMode == ExposureMode.locked
                   ? _lockedColor
-                  : theme.iconTheme.color!,
+                  : Theme.of(context).iconTheme.color,
             ),
           ),
         ),

lib/src/states/camera_picker_viewer_state.dart

@@ -289,7 +289,7 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
       minWidth: 20,
       height: 32,
       padding: const EdgeInsets.symmetric(horizontal: 20),
-      color: theme.colorScheme.secondary,
+      color: Theme.of(context).colorScheme.secondary,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(3),
       ),
@@ -298,7 +298,7 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
       child: Text(
         Singleton.textDelegate.confirm,
         style: TextStyle(
-          color: theme.textTheme.bodyLarge?.color,
+          color: Theme.of(context).textTheme.bodyLarge?.color,
           fontSize: 17,
           fontWeight: FontWeight.normal,
         ),
@@ -402,15 +402,20 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
           deletePreviewFileIfConfigured();
         }
       },
-      child: Material(
-        color: Colors.black,
-        child: Stack(
-          fit: StackFit.expand,
-          children: <Widget>[
-            buildPreview(context),
-            buildForeground(context),
-            if (isSavingEntity) buildLoading(context),
-          ],
+      child: Theme(
+        data: theme,
+        child: Builder(
+          builder: (context) => Material(
+            color: Colors.black,
+            child: Stack(
+              fit: StackFit.expand,
+              children: <Widget>[
+                buildPreview(context),
+                buildForeground(context),
+                if (isSavingEntity) buildLoading(context),
+              ],
+            ),
+          ),
         ),
       ),
     );

lib/src/widgets/camera_focus_point.dart

@@ -13,7 +13,7 @@ final class CameraFocusPoint extends StatelessWidget {
   });
 
   final double size;
-  final Color color;
+  final Color? color;
 
   @override
   Widget build(BuildContext context) {
@@ -51,7 +51,7 @@ final class CameraFocusPointPainter extends CustomPainter {
   final double size;
   final double radius;
   final double strokeWidth;
-  final Color color;
+  final Color? color;
 
   Radius get _circularRadius => Radius.circular(radius);
 
@@ -61,8 +61,10 @@ final class CameraFocusPointPainter extends CustomPainter {
     final double lineLength = dividedSize.width - radius;
     final Paint paint = Paint()
       ..style = PaintingStyle.stroke
-      ..color = color
       ..strokeWidth = strokeWidth;
+    if (color != null) {
+      paint.color = color!;
+    }
 
     final Path path = Path()
       // Move to the start of the arc-line group at the left-top.