@momo-kits/native-kits 0.117.1-beta.15 → 0.117.1-beta.17

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

@@ -200,9 +200,8 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
     Box(
         Modifier
             .offset(y = -keyboardSize)
-            .padding(bottom = bottom)
             .shadow(
-                Colors.black_20.copy(alpha = 0.1f),
+                Colors.black_20.copy(alpha = 0.2f),
                 borderRadius = 0.dp,
                 10f,
                 offsetX = 0.dp,
@@ -212,7 +211,9 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
             .background(AppTheme.current.colors.background.surface)
     ) {
         Box(
-            Modifier.fillMaxWidth().padding(vertical = Spacing.S, horizontal = Spacing.M)
+            Modifier.fillMaxWidth()
+                .padding(bottom = bottom)
+                .padding(vertical = Spacing.S, horizontal = Spacing.M)
         ) {
             footer?.invoke()
         }

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

@@ -57,6 +57,7 @@ fun PopupNotify(
     secondary: PopupAction? = null,
     buttonDirection: PopupActionDirection = PopupActionDirection.ROW,
     onIconClose: () -> Unit,
+    isShowCloseIcon: Boolean = true,
 ) {
     var isScroll by remember { mutableStateOf(false) }
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -144,34 +145,36 @@ fun PopupNotify(
             }
         }
 
-        Box(
-            Modifier
-                .width(22.dp)
-                .height(22.dp)
-                .offset(x = -(1).dp, y = (-11).dp)
-                .background(
-                    color = AppTheme.current.colors.text.default,
-                    shape = RoundedCornerShape(Radius.M)
-                )
-                .border(
-                    width = 2.dp,
+        if(isShowCloseIcon) {
+            Box(
+                Modifier
+                    .width(22.dp)
+                    .height(22.dp)
+                    .offset(x = -(1).dp, y = (-11).dp)
+                    .background(
+                        color = AppTheme.current.colors.text.default,
+                        shape = RoundedCornerShape(Radius.M)
+                    )
+                    .border(
+                        width = 2.dp,
+                        color = AppTheme.current.colors.background.surface,
+                        shape = RoundedCornerShape(Radius.M)
+                    )
+                    .clip(RoundedCornerShape(100))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = { onClose { onIconClose() } }
+                    ),
+                contentAlignment = Alignment.Center
+            ) {
+                Icon(
+                    source = "navigation_close",
                     color = AppTheme.current.colors.background.surface,
-                    shape = RoundedCornerShape(Radius.M)
+                    size = 16.dp,
+                    modifier = Modifier.setAutomationId("ic_popup_close")
                 )
-                .clip(RoundedCornerShape(100))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = { onClose { onIconClose() } }
-                ),
-            contentAlignment = Alignment.Center
-        ) {
-            Icon(
-                source = "navigation_close",
-                color = AppTheme.current.colors.background.surface,
-                size = 16.dp,
-                modifier = Modifier.setAutomationId("ic_popup_close")
-            )
+            }
         }
     }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -46,15 +46,15 @@ fun getFont(font: String): FontFamily {
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val key = "$fontFamily-${fontWeight?.weight}"
     val fontMap = mapOf(
-        "SFProText-100" to "sfprotext_thin.otf",
-        "SFProText-200" to "sfprotext_ultralight.otf",
+        "SFProText-100" to "sfprotext_thin.ttf",
+        "SFProText-200" to "sfprotext_ultralight.ttf",
         "SFProText-300" to "sfprotext_light.ttf",
         "SFProText-400" to "sfprotext_regular.ttf",
         "SFProText-500" to "sfprotext_medium.ttf",
         "SFProText-600" to "sfprotext_semibold.ttf",
         "SFProText-700" to "sfprotext_bold.ttf",
         "SFProText-800" to "sfprotext_heavy.ttf",
-        "SFProText-900" to "sfprotext_black.otf",
+        "SFProText-900" to "sfprotext_black.ttf",
 
         "MoMoSignature-100" to "momosignature.otf",
         "MoMoSignature-200" to "momosignature.otf",

package/ios/Application/Screen.swift

@@ -88,7 +88,8 @@ public struct Screen<Content: View>: View {
             let screenHeight = height + topInset + bottomInset
 
             ZStack {
-                (backgroundColor ?? Color.white).edgesIgnoringSafeArea(.all)
+                (backgroundColor ?? Color.white)
+                    .edgesIgnoringSafeArea(.top)
 
                 VStack(spacing: 0) {
                     ZStack(alignment: .top) {
@@ -184,6 +185,8 @@ struct Footer: View {
         VStack {
             footerView
         }
+        .padding(.vertical, Spacing.S)
+        .padding(.horizontal, Spacing.M)
         .padding(.bottom, keyboardSize)
         .background(Colors.black01)
     }

package/ios/Popup/PopupDisplay.swift

@@ -21,7 +21,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 = {}, errorCode: String = "") {
+    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 = "", isShowCloseIcon: Bool = true) {
         self._isPresented = isPresented
         self.title = title
         self.description = description
@@ -34,6 +34,7 @@ public struct PopupDisplay: View {
         self.closeButtonTitle = closeButtonTitle
         self.actionButtonTitle = actionButtonTitle
         self.errorCode = errorCode
+        self.isShowCloseIcon = isShowCloseIcon
     }
 
     // MARK: Public
@@ -48,17 +49,19 @@ public struct PopupDisplay: View {
 
         VStack(spacing: 12) {
             ZStack(alignment: .topTrailing) {
-                SwiftUI.Button(action: onClose) {
-                    Image(systemName: "xmark.circle.fill")
-                        .resizable()
-                        .frame(width: 22, height: 22)
-                        .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 2))
-                }.foregroundColor(Colors.black20)
-                    .background(Colors.black01.cornerRadius(15))
-                    .padding(.trailing, -11)
-                    .padding(.top, -11)
-                    .zIndex(1)
-                    .accessibility(identifier: "ic_popup_close")
+                if(isShowCloseIcon) {
+                    SwiftUI.Button(action: onClose) {
+                        Image(systemName: "xmark.circle.fill")
+                            .resizable()
+                            .frame(width: 22, height: 22)
+                            .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 2))
+                    }.foregroundColor(Colors.black20)
+                        .background(Colors.black01.cornerRadius(15))
+                        .padding(.trailing, -11)
+                        .padding(.top, -11)
+                        .zIndex(1)
+                        .accessibility(identifier: "ic_popup_close")
+                }
 
                 VStack {
                     if(!url.isEmpty) {
@@ -162,6 +165,7 @@ public struct PopupDisplay: View {
     var actionButtonTitle: String
     var closeButtonTitle: String
     var errorCode: String
+    var isShowCloseIcon: Bool
 
     var RowTextButtons: some View {
         HStack {
@@ -199,7 +203,9 @@ public struct PopupDisplay: View {
 
     var RowButtons: some View {
         HStack {
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium).accessibility(identifier: "btn_popup_cancel")
+            if(!closeButtonTitle.isEmpty) {
+                Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium).accessibility(identifier: "btn_popup_cancel")
+            }
             Button(title: actionButtonTitle, action: onPressAction, size: .medium)
                 .accessibility(identifier: "btn_popup_allow")
         }
@@ -215,8 +221,9 @@ public struct PopupDisplay: View {
                 action: onPressAction,
                 size: .medium
             ).accessibility(identifier: "btn_popup_allow")
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium).accessibility(identifier: "btn_popup_cancel")
-
+            if(!closeButtonTitle.isEmpty) {
+                Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium).accessibility(identifier: "btn_popup_cancel")
+            }
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
         .padding(.horizontal, 24)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.117.1-beta.15",
+  "version": "0.117.1-beta.17",
   "private": false,
   "dependencies": {},
   "devDependencies": {},