feat: add custom events support (#153)

Author: fadi-george

.gitignore

@@ -44,3 +44,4 @@ Thumbs.db
 .vs
 /Samples/OneSignalApp/<AndroidSdkPath>
 /Samples/OneSignalApp/<JavaSdkPath>
+/Samples/OneSignalDevApp/Platforms/Android/google-services.json

OneSignalSDK.DotNet.Android.Core.Binding/Jars/core-release.aar

@@ -1,7 +1,8 @@
-using System.Reflection.Emit;
+using System.Reflection.Emit;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.User;
 using OneSignalSDK.DotNet.Core.User.Subscriptions;
+using OneSignalSDK.DotNet.Android.Utilities;
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android
@@ -59,6 +60,11 @@ public string ExternalId
         public void RemoveTags(params string[] keys) => OneSignalNative.User.RemoveTags(keys);
         public IDictionary<string, string> GetTags() => OneSignalNative.User.Tags;
 
+        public void TrackEvent(string name, IDictionary<string, object>? properties = null)
+        {
+            OneSignalNative.User.TrackEvent(name, ToNativeConversion.DictToJavaMap(properties));
+        }
+
         private sealed class InternalUserState : IUserState
         {
             public string OneSignalId { get; }

OneSignalSDK.DotNet.Android.InAppMessages.Binding/Jars/in-app-messages-release.aar

@@ -1,4 +1,4 @@
-using System;
+using System;
 using OneSignalSDK.DotNet.Core.Debug;
 
 namespace OneSignalSDK.DotNet.Android.Utilities;
@@ -31,15 +31,19 @@ public static Com.OneSignal.Android.Debug.LogLevel ToLogLevel(LogLevel logLevel)
         }
     }
 
-    public static Java.Lang.Object? ToJavaObject<TObject>(this TObject value)
+    public static Java.Lang.Object? ToJavaObject(object? value)
     {
-        if (Equals(value, default(TObject)) && !typeof(TObject).IsValueType)
+        if (value == null)
             return null;
 
         if (value is string strValue)
         {
             return new Java.Lang.String(strValue);
         }
+        else if (value is bool boolValue)
+        {
+            return new Java.Lang.Boolean(boolValue);
+        }
         else if (value is int intValue)
         {
             return new Java.Lang.Integer(intValue);
@@ -76,7 +80,56 @@ public static Com.OneSignal.Android.Debug.LogLevel ToLogLevel(LogLevel logLevel)
         {
             return new Java.Lang.Long((long)ulongValue);
         }
+        else if (value is IDictionary<string, object> dictValue)
+        {
+            return DictToJavaHashMap(dictValue);
+        }
+        else if (value is System.Collections.IList listValue)
+        {
+            return ListToJavaList(listValue);
+        }
 
         return null;
     }
+
+    public static IDictionary<string, Java.Lang.Object>? DictToJavaMap(IDictionary<string, object>? dict)
+    {
+        if (dict == null)
+            return null;
+
+        var javaMap = new Dictionary<string, Java.Lang.Object>();
+        foreach (var kvp in dict)
+        {
+            var javaValue = ToJavaObject(kvp.Value);
+            if (javaValue != null)
+                javaMap[kvp.Key] = javaValue;
+        }
+        return javaMap;
+    }
+
+    private static Java.Util.HashMap? DictToJavaHashMap(IDictionary<string, object>? dict)
+    {
+        if (dict == null)
+            return null;
+
+        var javaMap = new Java.Util.HashMap();
+        foreach (var kvp in dict)
+        {
+            javaMap.Put(kvp.Key, ToJavaObject(kvp.Value));
+        }
+        return javaMap;
+    }
+
+    public static Java.Util.ArrayList? ListToJavaList(System.Collections.IList? list)
+    {
+        if (list == null)
+            return null;
+
+        var javaList = new Java.Util.ArrayList();
+        foreach (var item in list)
+        {
+            javaList.Add(ToJavaObject(item));
+        }
+        return javaList;
+    }
 }

OneSignalSDK.DotNet.Android.Location.Binding/Jars/location-release.aar

@@ -4,6 +4,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <ImplicitUsings>disable</ImplicitUsings>
+    <LangVersion>10.0</LangVersion>
+    <Nullable>enable</Nullable>
     <AssemblyName>OneSignalSDK.DotNet.Core</AssemblyName>
     <PackageId>OneSignalSDK.DotNet.Core</PackageId>
   </PropertyGroup>

OneSignalSDK.DotNet.Android.Notifications.Binding/Jars/notifications-release.aar

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using OneSignalSDK.DotNet.Core.User.Subscriptions;
 
@@ -149,5 +149,12 @@ public interface IUserManager
         /// Get the dictionary of data tags for the current user.
         /// </summary>
         IDictionary<string, string> GetTags();
+
+        /// <summary>
+        /// Track a custom event with the provided name and optional properties.
+        /// </summary>
+        /// <param name="name">The name of the custom event to track.</param>
+        /// <param name="properties">Optional properties to associate with the event.</param>
+        void TrackEvent(string name, IDictionary<string, object>? properties = null);
     }
 }

OneSignalSDK.DotNet.Android/AndroidUserManager.cs

@@ -603,6 +603,11 @@ interface OSUser
         //[Abstract]
         //[Export ("onJwtExpiredWithExpiredHandler:")]
         //void OnJwtExpiredWithExpiredHandler(Action<NSString, Action<NSString>> expiredHandler);
+
+        // @required -(void)trackEventWithName:(NSString * _Nonnull)name properties:(NSDictionary<NSString *, id> * _Nullable)properties;
+        //[Abstract]
+        [Export ("trackEventWithName:properties:")]
+        void TrackEventWithName(string name, [NullAllowed] NSDictionary<NSString, NSObject> properties);
     }
 
     // @interface OSInAppMessage : NSObject