From c278506daeb0a4e13db5b98169544c764a2c8dc9 Mon Sep 17 00:00:00 2001 From: Florina Muntenescu Date: Fri, 7 Oct 2022 18:04:08 +0100 Subject: [PATCH 1/2] Updating Material3 to RC01 --- JetNews/gradle/libs.versions.toml | 4 ++-- Jetchat/gradle/libs.versions.toml | 4 ++-- .../example/compose/jetsurvey/signinsignup/SignInSignUp.kt | 5 +++-- Jetsurvey/gradle/libs.versions.toml | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt index 8264a27ee..c9a7726d5 100644 --- a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt +++ b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt @@ -217,6 +217,9 @@ fun Password( PasswordVisualTransformation() }, isError = passwordState.showErrors(), + supportingText = { + passwordState.getError()?.let { error -> TextFieldError(textError = error) } + }, keyboardOptions = KeyboardOptions.Default.copy( imeAction = imeAction, keyboardType = KeyboardType.Password @@ -227,8 +230,6 @@ fun Password( } ), ) - - passwordState.getError()?.let { error -> TextFieldError(textError = error) } } /** diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" From 67e1e32fe8b34901203555c8e857b65af6d06e2f Mon Sep 17 00:00:00 2001 From: Alejandra Stamato Date: Fri, 7 Oct 2022 18:19:58 +0100 Subject: [PATCH 2/2] [All] Update all to material3 and compose-materialWindow to rc01 --- Crane/gradle/libs.versions.toml | 4 ++-- Jetcaster/gradle/libs.versions.toml | 4 ++-- Jetsnack/gradle/libs.versions.toml | 4 ++-- Owl/gradle/libs.versions.toml | 4 ++-- Reply/gradle/libs.versions.toml | 4 ++-- scripts/libs.versions.toml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index dd2efdb86..bd6d60484 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -28,9 +28,9 @@ compileSdk = "33" compose = "1.3.0-rc01" compose-compiler = "1.3.2" # @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-beta03" +compose-material3 = "1.0.0-rc01" # @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-beta03" +compose-materialWindow = "1.0.0-rc01" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0"