Merge pull request #4 from OneSignal/package_name

Package name

Author: Nightsd01

android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java

@@ -252,7 +252,6 @@ private void didSetNotificationOpenedHandler() {
 
   @Override
   public void onOSSubscriptionChanged(OSSubscriptionStateChanges stateChanges) {
-    Log.d("onesignal", "Subscription changed calling observer");
     this.channel.invokeMethod("OneSignal#subscriptionChanged", OneSignalSerializer.convertSubscriptionStateChangesToMap(stateChanges));
   }
 
@@ -281,8 +280,7 @@ public void notificationOpened(OSNotificationOpenResult result) {
       this.coldStartNotificationResult = result;
       return;
     }
-
-    Log.d("onesignal", "OS Notification Opened");
+    
     try {
       this.channel.invokeMethod("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationOpenResultToMap(result));
     } catch (JSONException exception) {

example/lib/main.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'dart:async';
 
 //import OneSignal
-import 'package:OneSignalFlutter/onesignal.dart';
+import 'package:onesignal/onesignal.dart';
 
 void main() => runApp(new MyApp());
 

example/pubspec.yaml

@@ -16,7 +16,7 @@ dev_dependencies:
     sdk: flutter
 
 
-  OneSignalFlutter:
+  onesignal:
     path: ../
 
 # For information on the generic Dart part of this file, see the

example/test/widget_test.dart

@@ -31,8 +31,6 @@
 
 @implementation OneSignalTagsController
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    NSLog(@"Registering tags controller");
-    
     OneSignalTagsController *instance = [OneSignalTagsController new];
 
     instance.channel = [FlutterMethodChannel

ios/Classes/OneSignalTagsController.m

@@ -2,7 +2,7 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
-  s.name             = 'OneSignalFlutter'
+  s.name             = 'onesignal'
   s.version          = '0.0.1'
   s.summary          = 'The OneSignal Flutter SDK'
   s.description      = 'Allows you to easily add OneSignal to your flutter projects, to make sending and handling push notifications easy'

ios/OneSignalFlutter.podspec renamed to ios/onesignal.podspec

@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
-import 'package:OneSignalFlutter/src/permission.dart';
-import 'package:OneSignalFlutter/src/subscription.dart';
-import 'package:OneSignalFlutter/src/defines.dart';
-import 'package:OneSignalFlutter/src/utils.dart';
-import 'package:OneSignalFlutter/src/notification.dart';
-import 'package:OneSignalFlutter/src/create_notification.dart';
+import 'package:onesignal/src/permission.dart';
+import 'package:onesignal/src/subscription.dart';
+import 'package:onesignal/src/defines.dart';
+import 'package:onesignal/src/utils.dart';
+import 'package:onesignal/src/notification.dart';
+import 'package:onesignal/src/create_notification.dart';
 
 export 'src/notification.dart';
 export 'src/subscription.dart';
@@ -160,7 +160,7 @@ class OneSignal {
   /// This method can often take more than five seconds to complete,
   /// so please do NOT block any user-interactive content while
   /// waiting for this request to complete.
-  Future<Map<String, dynamic>> sendTag(dynamic key, dynamic value) async {
+  Future<Map<String, dynamic>> sendTag(String key, dynamic value) async {
     Map<dynamic, dynamic> response = await this.sendTags({ key : value });
     return response.cast<String, dynamic>();
   }
@@ -169,7 +169,7 @@ class OneSignal {
   /// This method can often take more than five seconds to complete,
   /// so please do NOT block any user-interactive content while
   /// waiting for this request to complete.
-  Future<Map<String, dynamic>> sendTags(Map<dynamic, dynamic> tags) async {
+  Future<Map<String, dynamic>> sendTags(Map<String, dynamic> tags) async {
     Map<dynamic, dynamic> response = await _tagsChannel.invokeMethod("OneSignal#sendTags", tags);
     return response.cast<String, dynamic>();
   }
@@ -207,25 +207,27 @@ class OneSignal {
   Future<OSPermissionSubscriptionState> getPermissionSubscriptionState() async {
     var json = await _channel.invokeMethod("OneSignal#getPermissionSubscriptionState");
 
-    return OSPermissionSubscriptionState(json);
+    return OSPermissionSubscriptionState(json.cast<String, dynamic>());
   }
 
   /// Allows you to manually disable or enable push notifications for this user.
   /// Note: This method does not change the user's system (iOS) push notification
   /// permission status. If the user disabled (or never allowed) your application
   /// to send push notifications, calling setSubscription(true) will not change that.
   Future<void> setSubscription(bool enable) async {
-    await _channel.invokeMethod("OneSignal#setSubscription", enable);
+    return await _channel.invokeMethod("OneSignal#setSubscription", enable);
   }
 
   /// Allows you to post a notification to the current user (or a different user 
   /// if you specify their OneSignal user ID).
-  Future<Map<dynamic, dynamic>> postNotificationWithJson(Map<dynamic, dynamic> json) async {
-    return await _channel.invokeMethod("OneSignal#postNotification", json);
+  Future<Map<String, dynamic>> postNotificationWithJson(Map<String, dynamic> json) async {
+    Map<dynamic, dynamic> response = await _channel.invokeMethod("OneSignal#postNotification", json);
+    return response.cast<String, dynamic>();
   }
 
-  Future<Map<dynamic, dynamic>> postNotification(OSCreateNotification notification) async {
-    return await _channel.invokeMethod("OneSignal#postNotification", notification.mapRepresentation());
+  Future<Map<String, dynamic>> postNotification(OSCreateNotification notification) async {
+    Map<dynamic, dynamic> response = await _channel.invokeMethod("OneSignal#postNotification", notification.mapRepresentation());
+    return response.cast<String, dynamic>();
   }
 
   /// Allows you to prompt the user for permission to use location services
@@ -260,15 +262,15 @@ class OneSignal {
   // Private function that gets called by ObjC/Java
   Future<Null> _handleMethod(MethodCall call) async {
     if (call.method == 'OneSignal#handleReceivedNotification' && this._onReceivedNotification != null) {
-      return this._onReceivedNotification(OSNotification(call.arguments as Map<dynamic, dynamic>));
+      return this._onReceivedNotification(OSNotification(call.arguments.cast<String, dynamic>()));
     } else if (call.method == 'OneSignal#handleOpenedNotification' && this._onOpenedNotification != null) {
-      return this._onOpenedNotification(OSNotificationOpenedResult(call.arguments as Map<dynamic, dynamic>));
+      return this._onOpenedNotification(OSNotificationOpenedResult(call.arguments.cast<String, dynamic>()));
     } else if (call.method == 'OneSignal#subscriptionChanged' && this._onSubscriptionChangedHandler != null) {
-      return this._onSubscriptionChangedHandler(OSSubscriptionStateChanges(call.arguments as Map<dynamic, dynamic>));
+      return this._onSubscriptionChangedHandler(OSSubscriptionStateChanges(call.arguments.cast<String, dynamic>()));
     } else if (call.method == 'OneSignal#permissionChanged' && this._onPermissionChangedHandler != null) {
-      return this._onPermissionChangedHandler(OSPermissionStateChanges(call.arguments as Map<dynamic, dynamic>));
+      return this._onPermissionChangedHandler(OSPermissionStateChanges(call.arguments.cast<String, dynamic>()));
     } else if (call.method == 'OneSignal#emailSubscriptionChanged' && this._onEmailSubscriptionChangedHandler != null) {
-      return this._onEmailSubscriptionChangedHandler(OSEmailSubscriptionStateChanges(call.arguments as Map<dynamic, dynamic>));
+      return this._onEmailSubscriptionChangedHandler(OSEmailSubscriptionStateChanges(call.arguments.cast<String, dynamic>()));
     }
 
     return null;

lib/onesignal.dart

@@ -1,7 +1,7 @@
-import 'package:OneSignalFlutter/src/utils.dart';
+import 'package:onesignal/src/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:OneSignalFlutter/src/notification.dart';
-import 'package:OneSignalFlutter/onesignal.dart';
+import 'package:onesignal/src/notification.dart';
+import 'package:onesignal/onesignal.dart';
 
 /// The parameters & format to create push notifications is 
 /// so different from receiving notifications that we represent

lib/src/create_notification.dart

@@ -1,5 +1,5 @@
-import 'package:OneSignalFlutter/src/defines.dart';
-import 'package:OneSignalFlutter/src/utils.dart';
+import 'package:onesignal/src/defines.dart';
+import 'package:onesignal/src/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'dart:convert';
 
@@ -36,8 +36,8 @@ class OSNotification extends JSONStringRepresentable {
   int androidNotificationId;
 
   //converts JSON map to OSNotification instance
-  OSNotification(Map<dynamic, dynamic> json) {
-    this.payload = OSNotificationPayload(json['payload'] as Map<dynamic, dynamic>);
+  OSNotification(Map<String, dynamic> json) {
+    this.payload = OSNotificationPayload(json['payload'].cast<String, dynamic>());
     this.shown = json['shown'] as bool;
     this.appInFocus = json['appInFocus'] as bool;
     this.silent = json['silent'] as bool;
@@ -121,11 +121,11 @@ class OSNotificationPayload extends JSONStringRepresentable {
 
   /// Any additional custom data you want to send along
   /// with this notification.
-  Map<dynamic, dynamic> additionalData;
+  Map<String, dynamic> additionalData;
 
   /// Any attachments (images, sounds, videos) you want
   /// to display with this notification.
-  Map<dynamic, dynamic> attachments;
+  Map<String, dynamic> attachments;
 
   /// Any buttons you want to add to the notification.
   /// The notificationOpened handler will provide an
@@ -135,7 +135,7 @@ class OSNotificationPayload extends JSONStringRepresentable {
 
   /// A hashmap object representing the raw key/value 
   /// properties of the push notification
-  dynamic rawPayload;
+  Map<String, dynamic> rawPayload;
 
   /// (Android Only)
   /// The filename of the image to use as the small
@@ -211,7 +211,7 @@ class OSNotificationPayload extends JSONStringRepresentable {
   /// notification (if set)
   OSAndroidBackgroundImageLayout backgroundImageLayout;
 
-  OSNotificationPayload(Map<dynamic, dynamic> json) {
+  OSNotificationPayload(Map<String, dynamic> json) {
     this.notificationId = json['notificationId'] as String;
 
     // iOS Specific Parameters
@@ -221,7 +221,7 @@ class OSNotificationPayload extends JSONStringRepresentable {
     if (json.containsKey('badge')) this.badge = json['badge'] as int;
     if (json.containsKey('badgeIncrement')) this.badgeIncrement = json['badgeIncrement'] as int;
     if (json.containsKey('subtitle')) this.subtitle = json['subtitle'] as String;
-    if (json.containsKey('attachments')) this.attachments = json['attachments'] as Map<dynamic, dynamic>;
+    if (json.containsKey('attachments')) this.attachments = json['attachments'].cast<String, dynamic>();
 
     // Android Specific Parameters
     if (json.containsKey("smallIcon")) this.smallIcon = json['smallIcon'] as String;
@@ -242,10 +242,10 @@ class OSNotificationPayload extends JSONStringRepresentable {
     if (json.containsKey('title')) this.title = json['title'] as String;
     if (json.containsKey('body')) this.body = json['body'] as String;
     if (json.containsKey('launchUrl')) this.launchUrl = json['launchUrl'] as String;
-    if (json.containsKey('additionalData')) this.additionalData = json['additionalData'] as Map<dynamic, dynamic>;
+    if (json.containsKey('additionalData')) this.additionalData = json['additionalData'].cast<String, dynamic>();
 
     if (json.containsKey('backgroundImageLayout')) {
-      this.backgroundImageLayout = OSAndroidBackgroundImageLayout(json['backgroundImageLayout'] as Map<dynamic, dynamic>);
+      this.backgroundImageLayout = OSAndroidBackgroundImageLayout(json['backgroundImageLayout'].cast<String, dynamic>());
     }
 
     // raw payload comes as a JSON string
@@ -259,7 +259,7 @@ class OSNotificationPayload extends JSONStringRepresentable {
       this.buttons = List<OSActionButton>();
       var btns = json['buttons'] as List<dynamic>;
       for (var btn in btns) {
-        var serialized = btn as Map<dynamic, dynamic>;
+        var serialized = btn.cast<String, dynamic>();
         this.buttons.add(OSActionButton.fromJson(serialized));
       }
     }
@@ -279,11 +279,11 @@ class OSNotificationOpenedResult {
   OSNotificationAction action;
 
   //constructor
-  OSNotificationOpenedResult(Map<dynamic, dynamic> json) {
-    this.notification = OSNotification(json['notification'] as Map<dynamic, dynamic>);
+  OSNotificationOpenedResult(Map<String, dynamic> json) {
+    this.notification = OSNotification(json['notification'].cast<String, dynamic>());
 
     if (json.containsKey('action')) { 
-      this.action = OSNotificationAction(json['action'] as Map<dynamic, dynamic>); 
+      this.action = OSNotificationAction(json['action'].cast<String, dynamic>()); 
     }
   }
 }
@@ -305,7 +305,7 @@ class OSNotificationAction {
   /// that the user tapped
   String actionId;
 
-  OSNotificationAction(Map<dynamic, dynamic> json) {
+  OSNotificationAction(Map<String, dynamic> json) {
     this.type = OSNotificationActionType.opened;
     this.actionId = json['id'] as String;
 
@@ -330,7 +330,7 @@ class OSActionButton extends JSONStringRepresentable {
 
   OSActionButton({@required this.id, @required this.text, this.icon});
 
-  OSActionButton.fromJson(Map<dynamic, dynamic> json) {
+  OSActionButton.fromJson(Map<String, dynamic> json) {
     this.id = json['id'] as String;
     this.text = json['text'] as String;
 
@@ -366,7 +366,7 @@ class OSAndroidBackgroundImageLayout extends JSONStringRepresentable {
   /// The color of the body text
   String bodyTextColor;
 
-  OSAndroidBackgroundImageLayout(Map<dynamic, dynamic> json) {
+  OSAndroidBackgroundImageLayout(Map<String, dynamic> json) {
     if (json.containsKey('image')) this.image = json['image'] as String;
     if (json.containsKey('titleTextColor')) this.titleTextColor = json['titleTextColor'] as String;
     if (json.containsKey('bodyTextColor')) this.bodyTextColor = json['bodyTextColor'] as String;

lib/src/notification.dart

@@ -1,13 +1,13 @@
-import 'package:OneSignalFlutter/src/subscription.dart';
-import 'package:OneSignalFlutter/src/defines.dart';
-import 'package:OneSignalFlutter/src/utils.dart';
+import 'package:onesignal/src/subscription.dart';
+import 'package:onesignal/src/defines.dart';
+import 'package:onesignal/src/utils.dart';
 
 class OSPermissionState extends JSONStringRepresentable {
   bool hasPrompted; // iOS only
   bool provisional; //iOS only
   OSNotificationPermission status;
 
-  OSPermissionState(Map<dynamic, dynamic> json) {
+  OSPermissionState(Map<String, dynamic> json) {
 
     if (json.containsKey('status')) {
       //ios
@@ -44,10 +44,10 @@ class OSPermissionSubscriptionState extends JSONStringRepresentable {
   OSSubscriptionState subscriptionStatus;
   OSEmailSubscriptionState emailSubscriptionStatus;
 
-  OSPermissionSubscriptionState(Map<dynamic, dynamic> json) {
-    this.permissionStatus = OSPermissionState(json['permissionStatus']);
-    this.subscriptionStatus = OSSubscriptionState(json['subscriptionStatus']);
-    this.emailSubscriptionStatus = OSEmailSubscriptionState(json['emailSubscriptionStatus']);
+  OSPermissionSubscriptionState(Map<String, dynamic> json) {
+    this.permissionStatus = OSPermissionState(json['permissionStatus'].cast<String, dynamic>());
+    this.subscriptionStatus = OSSubscriptionState(json['subscriptionStatus'].cast<String, dynamic>());
+    this.emailSubscriptionStatus = OSEmailSubscriptionState(json['emailSubscriptionStatus'].cast<String, dynamic>());
   }
 
   String jsonRepresentation() {
@@ -63,7 +63,7 @@ class OSPermissionStateChanges extends JSONStringRepresentable {
   OSPermissionState from;
   OSPermissionState to;
 
-  OSPermissionStateChanges(Map<dynamic, dynamic> json) {
+  OSPermissionStateChanges(Map<String, dynamic> json) {
     this.from = OSPermissionState(json['from']);
     this.to = OSPermissionState(json['to']);
   }