From 5746e3bb57c9d5e48729ce17ce3e72ab01c3a4ac Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:54:32 +0800 Subject: [PATCH] Pin compose foundation version to 1.7.0-alpha03 --- app/build.gradle.kts | 7 +++++++ .../main/kotlin/androidx/compose/material3/SearchBar2.kt | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 56a75481f..df09ba0b7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -252,6 +252,13 @@ dependencies { implementation(libs.compose.ui.tooling.preview) } +configurations.all { + resolutionStrategy { + // Workaround for https://issuetracker.google.com/329489167 + force("androidx.compose.foundation:foundation-android:1.7.0-alpha03") + } +} + kotlin { jvmToolchain(21) } diff --git a/app/src/main/kotlin/androidx/compose/material3/SearchBar2.kt b/app/src/main/kotlin/androidx/compose/material3/SearchBar2.kt index 622cf8576..e919e6f48 100644 --- a/app/src/main/kotlin/androidx/compose/material3/SearchBar2.kt +++ b/app/src/main/kotlin/androidx/compose/material3/SearchBar2.kt @@ -44,7 +44,7 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.onConsumedWindowInsetsChanged import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.GenericShape -import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.BasicTextField2 import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.input.TextFieldLineLimits @@ -494,7 +494,7 @@ private fun SearchBarInputField( if (focused) colors.focusedTextColor else colors.unfocusedTextColor } - BasicTextField( + BasicTextField2( state = state, modifier = modifier .height(InputFieldHeight)