Merge pull request #5 from andre-paraense/null-safety

Null safety migration
andre-paraense · Mar 23, 2021 · e2d198b · e2d198b
2 parents 06eeb89 + 5483708
commit e2d198b
Show file tree

Hide file tree

Showing 17 changed files with 198 additions and 235 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git 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
@@ -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/...id/src/main/kotlin/com/oakam/survicate/survicate_flutter_sdk/SurvicateFlutterSdkPlugin.kt b/...id/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
@@ -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
@@ -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
diff --git 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();
-  }
+  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;