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

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.13.37"
+    implementation "com.convep.qms:qms-plugin:1.14.0"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
 

package/ios/QmsPlugin/QmsDashboardViewManager.mm

@@ -461,11 +461,39 @@ static NSString * const kQmsRoutePayloadNotification = @"QmsRoutePayloadNotifica
     }
 }
 
+- (void)applyDashboardHeaderOverlayTintRecursivelyOnView:(UIView *)view color:(UIColor *)themeColor {
+    if (!view || !themeColor || !_dashboardVC || !_dashboardVC.view) return;
+
+    if ([view isKindOfClass:[UIImageView class]]) {
+        UIImageView *imageView = (UIImageView *)view;
+        CGPoint originInRoot = [imageView.superview convertPoint:imageView.frame.origin toView:_dashboardVC.view];
+        CGFloat rootWidth = CGRectGetWidth(_dashboardVC.view.bounds);
+        BOOL isHeaderBand = originInRoot.y <= 220.0 &&
+                            CGRectGetHeight(imageView.bounds) >= 56.0 &&
+                            CGRectGetHeight(imageView.bounds) <= 120.0 &&
+                            CGRectGetWidth(imageView.bounds) >= (rootWidth * 0.75) &&
+                            imageView.contentMode == UIViewContentModeScaleToFill &&
+                            !imageView.userInteractionEnabled;
+        if (isHeaderBand && imageView.image) {
+            UIImage *templated = [imageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+            if (templated != imageView.image) {
+                imageView.image = templated;
+            }
+            imageView.tintColor = themeColor;
+        }
+    }
+
+    for (UIView *subview in view.subviews) {
+        [self applyDashboardHeaderOverlayTintRecursivelyOnView: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];
+    [self applyDashboardHeaderOverlayTintRecursivelyOnView:_dashboardVC.view color:theme];
 }
 
 - (void)applyAccentRecursivelyOnView:(UIView *)view color:(UIColor *)color {

package/ios/QmsPlugin/QmsModule.mm

@@ -3,6 +3,7 @@
 #import <UIKit/UIKit.h>
 #import <objc/runtime.h>
 #import <QmsPluginFramework/QmsPlugin.h>
+#import "QmsThemeRuntime.h"
 
 static NSString * const kQmsThemePrimaryColorKey = @"QmsThemePrimaryColor";
 static NSString * const kQmsThemeHeaderTextColorKey = @"QmsThemeHeaderTextColor";
@@ -106,30 +107,45 @@ RCT_EXPORT_METHOD(setPrimaryColor:(NSString *)hexColor) {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   if (hexColor.length > 0) [defaults setObject:hexColor forKey:kQmsThemePrimaryColorKey];
   else [defaults removeObjectForKey:kQmsThemePrimaryColorKey];
+  QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+  runtime.primaryColorHex = (hexColor.length > 0 ? hexColor : nil);
+  [runtime notifyThemeChanged];
 }
 
 RCT_EXPORT_METHOD(setHeaderTextColor:(NSString *)hexColor) {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   if (hexColor.length > 0) [defaults setObject:hexColor forKey:kQmsThemeHeaderTextColorKey];
   else [defaults removeObjectForKey:kQmsThemeHeaderTextColorKey];
+  QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+  runtime.headerTextColorHex = (hexColor.length > 0 ? hexColor : nil);
+  [runtime notifyThemeChanged];
 }
 
 RCT_EXPORT_METHOD(setHeaderIconColor:(NSString *)hexColor) {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   if (hexColor.length > 0) [defaults setObject:hexColor forKey:kQmsThemeHeaderIconColorKey];
   else [defaults removeObjectForKey:kQmsThemeHeaderIconColorKey];
+  QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+  runtime.headerIconColorHex = (hexColor.length > 0 ? hexColor : nil);
+  [runtime notifyThemeChanged];
 }
 
 RCT_EXPORT_METHOD(setAccentColor:(NSString *)hexColor) {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   if (hexColor.length > 0) [defaults setObject:hexColor forKey:kQmsThemeAccentColorKey];
   else [defaults removeObjectForKey:kQmsThemeAccentColorKey];
+  QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+  runtime.accentColorHex = (hexColor.length > 0 ? hexColor : nil);
+  [runtime notifyThemeChanged];
 }
 
 RCT_EXPORT_METHOD(setFontFamily:(NSString *)fontFamily) {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
   if (fontFamily.length > 0) [defaults setObject:fontFamily forKey:kQmsThemeFontFamilyKey];
   else [defaults removeObjectForKey:kQmsThemeFontFamilyKey];
+  QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+  runtime.fontFamily = (fontFamily.length > 0 ? fontFamily : nil);
+  [runtime notifyThemeChanged];
 }
 
 RCT_EXPORT_METHOD(emitInAppNotification:(NSString *)title body:(NSString *)body) {

package/ios/QmsPlugin/QmsThemeRuntime.h

@@ -0,0 +1,22 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const QmsThemeDidChangeNotification;
+
+@interface QmsThemeRuntime : NSObject
+
++ (instancetype)shared;
+
+@property (nonatomic, copy, nullable) NSString *primaryColorHex;
+@property (nonatomic, copy, nullable) NSString *headerTextColorHex;
+@property (nonatomic, copy, nullable) NSString *headerIconColorHex;
+@property (nonatomic, copy, nullable) NSString *accentColorHex;
+@property (nonatomic, copy, nullable) NSString *fontFamily;
+
+- (void)reloadFromDefaults;
+- (void)notifyThemeChanged;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/QmsPlugin/QmsThemeRuntime.m

@@ -0,0 +1,39 @@
+#import "QmsThemeRuntime.h"
+
+static NSString * const kQmsThemePrimaryColorKey = @"QmsThemePrimaryColor";
+static NSString * const kQmsThemeHeaderTextColorKey = @"QmsThemeHeaderTextColor";
+static NSString * const kQmsThemeHeaderIconColorKey = @"QmsThemeHeaderIconColor";
+static NSString * const kQmsThemeAccentColorKey = @"QmsThemeAccentColor";
+static NSString * const kQmsThemeFontFamilyKey = @"QmsThemeFontFamily";
+
+NSString * const QmsThemeDidChangeNotification = @"QmsThemeDidChangeNotification";
+
+@implementation QmsThemeRuntime
+
++ (instancetype)shared {
+    static QmsThemeRuntime *instance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[QmsThemeRuntime alloc] init];
+        [instance reloadFromDefaults];
+    });
+    return instance;
+}
+
+- (void)reloadFromDefaults {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    self.primaryColorHex = [defaults stringForKey:kQmsThemePrimaryColorKey];
+    self.headerTextColorHex = [defaults stringForKey:kQmsThemeHeaderTextColorKey];
+    self.headerIconColorHex = [defaults stringForKey:kQmsThemeHeaderIconColorKey];
+    self.accentColorHex = [defaults stringForKey:kQmsThemeAccentColorKey];
+    self.fontFamily = [defaults stringForKey:kQmsThemeFontFamilyKey];
+}
+
+- (void)notifyThemeChanged {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[NSNotificationCenter defaultCenter] postNotificationName:QmsThemeDidChangeNotification
+                                                            object:nil];
+    });
+}
+
+@end

