Release 2.2.0

PSPDFKit · PSPDFKit · commit d6c418a6c9f1 · 2021-05-03T11:33:05.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [2.2.0] - 03 May 2021
+
+- Updates the minimum required Dart version to 2.12.0. (#28465)
+- Migrates the plugin and the examples to support Sound Null Safety. (#28465)
+
 ## [2.1.0] - 20 Apr 2021
 
 - Adds a string for the reader view button in iOS so that it can be used in PSPDFViewController's toolbar. (#28465)
diff --git a/android/.classpath b/android/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/android/.project b/android/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pspdfkit_flutter</name>
+	<comment>Project pspdfkit_flutter created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1619781477623</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.8))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/example/PDFs/PSPDFKit.pdf b/example/PDFs/PSPDFKit.pdf
diff --git a/example/android/.project b/example/android/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1619781477616</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/example/android/app/.classpath b/example/android/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/example/android/app/.project b/example/android/app/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1619781477620</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/example/android/app/.settings/org.eclipse.buildship.core.prefs b/example/android/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/example/android/app/bin/.settings/org.eclipse.buildship.core.prefs b/example/android/app/bin/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -415,7 +415,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
       print("Failed to set form field values '${e.message}'.");
     }
 
-    String lastName;
+    String? lastName;
     try {
       lastName = await view.getFormFieldValue('Name_Last');
     } on PlatformException catch (e) {
@@ -545,7 +545,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
       print("Failed to set form field values '${e.message}'.");
     }
 
-    String lastName;
+    String? lastName;
     try {
       lastName = await Pspdfkit.getFormFieldValue('Name_Last');
     } on PlatformException catch (e) {
@@ -580,20 +580,20 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
+    WidgetsBinding.instance?.addObserver(this);
     initPlatformState();
   }
 
   @override
   void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
