@momo-kits/native-kits 0.162.44-debug → 0.162.45-debug

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/ReservedRegions.ios.kt

@@ -0,0 +1,94 @@
+package vn.momo.kits.platform
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.uikit.LocalUIViewController
+import androidx.compose.ui.unit.dp
+import kotlinx.cinterop.BetaInteropApi
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.interpretObjCPointer
+import kotlinx.cinterop.objcPtr
+import kotlinx.cinterop.readValue
+import kotlinx.cinterop.useContents
+import platform.CoreGraphics.CGRectZero
+import platform.Foundation.NSArray
+import platform.Foundation.NSSelectorFromString
+import platform.Foundation.NSValue
+import platform.Foundation.valueForKey
+import platform.UIKit.CGRectValue
+import platform.UIKit.UIView
+import platform.UIKit.UIViewAutoresizingFlexibleHeight
+import platform.UIKit.UIViewAutoresizingFlexibleWidth
+import platform.darwin.NSObject
+import platform.Foundation.NSClassFromString
+
+// The API is newer than the SDK Kotlin/Native binds, so it is reached through the runtime.
+@OptIn(ExperimentalForeignApi::class)
+private val regionsOfKind = NSSelectorFromString("reservedRegionsOfKind:")
+
+@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
+private fun UIView.occlusionRegions(target: UIView): List<ReservedRegion> {
+    if (window == null || !respondsToSelector(regionsOfKind)) return emptyList()
+    // a class object fails `as? NSObjectProtocol` (K/N checks it as an instance), so it is reinterpreted
+    val kindClass = NSClassFromString("UIViewReservedRegionKind")
+        ?.let { interpretObjCPointer<NSObject>(it.objcPtr()) } ?: return emptyList()
+    val kind = kindClass.performSelector(NSSelectorFromString("occlusionRegionKind")) ?: return emptyList()
+    val regions = when (val result = performSelector(regionsOfKind, withObject = kind)) {
+        is List<*> -> result
+        is NSArray -> List(result.count.toInt()) { result.objectAtIndex(it.toULong()) }
+        else -> return emptyList()
+    }
+    return regions.mapNotNull { region ->
+        val frame = ((region as? NSObject)?.valueForKey("frame") as? NSValue)?.CGRectValue ?: return@mapNotNull null
+        convertRect(frame, toView = target).useContents {
+            ReservedRegion(origin.x.dp, origin.y.dp, size.width.dp, size.height.dp)
+        }
+    }
+}
+
+// Invisible full-size probe: reading the regions in layoutSubviews makes UIKit run it again
+// when they change, so nothing polls.
+@OptIn(ExperimentalForeignApi::class)
+private class ReservedRegionsProbe(
+    private val onChange: (List<ReservedRegion>) -> Unit,
+) : UIView(frame = CGRectZero.readValue()) {
+    private var last: List<ReservedRegion>? = null
+
+    init {
+        userInteractionEnabled = false
+        autoresizingMask = UIViewAutoresizingFlexibleWidth or UIViewAutoresizingFlexibleHeight
+    }
+
+    override fun layoutSubviews() {
+        super.layoutSubviews()
+        val regions = superview?.let { occlusionRegions(it) } ?: emptyList()
+        if (regions != last) {
+            last = regions
+            onChange(regions)
+        }
+    }
+
+    override fun didMoveToWindow() {
+        super.didMoveToWindow()
+        setNeedsLayout()
+    }
+}
+
+@OptIn(ExperimentalForeignApi::class)
+@Composable
+internal actual fun rememberReservedRegions(): List<ReservedRegion> {
+    if (!isPhoneIdiom()) return emptyList()
+    val host = LocalUIViewController.current.view
+    var regions by remember { mutableStateOf(emptyList<ReservedRegion>()) }
+    DisposableEffect(host) {
+        val probe = ReservedRegionsProbe { regions = it }
+        probe.setFrame(host.bounds)
+        host.insertSubview(probe, atIndex = 0)
+        onDispose { probe.removeFromSuperview() }
+    }
+    return regions
+}

