@momo-kits/native-kits 0.161.1-beta.15-debug → 0.161.2-beta.1-debug

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Resources.kt

@@ -24,13 +24,21 @@ fun getResource(name: String): DrawableResource {
 @Composable
 fun readJson(name: String): String {
     val path = name.plus(".json")
+    val candidatePaths = listOf(
+        path,
+        "composeResources/vn.momo.compose.resources/$path",
+    )
 
     val jsonContent by rememberState(path, { "" }) {
         val cached = resourceCache.getOrPut(path) {
-            val content = try {
-                readResourceBytes(path).decodeToString()
-            } catch (_: Exception) {
-                ""
+            var content = ""
+            for (candidate in candidatePaths) {
+                try {
+                    content = readResourceBytes(candidate).decodeToString()
+                    break
+                } catch (_: Exception) {
+                    // try next candidate
+                }
             }
             ResourceCache.JSON(content)
         } as ResourceCache.JSON

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

@@ -0,0 +1,33 @@
+package vn.momo.kits.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import platform.Foundation.NSNotification
+import platform.Foundation.NSNotificationCenter
+import platform.Foundation.NSOperationQueue
+import platform.darwin.NSObjectProtocol
+
+private const val STATUS_BAR_TAPPED_NOTIFICATION = "statusBarSelected"
+
+@Composable
+internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) {
+    val maxApi = LocalMaxApi.current
+    DisposableEffect(callback) {
+        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 {
+            token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
+        }
+    }
+}

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -12,17 +12,19 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.interop.UIKitView
 import androidx.compose.ui.semantics.SemanticsPropertyKey
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.UIKitInteropProperties
+import androidx.compose.ui.viewinterop.UIKitView
 import cocoapods.lottie_ios.CompatibleAnimation
 import cocoapods.lottie_ios.CompatibleAnimationKeypath
 import cocoapods.lottie_ios.CompatibleAnimationView
@@ -85,18 +87,25 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp
 }
 
-actual fun getOSVersion(): Int {
-    return UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
-}
+actual fun getOSVersion(): OSVersion = OSVersion.IOS(
+    major = UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
+)
 
-@OptIn(ExperimentalForeignApi::class)
+@OptIn(ExperimentalForeignApi::class, ExperimentalComposeUiApi::class)
 @Composable
 actual fun LottieAnimation(
     path: String,
     tintColor: Color?,
     bgColor: Color?,
-    modifier: Modifier
+    placedAsOverlay: Boolean,
+    modifier: Modifier,
+    useCompose: Boolean
 ) {
+    if (useCompose) {
+        ComposeLottieAnimation(path, tintColor, bgColor, modifier)
+        return
+    }
+
     var animation by remember { mutableStateOf<CompatibleAnimation?>(null) }
 
     LaunchedEffect(Unit) {
@@ -112,11 +121,12 @@ actual fun LottieAnimation(
             Box(modifier) {
                 UIKitView(
                     modifier = Modifier.fillMaxSize(),
+                    properties = UIKitInteropProperties(placedAsOverlay = placedAsOverlay),
                     factory = {
                         CompatibleAnimationView(value).apply {
                             translatesAutoresizingMaskIntoConstraints = true
 
-                            setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
+                            setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
 
                             setLoopAnimationCount(-1.0)
                             setAnimationSpeed(1.0)
@@ -137,7 +147,7 @@ actual fun LottieAnimation(
                     },
 
                     update = { view ->
-                        view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
+                        view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
 
                         if (tintColor != null) {
                             val uiColor = tintColor.toUIColor()

package/gradle/libs.versions.toml

@@ -13,12 +13,13 @@ androidGradlePlugin = "8.13.2"
 r8 = "8.9.35"
 kotlinx-datetime = "0.7.1"
 airbnb-lottie = "5.2.0"
+compottie = "2.2.0"
 androidx-activity = "1.9.1"
 androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.160.1-beta.6"
+kits = "0.159.1-beta.7"
 nativemaxapi = "0.0.6"
 
 [libraries]
@@ -38,6 +39,7 @@ coil-multiplatform-compose = { module = "io.coil-kt.coil3:coil-compose", version
 coil-multiplatform-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil3-multiplatform" }
 r8 = { module = "com.android.tools:r8", version.ref = "r8" }
 airbnb-lottie = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "airbnb-lottie" }
+compottie = { module = "io.github.alexzhirkevich:compottie", version.ref = "compottie" }
 native-max-api = { group = "vn.momo.maxapi", name = "NativeMaxApi", version.ref = "nativemaxapi" }
 kits = { module = "vn.momo.kits:kits", version.ref = "kits" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -17,7 +17,7 @@ public class MiniAppContext {
     public var toolkitConfig: [String: Any] = [:]
     public var providerId: String = "momo"
     public var permissions: [[String: Any]] = []
-
+    
     public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
         self.appId = appId
         self.appCode = appCode
@@ -37,15 +37,11 @@ public class KitConfig {
     public var headerGradient: String? = nil
 }
 
-public var IsShowBaseLineDebug = false
-
-public var UseFontScaleSystem = true
-
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?
     let config: KitConfig?
-
+    
     public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi

package/ios/Input/Input.swift

@@ -4,7 +4,7 @@ import Combine
 
 public struct Input: View {
     @Binding public var text: String
-
+    
     public var placeholder: String
     public var floatingValue: String
     public var floatingIcon: String
@@ -22,6 +22,7 @@ public struct Input: View {
     public var leadingIconColor: Color
     public var loading: Bool
     public var required: Bool
+    public var maxLength: Int?
     public var fontWeight: InputFontWeight
     public var keyboardType: UIKeyboardType
     public var autofocus: Bool
@@ -29,10 +30,10 @@ public struct Input: View {
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
-
+    
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
-
+    
     public init(
         text: Binding<String>,
         placeholder: String = "",
@@ -52,6 +53,7 @@ public struct Input: View {
         leadingIconColor: Color = Colors.black12,
         loading: Bool = false,
         required: Bool = false,
+        maxLength: Int? = nil,
         fontWeight: InputFontWeight = .regular,
         keyboardType: UIKeyboardType = .default,
         autofocus: Bool = false,
@@ -78,6 +80,7 @@ public struct Input: View {
         self.leadingIconColor = leadingIconColor
         self.loading = loading
         self.required = required
+        self.maxLength = maxLength
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
         self.autofocus = autofocus
@@ -93,7 +96,7 @@ public struct Input: View {
             get: { self.text },
             set: { newValue in
                 self.text = newValue
-                self.onChangeText?(newValue)
+                self.onChangeText?(limitText(newValue))
             }
         )
 
@@ -115,7 +118,7 @@ public struct Input: View {
                     .offset(x: Spacing.S, y: -8)
                     .zIndex(10)
                 }
-
+                
                 // Input container
                 HStack(alignment: .center, spacing: 0) {
                     // Leading icon
@@ -123,7 +126,7 @@ public struct Input: View {
                         Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: leadingIconColor)
                             .padding(.trailing, Spacing.M)
                     }
-
+                    
                     // Text input field
                     ZStack(alignment: .leading) {
                         if text.isEmpty {
@@ -133,7 +136,7 @@ public struct Input: View {
                                 color: getPlaceholderColor()
                             )
                         }
-
+                        
                         if secureTextEntry && isPasswordHidden {
                             SecureInputField(
                                 text: $text,
@@ -142,6 +145,7 @@ public struct Input: View {
                                 fontWeight: fontWeight == .bold ? .bold : .regular,
                                 textColor: UIColor(getTextColor()),
                                 isDisabled: disabled || readOnly,
+                                maxLength: maxLength,
                                 onFocusChange: { focused in
                                     handleFocusChange(focused)
                                 },
@@ -156,9 +160,15 @@ public struct Input: View {
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()
+                            .onChange(of: text) { newValue in
+                                let limited = limitText(newValue)
+                                if limited != newValue {
+                                    text = limited
+                                }
+                            }
                         }
                     }
-
+                    
                     // Clear button (only show when focused and has text)
                     if isFocused && !text.isEmpty {
                         SwiftUI.Button(action: {
@@ -169,14 +179,14 @@ public struct Input: View {
                                 .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                         }
                     }
-
+                    
                     // Loading indicator
                     if loading {
                         ActivityIndicator(isAnimating: .constant(true), style: .medium)
                             .frame(width: 16, height: 16)
                             .padding(.leading, Spacing.S)
                     }
-
+                    
                     // Right icon (password toggle or custom icon)
                     if secureTextEntry {
                         if !text.isEmpty {
@@ -197,7 +207,7 @@ public struct Input: View {
                     }
                 }
                 .padding(.horizontal, Spacing.M)
-                .frame(height: scaleSize(size == .small ? 48 : 56))
+                .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
                 .background(
                     RoundedRectangle(cornerRadius: Radius.S)
                         .fill(Colors.black01)
@@ -207,7 +217,7 @@ public struct Input: View {
                         .stroke(borderColor(), lineWidth: 1)
                 )
             }
-
+            
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -223,9 +233,9 @@ public struct Input: View {
             }
         }
     }
-
+    
     // MARK: - Helpers
-
+    
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -234,12 +244,19 @@ public struct Input: View {
             onBlur?()
         }
     }
-
+    
     private func togglePasswordVisibility() {
         isPasswordHidden.toggle()
         onRightIconPressed?()
     }
 
+    private func limitText(_ value: String) -> String {
+        guard let maxLength = maxLength else {
+            return value
+        }
+        return String(value.prefix(maxLength))
+    }
+    
     private func borderColor() -> Color {
         if disabled {
             return Colors.black04 // border.disable
@@ -252,19 +269,19 @@ public struct Input: View {
         }
         return Colors.black04 // border.default
     }
-
+    
     private func getTextColor() -> Color {
         return disabled ? Colors.black09 : Colors.black17
     }
-
+    
     private func getPlaceholderColor() -> Color {
         return disabled ? Colors.black09 : Colors.black12
     }
-
+    
     private func getFloatingColor() -> Color {
         return disabled ? Colors.black09 : Colors.black12
     }
-
+    
     private func getFloatingIconColor() -> Color {
         return disabled ? Colors.black09 : floatingIconColor
     }
@@ -279,6 +296,7 @@ private struct SecureInputField: UIViewRepresentable {
     var fontWeight: UIFont.Weight
     var textColor: UIColor
     var isDisabled: Bool
+    var maxLength: Int?
     var onFocusChange: (Bool) -> Void
     var onChangeText: ((String) -> Void)?
 
@@ -307,6 +325,7 @@ private struct SecureInputField: UIViewRepresentable {
     }
 
     func updateUIView(_ textField: UITextField, context: Context) {
+        context.coordinator.parent = self
         if textField.text != text {
             textField.text = text
         }
@@ -342,7 +361,7 @@ private struct SecureInputField: UIViewRepresentable {
         }
 
         func textFieldDidEndEditing(_ textField: UITextField) {
-            parent.text = textField.text ?? ""
+            parent.text = limitText(textField.text ?? "")
             parent.onFocusChange(false)
         }
 
@@ -357,7 +376,10 @@ private struct SecureInputField: UIViewRepresentable {
 
         @objc func textFieldDidChange(_ textField: UITextField) {
             if isResettingText { return }
-            let newText = textField.text ?? ""
+            let newText = limitText(textField.text ?? "")
+            if textField.text != newText {
+                textField.text = newText
+            }
             parent.text = newText
             parent.onChangeText?(newText)
         }
@@ -366,6 +388,13 @@ private struct SecureInputField: UIViewRepresentable {
             textField.resignFirstResponder()
             return true
         }
+
+        private func limitText(_ value: String) -> String {
+            guard let maxLength = parent.maxLength else {
+                return value
+            }
+            return String(value.prefix(maxLength))
+        }
     }
 }
 

package/ios/Input/InputPhoneNumber.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 public struct InputPhoneNumber: View {
     @Binding public var text: String
-
+    
     public var placeholder: String
     public var size: InputSize
     public var hintText: String
@@ -22,9 +22,9 @@ public struct InputPhoneNumber: View {
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
     public var accessibilityLabel: String?
-
+    
     @State private var isFocused: Bool = false
-
+    
     public init(
         text: Binding<String>,
         placeholder: String = "0123456789",
@@ -57,7 +57,7 @@ public struct InputPhoneNumber: View {
         self.onRightIconPressed = onRightIconPressed
         self.accessibilityLabel = accessibilityLabel
     }
-
+    
     // MARK: - Body
     public var body: some View {
         let textBinding = Binding<String>(
@@ -67,28 +67,28 @@ public struct InputPhoneNumber: View {
                 self.onChangeText?(newValue)
             }
         )
-
+        
         VStack(alignment: .leading, spacing: 4) {
             HStack(spacing: 0) {
                 // 🇻🇳 Flag
                 ImageView("https://static.momocdn.net/app/img/icon/ic-qrcode-package/ic_vn_flag.png")
                     .frame(width: 24, height: 24)
                     .padding(.trailing, Spacing.XS)
-
+                
                 MomoText("+84", typography: size == .small ? .headerSSemibold : .headerMBold)
                     .foregroundColor(Colors.black17)
-
+                
                 Rectangle()
                     .fill(Colors.black04)
                     .frame(width: 1, height: size == .small ? 24 : 32)
                     .padding(.horizontal, Spacing.M)
-
+                
                 // Text input
                 ZStack(alignment: .leading) {
                     if text.isEmpty {
                         MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
-
+                    
                     TextField("", text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
@@ -100,7 +100,7 @@ public struct InputPhoneNumber: View {
                     .accessibility(identifier: accessibilityLabel ?? "")
                     .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
                 }
-
+                
                 // Clear button
                 if isFocused && !text.isEmpty {
                     SwiftUI.Button(action: {
@@ -111,13 +111,13 @@ public struct InputPhoneNumber: View {
                             .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                     }
                 }
-
+                
                 // Loading indicator
                 if loading {
                     ActivityIndicator(isAnimating: .constant(true), style: .medium)
                         .frame(width: 16, height: 16)
                 }
-
+                
                 // ✅ Right icon
                 if !rightIcon.isEmpty {
                     SwiftUI.Button(action: { onRightIconPressed?() }) {
@@ -127,7 +127,7 @@ public struct InputPhoneNumber: View {
                 }
             }
             .padding(.horizontal, Spacing.M)
-            .frame(height: scaleSize(size == .small ? 48 : 56))
+            .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
             .background(
                 RoundedRectangle(cornerRadius: Radius.S)
                     .fill(Colors.black01)
@@ -136,7 +136,7 @@ public struct InputPhoneNumber: View {
                 RoundedRectangle(cornerRadius: Radius.S)
                     .stroke(borderColor(), lineWidth: isFocused ? 1.5 : 1)
             )
-
+            
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -145,9 +145,9 @@ public struct InputPhoneNumber: View {
             )
         }
     }
-
+    
     // MARK: - Helpers
-
+    
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -156,7 +156,7 @@ public struct InputPhoneNumber: View {
             onBlur?()
         }
     }
-
+    
     private func borderColor() -> Color {
         if !error.isEmpty { return Colors.red03 }
         if isFocused { return Colors.primary }

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,75 @@
+#import <UIKit/UIKit.h>
+#import <objc/message.h>
+#import <objc/runtime.h>
+#import "StatusBarTap.h"
+
+// Performs the actual swizzle once per process. Safe to call multiple times.
+static void mm_installStatusBarTapSwizzleOnce(void) {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Class cls = [UIStatusBarManager class];
+        SEL originalSelector = NSSelectorFromString(@"handleTapAction:");
+        SEL swizzledSelector = NSSelectorFromString(@"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);
+        }
+    });
+}
+
+@implementation MoMoStatusBarTap
++ (NSNotificationName)notificationName { return @"statusBarSelected"; }
++ (void)install { mm_installStatusBarTapSwizzleOnce(); }
+@end
+
+// MARK: - Swizzle target on UIStatusBarManager
+// `mm_handleTapAction:` is the replacement IMP. After the add/exchange,
+// this selector points at the original UIKit IMP — calling it inside
+// the body invokes UIKit's real handler so UIScrollView.scrollsToTop
+// and any other side effects continue to work.
+
+@interface UIStatusBarManager (MoMoStatusBarTap)
+@end
+
+@implementation UIStatusBarManager (MoMoStatusBarTap)
+
+// Auto-install at framework load. Commented out so the swizzle stays
+// opt-in via `[MoMoStatusBarTap install]`. Uncomment to revert to
+// auto-installation before main().
+//
+// + (void)load {
+//     mm_installStatusBarTapSwizzleOnce();
+// }
+
+- (void)mm_handleTapAction:(id)action {
+    [self mm_handleTapAction:action];
+    [[NSNotificationCenter defaultCenter] postNotificationName:MoMoStatusBarTap.notificationName
+                                                        object:nil];
+}
+
+@end