@momo-kits/native-kits 0.114.2-beta.14 → 0.114.2-beta.20

package/compose/src/commonMain/kotlin/vn/momo/kits/components/CheckBox.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
@@ -27,8 +28,8 @@ fun CheckBox(
     title: String = "",
 ) {
     var borderColor = AppTheme.current.colors.text.default
-    var backgroundColor = AppTheme.current.colors.background.surface
-    val iconSource = if (indeterminate) "minus" else "ic_checked"
+    var backgroundColor = Color.Transparent
+    val iconSource = if (indeterminate) "navigation_minus" else "ic_checked"
 
     if (checked) {
         borderColor = AppTheme.current.colors.primary
@@ -36,7 +37,7 @@ fun CheckBox(
     }
     if (disabled) {
         borderColor = AppTheme.current.colors.border.disable
-        backgroundColor = AppTheme.current.colors.background.surface
+        backgroundColor = Color.Transparent
         if (checked) {
             borderColor = AppTheme.current.colors.background.tonal
             backgroundColor = AppTheme.current.colors.background.tonal

package/ios/Application/Components.swift

@@ -138,12 +138,12 @@ public struct Header: View {
     
     public var body: some View {
         
-//        let statusBarHeight = safeAreaTopInset()
+        let statusBarHeight = safeAreaTopInset()
         let tintIconColor = Colors.black17
         let backgroundButton = Colors.black01.opacity(0.6)
 
         if headerType != .none {
-            VStack(spacing: 0) {
+                VStack(spacing: 0) {
                     ZStack {
                         HStack {
                             if let goBack = goBack {
@@ -153,7 +153,8 @@ public struct Header: View {
                                         .background(Circle().fill(backgroundButton))
                                         .frame(width: 28, height: 28)
                                         .overlay(
-                                            Icon(source: "arrow-back", size: 20, color: Colors.black17)
+                                            Image(systemName: "arrow.backward")
+                                                .foregroundColor(.black)
                                         )
                                 }
                                 
@@ -166,11 +167,14 @@ public struct Header: View {
                             }
                         
                         }
-                        .padding(.horizontal, 12)
+                        .frame(height: 52)
+                        .padding(.horizontal)
+                        
+                        
                         
                         HStack {
                             if titlePosition == .left, goBack != nil {
-                                Spacer().frame(width: 38)
+                                Spacer().frame(width: 40)
                             }
                             
                             if inputSearchProps != nil {
@@ -197,22 +201,20 @@ public struct Header: View {
                                 }
                             } else {
                                 Text(title)
-                                    .font(Font.system(size: 17).weight(.bold))          .lineSpacing(22)
+                                    .font(.headline)
                                     .foregroundColor(tintIconColor)
-                                    .frame(maxWidth: titlePosition == .center ? UIScreen.main.bounds.width - 252 : nil)
-                                    .frame(maxWidth: titlePosition == .center ? .infinity : UIScreen.main.bounds.width - 172, alignment: titlePosition == .center ? .center : .leading)
-                                    .lineLimit(1)
-                                
+                                    .frame(maxWidth: titlePosition == .center ? .infinity : nil, alignment: titlePosition == .center ? .center : .leading)
                             }
                             Spacer()
                         }
+                        .frame(height: 52)
                         .padding(.horizontal)
                     }
                     .background(Color.clear)
                 }
-                .frame(height: 52)
+            }
         }
-    }
+    
 }
 
 

package/ios/Application/Screen.swift

@@ -34,7 +34,7 @@ public struct Screen<Content: View>: View {
         verticalAlignment: VerticalAlignment = .top,
         horizontalAlignment: HorizontalAlignment = .leading,
         title: String = "Stack",
-        titlePosition: TitlePosition = .left,
+        titlePosition: TitlePosition = .center,
         goBack: (() -> Void)? = nil,
         scrollable: Bool = true,
         onContentLayout: ((CGRect) -> Void)? = nil,
@@ -71,25 +71,23 @@ public struct Screen<Content: View>: View {
 
     public var body: some View {
         GeometryReader { geometry in
-            let topInset = geometry.safeAreaInsets.top
+            let safeAreaInsets = geometry.safeAreaInsets
+            let statusBarHeight = safeAreaInsets.top
             let keyboardHeight: CGFloat = 0
             let keyboardSize: CGFloat = useAvoidKeyboard ? max(keyboardHeight, 0) : 0
-            let height = geometry.size.height
-            let bottomInset = geometry.safeAreaInsets.bottom
-            let screenHeight = height + topInset + bottomInset
 
             ZStack {
                 (backgroundColor ?? Color.white).edgesIgnoringSafeArea(.all)
 
                 VStack(spacing: 0) {
-                    ZStack(alignment: .top) {
-//                        if animatedHeader == nil {
-//                            HeaderBackground(headerType: headerType, scrollState: scrollOffset)
-//                        } else {
-//                            Color.white.opacity(Double(min(scrollOffset / 114, 1)))
-//                                .overlay(HeaderBackground(headerType: headerType, scrollState: scrollOffset))
-//
-//                        }
+                    ZStack {
+                        if animatedHeader == nil {
+                            HeaderBackground(headerType: headerType, scrollState: scrollOffset)
+                        } else {
+                            Color.white.opacity(Double(min(scrollOffset / 114, 1)))
+                                .overlay(HeaderBackground(headerType: headerType, scrollState: scrollOffset))
+
+                        }
 
                         Header(
                             headerType: headerType,
@@ -101,17 +99,13 @@ public struct Screen<Content: View>: View {
                             animatedHeader: animatedHeader,
                             scrollState: scrollOffset,
                             inputSearchProps: inputSearchProps
-                        )
-                        .background(HeaderBackground(headerType: headerType, scrollState: scrollOffset).edgesIgnoringSafeArea(.top))
-                        .offset(y: topInset)
-
-                    }
-                    .offset(y: -topInset)
+                        ).padding(.bottom, headerType == .extended ? 0 : -safeAreaTopInset())
+                    }.padding(.top, -safeAreaTopInset())
 
 
                     VStack(alignment: horizontalAlignment, spacing: 0) {
                         if animatedHeader != nil {
-                            Spacer().frame(height: topInset + 52 + layoutOffset)
+                            Spacer().frame(height: statusBarHeight + 52 + layoutOffset)
                         }
 
                         if scrollable {

package/ios/Checkbox/Checkbox.swift

@@ -75,7 +75,7 @@ public struct Checkbox: View{
         } else if checked {
             return Colors.primary
         } else {
-            return Colors.black01
+            return Color.clear
         }
     }
 }

package/ios/Popup/PopupDisplay.swift

@@ -62,7 +62,7 @@ public struct PopupDisplay: View {
                         }
                         .scaledToFill()
                         .frame(maxWidth: .infinity)
-                        .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
+                        .clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
                         .aspectRatio(2, contentMode: .fit)
                 }
                     VStack(alignment: .leading) {

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Tue Apr 08 11:13:31 ICT 2025
+sdk.dir=/Users/sonnguyen/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.114.2-beta.14",
+  "version": "0.114.2-beta.20",
   "private": false,
   "dependencies": {},
   "devDependencies": {},