package/gradle/libs.versions.toml

@@ -19,7 +19,7 @@ androidx-appcompat = "1.7.0"
 material = "1.10.0"
 maxapi = "0.1.1"
 vanniktechMavenPublish = "0.34.0"
-kits = "0.164.1-beta.1"
+kits = "0.167.1-duo.1"
 nativemaxapi = "0.0.6"
 gif-image = "0.1.2"
 

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.44
+version=0.162.45
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/ApplicationEnvironment.swift

@@ -41,6 +41,12 @@ public class KitConfig {
     public var trustBanner: TrustBannerData? = nil
     public var headerBar: String? = nil
     public var headerGradient: String? = nil
+
+    public init(trustBanner: TrustBannerData? = nil, headerBar: String? = nil, headerGradient: String? = nil) {
+        self.trustBanner = trustBanner
+        self.headerBar = headerBar
+        self.headerGradient = headerGradient
+    }
 }
 
 public class ApplicationEnvironment: ObservableObject {
@@ -59,6 +65,17 @@ public class ApplicationEnvironment: ObservableObject {
     }
 }
 
+extension ApplicationEnvironment {
+    /// Closes the mini app: through `composeApi` as before, else `maxApi` (Compose `maxApi.dismiss`).
+    func requestDismiss() {
+        if let composeApi {
+            composeApi.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+        } else {
+            maxApi?.dismiss(completion: nil)
+        }
+    }
+}
+
 private struct ApplicationEnvironmentKey: EnvironmentKey {
     static let defaultValue = ApplicationEnvironment()
 }

package/ios/Application/MaxApi.swift

@@ -5,14 +5,41 @@
 //  Swift mirror of the host-app bridge exposed on Kotlin as `vn.momo.maxapi.IMaxApi`
 //  (`LocalMaxApi`). `IMaxApi` itself is an external compiled dependency with no
 //  source in this repo, so this protocol intentionally exposes only the methods
-//  this kit's Kotlin source actually calls (`track`, `dismiss`, `getLanguage`) —
-//  not a full guess at IMaxApi's real surface.
+//  this kit's Kotlin source actually calls — not a full guess at IMaxApi's real surface.
+//  Callbacks carry IMaxApi's `["response": …]` payload.
 //
 
-import Foundation
+import UIKit
 
 public protocol MaxApi {
     func track(eventName: String, params: [String: Any?])
     func dismiss(completion: (() -> Void)?)
     func getLanguage(callback: @escaping ([String: Any?]?) -> Void)
+    /// `type` is the IMaxApi vibration name (`"light"`, …).
+    func triggerEventVibration(_ type: String)
+    // Toolkit (Compose `HeaderRight.Toolkit`).
+    func isFavoriteApp(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void)
+    func onToolAction(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void)
+    func showTools(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void)
+    func showHelpCenter(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void)
+    /// Back to the host home, closing every mini app.
+    func dismissAll(completion: (() -> Void)?)
+}
+
+public extension MaxApi {
+    /// Hosts that don't bridge haptics still get the system light tick.
+    func triggerEventVibration(_ type: String) {
+        UIImpactFeedbackGenerator(style: .light).impactOccurred()
+    }
+
+    // Hosts that don't bridge the toolkit keep it inert, as before these joined the protocol.
+    func isFavoriteApp(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void) {}
+    func onToolAction(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void) {}
+    func showTools(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void) {}
+    func showHelpCenter(_ params: [String: Any?], callback: @escaping ([String: Any?]?) -> Void) {}
+
+    /// Without a home to return to, closing this mini app is the closest thing.
+    func dismissAll(completion: (() -> Void)?) {
+        dismiss(completion: completion)
+    }
 }

package/ios/Avatar/Avatar.swift

