@convep_mobilogy/react-native-qms-plugin 0.10.4 → 0.10.6

package/android/build.gradle

@@ -75,7 +75,7 @@ dependencies {
     implementation "com.facebook.react:react-android"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.facebook.react:react-native:+' 
-    implementation "com.convep.qms:qms-plugin:1.12.17"
+    implementation "com.convep.qms:qms-plugin:1.13.37"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
 

package/ios/QmsPlugin/QmsDashboardViewManager.mm

@@ -3,6 +3,12 @@
 #import <QmsPluginFramework/QmsPluginFramework.h>
 #import <QmsPluginFramework/QmsPlugin.h>
 
+static NSString * const kQmsThemePrimaryColorKey = @"QmsThemePrimaryColor";
+static NSString * const kQmsThemeHeaderTextColorKey = @"QmsThemeHeaderTextColor";
+static NSString * const kQmsThemeAccentColorKey = @"QmsThemeAccentColor";
+static NSString * const kQmsThemeFontFamilyKey = @"QmsThemeFontFamily";
+static NSString * const kQmsRoutePayloadNotification = @"QmsRoutePayloadNotification";
+
 @interface QmsDashboardView : UIView
 @property (nonatomic, strong) UIViewController *dashboardVC;
 @property (nonatomic, assign) BOOL didSetupVC;
@@ -10,18 +16,51 @@
 @property (nonatomic, copy) NSString *ClientID;
 @property (nonatomic, copy) NSString *ClientCode;
 @property (nonatomic, copy) NSString *user_token;
+@property (nonatomic, copy) NSString *themeColor;
 @property (nonatomic, copy) NSString *headerTextColor;
 @property (nonatomic, copy) NSString *headerIconColor;
 @property (nonatomic, copy) NSString *accentColor;
 @property (nonatomic, copy) NSString *fontFamily;
+@property (nonatomic, assign) BOOL isOrigin;
+@property (nonatomic, copy) NSDictionary *payload;
+@property (nonatomic, assign) BOOL didRouteInitialPayload;
 
 @property (nonatomic, copy) RCTDirectEventBlock onClose;
+@property (nonatomic, copy) RCTDirectEventBlock onLogout;
 @property (nonatomic, copy) RCTDirectEventBlock onAnalyticsScreen;
 @property (nonatomic, copy) RCTDirectEventBlock onAnalyticsEvent;
 @end
 
 @implementation QmsDashboardView
 
+- (void)persistThemeDefaults {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    if (_themeColor.length > 0) [defaults setObject:_themeColor forKey:kQmsThemePrimaryColorKey];
+    else [defaults removeObjectForKey:kQmsThemePrimaryColorKey];
+
+    if (_headerTextColor.length > 0) [defaults setObject:_headerTextColor forKey:kQmsThemeHeaderTextColorKey];
+    else [defaults removeObjectForKey:kQmsThemeHeaderTextColorKey];
+
+    if (_accentColor.length > 0) [defaults setObject:_accentColor forKey:kQmsThemeAccentColorKey];
+    else [defaults removeObjectForKey:kQmsThemeAccentColorKey];
+
+    if (_fontFamily.length > 0) [defaults setObject:_fontFamily forKey:kQmsThemeFontFamilyKey];
+    else [defaults removeObjectForKey:kQmsThemeFontFamilyKey];
+}
+
+- (void)applyAllThemeImmediatelyIfNeeded {
+    if (!_dashboardVC || !_dashboardVC.view) return;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self persistThemeDefaults];
+        [self applyThemeColorIfNeeded];
+        [self applyHeaderThemeIfNeeded];
+        [self applyAccentColorIfNeeded];
+        [self applyFontFamilyIfNeeded];
+        [_dashboardVC.view setNeedsLayout];
+        [_dashboardVC.view layoutIfNeeded];
+    });
+}
+
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     _dashboardVC = [QmsPluginUI makeViewController];   
@@ -41,6 +80,14 @@
                                              selector:@selector(handleAnalyticsEvent:)
                                                  name:@"QmsAnalyticsEventNotification"
                                                object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleDashboardLogout:)
+                                                 name:@"QmsDashboardDidLogoutNotification"
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleRoutePayloadNotification:)
+                                                 name:kQmsRoutePayloadNotification
+                                               object:nil];
   }
   return self;
 }
