@momo-kits/native-kits 0.162.21-debug → 0.162.22-debug

package/ios/SuggestAction/SuggestAction.swift

@@ -77,9 +77,11 @@ public struct SuggestAction: View {
 
                     Spacer().frame(width: Spacing.S)
 
-                    Icon(source: "navigation_close", size: 24, color: theme.colors.text.default)
-                        .contentShape(Rectangle())
-                        .onTapGesture { onClose() }
+                    SwiftUI.Button(action: onClose) {
+                        Icon(source: "navigation_close", size: 24, color: theme.colors.text.default)
+                            .contentShape(Rectangle())
+                    }
+                    .buttonStyle(ActiveOpacityButtonStyle())
                 }
                 .padding(Spacing.M)
                 .frame(maxWidth: .infinity)

package/ios/Swipeable/SwipeCell.swift

@@ -6,6 +6,8 @@ private let swipeActionWidth: CGFloat = 56
 // MARK: - Swipe
 
 public struct Swipe<Content: View>: View {
+    @Environment(\.appTheme) private var theme
+
     private let leftActions: [SwipeAction]
     private let rightActions: [SwipeAction]
     private let height: CGFloat
@@ -54,7 +56,7 @@ public struct Swipe<Content: View>: View {
                             action: action,
                             height: height,
                             itemRadius: itemRadius,
-                            defaultBackgroundColor: Colors.primary
+                            defaultBackgroundColor: theme.colors.primary
                         )
                     }
                     Spacer(minLength: 0)
@@ -69,14 +71,14 @@ public struct Swipe<Content: View>: View {
                             action: action,
                             height: height,
                             itemRadius: itemRadius,
-                            defaultBackgroundColor: Colors.error
+                            defaultBackgroundColor: theme.colors.error.primary
                         )
                     }
                 }
             }
 
             ZStack {
-                Colors.card
+                theme.colors.background.surface
                 content()
             }
             .frame(maxWidth: .infinity)

package/ios/Switch/Switch.swift

@@ -1,44 +1,69 @@
 import Foundation
 import SwiftUI
 
-public struct Switch: View{
+public struct Switch: View {
     @Binding var value: Bool
     var disabled: Bool
-    var onChange: ((Bool)->Void)?
-    
-    public init(_ value: Binding<Bool>,disabled: Bool = false, onChange: ((Bool)->Void)? = nil){
+    var onChange: ((Bool) -> Void)?
+    var title: String?
+    var accessibilityId: String?
+
+    public init(
+        _ value: Binding<Bool>,
+        disabled: Bool = false,
+        onChange: ((Bool) -> Void)? = nil,
+        title: String? = "",
+        accessibilityId: String? = ""
+    ) {
         self._value = value
         self.disabled = disabled
         self.onChange = onChange
+        self.title = title
+        self.accessibilityId = accessibilityId
+    }
+
+    // Mirrors Kotlin's `backgroundColor`: shared by the track AND the inner dot.
+    private var backgroundColor: Color {
+        switch (disabled, value) {
+        case (true, true): return Colors.green09
+        case (true, false): return Colors.black05
+        case (false, true): return Colors.green03
+        case (false, false): return Colors.black07
+        }
+    }
+
+    // Mirrors Kotlin's `circleBackgroundColor` (the outer 14pt thumb circle).
+    private var circleColor: Color {
+        value ? Colors.black01 : Colors.black03
     }
-    
-    
+
+    private var automationId: String {
+        accessibilityId?.isEmpty == false ? accessibilityId! : "toggle_\(title?.isEmpty == false ? title! : "unknown")_\(value)"
+    }
+
     public var body: some View {
         SwiftUI.Button(action: {
-            withAnimation{
+            withAnimation {
                 value.toggle()
                 onChange?(value)
             }
-        }){
-              HStack{
-                  HStack {
-                  }
-                  .frame(width: 6, height: 6)
-                  .background(value ? Colors.pink03 : Colors.black07)
-                  .clipShape(Circle())
-                  .opacity(disabled ? 0.4 : 1)
-              }
-              .frame(width: 14, height: 14)
-              .background(Colors.black01)
-              .clipShape(Circle())
-              .padding(.leading,5)
-              .padding(.trailing,5)
-              
-          }
-          .disabled(disabled)
-          .frame(width: 40, height: 24, alignment: value == true ? .trailing : .leading)
-          .background(value ? Colors.pink03 : Colors.black07)
-          .clipShape(Capsule())
-          .opacity(disabled ? 0.4 : 1)
+        }) {
+            HStack {
+                HStack {}
+                    .frame(width: 6, height: 6)
+                    .background(backgroundColor)
+                    .clipShape(Circle())
+            }
+            .frame(width: 14, height: 14)
+            .background(circleColor)
+            .clipShape(Circle())
+            .padding(.leading, Spacing.XS)
+            .padding(.trailing, Spacing.XS)
+        }
+        .disabled(disabled)
+        .frame(width: 38, height: 20, alignment: value ? .trailing : .leading)
+        .background(backgroundColor)
+        .clipShape(Capsule())
+        .accessibilityIdentifier(automationId)
     }
 }

package/ios/TabView/TabView.swift

@@ -363,13 +363,15 @@ private struct CardTabBar: View {
                 let isActive = selectedIndex == index
                 let iconColor = isActive ? selectedColor : unselectedColor
 
-                cardItem(tab: tab, isActive: isActive, iconColor: iconColor)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: isActive ? 44 : 40)
-                    .background(isActive ? theme.colors.background.surface : theme.colors.background.tonal)
-                    .clipShape(UnstyledRoundedRectangle(topLeft: Radius.M, topRight: Radius.M))
-                    .contentShape(Rectangle())
-                    .onTapGesture { onPress(index) }
+                SwiftUI.Button(action: { onPress(index) }) {
+                    cardItem(tab: tab, isActive: isActive, iconColor: iconColor)
+                        .frame(maxWidth: .infinity)
+                        .frame(height: isActive ? 44 : 40)
+                        .background(isActive ? theme.colors.background.surface : theme.colors.background.tonal)
+                        .clipShape(UnstyledRoundedRectangle(topLeft: Radius.M, topRight: Radius.M))
+                        .contentShape(Rectangle())
+                }
+                .buttonStyle(ActiveOpacityButtonStyle())
             }
         }
         .frame(maxWidth: .infinity)
