@momo-kits/native-kits 0.117.1-beta.6 → 0.117.1-beta.7

package/ios/Application/Components.swift

@@ -85,7 +85,9 @@ public struct HeaderBackground: View {
                                 endPoint: .bottom))
                                 .opacity(opacity)
                                 .frame(height: height))
-                        .overlay(Rectangle()
+                        .overlay(
+                            isTransparent ? nil :
+                            Rectangle()
                             .fill(Colors.black04)
                             .frame(height: 1)
                             .frame(maxWidth: .infinity)
@@ -154,9 +156,8 @@ public struct Header: View {
     
     public var body: some View {
         
-//        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)
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Color.black.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Color.white.opacity(0.2) : Color.black.opacity(0.2)
 
         if headerType != .none {
             VStack(spacing: 0) {
@@ -166,7 +167,7 @@ public struct Header: View {
                                 SwiftUI.Button(action: goBack) {
                                     Circle()
                                         .stroke(borderColor, lineWidth: 0.2)
-                                        .background(Circle().fill(backgroundButton))
+                                        .background(Circle().fill(backgroundButtonColor))
                                         .frame(width: 28, height: 28)
                                         .overlay(
                                             Icon(source: "arrow-back", size: 20, color: tintColor)
@@ -213,8 +214,9 @@ public struct Header: View {
                                 }
                             } else {
                                 Text(title)
-                                    .font(Font.system(size: 17).weight(.bold))          .lineSpacing(22)
-                                    .foregroundColor(Colors.black17)
+                                    .font(Font.system(size: 17).weight(.bold))
+                                    .lineSpacing(22)
+                                    .foregroundColor(tintColor)
                                     .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)

package/ios/Application/HeaderRight.swift

@@ -75,20 +75,23 @@ struct NavigationButtonConfig {
 
 // MARK: - Components
 public struct HeaderRight: View {
-    public init(headerRight: HeaderRightData? = nil) {
+    public init(headerRight: HeaderRightData? = nil, tintColor: Color? = nil) {
         self.headerRight = headerRight
+        self.tintColor = tintColor
     }
     var headerRight: HeaderRightData?
+    var tintColor: Color? = nil
     
     public var body: some View {
         HStack(alignment: .center) {
-            ToolkitHeaderRight(headerRight: headerRight)
+            ToolkitHeaderRight(headerRight: headerRight, tintColor: tintColor)
         }
     }
 }
 
 struct ToolkitHeaderRight: View {
     var headerRight: HeaderRightData?
+    var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
@@ -176,6 +179,8 @@ struct ToolkitHeaderRight: View {
     }
     
     var body: some View {
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Color.black.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Color.white.opacity(0.2) : Color.black.opacity(0.2)
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
@@ -187,33 +192,34 @@ struct ToolkitHeaderRight: View {
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
                     showBadge: showBadge,
-                    onClick: navButtonConfig.onPress
+                    onClick: navButtonConfig.onPress,
+                    tintColor: tintColor
                 )
             }
             
             HStack(alignment: .center, spacing: 0) {
-                Icon(source: "help_center", size: 20)
+                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
                     .onTapGesture {
                         onPressHelpCenter()
                     }
                 
                 Rectangle()
-                    .fill(Colors.black20)
+                    .fill(tintColor ?? Colors.black20)
                     .frame(width: 0.5, height: 12)
                 
-                Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
+                Icon(source: "16_navigation_close_circle", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
                     .onTapGesture {
                         onPressClose()
                     }
             }
             .frame(width: 65, height: 28)
-            .background(Color.white.opacity(0.6))
+            .background(backgroundButtonColor)
             .cornerRadius(14)
             .overlay(
                 RoundedRectangle(cornerRadius: 14)
-                    .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
+                    .stroke(borderColor, lineWidth: 0.2)
             )
             .padding(.leading, Spacing.S)
         }
@@ -225,17 +231,21 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
+    var tintColor: Color?
     
     var body: some View {
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Color.black.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Color.white.opacity(0.2) : Color.black.opacity(0.2)
+        
         ZStack {
             Circle()
-                .fill(Color.white.opacity(0.6))
+                .fill(backgroundButtonColor)
                 .overlay(
                     Circle()
-                        .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
+                        .stroke(borderColor, lineWidth: 0.2)
                 )
             
-            Icon(source: icon, size: 16)
+            Icon(source: icon, size: 16, color: tintColor)
             
             if showBadge {
                 BadgeDot(size: .small)

package/ios/Application/Screen.swift

@@ -76,6 +76,9 @@ public struct Screen<Content: View>: View {
     @State private var scrollOffset: CGFloat = 0
 
     public var body: some View {
+        
+        let headerRightInstance = {HeaderRight(tintColor: tintColor)}
+        
         GeometryReader { geometry in
             let topInset = geometry.safeAreaInsets.top
             let keyboardHeight: CGFloat = 0
@@ -101,7 +104,7 @@ public struct Screen<Content: View>: View {
                             headerType: headerType,
                             titlePosition: titlePosition,
                             title: title,
-                            headerRight: headerRight,
+                            headerRight: headerRightInstance,
                             goBack: goBack,
                             opacity: min(scrollOffset / 114, 1),
                             animatedHeader: animatedHeader,

package/ios/Image/Image.swift

@@ -27,7 +27,7 @@ public struct ImageView: View {
                 error = false
             }
             .resizable()
-            .renderingMode(.original)
+            .renderingMode(color != nil ? .template : .original)
             .placeholder {
                 Rectangle().foregroundColor(.gray)
                 VStack(alignment: .center, content: {
@@ -49,7 +49,7 @@ public struct ImageView: View {
             .scaledToFit()
             .transition(.fade)
             .aspectRatio(aspectRatio, contentMode: contentMode)
-            .modifier(ColorMultiplyModifier(color: color))
+            .foregroundColor(color)
     }
 
     // MARK: Internal

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.
-#Wed Aug 21 14:20:12 ICT 2024
-sdk.dir=/Users/huynhdung/Library/Android/sdk
+#Thu Jan 09 10:43:10 ICT 2025
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

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