From ddcb803f1b1ec1ed9cf28b8fe79df94fdc8db37e Mon Sep 17 00:00:00 2001
From: Andre Paraense <andre.paraense@mobwise.com.br>
Date: Tue, 23 Mar 2021 14:43:45 +0000
Subject: [PATCH 1/2] Null safety migration

---
 .idea/workspace.xml                           |  73 +++---------
 CHANGELOG.md                                  |   4 +
 android/build.gradle                          |   4 +-
 .../SurvicateFlutterSdkPlugin.kt              |   8 +-
 example/android/app/build.gradle              |   4 +-
 example/android/build.gradle                  |   2 +-
 .../contents.xcworkspacedata                  |   2 +-
 example/lib/main.dart                         |  34 +++---
 example/pubspec.lock                          |  40 +++----
 example/pubspec.yaml                          |   4 +-
 ios/survicate_flutter_sdk.podspec             |   2 +-
 lib/models/survicate_answer_model.dart        |   8 +-
 lib/models/user_traits_model.dart             |  46 +++----
 lib/survicate_flutter_sdk.dart                |  48 ++++----
 pubspec.lock                                  |  38 +++---
 pubspec.yaml                                  |   4 +-
 test/survicate_flutter_sdk_test.dart          | 112 +++++++++---------
 17 files changed, 198 insertions(+), 235 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6e3bd47..969f921 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -30,21 +30,24 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/android/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/android/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/android/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/ios/Runner/Info.plist" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/ios/Runner/Info.plist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/example/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/ios/Classes/SwiftSurvicateFlutterSdkPlugin.swift" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/ios/Classes/SwiftSurvicateFlutterSdkPlugin.swift" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/ios/survicate_flutter_sdk.podspec" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/ios/survicate_flutter_sdk.podspec" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/pubspec.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/Runner/Info.plist" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner/Info.plist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/survicate_flutter_sdk/pubspec.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ios/Classes/SwiftSurvicateFlutterSdkPlugin.swift" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/SwiftSurvicateFlutterSdkPlugin.swift" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ios/survicate_flutter_sdk.podspec" beforeDir="false" afterPath="$PROJECT_DIR$/ios/survicate_flutter_sdk.podspec" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/models/survicate_answer_model.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/models/survicate_answer_model.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/models/user_traits_model.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/models/user_traits_model.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/survicate_flutter_sdk.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/survicate_flutter_sdk.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/survicate_flutter_sdk_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/survicate_flutter_sdk_test.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -251,56 +254,18 @@
     <option name="LAST_COMMIT_MESSAGE" value="CI/CD" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="100" y="124" width="1480" height="751" key="AVDManager" timestamp="1611136991710">
+    <state x="100" y="124" width="1480" height="751" key="AVDManager" timestamp="1616508210464">
       <screen x="0" y="25" width="1680" height="954" />
     </state>
-    <state x="100" y="123" width="1480" height="758" key="AVDManager/0.23.1680.961@0.23.1680.961" timestamp="1605005333969" />
-    <state x="100" y="123" width="1480" height="758" key="AVDManager/0.23.1680.963@0.23.1680.963" timestamp="1605005512048" />
-    <state x="100" y="124" width="1480" height="751" key="AVDManager/0.25.1680.954@0.25.1680.954" timestamp="1611136991710" />
-    <state x="398" y="82" key="CommitChangelistDialog2" timestamp="1604602310875">
-      <screen x="0" y="23" width="1680" height="961" />
+    <state x="100" y="124" width="1480" height="751" key="AVDManager/0.25.1680.954@0.25.1680.954" timestamp="1616508210464" />
+    <state x="100" y="125" width="1480" height="753" key="DiffContextDialog" timestamp="1616510585744">
+      <screen x="0" y="25" width="1680" height="951" />
     </state>
