zcdziura/debt-pirate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change sign in text button to outline button

Browse source
This commit is contained in:
Z. Charles Dziura 2024-08-21 07:46:42 -04:00
parent d48c47af41
commit 1637d058b1
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/app/src/main/java/software/makeshift/debtpirate/MainActivity.kt
View file

@ -9,8 +9,8 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import kotlinx.serialization.Serializable
import software.makeshift.debtpirate.screens.auth.LoginScreen
import software.makeshift.debtpirate.screens.auth.signup.SignUpFormViewModel
import software.makeshift.debtpirate.screens.auth.SignUpScreen
import software.makeshift.debtpirate.screens.auth.signup.SignUpScreenViewModel
import software.makeshift.debtpirate.ui.theme.DebtPirateTheme
@Serializable
@ -26,8 +26,8 @@ class MainActivity : ComponentActivity() {
DebtPirateTheme {
NavHost(navController = navController, startDestination = LoginRoute) {
composable<LoginRoute> {
LoginScreen(
signUpFormViewModel = viewModel<SignUpFormViewModel>()
SignUpScreen(
viewModel = viewModel<SignUpScreenViewModel>()
)
}
}

18
app/app/src/main/java/software/makeshift/debtpirate/screens/auth/AuthScreen.kt
View file

@ -9,9 +9,9 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Alignment
@ -20,13 +20,13 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import software.makeshift.debtpirate.R
import software.makeshift.debtpirate.screens.auth.signup.SignUpFormViewModel
import software.makeshift.debtpirate.screens.auth.signup.SignUpScreen
import software.makeshift.debtpirate.screens.auth.signup.SignUpScreenViewModel
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@Composable
fun LoginScreen(
signUpFormViewModel: SignUpFormViewModel
fun SignUpScreen(
viewModel: SignUpScreenViewModel
) {
Scaffold(
modifier = Modifier.fillMaxSize()
@ -39,13 +39,13 @@ fun LoginScreen(
.weight(1f)
)
val displayName = signUpFormViewModel.displayName.collectAsState()
val emailAddress = signUpFormViewModel.emailAddress.collectAsState()
val displayName = viewModel.displayName.collectAsState()
val emailAddress = viewModel.emailAddress.collectAsState()
SignUpScreen(
displayName,
onDisplayNameUpdate = signUpFormViewModel::updateDisplayName,
onDisplayNameUpdate = viewModel::updateDisplayName,
emailAddress,
onEmailAddressUpdate = signUpFormViewModel::updateEmailAddress,
onEmailAddressUpdate = viewModel::updateEmailAddress,
modifier = Modifier
.weight(3f)
.padding(16.dp)
@ -69,7 +69,7 @@ private fun LoginTopBar(innerPadding: PaddingValues, modifier: Modifier = Modifi
.padding(16.dp)
)
{
TextButton(onClick = { /*TODO*/ }) {
OutlinedButton(onClick = { /*TODO*/ }) {
Text(stringResource(id = R.string.login_screen__sign_in))
}
}

2
app/app/src/main/java/software/makeshift/debtpirate/screens/auth/signup/SignUpViewModel.kt → app/app/src/main/java/software/makeshift/debtpirate/screens/auth/signup/SignUpScreenViewModel.kt
View file

@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
class SignUpFormViewModel : ViewModel() {
class SignUpScreenViewModel : ViewModel() {
private val _displayName = MutableStateFlow("")
val displayName = _displayName.asStateFlow()