+    WidgetsBinding.instance?.removeObserver(this);
     super.dispose();
   }
 
   @override
   void didChangePlatformBrightness() {
     currentTheme =
-        WidgetsBinding.instance.window.platformBrightness == Brightness.light
+        WidgetsBinding.instance?.window.platformBrightness == Brightness.light
             ? lightTheme
             : darkTheme;
     setState(() {
@@ -608,7 +608,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
 
   // Platform messages are asynchronous, so we initialize in an async method.
   void initPlatformState() async {
-    String frameworkVersion;
+    String? frameworkVersion;
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
       frameworkVersion = await Pspdfkit.frameworkVersion;
@@ -622,7 +622,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
     if (!mounted) return;
 
     setState(() {
-      _frameworkVersion = frameworkVersion;
+      _frameworkVersion = frameworkVersion ?? '';
     });
 
     await Pspdfkit.setLicenseKey(PSPDFKIT_LICENSE_KEY);
@@ -657,11 +657,11 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
       final title = Theme.of(context)
           .textTheme
           .headline6
-          .copyWith(color: currentTheme.primaryColor);
+          ?.copyWith(color: currentTheme.primaryColor);
       final subhead = Theme.of(context)
           .textTheme
           .subtitle1
-          .copyWith(color: currentTheme.primaryColor);
+          ?.copyWith(color: currentTheme.primaryColor);
       final crossAxisAlignment = CrossAxisAlignment.start;
       final padding = EdgeInsets.all(16.0);
 
@@ -670,7 +670,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
             color: Colors.grey[200],
             padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
             child: Text('Pspdfkit Widget Examples',
-                style: currentTheme.textTheme.headline4.copyWith(
+                style: currentTheme.textTheme.headline4?.copyWith(
                     fontSize: _fontSize, fontWeight: FontWeight.bold))),
         GestureDetector(
           onTap: showDocument,
@@ -785,7 +785,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
             color: Colors.grey[200],
             padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
             child: Text('Pspdfkit Global Plugin View Examples',
-                style: currentTheme.textTheme.headline4.copyWith(
+                style: currentTheme.textTheme.headline4?.copyWith(
                     fontSize: _fontSize, fontWeight: FontWeight.bold))),
         GestureDetector(
           onTap: showDocumentGlobal,
@@ -932,7 +932,7 @@ class ExampleListView extends StatelessWidget {
         padding: EdgeInsets.only(top: 24),
         child: Center(
           child: Text(_frameworkVersion,
-              style: _themeData.textTheme.headline4.copyWith(
+              style: _themeData.textTheme.headline4?.copyWith(
                   fontSize: _fontSize,
                   fontWeight: FontWeight.bold,
                   color: _themeData.primaryColor)),
diff --git a/example/lib/pspdfkit_annotation_processing_example.dart b/example/lib/pspdfkit_annotation_processing_example.dart
@@ -26,9 +26,9 @@ class PspdfkitAnnotationProcessingExampleWidget extends StatefulWidget {
   final dynamic configuration;
 
   PspdfkitAnnotationProcessingExampleWidget(
-      {Key key,
-      @required this.documentPath,
-      @required this.exportPath,
+      {Key? key,
+      required this.documentPath,
+      required this.exportPath,
       this.configuration})
       : super(key: key);
 
@@ -39,7 +39,7 @@ class PspdfkitAnnotationProcessingExampleWidget extends StatefulWidget {
 
 class PspdfkitAnnotationProcessingExampleWidgetState
     extends State<PspdfkitAnnotationProcessingExampleWidget> {
-  PspdfkitView view;
+  late PspdfkitView view;
 
   Future<File> extractAsset(String assetPath) async {
     final bytes = await DefaultAssetBundle.of(context).load(assetPath);
diff --git a/example/lib/pspdfkit_annotations_example.dart b/example/lib/pspdfkit_annotations_example.dart
@@ -21,7 +21,7 @@ class PspdfkitAnnotationsExampleWidget extends StatefulWidget {
   final dynamic configuration;
 
   PspdfkitAnnotationsExampleWidget(
-      {Key key, @required this.documentPath, this.configuration})
+      {Key? key, required this.documentPath, this.configuration})
       : super(key: key);
 
   @override
@@ -31,7 +31,7 @@ class PspdfkitAnnotationsExampleWidget extends StatefulWidget {
 
 class PspdfkitAnnotationsExampleWidgetState
     extends State<PspdfkitAnnotationsExampleWidget> {
-  PspdfkitView view;
+  late PspdfkitView view;
 
   @override
   Widget build(BuildContext context) {
diff --git a/example/lib/pspdfkit_form_example.dart b/example/lib/pspdfkit_form_example.dart
@@ -22,12 +22,12 @@ typedef PspdfkitFormExampleWidgetCreatedCallback = void Function(
 class PspdfkitFormExampleWidget extends StatefulWidget {
   final String documentPath;
   final dynamic configuration;
-  final PspdfkitFormExampleWidgetCreatedCallback
+  final PspdfkitFormExampleWidgetCreatedCallback?
       onPspdfkitFormExampleWidgetCreated;
 
   PspdfkitFormExampleWidget(
-      {Key key,
-      @required this.documentPath,
+      {Key? key,
+      required this.documentPath,
       this.configuration,
       this.onPspdfkitFormExampleWidgetCreated})
       : super(key: key);
@@ -38,7 +38,7 @@ class PspdfkitFormExampleWidget extends StatefulWidget {
 }
 
 class PspdfkitFormExampleWidgetState extends State<PspdfkitFormExampleWidget> {
-  PspdfkitView view;
+  late PspdfkitView view;
 
   @override
   Widget build(BuildContext context) {
@@ -68,7 +68,7 @@ class PspdfkitFormExampleWidgetState extends State<PspdfkitFormExampleWidget> {
                           onPressed: () async {
                             final title = 'Form Field Value';
                             final formFieldValue =
-                                await view.getFormFieldValue('Name_Last');
+                                await view.getFormFieldValue('Name_Last') ?? '';
                             await showCupertinoDialog<CupertinoAlertDialog>(
                                 context: context,
                                 builder: (BuildContext context) =>
@@ -99,7 +99,7 @@ class PspdfkitFormExampleWidgetState extends State<PspdfkitFormExampleWidget> {
   Future<void> onPlatformViewCreated(int id) async {
     view = PspdfkitView.init(id, widget.documentPath, widget.configuration);
     if (widget.onPspdfkitFormExampleWidgetCreated != null) {
-      widget.onPspdfkitFormExampleWidgetCreated(view);
+      widget.onPspdfkitFormExampleWidgetCreated!(view);
     }
   }
 }
diff --git a/example/lib/pspdfkit_instantjson_example.dart b/example/lib/pspdfkit_instantjson_example.dart
@@ -22,9 +22,9 @@ class PspdfkitInstantJsonExampleWidget extends StatefulWidget {
   final dynamic configuration;
 
   PspdfkitInstantJsonExampleWidget({
-    Key key,
-    @required this.documentPath,
-    @required this.instantJsonPath,
+    Key? key,
+    required this.documentPath,
+    required this.instantJsonPath,
     this.configuration,
   }) : super(key: key);
 
@@ -35,7 +35,7 @@ class PspdfkitInstantJsonExampleWidget extends StatefulWidget {
 
 class PspdfkitInstantJsonExampleWidgetState
     extends State<PspdfkitInstantJsonExampleWidget> {
-  PspdfkitView view;
+  late PspdfkitView view;
 
   @override
   Widget build(BuildContext context) {
@@ -67,7 +67,7 @@ class PspdfkitInstantJsonExampleWidgetState
                           onPressed: () async {
                             final title = 'Exported Instant JSON';
                             final exportedInstantJson =
-                                await view.exportInstantJson();
+                                await view.exportInstantJson() ?? '';
                             await showCupertinoDialog<CupertinoAlertDialog>(
                                 context: context,
                                 builder: (BuildContext context) =>
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,10 +1,10 @@
 name: pspdfkit_example
 description: Demonstrates how to use the pspdfkit plugin.
-version: 2.1.0
+version: 2.2.0
 author: PSPDFKit
 homepage: https://pspdfkit.com/
 environment:
-  sdk: '>=2.0.0 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
   flutter: ">=1.12.0 <2.0.0"
 
 dependencies:
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
diff --git a/lib/src/main.dart b/lib/src/main.dart
diff --git a/lib/src/pspdfkit_view.dart b/lib/src/pspdfkit_view.dart
diff --git a/lib/src/widgets/pspdfkit_widget.dart b/lib/src/widgets/pspdfkit_widget.dart
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=..`
	`2`	`+eclipse.preferences.version=1`