package/ios/QmsPlugin/UIViewController+QmsAnalytics.m

@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <objc/runtime.h>
+#import "QmsThemeRuntime.h"
 
 static NSString * const QmsAnalyticsScreenNotification = @"QmsAnalyticsScreenNotification";
 static NSString * const QmsAnalyticsEventNotification = @"QmsAnalyticsEventNotification";
@@ -9,6 +10,8 @@ static NSString * const QmsThemeHeaderTextColorKey = @"QmsThemeHeaderTextColor";
 static NSString * const QmsThemeAccentColorKey = @"QmsThemeAccentColor";
 static NSString * const QmsThemeFontFamilyKey = @"QmsThemeFontFamily";
 static char QmsStatusBarFillViewKey;
+static char QmsThemeObserverAttachedKey;
+static char QmsThemeGuardTokenKey;
 
 static void qms_swizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizzledSelector) {
     Method originalMethod = class_getInstanceMethod(cls, originalSelector);
@@ -36,17 +39,28 @@ static void qms_swizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizz
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         Class class = [self class];
+        qms_swizzleInstanceMethod(class, @selector(viewDidLoad), @selector(qms_viewDidLoad));
         qms_swizzleInstanceMethod(class, @selector(viewWillAppear:), @selector(qms_viewWillAppear:));
         qms_swizzleInstanceMethod(class, @selector(viewDidAppear:), @selector(qms_viewDidAppear:));
         qms_swizzleInstanceMethod(class, @selector(viewDidLayoutSubviews), @selector(qms_viewDidLayoutSubviews));
     });
 }
 
