varnitgoyal95/uitron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TP-49506 update kotlin ksp compilesdk and material3 version (#241)

Browse Source
This commit is contained in:
Hitesh Kumar
2023-11-24 13:20:52 +05:30
committed by GitHub
parent a9ba78db4d
commit 46f2ce718f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -7,7 +7,7 @@ plugins {
android {
namespace 'com.uitron.demo'
compileSdk 33
compileSdk 34
defaultConfig {
applicationId "com.uitron.demo"
@@ -64,7 +64,7 @@ android {
}
dependencies {
implementation platform("androidx.compose:compose-bom:2023.06.01")
implementation platform("androidx.compose:compose-bom:2023.10.01")
implementation project(':navi-uitron')
implementation 'androidx.appcompat:appcompat:1.6.1'

4
gradle/libs.versions.toml
View File

@@ -1,8 +1,8 @@
[versions]
androidGradlePlugin = "8.1.1"
hilt = "2.48"
kotlin = "1.9.10"
ksp = "1.9.10-1.0.13"
kotlin = "1.9.20"
ksp = "1.9.20-1.0.14"
[libraries]

6
navi-uitron/build.gradle
View File

@@ -9,7 +9,7 @@ def VERSION_NAME = "1.0.33"
android {
namespace 'com.navi.uitron'
compileSdk 33
compileSdk 34
defaultConfig {
minSdk 21
@@ -81,7 +81,7 @@ publishing {
}
dependencies {
implementation platform("androidx.compose:compose-bom:2023.06.01")
implementation platform("androidx.compose:compose-bom:2023.10.01")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
@@ -101,5 +101,5 @@ dependencies {
api "io.coil-kt:coil-compose:2.4.0"
testImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test.ext:junit:1.1.5"
implementation 'androidx.compose.material3:material3:1.1.2'
implementation 'androidx.compose.material3:material3:1.2.0-alpha11'
}

8
navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt
View File

@@ -619,7 +619,7 @@ fun String?.toDoubleWithSafe(): Double {
}
}
fun getTextAlignment(textAlignment: String?): TextAlign? {
fun getTextAlignment(textAlignment: String?): TextAlign {
return when (textAlignment) {
TextAlign.Start.toString() -> TextAlign.Start
TextAlign.End.toString() -> TextAlign.End
@@ -627,7 +627,7 @@ fun getTextAlignment(textAlignment: String?): TextAlign? {
TextAlign.Left.toString() -> TextAlign.Left
TextAlign.Right.toString() -> TextAlign.Right
TextAlign.Justify.toString() -> TextAlign.Justify
else -> null
else -> TextAlign.Unspecified
}
}
@@ -739,7 +739,7 @@ fun Modifier.conditional(condition : Boolean, modifier : Modifier.() -> Modifier
fun RowScope.constraintsToModifier(rowConstraints: RowConstraints?): Modifier {
return Modifier
.conditional(rowConstraints?.rowWeight != null) {
weight(rowConstraints?.rowWeight?.weight ?: 0f, rowConstraints?.rowWeight?.fill ?: true)
weight(rowConstraints?.rowWeight?.weight ?: 1f, rowConstraints?.rowWeight?.fill ?: true)
}
.conditional(rowConstraints?.verticalAlignment != null) {
align(getVerticalAlignment(rowConstraints?.verticalAlignment))
@@ -753,7 +753,7 @@ fun ColumnScope.constraintsToModifier(columnConstraints: ColumnConstraints?): Mo
return Modifier
.conditional(columnConstraints?.columnWeight != null) {
weight(
columnConstraints?.columnWeight?.weight ?: 0f,
columnConstraints?.columnWeight?.weight ?: 1f,
columnConstraints?.columnWeight?.fill ?: true
)
}