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

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

package/ios/Typography/Text.swift

@@ -1,25 +1,30 @@
 import SwiftUI
 
-private let DEFAULT_SCREEN_SIZE: CGFloat = 375
-private let MAX_FONT_SCALE: CGFloat = 1.2
+public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
+    let defaultScreenSize: CGFloat = 375
+    let maxFontScale: CGFloat = scaleRate ?? 1.5
+    let maxDeviceScale: CGFloat = 5
 
-public func scaleSize(_ size: CGFloat) -> CGFloat {
-    if UseFontScaleSystem {
-        let deviceWidth = UIScreen.main.bounds.width
-        let deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+    let deviceWidth = UIScreen.main.bounds.width
+    let deviceScale = deviceWidth / defaultScreenSize
 
-        let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
-        let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-        let fontScale = scaledFont.pointSize / defaultFont.pointSize
+    let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+    let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
+    let fontScale = scaledFont.pointSize / defaultFont.pointSize
 
-        let maxSize = size * MAX_FONT_SCALE
-        let fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size
-        let fontSizeScaleOS = fontScale > 1 ? fontScale * size : size
+    var fontSizeDeviceScale = size
+    var fontSizeOSScale = size
 
-        return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
+
+    if deviceScale > 1 {
+        fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
+    }
+
+    if fontScale > 1 {
+        fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
     }
 
-    return size
+    return max(fontSizeDeviceScale, fontSizeOSScale)
 }
 
 public enum TypographyStyle {

package/ios/Typography/Typography.swift

@@ -2,7 +2,28 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
-        return Font.system(size: scaleSize(size))
+        let defaultScreenSize: CGFloat = 375
+        let maxFontScale: CGFloat = 1.5
+        let maxDeviceScale: CGFloat = 5
+        
+        let deviceWidth = UIScreen.main.bounds.width
+        let deviceScale = deviceWidth / defaultScreenSize
+        
+        let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+        let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
+        let fontScale = scaledFont.pointSize / defaultFont.pointSize
+
+        var fontSize = size
+
+        if deviceScale > 1 {
+            fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
+        }
+
+        if fontScale > 1 {
+            fontSize = min(fontSize * fontScale, fontSize * maxFontScale)
+        }
+
+        return Font.system(size: fontSize)
     }
     
     // New supported typography styles

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/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Aug 21 14:20:12 ICT 2024
+sdk.dir=/Users/huynhdung/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.161.1-beta.1",
+  "version": "0.161.2-beta.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/settings.gradle.kts

@@ -0,0 +1,64 @@
+import org.gradle.kotlin.dsl.maven
+
+rootProject.name = "momo-native-kits"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        }
+        maven {
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {
+                username = "download_packages";
+                password = "gldt-bjDqLpU_sPcHDuXau2ws"
+            }
+        }
+        maven {
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+include(":compose")
+
+include(":sample:androidApp")
+include(":sample:shared")