@momo-kits/native-kits 0.160.1-scrolltotop.23-debug → 0.160.1-scrolltotop.24-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-scrolltotop.23-debug"
+        version = "0.160.1-scrolltotop.24-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.159.1-beta.12'
+    spec.version                  = '0.160.1-scrolltotop.23'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.160.1-scrolltotop.23
+version=0.160.1-scrolltotop.24
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/StatusBarTap/StatusBarTap.h

@@ -0,0 +1,13 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Posts `MoMoStatusBarTap.notificationName` on every status-bar tap.
+/// The swizzle installs automatically at framework load (`+load`) — calling
+/// `install` is a no-op kept for explicit/manual triggering.
+@interface MoMoStatusBarTap : NSObject
+@property (class, nonatomic, readonly) NSNotificationName notificationName;
++ (void)install;
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/StatusBarTap/StatusBarTap.m

@@ -0,0 +1,67 @@
+#import <UIKit/UIKit.h>
+#import <objc/message.h>
+#import <objc/runtime.h>
+#import "StatusBarTap.h"
+
+@implementation MoMoStatusBarTap
++ (NSNotificationName)notificationName { return @"statusBarSelected"; }
++ (void)install { /* installed automatically via +load below */ }
+@end
+
+// MARK: - Swizzle on UIStatusBarManager
+// Runs once at framework-load time. Uses the canonical add-or-exchange
+// idiom so we never accidentally swizzle an inherited (superclass) IMP.
+
+@interface UIStatusBarManager (MoMoStatusBarTap)
+@end
+
+@implementation UIStatusBarManager (MoMoStatusBarTap)
+
++ (void)load {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Class cls = [self class];
+        SEL originalSelector = NSSelectorFromString(@"handleTapAction:");
+        SEL swizzledSelector = @selector(mm_handleTapAction:);
+
+        Method originalMethod = class_getInstanceMethod(cls, originalSelector);
+        Method swizzledMethod = class_getInstanceMethod(cls, swizzledSelector);
+        if (!originalMethod || !swizzledMethod) return;
+
+        // Verify the original method matches the (id) -> void shape we expect.
+        // Encoding may include byte offsets (e.g. "v32@0:8@16") so we filter
+        // digits out before comparing.
+        const char *encPtr = method_getTypeEncoding(originalMethod);
+        if (encPtr) {
+            NSMutableString *enc = [NSMutableString string];
+            for (const char *p = encPtr; *p; p++) {
+                if (!(*p >= '0' && *p <= '9')) [enc appendFormat:@"%c", *p];
+            }
+            if (![enc isEqualToString:@"v@:@"]) return;
+        }
+
+        BOOL didAdd = class_addMethod(cls,
+                                      originalSelector,
+                                      method_getImplementation(swizzledMethod),
+                                      method_getTypeEncoding(swizzledMethod));
+        if (didAdd) {
+            class_replaceMethod(cls,
+                                swizzledSelector,
+                                method_getImplementation(originalMethod),
+                                method_getTypeEncoding(originalMethod));
+        } else {
+            method_exchangeImplementations(originalMethod, swizzledMethod);
+        }
+    });
+}
+
+- (void)mm_handleTapAction:(id)action {
+    // After the swap, this selector points at the original UIKit IMP —
+    // call it first so UIScrollView.scrollsToTop and other UIKit side
+    // effects fire normally, then notify our observers.
+    [self mm_handleTapAction:action];
+    [[NSNotificationCenter defaultCenter] postNotificationName:MoMoStatusBarTap.notificationName
+                                                        object:nil];
+}
+
+@end

package/ios/native-kits.podspec

@@ -10,7 +10,8 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '15.0'
   s.swift_version         = '5.0'
 
-  s.source_files       = "**/*.swift"
+  s.source_files       = "**/*.{swift,m,h}"
+  s.public_header_files = "StatusBarTap/*.h"
   s.framework             = 'SwiftUI', 'Combine'
   s.dependency  'SDWebImageSwiftUI'
   s.dependency       'lottie-ios'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.1-scrolltotop.23-debug",
+  "version": "0.160.1-scrolltotop.24-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/ios/StatusBarTap/StatusBarTap.swift

@@ -1,42 +0,0 @@
-import UIKit
-import ObjectiveC.runtime
-
-extension UIStatusBarManager {
-    public static var statusBarTappedNotification: Notification.Name = {
-        let name = Notification.Name("statusBarSelected")
-        guard let original = class_getInstanceMethod(UIStatusBarManager.self, Selector(("handleTapAction:"))) else {
-            NSLog("[MoMoStatusBarTap] original handleTapAction: not found — skip")
-            return name
-        }
-        // Verify the method takes (self, _cmd, id) and returns void.
-        // Encoding may include offsets (e.g. "v32@0:8@16") so strip digits before comparing.
-        if let encPtr = method_getTypeEncoding(original) {
-            let enc = String(cString: encPtr).filter { !$0.isNumber }
-            guard enc == "v@:@" else {
-                NSLog("[MoMoStatusBarTap] unexpected encoding \(enc) — skip")
-                return name
-            }
-        }
-        guard let swizzled = class_getInstanceMethod(UIStatusBarManager.self, #selector(_mm_handleTapAction)) else {
-            NSLog("[MoMoStatusBarTap] replacement _mm_handleTapAction not found — skip")
-            return name
-        }
-        method_exchangeImplementations(original, swizzled)
-        NSLog("[MoMoStatusBarTap] swizzle installed")
-        return name
-    }()
-
-    @objc dynamic private func _mm_handleTapAction(_ action: Any?) {
-        _mm_handleTapAction(action)
-        NotificationCenter.default.post(name: UIStatusBarManager.statusBarTappedNotification, object: nil)
-    }
-}
-
-@objc(MoMoStatusBarTap)
-public final class MoMoStatusBarTap: NSObject {
-    @objc public static let notificationName: String = "statusBarSelected"
-
-    @objc public static func install() {
-        _ = UIStatusBarManager.statusBarTappedNotification
-    }
-}