From 21f042fa9576f62ca0159471e7495b221463fd5a Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 30 Jan 2024 13:38:41 -0500 Subject: [PATCH] Fixes secondary buttons theme in the login and signup screens. --- .../vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt | 3 ++- .../vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt index 079aa53cd..eeef52c43 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt @@ -49,6 +49,7 @@ import androidx.compose.material3.Checkbox import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -490,7 +491,7 @@ fun LoginPage( Spacer(modifier = Modifier.height(Size20dp)) Box(modifier = Modifier.padding(Size40dp, 0.dp, Size40dp, 0.dp)) { - Button( + OutlinedButton( onClick = onWantsToLogin, shape = RoundedCornerShape(Size35dp), modifier = Modifier.height(50.dp), diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt index e34a0c7bf..d92932043 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt @@ -40,6 +40,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -292,7 +293,7 @@ fun SignUpPage( Spacer(modifier = Modifier.height(Size20dp)) Box(modifier = Modifier.padding(Size40dp, 0.dp, Size40dp, 0.dp)) { - Button( + OutlinedButton( onClick = onWantsToLogin, shape = RoundedCornerShape(Size35dp), modifier = Modifier.height(50.dp),