@momo-kits/native-kits 0.113.2-beta.2 → 0.113.2-beta.4

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

@@ -94,14 +94,14 @@ fun Screen(
 
     Box(
         Modifier.fillMaxSize()
-            .background(backgroundColor ?: AppTheme.current.colors.background.surface)
+            .background(AppTheme.current.colors.background.surface)
     ) {
 
         if (animatedHeader === null) {
             HeaderBackground(
                 headerType = headerType,
                 scrollState = scrollState.value,
-                inputSearchProps= inputSearchProps,
+                inputSearchProps = inputSearchProps,
                 useAnimationSearch = useAnimationSearch
             )
         } else {
@@ -114,7 +114,7 @@ fun Screen(
                     isBack = isBack,
                     headerType = headerType,
                     scrollState = scrollState.value,
-                    inputSearchProps= inputSearchProps,
+                    inputSearchProps = inputSearchProps,
                     useAnimationSearch = useAnimationSearch
                 )
             }
@@ -155,7 +155,11 @@ fun Screen(
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
-                Box {
+                Box(
+                    modifier = Modifier.background(
+                        backgroundColor ?: AppTheme.current.colors.background.default
+                    )
+                ) {
                     headerAnimated()
                     Column {
                         if (animatedHeader !== null) {

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

@@ -115,7 +115,7 @@ fun PopupNotify(
             )
 
             Column(modifier = Modifier.padding(Spacing.XL)) {
-                Text(style = Typography.titleXs, maxLines = 1, text = title)
+                Text(style = Typography.titleXs, maxLines = 2, text = title)
                 content(Modifier.padding(top = Spacing.S))
                 if (error.isNotEmpty()) {
                     Text(
@@ -140,8 +140,8 @@ fun PopupNotify(
 
         Box(
             Modifier
-                .width(20.dp)
-                .height(20.dp)
+                .width(22.dp)
+                .height(22.dp)
                 .offset(x = Spacing.S, y = -Spacing.S)
                 .background(
                     color = AppTheme.current.colors.text.default,
@@ -163,7 +163,7 @@ fun PopupNotify(
             Icon(
                 source = "navigation_close",
                 color = AppTheme.current.colors.background.surface,
-                size = 14.dp,
+                size = 16.dp,
                 modifier = Modifier.semantics {
                     testTag = "ic_popup_close"
                 }

package/ios/Button/Button.swift

@@ -98,9 +98,8 @@ private extension View {
         case .secondary:
             return AnyView(self
                 .background(Colors.card)
-                .foregroundColor(Colors.text)
+                .foregroundColor(Colors.primary)
                 .cornerRadius(8)
-                .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black06, lineWidth: 1))
                 .padding(2)
             )
         case .outline:

package/ios/Popup/PopupDisplay.swift

@@ -42,25 +42,34 @@ public struct PopupDisplay: View {
                 SwiftUI.Button(action: onPressClose) {
                     Image(systemName: "xmark.circle.fill")
                         .resizable()
-                        .frame(width: 16, height: 16)
+                        .frame(width: 22, height: 22)
+                        .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
-                    .background(Colors.black01.cornerRadius(8))
+                    .background(Colors.black01.cornerRadius(15))
                     .offset(x: 6, y: -6)
                     .zIndex(1)
 
             VStack {
+                if(!url.isEmpty) {
                     WebImage(url: URL(string: url), isAnimating: .constant(true))
                         .resizable()
+                        .placeholder {
+                            Rectangle()
+                                .fill(Color.gray.opacity(0.3))
+                                .frame(maxWidth: .infinity, maxHeight: 184)
+                        }
                         .scaledToFill()
-                        .frame(maxWidth: .infinity, maxHeight: 164)
+                        .frame(maxWidth: .infinity)
                         .clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
-
+                        .aspectRatio(2, contentMode: .fit)
+                }
                     VStack(alignment: .leading) {
                         Text(title)
                             .foregroundColor(.black)
-                            .font(.headerText1)
-                            .padding(.top, 12)
-                            .padding(.bottom, 24)
+                            .font(.header_default_semibold)
+                            .padding(.top, 16)
+                            .padding(.bottom, 8)
+                            .lineLimit(2)
 
                         Text(description)
                             .foregroundColor(.black)
@@ -87,10 +96,8 @@ public struct PopupDisplay: View {
                 }.clipped()
             }
         }
-        .background(Color.white.cornerRadius(8))
-        .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)
+        .background(Color.white.cornerRadius(15))
+        .padding(.horizontal, 24)
     }
 
     // MARK: Internal
@@ -106,7 +113,7 @@ public struct PopupDisplay: View {
     var onClose: () -> Void
     var actionButtonTitle: String
     var closeButtonTitle: String
-
+    
     var RowTextButtons: some View {
         HStack {
             SwiftUI.Button(action: onPressCloseButton) {
@@ -143,8 +150,8 @@ public struct PopupDisplay: View {
 
     var RowButtons: some View {
         HStack {
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
-            Button(title: actionButtonTitle, action: onPressAction)
+            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium)
+            Button(title: actionButtonTitle, action: onPressAction, size: .medium)
         }
         .frame(maxWidth: .infinity, alignment: .center)
         .padding(.horizontal, 24)
@@ -153,8 +160,12 @@ public struct PopupDisplay: View {
 
     var ColumnButtons: some View {
         VStack(alignment: .trailing) {
-            Button(title: actionButtonTitle, action: onPressAction)
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
+            Button(
+                title: actionButtonTitle,
+                action: onPressAction,
+                size: .medium
+            )
+            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
         .padding(.horizontal, 24)

package/ios/Typography/Typography.swift

@@ -2,13 +2,14 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
-        return Font.custom("SFProText", size: size)
+        return Font.system(size: size)
     }
     
     // New supported typography styles
     static let headline_default_bold = appFont(size: 24).weight(.bold)
     static let header_m_bold = appFont(size: 18).weight(.bold)
     static let header_default_bold = appFont(size: 16).weight(.bold)
+    static let header_default_semibold = appFont(size: 16).weight(.semibold)
     static let header_s_semibold = appFont(size: 14).weight(.semibold)
     static let header_xs_semibold = appFont(size: 12).weight(.semibold)
     static let body_default_regular = appFont(size: 14).weight(.regular)

package/package.json

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