@momo-kits/native-kits 0.161.1-beta.15-debug → 0.161.2-beta.1-debug

package/compose/build.gradle.kts

@@ -30,7 +30,7 @@ kotlin {
     }
 
     val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
+    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
     iosTargets.forEach {
         it.binaries.framework {
             baseName = fwName
@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.1-beta.15-debug"
+        version = "0.161.2-beta.1-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -73,6 +73,7 @@ kotlin {
             implementation(libs.jetbrains.serialization.json)
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
+            implementation(libs.compottie)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)
@@ -108,12 +109,17 @@ repositories {
         }
     }
     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("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+        url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+        credentials {
+            username = "viewer"
+            password = "viewer"
+        }
         isAllowInsecureProtocol = true
     }
 }

package/compose/build.gradle.kts.backup

@@ -30,7 +30,7 @@ kotlin {
     }
 
     val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
+    val iosTargets = listOf(iosArm64(), iosSimulatorArm64())
     iosTargets.forEach {
         it.binaries.framework {
             baseName = fwName
@@ -73,6 +73,7 @@ kotlin {
             implementation(libs.jetbrains.serialization.json)
             implementation(libs.kotlinx.datetime)
             api(libs.native.max.api)
+            implementation(libs.compottie)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.okhttp)
@@ -108,12 +109,17 @@ repositories {
         }
     }
     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("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+        url = uri("https://artifacts.mservice.com.vn/repository/maven-momo-app/")
+        credentials {
+            username = "viewer"
+            password = "viewer"
+        }
         isAllowInsecureProtocol = true
     }
 }

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.159.1-beta.7'
+    spec.version                  = '0.159.1-beta.16'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -0,0 +1,6 @@
+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/Platform.android.kt

@@ -70,15 +70,22 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp + if (getOSVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
 }
 
-actual fun getOSVersion(): Int = Build.VERSION.SDK_INT
+actual fun getOSVersion(): OSVersion = OSVersion.Android(sdk = Build.VERSION.SDK_INT)
 
 @Composable
 actual fun LottieAnimation(
     path: String,
     tintColor: Color?,
     bgColor: Color?,
-    modifier: Modifier
+    placedAsOverlay: Boolean,
+    modifier: Modifier,
+    useCompose: Boolean
 ) {
+    if (useCompose) {
+        ComposeLottieAnimation(path, tintColor, bgColor, modifier)
+        return
+    }
+
     val json = readJson(path)
 
     if (json.isEmpty()) {

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -1,15 +1,12 @@
 package vn.momo.kits.application
 
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
 
 @Immutable
 data class FeatureFlags(
-    val isBaselineEnabled: Boolean? = false,
-    val isWhiteList: Boolean? = false,
-    val allowFontScale: Boolean? = true,
+    val showBaseLineDebug: Boolean? = false,
 )
 
 @Immutable
@@ -31,6 +28,7 @@ data class MiniAppContext(
     val providerId: String = "",
     val permissions: List<Map<String, Any>>? = emptyList(),
     val features: FeatureFlags? = null,
+    val scaleSizeMaxRate: Float? = null,
 ) {
     companion object {
 
@@ -62,6 +60,7 @@ data class MiniAppContext(
                 providerId = parent.providerId.ifBlank { child.providerId },
                 permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
                 features = mergeFeatureFlags(parent.features, child.features),
+                scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
             )
         }
 
@@ -75,7 +74,7 @@ data class MiniAppContext(
             if (child == null) return parent
 
             return FeatureFlags(
-                isBaselineEnabled = parent.isBaselineEnabled ?: child.isBaselineEnabled
+                showBaseLineDebug = parent.showBaseLineDebug ?: child.showBaseLineDebug
             )
         }
     }
@@ -89,19 +88,12 @@ data class ComponentInformation(
     val action: String? = null
 )
 
+var IsShowBaseLineDebug = false
+
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null
 }
 
-var IsShowBaseLineDebug = false
-
-private val UseFontScaleSystemState = mutableStateOf(true)
-var UseFontScaleSystem: Boolean
-    get() = UseFontScaleSystemState.value
-    set(value) {
-        UseFontScaleSystemState.value = value
-    }
-
 val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
@@ -113,3 +105,5 @@ val AppLanguage = staticCompositionLocalOf<String?> {
 val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?> {
     null
 }
+
+val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }