@customerglu/react-native-customerglu 3.0.0-beta-1.0 → 3.0.0-beta-1.2

package/ReactNativeCustomerglu.podspec

@@ -14,8 +14,12 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/customerglu/CG-SDK-React-Native.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
+  s.swift_version = '5.0'
+
+
+  s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/generated/**/*.h"
+  s.dependency "CustomerGlu", "3.0.12"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
@@ -32,6 +36,7 @@ Pod::Spec.new do |s|
           "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
       }
+      s.dependency "React-RCTFabric"
       s.dependency "React-Codegen"
       s.dependency "RCT-Folly"
       s.dependency "RCTRequired"

package/android/generated/java/com/customerglu/reactnativecustomerglu/NativeReactNativeCustomergluSpec.java

@@ -68,7 +68,7 @@ public abstract class NativeReactNativeCustomergluSpec extends ReactContextBaseJ
 
   @ReactMethod
   @DoNotStrip
-  public abstract void loadCampaignById(String id, @Nullable ReadableMap obj);
+  public abstract void loadCampaignById(String campid, @Nullable ReadableMap obj);
 
   @ReactMethod
   @DoNotStrip
@@ -92,7 +92,7 @@ public abstract class NativeReactNativeCustomergluSpec extends ReactContextBaseJ
 
   @ReactMethod
   @DoNotStrip
-  public abstract void isFcmApn(boolean id);
+  public abstract void isFcmApn(String value);
 
   @ReactMethod
   @DoNotStrip

package/android/generated/jni/CMakeLists.txt

@@ -6,18 +6,18 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNReactNativeCustomergluSpec/*.cpp)
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNCustomergluSpec/*.cpp)
 
 add_library(
-  react_codegen_RNReactNativeCustomergluSpec
+  react_codegen_RNCustomergluSpec
   OBJECT
   ${react_codegen_SRCS}
 )
 
-target_include_directories(react_codegen_RNReactNativeCustomergluSpec PUBLIC . react/renderer/components/RNReactNativeCustomergluSpec)
+target_include_directories(react_codegen_RNCustomergluSpec PUBLIC . react/renderer/components/RNCustomergluSpec)
 
 target_link_libraries(
-  react_codegen_RNReactNativeCustomergluSpec
+  react_codegen_RNCustomergluSpec
   fbjni
   jsi
   # We need to link different libraries based on whether we are building rncore or not, that's necessary
@@ -26,7 +26,7 @@ target_link_libraries(
 )
 
 target_compile_options(
-  react_codegen_RNReactNativeCustomergluSpec
+  react_codegen_RNCustomergluSpec
   PRIVATE
   -DLOG_TAG=\"ReactNative\"
   -fexceptions

package/android/generated/jni/{RNReactNativeCustomergluSpec-generated.cpp → RNCustomergluSpec-generated.cpp}

@@ -8,7 +8,7 @@
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include "RNReactNativeCustomergluSpec.h"
+#include "RNCustomergluSpec.h"
 
 namespace facebook::react {
 
@@ -84,7 +84,7 @@ static facebook::jsi::Value __hostFunction_NativeReactNativeCustomergluSpecJSI_e
 
 static facebook::jsi::Value __hostFunction_NativeReactNativeCustomergluSpecJSI_isFcmApn(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, VoidKind, "isFcmApn", "(Z)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "isFcmApn", "(Ljava/lang/String;)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeReactNativeCustomergluSpecJSI_UpdateProfile(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -178,7 +178,7 @@ NativeReactNativeCustomergluSpecJSI::NativeReactNativeCustomergluSpecJSI(const J
   methodMap_["getCampaignStatus"] = MethodMetadata {2, __hostFunction_NativeReactNativeCustomergluSpecJSI_getCampaignStatus};
 }
 
-std::shared_ptr<TurboModule> RNReactNativeCustomergluSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+std::shared_ptr<TurboModule> RNCustomergluSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
   if (moduleName == "Rncustomerglu") {
     return std::make_shared<NativeReactNativeCustomergluSpecJSI>(params);
   }

package/android/generated/jni/{RNReactNativeCustomergluSpec.h → RNCustomergluSpec.h}

@@ -26,6 +26,6 @@ public:
 
 
 JSI_EXPORT
-std::shared_ptr<TurboModule> RNReactNativeCustomergluSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+std::shared_ptr<TurboModule> RNCustomergluSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
 
 } // namespace facebook::react

package/android/generated/jni/react/renderer/components/{RNReactNativeCustomergluSpec/RNReactNativeCustomergluSpecJSI-generated.cpp → RNCustomergluSpec/RNCustomergluSpecJSI-generated.cpp}

@@ -7,7 +7,7 @@
  * @generated by codegen project: GenerateModuleCpp.js
  */
 