-    <state x="398" y="82" key="CommitChangelistDialog2/0.23.1680.960@0.23.1680.960" timestamp="1604582435002" />
-    <state x="398" y="82" key="CommitChangelistDialog2/0.23.1680.961@0.23.1680.961" timestamp="1604602310875" />
-    <state x="398" y="82" key="CommitChangelistDialog2/0.23.1680.963@0.23.1680.963" timestamp="1604532042619" />
-    <state x="398" y="82" key="CommitChangelistDialog2/0.23.1680.965@0.23.1680.965" timestamp="1604499359970" />
-    <state width="1638" height="216" key="GridCell.Tab.0.bottom" timestamp="1604575863984">
-      <screen x="0" y="23" width="1680" height="961" />
-    </state>
-    <state width="1638" height="216" key="GridCell.Tab.0.bottom/0.23.1680.961@0.23.1680.961" timestamp="1604575863984" />
-    <state width="1638" height="258" key="GridCell.Tab.0.bottom/0.23.1680.963@0.23.1680.963" timestamp="1604535520181" />
-    <state width="1638" height="216" key="GridCell.Tab.0.center" timestamp="1604575863984">
-      <screen x="0" y="23" width="1680" height="961" />
-    </state>
-    <state width="1638" height="216" key="GridCell.Tab.0.center/0.23.1680.961@0.23.1680.961" timestamp="1604575863984" />
-    <state width="1638" height="258" key="GridCell.Tab.0.center/0.23.1680.963@0.23.1680.963" timestamp="1604535520181" />
-    <state width="1638" height="216" key="GridCell.Tab.0.left" timestamp="1604575863984">
-      <screen x="0" y="23" width="1680" height="961" />
-    </state>
-    <state width="1638" height="216" key="GridCell.Tab.0.left/0.23.1680.961@0.23.1680.961" timestamp="1604575863984" />
-    <state width="1638" height="258" key="GridCell.Tab.0.left/0.23.1680.963@0.23.1680.963" timestamp="1604535520180" />
-    <state width="1638" height="216" key="GridCell.Tab.0.right" timestamp="1604575863984">
-      <screen x="0" y="23" width="1680" height="961" />
-    </state>
-    <state width="1638" height="216" key="GridCell.Tab.0.right/0.23.1680.961@0.23.1680.961" timestamp="1604575863984" />
-    <state width="1638" height="258" key="GridCell.Tab.0.right/0.23.1680.963@0.23.1680.963" timestamp="1604535520181" />
+    <state x="100" y="125" width="1480" height="753" key="DiffContextDialog/0.25.1680.951@0.25.1680.951" timestamp="1616510585744" />
+    <state x="100" y="125" width="1480" height="753" key="DiffContextDialog/0.25.1680.953@0.25.1680.953" timestamp="1616510506263" />
     <state x="467" y="213" key="RollbackChangesDialog" timestamp="1611150034237">
       <screen x="0" y="25" width="1680" height="954" />
     </state>
-    <state x="467" y="213" key="RollbackChangesDialog/0.23.1680.961@0.23.1680.961" timestamp="1604599107168" />
-    <state x="467" y="213" key="RollbackChangesDialog/0.23.1680.963@0.23.1680.963" timestamp="1605012671562" />
     <state x="467" y="213" key="RollbackChangesDialog/0.25.1680.954@0.25.1680.954" timestamp="1611150034237" />
