@momo-kits/native-kits 0.300.3 → 0.300.4-debug

package/publish.sh

@@ -379,6 +379,10 @@ phase_publish_npm() {
         exit 1
     fi
 
+    if [ -e gradle.properties.npm-backup ]; then
+        echo "❌ Error: gradle.properties.npm-backup already exists; recover it before publishing."
+        exit 1
+    fi
     echo "🔧 Preparing debug version with compose kits..."
 
     # Create debug version
@@ -389,6 +393,7 @@ phase_publish_npm() {
     restore_npm_workspace() {
         [ -f .npmignore.backup ] && mv .npmignore.backup .npmignore
         [ -f compose/build.gradle.kts.backup ] && mv compose/build.gradle.kts.backup compose/build.gradle.kts
+        [ -f gradle.properties.npm-backup ] && mv gradle.properties.npm-backup gradle.properties
         local pkg_version
         pkg_version=$(node -p "require('./package.json').version")
         if [ "$pkg_version" != "$VERSION" ]; then
@@ -400,6 +405,14 @@ phase_publish_npm() {
         fi
     }
     trap restore_npm_workspace EXIT
+    cp gradle.properties gradle.properties.npm-backup
+    node <<'NODE'
+const fs = require('fs');
+const path = 'gradle.properties';
+const sanitized = fs.readFileSync(path, 'utf8')
+    .replace(/^(gitlab\.(?:user|password)\s*=).*$/gm, '$1');
+fs.writeFileSync(path, sanitized);
+NODE
     echo "📦 Debug version: $DEBUG_VERSION"
 
     # Get current version from package.json (in case it's different from $VERSION)
@@ -436,12 +449,14 @@ phase_publish_npm() {
     echo "🔧 Modifying android configuration for debug version..."
     if [[ "$OSTYPE" == "darwin"* ]]; then
         sed -i '' 's/namespace = "\$gitlabGroup\.\$gitlabArtifactId"/namespace = "vn.momo.kits.kits"/' compose/build.gradle.kts
-        sed -i '' 's/compileSdk = libs\.versions\.android\.compileSdk\.get()\.toInt()/compileSdk = 35/' compose/build.gradle.kts
+        sed -i '' \
+            's/compileSdk = libs\.versions\.android\.compileSdk\.get()\.toInt()/compileSdk = 36/' compose/build.gradle.kts
         sed -i '' 's/minSdk = libs\.versions\.android\.minSdk\.get()\.toInt()/minSdk = 24/' compose/build.gradle.kts
         sed -i '' "s/version = gitlabVersion/version = \"$DEBUG_VERSION\"/" compose/build.gradle.kts
     else
         sed -i 's/namespace = "\$gitlabGroup\.\$gitlabArtifactId"/namespace = "vn.momo.kits.kits"/' compose/build.gradle.kts
-        sed -i 's/compileSdk = libs\.versions\.android\.compileSdk\.get()\.toInt()/compileSdk = 35/' compose/build.gradle.kts
+        sed -i \
+            's/compileSdk = libs\.versions\.android\.compileSdk\.get()\.toInt()/compileSdk = 36/' compose/build.gradle.kts
         sed -i 's/minSdk = libs\.versions\.android\.minSdk\.get()\.toInt()/minSdk = 24/' compose/build.gradle.kts
         sed -i "s/version = gitlabVersion/version = \"$DEBUG_VERSION\"/" compose/build.gradle.kts
     fi
@@ -463,6 +478,7 @@ build/
 .gitattributes
 .gitlab-ci.yml
 .npmignore.backup
+gradle.properties.npm-backup
 EOF
 
     echo "📤 Publishing debug version (with compose)..."
@@ -477,6 +493,7 @@ EOF
     # Restore compose/build.gradle.kts
     mv compose/build.gradle.kts.backup compose/build.gradle.kts
     echo "✅ compose/build.gradle.kts restored"
+    mv gradle.properties.npm-backup gradle.properties
 
     # Restore package.json version to original
     # Verify current version is debug version before restoring

package/scripts/gen-ios-icons.mjs

@@ -0,0 +1,36 @@
+// Generates ios/Icon/Icons.swift from the Compose icon map so both kits ship the same
+// compiled-in icons. Run from anywhere: `node scripts/gen-ios-icons.mjs`.
+import { readFileSync, writeFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+
+const root = join(dirname(fileURLToPath(import.meta.url)), "..");
+const source = join(root, "compose/src/commonMain/kotlin/vn/momo/kits/utils/Icons.kt");
+const target = join(root, "ios/Icon/Icons.swift");
+
+const kotlin = readFileSync(source, "utf8");
+const kotlinString = String.raw`"((?:[^"\\]|\\.)*)"`;
+const unescapeKotlin = (s) => s.replace(/\\(["\\$])/g, "$1");
+const swiftString = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+
+const icons = [...kotlin.matchAll(new RegExp(`^\\s*${kotlinString} to ${kotlinString}`, "gm"))]
+  .map(([, key, url]) => [unescapeKotlin(key), unescapeKotlin(url)]);
+const noThemeBlock = kotlin.match(/val noThemeIcons = listOf\(([^)]*)\)/);
+const noTheme = noThemeBlock
+  ? [...noThemeBlock[1].matchAll(new RegExp(kotlinString, "g"))].map(([, s]) => unescapeKotlin(s))
+  : [];
+
+if (icons.length === 0) throw new Error(`No icons parsed from ${source}`);
+if (new Set(icons.map(([key]) => key)).size !== icons.length) throw new Error("Duplicate icon keys");
+
+const swift = `// Generated by scripts/gen-ios-icons.mjs from compose/.../utils/Icons.kt. Do not edit by hand.
+
+let kitIcons: [String: String] = [
+${icons.map(([key, url]) => `    ${swiftString(key)}: ${swiftString(url)},`).join("\n")}
+]
+
+let noThemeIcons: [String] = [${noTheme.map(swiftString).join(", ")}]
+`;
+
+writeFileSync(target, swift);
+console.log(`Wrote ${icons.length} icons (${noTheme.length} untinted) to ${target}`);

package/settings.gradle.kts

@@ -0,0 +1,64 @@
+import org.gradle.kotlin.dsl.maven
+
+rootProject.name = "momo-native-kits"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        }
+        maven {
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {
+                username = "download_packages";
+                password = "gldt-bjDqLpU_sPcHDuXau2ws"
+            }
+        }
+        maven {
+            url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+            credentials {
+                username = "viewer"
+                password = "viewer"
+            }
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+include(":compose")
+
+include(":sample:androidApp")
+include(":sample:shared")

package/ios/Application/Components.swift

@@ -1,270 +0,0 @@
-//
-//  Components.swift
-//  Pods
-//
-//  Created by sophia on 24/1/25.
-//
-
-import SwiftUI
-
-// MARK: - Enums
-
-public enum TitlePosition {
-    case left, center
-}
-
-public enum HeaderType {
-    case `default`, extended, none
-}
-
-public enum AnimatedHeaderRatio {
-    case ratio16_9
-    case ratio1_1
-    case ratio3_2
-
-    var value: CGFloat {
-        switch self {
-        case .ratio16_9: return 16.0 / 9.0
-        case .ratio1_1:  return 1.0
-        case .ratio3_2:  return 3.0 / 2.0
-        }
-    }
-}
-
-
-// MARK: - Animated Header Config
-
-public struct AnimatedHeader {
-    public var aspectRatio: AnimatedHeaderRatio = .ratio16_9
-    public var isSurface: Bool = true
-    public var composable: (_ scrollState: CGFloat) -> AnyView = { _ in AnyView(EmptyView()) }
-
-    public init(
-        aspectRatio: AnimatedHeaderRatio = .ratio16_9,
-        isSurface: Bool = true,
-        composable: @escaping (_ scrollState: CGFloat) -> AnyView = { _ in AnyView(EmptyView()) }
-    ) {
-        self.aspectRatio = aspectRatio
-        self.isSurface = isSurface
-        self.composable = composable
-    }
-}
-
-// MARK: - Utils
-
-func safeAreaTopInset() -> CGFloat {
-    if #available(iOS 15.0, *) {
-        return UIApplication.shared.connectedScenes
-            .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.top }
-            .first ?? 0
-    } else {
-        return UIApplication.shared.connectedScenes
-            .compactMap { ($0 as? UIWindowScene)?.windows.first?.safeAreaInsets.top }
-            .first ?? 0
-    }
-}
-
-// MARK: - Header Background
-
-public struct HeaderBackground: View {
-    var headerType: HeaderType = .default
-    var scrollState: CGFloat
-    var headerTransparent: Bool = false
-    var fullScreenContent: Bool = false
-
-    public init(
-        headerType: HeaderType = .default,
-        scrollState: CGFloat = 0,
-        headerTransparent: Bool = false,
-        fullScreenContent: Bool = false
-    ) {
-        self.headerType = headerType
-        self.scrollState = scrollState
-        self.headerTransparent = headerTransparent
-        self.fullScreenContent = fullScreenContent
-    }
-
-    public var body: some View {
-        let statusBarHeight = safeAreaTopInset()
-        let opacity = max(0, 1 - scrollState / 200)
-        let height = fullScreenContent ? 0 :  statusBarHeight + 52
-        let backgroundColor = headerTransparent ? Color.clear : Colors.black01
-
-        Group {
-            switch headerType {
-            case .default:
-                ZStack(alignment: .bottom) {
-                    Rectangle()
-                        .fill(backgroundColor)
-                        .opacity(headerTransparent ? 0 : opacity)
-                        .frame(height: height)
-                        .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
-                        .background(backgroundColor)
-                        .overlay(
-                            headerTransparent ? AnyView(EmptyView()) :
-                            AnyView(
-                                Rectangle()
-                                    .fill(LinearGradient(
-                                        gradient: Gradient(colors: [
-                                            Color(red: 1, green: 0.8, blue: 0.87),
-                                            Color(red: 1, green: 0.8, blue: 0.87).opacity(0.5)
-                                        ]),
-                                        startPoint: .top,
-                                        endPoint: .bottom))
-                                    .opacity(opacity)
-                                    .frame(height: height))
-                        )
-                    if !headerTransparent {
-                        Rectangle()
-                            .fill(Color.black.opacity(0.1))
-                            .frame(height: 1)
-                            .frame(maxWidth: .infinity)
-                    }
-                }
-
-            case .extended:
-                ZStack {
-                    if !headerTransparent {
-                        Colors.black01
-                        LinearGradient(
-                            gradient: Gradient(colors: [
-                                Color(red: 1, green: 0.8, blue: 0.87),
-                                Color(red: 1, green: 0.8, blue: 0.87).opacity(0)
-                            ]),
-                            startPoint: .top,
-                            endPoint: .bottom
-                        )
-                        .opacity(opacity)
-                        .frame(height: 154)
-                    }
-                }
-
-            case .none:
-                EmptyView()
-            }
-        }
-    }
-}
-
-// MARK: - Bottom-tab root preference
-
-/// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
-/// it's hosting a self-contained bottom-tab surface and skip its own bottom
-/// safe-area reservation — mirrors Compose's `Navigation.markAsBottomTabRoot()`
-/// (`navigation.isBottomTabRoot`, read by `StackScreen.kt`'s `MainContent`).
-/// Without this, `BottomTab`'s own internal safe-area handling gets an extra,
-/// unwanted inset stacked on top of it by the outer `StackScreen`, pushing the
-/// tab bar up higher than the true bottom inset.
-public struct IsBottomTabRootKey: PreferenceKey {
-    public static var defaultValue: Bool = false
-    public static func reduce(value: inout Bool, nextValue: () -> Bool) {
-        value = value || nextValue()
-    }
-}
-
-// MARK: - Header View
-
-public struct Header: View {
-    var headerType: HeaderType = .default
-    var titlePosition: TitlePosition
-    var title: String
-    /// Optional rich title (mirrors Compose's `HeaderTitle`); `.user` renders an
-    /// avatar group instead of `title`. Defaults to nil → plain `title` text.
-    var headerTitle: HeaderTitle?
-    var headerRight:  (()->any View)? = {HeaderRight()}
-    var goBack: (() -> Void)?
-    var opacity: CGFloat = 1
-    var animatedHeader: AnimatedHeader?
-    var scrollState: CGFloat = 0
-    var inputSearchProps: InputSearchProps?
-    var tintColor: Color?
-    /// Title opacity; used by the animated search header to fade the title out on scroll.
-    var titleOpacity: CGFloat = 1
-
-    public init(
-        headerType: HeaderType = .default,
-        titlePosition: TitlePosition,
-        title: String,
-        headerTitle: HeaderTitle? = nil,
-        headerRight:  (()->any View)? = {HeaderRight()},
-        goBack: (() -> Void)? = nil,
-        opacity: CGFloat = 1,
-        animatedHeader: AnimatedHeader? = nil,
-        scrollState: CGFloat = 0,
-        inputSearchProps: InputSearchProps? = nil,
-        tintColor: Color? = nil,
-        titleOpacity: CGFloat = 1
-    ) {
-        self.headerType = headerType
-        self.titlePosition = titlePosition
-        self.title = title
-        self.headerTitle = headerTitle
-        self.headerRight = headerRight
-        self.goBack = goBack
-        self.opacity = opacity
-        self.animatedHeader = animatedHeader
-        self.scrollState = scrollState
-        self.inputSearchProps = inputSearchProps
-        self.tintColor = tintColor
-        self.titleOpacity = titleOpacity
-    }
-
-    public var body: some View {
-
-        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
-        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
-
-        if headerType != .none {
-            VStack(spacing: 0) {
-                ZStack {
-                    // MARK: - Left and Right Controls
-                    HStack {
-                        if let goBack = goBack {
-                            SwiftUI.Button(action: goBack) {
-                                Circle()
-                                    .stroke(borderColor, lineWidth: 0.2)
-                                    .background(Circle().fill(backgroundButtonColor))
-                                    .frame(width: 28, height: 28)
-                                    .overlay(
-                                            Icon(source: "arrow-back", size: 20, color: tintColor ?? Colors.black17)
-                                    )
-                            }
-                        }
-
-                        Spacer()
-
-                        if let headerRight = headerRight {
-                            AnyView(headerRight())
-                        }
-                    }
-                    .padding(.horizontal, 12)
-
-                    // MARK: - Title or Search
-                    HStack {
-                        if titlePosition == .left && goBack != nil {
-                            Spacer().frame(width: 38)
-                        }
-
-                        if let inputProps = inputSearchProps {
-                            InputSearch(props: inputProps)
-                        } else if case let .user(userData)? = headerTitle {
-                            if #available(iOS 16.0, *) {
-                                HeaderUserView(userData)
-                            }
-                        } else {
-                            MomoText(headerTitle?.defaultTitle ?? title, typography: .headerDefaultBold, color: tintColor ?? Colors.black17, maxLines: 1)
-                                .opacity(titleOpacity)
-                                .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)
-                        }
-
-                        Spacer()
-                    }
-                    .padding(.horizontal)
-                }
-                .background(Color.clear)
-                .frame(height: 52)
-            }
-        }
-    }
-}

package/ios/Application/ComposeApi.swift

@@ -1,22 +0,0 @@
-import Foundation
-
-public protocol ComposeApi {
-    func request(funcName: String, params: Any, _ completion: ((String) -> Void)?)
-    func request(funcName: String, params: Any) -> String
-}
-
-// Default implementation
-public class ComposeApiImpl: ComposeApi {
-    public static let shared = ComposeApiImpl()
-    
-    private init() {}
-    
-    public func request(funcName: String, params: Any, _ completion: ((String) -> Void)?) {
-        // Implement your API request logic here
-    }
-    
-    public func request(funcName: String, params: Any) -> String {
-        // Implement your API request logic here
-        return ""
-    }
-}