@momo-kits/native-kits 0.89.12 → 0.89.14

package/android/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
 }
 

package/compose/build.gradle.kts

@@ -2,8 +2,12 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("org.jetbrains.compose")
+    id("maven-publish")
 }
 
+val libGroup = "vn.momo.kits"
+val libVersion = "0.0.1"
+
 kotlin {
     androidTarget {
         publishLibraryVariants("release")
@@ -33,6 +37,7 @@ kotlin {
                 implementation(libs.ktor.client.core)
                 implementation("com.github.skydoves:landscapist-coil3:2.3.2")
                 implementation(compose.components.resources)
+                implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha07")
 
                 implementation("cafe.adriel.voyager:voyager-navigator:$voyagerVersion")
                 implementation("cafe.adriel.voyager:voyager-screenmodel:$voyagerVersion")
@@ -61,6 +66,25 @@ kotlin {
     task("testClasses")
 }
 
+publishing {
+    repositories {
+        maven {
+            group = libGroup
+            version = libVersion
+
+            name = "GitLab"
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/2374/packages/maven")
+            credentials(PasswordCredentials::class) {
+                username = "gitlab+deploy-token-74"
+                password = "L3zudJhxiPsQi9hZ1YLX"
+            }
+            authentication {
+                create<BasicAuthentication>("basic")
+            }
+        }
+    }
+}
+
 android {
     compileSdk = 34
     namespace = "com.myapplication.common"

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -7,12 +7,10 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.ResourceItem
-import vn.momo.kits.utils.getPlatformName
 import vn.momo.kits.utils.getScreenDimensions
 
 const val DEFAULT_SCREEN_SIZE = 375f
@@ -27,12 +25,12 @@ fun scaleSize(size: Float): Float {
     return size
 }
 
-@OptIn(ExperimentalResourceApi::class, InternalResourceApi::class)
+@OptIn(InternalResourceApi::class)
 @Composable
 fun getFont(font: String): FontFamily {
     val fontResource = FontResource(
         "font:${font}",
-        setOf(ResourceItem(setOf(), "font/${font}.ttf"))
+        setOf(ResourceItem(setOf(), "font/${font}.ttf", -1, -1))
     )
     return FontFamily(Font(fontResource))
 }
@@ -40,9 +38,6 @@ fun getFont(font: String): FontFamily {
 @Composable
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val key = "$fontFamily-${fontWeight?.weight}"
-    if (getPlatformName() == "iOS") {
-        return FontFamily.Default
-    }
     val fontMap = mapOf(
         "SFProText-100" to getFont("sfprotext_thin"),
         "SFProText-200" to getFont("sfprotext_ultralight"),

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Resources.kt

@@ -0,0 +1,15 @@
+package vn.momo.kits.utils
+
+import androidx.compose.runtime.Composable
+import org.jetbrains.compose.resources.DrawableResource
+import org.jetbrains.compose.resources.InternalResourceApi
+import org.jetbrains.compose.resources.ResourceItem
+
+@OptIn(InternalResourceApi::class)
+@Composable
+fun getResource(name: String): DrawableResource {
+    return DrawableResource(
+        "drawable:$name",
+        setOf(ResourceItem(setOf(), "drawable/$name", -1, -1))
+    )
+}

package/gradle.properties

@@ -12,8 +12,8 @@ android.compileSdk=34
 android.targetSdk=34
 android.minSdk=24
 #Versions
-kotlin.version=1.9.22
+kotlin.version=1.9.24
 agp.version=8.1.1
-compose.version=1.6.0
-composeCompilerVersion = 1.5.8
+compose.version=1.6.11
+composeCompilerVersion = 1.5.14
 maven-publish.version=0.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.12",
+  "version": "0.89.14",
   "private": false,
   "dependencies": {},
   "devDependencies": {},