Merge pull request #175 from OneSignal/ios_outcome_events

Implementing outcome events for iOS stubbed side of the SDK

Author: mikechoch

ios/Classes/OneSignalCategories.h renamed to ios/Classes/OSFlutterCategories.h

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#import "OneSignalCategories.h"
+#import "OSFlutterCategories.h"
 
 /*
     The OneSignal iOS SDK implements similar methods (`toDictionary`)

ios/Classes/OneSignalCategories.m renamed to ios/Classes/OSFlutterCategories.m

@@ -28,7 +28,7 @@
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
 
-@interface OneSignalInAppMessagesController : NSObject<FlutterPlugin>
+@interface OSFlutterInAppMessagesController : NSObject<FlutterPlugin>
 
 @property (strong, nonatomic) FlutterMethodChannel *channel;
 

ios/Classes/OneSignalInAppMessagesController.h renamed to ios/Classes/OSFlutterInAppMessagesController.h

@@ -25,13 +25,13 @@
  * THE SOFTWARE.
  */
 
-#import "OneSignalInAppMessagesController.h"
+#import "OSFlutterInAppMessagesController.h"
 #import <OneSignal/OneSignal.h>
-#import "OneSignalCategories.h"
+#import "OSFlutterCategories.h"
 
-@implementation OneSignalInAppMessagesController
+@implementation OSFlutterInAppMessagesController
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    OneSignalInAppMessagesController *instance = [OneSignalInAppMessagesController new];
+    OSFlutterInAppMessagesController *instance = [OSFlutterInAppMessagesController new];
 
     instance.channel = [FlutterMethodChannel
                         methodChannelWithName:@"OneSignal#inAppMessages"

ios/Classes/OneSignalInAppMessagesController.m renamed to ios/Classes/OSFlutterInAppMessagesController.m

@@ -28,7 +28,7 @@
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
 
-@interface OneSignalOutcomeEventsController : NSObject<FlutterPlugin>
+@interface OSFlutterOutcomeEventsController : NSObject<FlutterPlugin>
 
 @property (strong, nonatomic) FlutterMethodChannel *channel;
 

ios/Classes/OneSignalOutcomeEventsController.h renamed to ios/Classes/OSFlutterOutcomeEventsController.h

@@ -25,13 +25,13 @@
  * THE SOFTWARE.
  */
 
-#import "OneSignalOutcomeEventsController.h"
+#import "OSFlutterOutcomeEventsController.h"
 #import <OneSignal/OneSignal.h>
-#import "OneSignalCategories.h"
+#import "OSFlutterCategories.h"
 
-@implementation OneSignalOutcomeEventsController
+@implementation OSFlutterOutcomeEventsController
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    OneSignalOutcomeEventsController *instance = [OneSignalOutcomeEventsController new];
+    OSFlutterOutcomeEventsController *instance = [OSFlutterOutcomeEventsController new];
 
     instance.channel = [FlutterMethodChannel
                         methodChannelWithName:@"OneSignal#outcomes"
@@ -53,22 +53,25 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 }
 
 - (void)sendOutcome:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-//    NSString *name = call.arguments;
-    [OneSignal onesignal_Log:ONE_S_LL_WARN message:@"Method sendOutcome() not implemented for iOS yet!"];
-    result(@{});
+    NSString *name = call.arguments;
+    [OneSignal sendOutcome:name onSuccess:^(OSOutcomeEvent *outcome) {
+        result(outcome.jsonRepresentation);
+    }];
 }
 
 - (void)sendUniqueOutcome:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-//    NSString *name = call.arguments;
-    [OneSignal onesignal_Log:ONE_S_LL_WARN message:@"Method sendUniqueOutcome() not implemented for iOS yet!"];
-    result(@{});
+    NSString *name = call.arguments;
+    [OneSignal sendUniqueOutcome:name onSuccess:^(OSOutcomeEvent *outcome) {
+        result(outcome.jsonRepresentation);
+    }];
 }
 
 - (void)sendOutcomeWithValue:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-//    NSString *name = call.arguments[@"outcome_name"];