@@ -74,12 +74,12 @@ public struct Avatar: View {
             .clipShape(RoundedRectangle(cornerRadius: cornerRadius))
             .overlay(
                 RoundedRectangle(cornerRadius: cornerRadius)
-                    .stroke(theme.colors.border.default, lineWidth: 1)
+                    .strokeBorder(theme.colors.border.default, lineWidth: 1)
             )
 
             // Badge icons — outside clip so they are not cut by border
             if shouldShowIconTop {
-                ImageView(LOGO_MOMO_URL)
+                ImageView(LOGO_MOMO_URL, contentMode: .fill)
                     .frame(width: badgeSizeDp, height: badgeSizeDp)
                     .clipShape(RoundedRectangle(cornerRadius: badgeCornerRadius))
                     .offset(x: 1, y: -1)
@@ -92,7 +92,7 @@ public struct Avatar: View {
             }
 
             if shouldShowIconBottom {
-                ImageView(iconSupport)
+                ImageView(iconSupport, contentMode: .fill)
                     .frame(width: badgeSizeDp, height: badgeSizeDp)
                     .clipShape(RoundedRectangle(cornerRadius: badgeCornerRadius))
                     .offset(x: 1, y: 1)
@@ -107,6 +107,7 @@ public struct Avatar: View {
         .frame(width: size.sizeDp, height: size.sizeDp)
         .accessibilityElement(children: .ignore)
         .accessibilityLabel(automationId)
+        .accessibilityIdentifier(automationId)
     }
 
     // MARK: Internal

package/ios/Badge/Badge.swift

@@ -33,7 +33,8 @@ public struct Badge: View {
     }
     
     private func formatTitle(_ text: String) -> String {
-        if isNumber(text), let number = Int(text), number > 99 {
+        // Digits too long for Int are well over 99.
+        if isNumber(text), (Int(text) ?? .max) > 99 {
             return "99+"
         }
         return text
@@ -54,14 +55,15 @@ public struct Badge: View {
     }
     
     public var body: some View {
-        MomoText(formatTitle(label), typography: .actionXxsBold, color: Colors.black01)
+        MomoText(formatTitle(label), typography: .actionXxsBold, color: Colors.black01, maxLines: 1)
             .padding(.horizontal, Spacing.XS)
-            .frame(minWidth: fontScale(16), minHeight: fontScale(16))
+            .frame(minWidth: fontScale(16))
+            .frame(height: fontScale(16))
             .background(badgeColor)
             .cornerRadius(Radius.M)
             .overlay(
                 RoundedRectangle(cornerRadius: Radius.M)
-                    .stroke(Colors.black01, lineWidth: 1)
+                    .strokeBorder(Colors.black01, lineWidth: 1)
             )
     }
 }

package/ios/Badge/BadgeDot.swift

@@ -25,7 +25,7 @@ public struct BadgeDot: View {
             .frame(width: size.size, height: size.size)
             .overlay(
                 Circle()
-                    .stroke(Colors.black01, lineWidth: 1)
+                    .strokeBorder(Colors.black01, lineWidth: 1)
             )
     }
 }

package/ios/Badge/BadgeRibbon.swift

@@ -160,7 +160,6 @@ public struct BadgeRibbon: View {
             MomoText(label, typography: .labelXsMedium, color: Colors.black01, maxLines: 1)
                 .rotationEffect(rotation)
                 .frame(height: RibbonConstants.skewBodyHeight)
-                .padding(.horizontal, 8)
                 .background(backgroundColor)
             
             rightTail

package/ios/Button/Button.swift

@@ -51,15 +51,17 @@ public extension ButtonType {
     }
 
     func contentColor(loading: Bool, theme: Theme) -> Color {
+        let color: Color
         switch self {
-        case .disabled: return theme.colors.text.disable.opacity(loading ? 0.75 : 1)
-        case .primary: return Colors.black01
-        case .secondary: return theme.colors.text.default
-        case .outline: return theme.colors.primary
-        case .tonal: return theme.colors.primary
-        case .danger: return Colors.black01
-        case .text: return theme.colors.primary
+        case .disabled: color = theme.colors.text.disable
+        case .primary: color = Colors.black01
+        case .secondary: color = theme.colors.text.default
+        case .outline: color = theme.colors.primary
+        case .tonal: color = theme.colors.primary
+        case .danger: color = Colors.black01
+        case .text: color = theme.colors.primary
         }
+        return color.opacity(loading ? 0.75 : 1)
     }
 
     var borderColor: Color? {
@@ -219,9 +221,8 @@ public struct Button: View {
         let color: Color? = useTintColor ? textColor : nil
 
         if forceLoading {
-            LottieView(name: "lottie_circle_loader", loopMode: .loop)
+            LottieView(name: "lottie_circle_loader", loopMode: .loop, tintColor: color.map { UIColor($0) })
                 .frame(width: size.iconSize, height: size.iconSize)
-                .colorMultiply(color ?? Colors.black01)
         } else if !icon.isEmpty {
             Icon(source: icon, size: size.iconSize, color: color)
         }
@@ -229,8 +230,8 @@ public struct Button: View {
 }
 
 /// Mirrors Compose's press feedback: the background shrinks via an animated
-/// horizontal inset while the content fades, rather than a plain opacity dim on
-/// the whole button (matching `animatedPadding`/`alpha` in Button.kt).
+/// horizontal inset and the whole button (background included) fades to 0.5,
+/// matching `animatedPadding`/`alpha` in Button.kt.
 private struct ButtonPressFeedbackStyle: ButtonStyle {
     let isEnabled: Bool
     let background: Color
@@ -245,7 +246,6 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
 
         configuration.label
             .modifier(HugContentOnLegacyOS(isFull: isFull))
-            .opacity(pressed ? 0.5 : 1)
             .background(
                 RoundedRectangle(cornerRadius: radius)
                     .fill(background)
@@ -257,6 +257,9 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
             )
             .frame(height: height)
             .clipShape(RoundedRectangle(cornerRadius: radius))
+            // `.text` has a clear background, which SwiftUI does not hit-test.
+            .contentShape(RoundedRectangle(cornerRadius: radius))
+            .opacity(pressed ? 0.5 : 1)
             .animation(.easeInOut(duration: 0.1), value: pressed)
     }
 }

package/ios/CalculatorKeyboard/CalculatorKeyboard.swift

@@ -16,55 +16,101 @@ extension String {
 public struct CalculatorKeyboard: View {
     // MARK: Lifecycle
     @Binding var value: String
-    @State var tempValue: String = ""
     
     public init(_ value: Binding<String>) {
         self._value = value
     }
+
+    // Derived from `value` so a host write to the binding (prefill, reset after submit) is honoured.
+    private var expression: String {
+        value.replacingOccurrences(of: "x", with: "*").replacingOccurrences(of: "÷", with: "/")
+    }
     
     func onPressBack(){
         if (value.count > 0 ){
             value.removeLast()
         }
-        
     }
     
     func onPressClear(key: String){
         value = ""
-        tempValue = ""
     }
     
     func onPressEqual(key: String){
-        if (tempValue == "") {
+        var expression = self.expression
+        if (expression == "") {
             return
         }
-        if (tempValue.last?.isNumber == false){
-            tempValue.removeLast()
+        if (expression.last?.isNumber == false){
+            expression.removeLast()
         }
-        let expression = NSExpression(format: tempValue)
-        
-        value = String(expression.expressionValue(with: nil, context: nil) as! Int)
-        if (Int(value) ?? 0 < 0){
+        // Overflow and division by zero are treated like a negative result: cleared.
+        if let result = Self.evaluate(expression), result >= 0 {
+            value = String(result)
+        } else {
             value = ""
         }
     }
+
+    /// Integer `+ - * /` with the usual precedence, as NSExpression did, but nil instead of a
+    /// crash when a number or result leaves `Int` range.
+    static func evaluate(_ expression: String) -> Int? {
+        var numbers: [Int] = []
+        var operators: [Character] = []
+        var digits = ""
+        for char in expression {
+            if ("0"..."9").contains(char) {
+                digits.append(char)
+                continue
+            }
+            guard let number = Int(digits) else { return nil }
+            numbers.append(number)
+            operators.append(char)
+            digits = ""
+        }
+        guard let last = Int(digits) else { return nil }
+        numbers.append(last)
+
+        var terms = [numbers[0]]
+        var signs: [Character] = []
+        for (op, number) in zip(operators, numbers.dropFirst()) {
+            switch op {
+            case "*":
+                let (product, overflow) = terms[terms.count - 1].multipliedReportingOverflow(by: number)
+                if overflow { return nil }
+                terms[terms.count - 1] = product
+            case "/":
+                guard number != 0 else { return nil }
+                terms[terms.count - 1] /= number
+            case "+", "-":
+                terms.append(number)
+                signs.append(op)
+            default:
+                return nil
+            }
+        }
+
+        var result = terms[0]
+        for (sign, term) in zip(signs, terms.dropFirst()) {
+            let (next, overflow) = sign == "+"
+                ? result.addingReportingOverflow(term)
+                : result.subtractingReportingOverflow(term)
+            if overflow { return nil }
+            result = next
+        }
+        return result
+    }
     
     func onPressKey(key:String){
-        if (tempValue.last?.isNumber == false){
+        if (value.last?.isNumber == false){
             if (key.isNumber == false){
                 return
             }
         }
-        var convertedKey = key
-        if (key == "x") {convertedKey = "*"}
-        if (key == "÷") {convertedKey = "/"}
         if (value == "" && (key == "0" || key == "000" || key.isNumber == false)) {
             return
         }
-        else {
-            value.append(key)
-            tempValue.append(convertedKey)
-        }
+        value.append(key)
     }
     
     // MARK: Public

package/ios/Carousel/Carousel.swift

@@ -1,4 +1,3 @@
-import Combine
 import SwiftUI
 
 /// Native SwiftUI port of the Compose `Carousel` component.
@@ -10,9 +9,9 @@ import SwiftUI
 /// snap behavior, and scroll enable/disable. Snap / scroll-index callbacks
 /// report the real item index.
 ///
-/// Available iOS 14+ (uses a custom paging ScrollView so behavior is identical
+/// Uses a custom drag-driven pager (not a ScrollView) so behavior is identical
 /// across versions and supports the loop virtualization + transform effects
-/// that `TabView(.page)` cannot express).
+/// that `TabView(.page)` cannot express.
 public struct Carousel<Content: View>: View {
     // MARK: Lifecycle
 
@@ -82,7 +81,7 @@ public struct Carousel<Content: View>: View {
     @State private var currentPage: Int
     @State private var dragOffset: CGFloat = 0
     @State private var isDragging: Bool = false
-    @State private var autoplayTick: Int = 0
+    @GestureState private var dragActive = false
 
     private func realIndex(_ page: Int) -> Int {
         ((page % itemCount) + itemCount) % itemCount
@@ -124,9 +123,20 @@ public struct Carousel<Content: View>: View {
         }
         .frame(width: viewportWidth)
         .clipped()
-        .onReceive(autoplayTimer) { _ in
-            guard autoplay, itemCount > 1, !isDragging else { return }
-            advance()
+        // Restarts on drag like Compose's LaunchedEffect(autoplayInterval, isUserScrolling).
+        .task(id: AutoplayKey(enabled: autoplay && itemCount > 1 && !isDragging, interval: autoplayInterval)) { @MainActor in
+            guard autoplay, itemCount > 1, !isDragging, autoplayInterval > 0 else { return }
+            while !Task.isCancelled {
+                try? await Task.sleep(nanoseconds: UInt64(autoplayInterval * 1_000_000_000))
+                guard !Task.isCancelled else { return }
+                advance()
+            }
+        }
+        // A drag stolen by a parent scroll view never reaches `onEnded`; settle on the current page.
+        .onChange(of: dragActive) { active in
+            guard !active, isDragging else { return }
+            isDragging = false
+            withAnimation(.easeInOut(duration: 0.25)) { dragOffset = 0 }
         }
     }
 
@@ -147,9 +157,14 @@ public struct Carousel<Content: View>: View {
 
     private func dragGesture(step: CGFloat) -> some Gesture {
         DragGesture(minimumDistance: 5)
+            .updating($dragActive) { _, active, _ in active = true }
             .onChanged { value in
                 isDragging = true
-                dragOffset = value.translation.width
+                var offset = value.translation.width
+                // No slide exists past either end, as with HorizontalPager bounds.
+                if currentPage == 0 { offset = min(offset, 0) }
+                if currentPage == virtualPageCount - 1 { offset = max(offset, 0) }
+                dragOffset = offset
             }
             .onEnded { value in
                 isDragging = false
@@ -167,7 +182,8 @@ public struct Carousel<Content: View>: View {
                     let moved = step > 0 ? Int((-dragOffset / step).rounded()) : 0
                     target = min(max(currentPage + moved, 0), virtualPageCount - 1)
                 }
-                dragOffset = 0
+                // Animated so a drag that stays on the same page eases back too.
+                withAnimation(.easeInOut(duration: 0.25)) { dragOffset = 0 }
                 setPage(target)
             }
     }
@@ -189,8 +205,9 @@ public struct Carousel<Content: View>: View {
             onScrollIndexChanged(real)
         }
     }
+}
 
-    private var autoplayTimer: Publishers.Autoconnect<Timer.TimerPublisher> {
-        Timer.publish(every: autoplayInterval, on: .main, in: .common).autoconnect()
-    }
+private struct AutoplayKey: Equatable {
+    let enabled: Bool
+    let interval: TimeInterval
 }

package/ios/Checkbox/Checkbox.swift

@@ -21,8 +21,10 @@ public struct Checkbox: View{
     }
 
     func onCheck(){
-        checked.toggle()
-        onChange?(checked)
+        // Not re-read from the binding: a `.constant` / one-way binding would report the stale value.
+        let newValue = !checked
+        checked = newValue
+        onChange?(newValue)
     }
 
     public var body: some View {
@@ -35,13 +37,15 @@ public struct Checkbox: View{
                         .frame(width: 20, height: 20)
                         .overlay(
                             RoundedRectangle(cornerRadius: Radius.XS)
-                                .stroke(borderColor, lineWidth: Spacing.XXS)
+                                .strokeBorder(borderColor, lineWidth: Spacing.XXS)
                         )
 
                     if checked {
                         Icon(source: indeterminate ? "navigation_minus" : "ic_checked", size: 20, color: Colors.black01)
                     }
                 }
+                // The unchecked fill is clear, which SwiftUI does not hit-test.
+                .contentShape(RoundedRectangle(cornerRadius: Radius.XS))
             }
             .buttonStyle(ActiveOpacityButtonStyle(activeOpacity: 0.8))
             .disabled(disabled)

package/ios/Chip/Chip.swift

@@ -89,18 +89,19 @@ public struct Chip: View {
             .padding(.horizontal, horizontal)
             .frame(height: height)
             .background(
-                RoundedRectangle(cornerRadius: radius, style: .continuous)
+                RoundedRectangle(cornerRadius: radius)
                     .fill(bg)
             )
             .overlay(
                 Group {
                     if selected {
-                        RoundedRectangle(cornerRadius: radius, style: .continuous)
-                            .stroke(theme.colors.secondary, lineWidth: 2)
+                        // Inside the bounds, like Compose `border`.
+                        RoundedRectangle(cornerRadius: radius)
+                            .strokeBorder(theme.colors.secondary, lineWidth: 2)
                     }
                 }
             )
-            .contentShape(RoundedRectangle(cornerRadius: radius, style: .continuous))
+            .contentShape(RoundedRectangle(cornerRadius: radius))
         }
         .buttonStyle(ActiveOpacityButtonStyle())
         .modifier(ChipAccessibilityModifier(accessibilityLabel: accessibilityLabel))