-    <state x="440" y="231" key="Vcs.Push.Dialog.v2" timestamp="1604602312291">
-      <screen x="0" y="23" width="1680" height="961" />
-    </state>
-    <state x="440" y="231" key="Vcs.Push.Dialog.v2/0.23.1680.960@0.23.1680.960" timestamp="1604582435995" />
-    <state x="440" y="231" key="Vcs.Push.Dialog.v2/0.23.1680.961@0.23.1680.961" timestamp="1604602312291" />
-    <state x="440" y="231" key="Vcs.Push.Dialog.v2/0.23.1680.963@0.23.1680.963" timestamp="1604532044049" />
-    <state x="440" y="232" key="Vcs.Push.Dialog.v2/0.23.1680.965@0.23.1680.965" timestamp="1604499361150" />
-    <state x="532" y="259" width="750" height="490" key="find.popup" timestamp="1604574589173">
-      <screen x="0" y="23" width="1680" height="961" />
-    </state>
-    <state x="532" y="259" width="750" height="490" key="find.popup/0.23.1680.961@0.23.1680.961" timestamp="1604574589173" />
-    <state x="532" y="260" width="750" height="490" key="find.popup/0.23.1680.965@0.23.1680.965" timestamp="1604498593967" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b7c1bc..727cb68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+
+* Null-safety migration
+
 ## 1.0.1
 
 * Bumping Survicate Android and iOS SDKs
diff --git a/android/build.gradle b/android/build.gradle
index 9031021..b08ce36 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.oakam.survicate.survicate_flutter_sdk'
-version '1.0.1'
+version '2.0.0'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
@@ -41,5 +41,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.survicate:survicate-sdk:1.2.3'
+    implementation 'com.survicate:survicate-sdk:1.2.4'
 }
diff --git a/android/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt b/android/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt
index 38dadc0..2ecd8d7 100644
--- a/android/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt
+++ b/android/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt
@@ -65,7 +65,7 @@ class SurvicateFlutterSdkPlugin: FlutterPlugin, ActivityAware, MethodCallHandler
             try {
               channel.invokeMethod("onSurveyDisplayed", arguments)
             } catch (e: Exception) {
-              Log.e("onSurveyDisplayed", e.message)
+              e.message?.let { Log.e("onSurveyDisplayed", it) }
             }
           })
         }
@@ -84,7 +84,7 @@ class SurvicateFlutterSdkPlugin: FlutterPlugin, ActivityAware, MethodCallHandler
             try {
               channel.invokeMethod("onQuestionAnswered", arguments)
             } catch (e: Exception) {
-              Log.e("onQuestionAnswered", e.message)
+              e.message?.let { Log.e("onQuestionAnswered", it) }
             }
           })
         }
@@ -96,7 +96,7 @@ class SurvicateFlutterSdkPlugin: FlutterPlugin, ActivityAware, MethodCallHandler
             try {
               channel.invokeMethod("onSurveyClosed", arguments)
             } catch (e: Exception) {
-              Log.e("onSurveyClosed", e.message)
+              e.message?.let { Log.e("onSurveyClosed", it) }
             }
           })
         }
@@ -108,7 +108,7 @@ class SurvicateFlutterSdkPlugin: FlutterPlugin, ActivityAware, MethodCallHandler
             try {
               channel.invokeMethod("onSurveyCompleted", arguments)
             } catch (e: Exception) {
-              Log.e("onSurveyCompleted", e.message)
+              e.message?.let { Log.e("onSurveyCompleted", it) }
             }
           })
         }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 650953f..8014f10 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.oakam.survicate.survicate_flutter_sdk_example"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/example/android/build.gradle b/example/android/build.gradle
index c505a86..b834f87 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a1..919434a 100644
--- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 2bb5988..1bf4edc 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -13,19 +13,13 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  SurvicateFlutterSdk survicateFlutterSdk;
-  String surveyIdDisplayed;
-  String surveyIdAnswered;
-  num questionIdAnswered;
-  SurvicateAnswerModel answer;
-  String surveyIdClosed;
-  String surveyIdCompleted;
-
-  @override
-  void initState() {
-    super.initState();
-    survicateFlutterSdk ??= SurvicateFlutterSdk();
-  }
+  late SurvicateFlutterSdk survicateFlutterSdk= SurvicateFlutterSdk();
+  String? surveyIdDisplayed;
+  String? surveyIdAnswered;
+  num? questionIdAnswered;
+  SurvicateAnswerModel? answer;
+  String? surveyIdClosed;
+  String? surveyIdCompleted;
 
   @override
   Widget build(BuildContext context) {
@@ -41,7 +35,7 @@ class _MyAppState extends State<MyApp> {
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     survicateFlutterSdk.invokeEvent('SURVEY');
                   },
@@ -50,13 +44,13 @@ class _MyAppState extends State<MyApp> {
                 SizedBox(
                   height: 5.0,
                 ),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     survicateFlutterSdk.enterScreen('SCREEN');
                   },
                   child: Text('Enter screen SCREEN'),
                 ),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     survicateFlutterSdk.leaveScreen('SCREEN');
                   },
