From e0a0270d699342b5b242c2880f2f5d341a4633b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:24:24 +0000 Subject: [PATCH 1/3] Update dependency androidx.compose.material3:material3 to v1.0.0-rc01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9cd11b16..9efa53297 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ androidDesugarJdkLibs = "2.0.0" compose = "1.3.0-rc01" composeCompiler = "1.3.1" composeMaterial3WindowSizeClass = "1.0.0-rc01" -composeMaterial3 = "1.0.0-beta03" +composeMaterial3 = "1.0.0-rc01" androidxFragment = "1.5.3" androidxLifecycle = "2.5.1" androidxActivity = "1.6.0" From 38578d0f9c89241ab844d4610ff0cabd7e82a906 Mon Sep 17 00:00:00 2001 From: ked4ma Date: Fri, 7 Oct 2022 11:31:10 +0900 Subject: [PATCH 2/3] set indicator color of search box --- .../droidkaigi/confsched2022/feature/sessions/Search.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt index 2a84f05e0..b95d073a4 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt +++ b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt @@ -365,7 +365,12 @@ private fun SearchTextField( }, singleLine = true, enabled = true, - colors = TextFieldDefaults.textFieldColors(), + colors = TextFieldDefaults.textFieldColors( + focusedIndicatorColor = Color.Transparent, + unfocusedIndicatorColor = Color.Transparent, + disabledIndicatorColor = Color.Transparent, + errorIndicatorColor = Color.Transparent, + ), interactionSource = remember { MutableInteractionSource() }, contentPadding = PaddingValues( top = 16.dp, From ac68fb1f62a0e4cf3e3a321a68912ad3d283d5fe Mon Sep 17 00:00:00 2001 From: ked4ma Date: Fri, 7 Oct 2022 11:42:32 +0900 Subject: [PATCH 3/3] not to pass decoration container instead of setting indicator color --- .../confsched2022/feature/sessions/Search.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt index b95d073a4..0bd1a00fc 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt +++ b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2022/feature/sessions/Search.kt @@ -365,19 +365,15 @@ private fun SearchTextField( }, singleLine = true, enabled = true, - colors = TextFieldDefaults.textFieldColors( - focusedIndicatorColor = Color.Transparent, - unfocusedIndicatorColor = Color.Transparent, - disabledIndicatorColor = Color.Transparent, - errorIndicatorColor = Color.Transparent, - ), + colors = TextFieldDefaults.textFieldColors(), interactionSource = remember { MutableInteractionSource() }, contentPadding = PaddingValues( top = 16.dp, bottom = 16.dp, start = 0.dp, end = 16.dp - ) + ), + container = {}, ) } )