@momo-kits/native-kits 0.167.1-beta.17-debug → 0.167.1-beta.18

package/ios/Title/Title.swift

@@ -155,7 +155,7 @@ public struct Title: View {
         let fontSize = fontScale(titleFontSize)
         // lineSpacing is added on top of the font's natural line height, not on top of fontSize.
         let lineSpacing = max(0, fontScale(titleLineHeight)
-            - UIFont.systemFont(ofSize: fontSize, weight: uiFontWeight(titleFontWeight)).lineHeight)
+            - UIFont.systemFont(ofSize: fontSize).lineHeight)
 
         return SwiftUI.Text(title)
             .font(.system(size: fontSize, weight: titleFontWeight))

package/ios/Typography/Text.swift

@@ -123,27 +123,13 @@ private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Fon
     return .custom(name, fixedSize: size)
 }
 
-// UIFont twin of momoFont(); only used to read the real line height for lineSpacing.
-private func momoUIFont(size: CGFloat, weight: Font.Weight, family: String) -> UIFont {
-    if let name = momoFontName(family: family, weight: weight),
+// lineHeight is identical across weights of a family, so the regular face is enough.
+private func momoLineHeight(size: CGFloat, family: String) -> CGFloat {
+    if let name = momoFontName(family: family, weight: .regular),
        let font = UIFont(name: name, size: size) {
-        return font
-    }
-    return .systemFont(ofSize: size, weight: uiFontWeight(weight))
-}
-
-func uiFontWeight(_ weight: Font.Weight) -> UIFont.Weight {
-    switch weight {
-    case .ultraLight: return .ultraLight
-    case .thin: return .thin
-    case .light: return .light
-    case .medium: return .medium
-    case .semibold: return .semibold
-    case .bold: return .bold
-    case .heavy: return .heavy
-    case .black: return .black
-    default: return .regular
+        return font.lineHeight
     }
+    return UIFont.systemFont(ofSize: size).lineHeight
 }
 
 public struct MomoText: View {
@@ -248,7 +234,7 @@ public struct MomoText: View {
         let fontSize = fontScale(typography.fontSize)
         // lineSpacing is added on top of the font's natural line height, not on top of fontSize.
         let lineSpacing = max(0, fontScale(typography.lineHeight)
-            - momoUIFont(size: fontSize, weight: typography.fontWeight, family: theme.font).lineHeight)
+            - momoLineHeight(size: fontSize, family: theme.font))
 
         var text = baseText
             .font(momoFont(size: fontSize, weight: typography.fontWeight, family: theme.font))

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.17'
+  s.version          = '0.167.1-beta.18'
   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.167.1-beta.17'
+  s.version          = '0.167.1-beta.18'
   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.167.1-beta.17-debug",
+  "version": "0.167.1-beta.18",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

package/build.gradle.kts

@@ -1,11 +0,0 @@
-plugins {
-    // this is necessary to avoid the plugins to be loaded multiple times
-    // in each subproject's classloader
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.compose) apply false
-    alias(libs.plugins.kotlin.compose.compiler) apply false
-    alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
-    alias(libs.plugins.jetbrains.kotlin.serialization) apply false
-    alias(libs.plugins.vanniktech.mavenPublish) apply false
-}

package/compose/build.gradle.kts

@@ -1,190 +0,0 @@
-// import com.vanniktech.maven.publish.JavadocJar
-// import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-//         alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String = findProperty("name") as String? ?: ""
-val gitlabRepo: String = findProperty("repo") as String? ?: ""
-val gitlabUrl: String = findProperty("url") as String? ?: ""
-val gitlabGroup: String = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String = findProperty("version") as String? ?: ""
-val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = "0.167.1-beta.17-debug"
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        all {
-            languageSettings.optIn("vn.momo.kits.modifier.InternalApi")
-        }
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.compose.ui.backhandler)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-            implementation(libs.compottie)
-            implementation(libs.gif.image)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "vn.momo.kits.kits"
-    compileSdk = 35
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = 24
-    }
-}
-
-dependencies {
-}
-
-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
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-// publishing {
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials {
-//                 username = gitlabUser
-//                 password = gitlabKey
-//             }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// }
-
-// mavenPublishing {
-//     configure(
-//         KotlinMultiplatform(
-//             javadocJar = JavadocJar.Empty(),
-//             sourcesJar = true,
-//             androidVariantsToPublish = listOf("release")
-//         )
-//     )
-// 
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials { username = gitlabUser; password = gitlabKey }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// 
-//     coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-// 
-//     pom {
-//         name = "$gitlabName Klib"
-//         description = "$gitlabName"
-//         url = "https://gitlab.mservice.com.vn"
-//         licenses {
-//             license {
-//                 name = "The Apache License, Version 2.0"
-//                 url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//                 distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//             }
-//         }
-//         developers {
-//             developer {
-//                 id = "kotlin-hands-on"
-//                 name = "Kotlin Developer Advocate"
-//                 url = "https://github.com/kotlin-hands-on/"
-//             }
-//         }
-//     }
-// }

package/compose/build.gradle.kts.backup

@@ -1,190 +0,0 @@
-import com.vanniktech.maven.publish.JavadocJar
-import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String = findProperty("name") as String? ?: ""
-val gitlabRepo: String = findProperty("repo") as String? ?: ""
-val gitlabUrl: String = findProperty("url") as String? ?: ""
-val gitlabGroup: String = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String = findProperty("version") as String? ?: ""
-val gitlabUser: String = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = gitlabVersion
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        all {
-            languageSettings.optIn("vn.momo.kits.modifier.InternalApi")
-        }
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.compose.ui.backhandler)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-            implementation(libs.compottie)
-            implementation(libs.gif.image)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "$gitlabGroup.$gitlabArtifactId"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
-}
-
-dependencies {
-}
-
-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
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials {
-                username = gitlabUser
-                password = gitlabKey
-            }
-            url = uri("$gitlabUrl")
-        }
-    }
-}
-
-mavenPublishing {
-    configure(
-        KotlinMultiplatform(
-            javadocJar = JavadocJar.Empty(),
-            sourcesJar = true,
-            androidVariantsToPublish = listOf("release")
-        )
-    )
-
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials { username = gitlabUser; password = gitlabKey }
-            url = uri("$gitlabUrl")
-        }
-    }
-
-    coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-
-    pom {
-        name = "$gitlabName Klib"
-        description = "$gitlabName"
-        url = "https://gitlab.mservice.com.vn"
-        licenses {
-            license {
-                name = "The Apache License, Version 2.0"
-                url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-                distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-            }
-        }
-        developers {
-            developer {
-                id = "kotlin-hands-on"
-                name = "Kotlin Developer Advocate"
-                url = "https://github.com/kotlin-hands-on/"
-            }
-        }
-    }
-}

