@momo-kits/native-kits 0.114.2-beta.8 → 0.117.1-beta.1

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

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Text
 import vn.momo.kits.const.Typography
@@ -19,7 +20,10 @@ fun HeaderTitle(
         modifier = Modifier.then(modifier).zIndex(1f),
         text = title,
         textAlign = textAlign,
-        style = Typography.actionSBold,
+        style = Typography.actionSBold.copy(
+            fontSize = 15.sp,
+            lineHeight = 22.sp,
+        ),
         color = color,
         maxLines = 1
     )

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/compose/src/commonMain/kotlin/vn/momo/kits/components/{PromotionPopup.kt → PopupPromotion.kt}

@@ -25,15 +25,22 @@ import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 
 @Composable
-fun PromotionPopup(
+fun PopupPromotion(
     source: String = "",
+    onPress: (() -> Unit) = {},
     onClose: (() -> Unit) = {},
 ) {
     Column(Modifier.semantics { testTag = "popup_notify" }) {
         if (source.isNotEmpty()) {
             Image(
                 source = source,
-                modifier = Modifier.fillMaxWidth().aspectRatio(0.72f),
+                modifier = Modifier.fillMaxWidth()
+                    .aspectRatio(0.72f)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onPress
+                    ),
             )
         }
         Box(

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt

@@ -1,11 +1,6 @@
 package vn.momo.kits.modifier
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag

package/ios/Application/Components.swift

@@ -45,13 +45,24 @@ func safeAreaTopInset() -> CGFloat {
 public struct HeaderBackground: View {
     var headerType: HeaderType = .default
     var scrollState: CGFloat
+    var isTransparent: Bool = false
+    
+    public init(
+        headerType: HeaderType = .default,
+        scrollState: CGFloat = 0,
+        isTransparent: Bool = false
+    ) {
+        self.headerType = headerType
+        self.scrollState = scrollState
+        self.isTransparent = isTransparent
+    }
     
     public var body: some View {
         
         let statusBarHeight = safeAreaTopInset()
         
         let opacity = 1 - CGFloat(scrollState) / 200
-        let backgroundColor = scrollState == 0 ? Color.clear : Colors.black01
+        let backgroundColor = isTransparent ? Color.clear : Colors.black01
         
         Group {
             if headerType == .default {
@@ -62,7 +73,9 @@ public struct HeaderBackground: View {
                         .fill(backgroundColor)
                         .frame(height: height)
                         .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
-                        .overlay(Rectangle()
+                        .overlay(
+                            isTransparent ? nil :
+                            Rectangle()
                             .fill(LinearGradient(
                                 gradient: Gradient(colors: [
                                     Color(red: 1, green: 0.8, blue: 0.87),
@@ -111,6 +124,7 @@ public struct Header: View {
     var animatedHeader: AnimatedHeader? = nil
     var scrollState: CGFloat = 0
     var inputSearchProps: InputSearchProps? = nil
+    var tintColor: Color? = nil
     
     @State private var colorFraction: CGFloat = 0
     
@@ -123,7 +137,8 @@ public struct Header: View {
         opacity: CGFloat? = nil,
         animatedHeader: AnimatedHeader? = nil,
         scrollState: CGFloat = 0,
-        inputSearchProps: InputSearchProps? = nil
+        inputSearchProps: InputSearchProps? = nil,
+        tintColor: Color? = nil
     ) {
         self.headerType = headerType
         self.titlePosition = titlePosition
@@ -134,27 +149,27 @@ public struct Header: View {
         self.animatedHeader = animatedHeader
         self.scrollState = scrollState
         self.inputSearchProps = inputSearchProps
+        self.tintColor = tintColor
     }
     
     public var body: some View {
         
-        let statusBarHeight = safeAreaTopInset()
-        let tintIconColor = Colors.black17
-        let backgroundButton = Colors.black01.opacity(0.6)
+//        let tintIconColor = Colors.black17
+        let backgroundButton = tintColor == Colors.black01 ? Color.white.opacity(0.2) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Color.black.opacity(0.6) : Color.black.opacity(0.2)
 
         if headerType != .none {
-                VStack(spacing: 0) {
+            VStack(spacing: 0) {
                     ZStack {
                         HStack {
                             if let goBack = goBack {
                                 SwiftUI.Button(action: goBack) {
                                     Circle()
-                                        .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
+                                        .stroke(borderColor, lineWidth: 0.2)
                                         .background(Circle().fill(backgroundButton))
                                         .frame(width: 28, height: 28)
                                         .overlay(
-                                            Image(systemName: "arrow.backward")
-                                                .foregroundColor(.black)
+                                            Icon(source: "arrow-back", size: 20, color: tintColor)
                                         )
                                 }
                                 
@@ -167,14 +182,11 @@ public struct Header: View {
                             }
                         
                         }
-                        .frame(height: 52)
-                        .padding(.horizontal)
-                        
-                        
+                        .padding(.horizontal, 12)
                         
                         HStack {
                             if titlePosition == .left, goBack != nil {
-                                Spacer().frame(width: 40)
+                                Spacer().frame(width: 38)
                             }
                             
                             if inputSearchProps != nil {
@@ -201,22 +213,22 @@ public struct Header: View {
                                 }
                             } else {
                                 Text(title)
-                                    .font(.headline)
-                                    .foregroundColor(tintIconColor)
+                                    .font(Font.system(size: 17).weight(.bold))          .lineSpacing(22)
+                                    .foregroundColor(Colors.black17)
                                     .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)
+                                
                             }
                             Spacer()
                         }
-                        .frame(height: 52)
                         .padding(.horizontal)
                     }
                     .background(Color.clear)
                 }
-            }
+                .frame(height: 52)
         }
-    
+    }
 }
 
 

package/ios/Application/Screen.swift

@@ -9,6 +9,8 @@ import SwiftUI
 
 public struct Screen<Content: View>: View {
     var backgroundColor: Color?
+    var headerTransparent: Bool = false
+    var tintColor: Color? = Colors.black17
     var isBack: Bool
     var headerType: HeaderType
     var verticalAlignment: VerticalAlignment
@@ -29,6 +31,8 @@ public struct Screen<Content: View>: View {
 
     public init(
         backgroundColor: Color? = nil,
+        headerTransparent: Bool = false,
+        tintColor: Color = Colors.black17,
         isBack: Bool = true,
         headerType: HeaderType = .default,
         verticalAlignment: VerticalAlignment = .top,
@@ -48,6 +52,8 @@ public struct Screen<Content: View>: View {
         @ViewBuilder content: @escaping () -> Content
     ) {
         self.backgroundColor = backgroundColor
+        self.headerTransparent = headerTransparent
+        self.tintColor = tintColor
         self.isBack = isBack
         self.headerType = headerType
         self.verticalAlignment = verticalAlignment
@@ -71,23 +77,25 @@ public struct Screen<Content: View>: View {
 
     public var body: some View {
         GeometryReader { geometry in
-            let safeAreaInsets = geometry.safeAreaInsets
-            let statusBarHeight = safeAreaInsets.top
+            let topInset = geometry.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 {
-                        if animatedHeader == nil {
-                            HeaderBackground(headerType: headerType, scrollState: scrollOffset)
-                        } else {
-                            Color.white.opacity(Double(min(scrollOffset / 114, 1)))
-                                .overlay(HeaderBackground(headerType: headerType, scrollState: scrollOffset))
-
-                        }
+                    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))
+//
+//                        }
 
                         Header(
                             headerType: headerType,
@@ -98,15 +106,19 @@ public struct Screen<Content: View>: View {
                             opacity: min(scrollOffset / 114, 1),
                             animatedHeader: animatedHeader,
                             scrollState: scrollOffset,
-                            inputSearchProps: inputSearchProps
-                        ).padding(.bottom, headerType == .extended ? 0 : -safeAreaTopInset())
-                            .padding(.top, statusBarHeight > 20 ? 10 : 0)
-                    }.padding(.top, -safeAreaTopInset())
+                            inputSearchProps: inputSearchProps,
+                            tintColor: tintColor
+                        )
+                        .background(HeaderBackground(headerType: headerType, scrollState: scrollOffset, isTransparent: headerTransparent).edgesIgnoringSafeArea(.top))
+                        .offset(y: topInset)
+
+                    }
+                    .offset(y: -topInset)
 
 
                     VStack(alignment: horizontalAlignment, spacing: 0) {
                         if animatedHeader != nil {
-                            Spacer().frame(height: statusBarHeight + 52 + layoutOffset)
+                            Spacer().frame(height: topInset + 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

@@ -20,7 +20,7 @@ public enum PopupButtonType {
 public struct PopupDisplay: View {
     // MARK: Lifecycle
 
-    public init(isPresented: Binding<Bool>, title: String = "", description: String = "", url: String = "", buttonDirection: PopupButtonDirection = .column, buttonType: PopupButtonType = .button, actionButtonTitle: String = "", closeButtonTitle: String = "", onPressAction: @escaping () -> Void = {}, onPressCloseButton: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}) {
+    public init(isPresented: Binding<Bool>, title: String = "", description: String = "", url: String = "", buttonDirection: PopupButtonDirection = .column, buttonType: PopupButtonType = .button, actionButtonTitle: String = "", closeButtonTitle: String = "", onPressAction: @escaping () -> Void = {}, onPressCloseButton: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}, errorCode: String = "") {
         self._isPresented = isPresented
         self.title = title
         self.description = description
@@ -32,7 +32,12 @@ public struct PopupDisplay: View {
         self.onClose = onClose
         self.closeButtonTitle = closeButtonTitle
         self.actionButtonTitle = actionButtonTitle
+        self.errorCode = errorCode
     }
+    
+    var placeholder: AnyView?
+
+    @State var error: Bool = false
 
     // MARK: Public
 
@@ -62,7 +67,7 @@ public struct PopupDisplay: View {
                         }
                         .scaledToFill()
                         .frame(maxWidth: .infinity)
-                        .clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
+                        .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
                         .aspectRatio(2, contentMode: .fit)
                 }
                     VStack(alignment: .leading) {
@@ -79,10 +84,18 @@ public struct PopupDisplay: View {
                             .font(.paragraph)
                             .opacity(0.6)
                             .multilineTextAlignment(.leading)
-                            .padding(.bottom, 20)
+                            .padding(.bottom, 8)
+                        
+                        if(!errorCode.isEmpty) {
+                            Text(errorCode)
+                                .foregroundColor(Colors.black12)
+                                .font(.description_xs_regular)
+                                .lineLimit(1)
+                        }
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
                     .padding(.horizontal, 24)
+                    .padding(.bottom, 24)
 
                     if buttonDirection == .row {
                         if buttonType == .text {
@@ -120,6 +133,7 @@ public struct PopupDisplay: View {
     var onClose: () -> Void
     var actionButtonTitle: String
     var closeButtonTitle: String
+    var errorCode: String
     
     var RowTextButtons: some View {
         HStack {

package/ios/Popup/PopupPromotion.swift

@@ -1,52 +1,71 @@
-import SDWebImageSwiftUI
 import SwiftUI
+import SDWebImageSwiftUI
 
 public struct PopupPromotion: View {
-    // MARK: Lifecycle
-
-    public init(isPresented: Binding<Bool>, url: String = "", buttonTitle: String = "", onPressAction: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}) {
-        self._isPresented = isPresented
-        self.onPressAction = onPressAction
-        self.buttonTitle = buttonTitle
-        self.onClose = onClose
-        self.url = url
-    }
+    var imageUrl: String
+    var onIconClose: (() -> Void)?
+    var onRequestClose: (((() -> Void)?) -> Void)? = nil
 
-    // MARK: Public
+    
+    public init(
+        imageUrl: String,
+        onIconClose: (() -> Void)? = nil,
+        onRequestClose: (((() -> Void)?) -> Void)? = nil
 
+    ) {
+        self.imageUrl = imageUrl
+        self.onIconClose = onIconClose
+        self.onRequestClose = onRequestClose
+    }
+    
     public var body: some View {
-        VStack(spacing: 12) {
-            ZStack(alignment: .bottom) {
-                WebImage(url: URL(string: url), isAnimating: .constant(true))
-                    .resizable()
-                    .placeholder {
-                        Circle().foregroundColor(.gray)
-                    }
-                    .scaledToFill()
-                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .cornerRadius(8)
-
-                Button(title: buttonTitle, action: onPressAction)
-                    .padding(.horizontal, 24)
-                    .padding(.bottom, 24)
-            }.clipped()
+        VStack(spacing: 8) {
+            WebImage(url: URL(string: imageUrl)!)
+                .resizable()
+                .placeholder {
+                    Color.gray
+                        .aspectRatio(0.72, contentMode: .fit)
+                        .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
+                        .clipped()
+                }
+                .aspectRatio(0.72, contentMode: .fit)
+                .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
+                .clipped()
+                
+            buildCloseIcon()
         }
-        .frame(maxWidth: .infinity, maxHeight: 400)
-        .shadow(color: .black.opacity(0.08), radius: 2, x: 0, y: 0)
-        .shadow(color: .black.opacity(0.16), radius: 24, x: 0, y: 0)
-        .padding(.horizontal, 40)
+        .accessibility(identifier: "popup_promotion")
     }
+    
+    @ViewBuilder
+    private func buildCloseIcon() -> some View {
+        HStack {
+            Spacer()
+            SwiftUI.Button(action: {
+                onAction(callback: onIconClose)
+            }) {
+                ZStack {
+                    Circle()
+                        .strokeBorder(Colors.black01, lineWidth: 2)
+                        .background(Circle().fill(Colors.black17))
+                        .frame(width: 20, height: 20)
+                    
+                    Icon(source: "navigation_close", size: 14, color: Colors.black01)
+                }
+            }
+            .padding(8)
+            Spacer()
+        }
+    }
+    
+    private func onAction(callback: (() -> Void)?) {
+        if let onRequestClose = onRequestClose {
+            onRequestClose(callback)
+        } else {
+            callback?()
+        }
+    }
+}
 
-    // MARK: Internal
 
-    @Binding var isPresented: Bool
-    var onPressAction: () -> Void
-    var onClose: () -> Void
-    var buttonTitle: String
-    var url: String
 
-    func onPressClose(){
-        isPresented = false
-        onClose()
-    }
-}

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
+#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.114.2-beta.8",
+  "version": "0.117.1-beta.1",
   "private": false,
   "dependencies": {},
   "devDependencies": {},