@@ -50,6 +97,7 @@
     if (self.window && !_didSetupVC) {
         UIViewController *parentVC = [UIApplication sharedApplication].keyWindow.rootViewController;
         if (parentVC) {
+            [self persistThemeDefaults];
 
             // 1️⃣ create VC with props
             _dashboardVC = [QmsPluginUI makeViewController];
@@ -63,6 +111,8 @@
 
             // 2️⃣ forward props again if needed
             [self forwardPropsToVC];
+            [self routePayloadIfNeeded:self.payload force:NO];
+            [self applyAllThemeImmediatelyIfNeeded];
         }
     }
 }
@@ -89,6 +139,12 @@
     }
 }
 
+- (void)handleDashboardLogout:(NSNotification *)note {
+    if (self.onLogout) {
+        self.onLogout(note.userInfo ?: @{});
+    }
+}
+
 - (void)cleanupDashboard {
     if (!_dashboardVC) return;
 
@@ -116,27 +172,51 @@
     [self forwardProp:@"user_token" value:_user_token];
 }
 
+- (void)setThemeColor:(NSString *)themeColor {
+    _themeColor = [themeColor copy];
+    [self persistThemeDefaults];
+    [self forwardProp:@"themeColor" value:_themeColor];
+    [self applyAllThemeImmediatelyIfNeeded];
+}
+
 - (void)setHeaderTextColor:(NSString *)headerTextColor {
     _headerTextColor = [headerTextColor copy];
+    [self persistThemeDefaults];
     [self forwardProp:@"headerTextColor" value:_headerTextColor];
+    [self applyAllThemeImmediatelyIfNeeded];
 }
 
 - (void)setHeaderIconColor:(NSString *)headerIconColor {
     _headerIconColor = [headerIconColor copy];
     [self forwardProp:@"headerIconColor" value:_headerIconColor];
+    [self applyAllThemeImmediatelyIfNeeded];
 }
 
 - (void)setAccentColor:(NSString *)accentColor {
     _accentColor = [accentColor copy];
+    [self persistThemeDefaults];
     [self forwardProp:@"accentColor" value:_accentColor];
+    [self applyAllThemeImmediatelyIfNeeded];
 }
 
 - (void)setFontFamily:(NSString *)fontFamily {
     _fontFamily = [fontFamily copy];
+    [self persistThemeDefaults];
     [self forwardProp:@"fontFamily" value:_fontFamily];
+    [self applyAllThemeImmediatelyIfNeeded];
+}
+
+- (void)setIsOrigin:(BOOL)isOrigin {
+    _isOrigin = isOrigin;
+    [self forwardProp:@"isOrigin" value:@(isOrigin)];
+}
+
+- (void)setPayload:(NSDictionary *)payload {
+    _payload = [payload copy];
+    [self routePayloadIfNeeded:_payload force:NO];
 }
 #pragma mark - Forward Props via KVC
