Skip to content

feat(all): Update compose bom and reintroduce material icons lib #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 22, 2025
Merged

feat(all): Update compose bom and reintroduce material icons lib #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cb38c7
Update compose bom and reintroduce material icons lib
tylerjroach Oct 20, 2025
65482db
update authenticator icons usage
tylerjroach Oct 20, 2025
8736985
apiDump update
tylerjroach Oct 21, 2025
601123f
lint fix
tylerjroach Oct 21, 2025
8583605
Merge branch 'main' into tjroach/update-compose-bom
tylerjroach Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions authenticator/api/authenticator.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ public final class com/amplifyframework/ui/authenticator/ui/ComposableSingletons
public static final field INSTANCE Lcom/amplifyframework/ui/authenticator/ui/ComposableSingletons$DateInputFieldKt;
public fun <init> ()V
public final fun getLambda$-1269239885$authenticator_release ()Lkotlin/jvm/functions/Function3;
public final fun getLambda$717979280$authenticator_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$-1322695825$authenticator_release ()Lkotlin/jvm/functions/Function2;
}

public final class com/amplifyframework/ui/authenticator/ui/ComposableSingletons$PasswordResetConfirmKt {
Expand All @@ -752,7 +752,7 @@ public final class com/amplifyframework/ui/authenticator/ui/ComposableSingletons
public final class com/amplifyframework/ui/authenticator/ui/ComposableSingletons$PhoneInputFieldKt {
public static final field INSTANCE Lcom/amplifyframework/ui/authenticator/ui/ComposableSingletons$PhoneInputFieldKt;
public fun <init> ()V
public final fun getLambda$-64258515$authenticator_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$1117974220$authenticator_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$639673736$authenticator_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$977961286$authenticator_release ()Lkotlin/jvm/functions/Function2;
}
Expand Down
3 changes: 2 additions & 1 deletion authenticator/src/main/java/com/amplifyframework/ui/authenticator/strings/StringResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import android.annotation.SuppressLint
import androidx.compose.runtime.Composable
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalResources
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import com.amplifyframework.auth.AuthException
Expand Down Expand Up @@ -143,7 +144,7 @@ internal open class StringResolver {
// Check if the customer application has defined a specific string for this Exception type. If not, return
// the generic error message.
val resourceName = error.toResourceName()
val resourceId = context.resources.getIdentifier(resourceName, "string", context.packageName)
val resourceId = LocalResources.current.getIdentifier(resourceName, "string", context.packageName)
val message = if (resourceId != 0) stringResource(resourceId) else null
message ?: stringResource(R.string.amplify_ui_authenticator_error_unknown)
}
Expand Down
4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ androidx-activity = "1.6.1"
androidx-navigation = "2.5.3"
binary-compatibility = "0.18.1"
cameraX = "1.4.2"
compose-bom = "2025.06.01"
compose-bom = "2025.10.00"
compose-material-icons = "1.7.8"
coroutines = "1.7.3"
desugar = "2.1.5"
futures = "1.1.0"
Expand Down Expand Up @@ -54,6 +55,7 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
# Compose
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
androidx-compose-material = { module = "androidx.compose.material3:material3" }
androidx-compose-material-icons = { module = "androidx.compose.material:material-icons-core", version.ref = "compose-material-icons" }
androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-compose-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
Expand Down
2 changes: 1 addition & 1 deletion liveness/api/liveness.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ public final class com/amplifyframework/ui/liveness/ui/ComposableSingletons$Inst
public final class com/amplifyframework/ui/liveness/ui/ComposableSingletons$PhotosensitivityViewKt {
public static final field INSTANCE Lcom/amplifyframework/ui/liveness/ui/ComposableSingletons$PhotosensitivityViewKt;
public fun <init> ()V
public final fun getLambda$1098672121$liveness_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$324742654$liveness_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$348729199$liveness_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$414441816$liveness_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$56343374$liveness_release ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$917919958$liveness_release ()Lkotlin/jvm/functions/Function3;
}
Expand Down
1 change: 1 addition & 0 deletions liveness/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ android {

dependencies {
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.material.icons)

api(libs.amplify.api)
api(libs.amplify.predictions)
Expand Down
1 change: 1 addition & 0 deletions samples/authenticator/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies {
implementation("com.amplifyframework.ui:authenticator:$authenticatorVersion")

implementation(libs.bundles.compose)
implementation(libs.androidx.compose.material.icons)
implementation(libs.androidx.lifecycle)
implementation(libs.androidx.activity.compose)
implementation(libs.samples.androidx.datastore.prefs)
Expand Down