null safety support added

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"fluttertoast","path":"/Users/sumedhtambat/StudioProjects/flutter-projects/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-3.1.3/","dependencies":[]},{"name":"razorpay_flutter","path":"/Users/sumedhtambat/StudioProjects/flutter-projects/razorpay-flutter/","dependencies":[]}],"android":[{"name":"fluttertoast","path":"/Users/sumedhtambat/StudioProjects/flutter-projects/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-3.1.3/","dependencies":[]},{"name":"razorpay_flutter","path":"/Users/sumedhtambat/StudioProjects/flutter-projects/razorpay-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"fluttertoast","dependencies":[]},{"name":"razorpay_flutter","dependencies":[]}],"date_created":"2021-03-04 15:36:49.203900","version":"1.20.0"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"fluttertoast","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\fluttertoast-3.1.3\\\\","dependencies":[]},{"name":"razorpay_flutter","path":"D:\\\\Project\\\\flutter\\\\razorpay-flutter\\\\","dependencies":[]}],"android":[{"name":"fluttertoast","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\fluttertoast-3.1.3\\\\","dependencies":[]},{"name":"razorpay_flutter","path":"D:\\\\Project\\\\flutter\\\\razorpay-flutter\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"fluttertoast","dependencies":[]},{"name":"razorpay_flutter","dependencies":[]}],"date_created":"2021-05-04 22:25:32.852099","version":"2.0.2"}

example/ios/Flutter/flutter_export_environment.sh

@@ -1,12 +1,10 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/sumedhtambat/StudioProjects/flutter-projects/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/sumedhtambat/StudioProjects/flutter-projects/razorpay-flutter/example"
-export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_ROOT=C:\flutter"
+export "FLUTTER_APPLICATION_PATH=D:\Project\flutter\razorpay-flutter\example"
+export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
-export "FLUTTER_FRAMEWORK_DIR=/Users/sumedhtambat/StudioProjects/flutter-projects/flutter/bin/cache/artifacts/engine/ios"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1.0.0"
 export "DART_OBFUSCATION=false"

example/pubspec.lock

@@ -7,42 +7,42 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -56,14 +56,14 @@ packages:
       name: eventify
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "1.0.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -101,21 +101,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   pedantic:
     dependency: transitive
     description:
@@ -129,7 +129,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.0"
+    version: "1.2.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -141,56 +141,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.17"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
-  flutter: ">=1.12.0 <2.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.12.0"

lib/razorpay_flutter.dart

@@ -24,15 +24,15 @@ class Razorpay {
   static const MethodChannel _channel = const MethodChannel('razorpay_flutter');
 
   // EventEmitter instance used for communication
-  EventEmitter _eventEmitter;
+  EventEmitter? _eventEmitter;
 
   Razorpay() {
     _eventEmitter = new EventEmitter();
   }
 
   /// Opens Razorpay checkout
-  void open(Map<String, dynamic> options) async {
-    Map<String, dynamic> validationResult = _validateOptions(options);
+  void open(Map<String?, dynamic> options) async {
+    Map<String?, dynamic> validationResult = _validateOptions(options);
 
     if (!validationResult['success']) {
       _handleResult({
@@ -51,7 +51,7 @@ class Razorpay {
 
   /// Handles checkout response from platform
   void _handleResult(Map<dynamic, dynamic> response) {
-    String eventName;
+    String? eventName;
     Map<dynamic, dynamic> data = response["data"];
 
     dynamic payload;
@@ -78,21 +78,21 @@ class Razorpay {
             PaymentFailureResponse(UNKNOWN_ERROR, 'An unknown error occurred.');
     }
 
-    _eventEmitter.emit(eventName, null, payload);
+    _eventEmitter?.emit(eventName, null, payload);
   }
 
   /// Registers event listeners for payment events
-  void on(String event, Function handler) {
+  void on(String? event, Function handler) {
     EventCallback cb = (event, cont) {
       handler(event.eventData);
     };
-    _eventEmitter.on(event, null, cb);
+    _eventEmitter?.on(event!, null, cb);
     _resync();
   }
 
   /// Clears all event listeners
   void clear() {
-    _eventEmitter.clear();
+    _eventEmitter?.clear();
   }
 
   /// Retrieves lost responses from platform
@@ -104,7 +104,7 @@ class Razorpay {
   }
 
   /// Validate payment options
-  static Map<String, dynamic> _validateOptions(Map<String, dynamic> options) {
+  static Map<String?, dynamic> _validateOptions(Map<String?, dynamic> options) {
     var key = options['key'];
     if (key == null) {
       return {
@@ -117,31 +117,33 @@ class Razorpay {
 }
 
 class PaymentSuccessResponse {
-  String paymentId;
-  String orderId;
-  String signature;
-  String subscriptionId;
+  String? paymentId;
+  String? orderId;
+  String? signature;
+  String? subscriptionId;
 
-  PaymentSuccessResponse(this.paymentId, this.orderId, this.signature,this.subscriptionId);
+  PaymentSuccessResponse(
+      this.paymentId, this.orderId, this.signature, this.subscriptionId);
 
   static PaymentSuccessResponse fromMap(Map<dynamic, dynamic> map) {
-    String paymentId = map["razorpay_payment_id"];
-    String signature = map["razorpay_signature"];
-    String orderId = map["razorpay_order_id"];
-    String subscriptionId = map["razorpay_subscription_id"];
-    return new PaymentSuccessResponse(paymentId, orderId, signature,subscriptionId);
+    String? paymentId = map["razorpay_payment_id"];
+    String? signature = map["razorpay_signature"];
+    String? orderId = map["razorpay_order_id"];
+    String? subscriptionId = map["razorpay_subscription_id"];
+    return new PaymentSuccessResponse(
+        paymentId, orderId, signature, subscriptionId);
   }
 }
 
 class PaymentFailureResponse {
-  int code;
-  String message;
+  int? code;
+  String? message;
 
   PaymentFailureResponse(this.code, this.message);
 
   static PaymentFailureResponse fromMap(Map<dynamic, dynamic> map) {
-    var code = map["code"] as int;
-    var message = map["message"] as String;
+    var code = map["code"] as int?;
+    var message = map["message"] as String?;
     return new PaymentFailureResponse(code, message);
   }
 }