package/compose/compose.podspec

@@ -1,47 +0,0 @@
-Pod::Spec.new do |spec|
-    spec.name                     = 'compose'
-    spec.version                  = '0.167.1-beta.17-debug'
-    spec.homepage                 = 'https://momo.vn'
-    spec.source                   = { :http=> ''}
-    spec.authors                  = ''
-    spec.license                  = ''
-    spec.summary                  = 'IOS Shared module'
-    spec.vendored_frameworks      = 'build/cocoapods/framework/kits.framework'
-    spec.libraries                = 'c++'
-    spec.ios.deployment_target    = '15.0'
-    spec.dependency 'lottie-ios', '4.4.3'
-    if !Dir.exist?('build/cocoapods/framework/kits.framework') || Dir.empty?('build/cocoapods/framework/kits.framework')
-        raise "
-        Kotlin framework 'kits' doesn't exist yet, so a proper Xcode project can't be generated.
-        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
-            ./gradlew :compose:generateDummyFramework
-        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
-    end
-    spec.xcconfig = {
-        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
-    }
-    spec.pod_target_xcconfig = {
-        'KOTLIN_PROJECT_PATH' => ':compose',
-        'PRODUCT_MODULE_NAME' => 'kits',
-    }
-    spec.script_phases = [
-        {
-            :name => 'Build compose',
-            :execution_position => :before_compile,
-            :shell_path => '/bin/sh',
-            :script => <<-SCRIPT
-                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
-                    echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
-                    exit 0
-                fi
-                set -ev
-                REPO_ROOT="$PODS_TARGET_SRCROOT"
-                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
-                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
-                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
-                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
-            SCRIPT
-        }
-    ]
-    spec.resources = ['build/compose/cocoapods/compose-resources']
-end

package/compose/src/androidMain/kotlin/vn/momo/kits/const/HostFont.android.kt

@@ -1,19 +0,0 @@
-package vn.momo.kits.const
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
-
-@Composable
-internal actual fun hostFontFamily(fileName: String): FontFamily? {
-    val assets = LocalContext.current.applicationContext.assets
-    return remember(fileName) {
-        val path = "fonts/$fileName"
-        // AssetManager.open ném IOException nếu thiếu file; Font(path, assetManager) thì lỗi
-        // muộn lúc render nên phải kiểm tra tồn tại trước.
-        val exists = runCatching { assets.open(path).close() }.isSuccess
-        if (exists) FontFamily(Font(path = path, assetManager = assets)) else null
-    }
-}

package/compose/src/androidMain/kotlin/vn/momo/kits/navigation/ScrollToTop.android.kt

@@ -1,6 +0,0 @@
-package vn.momo.kits.navigation
-
-import androidx.compose.runtime.Composable
-
-@Composable
-internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) = Unit

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/BackGesture.android.kt

@@ -1,12 +0,0 @@
-package vn.momo.kits.platform
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-
-// No passive observer at androidx.activity 1.10.x; a second callback would steal the gesture.
-@Composable
-actual fun rememberBackGestureProgress(): State<Float?> = remember { mutableStateOf(null) }
-
-actual fun reportFloatingArrowBack(shouldUse: Boolean) = Unit

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/OsFontScale.android.kt

@@ -1,7 +0,0 @@
-package vn.momo.kits.platform
-
-import androidx.compose.runtime.Composable
-
-// Android's LocalDensity.fontScale already tracks Configuration.fontScale live.
-@Composable
-actual fun ProvideOsFontScale(content: @Composable () -> Unit) = content()