From d75748205928456808821d97a05955d099587e46 Mon Sep 17 00:00:00 2001 From: Mehul Garg Date: Thu, 15 Feb 2024 16:31:21 +0530 Subject: [PATCH] TP-57277 | Mehul | Revert compose bom changes (#331) --- gradle/libs.versions.toml | 4 +--- navi-uitron/build.gradle | 1 - navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4761cad..fdbdb85 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,9 +16,8 @@ androidx-test-espresso = "3.5.0" androidx-test-junit = "1.1.5" androidx-uiautomator = "2.2.0" coil = "2.5.0" -compose-bom = "2024.01.00" +compose-bom = "2023.10.01" compose-lib = "1.5.8" -foundation = "1.7.0-alpha01" gson = "2.10.1" firebase-bom = "32.7.0" firebase-crashlytics = "2.9.9" @@ -59,7 +58,6 @@ androidx-constraintlayoutCompose = { module = "androidx.constraintlayout:constra androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" } -androidx-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundation" } androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } diff --git a/navi-uitron/build.gradle b/navi-uitron/build.gradle index 15abdcd..85fd78b 100644 --- a/navi-uitron/build.gradle +++ b/navi-uitron/build.gradle @@ -98,7 +98,6 @@ dependencies { implementation libs.androidx.core.ktx implementation libs.androidx.hilt.navigation.compose implementation libs.androidx.lifecycle.runtime.ktx - implementation libs.androidx.foundation implementation libs.gson diff --git a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt index fef12e1..c657909 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt @@ -639,7 +639,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 @@ -647,7 +647,7 @@ fun getTextAlignment(textAlignment: String?): TextAlign { TextAlign.Left.toString() -> TextAlign.Left TextAlign.Right.toString() -> TextAlign.Right TextAlign.Justify.toString() -> TextAlign.Justify - else -> TextAlign.Unspecified + else -> null } }