@momo-kits/native-kits 0.114.2-beta.1 → 0.114.2-beta.3

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

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
@@ -75,183 +75,143 @@ fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Norma
 
 @Immutable
 class AppTypography internal constructor(
-    val headlineDefault: TextStyle,
-    val headlineS: TextStyle,
-    val headlineL: TextStyle,
-    val headlineXl: TextStyle,
-    val titleDefault: TextStyle,
-    val titleXs: TextStyle,
-    val titleS: TextStyle,
-    val headerDefault: TextStyle,
-    val headerXs: TextStyle,
-    val headerS: TextStyle,
-    val paragraphDefault: TextStyle,
-    val paragraphBold: TextStyle,
-    val paragraphItalic: TextStyle,
-    val descriptionDefault: TextStyle,
-    val descriptionXs: TextStyle,
-    val descriptionS: TextStyle,
-    val labelDefault: TextStyle,
-    val labelXxs: TextStyle,
-    val labelXs: TextStyle,
-    val labelS: TextStyle,
-    val actionDefault: TextStyle,
-    val actionXxs: TextStyle,
-    val actionXs: TextStyle,
-    val actionS: TextStyle,
+    val headlineDefaultBold: TextStyle,
+    val headerMBold: TextStyle,
+    val headerDefaultBold: TextStyle,
+    val headerSSemibold: TextStyle,
+    val headerXsSemibold: TextStyle,
+    val bodyDefaultRegular: TextStyle,
+    val bodyDefaultRegularStrikethrough: TextStyle,
+    val descriptionDefaultRegular: TextStyle,
+    val descriptionDefaultRegularStrikethrough: TextStyle,
+    val descriptionXsRegular: TextStyle,
+    val descriptionXsRegularStrikethrough: TextStyle,
+    val labelDefaultMedium: TextStyle,
+    val labelSMedium: TextStyle,
+    val labelXsMedium: TextStyle,
+    val actionDefaultBold: TextStyle,
+    val actionSBold: TextStyle,
+    val actionXsBold: TextStyle,
+    val actionXxsBold: TextStyle,
 ) {
     constructor(
         default: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
             fontWeight = FontWeight.Normal
         ),
-        headlineDefault: TextStyle = TextStyle(
-            fontSize = 28.sp,
-            lineHeight = 34.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        headlineS: TextStyle = TextStyle(
+        headlineDefaultBold: TextStyle = TextStyle(
             fontSize = 24.sp,
-            lineHeight = 32.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        headlineL: TextStyle = TextStyle(
-            fontSize = 32.sp,
-            lineHeight = 36.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        headlineXl: TextStyle = TextStyle(
-            fontSize = 36.sp,
-            lineHeight = 44.sp,
-            fontWeight = FontWeight.SemiBold
+            lineHeight = 34.sp,
+            fontWeight = FontWeight.Bold
         ),
-        titleDefault: TextStyle = TextStyle(
-            fontSize = 20.sp,
-            lineHeight = 28.sp,
+        headerMBold: TextStyle = TextStyle(
+            fontSize = 18.sp,
+            lineHeight = 26.sp,
             fontWeight = FontWeight.Bold
         ),
-        titleXs: TextStyle = TextStyle(
+        headerDefaultBold: TextStyle = TextStyle(
             fontSize = 16.sp,
             lineHeight = 22.sp,
             fontWeight = FontWeight.Bold
         ),
-        titleS: TextStyle = TextStyle(
-            fontSize = 18.sp,
-            lineHeight = 28.sp,
-            fontWeight = FontWeight.Bold
-        ),
-        headerDefault: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
+        headerSSemibold: TextStyle = TextStyle(
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
             fontWeight = FontWeight.SemiBold
         ),
-        headerXs: TextStyle = TextStyle(
+        headerXsSemibold: TextStyle = TextStyle(
             fontSize = 12.sp,
-            lineHeight = 16.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.SemiBold
         ),
-        headerS: TextStyle = TextStyle(
+        bodyDefaultRegular: TextStyle = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
-            fontWeight = FontWeight.SemiBold
-        ),
-        paragraphDefault: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
             fontWeight = FontWeight.Normal
         ),
-        paragraphBold: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
-            fontWeight = FontWeight.Bold
-        ),
-        paragraphItalic: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
-            fontWeight = FontWeight.Normal,
-            fontStyle = FontStyle.Italic
-        ),
-        descriptionDefault: TextStyle = TextStyle(
+        bodyDefaultRegularStrikethrough: TextStyle = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
+            fontWeight = FontWeight.Normal,
+            textDecoration = TextDecoration.LineThrough
+        ),
+        descriptionDefaultRegular: TextStyle = TextStyle(
+            fontSize = 12.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.Normal
         ),
-        descriptionXs: TextStyle = TextStyle(
+        descriptionDefaultRegularStrikethrough: TextStyle = TextStyle(
+            fontSize = 12.sp,
+            lineHeight = 18.sp,
+            fontWeight = FontWeight.Normal,
+            textDecoration = TextDecoration.LineThrough
+        ),
+        descriptionXsRegular: TextStyle = TextStyle(
             fontSize = 10.sp,
             lineHeight = 14.sp,
             fontWeight = FontWeight.Normal
         ),
-        descriptionS: TextStyle = TextStyle(
-            fontSize = 12.sp,
-            lineHeight = 16.sp,
+        descriptionXsRegularStrikethrough: TextStyle = TextStyle(
+            fontSize = 10.sp,
+            lineHeight = 14.sp,
             fontWeight = FontWeight.Normal,
+            textDecoration = TextDecoration.LineThrough
         ),
-        labelDefault: TextStyle = TextStyle(
+        labelDefaultMedium: TextStyle = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
             fontWeight = FontWeight.Medium
         ),
-        labelXxs: TextStyle = TextStyle(
-            fontSize = 8.sp,
-            lineHeight = 12.sp,
+        labelSMedium: TextStyle = TextStyle(
+            fontSize = 12.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.Medium
         ),
-        labelXs: TextStyle = TextStyle(
+        labelXsMedium: TextStyle = TextStyle(
             fontSize = 10.sp,
             lineHeight = 14.sp,
             fontWeight = FontWeight.Medium
         ),
-        labelS: TextStyle = TextStyle(
-            fontSize = 12.sp,
-            lineHeight = 16.sp,
-            fontWeight = FontWeight.Medium
-        ),
-        actionDefault: TextStyle = TextStyle(
+        actionDefaultBold: TextStyle = TextStyle(
             fontSize = 16.sp,
             lineHeight = 22.sp,
             fontWeight = FontWeight.Bold
         ),
-        actionXxs: TextStyle = TextStyle(
-            fontSize = 10.sp,
-            lineHeight = 14.sp,
+        actionSBold: TextStyle = TextStyle(
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
             fontWeight = FontWeight.Bold
         ),
-        actionXs: TextStyle = TextStyle(
+        actionXsBold: TextStyle = TextStyle(
             fontSize = 12.sp,
-            lineHeight = 16.sp,
+            lineHeight = 18.sp,
             fontWeight = FontWeight.Bold
         ),
-        actionS: TextStyle = TextStyle(
-            fontSize = 15.sp,
-            lineHeight = 22.sp,
+        actionXxsBold: TextStyle = TextStyle(
+            fontSize = 10.sp,
+            lineHeight = 14.sp,
             fontWeight = FontWeight.Bold
         ),
     ) : this(
-        headlineDefault = headlineDefault,
-        headlineS = headlineS,
-        headlineL = headlineL,
-        headlineXl = headlineXl,
-        titleDefault = titleDefault,
-        titleXs = titleXs,
-        titleS = titleS,
-        headerDefault = headerDefault,
-        headerXs = headerXs,
-        headerS = headerS,
-        paragraphDefault = paragraphDefault,
-        paragraphBold = paragraphBold,
-        paragraphItalic = paragraphItalic,
-        descriptionDefault = descriptionDefault,
-        descriptionXs = descriptionXs,
-        descriptionS = descriptionS,
-        labelDefault = labelDefault,
-        labelXxs = labelXxs,
-        labelXs = labelXs,
-        labelS = labelS,
-        actionDefault = actionDefault,
-        actionXxs = actionXxs,
-        actionXs = actionXs,
-        actionS = actionS
+        headlineDefaultBold = headlineDefaultBold,
+        headerMBold = headerMBold,
+        headerDefaultBold = headerDefaultBold,
+        headerSSemibold = headerSSemibold,
+        headerXsSemibold = headerXsSemibold,
+        bodyDefaultRegular = bodyDefaultRegular,
+        bodyDefaultRegularStrikethrough = bodyDefaultRegularStrikethrough,
+        descriptionDefaultRegular = descriptionDefaultRegular,
+        descriptionDefaultRegularStrikethrough = descriptionDefaultRegularStrikethrough,
+        descriptionXsRegular = descriptionXsRegular,
+        descriptionXsRegularStrikethrough = descriptionXsRegularStrikethrough,
+        labelDefaultMedium = labelDefaultMedium,
+        labelSMedium = labelSMedium,
+        labelXsMedium = labelXsMedium,
+        actionDefaultBold = actionDefaultBold,
+        actionSBold = actionSBold,
+        actionXsBold = actionXsBold,
+        actionXxsBold = actionXxsBold
     )
 }
 

package/ios/Application/ApplicationEnvironment.swift

@@ -13,12 +13,12 @@ public class MiniAppContext {
     public var appName: Any? = nil
     public var appIcon: String = ""
     public var description: Any? = nil
-    public var support: Any? = nil
-    public var toolkitConfig: Any? = nil
-    public var providerId: String = ""
-    public var permissions: Any? = nil
-
-    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: Any? = nil, toolkitConfig: Any? = nil, providerId: String, permissions: Any? = nil) {
+    public var support: [String: Any] = [:]
+    public var toolkitConfig: [String: Any] = [:]
+    public var providerId: String = "momo"
+    public var permissions: [[String: Any]] = []
+    
+    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
         self.appId = appId
         self.appCode = appCode
         self.appName = appName
@@ -31,12 +31,20 @@ public class MiniAppContext {
     }
 }
 
+public class KitConfig {
+    public var trustBanner: TrustBannerData? = nil
+    public var headerBar: String? = nil
+    public var headerGradient: String? = nil
+}
+
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
-    let composeApi: KitComposeApi
-
-    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
+    let composeApi: KitComposeApi?
+    let config: KitConfig?
+    
+    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
+        self.config = config
     }
 }

package/ios/Application/HeaderRight.swift

@@ -6,7 +6,7 @@ public struct HeaderRightData {
     var useMore: Bool
     var tools: [ToolGroup]
     var toolCallback: ((String) -> Void)?
-
+    
     public init(
         useShortcut: Bool = false,
         useMore: Bool = false,
@@ -25,7 +25,7 @@ public struct Tool {
     var icon: String
     var showBadge: Bool
     var name: [String: String]
-
+    
     public init(
         key: String,
         icon: String,
@@ -37,7 +37,7 @@ public struct Tool {
         self.showBadge = showBadge
         self.name = name
     }
-
+    
     func toMap() -> [String: Any] {
         return [
             "key": key,
@@ -51,7 +51,7 @@ public struct Tool {
 public struct ToolGroup {
     var title: [String: String]
     var items: [Tool]
-
+    
     public init(
         title: [String: String] = [:],
         items: [Tool]
@@ -59,7 +59,7 @@ public struct ToolGroup {
         self.title = title
         self.items = items
     }
-
+    
     func toMap() -> [String: Any] {
         return [
             "title": title,
@@ -79,7 +79,7 @@ public struct HeaderRight: View {
         self.headerRight = headerRight
     }
     var headerRight: HeaderRightData?
-
+    
     public var body: some View {
         HStack(alignment: .center) {
             ToolkitHeaderRight(headerRight: headerRight)
@@ -92,17 +92,17 @@ struct ToolkitHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
-
+    
     // MARK: - Actions
     private func onPressShortcut() {
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "onToolAction",
             params: ["item": ["key": "onFavorite"]]
         ) { _ in
             isFavorite.toggle()
         }
     }
-
+    
     private func onPressHelpCenter() {
         let context = environment.applicationContext
         let paramMap: [String: Any] = [
@@ -112,20 +112,19 @@ struct ToolkitHeaderRight: View {
             "icon": context?.appIcon,
             "description": context?.description
         ]
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "showHelpCenter",
             params: paramMap
         ) { _ in }
     }
-
+    
     private func onPressClose() {
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "dismiss",
             params: ""
         ) { _ in }
     }
-
-
+    
     private func onPressMore() {
         let context = environment.applicationContext
         let params: [String: Any] = [
@@ -136,13 +135,13 @@ struct ToolkitHeaderRight: View {
                 "name": context?.appName,
                 "icon": context?.appIcon,
                 "description": context?.description,
-                 "support": context?.support,
-                 "toolkitConfig": context?.toolkitConfig,
-                 "providerId": context?.providerId,
-                 "permissions": context?.permissions
+                "support": context?.support,
+                "toolkitConfig": context?.toolkitConfig,
+                "providerId": context?.providerId,
+                "permissions": context?.permissions
             ]
         ]
-        environment.composeApi.request(
+        environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
@@ -157,12 +156,12 @@ struct ToolkitHeaderRight: View {
             }
         }
     }
-
+    
     private func getNavigationButtonConfig() -> NavigationButtonConfig {
         let totalTools = headerRight?.tools.reduce(0) { $0 + $1.items.count } ?? 0
         var icon = isFavorite ? "pin_star_checked" : "pin_star"
         var onClickHandler: () -> Void = onPressShortcut
-
+        
         if totalTools > 1 || headerRight?.useMore == true {
             icon = "navigation_more_icon"
             onClickHandler = onPressMore
@@ -172,16 +171,16 @@ struct ToolkitHeaderRight: View {
                 headerRight?.toolCallback?(singleTool.key)
             }
         }
-
+        
         return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
     }
-
+    
     var body: some View {
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
         } ?? false
-
+        
         HStack(alignment: .center) {
             if headerRight?.useShortcut == true {
                 NavigationButton(
@@ -191,18 +190,18 @@ struct ToolkitHeaderRight: View {
                     onClick: navButtonConfig.onPress
                 )
             }
-
+            
             HStack(alignment: .center, spacing: 0) {
                 Icon(source: "help_center", size: 20)
                     .padding(4)
                     .onTapGesture {
                         onPressHelpCenter()
                     }
-
+                
                 Rectangle()
                     .fill(Colors.black20)
                     .frame(width: 0.5, height: 12)
-
+                
                 Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
                     .padding(4)
                     .onTapGesture {
@@ -226,7 +225,7 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
-
+    
     var body: some View {
         ZStack {
             Circle()
@@ -235,9 +234,9 @@ struct NavigationButton: View {
                     Circle()
                         .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
                 )
-
+            
             Icon(source: icon, size: 16)
-
+            
             if showBadge {
                 BadgeDot(size: .small)
                     .offset(x: -2, y: -2)