-#include "RNReactNativeCustomergluSpecJSI.h"
+#include "RNCustomergluSpecJSI.h"
 
 namespace facebook::react {
 
@@ -112,7 +112,7 @@ static jsi::Value __hostFunction_NativeReactNativeCustomergluCxxSpecJSI_enableEn
 static jsi::Value __hostFunction_NativeReactNativeCustomergluCxxSpecJSI_isFcmApn(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeReactNativeCustomergluCxxSpecJSI *>(&turboModule)->isFcmApn(
     rt,
-    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asBool()
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
   );
   return jsi::Value::undefined();
 }

package/{ios/generated/RNReactNativeCustomergluSpecJSI.h → android/generated/jni/react/renderer/components/RNCustomergluSpec/RNCustomergluSpecJSI.h}

@@ -28,13 +28,13 @@ public:
   virtual void sendData(jsi::Runtime &rt, jsi::Object obj) = 0;
   virtual void openWallet(jsi::Runtime &rt, std::optional<jsi::Object> obj) = 0;
   virtual void initCGSDK(jsi::Runtime &rt, jsi::String obj) = 0;
-  virtual void loadCampaignById(jsi::Runtime &rt, jsi::String id, std::optional<jsi::Object> obj) = 0;
+  virtual void loadCampaignById(jsi::Runtime &rt, jsi::String campid, std::optional<jsi::Object> obj) = 0;
   virtual void loadCampaignWithUrl(jsi::Runtime &rt, jsi::String url, jsi::Object obj) = 0;
   virtual void enableAnalytic(jsi::Runtime &rt, bool b) = 0;
   virtual void allowAnonymousRegistration(jsi::Runtime &rt, bool b) = 0;
   virtual void gluSDKDebuggingMode(jsi::Runtime &rt, bool b) = 0;
   virtual void enableEntryPoints(jsi::Runtime &rt, bool b) = 0;
-  virtual void isFcmApn(jsi::Runtime &rt, bool id) = 0;
+  virtual void isFcmApn(jsi::Runtime &rt, jsi::String value) = 0;
   virtual void UpdateProfile(jsi::Runtime &rt, jsi::Object obj) = 0;
   virtual void DisplayCustomerGluNotification(jsi::Runtime &rt) = 0;
   virtual void DisplayCGNotification(jsi::Runtime &rt, jsi::Object obj, std::optional<bool> autoclosewebview) = 0;
@@ -141,13 +141,13 @@ private:
       return bridging::callFromJs<void>(
           rt, &T::initCGSDK, jsInvoker_, instance_, std::move(obj));
     }