+- (void)qms_viewDidLoad {
+    [self qms_viewDidLoad];
+    if (![self qms_shouldApplyTheme]) return;
+    [self qms_registerThemeObserverIfNeeded];
+    [self qms_applyThemeIfNeeded];
+    [self qms_startThemeGuardWindow];
+}
+
 - (void)qms_viewWillAppear:(BOOL)animated {
     [self qms_viewWillAppear:animated];
-    if (![self qms_shouldTrackAnalytics]) return;
+    if (![self qms_shouldApplyTheme]) return;
+    [self qms_registerThemeObserverIfNeeded];
     [self qms_applyThemeIfNeeded];
     [self qms_scheduleThemeReapplyPasses];
+    [self qms_startThemeGuardWindow];
 }
 
 - (void)qms_viewDidAppear:(BOOL)animated {
@@ -58,6 +72,7 @@ static void qms_swizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizz
 
     [self qms_applyThemeIfNeeded];
     [self qms_scheduleThemeReapplyPasses];
+    [self qms_startThemeGuardWindow];
 
     NSString *screenName = NSStringFromClass([self class]);
     NSString *screenClass = screenName;
@@ -83,23 +98,82 @@ static void qms_swizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizz
                                                       userInfo:eventInfo];
 }
 
+- (void)qms_registerThemeObserverIfNeeded {
+    NSNumber *attached = objc_getAssociatedObject(self, &QmsThemeObserverAttachedKey);
+    if (attached.boolValue) {
+        return;
+    }
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(qms_handleThemeDidChange:)
+                                                 name:QmsThemeDidChangeNotification
+                                               object:nil];
+    objc_setAssociatedObject(self, &QmsThemeObserverAttachedKey, @(YES), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (void)qms_handleThemeDidChange:(NSNotification *)note {
+    if (![self qms_shouldApplyTheme]) return;
+    if (!self.isViewLoaded) return;
+    [self qms_applyThemeIfNeeded];
+    [self qms_scheduleThemeReapplyPasses];
+    [self qms_startThemeGuardWindow];
+}
+
 - (void)qms_scheduleThemeReapplyPasses {
     __weak typeof(self) weakSelf = self;
-    NSArray<NSNumber *> *delays = @[@0.02, @0.12, @0.30, @0.55];
+    NSArray<NSNumber *> *delays = @[@0.02, @0.12, @0.30, @0.55, @1.0, @1.35];
     for (NSNumber *delay in delays) {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay.doubleValue * NSEC_PER_SEC)),
                        dispatch_get_main_queue(), ^{
             __strong typeof(weakSelf) strongSelf = weakSelf;
-            if (!strongSelf || !strongSelf.view.window) return;
-            if (![strongSelf qms_shouldTrackAnalytics]) return;
+            if (!strongSelf || !strongSelf.isViewLoaded) return;
+            if (![strongSelf qms_shouldApplyTheme]) return;
             [strongSelf qms_applyThemeIfNeeded];
         });
     }
 }
 
+- (void)qms_startThemeGuardWindow {
+    NSNumber *currentToken = objc_getAssociatedObject(self, &QmsThemeGuardTokenKey);
+    NSInteger nextToken = currentToken.integerValue + 1;
+    objc_setAssociatedObject(self, &QmsThemeGuardTokenKey, @(nextToken), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    [self qms_runThemeGuardTickWithToken:nextToken elapsed:0.0];
+}
+
+- (void)qms_runThemeGuardTickWithToken:(NSInteger)token elapsed:(NSTimeInterval)elapsed {
+    NSNumber *activeToken = objc_getAssociatedObject(self, &QmsThemeGuardTokenKey);
+    if (activeToken.integerValue != token) {
+        return;
+    }
+    if (![self qms_shouldApplyTheme]) {
+        return;
+    }
+    if (!self.isViewLoaded) {
+        NSTimeInterval retryElapsed = elapsed + 0.05;
+        if (retryElapsed > 2.2) {
+            return;
+        }
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)),
+                       dispatch_get_main_queue(), ^{
+            [self qms_runThemeGuardTickWithToken:token elapsed:retryElapsed];
+        });
+        return;
+    }
+
+    [self qms_applyThemeIfNeeded];
+
+    NSTimeInterval nextElapsed = elapsed + 0.05;
+    if (nextElapsed > 2.2) {
+        return;
+    }
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)),
+                   dispatch_get_main_queue(), ^{
+        [self qms_runThemeGuardTickWithToken:token elapsed:nextElapsed];
+    });
+}
+
 - (void)qms_viewDidLayoutSubviews {
     [self qms_viewDidLayoutSubviews];
-    if (![self qms_shouldTrackAnalytics]) return;
+    if (![self qms_shouldApplyTheme]) return;
     [self qms_applyThemeIfNeeded];
 }
 