@@ -416,15 +418,17 @@ private struct TabItemView: View {
     private var textStyle: TypographyStyle { active ? .headerSSemibold : .bodyDefaultRegular }
 
     var body: some View {
-        Group {
-            if direction == .column {
-                columnBody
-            } else {
-                rowBody
+        SwiftUI.Button(action: onPress) {
+            Group {
+                if direction == .column {
+                    columnBody
+                } else {
+                    rowBody
+                }
             }
+            .contentShape(Rectangle())
         }
-        .contentShape(Rectangle())
-        .onTapGesture { onPress() }
+        .buttonStyle(ActiveOpacityButtonStyle())
     }
 
     @ViewBuilder

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -52,15 +52,14 @@ let defaultBanner = TrustBannerData(
 
 public struct TrustBanner: View {
     @EnvironmentObject var applicationEnvironment: ApplicationEnvironment
-    
+    @EnvironmentObject private var localize: Localize
+
     var onPress: ((String)->Void)?
-     
+
     public init(onPress: ((String)->Void)?) {
         self.onPress = onPress
     }
-    
-    var language: String? = "vi"
-    
+
     func onPressSecurity() {
         if (onPress != nil) {
             onPress!(applicationEnvironment.config?.trustBanner?.urlConfig ?? defaultBanner.urlConfig)
@@ -75,7 +74,7 @@ public struct TrustBanner: View {
                 .scaledToFit()
                 .frame(width: 64, height: 64)
             VStack(alignment: .leading){
-                Text(applicationEnvironment.config?.trustBanner?.content[language ?? "vi"] as? String ?? defaultBanner.content[language ?? "vi"])
+                Text(applicationEnvironment.config?.trustBanner?.content[localize.currentLanguage] ?? defaultBanner.content[localize.currentLanguage])
                     .foregroundColor(Color(hex: "484848"))
                     .lineLimit(2)
                     .font(.system(size: 13, weight: Font.Weight.regular))
@@ -84,7 +83,7 @@ public struct TrustBanner: View {
                     .padding(.bottom, 8)
                 HStack {
                     HStack(spacing: 0) {
-                        Text(applicationEnvironment.config?.trustBanner?.subContent[language ?? "vi"] as? String ?? defaultBanner.subContent[language ?? "vi"])
+                        Text(applicationEnvironment.config?.trustBanner?.subContent[localize.currentLanguage] ?? defaultBanner.subContent[localize.currentLanguage])
                             .foregroundColor(Colors.pink03)
                             .font(.system(size: 13, weight: .bold))
                             .ignoreBoldTextSetting()

package/ios/Tooltip/Tooltip.swift

@@ -462,6 +462,9 @@ private struct TooltipSecondaryButton: View {
                 .padding(.vertical, Spacing.S)
         }
         .buttonStyle(.plain)
+        // Mirrors Compose's `Modifier.weight(1f, fill = false)` on the secondary button:
+        // it yields space to the primary button first under width pressure.
+        .layoutPriority(-1)
     }
 }
 

package/ios/Uploader/Uploader.swift

@@ -172,12 +172,3 @@ private struct UploaderImageItem: View {
         .buttonStyle(ActiveOpacityButtonStyle())
     }
 }
-
-// MARK: - Active opacity button style
-
-private struct ActiveOpacityButtonStyle: ButtonStyle {
-    func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .opacity(configuration.isPressed ? 0.5 : 1)
-    }
-}

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.163.1-beta.6'
+  s.version          = '0.162.2-sp.9'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.163.1-beta.6'
+  s.version          = '0.162.2-sp.9'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.21-debug",
+  "version": "0.162.22-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},