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

package/compose/build.gradle.kts

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

package/compose/src/androidMain/kotlin/vn/momo/kits/navigation/ScrollToTop.android.kt

@@ -3,7 +3,4 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 
 @Composable
-internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) = Unit
-
-internal actual fun onNavigatorEntered(navigator: Navigator) = Unit
-internal actual fun onNavigatorExited(navigator: Navigator) = Unit
+internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) = Unit

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/ScrollToTop.kt

@@ -6,6 +6,3 @@ import androidx.compose.runtime.Composable
 internal expect fun RegisterScrollToTop(callback: (() -> Unit)?)
 
 
-internal expect fun onNavigatorEntered(navigator: Navigator)
-
-internal expect fun onNavigatorExited(navigator: Navigator)

package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ScrollToTop.ios.kt

@@ -2,146 +2,32 @@ package vn.momo.kits.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import kotlinx.cinterop.*
 import platform.Foundation.NSNotification
 import platform.Foundation.NSNotificationCenter
 import platform.Foundation.NSOperationQueue
 import platform.darwin.NSObjectProtocol
-import platform.objc.*
-import kotlin.time.Clock
-import kotlin.time.ExperimentalTime
-
-@OptIn(ExperimentalForeignApi::class)
-private val replacementHandleTap = staticCFunction<COpaquePointer, COpaquePointer, COpaquePointer?, Unit> { _, _, _ ->
-    NSNotificationCenter.defaultCenter.postNotificationName("statusBarSelected", null)
-}
-
-@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
-private object StatusBarSwizzleManager {
-    var originalHandleTapImp: CPointer<CFunction<() -> Unit>>? = null
-    var swizzleInstalled = false
-    var observerCount = 0
-
-    fun install() {
-        try {
-            if (swizzleInstalled) return
-            // objc_getClass returns Any? in the binding, but the underlying value is
-            // the ObjC Class metaobject — safe to cast to ObjCClass for the other
-            // runtime calls that require it.
-            val cls = objc_getClass("UIStatusBarManager") as? ObjCClass ?: run {
-                log("swizzle skipped: UIStatusBarManager class not found")
-                return
-            }
-            val selector = sel_registerName("handleTapAction:") ?: run {
-                log("swizzle skipped: handleTapAction: selector unavailable")
-                return
-            }
-            val method = class_getInstanceMethod(cls, selector) ?: run {
-                log("swizzle skipped: handleTapAction: method not found")
-                return
-            }
-            // Capture original IMP so we can restore it on uninstall.
-            originalHandleTapImp = method_getImplementation(method)
-            val typeEncoding = method_getTypeEncoding(method)?.toKString()
-            class_replaceMethod(cls, selector, replacementHandleTap.reinterpret(), typeEncoding)
-            swizzleInstalled = true
-            log("UIStatusBarManager handleTapAction: replaced (originalImp captured)")
-        } catch (e: Throwable) {
-            log("install error: ${e.message}")
-        }
-    }
-
-    fun uninstall() {
-        try {
-            if (!swizzleInstalled) return
-            val original = originalHandleTapImp ?: run {
-                log("uninstall skipped: no original IMP captured")
-                return
-            }
-            val cls = objc_getClass("UIStatusBarManager") as? ObjCClass ?: return
-            val selector = sel_registerName("handleTapAction:") ?: return
-            val method = class_getInstanceMethod(cls, selector) ?: return
-            method_setImplementation(method, original)
-            originalHandleTapImp = null
-            swizzleInstalled = false
-            log("UIStatusBarManager handleTapAction: original IMP restored")
-        } catch (e: Throwable) {
-            log("uninstall error: ${e.message}")
-        }
-    }
-}
-
-
-private class StatusBarObserver {
-    private var token: NSObjectProtocol? = null
-    fun acquire(callback: (() -> Unit)?) {
-        if (token != null) {
-            return
-        }
-        if (StatusBarSwizzleManager.observerCount == 0) {
-            StatusBarSwizzleManager.install()
-        }
-        token = NSNotificationCenter.defaultCenter.addObserverForName(
-            name = "statusBarSelected",
-            `object` = null,
-            queue = NSOperationQueue.mainQueue,
-        ) { _: NSNotification? ->
-            log("statusBar tap notification → ScrollToTopRegistry.trigger()")
-            callback?.invoke()
-        }
-        StatusBarSwizzleManager.observerCount++
-        log("observerCount acquire ${StatusBarSwizzleManager.observerCount}")
-
-    }
-
-    fun release() {
-        if (token == null) return
-        token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
-        token = null
-        StatusBarSwizzleManager.observerCount--
-        if (StatusBarSwizzleManager.observerCount == 0) {
-            StatusBarSwizzleManager.uninstall()
-        }
-        log("observerCount release ${StatusBarSwizzleManager.observerCount}")
-    }
-}
-
-private const val TAG = "[ScrollToTop]"
-
-private fun Any.tag(): String = "${this::class.simpleName ?: "Any"}@${hashCode().toString(16)}"
-
-@OptIn(ExperimentalTime::class)
-private fun ts(): String {
-    val ms = Clock.System.now().toEpochMilliseconds()
-    val s = ms / 1000
-    val hh = ((s / 3600) % 24).toString().padStart(2, '0')
-    val mm = ((s / 60) % 60).toString().padStart(2, '0')
-    val ss = (s % 60).toString().padStart(2, '0')
-    val mmm = (ms % 1000).toString().padStart(3, '0')
-    return "$hh:$mm:$ss.$mmm"
-}
-
-private fun log(msg: String) = println("${ts()} $TAG $msg")
 
+private const val STATUS_BAR_TAPPED_NOTIFICATION = "statusBarSelected"
 
 @Composable
 internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) {
+    val maxApi = LocalMaxApi.current
     DisposableEffect(callback) {
-        val acquired = callback != null
-        val statusBarObserver = StatusBarObserver()
-        if (acquired) {
-            statusBarObserver.acquire { callback?.invoke() }
-        }
+        val cb = callback
+        val token: NSObjectProtocol? = if (cb != null) {
+            NSNotificationCenter.defaultCenter.addObserverForName(
+                name = STATUS_BAR_TAPPED_NOTIFICATION,
+                `object` = null,
+                queue = NSOperationQueue.mainQueue,
+            ) { _: NSNotification? ->
+                runCatching { cb() }.onFailure {
+                    maxApi?.logFile("[ScrollToTop] callback threw: ${it.message}") {}
+
+                }
+            }
+        } else null
         onDispose {
-            if (acquired) statusBarObserver.release()
+            token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
         }
     }
 }
-
-internal actual fun onNavigatorEntered(navigator: Navigator) {
-    StatusBarSwizzleManager.install()
-}
-
-internal actual fun onNavigatorExited(navigator: Navigator) {
-    StatusBarSwizzleManager.uninstall()
-}

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.22
+version=0.160.1-scrolltotop.23
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/StatusBarTap/StatusBarTap.swift

@@ -0,0 +1,42 @@
+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
+    }
+}

package/package.json

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