@momo-kits/native-kits 0.167.1-duo.3-debug → 0.167.1-duo.4

package/ios/Image/Image.swift

@@ -41,11 +41,7 @@ public struct ImageView: View {
             .placeholder {
                 VStack(alignment: .center, content: {
                     if error {
-                        Image("media_fail")
-                            .resizable()
-                            .renderingMode(.template)
-                            .foregroundColor(theme.colors.text.disable)
-                            .frame(width: 24, height: 24)
+                        ImageErrorIcon(color: theme.colors.text.disable)
                     } else if placeholder != nil {
                         placeholder
                     }
@@ -74,6 +70,21 @@ public struct ImageView: View {
     var url: String
 }
 
+// A bare WebImage on purpose: going through `Icon` nests another `ImageView`, whose own
+// failure would render this placeholder again, without end while offline.
+private struct ImageErrorIcon: View {
+    let color: Color
+
+    var body: some View {
+        WebImage(url: URL(string: iconSources["media_fail"] ?? ""))
+            .resizable()
+            .renderingMode(.template)
+            .scaledToFit()
+            .foregroundColor(color)
+            .frame(width: 24, height: 24)
+    }
+}
+
 private struct ColorMultiplyModifier: ViewModifier {
     let color: Color?
 

package/ios/Lottie/LottieView.swift

@@ -36,7 +36,8 @@ struct LottieView: UIViewRepresentable {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
       } else {
-        LottieAnimation.loadedFrom(url: URL(string: url)!, closure: { animation in
+        guard let animationURL = URL(string: url) else { return view }
+        LottieAnimation.loadedFrom(url: animationURL, closure: { animation in
           if let animation = animation {
             Self.animationCache.setObject(animation, forKey: url as NSString)
             animationView.animation = animation
@@ -49,7 +50,8 @@ struct LottieView: UIViewRepresentable {
       if let cachedAnimation = Self.animationCache.object(forKey: name as NSString) {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
-      } else if let animation = LottieAnimation.named(name) {
+      } else if let animation = LottieAnimation.named(name, bundle: MoMoUIKitsResources.bundle)
+                  ?? LottieAnimation.named(name) {
         Self.animationCache.setObject(animation, forKey: name as NSString)
         animationView.animation = animation
         setupAnimationView(animationView, view)

package/ios/Popup/PopupDisplay.swift

@@ -55,7 +55,6 @@ extension View {
 
 public struct PopupDisplay: View {
     @Environment(\.localize) private var localize
-    @Environment(\.screenLayout) private var layout
 
     // MARK: Lifecycle
 
@@ -92,7 +91,6 @@ public struct PopupDisplay: View {
 
     @State private var textHeight: CGFloat = .zero
     @State private var isScrollable = false
-    @State private var actionsHeight: CGFloat = 0
     
     public var body: some View {
         var shouldUseColumn: Bool {
@@ -116,103 +114,89 @@ public struct PopupDisplay: View {
                 }
                 
                 VStack(spacing: 0) {
-                    // scrolls when iPhone Duo landscape is too short; actions stay visible
-                    PopupScrollBody(maxHeight: layout.popupMaxHeight.map { $0 - actionsHeight }) {
-                        VStack(spacing: 0) {
-                            if(!url.isEmpty) {
-                                WebImage(url: URL(string: url), isAnimating: .constant(true))
-                                    .resizable()
-                                    .placeholder {
-                                        Rectangle()
-                                            .fill(Color.gray.opacity(0.3))
-                                            .aspectRatio(1.777, contentMode: .fit)
-                                            .frame(maxWidth: .infinity, maxHeight: 184)
-                                    }
+                    if(!url.isEmpty) {
+                        WebImage(url: URL(string: url), isAnimating: .constant(true))
+                            .resizable()
+                            .placeholder {
+                                Rectangle()
+                                    .fill(Color.gray.opacity(0.3))
                                     .aspectRatio(1.777, contentMode: .fit)
-                                    .frame(maxWidth: .infinity, alignment: .center)
-                                    .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
-                                    .clipped()
+                                    .frame(maxWidth: .infinity, maxHeight: 184)
                             }
-                            VStack(alignment: .leading, spacing: 0) {
-                                MomoText(title, typography: .headerDefaultBold)
-                                    .padding(.top, 24)
-                                    .padding(.bottom, 8)
-                                    .lineLimit(2)
-                                    .accessibility(identifier: "title_popup_permission")
-                        
-                                Group {
-                                    if isScrollable {
-                                        ScrollView(showsIndicators: false) {
-                                            MomoText(description, typography: .bodyDefaultRegular)
-                                                .multilineTextAlignment(.leading)
-                                                .background(GeometryReader { geo in
-                                                    Color.clear.onAppear { textHeight = geo.size.height }
-                                                })
-                                                .measureLineHeights(font: .body_default_regular,
-                                                                    oneLine: $oneLineH,
-                                                                    twoLines: $twoLineH)
-                                                .accessibility(identifier: "description_popup_permission")
-                                        }
-                                        // Cap the visible height to ~8.5 lines
-                                        .frame(height: min(maxHeight8_5, textHeight))
-                                    } else {
-                                        MomoText(description, typography: .bodyDefaultRegular)
-                                            .multilineTextAlignment(.leading)
-                                            .background(GeometryReader { geo in
-                                                Color.clear.onAppear {
-                                                    textHeight = geo.size.height
-                                                    // Trigger scroll at ~8.5 lines
-                                                    isScrollable = textHeight > maxHeight8_5
-                                                }
-                                            })
-                                            .measureLineHeights(font: .body_default_regular,
-                                                                oneLine: $oneLineH,
-                                                                twoLines: $twoLineH)
-                                            .accessibility(identifier: "description_popup_permission")
-                                    }
-                                }
-                                .padding(.bottom, 8)
+                            .aspectRatio(1.777, contentMode: .fit)
+                            .frame(maxWidth: .infinity, alignment: .center)
+                            .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
+                            .clipped()
+                    }
+                    VStack(alignment: .leading, spacing: 0) {
+                        MomoText(title, typography: .headerDefaultBold)
+                            .padding(.top, 24)
+                            .padding(.bottom, 8)
+                            .lineLimit(2)
+                            .accessibility(identifier: "title_popup_permission")
                         
-                                if(!errorCode.isEmpty) {
-                                    MomoText(localize.translate("errorCode") + errorCode, typography: .descriptionXsRegular, color: Colors.black12)
-                                        .lineLimit(1)
-                                        .padding(.bottom, 8)
+                        Group {
+                            if isScrollable {
+                                ScrollView(showsIndicators: false) {
+                                    MomoText(description, typography: .bodyDefaultRegular)
+                                        .multilineTextAlignment(.leading)
+                                        .background(GeometryReader { geo in
+                                            Color.clear.onAppear { textHeight = geo.size.height }
+                                        })
+                                        .measureLineHeights(font: .body_default_regular,
+                                                            oneLine: $oneLineH,
+                                                            twoLines: $twoLineH)
+                                        .accessibility(identifier: "description_popup_permission")
                                 }
+                                // Cap the visible height to ~8.5 lines
+                                .frame(height: min(maxHeight8_5, textHeight))
+                            } else {
+                                MomoText(description, typography: .bodyDefaultRegular)
+                                    .multilineTextAlignment(.leading)
+                                    .background(GeometryReader { geo in
+                                        Color.clear.onAppear {
+                                            textHeight = geo.size.height
+                                            // Trigger scroll at ~8.5 lines
+                                            isScrollable = textHeight > maxHeight8_5
+                                        }
+                                    })
+                                    .measureLineHeights(font: .body_default_regular,
+                                                        oneLine: $oneLineH,
+                                                        twoLines: $twoLineH)
+                                    .accessibility(identifier: "description_popup_permission")
                             }
-                            .frame(maxWidth: .infinity, alignment: .leading)
-                            .padding(.horizontal, 24)
-                            .padding(.bottom, 16)
+                        }
+                        .padding(.bottom, 8)
+                        
+                        if(!errorCode.isEmpty) {
+                            MomoText(localize.translate("errorCode") + errorCode, typography: .descriptionXsRegular, color: Colors.black12)
+                                .lineLimit(1)
+                                .padding(.bottom, 8)
                         }
                     }
-
-                    Group {
-                        if shouldUseColumn {
-                            if buttonType == .text {
-                                ColumnTextButtons
-                            } else {
-                                ColumnButtons
-                            }
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(.horizontal, 24)
+                    .padding(.bottom, 16)
+                    
+                    if shouldUseColumn {
+                        if buttonType == .text {
+                            ColumnTextButtons
                         } else {
-                            if buttonType == .text {
-                                RowTextButtons
-                            } else {
-                                RowButtons
-                            }
+                            ColumnButtons
                         }
-                    }
-                    .background(
-                        GeometryReader { proxy in
-                            Color.clear
-                                .onAppear { actionsHeight = proxy.size.height }
-                                .onChange(of: proxy.size.height) { actionsHeight = $0 }
+                    } else {
+                        if buttonType == .text {
+                            RowTextButtons
+                        } else {
+                            RowButtons
                         }
-                    )
+                    }
                 }
                 .fixedSize(horizontal: false, vertical: true)
             }
         }
             .background(Color.white.cornerRadius(15))
-            .frame(maxWidth: layout.popupMaxWidth)
+            .frame(maxWidth: popupMaxWidth - 24)
             .padding(.horizontal, 12)
             .accessibilityElement(children: .ignore)
             .accessibility(identifier: "popup_notify")

package/ios/Popup/PopupNotify.swift

@@ -3,6 +3,12 @@ import SwiftUI
 
 public typealias PopupActionDirection = PopupButtonDirection
 
+// Portrait width in landscape too, so aspect-ratio images don't push popups past the screen height.
+var popupMaxWidth: CGFloat {
+    let size = UIScreen.main.bounds.size
+    return min(size.width, size.height)
+}
+
 public struct PopupNotifyProps {
     public var image: String
     public var title: String
@@ -40,12 +46,10 @@ public struct PopupNotifyProps {
 public struct PopupNotify: View {
     @Environment(\.localize) private var localize
     @Environment(\.momoFontScale) private var fontScale
-    @Environment(\.screenLayout) private var layout
 
     public let props: PopupNotifyProps
 
     @State private var descriptionHeight: CGFloat = 0
-    @State private var actionsHeight: CGFloat = 0
 
     private var errorCodePrefix: String {
         localize.translate("errorCode")
@@ -73,26 +77,37 @@ public struct PopupNotify: View {
     public var body: some View {
         ZStack(alignment: .topTrailing) {
             VStack(spacing: 0) {
-                // scrolls when iPhone Duo landscape is too short; actions stay visible
-                PopupScrollBody(maxHeight: layout.popupMaxHeight.map { $0 - actionsHeight }) {
-                    VStack(spacing: 0) {
-                        if !props.image.isEmpty {
-                            popupImage
-                        }
-                        textContent
+                if !props.image.isEmpty {
+                    popupImage
+                }
+
+                VStack(alignment: .leading, spacing: 0) {
+                    MomoText(
+                        props.title,
+                        typography: .headerDefaultBold,
+                        maxLines: 2,
+                        accessibilityId: "title_popup_permission"
+                    )
+                    .padding(.bottom, Spacing.S)
+
+                    descriptionContent
+
+                    if !props.error.isEmpty {
+                        MomoText(
+                            errorCodePrefix + props.error,
+                            typography: .descriptionXsRegular,
+                            color: Colors.black12,
+                            maxLines: 1
+                        )
+                        .padding(.top, Spacing.S)
                     }
                 }
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(Spacing.XL)
 
                 actionButtons
                     .padding(.horizontal, Spacing.XL)
                     .padding(.bottom, Spacing.XL)
-                    .background(
-                        GeometryReader { proxy in
-                            Color.clear
-                                .onAppear { actionsHeight = proxy.size.height }
-                                .onChange(of: proxy.size.height) { actionsHeight = $0 }
-                        }
-                    )
             }
             .background(Colors.black01)
             .clipShape(RoundedRectangle(cornerRadius: Radius.L))
@@ -102,38 +117,12 @@ public struct PopupNotify: View {
                     .offset(x: 11, y: -11)
             }
         }
-        .frame(maxWidth: layout.popupMaxWidth)
+        .frame(maxWidth: popupMaxWidth - Spacing.M * 2)
         .padding(.horizontal, Spacing.M)
         .accessibilityElement(children: .ignore)
         .accessibilityIdentifier("popup_notify")
     }
 
-    private var textContent: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            MomoText(
-                props.title,
-                typography: .headerDefaultBold,
-                maxLines: 2,
-                accessibilityId: "title_popup_permission"
-            )
-            .padding(.bottom, Spacing.S)
-
-            descriptionContent
-
-            if !props.error.isEmpty {
-                MomoText(
-                    errorCodePrefix + props.error,
-                    typography: .descriptionXsRegular,
-                    color: Colors.black12,
-                    maxLines: 1
-                )
-                .padding(.top, Spacing.S)
-            }
-        }
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .padding(Spacing.XL)
-    }
-
     private var popupImage: some View {
         WebImage(url: URL(string: props.image), isAnimating: .constant(true))
             .resizable()

package/ios/Popup/PopupPromotion.swift

@@ -3,7 +3,6 @@ import SDWebImageSwiftUI
 
 public struct PopupPromotion: View {
     @Environment(\.appTheme) private var theme
-    @Environment(\.screenLayout) private var layout
 
     var imageUrl: String
     var onIconClose: (() -> Void)?
@@ -20,33 +19,22 @@ public struct PopupPromotion: View {
         self.onAction = onAction
     }
 
-    private static let aspectRatio: CGFloat = 0.72
-    // close button row under the image: stack spacing + padded 40pt button
-    private static let closeRowHeight: CGFloat = 8 + 40 + Spacing.S * 2
-
-    // fit the portrait image by height when iPhone Duo leaves too little room
-    private var imageWidth: CGFloat {
-        let width = min(layout.width - Spacing.XL * 2, layout.popupMaxWidth)
-        guard let maxHeight = layout.popupMaxHeight else { return width }
-        return min(width, (maxHeight - Self.closeRowHeight) * Self.aspectRatio)
-    }
-
     public var body: some View {
         VStack(spacing: 8) {
             if(imageUrl.isEmpty) {
-                Icon(source: "media_fail", size: imageWidth)
+                Icon(source: "media_fail", size: popupMaxWidth - Spacing.XL * 2)
             }
             else {
-                WebImage(url: URL(string: imageUrl)!)
+                WebImage(url: URL(string: imageUrl))
                     .resizable()
                     .placeholder {
                         Color.gray
-                            .aspectRatio(Self.aspectRatio, contentMode: .fit)
-                            .frame(maxWidth: imageWidth)
+                            .aspectRatio(0.72, contentMode: .fit)
+                            .frame(maxWidth: popupMaxWidth - Spacing.XL * 2)
                             .clipped()
                     }
-                    .aspectRatio(Self.aspectRatio, contentMode: .fit)
-                    .frame(maxWidth: imageWidth, alignment: .center)
+                    .aspectRatio(0.72, contentMode: .fit)
+                    .frame(maxWidth: popupMaxWidth - Spacing.XL * 2, alignment: .center)
                     .clipped()
                     .onTapGesture {
                         onAction?()