-    void loadCampaignById(jsi::Runtime &rt, jsi::String id, std::optional<jsi::Object> obj) override {
+    void loadCampaignById(jsi::Runtime &rt, jsi::String campid, std::optional<jsi::Object> obj) override {
       static_assert(
           bridging::getParameterCount(&T::loadCampaignById) == 3,
           "Expected loadCampaignById(...) to have 3 parameters");
 
       return bridging::callFromJs<void>(
-          rt, &T::loadCampaignById, jsInvoker_, instance_, std::move(id), std::move(obj));
+          rt, &T::loadCampaignById, jsInvoker_, instance_, std::move(campid), std::move(obj));
     }
     void loadCampaignWithUrl(jsi::Runtime &rt, jsi::String url, jsi::Object obj) override {
       static_assert(
@@ -189,13 +189,13 @@ private:
       return bridging::callFromJs<void>(
           rt, &T::enableEntryPoints, jsInvoker_, instance_, std::move(b));
     }
-    void isFcmApn(jsi::Runtime &rt, bool id) override {
+    void isFcmApn(jsi::Runtime &rt, jsi::String value) override {
       static_assert(
           bridging::getParameterCount(&T::isFcmApn) == 2,
           "Expected isFcmApn(...) to have 2 parameters");
 
       return bridging::callFromJs<void>(
-          rt, &T::isFcmApn, jsInvoker_, instance_, std::move(id));
+          rt, &T::isFcmApn, jsInvoker_, instance_, std::move(value));
     }
     void UpdateProfile(jsi::Runtime &rt, jsi::Object obj) override {
       static_assert(

package/ios/IosBannerView.h

@@ -0,0 +1,16 @@
+#import <React/RCTView.h>
+#import <WebKit/WebKit.h>
+#import <UserNotifications/UserNotifications.h>
+#import <UserNotifications/UNNotification.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface IosBannerView : RCTView
+
+@property (nonatomic, strong) NSString *bannerId;
+- (void)setBannerId:(NSString *)bannerId;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/IosBannerView.mm

@@ -0,0 +1,126 @@
+#import "IosBannerView.h"
+#import <WebKit/WebKit.h>
+#import <UserNotifications/UserNotifications.h>
+#import <UserNotifications/UNNotification.h>
+#import <CustomerGlu/CustomerGlu-Swift.h>
+#import <objc/runtime.h>
+
+@implementation IosBannerView {
+    BannerView *_bannerView;
+    NSString *_bannerId;
+    BOOL _bannerInitialized;
+    BOOL _isHeightUpdated;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        // Initialize view
+        self.userInteractionEnabled = YES;
+        _bannerInitialized = NO;
+        NSLog(@"[IosView] Initialized with frame: %@, userInteractionEnabled: %d", NSStringFromCGRect(frame), self.userInteractionEnabled);
+    }
+    return self;
+}
+
+- (void)setBannerId:(NSString *)bannerId {
+    NSLog(@"[IosView] setBannerId called with: %@", bannerId);
+    _bannerId = bannerId;
+    
+    if (!_bannerInitialized || ![_bannerId isEqualToString:bannerId]) {
+        // Remove existing banner if any
+        if (_bannerView) {
+            [_bannerView removeFromSuperview];
+            _bannerView = nil;
+            NSLog(@"[IosView] Removed existing banner view");
+        }
+        
+        if (bannerId) {
+            [self createBannerView];
+        }
+    }
+}
+
+- (void)createBannerView {
+    NSLog(@"[IosView] Creating banner view");
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self->_bannerView = [[BannerView alloc] initWithFrame:self.bounds bannerId:self->_bannerId];
+        
+        if (self->_bannerView) {
+            self.userInteractionEnabled = YES;
+            self->_bannerView.userInteractionEnabled = YES;
+            NSLog(@"[IosView] Banner view created, userInteractionEnabled: %d", self->_bannerView.userInteractionEnabled);
+            
+            [self addSubview:self->_bannerView];
+            self->_bannerView.frame = self.bounds;
+            self->_bannerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+            self->_bannerInitialized = YES;
+            [self setNeedsLayout];
+        
+        } else {
+            [self showError:@"Failed to create banner view"];
+            NSLog(@"[IosView] Failed to create banner view");
+        }
+    });
+}
+
+- (void)showError:(NSString *)message {
+    UILabel *errorLabel = [[UILabel alloc] init];
+    errorLabel.text = message;
+    errorLabel.textColor = [UIColor redColor];
+    errorLabel.textAlignment = NSTextAlignmentCenter;
+    errorLabel.numberOfLines = 0;
+    [self addSubview:errorLabel];
+    errorLabel.frame = self.bounds;
+}
+
+//- (void)layoutSubviews {
+//    [super layoutSubviews];
+//    
+//    if (_bannerView) {
+//        _bannerView.frame = self.bounds;
+//    }
+//}
+
+//- (void)didMoveToSuperview {
+//    [super didMoveToSuperview];
+//    
+//    if (_bannerId && !_bannerView) {
+//        NSLog(@"[IosView] didMoveToSuperview - recreating banner view");
+//        [self createBannerView];
+//    }
+//}
+//
+//- (void)didMoveToWindow {
+//    [super didMoveToWindow];
+//    
+//    if (self.window && _bannerId && !_bannerView) {
+//        NSLog(@"[IosView] didMoveToWindow - recreating banner view");
+//        [self createBannerView];
+//    }
+//}
+
+// Direct touch handling to manually forward touches to BannerView
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+    NSLog(@"[IosView] touchesBegan detected in IosView");
+       
+       if (_bannerView) {
+           UITouch *touch = [touches anyObject];
+           CGPoint point = [touch locationInView:self];
+           
+           // Check if the touch is within the banner view
+           if (CGRectContainsPoint(_bannerView.frame, point)) {
+               NSLog(@"[IosView] Touch is within banner view bounds");
+               
+               // Option 1: Try calling handleTap: with nil since we can't create a properly configured gesture recognizer
+               NSLog(@"[IosView] Directly calling handleTap: on BannerView");
+               [_bannerView performSelector:@selector(handleTap:) withObject:nil];
+               
+               // Don't call super so we consume the event
+               return;
+           }
+       }
+       
+       [super touchesBegan:touches withEvent:event];
+}
+
+@end