@@ -65,7 +59,7 @@ class _MyAppState extends State<MyApp> {
                 SizedBox(
                   height: 5.0,
                 ),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     survicateFlutterSdk.setUserTraits(
                         UserTraitsModel(userId: '1', firstName: 'USER'));
@@ -75,7 +69,7 @@ class _MyAppState extends State<MyApp> {
                 SizedBox(
                   height: 5.0,
                 ),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     setState(() {
                       surveyIdDisplayed = null;
@@ -92,7 +86,7 @@ class _MyAppState extends State<MyApp> {
                 SizedBox(
                   height: 5.0,
                 ),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     setState(() {
                       surveyIdDisplayed = null;
@@ -129,7 +123,7 @@ class _MyAppState extends State<MyApp> {
                 SizedBox(
                   height: 5.0,
                 ),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () {
                     setState(() {
                       surveyIdDisplayed = null;
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 15121dd..91a8f08 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,56 +7,56 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -73,21 +73,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -99,28 +99,28 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   survicate_flutter_sdk:
     dependency: "direct main"
     description:
@@ -134,28 +134,28 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index f2d4fae..ec55853 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -3,7 +3,7 @@ description: Demonstrates how to use the survicate_flutter_sdk plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
@@ -12,7 +12,7 @@ dependencies:
   survicate_flutter_sdk:
     path: ../
 
-  cupertino_icons: 1.0.0
+  cupertino_icons: 1.0.2
 
 dev_dependencies:
   flutter_test:
diff --git a/ios/survicate_flutter_sdk.podspec b/ios/survicate_flutter_sdk.podspec
index 14b9ce8..b6ff31e 100644
--- a/ios/survicate_flutter_sdk.podspec
+++ b/ios/survicate_flutter_sdk.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'survicate_flutter_sdk'
-  s.version          = '1.0.1'
+  s.version          = '2.0.0'
   s.summary          = 'Survicate mobile survey SDK for Flutter.'
   s.description      = <<-DESC
 A new flutter plugin project.
diff --git a/lib/models/survicate_answer_model.dart b/lib/models/survicate_answer_model.dart
index 9e14b7a..5a15123 100644
--- a/lib/models/survicate_answer_model.dart
+++ b/lib/models/survicate_answer_model.dart
@@ -1,15 +1,15 @@
 class SurvicateAnswerModel {
   /// Answer type
-  final String type;
+  final String? type;
 
   /// Answer ID. Applicable only for type = [‘single’, ‘smiley_scale’, ‘dropdown_list’]
-  final int id;
+  final int? id;
 
   /// Array of answer IDs. Applicable only for type = [‘multiple’]
-  final List<int> ids;
+  final List<int>? ids;
 
   /// Context value of the answer. Applicable only for type = [‘text’, ‘nps’, ‘date’, ‘rating’]
-  final String value;
+  final String? value;
 
   /// Expect that there might be answer objects that consist only of the type property.
   SurvicateAnswerModel.fromMap(dynamic survicateAnswerMap)
diff --git a/lib/models/user_traits_model.dart b/lib/models/user_traits_model.dart
index a25aa2c..8649b7d 100644
--- a/lib/models/user_traits_model.dart
+++ b/lib/models/user_traits_model.dart
@@ -1,23 +1,23 @@
 class UserTraitsModel {
-  final String userId;
-  final String firstName;
-  final String lastName;
-  final String email;
-  final String organization;
-  final String department;
-  final String jobTitle;
-  final String phone;
-  final String website;
-  final String addressFirstLine;
-  final String addressSecondLine;
-  final String city;
-  final String state;
-  final String zipCode;
-  final String fax;
-  final String annualRevenue;
-  final String employees;
-  final String industry;
-  final Map<String, String> customTraits;
+  final String? userId;
+  final String? firstName;
+  final String? lastName;
+  final String? email;
+  final String? organization;
+  final String? department;
+  final String? jobTitle;
+  final String? phone;
+  final String? website;
+  final String? addressFirstLine;
+  final String? addressSecondLine;
+  final String? city;
+  final String? state;
+  final String? zipCode;
+  final String? fax;
+  final String? annualRevenue;
+  final String? employees;
+  final String? industry;
+  final Map<String, String>? customTraits;
 
   UserTraitsModel({
     this.userId,
@@ -41,8 +41,8 @@ class UserTraitsModel {
     this.customTraits,
   });
 
-  Map<String, String> toMap() {
-    Map<String, String> userTraits = <String, String>{};
+  Map<String, String?> toMap() {
+    Map<String, String?> userTraits = <String, String?>{};
 
     if (userId != null) {
       userTraits['user_id'] = userId;
@@ -116,8 +116,8 @@ class UserTraitsModel {
       userTraits['industry'] = industry;
     }
 
-    if (customTraits != null && customTraits.isNotEmpty) {
-      userTraits..addAll(customTraits);
+    if (customTraits != null && customTraits!.isNotEmpty) {
+      userTraits..addAll(customTraits!);
     }
 
     return userTraits;
diff --git a/lib/survicate_flutter_sdk.dart b/lib/survicate_flutter_sdk.dart
index 68b05e4..4fcc7b0 100644
--- a/lib/survicate_flutter_sdk.dart
+++ b/lib/survicate_flutter_sdk.dart
@@ -7,16 +7,16 @@ import 'package:survicate_flutter_sdk/models/user_traits_model.dart';
 /// Client for accessing Survicate SDK.
 class SurvicateFlutterSdk {
   /// listener triggered when survey gets loaded and appears in user’s interface.
-  Function(String) onSurveyDisplayedListener;
+  Function(String?)? onSurveyDisplayedListener;
 
   /// listener triggered after a response submitted to each question.
-  Function(String, num, SurvicateAnswerModel) onQuestionAnsweredListener;
+  Function(String?, num?, SurvicateAnswerModel)? onQuestionAnsweredListener;
 
   /// listener triggered after user closes the survey using the close button.
-  Function(String) onSurveyClosedListener;
+  Function(String?)? onSurveyClosedListener;
 
   /// triggered when user responds to their last question and therefore finishes a survey.
-  Function(String) onSurveyCompletedListener;
+  Function(String?)? onSurveyCompletedListener;
 
   static const MethodChannel _channel =
       const MethodChannel('survicate_flutter_sdk');
@@ -42,9 +42,9 @@ class SurvicateFlutterSdk {
           return false;
         }
 
-        String surveyId = call.arguments['surveyId'];
+        String? surveyId = call.arguments['surveyId'];
 
-        onSurveyDisplayedListener(surveyId);
+        onSurveyDisplayedListener!(surveyId);
         return true;
 
       case 'onQuestionAnswered':
@@ -62,12 +62,12 @@ class SurvicateFlutterSdk {
           return false;
         }
 
-        String surveyId = call.arguments['surveyId'];
-        num questionId = call.arguments['questionId'];
+        String? surveyId = call.arguments['surveyId'];
+        num? questionId = call.arguments['questionId'];
         SurvicateAnswerModel answer =
             SurvicateAnswerModel.fromMap(call.arguments['answer']);
 
-        onQuestionAnsweredListener(surveyId, questionId, answer);
+        onQuestionAnsweredListener!(surveyId, questionId, answer);
         return true;
 
       case 'onSurveyClosed':
@@ -83,9 +83,9 @@ class SurvicateFlutterSdk {
           return false;
         }
 
-        String surveyId = call.arguments['surveyId'];
+        String? surveyId = call.arguments['surveyId'];
 
-        onSurveyClosedListener(surveyId);
+        onSurveyClosedListener!(surveyId);
         return true;
 
       case 'onSurveyCompleted':
@@ -101,9 +101,9 @@ class SurvicateFlutterSdk {
           return false;
         }
 
-        String surveyId = call.arguments['surveyId'];
+        String? surveyId = call.arguments['surveyId'];
 
-        onSurveyCompletedListener(surveyId);
+        onSurveyCompletedListener!(surveyId);
         return true;
 
       default:
@@ -117,12 +117,12 @@ class SurvicateFlutterSdk {
   /// [callbackQuestionAnsweredListener] the listener to be called after a response submitted to each question.
   /// [callbackSurveyClosedListener] the listener to be called after user closes the survey using the close button.
   /// [callbackSurveyCompletedListener] the listener to be called when user responds to their last question and therefore finishes a survey.
-  Future<bool> registerSurveyListeners(
-      {Function(String surveyId) callbackSurveyDisplayedListener,
-      Function(String surveyId, num questionId, SurvicateAnswerModel answer)
+  Future<bool?> registerSurveyListeners(
+      {Function(String? surveyId)? callbackSurveyDisplayedListener,
+      Function(String? surveyId, num? questionId, SurvicateAnswerModel answer)?
           callbackQuestionAnsweredListener,
-      Function(String surveyId) callbackSurveyClosedListener,
-      Function(String surveyId) callbackSurveyCompletedListener}) async {
+      Function(String? surveyId)? callbackSurveyClosedListener,
+      Function(String? surveyId)? callbackSurveyCompletedListener}) async {
     if (callbackSurveyDisplayedListener == null ||
         callbackQuestionAnsweredListener == null ||
         callbackSurveyClosedListener == null ||
@@ -150,7 +150,7 @@ class SurvicateFlutterSdk {
 
   /// Unregisters Survey activity listeners
   ///
-  Future<bool> unregisterSurveyListeners() async {
+  Future<bool?> unregisterSurveyListeners() async {
     if (onSurveyDisplayedListener == null &&
         onQuestionAnsweredListener == null &&
         onSurveyClosedListener == null &&
@@ -170,7 +170,7 @@ class SurvicateFlutterSdk {
   /// Events trigger surveys instantly after occurring in your app.
   ///
   /// [eventName] the name of the event to be logged
-  Future<bool> invokeEvent(String eventName) async {
+  Future<bool?> invokeEvent(String? eventName) async {
     if (eventName == null || eventName.isEmpty) {
       return false;
     }
@@ -186,7 +186,7 @@ class SurvicateFlutterSdk {
   /// To achieve such effect, you need to send information to Survicate about user entering a screen.
   ///
   /// [screenName] the name of the screen the user is entering.
-  Future<bool> enterScreen(String screenName) async {
+  Future<bool?> enterScreen(String? screenName) async {
     if (screenName == null || screenName.isEmpty) {
       return false;
     }
@@ -202,7 +202,7 @@ class SurvicateFlutterSdk {
   /// To achieve such effect, you need to send information to Survicate about user leaving a screen.
   ///
   /// [screenName] the name of the screen the user is leaving.
-  Future<bool> leaveScreen(String screenName) async {
+  Future<bool?> leaveScreen(String? screenName) async {
     if (screenName == null || screenName.isEmpty) {
       return false;
     }
@@ -218,7 +218,7 @@ class SurvicateFlutterSdk {
   /// You can also change their values at any time (which may potentially trigger showing the survey).
   ///
   /// [userTraits] the  custom attributes to be assigned to your users.
-  Future<bool> setUserTraits(UserTraitsModel userTraits) async {
+  Future<bool?> setUserTraits(UserTraitsModel? userTraits) async {
     if (userTraits == null || userTraits.toMap().isEmpty) {
       return false;
     }
@@ -228,7 +228,7 @@ class SurvicateFlutterSdk {
 
   /// This method will reset all user data stored on your device (views, traits, answers).
   /// If you need to test surveys on your device, this method might be helpful.
-  Future<bool> reset() async {
+  Future<bool?> reset() async {
     return await _channel.invokeMethod('reset');
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 567db0b..96b4a33 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,49 +7,49 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,21 +66,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -92,56 +92,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 3a565be..710bd30 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: survicate_flutter_sdk
 description: Survicate mobile SDK for Flutter allows you to survey specific groups of your mobile app users to understand their needs, expectations, and objections.
-version: 1.0.1
+version: 2.0.0
 homepage: https://github.com/andre-paraense/survicate-flutter-sdk
 issue_tracker: https://github.com/andre-paraense/survicate-flutter-sdk/issues
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
   flutter: ">=1.20.0"
 
 dependencies:
diff --git a/test/survicate_flutter_sdk_test.dart b/test/survicate_flutter_sdk_test.dart
index 2173091..f752cfd 100644
--- a/test/survicate_flutter_sdk_test.dart
+++ b/test/survicate_flutter_sdk_test.dart
@@ -169,21 +169,21 @@ void main() {
 
     test('Return true if the callbacks are passed and previously registered',
         () async {
-      bool Function(String) previousCallback = (String surveyId) {
+      bool Function(String?) previousCallback = (String? surveyId) {
         return false;
       };
       survicateFlutterSdk.onSurveyDisplayedListener = previousCallback;
-      bool Function(String) newCallback = (String surveyId) {
+      bool Function(String?) newCallback = (String? surveyId) {
         return true;
       };
-      bool Function(String, num, SurvicateAnswerModel)
+      bool Function(String?, num?, SurvicateAnswerModel)
           previousCallbackQuestion =
-          (String surveyId, num questionId, SurvicateAnswerModel answer) {
+          (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
         return false;
       };
       survicateFlutterSdk.onQuestionAnsweredListener = previousCallbackQuestion;
-      bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-          (String surveyId, num questionId, SurvicateAnswerModel answer) {
+      bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+          (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
         return true;
       };
       expect(
@@ -193,25 +193,25 @@ void main() {
               callbackSurveyClosedListener: newCallback,
               callbackSurveyCompletedListener: newCallback),
           true);
-      expect(survicateFlutterSdk.onSurveyDisplayedListener('surveyId'), true);
+      expect(survicateFlutterSdk.onSurveyDisplayedListener!('surveyId'), true);
       expect(
-          survicateFlutterSdk.onQuestionAnsweredListener(
+          survicateFlutterSdk.onQuestionAnsweredListener!(
               'surveyId',
               1,
               SurvicateAnswerModel.fromMap(
                   {'type': 'type', 'id': null, 'ids': null, 'value': null})),
           true);
-      expect(survicateFlutterSdk.onSurveyClosedListener('surveyId'), true);
-      expect(survicateFlutterSdk.onSurveyCompletedListener('surveyId'), true);
+      expect(survicateFlutterSdk.onSurveyClosedListener!('surveyId'), true);
+      expect(survicateFlutterSdk.onSurveyCompletedListener!('surveyId'), true);
     });
 
     test('Return true if the callback is passed and not previously registered',
         () async {
-      bool Function(String) newCallback = (String surveyId) {
+      bool Function(String?) newCallback = (String? surveyId) {
         return true;
       };
-      bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-          (String surveyId, num questionId, SurvicateAnswerModel answer) {
+      bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+          (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
         return true;
       };
       expect(
@@ -221,9 +221,9 @@ void main() {
               callbackSurveyClosedListener: newCallback,
               callbackSurveyCompletedListener: newCallback),
           true);
-      expect(survicateFlutterSdk.onSurveyDisplayedListener('surveyId'), true);
+      expect(survicateFlutterSdk.onSurveyDisplayedListener!('surveyId'), true);
       expect(
-          survicateFlutterSdk.onQuestionAnsweredListener(
+          survicateFlutterSdk.onQuestionAnsweredListener!(
               'surveyId',
               1,
               SurvicateAnswerModel.fromMap({
@@ -233,8 +233,8 @@ void main() {
                 'value': 'value'
               })),
           true);
-      expect(survicateFlutterSdk.onSurveyClosedListener('surveyId'), true);
-      expect(survicateFlutterSdk.onSurveyCompletedListener('surveyId'), true);
+      expect(survicateFlutterSdk.onSurveyClosedListener!('surveyId'), true);
+      expect(survicateFlutterSdk.onSurveyCompletedListener!('surveyId'), true);
     });
   });
 
@@ -244,12 +244,12 @@ void main() {
     });
 
     test('Return true if there was a previous registered listener', () async {
-      bool Function(String) previousCallback = (String surveyId) {
+      bool Function(String?) previousCallback = (String? surveyId) {
         return true;
       };
-      bool Function(String, num, SurvicateAnswerModel)
+      bool Function(String?, num?, SurvicateAnswerModel)
           previousCallbackQuestion =
-          (String surveyId, num questionId, SurvicateAnswerModel answer) {
+          (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
         return false;
       };
       survicateFlutterSdk.onSurveyDisplayedListener = previousCallback;
@@ -290,11 +290,11 @@ void main() {
       });
 
       test('Return false if no argument is passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -308,11 +308,11 @@ void main() {
       });
 
       test('Return false if the expected arguments are not passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -329,11 +329,11 @@ void main() {
 
       test('Return true if the listener is called with the expected arguments',
           () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -368,11 +368,11 @@ void main() {
       });
 
       test('Return false if no argument is passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -386,11 +386,11 @@ void main() {
       });
 
       test('Return false if the expected arguments are not passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -407,11 +407,11 @@ void main() {
 
       test('Return true if the listener is called with the expected arguments',
           () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -445,11 +445,11 @@ void main() {
       });
 
       test('Return false if no argument is passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -463,11 +463,11 @@ void main() {
       });
 
       test('Return false if the expected arguments are not passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -483,11 +483,11 @@ void main() {
 
       test('Return true if the listener is called with the expected arguments',
           () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -514,11 +514,11 @@ void main() {
       });
 
       test('Return false if no argument is passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -532,11 +532,11 @@ void main() {
       });
 
       test('Return false if the expected arguments are not passed', () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(
@@ -553,11 +553,11 @@ void main() {
 
       test('Return true if the listener is called with the expected arguments',
           () async {
-        bool Function(String) newCallback = (String surveyId) {
+        bool Function(String?) newCallback = (String? surveyId) {
           return true;
         };
-        bool Function(String, num, SurvicateAnswerModel) newCallbackQuestion =
-            (String surveyId, num questionId, SurvicateAnswerModel answer) {
+        bool Function(String?, num?, SurvicateAnswerModel) newCallbackQuestion =
+            (String? surveyId, num? questionId, SurvicateAnswerModel answer) {
           return true;
         };
         expect(

From 5483708f9f82918e62de595f3a1a601737a49052 Mon Sep 17 00:00:00 2001
From: Andre Paraense <andre.paraense@mobwise.com.br>
Date: Tue, 23 Mar 2021 14:52:10 +0000
Subject: [PATCH 2/2] Cleaning code

---
 example/lib/main.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/lib/main.dart b/example/lib/main.dart
index 1bf4edc..89540dc 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -13,7 +13,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  late SurvicateFlutterSdk survicateFlutterSdk= SurvicateFlutterSdk();
+  SurvicateFlutterSdk survicateFlutterSdk= SurvicateFlutterSdk();
   String? surveyIdDisplayed;
   String? surveyIdAnswered;
   num? questionIdAnswered;