@momo-kits/native-kits 0.160.1-beta.2-debug → 0.160.1-beta.4-debug

package/compose/build.gradle.kts

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

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -1,8 +1,6 @@
 package vn.momo.kits.application
 
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
 
@@ -94,10 +92,7 @@ val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null
 }
 
-val IsShowBaseLineDebug: Boolean
-    @Composable
-    @ReadOnlyComposable
-    get() = ApplicationContext.current?.features?.isBaselineEnabled ?: false
+var IsShowBaseLineDebug = false
 
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null

package/gradle/libs.versions.toml

@@ -18,7 +18,7 @@ androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.160.1-beta.2"
+kits = "0.160.1-beta.4"
 nativemaxapi = "0.0.6"
 
 [libraries]

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

package/ios/Application/ApplicationEnvironment.swift

@@ -37,6 +37,8 @@ public class KitConfig {
     public var headerGradient: String? = nil
 }
 
+public var IsShowBaseLineDebug = false
+
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?

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
@@ -29,10 +29,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 = "",
@@ -96,7 +96,7 @@ public struct Input: View {
                 self.onChangeText?(newValue)
             }
         )
-        
+
         VStack(alignment: .leading, spacing: 4) {
             ZStack(alignment: .topLeading) {
                 // Floating label
@@ -115,7 +115,7 @@ public struct Input: View {
                     .offset(x: Spacing.S, y: -8)
                     .zIndex(10)
                 }
-                
+
                 // Input container
                 HStack(alignment: .center, spacing: 0) {
                     // Leading icon
@@ -123,7 +123,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 +133,7 @@ public struct Input: View {
                                 color: getPlaceholderColor()
                             )
                         }
-                        
+
                         if secureTextEntry && isPasswordHidden {
                             SecureInputField(
                                 text: $text,
@@ -158,7 +158,7 @@ public struct Input: View {
                             .applyPrimaryCursorColor()
                         }
                     }
-                    
+
                     // Clear button (only show when focused and has text)
                     if isFocused && !text.isEmpty {
                         SwiftUI.Button(action: {
@@ -169,14 +169,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 +197,7 @@ public struct Input: View {
                     }
                 }
                 .padding(.horizontal, Spacing.M)
-                .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+                .frame(height: scaleSize(size == .small ? 48 : 56))
                 .background(
                     RoundedRectangle(cornerRadius: Radius.S)
                         .fill(Colors.black01)
@@ -207,7 +207,7 @@ public struct Input: View {
                         .stroke(borderColor(), lineWidth: 1)
                 )
             }
-            
+
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -223,9 +223,9 @@ public struct Input: View {
             }
         }
     }
-    
+
     // MARK: - Helpers
-    
+
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
         if focused {
@@ -234,12 +234,12 @@ public struct Input: View {
             onBlur?()
         }
     }
-    
+
     private func togglePasswordVisibility() {
         isPasswordHidden.toggle()
         onRightIconPressed?()
     }
-    
+
     private func borderColor() -> Color {
         if disabled {
             return Colors.black04 // border.disable
@@ -252,19 +252,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
     }

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, 1.1))
+            .frame(height: scaleSize(size == .small ? 48 : 56))
             .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/Typography/Text.swift

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

package/ios/Typography/Typography.swift

@@ -2,28 +2,7 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
-        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)
+        return Font.system(size: scaleSize(size))
     }
     
     // New supported typography styles

package/package.json

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