feat: add custom events trackEvent method

.gitignore

@@ -10,6 +10,7 @@ coverage/
 # tsc
 #
 dist
+android/build
 
 # OSX
 #

android/build.gradle

@@ -31,7 +31,7 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:5.1.35'
+    api 'com.onesignal:OneSignal:5.3.0-alpha-01'
 
     testImplementation 'junit:junit:4.12'
 }

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

@@ -35,11 +35,15 @@ of this software and associated documentation files (the "Software"), to deal
 
 package com.onesignal.rnonesignalandroid;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.Bundle;
-import com.onesignal.debug.internal.logging.Logging;
-import com.facebook.react.bridge.Callback;
+
+import org.jetbrains.annotations.Nullable;
+import org.json.JSONException;
+
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -48,39 +52,31 @@ of this software and associated documentation files (the "Software"), to deal
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.onesignal.Continue;
 import com.onesignal.OneSignal;
-import com.onesignal.debug.LogLevel;
 import com.onesignal.common.OneSignalWrapper;
-import com.onesignal.inAppMessages.IInAppMessage;
-import com.onesignal.inAppMessages.IInAppMessageClickListener;
+import com.onesignal.debug.LogLevel;
+import com.onesignal.debug.internal.logging.Logging;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
-import com.onesignal.inAppMessages.IInAppMessageClickResult;
-import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
-import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
+import com.onesignal.inAppMessages.IInAppMessageClickListener;
+import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
 import com.onesignal.inAppMessages.IInAppMessageDidDisplayEvent;
+import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
 import com.onesignal.inAppMessages.IInAppMessageWillDismissEvent;
-import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
+import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
 import com.onesignal.notifications.INotification;
-import com.onesignal.notifications.INotificationClickListener;
 import com.onesignal.notifications.INotificationClickEvent;
+import com.onesignal.notifications.INotificationClickListener;
 import com.onesignal.notifications.INotificationLifecycleListener;
 import com.onesignal.notifications.INotificationWillDisplayEvent;
 import com.onesignal.notifications.IPermissionObserver;
+import com.onesignal.user.state.IUserStateObserver;
+import com.onesignal.user.state.UserChangedState;
 import com.onesignal.user.subscriptions.IPushSubscription;
 import com.onesignal.user.subscriptions.IPushSubscriptionObserver;
-import com.onesignal.user.subscriptions.PushSubscriptionState;
 import com.onesignal.user.subscriptions.PushSubscriptionChangedState;
-import com.onesignal.user.state.UserState;
-import com.onesignal.user.state.UserChangedState;
-import com.onesignal.user.state.IUserStateObserver;
-import org.json.JSONException;
-
-import java.util.HashMap;
-import java.util.Map;
 
 public class RNOneSignal extends ReactContextBaseJavaModule implements
         IPushSubscriptionObserver,
@@ -739,4 +735,10 @@ public void addListener(String eventName) {
     public void removeListeners(int count) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
+
+
+    @ReactMethod
+    public void trackEvent(String name, @Nullable ReadableMap properties) {
+        OneSignal.getUser().trackEvent(name, properties != null ? RNUtils.convertReadableMapIntoStringMap(properties) : null);
+    }
 }

examples/RNOneSignalTS/.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

examples/RNOneSignalTS/.eslintrc.js

@@ -1,6 +1,4 @@
 module.exports = {
   root: true,
-  extends: '@react-native-community',
-  parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint'],
+  extends: '@react-native',
 };

examples/RNOneSignalTS/.gitignore

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -28,36 +29,47 @@ build/
 .gradle
 local.properties
 *.iml
-
-# Visual Studio Code
-#
-.vscode/
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
+.kotlin/
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
 
-# CocoaPods
-/ios/Pods/
+# Ruby / CocoaPods
+**/Pods/
+/vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

examples/RNOneSignalTS/.prettierrc.js

@@ -1,6 +1,5 @@
 module.exports = {
-  bracketSpacing: false,
-  jsxBracketSameLine: true,
+  arrowParens: 'avoid',
   singleQuote: true,
   trailingComma: 'all',
 };

examples/RNOneSignalTS/src/App.tsx → examples/RNOneSignalTS/App.tsx

@@ -9,15 +9,8 @@
  */
 
 import React from 'react';
-import {
-  SafeAreaView,
-  StyleSheet,
-  ScrollView,
-  View,
-  StatusBar,
-} from 'react-native';
+import {StatusBar, StyleSheet, View} from 'react-native';
 
-import {Colors} from 'react-native/Libraries/NewAppScreen';
 import OSDemo from './OSDemo';
 
 declare const global: {HermesInternal: null | {}};
@@ -36,7 +29,7 @@ const App = () => {
 const styles = StyleSheet.create({
   body: {
     flex: 1,
-    backgroundColor: Colors.white,
+    backgroundColor: '#ffffff',
     padding: 10,
   },
 });

examples/RNOneSignalTS/Gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'
+
+# Ruby 3.4.0 has removed some libraries from the standard library.
+gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
+gem 'mutex_m'

examples/RNOneSignalTS/src/Helpers.tsx → examples/RNOneSignalTS/Helpers.tsx

@@ -1,26 +1,24 @@
-import * as React from 'react';
 import {
-  View,
-  StyleSheet,
-  Platform,
   KeyboardAvoidingView,
+  StyleSheet,
+  Text,
   TextInput,
+  TouchableOpacity,
 } from 'react-native';
-import {Button} from '@react-native-material/core';
 
-const disabledColor = '#BEBEBE';
+// const disabledColor = '#BEBEBE';
 
 export const renderButtonView = (name: string, callback: Function) => {
   return (
-    <View key={name + '_parent'} style={styles.buttonContainer}>
-      <Button
-        key={name}
-        title={name}
-        onPress={() => {
-          callback();
-        }}
-      />
-    </View>
+    <TouchableOpacity
+      key={name + '_parent'}
+      style={styles.buttonContainer}
+      onPress={() => {
+        callback();
+      }}
+    >
+      <Text style={styles.buttonText}>{name}</Text>
+    </TouchableOpacity>
   );
 };
 
@@ -59,11 +57,19 @@ export const renderFieldView = (
 
 const styles = StyleSheet.create({
   buttonContainer: {
-    flexDirection: 'column',
-    overflow: 'hidden',
-    borderRadius: 10,
+    backgroundColor: '#007bff',
+    borderRadius: 8,
     marginVertical: 10,
     marginHorizontal: 10,
+    paddingVertical: 12,
+    paddingHorizontal: 16,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  buttonText: {
+    color: 'white',
+    fontSize: 16,
+    fontWeight: '600',
   },
   textInput: {
     marginHorizontal: 10,