@@ -215,11 +289,18 @@ static void qms_swizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizz
 }
 
 - (void)qms_applyThemeIfNeeded {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    UIColor *themeColor = [self qms_colorFromHexString:[defaults stringForKey:QmsThemePrimaryColorKey]];
-    UIColor *headerTextColor = [self qms_colorFromHexString:[defaults stringForKey:QmsThemeHeaderTextColorKey]];
-    UIColor *accentColor = [self qms_colorFromHexString:[defaults stringForKey:QmsThemeAccentColorKey]];
-    NSString *fontFamily = [defaults stringForKey:QmsThemeFontFamilyKey];
+    QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+    UIColor *themeColor = [self qms_colorFromHexString:runtime.primaryColorHex];
+    UIColor *headerTextColor = [self qms_colorFromHexString:runtime.headerTextColorHex];
+    UIColor *accentColor = [self qms_colorFromHexString:runtime.accentColorHex];
+    NSString *fontFamily = runtime.fontFamily;
+    if (!themeColor && !headerTextColor && !accentColor && fontFamily.length == 0) {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        themeColor = [self qms_colorFromHexString:[defaults stringForKey:QmsThemePrimaryColorKey]];
+        headerTextColor = [self qms_colorFromHexString:[defaults stringForKey:QmsThemeHeaderTextColorKey]];
+        accentColor = [self qms_colorFromHexString:[defaults stringForKey:QmsThemeAccentColorKey]];
+        fontFamily = [defaults stringForKey:QmsThemeFontFamilyKey];
+    }
     if (themeColor) {
         [self qms_applyPrimaryRecursively:self.view themeColor:themeColor];
         [self qms_applyForegroundRecursively:self.view
@@ -351,4 +432,48 @@ static void qms_swizzleInstanceMethod(Class cls, SEL originalSelector, SEL swizz
     return NO;
 }
 
+- (BOOL)qms_themeIsConfigured {
+    QmsThemeRuntime *runtime = [QmsThemeRuntime shared];
+    return runtime.primaryColorHex.length > 0 ||
+           runtime.headerTextColorHex.length > 0 ||
+           runtime.accentColorHex.length > 0 ||
+           runtime.fontFamily.length > 0;
+}
+
+- (BOOL)qms_isKnownSdkControllerClassName:(NSString *)className {
+    static NSSet<NSString *> *knownClasses;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        knownClasses = [NSSet setWithArray:@[
+            @"DashboardViewController",
+            @"UnitViewController",
+            @"GeneralInfoViewController",
+            @"ProfileViewController",
+            @"AppointmentViewController",
+            @"AppointmentDetailsViewController",
+            @"AppointmentConfirmationViewController",
+            @"AppointmentTutorialViewController",
+            @"IssuesViewController",
+            @"IssueDetailViewController",
+            @"AccessItemViewController",
+            @"AccessTransactionViewController",
+            @"SyncScreenViewController",
+            @"FormsListViewController",
+            @"AnnouncementViewController",
+            @"NotificationViewController"
+        ]];
+    });
+    return [knownClasses containsObject:className];
+}
+
+- (BOOL)qms_shouldApplyTheme {
+    if (![self qms_themeIsConfigured]) {
+        return NO;
+    }
+    if ([self qms_shouldTrackAnalytics]) {
+        return YES;
+    }
+    return [self qms_isKnownSdkControllerClassName:NSStringFromClass([self class])];
+}
+
 @end

package/ios/QmsPluginFramework.xcframework/ios-arm64/QmsPluginFramework.framework/_CodeSignature/CodeResources

@@ -36,6 +36,18 @@
 		<data>
 		7BPvHyyZ+HgNby6z+fJ++J8wFhs=
 		</data>
+		<key>bm.json</key>
+		<data>
+		PWeiaoATJ5Tmok3tqZ2zbqPpvY0=
+		</data>
+		<key>cn.json</key>
+		<data>
+		IeWp7CtgjE4S1AXI2avoC5pUwMA=
+		</data>
+		<key>en.json</key>
+		<data>
+		X7Dm5XAAyo7V/dbykrhTjHVVkn4=
+		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
@@ -88,6 +100,27 @@
 			75z5nwF1vvUwuIk0vZBPz1b3c87G/U37jMr3ziu9OV4=
 			</data>
 		</dict>
+		<key>bm.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			66O9IXhz9EzcdoULJI0EQ2d+TxbKeqB/ojI1dKuPF5M=
+			</data>
+		</dict>
+		<key>cn.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			iBpiD/sGrHsIjhadlFeetj9OBEd+QOCIlXDBBibjEw4=
+			</data>
+		</dict>
+		<key>en.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			S+vrXUroDoLwz8Wj8IbMLzSfNPdBglOGEIJmJos1nrg=
+			</data>
+		</dict>
 	</dict>
 	<key>rules</key>
 	<dict>