@developer_tribe/react-native-comnyx 0.7.6 → 0.9.0

package/android/build.gradle

@@ -15,6 +15,7 @@ buildscript {
   }
 }
 
+
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 apply plugin: "com.facebook.react"
@@ -90,14 +91,19 @@ dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation "com.google.firebase:firebase-analytics:21.5.0"
   api('com.google.firebase:firebase-messaging') {
-     version {
-         require '[21.0.0, 23.4.99]'
-         prefer '23.4.0'
-     }
+    version {
+        require '[21.0.0, 23.4.99]'
+        prefer '23.4.0'
+    }
   }
- }
+   api('com.google.firebase:firebase-analytics') {
+      version {
+          require '[21.0.0, 23.4.99]'
+          prefer '23.4.0'
+      }
+    }
+}
 
 react {
   jsRootDir = file("../src/")

package/android/generated/RCTAppDependencyProvider.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React-RCTAppDelegate/RCTDependencyProvider.h>
+#elif __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React_RCTAppDelegate/RCTDependencyProvider.h>
+#else
+#import "RCTDependencyProvider.h"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTAppDependencyProvider : NSObject <RCTDependencyProvider>
+
+@end
+
+NS_ASSUME_NONNULL_END

package/android/generated/RCTAppDependencyProvider.mm

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAppDependencyProvider.h"
+#import <ReactCodegen/RCTModulesConformingToProtocolsProvider.h>
+#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+
+@implementation RCTAppDependencyProvider {
+  NSArray<NSString *> * _URLRequestHandlerClassNames;
+  NSArray<NSString *> * _imageDataDecoderClassNames;
+  NSArray<NSString *> * _imageURLLoaderClassNames;
+  NSDictionary<NSString *,Class<RCTComponentViewProtocol>> * _thirdPartyFabricComponents;
+}
+
+- (nonnull NSArray<NSString *> *)URLRequestHandlerClassNames {
+  static dispatch_once_t requestUrlToken;
+  dispatch_once(&requestUrlToken, ^{
+    self->_URLRequestHandlerClassNames = RCTModulesConformingToProtocolsProvider.URLRequestHandlerClassNames;
+  });
+
+  return _URLRequestHandlerClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageDataDecoderClassNames {
+  static dispatch_once_t dataDecoderToken;
+  dispatch_once(&dataDecoderToken, ^{
+    _imageDataDecoderClassNames = RCTModulesConformingToProtocolsProvider.imageDataDecoderClassNames;
+  });
+
+  return _imageDataDecoderClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageURLLoaderClassNames {
+  static dispatch_once_t urlLoaderToken;
+  dispatch_once(&urlLoaderToken, ^{
+    _imageURLLoaderClassNames = RCTModulesConformingToProtocolsProvider.imageURLLoaderClassNames;
+  });
+
+  return _imageURLLoaderClassNames;
+}
+
+- (nonnull NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents {
+  static dispatch_once_t nativeComponentsToken;
+  dispatch_once(&nativeComponentsToken, ^{
+    _thirdPartyFabricComponents = RCTThirdPartyComponentsProvider.thirdPartyFabricComponents;
+  });
+
+  return _thirdPartyFabricComponents;
+}
+
+@end

package/android/generated/RCTModulesConformingToProtocolsProvider.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface RCTModulesConformingToProtocolsProvider: NSObject
+
++(NSArray<NSString *> *)imageURLLoaderClassNames;
+
++(NSArray<NSString *> *)imageDataDecoderClassNames;
+
++(NSArray<NSString *> *)URLRequestHandlerClassNames;
+
+@end

package/android/generated/RCTModulesConformingToProtocolsProvider.mm

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTModulesConformingToProtocolsProvider.h"
+
+@implementation RCTModulesConformingToProtocolsProvider
+
++(NSArray<NSString *> *)imageURLLoaderClassNames
+{
+  return @[
+    
+  ];
+}
+
++(NSArray<NSString *> *)imageDataDecoderClassNames
+{
+  return @[
+    
+  ];
+}
+
++(NSArray<NSString *> *)URLRequestHandlerClassNames
+{
+  return @[
+    
+  ];
+}
+
+@end

package/android/generated/RCTThirdPartyComponentsProvider.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol RCTComponentViewProtocol;
+
+@interface RCTThirdPartyComponentsProvider: NSObject
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;
+
+@end

package/android/generated/RCTThirdPartyComponentsProvider.mm

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#import "RCTThirdPartyComponentsProvider.h"
+#import <React/RCTComponentViewProtocol.h>
+
+@implementation RCTThirdPartyComponentsProvider
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
+{
+  return @{
+
+  };
+}
+
+@end

package/android/generated/ReactAppDependencyProvider.podspec

@@ -0,0 +1,34 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+version = "0.78.1"
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "ReactAppDependencyProvider"
+  s.version                = version
+  s.summary                = "The third party dependency provider for the app"
+  s.homepage               = "https://reactnative.dev/"
+  s.documentation_url      = "https://reactnative.dev/"
+  s.license                = "MIT"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
+  s.platforms              = min_supported_versions
+  s.source                 = source
+  s.source_files           = "**/RCTAppDependencyProvider.{h,mm}"
+
+  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+  s.pod_target_xcconfig    = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+    "DEFINES_MODULE" => "YES"
+  }
+
+  s.dependency "ReactCodegen"
+end

package/android/generated/jni/RNComnyxSpec-generated.cpp

@@ -12,20 +12,10 @@
 
 namespace facebook::react {
 
-static facebook::jsi::Value __hostFunction_NativeComnyxSpecJSI_multiply(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-  static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, NumberKind, "multiply", "(DD)D", args, count, cachedMethodId);
-}
 
-NativeComnyxSpecJSI::NativeComnyxSpecJSI(const JavaTurboModule::InitParams &params)
-  : JavaTurboModule(params) {
-  methodMap_["multiply"] = MethodMetadata {2, __hostFunction_NativeComnyxSpecJSI_multiply};
-}
 
 std::shared_ptr<TurboModule> RNComnyxSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
-  if (moduleName == "Comnyx") {
-    return std::make_shared<NativeComnyxSpecJSI>(params);
-  }
+
   return nullptr;
 }
 

package/android/generated/jni/RNComnyxSpec.h

@@ -16,13 +16,6 @@
 
 namespace facebook::react {
 
-/**
- * JNI C++ class for module 'NativeComnyx'
- */
-class JSI_EXPORT NativeComnyxSpecJSI : public JavaTurboModule {
-public:
-  NativeComnyxSpecJSI(const JavaTurboModule::InitParams &params);
-};
 
 
 JSI_EXPORT

package/android/generated/jni/react/renderer/components/RNComnyxSpec/RNComnyxSpecJSI-generated.cpp

@@ -11,18 +11,7 @@
 
 namespace facebook::react {
 
-static jsi::Value __hostFunction_NativeComnyxCxxSpecJSI_multiply(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeComnyxCxxSpecJSI *>(&turboModule)->multiply(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber(),
-    count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asNumber()
-  );
-}
 
-NativeComnyxCxxSpecJSI::NativeComnyxCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule("Comnyx", jsInvoker) {
-  methodMap_["multiply"] = MethodMetadata {2, __hostFunction_NativeComnyxCxxSpecJSI_multiply};
-}
 
 
 } // namespace facebook::react

package/android/generated/jni/react/renderer/components/RNComnyxSpec/RNComnyxSpecJSI.h

@@ -15,57 +15,5 @@
 namespace facebook::react {
 
 
-  class JSI_EXPORT NativeComnyxCxxSpecJSI : public TurboModule {
-protected:
-  NativeComnyxCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
-
-public:
-  virtual double multiply(jsi::Runtime &rt, double a, double b) = 0;
-
-};
-
-template <typename T>
-class JSI_EXPORT NativeComnyxCxxSpec : public TurboModule {
-public:
-  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.create(rt, propName);
-  }
-
-  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
-    return delegate_.getPropertyNames(runtime);
-  }
-
-  static constexpr std::string_view kModuleName = "Comnyx";
-
-protected:
-  NativeComnyxCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(std::string{NativeComnyxCxxSpec::kModuleName}, jsInvoker),
-      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
-
-
-private:
-  class Delegate : public NativeComnyxCxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      NativeComnyxCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
-
-    }
-
-    double multiply(jsi::Runtime &rt, double a, double b) override {
-      static_assert(
-          bridging::getParameterCount(&T::multiply) == 3,
-          "Expected multiply(...) to have 3 parameters");
-
-      return bridging::callFromJs<double>(
-          rt, &T::multiply, jsInvoker_, instance_, std::move(a), std::move(b));
-    }
-
-  private:
-    friend class NativeComnyxCxxSpec;
-    T *instance_;
-  };
-
-  Delegate delegate_;
-};
 
 } // namespace facebook::react