package/ios/IosBannerViewManager.mm

@@ -0,0 +1,24 @@
+#import <React/RCTViewManager.h>
+#import <WebKit/WebKit.h>
+#import <UserNotifications/UserNotifications.h>
+#import <UserNotifications/UNNotification.h>
+#import "IosBannerView.h"
+
+@interface IosBannerViewManager : RCTViewManager
+@end
+
+@implementation IosBannerViewManager
+
+RCT_EXPORT_MODULE(BannerView)
+
+- (UIView *)view {
+    return [[IosBannerView alloc] init];
+}
+
+RCT_EXPORT_VIEW_PROPERTY(bannerId, NSString)
+
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
+@end

package/ios/ReactNativeCustomerglu-Bridging-Header.h

@@ -0,0 +1,19 @@
+//
+//  ReactNativeCustomerglu-Bridging-Header.h
+//  Pods
+//
+//  Created by Himanshu Trehan on 27/02/25.
+//
+
+#ifndef ReactNativeCustomerglu_Bridging_Header_h
+#define ReactNativeCustomerglu_Bridging_Header_h
+
+#import "React/RCTBridgeModule.h"
+#import "React/RCTEventEmitter.h"
+
+#import <ReactNativeCustomerglu/Rncustomerglu.h>
+#import <WebKit/WebKit.h>
+#import <UserNotifications/UserNotifications.h>
+#import <UserNotifications/UNNotification.h>
+
+#endif /* ReactNativeCustomerglu_Bridging_Header_h */

package/ios/Rncustomerglu.h

@@ -1,6 +1,9 @@
 
-#import "generated/RNReactNativeCustomergluSpec/RNReactNativeCustomergluSpec.h"
+#import "generated/RNCustomergluSpec/RNCustomergluSpec.h"
+#import <WebKit/WebKit.h>
+#import <UserNotifications/UNNotification.h>
+#import <React/RCTEventEmitter.h>
 
-@interface Rncustomerglu : NSObject <NativeRncustomergluSpec>
+@interface Rncustomerglu : RCTEventEmitter <NativeReactNativeCustomergluSpec>
 
 @end