-- (void)forwardProp:(NSString *)key value:(NSString *)value {
+- (void)forwardProp:(NSString *)key value:(id)value {
     if (_dashboardVC && [_dashboardVC respondsToSelector:NSSelectorFromString(key)]) {
         @try {
             [_dashboardVC setValue:value forKey:key];
@@ -150,10 +230,315 @@
     [self forwardProp:@"ClientID" value:_ClientID];
     [self forwardProp:@"ClientCode" value:_ClientCode];
     [self forwardProp:@"user_token" value:_user_token];
+    [self forwardProp:@"themeColor" value:_themeColor];
     [self forwardProp:@"headerTextColor" value:_headerTextColor];
     [self forwardProp:@"headerIconColor" value:_headerIconColor];
     [self forwardProp:@"accentColor" value:_accentColor];
     [self forwardProp:@"fontFamily" value:_fontFamily];
+    [self forwardProp:@"isOrigin" value:@(_isOrigin)];
+    [self applyAllThemeImmediatelyIfNeeded];
+}
+
+- (NSString *)stringFromPayload:(NSDictionary *)payload key:(NSString *)key {
+    id value = payload[key];
+    if ((!value || value == [NSNull null]) && [payload[@"data"] isKindOfClass:[NSDictionary class]]) {
+        value = payload[@"data"][key];
+    }
+    if (!value || value == [NSNull null]) return nil;
+    return [value description];
+}
+
+- (BOOL)isIssueType:(NSString *)type {
+    static NSSet<NSString *> *types;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        types = [NSSet setWithArray:@[
+            @"new_issue", @"new_info", @"accept_issue", @"reject_issue", @"decline_issue",
+            @"start_fix", @"redo", @"completed", @"close_internal", @"close_external",
+            @"pending_owner_acceptance", @"assign_issue", @"reassign_issue", @"poa_reminder",
+            @"auto_close_reminder", @"pending_access_reminder", @"overdue_reminder",
+            @"issue_summary_reminder", @"lodge_summary_reminder", @"overdue_summary_reminder"
+        ]];
+    });
+    return type.length > 0 && [types containsObject:type];
+}
+
+- (BOOL)isAppointmentType:(NSString *)type {
+    return [type isEqualToString:@"appointment_reminder"] ||
+           [type isEqualToString:@"unattend_appt_reminder"];
+}
+
+- (void)applyPayloadContext:(NSDictionary *)payload {
+    Class apiConfig = NSClassFromString(@"APIConfig");
+    if (!apiConfig) return;
+
+    NSString *projectId = [self stringFromPayload:payload key:@"project_id"];
+    NSString *planId = [self stringFromPayload:payload key:@"plan_id"];
+
+    if (projectId.length > 0 && [apiConfig respondsToSelector:NSSelectorFromString(@"setProjectId:")]) {
+        [apiConfig performSelector:NSSelectorFromString(@"setProjectId:") withObject:projectId];
+    }
+    if (planId.length > 0 && [apiConfig respondsToSelector:NSSelectorFromString(@"setDrawingPlanId:")]) {
+        [apiConfig performSelector:NSSelectorFromString(@"setDrawingPlanId:") withObject:planId];
+    }
+}
+
+- (UINavigationController *)mainNavigationController {
+    id mainVC = nil;
+    @try {
+        mainVC = [self.dashboardVC valueForKey:@"mainViewController"];
+    } @catch (__unused NSException *exception) {}
+
+    if ([mainVC isKindOfClass:[UINavigationController class]]) {
+        return (UINavigationController *)mainVC;
+    }
+    if ([self.dashboardVC isKindOfClass:[UINavigationController class]]) {
+        return (UINavigationController *)self.dashboardVC;
+    }
+    return self.dashboardVC.navigationController;
+}
+
+- (void)pushViewControllerNamed:(NSString *)className {
+    Class cls = NSClassFromString(className);
+    if (!cls) return;
+    UIViewController *vc = [[cls alloc] init];
+    if (!vc) return;
+    UINavigationController *nav = [self mainNavigationController];
+    if (nav) {
+        [nav pushViewController:vc animated:YES];
+    }
+}
+
+- (void)pushIssuesViewControllerWithPayload:(NSDictionary *)payload {
+    Class cls = NSClassFromString(@"IssuesViewController");
+    if (!cls) return;
+    UIViewController *vc = [[cls alloc] init];
+    if (!vc) return;
+    NSString *issueId = [self stringFromPayload:payload key:@"issue_id"];
+    if (issueId.length > 0 && [vc respondsToSelector:NSSelectorFromString(@"setDeepLinkIssueId:")]) {
+        @try {
+            [vc setValue:issueId forKey:@"deepLinkIssueId"];
+        } @catch (__unused NSException *exception) {}
+    }
+    UINavigationController *nav = [self mainNavigationController];
+    if (nav) {
+        [nav pushViewController:vc animated:YES];
+    }
+}
+
+- (void)routePayloadIfNeeded:(NSDictionary *)payload force:(BOOL)force {
+    if (![payload isKindOfClass:[NSDictionary class]] || payload.count == 0) return;
+    if (!_didSetupVC || !self.dashboardVC) return;
+    if (_didRouteInitialPayload && !force) return;
+
+    _didRouteInitialPayload = YES;
+    [self applyPayloadContext:payload];
+
+    NSString *type = [self stringFromPayload:payload key:@"type"];
+    NSLog(@"🧭 routePayloadIfNeeded type=%@ issue_id=%@ plan_id=%@ project_id=%@",
+          type ?: @"", [self stringFromPayload:payload key:@"issue_id"] ?: @"",
+          [self stringFromPayload:payload key:@"plan_id"] ?: @"",
+          [self stringFromPayload:payload key:@"project_id"] ?: @"");
+    if ([self isIssueType:type]) {
+        NSString *issueId = [self stringFromPayload:payload key:@"issue_id"];
+        if (issueId.length > 0) {
+            NSLog(@"🧭 routing issue deep link to IssuesViewController issue_id=%@", issueId);
+            [self pushIssuesViewControllerWithPayload:payload];
+        } else {
+            NSLog(@"🧭 routing issue type without issue_id to IssuesViewController");
+            [self pushViewControllerNamed:@"IssuesViewController"];
+        }
+    } else if ([self isAppointmentType:type]) {
+        NSLog(@"🧭 routing appointment type to AppointmentViewController");
+        [self pushViewControllerNamed:@"AppointmentViewController"];
+    } else if ([type isEqualToString:@"clearance_letter"]) {
+        NSLog(@"🧭 routing clearance_letter to GeneralInfoViewController");
+        [self pushViewControllerNamed:@"GeneralInfoViewController"];
+    } else {
+        NSLog(@"🧭 no route matched for type=%@", type ?: @"");
+    }
+}
+
+- (void)handleRoutePayloadNotification:(NSNotification *)note {
+    NSDictionary *payload = [note.userInfo isKindOfClass:[NSDictionary class]] ? note.userInfo : nil;
+    [self routePayloadIfNeeded:payload force:YES];
+}
+
+- (UIColor *)qms_colorFromHexString:(NSString *)hexString {
+    if (hexString.length == 0) return nil;
+    NSString *value = [[hexString stringByTrimmingCharactersInSet:
+                        [NSCharacterSet whitespaceAndNewlineCharacterSet]]
+                      uppercaseString];
+    if ([value hasPrefix:@"#"]) value = [value substringFromIndex:1];
+    if (value.length == 3) {
+        unichar c0 = [value characterAtIndex:0];
+        unichar c1 = [value characterAtIndex:1];
+        unichar c2 = [value characterAtIndex:2];
+        value = [NSString stringWithFormat:@"%C%C%C%C%C%C", c0, c0, c1, c1, c2, c2];
+    }
+    if (value.length != 6 && value.length != 8) return nil;
+
+    unsigned int hex = 0;
+    [[NSScanner scannerWithString:value] scanHexInt:&hex];
+
+    CGFloat a = 1.0;
+    CGFloat r = 0, g = 0, b = 0;
+    if (value.length == 8) {
+        a = ((hex >> 24) & 0xFF) / 255.0;
+        r = ((hex >> 16) & 0xFF) / 255.0;
+        g = ((hex >> 8) & 0xFF) / 255.0;
+        b = (hex & 0xFF) / 255.0;
+    } else {
+        r = ((hex >> 16) & 0xFF) / 255.0;
+        g = ((hex >> 8) & 0xFF) / 255.0;
+        b = (hex & 0xFF) / 255.0;
+    }
+    return [UIColor colorWithRed:r green:g blue:b alpha:a];
+}
+
+- (void)applyHeaderThemeRecursivelyOnView:(UIView *)view textColor:(UIColor *)textColor iconColor:(UIColor *)iconColor {
+    if (!view) return;
+
+    if (textColor && [view isKindOfClass:[UILabel class]]) {
+        UILabel *label = (UILabel *)view;
+        CGPoint originInRoot = [label.superview convertPoint:label.frame.origin toView:_dashboardVC.view];
+        if (originInRoot.y <= 120) {
+            label.textColor = textColor;
+        }
+    }
+
+    if (iconColor && [view isKindOfClass:[UIButton class]]) {
+        UIButton *button = (UIButton *)view;
+        CGPoint originInRoot = [button.superview convertPoint:button.frame.origin toView:_dashboardVC.view];
+        if (originInRoot.y <= 120) {
+            button.tintColor = iconColor;
+            [button setTitleColor:iconColor forState:UIControlStateNormal];
+        }
+    }
+
+    for (UIView *subview in view.subviews) {
+        [self applyHeaderThemeRecursivelyOnView:subview textColor:textColor iconColor:iconColor];
+    }
+}
+
+- (void)applyHeaderThemeIfNeeded {
+    if (!_dashboardVC || !_dashboardVC.view) return;
+    UIColor *text = [self qms_colorFromHexString:_headerTextColor];
+    UIColor *icon = [self qms_colorFromHexString:_headerIconColor];
+    if (!text && !icon) return;
+    [self applyHeaderThemeRecursivelyOnView:_dashboardVC.view textColor:text iconColor:icon];
+}
+
+- (BOOL)isDefaultQmsBlueColor:(UIColor *)color {
+    if (!color) return NO;
+    CGFloat r = 0, g = 0, b = 0, a = 0;
+    if (![color getRed:&r green:&g blue:&b alpha:&a]) return NO;
+    if (a < 0.01) return NO;
+
+    BOOL closeToBlueA = (fabs(r - 0.0) < 0.12 && fabs(g - 0.50) < 0.16 && fabs(b - 0.60) < 0.16);
+    BOOL closeToBlueB = (fabs(r - 0.0) < 0.12 && fabs(g - 0.43) < 0.16 && fabs(b - 0.55) < 0.16);
+    return closeToBlueA || closeToBlueB;
+}
+
+- (void)applyThemeRecursivelyOnView:(UIView *)view color:(UIColor *)themeColor {
+    if (!view || !themeColor) return;
+
+    CGPoint originInRoot = [view.superview convertPoint:view.frame.origin toView:_dashboardVC.view];
+    BOOL nearHeader = originInRoot.y <= 140.0 && view.bounds.size.height <= 120.0;
+    if (nearHeader && [self isDefaultQmsBlueColor:view.backgroundColor]) {
+        view.backgroundColor = themeColor;
+    }
+
+    if ([view isKindOfClass:[UIButton class]]) {
+        UIButton *button = (UIButton *)view;
+        if ([self isDefaultQmsBlueColor:button.backgroundColor]) {
+            button.backgroundColor = themeColor;
+        }
+    }
+
+    for (UIView *subview in view.subviews) {
+        [self applyThemeRecursivelyOnView:subview color:themeColor];
+    }
+}
+
+- (void)applyThemeColorIfNeeded {
+    if (!_dashboardVC || !_dashboardVC.view) return;
+    UIColor *theme = [self qms_colorFromHexString:_themeColor];
+    if (!theme) return;
+    [self applyThemeRecursivelyOnView:_dashboardVC.view color:theme];
+}
+
+- (void)applyAccentRecursivelyOnView:(UIView *)view color:(UIColor *)color {
+    if (!view || !color) return;
+
+    if ([view isKindOfClass:[UIButton class]]) {
+        UIButton *button = (UIButton *)view;
+        button.tintColor = color;
+    } else if ([view isKindOfClass:[UITextField class]]) {
+        ((UITextField *)view).tintColor = color;
+    } else if ([view isKindOfClass:[UITextView class]]) {
+        ((UITextView *)view).tintColor = color;
+    } else if ([view isKindOfClass:[UISwitch class]]) {
+        ((UISwitch *)view).onTintColor = color;
+    } else if ([view isKindOfClass:[UISlider class]]) {
+        ((UISlider *)view).minimumTrackTintColor = color;
+    } else if ([view isKindOfClass:[UIPageControl class]]) {
+        ((UIPageControl *)view).currentPageIndicatorTintColor = color;
+    }
+
+    for (UIView *subview in view.subviews) {
+        [self applyAccentRecursivelyOnView:subview color:color];
+    }
+}
+
+- (void)applyAccentColorIfNeeded {
+    if (!_dashboardVC || !_dashboardVC.view) return;
+    UIColor *accent = [self qms_colorFromHexString:_accentColor];
+    if (!accent) return;
+    [self applyAccentRecursivelyOnView:_dashboardVC.view color:accent];
+}
+
+- (UIFont *)fontByPreservingStyleFromFont:(UIFont *)sourceFont {
+    if (sourceFont == nil || _fontFamily.length == 0) return sourceFont;
+
+    UIFont *base = [UIFont fontWithName:_fontFamily size:sourceFont.pointSize];
+    if (!base) return sourceFont;
+
+    UIFontDescriptorSymbolicTraits traits = sourceFont.fontDescriptor.symbolicTraits;
+    UIFontDescriptor *descriptor = [base.fontDescriptor fontDescriptorWithSymbolicTraits:traits];
+    if (descriptor) {
+        return [UIFont fontWithDescriptor:descriptor size:sourceFont.pointSize];
+    }
+    return base;
+}
+
+- (void)applyFontFamilyRecursivelyOnView:(UIView *)view {
+    if (!view) return;
+
+    if ([view isKindOfClass:[UILabel class]]) {
+        UILabel *label = (UILabel *)view;
+        label.font = [self fontByPreservingStyleFromFont:label.font];
+    } else if ([view isKindOfClass:[UIButton class]]) {
+        UIButton *button = (UIButton *)view;
+        if (button.titleLabel) {
+            button.titleLabel.font = [self fontByPreservingStyleFromFont:button.titleLabel.font];
+        }
+    } else if ([view isKindOfClass:[UITextField class]]) {
+        UITextField *textField = (UITextField *)view;
+        textField.font = [self fontByPreservingStyleFromFont:textField.font];
+    } else if ([view isKindOfClass:[UITextView class]]) {
+        UITextView *textView = (UITextView *)view;
+        textView.font = [self fontByPreservingStyleFromFont:textView.font];
+    }
+
+    for (UIView *subview in view.subviews) {
+        [self applyFontFamilyRecursivelyOnView:subview];
+    }
+}
+
+- (void)applyFontFamilyIfNeeded {
+    if (_fontFamily.length == 0 || !_dashboardVC || !_dashboardVC.view) return;
+    [self applyFontFamilyRecursivelyOnView:_dashboardVC.view];
 }
 
 - (void)removeFromSuperview {
@@ -178,10 +563,14 @@ RCT_EXPORT_MODULE(QmsDashboardView)
 RCT_EXPORT_VIEW_PROPERTY(ClientID, NSString)
 RCT_EXPORT_VIEW_PROPERTY(ClientCode, NSString)
 RCT_EXPORT_VIEW_PROPERTY(user_token, NSString)
+RCT_EXPORT_VIEW_PROPERTY(themeColor, NSString)
 RCT_EXPORT_VIEW_PROPERTY(headerTextColor, NSString)
 RCT_EXPORT_VIEW_PROPERTY(headerIconColor, NSString)
 RCT_EXPORT_VIEW_PROPERTY(accentColor, NSString)
 RCT_EXPORT_VIEW_PROPERTY(fontFamily, NSString)
+RCT_EXPORT_VIEW_PROPERTY(isOrigin, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(payload, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(onLogout, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onAnalyticsScreen, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onAnalyticsEvent, RCTDirectEventBlock)
 
@@ -221,12 +610,23 @@ RCT_EXPORT_MODULE();
                                                  selector:@selector(handleAnalyticsEvent:)
                                                      name:@"QmsAnalyticsEventNotification"
                                                    object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleDashboardLogout:)
+                                                     name:@"QmsDashboardDidLogoutNotification"
+                                                   object:nil];
     }
     return self;
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"onClose", @"onAnalyticsScreen", @"onAnalyticsEvent"];
+    return @[
+        @"onClose",
+        @"onLogout",
+        @"onAnalyticsScreen",
+        @"onAnalyticsEvent",
+        @"QmsSdkOnAnalyticsScreen",
+        @"QmsSdkOnAnalyticsEvent"
+    ];
 }
 
 - (void)handleDashboardClose:(NSNotification *)note {
@@ -236,10 +636,16 @@ RCT_EXPORT_MODULE();
 
 - (void)handleAnalyticsScreen:(NSNotification *)note {
     [self sendEventWithName:@"onAnalyticsScreen" body:note.userInfo];
+    [self sendEventWithName:@"QmsSdkOnAnalyticsScreen" body:note.userInfo];
 }
 
 - (void)handleAnalyticsEvent:(NSNotification *)note {
     [self sendEventWithName:@"onAnalyticsEvent" body:note.userInfo];
+    [self sendEventWithName:@"QmsSdkOnAnalyticsEvent" body:note.userInfo];
+}
+
+- (void)handleDashboardLogout:(NSNotification *)note {
+    [self sendEventWithName:@"onLogout" body:note.userInfo];
 }
 
 - (void)dealloc {