package/android/src/main/java/com/comnyx/ComnyxModule.kt

@@ -63,7 +63,13 @@ class ComnyxModule(reactContext: ReactApplicationContext) :
         if(activity?.intent !== null){
           ComnyxModule.handleNewIntent(activity.intent)
         }
-        promise.resolve(true)
+        
+        val result = Arguments.createMap()
+        result.putBoolean("success", true)
+        result.putString("country", java.util.Locale.getDefault().country)
+        result.putString("timezone", java.util.TimeZone.getDefault().id)
+        result.putString("language", java.util.Locale.getDefault().language)
+        promise.resolve(result)
         },
         { exception ->
           promise.reject("TOKEN_FAILED", exception.message, exception)
@@ -209,20 +215,82 @@ class ComnyxModule(reactContext: ReactApplicationContext) :
       }
        intent?.let {
         val params = Arguments.createMap()
+        params.putString("comnyx_type", type ?: "")
+        params.putString("title", it.getStringExtra("title") ?: "")
+        params.putString("body", it.getStringExtra("body") ?: "")
+        params.putString("subtitle", it.getStringExtra("subtitle") ?: "")
+        params.putInt("badge", it.getIntExtra("badge", 0))
+        params.putString("sound", it.getStringExtra("sound") ?: "")
+        
+        // Add structured data map
+        val dataMap = Arguments.createMap()
         it.extras?.let { extras ->
           for (key in extras.keySet()) {
-            val value = extras.get(key)
-            when (value) {
-              is String -> params.putString(key, value)
-              is Int -> params.putInt(key, value)
-              is Boolean -> params.putBoolean(key, value)
-              is Double -> params.putDouble(key, value)
+            // Skip the structured fields we already handled
+            if (!key.startsWith("raw_") && !listOf("comnyx_type", "title", "body", "subtitle", "badge", "sound", "data").contains(key)) {
+              val value = extras.get(key)
+              when (value) {
+                is String -> dataMap.putString(key, value)
+                is Int -> dataMap.putInt(key, value)
+                is Boolean -> dataMap.putBoolean(key, value)
+                is Double -> dataMap.putDouble(key, value)
+              }
             }
           }
         }
+        params.putMap("data", dataMap)
+        
+        // Add raw RemoteMessage data
+        val rawMap = Arguments.createMap()
+        rawMap.putString("from", it.getStringExtra("raw_from") ?: "")
+        rawMap.putString("to", it.getStringExtra("raw_to") ?: "")
+        rawMap.putString("messageId", it.getStringExtra("raw_messageId") ?: "")
+        rawMap.putString("messageType", it.getStringExtra("raw_messageType") ?: "")
+        rawMap.putString("collapseKey", it.getStringExtra("raw_collapseKey") ?: "")
+        rawMap.putInt("priority", it.getIntExtra("raw_priority", 0))
+        rawMap.putInt("originalPriority", it.getIntExtra("raw_originalPriority", 0))
+        rawMap.putInt("ttl", it.getIntExtra("raw_ttl", 0))
+        rawMap.putDouble("sentTime", it.getLongExtra("raw_sentTime", 0).toDouble())
+        
+        // Add raw notification data if available
+        val notificationMap = Arguments.createMap()
+        notificationMap.putString("title", it.getStringExtra("raw_notification_title") ?: "")
+        notificationMap.putString("body", it.getStringExtra("raw_notification_body") ?: "")
+        notificationMap.putString("icon", it.getStringExtra("raw_notification_icon") ?: "")
+        notificationMap.putString("color", it.getStringExtra("raw_notification_color") ?: "")
+        notificationMap.putString("sound", it.getStringExtra("raw_notification_sound") ?: "")
+        notificationMap.putString("tag", it.getStringExtra("raw_notification_tag") ?: "")
+        notificationMap.putString("clickAction", it.getStringExtra("raw_notification_clickAction") ?: "")
+        notificationMap.putString("channelId", it.getStringExtra("raw_notification_channelId") ?: "")
+        notificationMap.putString("link", it.getStringExtra("raw_notification_link") ?: "")
+        notificationMap.putString("ticker", it.getStringExtra("raw_notification_ticker") ?: "")
+        notificationMap.putBoolean("sticky", it.getBooleanExtra("raw_notification_sticky", false))
+        notificationMap.putBoolean("localOnly", it.getBooleanExtra("raw_notification_localOnly", false))
+        notificationMap.putBoolean("defaultSound", it.getBooleanExtra("raw_notification_defaultSound", false))
+        notificationMap.putBoolean("defaultVibrateSettings", it.getBooleanExtra("raw_notification_defaultVibrateSettings", false))
+        notificationMap.putBoolean("defaultLightSettings", it.getBooleanExtra("raw_notification_defaultLightSettings", false))
+        
+        val vibrateTimings = it.getStringExtra("raw_notification_vibrateTimings")
+        if (!vibrateTimings.isNullOrEmpty()) {
+          notificationMap.putString("vibrateTimings", vibrateTimings)
+        }
+        
+        // Add light settings if available
+        if (it.hasExtra("raw_notification_lightColor")) {
+          val lightMap = Arguments.createMap()
+          lightMap.putInt("color", it.getIntExtra("raw_notification_lightColor", 0))
+          lightMap.putInt("onTime", it.getIntExtra("raw_notification_lightOnTime", 0))
+          lightMap.putInt("offTime", it.getIntExtra("raw_notification_lightOffTime", 0))
+          notificationMap.putMap("lightSettings", lightMap)
+        }
+        
+        rawMap.putMap("notification", notificationMap)
+        params.putMap("raw", rawMap)
+        
          if(type == "notification_clicked"){
            __self?.onNotificationClicked(params)
          } else {
+          //TODO: remove this
            __self?.onNotificationShown(params)
          }
        }

package/android/src/main/java/com/comnyx/ComnyxPackage.kt

@@ -27,10 +27,7 @@ class ComnyxPackage : BaseReactPackage() {
         false,  // isCxxModule
         false // isTurboModule
       )
-
       // Add NotificationPermissionModule
-
-
       moduleInfos
     }
   }