-//    NSNumber *value = call.arguments[@"outcome_value"];
-    [OneSignal onesignal_Log:ONE_S_LL_WARN message:@"Method sendOutcomeWithValue() not implemented for iOS yet!"];
-    result(@{});
+    NSString *name = call.arguments[@"outcome_name"];
+    NSNumber *value = call.arguments[@"outcome_value"];
+    [OneSignal sendOutcomeWithValue:name value:value onSuccess:^(OSOutcomeEvent *outcome) {
+        result(outcome.jsonRepresentation);
+    }];
 }
 
 @end

ios/Classes/OneSignalOutcomeEventsController.m renamed to ios/Classes/OSFlutterOutcomeEventsController.m

@@ -28,7 +28,7 @@
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
 
-@interface OneSignalTagsController : NSObject<FlutterPlugin>
+@interface OSFlutterTagsController : NSObject<FlutterPlugin>
 
 @property (strong, nonatomic) FlutterMethodChannel *channel;
 

ios/Classes/OneSignalTagsController.h renamed to ios/Classes/OSFlutterTagsController.h

@@ -25,13 +25,13 @@
  * THE SOFTWARE.
  */
 
-#import "OneSignalTagsController.h"
+#import "OSFlutterTagsController.h"
 #import <OneSignal/OneSignal.h>
-#import "OneSignalCategories.h"
+#import "OSFlutterCategories.h"
 
-@implementation OneSignalTagsController
+@implementation OSFlutterTagsController
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    OneSignalTagsController *instance = [OneSignalTagsController new];
+    OSFlutterTagsController *instance = [OSFlutterTagsController new];
 
     instance.channel = [FlutterMethodChannel
                         methodChannelWithName:@"OneSignal#tags"

ios/Classes/OneSignalTagsController.m renamed to ios/Classes/OSFlutterTagsController.m

@@ -21,45 +21,49 @@ OSSession sessionFromString(String session) {
 class OSOutcomeEvent extends JSONStringRepresentable {
 
   // The session when the outcome event is sent (DIRECT, INDIRECT, UNATTRIBUTED)
-  OSSession session;
+  OSSession session = OSSession.DISABLED;
 
   // List of notification ids that were sent with the outcome
-  List<String> notificationIds;
+  List<String> notificationIds = [];
 
   // Name of the outcome event
-  String name;
+  String name = "";
 
   // Time in millis when the outcome was sent
-  int timestamp;
+  int timestamp = 0;
 
   // Value if one exists (default 0.0) that was sent with the outcome
-  double weight;
+  double weight = 0.0;
 
-  OSOutcomeEvent(Map<String, dynamic> outcome) {
+  OSOutcomeEvent() {
+
+  }
+
+  OSOutcomeEvent.fromMap(Map<String, dynamic> outcome) {
       // Make sure session exists
-      this.session = outcome["session"] == null ?
-                     OSSession.DISABLED :
-                     sessionFromString(outcome["session"] as String);
+      this.session = outcome.containsKey("session") && outcome["session"] != null ?
+                     sessionFromString(outcome["session"] as String) :
+                     OSSession.DISABLED;
 
       // Make sure notification_ids exists
-      this.notificationIds = outcome["notification_ids"] == null ?
-                             [] :
-                             new List<String>.from(json.decode(outcome["notification_ids"]));
+      this.notificationIds = outcome.containsKey("notification_ids") && outcome["notification_ids"] != null ?
+                             new List<String>.from(json.decode(outcome["notification_ids"])) :
+                             [];
 
       // Make sure name exists
-      this.name = outcome["id"] == null ?
-                  "" :
-                  outcome["id"] as String;
+      this.name = outcome.containsKey("id") && outcome["id"] != null ?
+                  outcome["id"] as String :
+                  "";
 
       // Make sure timestamp exists
-      this.timestamp = outcome["timestamp"] == null ?
-                       0 :
-                       outcome["timestamp"] as int;
+      this.timestamp = outcome.containsKey("timestamp") && outcome["timestamp"] != null ?
+                       outcome["timestamp"] as int :
+                       0;
 
       // Make sure weight exists
-      this.weight = outcome["weight"] == null ?
-                    0 :
-                    double.parse(outcome["weight"] as String);
+      this.weight = outcome.containsKey("weight") && outcome["weight"] != null ?
+                    double.parse(outcome["weight"] as String) :
+                    0.0;
   }
 
   String jsonRepresentation() {