Merge remote-tracking branch 'origin/nullsafety'

CHANGELOG.md

+## [1.0.0-nullsafety.0] - 10/02/2021
+* Add nullsafety
+
 ## [0.3.0] - 10/02/2021
 * breaking change capture method returns Uint8List instead of File.
 * support for web and windows

example/pubspec.yaml

@@ -11,8 +11,8 @@ version: 1.0.0+1
 publish_to: none
 
 environment:
-  sdk: '>=2.8.0 <3.0.0'
-  # sdk: '>=2.12.0-259.8.beta <3.0.0'
+  # sdk: '>=2.8.0 <3.0.0'
+  sdk: '>=2.12.0-259.8.beta <3.0.0'
 
 dependencies:
   flutter:

lib/screenshot.dart

@@ -16,26 +16,28 @@ import 'dart:ui' as ui;
 ///
 ///
 class ScreenshotController {
-  GlobalKey? _containerKey;
+  late GlobalKey _containerKey;
   ScreenshotController() {
     _containerKey = GlobalKey();
   }
 
   /// Captures image and saves to given path
-  Future<String> captureAndSave(
+  Future<String?> captureAndSave(
     String directory, {
     String? fileName,
     double? pixelRatio,
-    Duration delay: const Duration(milliseconds: 20),
+    Duration delay = const Duration(milliseconds: 20),
   }) async {
-    Uint8List content = await capture(
+    Uint8List? content = await capture(
       pixelRatio: pixelRatio,
       delay: delay,
     );
+    if (content != null) {
+      PlatformFileManager fileManager = PlatformFileManager();
 
-    PlatformFileManager fileManager = PlatformFileManager();
-
-    return fileManager.saveFile(content, directory, name: fileName);
+      return fileManager.saveFile(content, directory, name: fileName);
+    }
+    return null;
   }
 
   Future<Uint8List> capture({
@@ -43,15 +45,15 @@ class ScreenshotController {
     Duration delay: const Duration(milliseconds: 20),
   }) {
     //Delay is required. See Issue https://github.com/flutter/flutter/issues/22308
-    return new Future.delayed(delay, () async {
+    return new Future.delayed(delay ?? Duration(milliseconds: 20), () async {
       try {
         ui.Image image = await captureAsUiImage(
           delay: Duration.zero,
           pixelRatio: pixelRatio,
         );
-        ByteData byteData = await (image.toByteData(
-            format: ui.ImageByteFormat.png) as FutureOr<ByteData>);
-        Uint8List pngBytes = byteData.buffer.asUint8List();
+        ByteData? byteData =
+            await image.toByteData(format: ui.ImageByteFormat.png);
+        Uint8List? pngBytes = byteData?.buffer.asUint8List();
 
         return pngBytes;
       } catch (Exception) {
@@ -67,12 +69,15 @@ class ScreenshotController {
     return new Future.delayed(delay, () async {
       try {
         RenderRepaintBoundary boundary = this
-            ._containerKey!
-            .currentContext!
-            .findRenderObject() as RenderRepaintBoundary;
-        pixelRatio = pixelRatio ??
-            MediaQuery.of(_containerKey!.currentContext!).devicePixelRatio;
-        ui.Image image = await boundary.toImage(pixelRatio: pixelRatio!);
+            ._containerKey
+            .currentContext
+            ?.findRenderObject() as RenderRepaintBoundary;
+        BuildContext? context = _containerKey.currentContext;
+        if (pixelRatio == null) {
+          if (context != null)
+            pixelRatio = pixelRatio ?? MediaQuery.of(context).devicePixelRatio;
+        }
+        ui.Image image = await boundary.toImage(pixelRatio: pixelRatio ?? 1);
         return image;
       } catch (Exception) {
         throw (Exception);
@@ -139,8 +144,8 @@ class Screenshot<T> extends StatefulWidget {
   final ScreenshotController? controller;
   const Screenshot({
     Key? key,
-    this.child,
-    this.controller,
+    required this.child,
+    required this.controller,
   }) : super(key: key);
 
   @override
@@ -150,15 +155,15 @@ class Screenshot<T> extends StatefulWidget {
 }
 
 class ScreenshotState extends State<Screenshot> with TickerProviderStateMixin {
-  ScreenshotController? _controller;
+  late ScreenshotController _controller;
 
   @override
   void initState() {
     super.initState();
-    if (widget.controller == null) {
-      _controller = ScreenshotController();
-    } else
-      _controller = widget.controller;
+    // if (widget.controller == null) {
+    //   _controller = ScreenshotController();
+    // } else
+    _controller = widget.controller;
   }
 
   // @override

lib/src/main.dart

+

lib/src/platform_specific/file_manager/file_manager_mobile.dart

@@ -13,6 +13,5 @@
 //     file.writeAsBytesSync(fileContent);
 //     return file.path;
 //   }
- 
- 
+
 // }

lib/src/platform_specific/file_manager/file_manager_stub.dart

 import 'file_manager.dart';
 
-PlatformFileManager getFileManager() =>
-    throw UnimplementedError("File Picker is Not Implementd in current platform");
+PlatformFileManager getFileManager() => throw UnimplementedError(
+    "File Picker is Not Implementd in current platform");

pubspec.yaml

 name: screenshot
 description: Flutter Screenshot Package (Runtime). Capture any Widget as an image.
-version: 0.3.0
+version: 1.0.0-nullsafety.0
 homepage: https://github.com/SachinGanesh/screenshot
 
 environment: