@momo-kits/native-kits 0.89.16 → 0.89.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/android.iml +11 -0
- package/android/build.gradle +1 -1
- package/compose/build.gradle.kts +2 -1
- package/compose/src/commonMain/composeResources/drawable/test.jpg +0 -0
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/Button.kt +1 -2
- package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +2 -3
- package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Resources.kt +2 -3
- package/gradle.properties +3 -3
- package/package.json +1 -1
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<module type="JAVA_MODULE" version="4">
|
|
3
|
+
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
4
|
+
<exclude-output />
|
|
5
|
+
<content url="file://$MODULE_DIR$">
|
|
6
|
+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" />
|
|
7
|
+
</content>
|
|
8
|
+
<orderEntry type="inheritedJdk" />
|
|
9
|
+
<orderEntry type="sourceFolder" forTests="false" />
|
|
10
|
+
</component>
|
|
11
|
+
</module>
|
package/android/build.gradle
CHANGED
package/compose/build.gradle.kts
CHANGED
|
@@ -6,7 +6,7 @@ plugins {
|
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
val libGroup = "vn.momo.kits"
|
|
9
|
-
val libVersion = "0.0.
|
|
9
|
+
val libVersion = "0.0.1"
|
|
10
10
|
|
|
11
11
|
kotlin {
|
|
12
12
|
androidTarget {
|
|
@@ -37,6 +37,7 @@ kotlin {
|
|
|
37
37
|
implementation(libs.ktor.client.core)
|
|
38
38
|
implementation("com.github.skydoves:landscapist-coil3:2.3.2")
|
|
39
39
|
implementation(compose.components.resources)
|
|
40
|
+
implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha07")
|
|
40
41
|
|
|
41
42
|
implementation("cafe.adriel.voyager:voyager-navigator:$voyagerVersion")
|
|
42
43
|
implementation("cafe.adriel.voyager:voyager-screenmodel:$voyagerVersion")
|
|
Binary file
|
|
@@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier
|
|
|
22
22
|
import androidx.compose.ui.draw.clip
|
|
23
23
|
import androidx.compose.ui.graphics.Color
|
|
24
24
|
import androidx.compose.ui.text.TextStyle
|
|
25
|
-
import androidx.compose.ui.text.style.TextOverflow
|
|
26
25
|
import androidx.compose.ui.unit.Dp
|
|
27
26
|
import androidx.compose.ui.unit.dp
|
|
28
27
|
import vn.momo.kits.const.AppTheme
|
|
@@ -117,7 +116,7 @@ fun getTextColor(type: ButtonType): Color {
|
|
|
117
116
|
fun RenderTitle(size: Size, title: String = "", type: ButtonType) {
|
|
118
117
|
val style = getStyle(size)
|
|
119
118
|
val color = getTextColor(type)
|
|
120
|
-
Text(style = style, text = title, color = color
|
|
119
|
+
Text(style = style, text = title, color = color)
|
|
121
120
|
}
|
|
122
121
|
|
|
123
122
|
@Composable
|
|
@@ -7,7 +7,6 @@ import androidx.compose.ui.text.font.FontFamily
|
|
|
7
7
|
import androidx.compose.ui.text.font.FontStyle
|
|
8
8
|
import androidx.compose.ui.text.font.FontWeight
|
|
9
9
|
import androidx.compose.ui.unit.sp
|
|
10
|
-
import org.jetbrains.compose.resources.ExperimentalResourceApi
|
|
11
10
|
import org.jetbrains.compose.resources.Font
|
|
12
11
|
import org.jetbrains.compose.resources.FontResource
|
|
13
12
|
import org.jetbrains.compose.resources.InternalResourceApi
|
|
@@ -26,12 +25,12 @@ fun scaleSize(size: Float): Float {
|
|
|
26
25
|
return size
|
|
27
26
|
}
|
|
28
27
|
|
|
29
|
-
@OptIn(InternalResourceApi::class
|
|
28
|
+
@OptIn(InternalResourceApi::class)
|
|
30
29
|
@Composable
|
|
31
30
|
fun getFont(font: String): FontFamily {
|
|
32
31
|
val fontResource = FontResource(
|
|
33
32
|
"font:${font}",
|
|
34
|
-
setOf(ResourceItem(setOf(), "font/${font}.ttf"))
|
|
33
|
+
setOf(ResourceItem(setOf(), "font/${font}.ttf", -1, -1))
|
|
35
34
|
)
|
|
36
35
|
return FontFamily(Font(fontResource))
|
|
37
36
|
}
|
|
@@ -2,15 +2,14 @@ package vn.momo.kits.utils
|
|
|
2
2
|
|
|
3
3
|
import androidx.compose.runtime.Composable
|
|
4
4
|
import org.jetbrains.compose.resources.DrawableResource
|
|
5
|
-
import org.jetbrains.compose.resources.ExperimentalResourceApi
|
|
6
5
|
import org.jetbrains.compose.resources.InternalResourceApi
|
|
7
6
|
import org.jetbrains.compose.resources.ResourceItem
|
|
8
7
|
|
|
9
|
-
@OptIn(InternalResourceApi::class
|
|
8
|
+
@OptIn(InternalResourceApi::class)
|
|
10
9
|
@Composable
|
|
11
10
|
fun getResource(name: String): DrawableResource {
|
|
12
11
|
return DrawableResource(
|
|
13
12
|
"drawable:$name",
|
|
14
|
-
setOf(ResourceItem(setOf(), "drawable/$name"))
|
|
13
|
+
setOf(ResourceItem(setOf(), "drawable/$name", -1, -1))
|
|
15
14
|
)
|
|
16
15
|
}
|
package/gradle.properties
CHANGED
|
@@ -12,8 +12,8 @@ android.compileSdk=34
|
|
|
12
12
|
android.targetSdk=34
|
|
13
13
|
android.minSdk=24
|
|
14
14
|
#Versions
|
|
15
|
-
kotlin.version=1.9.
|
|
15
|
+
kotlin.version=1.9.24
|
|
16
16
|
agp.version=8.1.1
|
|
17
|
-
compose.version=1.6.
|
|
18
|
-
composeCompilerVersion = 1.5.
|
|
17
|
+
compose.version=1.6.11
|
|
18
|
+
composeCompilerVersion = 1.5.14
|
|
19
19
|
maven-publish.version=0.25.3
|