package/android/src/main/java/com/comnyx/src/messaging/firebase/FirebaseMessagingService.kt

@@ -18,21 +18,13 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
       //https://stackoverflow.com/a/40083727
         super.onMessageReceived(remoteMessage)
-        Log.d("MyFirebaseMessagingService","onMessageReceived($remoteMessage)")
-       val title: String = remoteMessage.data["title"] ?: remoteMessage.notification?.title ?: ""
-       val body: String = remoteMessage.data["body"] ?: remoteMessage.notification?.body ?: ""
-
-        notificationsHelper.showNotification(title, body, remoteMessage.data)
+        notificationsHelper.showNotification(remoteMessage)
     }
 
-
-
-
     override fun onNewToken(token: String) {
         sendRegistrationToServer(token)
     }
 
-
     private fun sendRegistrationToServer(token: String) {
         //TODO: send token to server
         Log.d("MyFirebaseMessagingService","sendRegistrationTokenToServer($token)")

package/android/src/main/java/com/comnyx/src/messaging/notifications/NotificationsService.kt

@@ -12,6 +12,7 @@ import androidx.core.app.NotificationCompat
 import com.comnyx.ComnyxModule
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
+import com.google.firebase.messaging.RemoteMessage
 
 class NotificationsHelper(private val context: Context) {
 
@@ -49,9 +50,15 @@ class NotificationsHelper(private val context: Context) {
         }
     }
 
-    fun showNotification(title: String, message: String, data: Map<String, String>? = null) {
-        Log.d(TAG, "Showing notification - Title: $title, Message: $message")
-        
+    fun showNotification(remoteMessage: RemoteMessage) {
+        Log.d(TAG, "Showing notification - Title: ${remoteMessage.notification?.title}, Message: ${remoteMessage.notification?.body}")
+        val title: String = remoteMessage.data["title"] ?: remoteMessage.notification?.title ?: ""
+        val message: String = remoteMessage.data["body"] ?: remoteMessage.notification?.body ?: ""
+        val subtitle: String = remoteMessage.data["subtitle"] ?: remoteMessage.notification?.bodyLocalizationKey ?: ""
+        val badge: Int = remoteMessage.data["badge"]?.toIntOrNull() ?: 0
+        val sound: String = remoteMessage.data["sound"] ?: remoteMessage.notification?.sound ?: ""
+        val data: Map<String, String>? = remoteMessage.data
+
         // Create pending intent for notification click
         val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
             ?: Intent().setPackage(context.packageName)
@@ -65,8 +72,50 @@ class NotificationsHelper(private val context: Context) {
             intent.putExtra(key, value)
         }
         intent.putExtra("comnyx_type", "notification_clicked")
-        intent.putExtra("notification_title", title)
-        intent.putExtra("notification_message", message)
+        intent.putExtra("title", title)
+        intent.putExtra("body", message)
+        intent.putExtra("subtitle", subtitle)
+        intent.putExtra("badge", badge)
+        intent.putExtra("sound", sound)
+        intent.putExtra("data", remoteMessage.data.toString())
+
+        // Add all raw RemoteMessage data
+        intent.putExtra("raw_from", remoteMessage.from ?: "")
+        intent.putExtra("raw_to", remoteMessage.to ?: "")
+        intent.putExtra("raw_messageId", remoteMessage.messageId ?: "")
+        intent.putExtra("raw_messageType", remoteMessage.messageType ?: "")
+        intent.putExtra("raw_collapseKey", remoteMessage.collapseKey ?: "")
+        intent.putExtra("raw_priority", remoteMessage.priority)
+        intent.putExtra("raw_originalPriority", remoteMessage.originalPriority)
+        intent.putExtra("raw_ttl", remoteMessage.ttl)
+        intent.putExtra("raw_sentTime", remoteMessage.sentTime)
+
+        // Add raw notification data if available
+        remoteMessage.notification?.let { notification ->
+            intent.putExtra("raw_notification_title", notification.title ?: "")
+            intent.putExtra("raw_notification_body", notification.body ?: "")
+            intent.putExtra("raw_notification_icon", notification.icon ?: "")
+            intent.putExtra("raw_notification_color", notification.color ?: "")
+            intent.putExtra("raw_notification_sound", notification.sound ?: "")
+            intent.putExtra("raw_notification_tag", notification.tag ?: "")
+            intent.putExtra("raw_notification_clickAction", notification.clickAction ?: "")
+            intent.putExtra("raw_notification_channelId", notification.channelId ?: "")
+            intent.putExtra("raw_notification_link", notification.link?.toString() ?: "")
+            intent.putExtra("raw_notification_ticker", notification.ticker ?: "")
+            intent.putExtra("raw_notification_sticky", notification.sticky)
+            intent.putExtra("raw_notification_localOnly", notification.localOnly)
+            intent.putExtra("raw_notification_defaultSound", notification.defaultSound)
+            intent.putExtra("raw_notification_defaultVibrateSettings", notification.defaultVibrateSettings)
+            intent.putExtra("raw_notification_defaultLightSettings", notification.defaultLightSettings)
+            notification.vibrateTimings?.let { vibrate ->
+                intent.putExtra("raw_notification_vibrateTimings", vibrate.contentToString())
+            }
+            notification.lightSettings?.let { light ->
+                intent.putExtra("raw_notification_lightColor", light[0])
+                intent.putExtra("raw_notification_lightOnTime", light[1])
+                intent.putExtra("raw_notification_lightOffTime", light[2])
+            }
+        }
 
         try {
             val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
@@ -85,11 +134,59 @@ class NotificationsHelper(private val context: Context) {
 
             val writableMap: WritableMap = Arguments.createMap()
             writableMap.putString("comnyx_type", "notification_shown")
-            writableMap.putString("notification_title", title)
-            writableMap.putString("notification_message", message)
+            writableMap.putString("title", title)
+            writableMap.putString("body", message)
+            writableMap.putString("subtitle", subtitle)
+            writableMap.putInt("badge", badge)
+            writableMap.putString("sound", sound)
+            val dataMap = Arguments.createMap()
             data?.forEach { (key, value) ->
-                writableMap.putString(key, value)
+                dataMap.putString(key, value)
+            }
+            writableMap.putMap("data", dataMap)
+
+            val rawMap = Arguments.createMap()
+            rawMap.putString("from", remoteMessage.from ?: "")
+            rawMap.putString("to", remoteMessage.to ?: "")
+            rawMap.putString("messageId", remoteMessage.messageId ?: "")
+            rawMap.putString("messageType", remoteMessage.messageType ?: "")
+            rawMap.putString("collapseKey", remoteMessage.collapseKey ?: "")
+            rawMap.putInt("priority", remoteMessage.priority)
+            rawMap.putInt("originalPriority", remoteMessage.originalPriority)
+            rawMap.putInt("ttl", remoteMessage.ttl)
+            rawMap.putDouble("sentTime", remoteMessage.sentTime.toDouble())
+
+            // Add raw notification data if available
+            remoteMessage.notification?.let { notification ->
+                val notificationMap = Arguments.createMap()
+                notificationMap.putString("title", notification.title ?: "")
+                notificationMap.putString("body", notification.body ?: "")
+                notificationMap.putString("icon", notification.icon ?: "")
+                notificationMap.putString("color", notification.color ?: "")
+                notificationMap.putString("sound", notification.sound ?: "")
+                notificationMap.putString("tag", notification.tag ?: "")
+                notificationMap.putString("clickAction", notification.clickAction ?: "")
+                notificationMap.putString("channelId", notification.channelId ?: "")
+                notificationMap.putString("link", notification.link?.toString() ?: "")
+                notificationMap.putString("ticker", notification.ticker ?: "")
+                notificationMap.putBoolean("sticky", notification.sticky)
+                notificationMap.putBoolean("localOnly", notification.localOnly)
+                notificationMap.putBoolean("defaultSound", notification.defaultSound)
+                notificationMap.putBoolean("defaultVibrateSettings", notification.defaultVibrateSettings)
+                notificationMap.putBoolean("defaultLightSettings", notification.defaultLightSettings)
+                notification.vibrateTimings?.let { vibrate ->
+                    notificationMap.putString("vibrateTimings", vibrate.contentToString())
+                }
+                notification.lightSettings?.let { light ->
+                    val lightMap = Arguments.createMap()
+                    lightMap.putInt("color", light[0])
+                    lightMap.putInt("onTime", light[1])
+                    lightMap.putInt("offTime", light[2])
+                    notificationMap.putMap("lightSettings", lightMap)
+                }
+                rawMap.putMap("notification", notificationMap)
             }
+            writableMap.putMap("raw", rawMap)
             ComnyxModule.__self?.onNotificationShown(writableMap)
             Log.d(TAG, "Notification event sent to JS")
         } catch (e: Exception) {

package/ios/Comnyx.m

@@ -10,9 +10,9 @@ RCT_EXTERN_METHOD(optIn:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(initialize:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(linkToSettings:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-@end 
+@end